Changeset 6eaac22 in github

Timestamp:

May 30, 2008 7:52:15 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

134eafd

Parents:

ea400ed

Message:

• Disallowed delimiter in folder name (#1484803)

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (2 diffs)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/localization/pl_PL/messages.inc (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (1 diff)

CHANGELOG

@@ -5 +5 @@
 ----------
 - Support for subfolders in default/protected folders (#1484665)
+- Disallowed delimiter in folder name (#1484803)
 
 2008/05/29 (alec)

program/js/app.js

@@ -2648 +2648 @@
     var form;
     if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
+      {
       name = form.elements['_folder_name'].value;
-    if (this.env.folder && name != '')
-      name = this.env.folder+this.env.delimiter+name;
-
-    if (name)
+
+      if (name.indexOf(this.env.delimiter)>=0)
+        {
+        alert(this.get_label('forbiddencharacter'));
+        return false;
+        }
+
+      if (this.env.folder && name != '')
+        name = this.env.folder+this.env.delimiter+name;
+
       this.http_post('create-folder', '_name='+urlencode(name), true);
+      }
     else if (form.elements['_folder_name'])
       form.elements['_folder_name'].focus();
@@ -2717 +2725 @@
       if (this.edit_folder && newname)
         {
+        if (newname.indexOf(this.env.delimiter)>=0)
+          {
+          alert(this.get_label('forbiddencharacter'));
+          return false;
+          }
+
         if (this.name_input.__parent)
           newname = this.name_input.__parent + this.env.delimiter + newname;
+        
         this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
         }

program/localization/en_US/messages.inc

@@ -79 +79 @@
 $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
 $messages['addsubfolderhint'] = 'This folder will be created as subfolder of the currently selected one';
+$messages['forbiddencharacter'] = 'Folder name contains forbidden character';
 
 ?>

program/localization/pl_PL/messages.inc

@@ -104 +104 @@
 .';
 $messages['addsubfolderhint'] = 'Ten folder zostanie utworzony jako podfolder aktualnie wybranego.';
+$messages['forbiddencharacter'] = 'Nazwa folderu zawiera niedozwolony znak';
 
 ?>

program/steps/settings/manage_folders.inc

@@ -342 +342 @@
 
 // add some labels to client
-rcube_add_label('deletefolderconfirm','addsubfolderhint');
+rcube_add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter');
 
 $OUTPUT->send('managefolders');