X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ffolder_manip.php;h=49a3a3d3331893efd5eb7cd8ec92fe40325708a5;hb=79a7fdf53a746bcb7e0b18bb58cc5bdc594f4b53;hp=c080f1c77044027d80a8ed12829bcb56abc39400;hpb=51fa8319fff96a2272291ad58274898ba595b270;p=squirrelmail.git

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index c080f1c7..49a3a3d3 100644
--- a/functions/folder_manip.php
+++ b/functions/folder_manip.php
@@ -7,7 +7,7 @@
  * (un)subscribe, create, rename, delete.
  *
  * @author Thijs Kinkhorst <kink at squirrelmail.org>
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -106,7 +106,7 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
     $old = imap_utf7_decode_local($old);
 
     if (strpos($old, $delimiter)) {
-        $old_name = substr($old, strrpos($old, $delimiter)+1, strlen($old));
+        $old_name = substr($old, strrpos($old, $delimiter)+1);
         // hide default prefix (INBOX., mail/ or other)
         $quoted_prefix=preg_quote($default_folder_prefix,'/');
         $prefix_length=(preg_match("/^$quoted_prefix/",$old) ? strlen($default_folder_prefix) : 0);
@@ -124,11 +124,10 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
     sqimap_logout($imapConnection);
 
     $oTemplate->assign('dialog_type', 'rename');
-    $oTemplate->assign('color', $color);
-    $oTemplate->assign('old_parent', htmlspecialchars($old_parent));
-    $oTemplate->assign('old', htmlspecialchars($old));
-    $oTemplate->assign('old_name', htmlspecialchars($old_name));
-    $oTemplate->assign('isfolder', $isfolder);
+    $oTemplate->assign('parent_folder', htmlspecialchars($old_parent));
+    $oTemplate->assign('current_full_name', htmlspecialchars($old));
+    $oTemplate->assign('current_folder_name', htmlspecialchars($old_name));
+    $oTemplate->assign('is_folder', $isfolder);
     
     $oTemplate->display('folder_manip_dialog.tpl');
     $oTemplate->display('footer.tpl');
@@ -199,7 +198,6 @@ function folders_delete_ask ($imapConnection, $folder_name)
     sqimap_logout($imapConnection);
 
     $oTemplate->assign('dialog_type', 'delete');
-    $oTemplate->assign('color', $color);
     $oTemplate->assign('folder_name', htmlspecialchars($folder_name));
     $oTemplate->assign('visible_folder_name', htmlspecialchars($visible_folder_name));