From 1597c8a0c2a8a35fa19ad710d0518ea30c7244c5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 22 Mar 2014 09:55:12 -0400
Subject: [PATCH] Make sure parent folder selector always contains parent folder of current folder, even if it does not exist
---
program/steps/settings/edit_folder.inc | 276 +++++++++++++++++++++++++++++-------------------------
1 files changed, 149 insertions(+), 127 deletions(-)
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 2842b35..6b7bd08 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -5,8 +5,11 @@
| program/steps/settings/edit_folder.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Provide functionality to create/edit a folder |
@@ -14,106 +17,147 @@
+-----------------------------------------------------------------------+
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
-// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
+// register UI objects
+$OUTPUT->add_handlers(array(
+ 'folderdetails' => 'rcmail_folder_form',
+));
-// init IMAP connection
-$RCMAIL->imap_connect();
+$OUTPUT->add_label('nonamewarning');
-function rcube_folder_form($attrib)
+$OUTPUT->send('folderedit');
+
+
+// WARNING: folder names in UI are encoded with RCUBE_CHARSET
+
+function rcmail_folder_form($attrib)
{
global $RCMAIL;
+ $storage = $RCMAIL->get_storage();
+
// edited folder name (empty in create-folder mode)
- $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true));
- $mbox_imap = rcube_charset_convert($mbox, RCMAIL_CHARSET, 'UTF7-IMAP');
+ $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true);
+ $mbox_imap = rcube_charset::convert($mbox, RCUBE_CHARSET, 'UTF7-IMAP');
// predefined path for new folder
- $parent = trim(get_input_value('_path', RCUBE_INPUT_GPC, true));
- $parent_imap = rcube_charset_convert($parent, RCMAIL_CHARSET, 'UTF7-IMAP');
+ $parent = rcube_utils::get_input_value('_path', rcube_utils::INPUT_GPC, true);
+ $parent_imap = rcube_charset::convert($parent, RCUBE_CHARSET, 'UTF7-IMAP');
- $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
- $special = (strlen($mbox_imap) && in_array($mbox_imap, (array) $RCMAIL->config->get('default_imap_folders')));
- $protected = ($special && $RCMAIL->config->get('protect_default_folders'));
- $threading_supported = $RCMAIL->imap->get_capability('THREAD');
+ $threading_supported = $storage->get_capability('THREAD');
+ $delimiter = $storage->get_hierarchy_delimiter();
- // Get mailbox stats (messages count, etc.), mailbox name and parent
+ // Get mailbox parameters
if (strlen($mbox)) {
- $msgcount = $RCMAIL->imap->messagecount($mbox_imap, 'ALL', true, false);
+ $options = rcmail_folder_options($mbox_imap);
+ $namespace = $storage->get_namespace();
$path = explode($delimiter, $mbox_imap);
$folder = array_pop($path);
$path = implode($delimiter, $path);
-
- $folder = rcube_charset_convert($folder, 'UTF7-IMAP');
+ $folder = rcube_charset::convert($folder, 'UTF7-IMAP');
$hidden_fields = array('name' => '_mbox', 'value' => $mbox);
}
else {
- $path = $parent_imap;
+ $options = array();
+ $path = $parent_imap;
+
+ // allow creating subfolders of INBOX folder
+ if ($path == 'INBOX') {
+ $path = $storage->mod_folder($path, 'in');
+ }
+ }
+
+ // remove personal namespace prefix
+ if (strlen($path)) {
+ $path_id = $path;
+ $path = $storage->mod_folder($path.$delimiter);
+ if ($path[strlen($path)-1] == $delimiter) {
+ $path = substr($path, 0, -1);
+ }
}
$form = array();
// General tab
$form['props'] = array(
- 'name' => rcube_label('properties'),
+ 'name' => $RCMAIL->gettext('properties'),
);
// Location (name)
- if ($protected)
- $foldername = rcmail_localize_foldername($mbox_imap);
+ if ($options['protected']) {
+ $foldername = str_replace($delimiter, ' » ', rcube::Q($RCMAIL->localize_folderpath($mbox_imap)));
+ }
+ else if ($options['norename']) {
+ $foldername = rcube::Q($folder);
+ }
else {
if (isset($_POST['_name']))
- $folder = trim(get_input_value('_name', RCUBE_INPUT_POST, true));
+ $folder = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
$foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
$foldername = $foldername->show($folder);
- if ($special)
- $foldername .= ' (' . rcmail_localize_foldername($mbox_imap) .')';
+ if ($options['special']) {
+ $foldername .= ' (' . rcube::Q($RCMAIL->localize_foldername($mbox_imap)) .')';
+ }
}
$form['props']['fieldsets']['location'] = array(
- 'name' => rcube_label('location'),
+ 'name' => $RCMAIL->gettext('location'),
'content' => array(
'name' => array(
- 'label' => rcube_label('foldername'),
+ 'label' => $RCMAIL->gettext('foldername'),
'value' => $foldername,
),
),
);
- if (strlen($path)) {
- $radio1 = new html_radiobutton(array('name' => '_parent', 'value' => ''));
- $radio2 = new html_radiobutton(array('name' => '_parent', 'value' => $path));
- $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path;
+ if (!empty($options) && ($options['norename'] || $options['protected'])) {
+ // prevent user from moving folder
+ $hidden_path = new html_hiddenfield(array('name' => '_parent', 'value' => $path));
+ $form['props']['fieldsets']['location']['content']['name']['value'] .= $hidden_path->show();
+ }
+ else {
+ $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path_id;
+ $exceptions = array($mbox_imap);
- $html_path = str_replace($delimiter, ' » ', rcmail_localize_folderpath($path));
+ // Exclude 'prefix' namespace from parent folders list (#1488349)
+ // If INBOX. namespace exists, folders created as INBOX subfolders
+ // will be listed at the same level - selecting INBOX as a parent does nothing
+ if ($prefix = $storage->get_namespace('prefix')) {
+ $exceptions[] = substr($prefix, 0, -1);
+ }
- $folderpath = $radio1->show($selected) . Q(rcube_label('none')) . ' '
- .$radio2->show($selected) . Q($html_path);
+ $select = $RCMAIL->folder_selector(array(
+ 'name' => '_parent',
+ 'noselection' => '---',
+ 'realnames' => false,
+ 'maxlength' => 150,
+ 'unsubscribed' => true,
+ 'skip_noinferiors' => true,
+ 'exceptions' => $exceptions,
+ 'additional' => strlen($selected) ? array($selected) : null,
+ ));
$form['props']['fieldsets']['location']['content']['path'] = array(
- 'label' => rcube_label('parentfolder'),
- 'value' => $folderpath,
+ 'label' => $RCMAIL->gettext('parentfolder'),
+ 'value' => $select->show($selected),
);
}
// Settings
$form['props']['fieldsets']['settings'] = array(
- 'name' => rcube_label('settings'),
+ 'name' => $RCMAIL->gettext('settings'),
);
// Settings: threading
- if ($threading_supported) {
+ if ($threading_supported && ($mbox_imap == 'INBOX' || (!$options['noselect'] && !$options['is_root']))) {
$select = new html_select(array('name' => '_viewmode', 'id' => '_listmode'));
- $select->add(rcube_label('list'), 0);
- $select->add(rcube_label('threads'), 1);
+ $select->add($RCMAIL->gettext('list'), 0);
+ $select->add($RCMAIL->gettext('threads'), 1);
if (isset($_POST['_viewmode'])) {
$value = (int) $_POST['_viewmode'];
@@ -124,38 +168,38 @@
}
$form['props']['fieldsets']['settings']['content']['viewmode'] = array(
- 'label' => rcube_label('listmode'),
+ 'label' => $RCMAIL->gettext('listmode'),
'value' => $select->show($value),
);
}
/*
// Settings: sorting column
$select = new html_select(array('name' => '_sortcol', 'id' => '_sortcol'));
- $select->add(rcube_label('nonesort'), '');
- $select->add(rcube_label('arrival'), 'arrival');
- $select->add(rcube_label('sentdate'), 'date');
- $select->add(rcube_label('subject'), 'subject');
- $select->add(rcube_label('fromto'), 'from');
- $select->add(rcube_label('replyto'), 'replyto');
- $select->add(rcube_label('cc'), 'cc');
- $select->add(rcube_label('size'), 'size');
+ $select->add($RCMAIL->gettext('nonesort'), '');
+ $select->add($RCMAIL->gettext('arrival'), 'arrival');
+ $select->add($RCMAIL->gettext('sentdate'), 'date');
+ $select->add($RCMAIL->gettext('subject'), 'subject');
+ $select->add($RCMAIL->gettext('fromto'), 'from');
+ $select->add($RCMAIL->gettext('replyto'), 'replyto');
+ $select->add($RCMAIL->gettext('cc'), 'cc');
+ $select->add($RCMAIL->gettext('size'), 'size');
$value = isset($_POST['_sortcol']) ? $_POST['_sortcol'] : '';
$form['props']['fieldsets']['settings']['content']['sortcol'] = array(
- 'label' => rcube_label('listsorting'),
+ 'label' => $RCMAIL->gettext('listsorting'),
'value' => $select->show($value),
);
// Settings: sorting order
$select = new html_select(array('name' => '_sortord', 'id' => '_sortord'));
- $select->add(rcube_label('asc'), 'ASC');
- $select->add(rcube_label('desc'), 'DESC');
+ $select->add($RCMAIL->gettext('asc'), 'ASC');
+ $select->add($RCMAIL->gettext('desc'), 'DESC');
$value = isset($_POST['_sortord']) ? $_POST['_sortord'] : '';
$form['props']['fieldsets']['settings']['content']['sortord'] = array(
- 'label' => rcube_label('listorder'),
+ 'label' => $RCMAIL->gettext('listorder'),
'value' => $select->show(),
);
*/
@@ -163,42 +207,55 @@
if (strlen($mbox)) {
// Number of messages
$form['props']['fieldsets']['info'] = array(
- 'name' => rcube_label('info'),
- 'content' => array(
- 'count' => array(
- 'label' => rcube_label('messagecount'),
- 'value' => (int) $msgcount,
- ),
- ),
+ 'name' => $RCMAIL->gettext('info'),
+ 'content' => array()
);
- // Size
- if ($msgcount) {
- // create link with folder-size command
- $onclick = sprintf("return %s.command('folder-size', '%s', this)",
- JS_OBJECT_NAME, JQ($mbox_imap));
- $size = html::a(array('href' => '#', 'onclick' => $onclick, 'id' => 'folder-size'),
- rcube_label('getfoldersize'));
+ if ((!$options['noselect'] && !$options['is_root']) || $mbox_imap == 'INBOX') {
+ $msgcount = $storage->count($mbox_imap, 'ALL', true, false);
+
+ // Size
+ if ($msgcount) {
+ // create link with folder-size command
+ $onclick = sprintf("return %s.command('folder-size', '%s', this)",
+ rcmail_output::JS_OBJECT_NAME, rcube::JQ($mbox_imap));
+ $size = html::a(array('href' => '#', 'onclick' => $onclick,
+ 'id' => 'folder-size'), $RCMAIL->gettext('getfoldersize'));
+ }
+ else {
+ // no messages -> zero size
+ $size = 0;
+ }
+
+ $form['props']['fieldsets']['info']['content']['count'] = array(
+ 'label' => $RCMAIL->gettext('messagecount'),
+ 'value' => (int) $msgcount
+ );
+ $form['props']['fieldsets']['info']['content']['size'] = array(
+ 'label' => $RCMAIL->gettext('size'),
+ 'value' => $size,
+ );
}
- else {
- // no messages -> zero size
- $size = 0;
+
+ // show folder type only if we have non-private namespaces
+ if (!empty($namespace['shared']) || !empty($namespace['others'])) {
+ $form['props']['fieldsets']['info']['content']['foldertype'] = array(
+ 'label' => $RCMAIL->gettext('foldertype'),
+ 'value' => $RCMAIL->gettext($options['namespace'] . 'folder'));
}
- $form['props']['fieldsets']['info']['content']['size'] = array(
- 'label' => rcube_label('size'),
- 'value' => $size,
- );
}
// Allow plugins to modify folder form content
- $plugin = $RCMAIL->plugins->exec_hook('folder_form', array('form' => $form));
+ $plugin = $RCMAIL->plugins->exec_hook('folder_form',
+ array('form' => $form, 'options' => $options,
+ 'name' => $mbox_imap, 'parent_name' => $parent_imap));
$form = $plugin['form'];
// Set form tags and hidden fields
list($form_start, $form_end) = get_form_tags($attrib, 'save-folder', null, $hidden_fields);
- unset($attrib['form']);
+ unset($attrib['form'], $attrib['id']);
// return the complete edit form as table
$out = "$form_start\n";
@@ -208,18 +265,22 @@
if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
$content = '';
foreach ($tab['fieldsets'] as $fieldset) {
- $subcontent = rcmail_get_form_part($fieldset);
+ $subcontent = rcmail_get_form_part($fieldset, $attrib);
if ($subcontent) {
- $content .= html::tag('fieldset', null, html::tag('legend', null, Q($fieldset['name'])) . $subcontent) ."\n";
+ $subcontent = html::tag('legend', null, rcube::Q($fieldset['name'])) . $subcontent;
+ $content .= html::tag('fieldset', null, $subcontent) ."\n";
}
}
}
else {
- $content = rcmail_get_form_part($tab);
+ $content = rcmail_get_form_part($tab, $attrib);
}
- if ($content) {
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
+ if ($content && sizeof($form) > 1) {
+ $out .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) ."\n";
+ }
+ else {
+ $out .= $content ."\n";
}
}
@@ -230,7 +291,7 @@
return $out;
}
-function rcmail_get_form_part($form)
+function rcmail_get_form_part($form, $attrib = array())
{
$content = '';
@@ -238,12 +299,12 @@
$table = new html_table(array('cols' => 2));
foreach ($form['content'] as $col => $colprop) {
$colprop['id'] = '_'.$col;
- $label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);
+ $label = !empty($colprop['label']) ? $colprop['label'] : $RCMAIL->gettext($col);
- $table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], Q($label)));
+ $table->add('title', html::label($colprop['id'], rcube::Q($label)));
$table->add(null, $colprop['value']);
}
- $content = $table->show();
+ $content = $table->show($attrib);
}
else {
$content = $form['content'];
@@ -251,42 +312,3 @@
return $content;
}
-
-function rcmail_localize_folderpath($path)
-{
- global $RCMAIL;
-
- $protect_folders = $RCMAIL->config->get('protect_default_folders');
- $default_folders = (array) $RCMAIL->config->get('default_imap_folders');
- $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
- $path = explode($delimiter, $path);
- $result = array();
-
- foreach ($path as $idx => $dir) {
- $directory = implode($delimiter, array_slice($path, 0, $idx+1));
- if ($protect_folders && in_array($directory, $default_folders)) {
- unset($result);
- $result[] = rcmail_localize_foldername($directory);
- }
- else if ($protect_folders && in_array($dir, $default_folders)) {
- $result[] = rcmail_localize_foldername($dir);
- }
- else {
- $result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
- }
- }
-
- return implode($delimiter, $result);
-}
-
-
-//$OUTPUT->set_pagetitle(rcube_label('folders'));
-
-// register UI objects
-$OUTPUT->add_handlers(array(
- 'folderdetails' => 'rcube_folder_form',
-));
-
-$OUTPUT->add_label('nonamewarning');
-
-$OUTPUT->send('folderedit');
--
Gitblit v1.9.1