Changeset 1694 for sandbox/filemanager/inc

Timestamp:

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

Author:

amuller

Message:

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

Location:

sandbox/filemanager/inc

Files:

• class.uifilemanager.inc.php (modified) (11 diffs)
• upload.php (modified) (7 diffs)

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

@@ -54 +54 @@
                 var $current_config;
                 var $goto_x;
-                var $todir;
+                var $to;
                 var $changedir; // for switching dir.
                 var $cdtodir; // for switching dir.
@@ -79 +79 @@
                 var $file; // FIXME WHERE IS THIS FILLED?
                 var $sortby;
-                var $messages = array();
+                var $messages;
                 var $show_upload_boxes;
 
@@ -86 +86 @@
                 function uifilemanager()
                 {
-                        //                      error_reporting(8);
+                        $this->messages = &$_SESSION['phpgw_info']['filemanager']['user']['messages'];
+
                         $GLOBALS['phpgw']->browser = CreateObject('phpgwapi.browser');
 
@@ -124 +125 @@
                                 'sortby'        => array('sortby' => ''),
                                 'messages'      => array('messages'     => ''),
-                                'show_upload_boxes'     => array('show_upload_boxes' => '')
+                                'show_upload_boxes'     => array('show_upload_boxes' => ''),
+                                'to' => array('to' => '')
+
                         );
 
@@ -591 +594 @@
                                         foreach($this->messages as $msg)
                                         {
-                                                $messages.='<p>'.$msg.'</p>';
-                                        }
-                                }
-
+                                                $messages.='<span>'.$msg.'</span>';
+                                        }
+                                }
+                                $this->messages = NULL;
+                                
                                 $vars[messages]=$messages;
 
@@ -696 +700 @@
                                                 }
                                                 $link=$this->encode_href('/index.php','menuaction=filemanager.vfs_functions.setRestricted','file='.$files['name'].'&path='.$this->path);
-                                                $minibar_data = '<img id="restrict_'.$files['name'].'" onClick="cExecute(\''.$link.'\',setRestricted)" alt="'.lang("mark as restricted").'" title="'.lang("mark as restricted").'" src="'.$image.'">';
+                                                $minibar_data = '<img id="restrict_'.$files['name'].'" onClick="setRestricted(\''.$link.'\')" alt="'.lang("mark as restricted").'" title="'.lang("mark as restricted").'" src="'.$image.'">';
                                         }
 
@@ -1102 +1106 @@
                 function moveTo()
                 {
-                        if(!$this->todir)
+                        if(!$this->to)
                         {
                                 $this->messages[] = lang('Error:').lang('Could not move file because no destination directory is given ', $this->disppath.'/'.$file);
@@ -1114 +1118 @@
                                         if($this->bo->vfs->mv(array(
                                                 'from'  => $file,
-                                                'to'    => $this->todir . '/' . $file,
+                                                'to'    => $this->to . '/' . $file,
                                                 'relatives'     => array(RELATIVE_ALL, RELATIVE_NONE)
                                         )))
                                         {
                                                 $moved++;
-                                                $this->messages[]=lang('Moved %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[]=lang('Moved %1 to %2', $this->disppath.'/'.$file, $this->to.'/'.$file);
                                         }
                                         else
                                         {
-                                                $this->messages[] = lang('Error:').lang('Could not move %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[] = lang('Error:').lang('Could not move %1 to %2', $this->disppath.'/'.$file, $this->to.'/'.$file);
                                         }
                                 }
@@ -1140 +1144 @@
                 function copyTo()
                 {
-                        if(!$this->todir)
+                        if(!$this->to)
                         {
                                 $this->messages[] = lang('Error:').lang('Could not copy file because no destination directory is given ', $this->disppath.'/'.$file);
@@ -1151 +1155 @@
                                         if($this->bo->vfs->cp(array(
                                                 'from'  => $file,
-                                                'to'    => $this->todir . '/' . $file,
+                                                'to'    => $this->to . '/' . $file,
                                                 'relatives'     => array(RELATIVE_ALL, RELATIVE_NONE)
                                         )))
                                         {
                                                 $copied++;
-                                                $this->messages[] = lang('Copied %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[] = lang('Copied %1 to %2', $this->disppath.'/'.$file, $this->to.'/'.$file);
                                         }
                                         else
                                         {
-                                                $this->messages[] = lang('Error:').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->to.'/'.$file);
                                         }
                                 }
@@ -1531 +1535 @@
                                         return;
                                 }
-                                $_SESSION['debug'][] = $ls_array;
                                 if($ls_array[0]['mime_type'])
                                 {

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";
+
                 }
         }