Changeset 1804 for sandbox/filemanager/inc/upload.php

Timestamp:

12/10/09 15:26:19 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no modulo gerenciador de arquivos

File:

• sandbox/filemanager/inc/upload.php (modified) (7 diffs)

sandbox/filemanager/inc/upload.php

@@ -31 +31 @@
         if ($return == 1)
         {
-                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('One of the files sent was considered infected');
+                $_SESSION['response'] = serialize(array(0 => lang('Error:').lang('One of the files sent was considered infected')));
                 return;
         }
@@ -41 +41 @@
                 if($badchar = $bo->bad_chars($_FILES['upload_file']['name'][$i], True, True))
                 {
-                        $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('File names cannot contain "%1"', $badchar);
+                        $return[] = lang('Error:').lang('File names cannot contain "%1"', $badchar);
                         continue;
                 }
@@ -59 +59 @@
                         if($fileinfo['mime_type'] == 'Directory')
                         {
-                                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('Cannot replace %1 because it is a directory', $fileinfo['name']);
+                                $return[] = lang('Error:').lang('Cannot replace %1 because it is a directory', $fileinfo['name']);
                                 continue;
                         }
@@ -66 +66 @@
                 if ($_FILES['upload_file']['size'][$i] > ($upload_max_size*1024*1024))
                 {
-                        $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('The size of %1 has exceded the limit: %2', $_FILES['upload_file']['name'][$i], $upload_max_size);
+                        $return[] = lang('The size of %1 has exceded the limit: %2', $_FILES['upload_file']['name'][$i], $upload_max_size);
                         continue;
                 }
@@ -94 +94 @@
                                 );
                                 $bo->vfs->cp($tmp_arr);
-
-                                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Created new %1', $_FILES['upload_file']['name'][$i])."\n";
                         }
                         else
@@ -114 +112 @@
                                 ));
                                 else{
-                                        $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('Your quota has exceeded the limit');
+                                        $return[] = lang('Error:').lang('Your quota has exceeded the limit');
                                         return false;
                                 }
 
-                                 $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Created %1,%2', $_FILES['upload_file']['name'][$i], $bo->borkb($_FILES['upload_file']['size'][$i]))."\n";
                         }
                 }
@@ -137 +134 @@
                         ));
 
-                         $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Created %1,%2', $_FILES['upload_file']['name'][$i], $bo->borkb($file_size[$i]))."\n";
-
                 }
         }
+        if (count($return) > 0)
+                $_SESSION['response'] = serialize($return);
+        else
+                 $_SESSION['response'] = serialize( array( 0 => 'Ok' ) );
 ?>