Changeset 1678

Timestamp:

11/19/09 11:04:50 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Integração com antivirus, e gestão de quotas

Files:

• sandbox/filemanager/inc/class.uiconfig.inc.php (added)
• sandbox/filemanager/inc/class.uifilemanager.inc.php (modified) (3 diffs)
• sandbox/filemanager/inc/hook_admin.inc.php (modified) (1 diff)
• sandbox/filemanager/setup/phpgw_pt-br.lang (modified) (1 diff)
• sandbox/filemanager/templates/default/config.tpl (modified) (1 diff)
• trunk/admin/setup/phpgw_pt-br.lang (modified) (previous)

sandbox/filemanager/inc/class.uifilemanager.inc.php

@@ -1142 +1142 @@
                                                  $max_size .= "M";
 
-                                         $upload_max_filesize = str_replace("M","",$max_size) * 1024 * 1024;
+                                        $upload_max_filesize = str_replace("M","",$max_size) * 1024 * 1024;
 
                                         if ($_FILES['upload_file']['size'][$i] > $upload_max_filesize)
@@ -1148 +1148 @@
                                                 $this->messages[]=lang('The size of %1 has exceded the limit: %2', $this->disppath.'/'.$_FILES['upload_file']['name'][$i], $max_size);
                                         }
-                                        else
+                                        else if(strlen($this->current_config['filemanager_antivirus_command']) > 0)
+                                        {
+                                                $command = "nice -n19 ".$this->current_config['filemanager_antivirus_command']." ".$_FILES['upload_file']['tmp_name'][$i];
+                                                exec("bash -c ".escapeshellcmd(escapeshellarg($command)),$output,$return);
+                                                if ($return == 1)
+                                                {
+                                                        $this->messages[]=lang('Error:').lang('The file sent was considered infected');
+                                                        $this->readFilesInfo();
+                                                        $this->filelisting();
+                                                        return true;
+                                                }
+                                        }
                                         if($_FILES['upload_file']['size'][$i] > 0)
                                         {
@@ -1283 +1294 @@
                                         else
                                         {
-                                                $this->messages[] = lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[] = lang('Error:').lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
                                         }
                                 }

sandbox/filemanager/inc/hook_admin.inc.php

@@ -26 +26 @@
         $file = Array(
                 'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+                'Quota management' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiconfig.quota'),
+
         );
 //Do not modify below this line

sandbox/filemanager/setup/phpgw_pt-br.lang

@@ -27 +27 @@
 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 sent was considered infected   filemanager     pt-br   O arquivo enviado foi considerado infectado por vírus
 no comments     filemanager     pt-br   sem comentários
 created %1,%2   filemanager     pt-br   Criado %1, %2

sandbox/filemanager/templates/default/config.tpl

@@ -7 +7 @@
 <!-- END header -->
 <!-- BEGIN body -->
-    <tr bgcolor="{row_on}">              
-    <td>{lang_Max_file_size}</td>                
-    <td>                 
+    <tr bgcolor="{row_on}">
+    <td>{lang_Max_file_size}</td>
+    <td>
     <input size="1" name="newsettings[filemanager_Max_file_size]" value="{value_filemanager_Max_file_size}">&nbsp;Mb
     </td>
     </tr>
-    <tr bgcolor="{row_off}">              
-    <td>{lang_quota_size}</td>                
-    <td>                 
+    <tr bgcolor="{row_off}">
+    <td>{lang_quota_size}</td>
+    <td>
     <input size="2" name="newsettings[filemanager_quota_size]" value="{value_filemanager_quota_size}">&nbsp;Mb
     </td>
     </tr>
+    <tr bgcolor="{row_on}">
+    <td>{lang_antivirus_command}</td>    
+    <td>
+    <input size="50" name="newsettings[filemanager_antivirus_command]" value="{value_filemanager_antivirus_command}">
+    </td>
+    </tr>
+
 <!-- END body -->
 <!-- BEGIN footer -->