Changeset 1889 for sandbox/filemanager/inc

Timestamp:

12/23/09 09:51:15 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhoria do FM. melhorias na interface, melhoria na cópia, ao mover e etc...

Location:

sandbox/filemanager/inc

Files:

• class.uifilemanager.inc.php (modified) (2 diffs)
• class.vfs_functions.inc.php (modified) (2 diffs)

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

@@ -477 +477 @@
                         }
 
-                        # main action switch
-                        // FIXME this will become a switch
                         if($this->newfile_x && $this->newfile_or_dir) // create new textfile
                         {
                                 $this->createfile();
-                        }
-                        elseif($this->copy_to_x)
-                        {
-                                $this->copyTo();
-                        }
-                        elseif($this->move_to_x)
-                        {
-                                $this->moveTo();
                         }
                         elseif($this->edit_cancel_x)
@@ -752 +742 @@
                         // end file count
                 }
-
-                # Handle Moving Files and Directories
-                function moveTo()
-                {
-                        if(!$this->to)
-                        {
-                                $this->messages[] = lang('Error:').lang('Could not move file because no destination directory is given ', $this->disppath.'/'.$file);
-
-                        }
-                        else
-                        {
-                                $this->to = $this->bo->fakebase.'/'.$this->to;
-                                while(list($num, $file) = each($this->fileman))
-                                {
-                                        if($this->bo->vfs->mv(array(
-                                                'from'  => $this->from . '/' . $file,
-                                                'to'    => $this->to . '/' . $file,
-                                                'relatives'     => array(RELATIVE_NONE, RELATIVE_NONE)
-                                        )))
-                                        {
-                                                $moved++;
-                                                $this->messages[0]=lang('Files moved to %1 successfuly',$this->to);
-                                        }
-                                        else
-                                        {
-                                                $this->messages[] = lang('Error:').lang('Could not move %1 to %2', $file, $this->to);
-                                        }
-                                }
-                        }
-
-                        if($moved)
-                        {
-                                $x=0;
-                        }
-
-                        $this->readFilesInfo();
-                        $this->filelisting();
-                }
-
-                // Handle Copying of Files and Directories
-                function copyTo()
-                {
-                        if(!$this->to)
-                        {
-                                $this->messages[] = lang('Error:').lang('Could not copy file because no destination directory is given ');
-
-                        }
-                        else
-                        {
-                                $this->to = $this->bo->fakebase.'/'.$this->to;
-                                while(list($num, $file) = each($this->fileman))
-                                {
-                                        if($this->bo->vfs->cp(array(
-                                                'from'  => $this->from . '/' . $file,
-                                                'to'    => $this->to . '/' . $file,
-                                                'relatives'     => array(RELATIVE_NONE, RELATIVE_NONE)
-                                        )))
-                                        {
-                                                $copied++;
-                                                $this->messages[0] = lang('Files Copied to %1 successfuly', $this->to);
-                                        }
-                                        else
-                                        {
-                                                $this->messages[] = lang('Error:').lang('Could not copy %1',$file);
-                                        }
-                                }
-                        }
-                        if($copied)
-                        
-                        {
-                                $x=0;
-                        }
-
-                        $this->readFilesInfo();
-                        $this->filelisting();
-                }
-
                 function removedir()
                 {

sandbox/filemanager/inc/class.vfs_functions.inc.php

@@ -28 +28 @@
                         'archive'=>True,
                         'unarchive'=>True,
+                        'copyto'=>True,
+                        'moveto'=>True,
                         'summary' => True
                 );
@@ -345 +347 @@
                                 }
                 }
+                # Handle Moving Files and Directories
+                function moveto()
+                {
+                        if(!$this->to)
+                        {
+                                echo "NODIR|";
+                                return;
+                        }
+                        else
+                        {
+                                $this->from = base64_decode($this->from);
+                                while(list($num, $file) = each($this->fileman))
+                                {
+                                        if($this->bo->vfs->mv(array(
+                                                'from'  => $this->from . '/' . $file,
+                                                'to'    => $this->to . '/' . $file,
+                                                'relatives'     => array(RELATIVE_NONE, RELATIVE_NONE)
+                                        )))
+                                                $moved++;
+                                        else
+                                                $error++;
+                                }
+                        }
+                        if($error > 0){
+                                echo "SOMEERROR|".$error;
+                                return;
+                        }
+                        if($moved > 0)
+                                echo "MOVED|".$moved;
+                }
+
+                // Handle Copying of Files and Directories
+                function copyto()
+                {
+                        if(!$this->to)
+                        {
+                                echo "NODIR|";
+                                return;
+                        }
+                        else
+                        {
+                                $this->from = base64_decode($this->from);
+                                while(list($num, $file) = each($this->fileman))
+                                {
+                                        if($this->bo->vfs->cp(array(
+                                                'from'  => $this->from . '/' . $file,
+                                                'to'    => $this->to . '/' . $file,
+                                                'relatives'     => array(RELATIVE_NONE, RELATIVE_NONE)
+                                        )))
+                                                $copied++;
+                                        else
+                                                $error++;
+                                }
+                        }
+                        if($error > 0){
+                                echo "SOMEERROR|".$error;
+                                return;
+                        }
+                        if($copied > 0)
+                                echo "COPIED|".$copied;
+                }
+
                 # Handle Renaming Files and Directories
                 function rename()