Changeset 1732

Timestamp:

12/02/09 10:03:43 (14 years ago)

Author:

amuller

Message:

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

Location:

sandbox/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (4 diffs)
• js/draw_api.js (modified) (3 diffs)

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

@@ -125 +125 @@
                                 'messages'      => array('messages'     => ''),
                                 'show_upload_boxes'     => array('show_upload_boxes' => ''),
+                                'from'  =>      array('from' => ''),
                                 'to' => array('to' => '')
 
@@ -786 +787 @@
                                 {
                                         if($this->bo->vfs->mv(array(
-                                                'from'  => $file,
+                                                'from'  => $this->from . '/' . $file,
                                                 'to'    => $this->to . '/' . $file,
-                                                'relatives'     => array(RELATIVE_ALL, RELATIVE_NONE)
+                                                'relatives'     => array(RELATIVE_NONE, RELATIVE_NONE)
                                         )))
                                         {
                                                 $moved++;
-                                                $this->messages[]=lang('Moved %1 to %2', $this->disppath.'/'.$file, $this->to.'/'.$file);
+                                                $this->messages[]=lang('Moved %1 to %2', $this->from . '/' . $file, $this->to . '/' . $file);
                                         }
                                         else
@@ -824 +825 @@
                                 {
                                         if($this->bo->vfs->cp(array(
-                                                'from'  => $file,
+                                                'from'  => $this->from . '/' . $file,
                                                 'to'    => $this->to . '/' . $file,
-                                                'relatives'     => array(RELATIVE_ALL, RELATIVE_NONE)
+                                                'relatives'     => array(RELATIVE_NONE, RELATIVE_NONE)
                                         )))
                                         {
@@ -834 +835 @@
                                         else
                                         {
-                                                $this->messages[] = lang('Error:').lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->to.'/'.$file);
+                                                $this->messages[] = lang('Error:').lang('Could not copy %1 to %2',$this->from . '/' . $file , $this->to.'/'.$file);
                                         }
                                 }

sandbox/filemanager/js/draw_api.js

@@ -261 +261 @@
                 newpage += fl.td+sp_hd+'comm\')" id="comm">'+get_lang('comment')+'</a>'+sp_tl;
         if (preferences.version =='1') newpage += fl.td+sp_hd+'vers\')" id="vers">'+get_lang('version')+'</a>'+sp_tl+'</tr>';
-
+        if (files != null)
         for (var i=0; i < files.length; i++)
         {
@@ -312 +312 @@
                 if (preferences.version =='1') newpage += fl.td+'<span onclick="loadHistory(\''+files[i].name+'\')">'+files[i].vers+'</span></td></tr>';
         }
+        else
+                newpage = "<b>"+get_lang('no files in this directory.')+"</b>";
         fl.element.innerHTML = newpage;
         header = document.getElementsByName('head');
@@ -476 +478 @@
                                 elements[i]['url'] = address[0]+
                                         "&"+escape(arg)+".x=10"+
+                                        "&from="+base64_encode(currentPath)+
                                         "&to="+base64_encode(inputEl.childNodes[i].innerHTML)+
                                         filesUrl;