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

Timestamp:

11/23/09 10:58:52 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no módulo gerenciados de arquivos

File:

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

sandbox/filemanager/inc/upload.php

@@ -26 +26 @@
                 if($badchar = $bo->bad_chars($_FILES['upload_file']['name'][$i], True, True))
                 {
-                        $_SESSION['response'] = lang('Error:').lang('File names cannot contain "%1"', $badchar);
-                        return;
+                        $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('File names cannot contain "%1"', $badchar);
+                        continue;
                 }
 
@@ -44 +44 @@
                         if($fileinfo['mime_type'] == 'Directory')
                         {
-                                $_SESSION['response'] = lang('Error:').lang('Cannot replace %1 because it is a directory', $fileinfo['name']);
-                                return;
+                                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('Cannot replace %1 because it is a directory', $fileinfo['name']);
+                                continue;
                         }
                 }
@@ -51 +51 @@
                 if ($_FILES['upload_file']['size'][$i] > ($upload_max_size*1024*1024))
                 {
-                        $_SESSION['response'] = lang('The size of %1 has exceded the limit: %2', $_FILES['upload_file']['name'][$i], $upload_max_size);
-                        return;
+                        $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('The size of %1 has exceded the limit: %2', $_FILES['upload_file']['name'][$i], $upload_max_size);
+                        continue;
                 }
                 else if(strlen($current_config['filemanager_antivirus_command']) > 0)
@@ -60 +60 @@
                         if ($return == 1)
                         {
-                                 $_SESSION['response'] = lang('Error:').lang('The file %1 sent was considered infected',$_FILES['upload_file']['name'][$i]);
-                                return;
+                                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('The file %1 sent was considered infected',$_FILES['upload_file']['name'][$i]);
+                                continue;
                         }
                 }
@@ -90 +90 @@
                                 $bo->vfs->cp($tmp_arr);
 
-                                 $_SESSION['response'] .= lang('Created new %1', $_FILES['upload_file']['name'][$i])."\n";
+                                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Created new %1', $_FILES['upload_file']['name'][$i])."\n";
                         }
                         else
@@ -110 +110 @@
                                 ));
 
-                                 $_SESSION['response'] .= lang('Created %1,%2', $_FILES['upload_file']['name'][$i], $_FILES['upload_file']['size'][$i])."\n";
+                                 $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Created %1,%2', $_FILES['upload_file']['name'][$i], $_FILES['upload_file']['size'][$i])."\n";
                         }
                 }
@@ -129 +129 @@
                         ));
 
-                         $_SESSION['response'] .= lang('Created %1,%2', $_FILES['upload_file']['name'][$i], $file_size[$i])."\n";
+                         $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Created %1,%2', $_FILES['upload_file']['name'][$i], $file_size[$i])."\n";
+
                 }
         }