Changeset 524

Timestamp:

07/04/06 14:20:38 (7 years ago)

Author:

koto

Message:

- Added rename file feature for ExtendedFileManager (ticket:818)
- ALT / TITLE attributes for selected images/files in ExtendedFileManager have now file extension stripped off.

Location:

trunk/plugins

Files:

• ExtendedFileManager/Classes/ExtendedFileManager.php (modified) (2 diffs)
• ExtendedFileManager/assets/imagelist.css (modified) (1 diff)
• ExtendedFileManager/assets/images.js (modified) (2 diffs)
• ExtendedFileManager/config.inc.php (modified) (2 diffs)
• ExtendedFileManager/images.php (modified) (7 diffs)
• ExtendedFileManager/img/edit_rename.gif (added)
• ExtendedFileManager/lang/pl.js (modified) (1 diff)
• ImageManager/Classes/Files.php (modified) (2 diffs)
• ImageManager/manager.php (modified) (1 diff)

trunk/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php

@@ -4 +4 @@
  * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
  * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
+ * Package: ExtendedFileManager (EFM 1.1.2)
  * http://www.afrusoft.com/htmlarea
  */
@@ -747 +747 @@
                 }
         }
+
+        /**
+         * Renames files if certain GET variables are set
+         * @return bool
+         */
+        function processRenames()
+        {
+                if(!empty($_GET['rename']) && !empty($_GET['renameTo']))
+                {
+                        // new file name (without path and extension)
+                        $newName = Files::escape(rawurldecode($_GET['renameTo']));
+                        $newName = str_replace('.', '', $newName);
+
+                        // path to file (from base images directory)
+                        $oldName = rawurldecode($_GET['rename']);
+
+                        // strip parent dir ("..") to avoid escaping from base directiory
+                        $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));
+                        }
+                        return $ret;
+                }
+                
+                return null;
+        }
+
 }
 

trunk/plugins/ExtendedFileManager/assets/imagelist.css

@@ -1 +1 @@
 body { margin: 0; padding: 0;}
 .edit   { font-size: 8pt; font-family: small-caption, sans-serif; padding-top: 3px;}
-.edit a { border: none; padding: 3px; text-decoration:none; }
+.edit a { border: none; padding: 0; text-decoration:none; }
 .edit a:hover { background-color: ButtonHighlight; }
 .edit a img { border: none; vertical-align: bottom; }

trunk/plugins/ExtendedFileManager/assets/images.js

@@ -3 +3 @@
  * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
  * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
+ * Package: ExtendedFileManager (EFM 1.1.2)
  * http://www.afrusoft.com/htmlarea
  */
 
 function i18n(str) {
-    return HTMLArea._lc(str, 'ImageManager');
+    return HTMLArea._lc(str, 'ExtendedFileManager');
 }
 
@@ -27 +27 @@
     var viewtype = selection.options[selection.selectedIndex].value;
     location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&newDir="+newDir+"&viewtype="+viewtype;
+}
+
+function renameFile(oldPath) {
+    // strip directory and extension
+    var oldName=oldPath.replace(/.*%2F/,'').replace(/\..*$/,'');
+    var newName = prompt(i18n('Please enter new name for this file...'), oldName);
+
+    if(newName == '' || newName == null || newName == oldName)
+    {
+        alert(i18n('Cancelled rename.'));
+        return false;
+    }
+    var mode=window.top.document.getElementById('manager_mode').value;
+    var selection = window.top.document.getElementById('dirPath');
+    var dir = selection.options[selection.selectedIndex].value;
+    selection = window.top.document.getElementById('viewtype');
+    var viewtype = selection.options[selection.selectedIndex].value;
+    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&rename="+oldPath+"&renameTo="+newName+"&viewtype="+viewtype;
 }
 

trunk/plugins/ExtendedFileManager/config.inc.php

@@ -4 +4 @@
  * Authors: Wei Zhuo, Afru
  * Version: Updated on 08-01-2005 by Afru
- * Version 1.1.1: Updated on 21-06-2006 by Krzysztof Kotowicz <koto@webworkers.pl>
+ * Version 1.1.2: Updated on 04-07-2006 by Krzysztof Kotowicz <koto@webworkers.pl>
  * Package: ExtendedFileManager
  * http://www.afrusoft.com/htmlarea
@@ -184 +184 @@
 $IMConfig['allow_edit_image'] = true;
 
+/*
+  Possible values: true, false
+
+ TRUE -  Allow the user to rename files.
+
+ FALSE - No rename icon will be displayed.
+
+*/
+$IMConfig['allow_rename'] = true;
 
 /*

trunk/plugins/ExtendedFileManager/images.php

@@ -4 +4 @@
  * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz
  * Version: Updated on 08-01-2005 by Afru
- * Version: Updated on 21-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
+ * Package: ExtendedFileManager (EFM 1.1.2)
  * http://www.afrusoft.com/htmlarea
  */
@@ -21 +21 @@
 //process any file uploads
 $uploadStatus=$manager->processUploads();
+
+//process any file renames
+$renameStatus=$manager->processRenames();
 
 if ($manager->deleteFiles())
@@ -105 +108 @@
                 <tr>
                           <td><img src="<?php print $IMConfig['base_url']; if(is_file('icons/'.$file['ext'].'_small.gif')) echo "icons/".$file['ext']."_small.gif"; else echo $IMConfig['default_listicon']; ?>" alt="" /></td>
-                  <th><a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" <?php if ($insertMode == 'image') { ?> onmouseover="showPreview('<?php echo $file['relative'];?>')" onmouseout="showPreview(window.parent.document.getElementById('f_url').value)" <?php } ?> >
+                  <th><a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" <?php if ($insertMode == 'image') { ?> onmouseover="showPreview('<?php echo $file['relative'];?>')" onmouseout="showPreview(window.parent.document.getElementById('f_url').value)" <?php } ?> >
                                 <?php
                                 if(strlen($entry)>$maxNameLength) echo substr($entry,0,$maxNameLength)."..."; else echo $entry;
@@ -115 +118 @@
                   <td class="actions">
                     <a href="<?php print $IMConfig['backend_url']; ?>__function=images&dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;mode=<?php echo $insertMode;?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" border="0" /></a>
+                                <?php if ($IMConfig['allow_rename']) { ?>
+                    <a href="#" title="Rename" onclick="renameFile('<?php echo rawurlencode($file['relative']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" border="0" /></a>
+                    <?php }  ?>
                                 <?php if($IMConfig['img_library'] && $IMConfig['allow_edit_image'] && $file['image'][0] > 0) { ?>
                     <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" border="0" /></a>
@@ -129 +135 @@
         case 'thumbview': // thumbview is default
         default:
-                $maxFileNameLength=10;
+                $maxFileNameLength=11;
                 $maxFolderNameLength=13;
                 // start of foreach for draw thumbview folders.
@@ -153 +159 @@
                 {
                         $afruimgdimensions=$manager->checkImageSize($file['relative']);
+                        $thisFileNameLength = $maxFileNameLength;
                         ?>
                 <div class="thumb_holder" id="holder_<?php echo asc2hex($entry) ?>">
-                  <a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo $entry; ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>">
+                  <a href="#" class="thumb" style="cursor: pointer;" onclick="selectImage('<?php echo $file['relative'];?>', '<?php echo preg_replace('#\..{3,4}$#', '', $entry); ?>', <?php echo $file['image'][0];?>, <?php echo $file['image'][1]; ?>);return false;" title="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>">
                     <img src="<?php print $manager->getThumbnail($file['relative']); ?>" alt="<?php echo $entry; ?> - <?php echo Files::formatSize($file['stat']['size']); ?>" />
                   </a>
                   <div class="edit">
                     <a href="<?php print $IMConfig['backend_url']; ?>__function=images&amp;mode=<?php echo $insertMode;?>&amp;dir=<?php echo $relative; ?>&amp;delf=<?php echo rawurlencode($file['relative']);?>&amp;viewtype=<?php echo $afruViewType; ?>" title="Trash" onclick="return confirmDeleteFile('<?php echo $entry; ?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_trash.gif" height="15" width="15" alt="Trash" /></a>
-
+                                <?php if ($IMConfig['allow_rename']) { ?>
+                    <a href="#" title="Rename" onclick="renameFile('<?php echo rawurlencode($file['relative']);?>'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_rename.gif" height="15" width="15" alt="Rename" /></a>
+                    <?php $thisFileNameLength -= 3; }  ?>
                         <?php if($IMConfig['img_library'] && $IMConfig['allow_edit_image'] && $file['image'][0] > 0 )
                     { ?>
                     <a href="javascript:;" title="Edit" onclick="editImage('<?php echo rawurlencode($file['relative']);?>');"><img src="<?php print $IMConfig['base_url'];?>img/edit_pencil.gif" height="15" width="15" alt="Edit" /></a>
-                        <?php $maxFileName2=$maxFileNameLength-3;}
-                        else $maxFileName2=$maxFileNameLength; ?>
+                        <?php $thisFileNameLength -= 3; } ?>
 
                         <?php
-                                if(strlen($entry)>$maxFileName2) echo strtolower(substr($entry,0,$maxFileName2))."..."; else echo $entry;
+                                if(strlen($entry) > $thisFileNameLength + 3) echo strtolower(substr($entry,0,$thisFileNameLength))."..."; else echo $entry;
                         ?>
                   </div>
@@ -241 +249 @@
                 <?php
                 if(isset($uploadStatus) && !is_numeric($uploadStatus) && !is_bool($uploadStatus))
-                echo 'alert("'.$uploadStatus.'");';
+                echo 'alert(i18n("'.$uploadStatus.'"));';
                 else if(isset($uploadStatus) && $uploadStatus==false)
                 echo 'alert("Unable to upload File. \nEither Maximum file size ['.($insertMode == 'image' ? $IMConfig['max_filesize_kb_image'] : $IMConfig['max_filesize_kb_link'] ).'Kb] exceeded or\nFolder doesn\'t have write permission.");';
                 ?>
-                
+
+                <?php
+                if(isset($renameStatus) && !is_numeric($renameStatus) && !is_bool($renameStatus))
+                echo 'alert(i18n("'.$renameStatus.'"));';
+                else if(isset($renameStatus) && $renameStatus===false)
+                echo 'alert(i18n("Unable to rename file. File of the same name already exists or\nfolder doesn\'t have write permission."));';
+                ?>
 
                 var topDoc = window.top.document;

trunk/plugins/ExtendedFileManager/lang/pl.js

@@ -95 +95 @@
   "Folder is not empty. Please delete all Files and Subfolders inside.": "Folder nie jest pusty. Najpierw usuń wszystkie pliki i podfoldery tego folderu.",
   "Image Size": "Wymiary",
-  "Other" : "Inne..."
+  "Other" : "Inne...",
+  "Rename": "Zmień nazwę",
+  "Please enter new name for this file...": "Podaj nowÄ
+ nazwę dla tego pliku...",
+  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Nie mogłem zmienić nazwy pliku. Plik o nowej nazwie juÅŒ istnieje\nlub prak praw zapisu do katalogu.",
+  "Cancelled rename.": "Anulowano zmianę nazwy pliku."
 };

trunk/plugins/ImageManager/Classes/Files.php

@@ -90 +90 @@
          * @return string the escaped safe filename
          */
-        function escape($filename) 
+        function escape($filename)
         {
                 Return preg_replace('/[^\w\._]/', '_', $filename);
@@ -239 +239 @@
                 return $size;
         }
+        
+        /**
+         * Renames file, preserving its directory and extension
+         * @param string $oldPath path to the old existing file
+         * @param string new filename (just the name, without path or extension)
+         * @author Krzysztof Kotowicz <koto@webworkers.pl>
+         */
+        function renameFile($oldPath, $newName) {
+
+                if(!(file_exists($oldPath) && is_file($oldPath)))
+                        return FILE_ERROR_NO_SOURCE;
+
+                $oldFileParts = pathinfo($oldPath);
+
+                $newPath = $oldFileParts['dirname'] . '/'
+                                   . $newName
+                                   . (!empty($oldFileParts['extension']) ? '.' . $oldFileParts['extension'] : '');
+
+                if (file_exists($newPath))
+                        return false;
+
+                if (!rename($oldPath, $newPath))
+                        return FILE_ERROR_COPY_FAILED;
+
+        }
 
 }

trunk/plugins/ImageManager/manager.php

@@ -151 +151 @@
 
   <tr>
-    <th align="left">Align:</th>
+    <th align="left">Alignment:</th>
     <td colspan="2">
       <select size="1" id="f_align"  title="Positioning of this image">