Changeset 1745

Timestamp:

12/04/09 08:03:32 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no módulos gerenciador de arquivos do expresso livre

Location:

sandbox/filemanager

Files:

• inc/upload.php (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)

sandbox/filemanager/inc/upload.php

@@ -19 +19 @@
 $upload_max_size = $current_config['filemanager_Max_file_size'];
 $path = base64_decode($_POST['path']);
-$show_upload_boxes = $_POST['show_upload_boxes'];
+$show_upload_boxes = count($_FILES['upload_file']['name'])-1;
+
+/* Its much faster test all files only one time */
+if(strlen($current_config['filemanager_antivirus_command']) > 0)
+{
+        $command = "nice -n19 ".$current_config['filemanager_antivirus_command'];
+        for($i = 0; $i != $show_upload_boxes; $i++)
+                $command .= " ".$_FILES['upload_file']['tmp_name'][$i];
+        $return=0;
+        exec("bash -c ".escapeshellcmd(escapeshellarg($command)),$output,$return);
+        if ($return == 1)
+        {
+                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('One of the files sent was considered infected');
+                return;
+        }
+}
 
 if($path != '/')
@@ -54 +69 @@
                         continue;
                 }
-                else if(strlen($current_config['filemanager_antivirus_command']) > 0)
-                {
-                        $command = "nice -n19 ".$current_config['filemanager_antivirus_command']." ".$_FILES['upload_file']['tmp_name'][$i];
-                        exec("bash -c ".escapeshellcmd(escapeshellarg($command)),$output,$return);
-                        if ($return == 1)
-                        {
-                                $_SESSION['phpgw_info']['filemanager']['user']['messages'][] = lang('Error:').lang('The file %1 sent was considered infected',$_FILES['upload_file']['name'][$i]);
-                                continue;
-                        }
-                }
-                if($_FILES['upload_file']['size'][$i] > 0)
+                elseif($_FILES['upload_file']['size'][$i] > 0)
                 {
                         if($fileinfo['name'] && $fileinfo['deleteable'] != 'N')

sandbox/filemanager/setup/phpgw_pt-br.lang

@@ -29 +29 @@
 created %1      filemanager     pt-br   Criado %1
 You have no permission to access this file      filemanager     pt-br   Você não tem permissão para acessar este arquivo
-The file %1 sent was considered infected        filemanager     pt-bt   o arquivo (%1) enviado foi considerado infectado por vírus
+One of the files sent was considered infected   filemanager     pt-bt   Um dos arquivos enviados foi considerado infectado por vírus
 Note: Uploaded is limited to %1MB       filemanager     pt-br   Nota: O tamanho máximo de envio é limitado a %1MB
 This property will change the visibility of all users that have access to this file, continue?  filemanager     pt-br   Esta propriedade altera visibilidade dos usuários que estão compartilhados, deseja continuar?