- Disallowed delimiter in folder name (#1484803)

alecpl

2008-05-30 6eaac22d3244763800f4ce8e60bfb5c67f46b710

- Disallowed delimiter in folder name (#1484803)

 CHANGELOG

@@ -4,6 +4,7 @@
2008/05/30 (alec)
----------
- Support for subfolders in default/protected folders (#1484665)
- Disallowed delimiter in folder name (#1484803)

2008/05/29 (alec)
----------

 program/js/app.js

@@ -2647,12 +2647,20 @@

    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();
    };
@@ -2716,8 +2724,15 @@
      var newname = this.name_input ? this.name_input.value : null;
      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

@@ -78,5 +78,6 @@
$messages['errorsendingreceipt'] = 'Could not send the receipt';
$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

@@ -83,5 +83,6 @@
$messages['errorsendingreceipt'] = 'Nie można wysłać potwierdzenia';
$messages['nodeletelastidentity'] = 'Nie można skasować tej tożsamości, ponieważ jest ostatnią.';
$messages['addsubfolderhint'] = 'Ten folder zostanie utworzony jako podfolder aktualnie wybranego.';
$messages['forbiddencharacter'] = 'Nazwa folderu zawiera niedozwolony znak';

?>

 program/steps/settings/manage_folders.inc

@@ -341,7 +341,7 @@
));

// add some labels to client
rcube_add_label('deletefolderconfirm','addsubfolderhint');
rcube_add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter');

$OUTPUT->send('managefolders');
?>