diff options
| author | defa <defa@so36.net> | 2012-09-05 14:48:55 +0200 |
|---|---|---|
| committer | defa <defa@so36.net> | 2012-09-05 14:48:55 +0200 |
| commit | 921408eba600a7dc51271c35480e9114cac5ecec (patch) | |
| tree | 8728fecce574a1a70f623311b315360564708360 /program/steps/settings | |
| parent | 5c603c4032bf71792e7accd80e2b7d0e78d445f8 (diff) | |
| parent | e263994adc3f8f331c6167da1665c1920a5142f9 (diff) | |
Merge https://github.com/roundcube/roundcubemail into crypt_hash_branch
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | program/steps/settings/folders.inc | 4 | ||||
| -rw-r--r-- | program/steps/settings/save_folder.inc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 2c2cbdcc2..6ca704998 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -411,8 +411,10 @@ function rcmail_rename_folder($oldname, $newname) $OUTPUT->set_pagetitle(rcube_label('folders')); $OUTPUT->include_script('list.js'); -$OUTPUT->set_env('quota', $STORAGE->get_capability('QUOTA')); $OUTPUT->set_env('prefix_ns', $STORAGE->get_namespace('prefix')); +if ($STORAGE->get_capability('QUOTA')) { + $OUTPUT->set_env('quota', true); +} // add some labels to client $OUTPUT->add_label('deletefolderconfirm', 'purgefolderconfirm', 'folderdeleting', diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc index 09f76ac27..73cc5e4bf 100644 --- a/program/steps/settings/save_folder.inc +++ b/program/steps/settings/save_folder.inc @@ -80,7 +80,10 @@ if (!$error && strlen($path) && (!strlen($old_imap) || $old_imap != $name_imap)) } } -if (!$error) { +if ($error) { + $OUTPUT->command('display_message', $error, 'error'); +} +else { $folder['name'] = $name_imap; $folder['oldname'] = $old_imap; $folder['class'] = ''; |