Changeset 604 for trunk/plugins/ExtendedFileManager/Classes

Timestamp:

10/29/06 23:53:06 (14 years ago)

Author:

ray

Message:

see Ticket #874

File:

• trunk/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php (modified) (3 diffs)

trunk/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php

@@ -723 +723 @@
         {
                 $fullpath = Files::makePath($this->getImagesDir(),$relative);
-                if($this->countFiles($fullpath) <= 0)
+        //      if($this->countFiles($fullpath) <= 0)
                         return Files::delFolder($fullpath,true); //delete recursively.
-                else
-                        Return false;
+                //else
+                        //Return false;
         }
 
@@ -770 +770 @@
                         $oldName = preg_replace('#\.\.#', '', $oldName);
 
-                        // path to old file
-                        $oldPath = Files::makeFile($this->getImagesDir(), $oldName);
-
-                        $ret = Files::renameFile($oldPath, $newName);
-                        if ($ret === true) {
-                                // delete old thumbnail
-                                Files::delFile($this->getThumbname($oldPath));
+                        if (is_dir($oldPath = Files::makeFile($this->getImagesDir(), $_GET['dir'].$oldName)))
+                        {
+                                $newPath = Files::makeFile($this->getImagesDir(), $_GET['dir'].$newName);
+                                return Files::rename($oldPath,$newPath);
+                        }
+                        else 
+                        {
+                                // path to old file
+                                $oldPath = Files::makeFile($this->getImagesDir(), $oldName);
+        
+                                $ret = Files::renameFile($oldPath, $newName);
+                                if ($ret === true) {
+                                        // delete old thumbnail
+                                        Files::delFile($this->getThumbname($oldPath));
+                                }
                         }
                         return $ret;
@@ -784 +792 @@
         }
 
+        function processPaste()
+        {
+                switch ($_GET['paste'])
+                {
+                        case 'copyFile':
+                                $src = Files::makeFile($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
+                                $file = $_GET['file'];
+                                $dest = Files::makeFile($this->getImagesDir(), $_GET['dir']);
+                                return  Files::copyFile($src,$dest,$file);
+                        break;
+                        case 'copyDir':
+                                $basePath = $this->getImagesDir();
+                                $src = $_GET['srcdir'].$_GET['file'];
+                                $dest = $_GET['dir'].$_GET['file'];
+                                return Files::copyDir($basePath,$src,$dest);
+                        break;
+                        case 'moveFile':
+                                $src = Files::makePath($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
+                                $dest = Files::makePath($this->getImagesDir(), $_GET['dir'].$_GET['file']);
+                                return Files::rename($src,$dest);
+                        break;
+                        case 'moveDir':
+                                $src = Files::makeFile($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
+                                $dest = Files::makeFile($this->getImagesDir(), $_GET['dir'].$_GET['file']);
+                                return Files::rename($src,$dest);
+                        break;
+                }
+        }
 }