From c17dc6aa31aaa6e7f61bd25993be55354e428996 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 20 Sep 2008 13:21:15 -0400
Subject: [PATCH] #1485385: fix missing close form tag
---
program/steps/settings/manage_folders.inc | 339 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 252 insertions(+), 87 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 33d83df..28d02df 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -5,7 +5,7 @@
| program/steps/settings/manage_folders.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,157 +19,274 @@
*/
-require_once('lib/utf7.inc');
+// WARNING: folder names in UI are encoded with UTF-8
-// init IAMP connection
-rcmail_imap_init(TRUE);
-
+// init IMAP connection
+$RCMAIL->imap_init(true);
// subscribe to one or more mailboxes
-if ($_action=='subscribe')
+if ($RCMAIL->action=='subscribe')
{
- if (strlen($_GET['_mboxes']))
- $IMAP->subscribe(explode(',', $_GET['_mboxes']));
-
- if ($_GET['_remote'])
- rcube_remote_response('// subscribed');
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF-7'))
+ $IMAP->subscribe(array($mbox));
}
// unsubscribe one or more mailboxes
-else if ($_action=='unsubscribe')
+else if ($RCMAIL->action=='unsubscribe')
{
- if (strlen($_GET['_mboxes']))
- $IMAP->unsubscribe(explode(',', $_GET['_mboxes']));
-
- if ($_GET['_remote'])
- rcube_remote_response('// unsubscribed');
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF-7'))
+ $IMAP->unsubscribe(array($mbox));
}
// create a new mailbox
-else if ($_action=='create-folder')
+else if ($RCMAIL->action=='create-folder')
{
- if (strlen($_GET['_name']))
- $create = $IMAP->create_mailbox(strip_tags(trim($_GET['_name'])), TRUE);
-
- if ($create && $_GET['_remote'])
+ if (!empty($_POST['_name']))
{
- $commands = sprintf("this.add_folder_row('%s')", rep_specialchars_output($create, 'js'));
- rcube_remote_response($commands);
+ $name = trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7'));
+ // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
+ $name = str_replace('&-', '&', $name);
+ $create = $IMAP->create_mailbox($name, TRUE);
}
- else if (!$create && $_GET['_remote'])
+
+ if ($create && $OUTPUT->ajax_call)
{
- $commands = show_message('errorsaving', 'error');
- rcube_remote_response($commands);
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $folderlist = $IMAP->list_unsubscribed();
+ $index = array_search($create, $folderlist);
+ $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF-7') : false;
+
+ $create = rcube_charset_convert($create, 'UTF-7');
+ $foldersplit = explode($delimiter, $create);
+ $display_create = str_repeat(' ', substr_count($create, $delimiter)) . $foldersplit[count($foldersplit)-1];
+
+ $OUTPUT->command('add_folder_row', $create, $display_create, false, $before);
}
else if (!$create)
- show_message('errorsaving', 'error');
+ {
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+ }
+
+// rename a mailbox
+else if ($RCMAIL->action=='rename-folder')
+ {
+ if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname']))
+ {
+ $name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST));
+ $oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST);
+ $name = rcube_charset_convert($name_utf8, 'UTF-8', 'UTF-7');
+ $oldname = rcube_charset_convert($oldname_utf8, 'UTF-8', 'UTF-7');
+
+ // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
+ $name = str_replace('&-', '&', $name);
+
+ $rename = $IMAP->rename_mailbox($oldname, $name);
+ }
+
+ if ($rename && $OUTPUT->ajax_call)
+ {
+ $folderlist = $IMAP->list_unsubscribed();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+
+ $regexp = '/^' . preg_quote($rename . $delimiter, '/') . '/';
+
+ // subfolders
+ for ($x=sizeof($folderlist)-1; $x>=0; $x--)
+ {
+ if (preg_match($regexp, $folderlist[$x]))
+ {
+ $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]);
+ $foldersplit = explode($delimiter, $folderlist[$x]);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level)
+ . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+
+ $before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF-7') : false;
+
+ $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF-7'),
+ rcube_charset_convert($folderlist[$x], 'UTF-7'), $display_rename, $before);
+ }
+ }
+
+ $foldersplit = explode($delimiter, $rename);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+ $index = array_search($rename, $folderlist);
+ $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF-7') : false;
+
+ $OUTPUT->command('replace_folder_row', $oldname_utf8, rcube_charset_convert($rename, 'UTF-7'), $display_rename, $before);
+
+ $OUTPUT->command('reset_folder_rename');
+ }
+ else if (!$rename && $OUTPUT->ajax_call)
+ {
+ $OUTPUT->command('reset_folder_rename');
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+ else if (!$rename)
+ $OUTPUT->show_message('errorsaving', 'error');
}
// delete an existing IMAP mailbox
-else if ($_action=='delete-folder')
+else if ($RCMAIL->action=='delete-folder')
{
- if (strlen($_GET['_mboxes']))
- $deleted = $IMAP->delete_mailbox(explode(',', $_GET['_mboxes']));
+ $a_mboxes = $IMAP->list_unsubscribed();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+
+ $mboxes_utf8 = get_input_value('_mboxes', RCUBE_INPUT_POST);
+ $mboxes = rcube_charset_convert($mboxes_utf8, 'UTF-8', 'UTF-7');
- if ($_GET['_remote'] && $deleted)
- rcube_remote_response(sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_mboxes'], 'js')));
- else if ($_GET['_remote'])
+ if ($mboxes)
+ $deleted = $IMAP->delete_mailbox(array($mboxes));
+
+ if ($OUTPUT->ajax_call && $deleted)
{
- $commands = show_message('errorsaving', 'error');
- rcube_remote_response($commands);
+ $OUTPUT->command('remove_folder_row', $mboxes_utf8);
+ foreach ($a_mboxes as $mbox)
+ {
+ if (preg_match('/^'. preg_quote($mboxes.$delimiter, '/') .'/', $mbox))
+ {
+ $OUTPUT->command('remove_folder_row', rcube_charset_convert($mbox, 'UTF-7'));
+ }
+ }
+ $OUTPUT->show_message('folderdeleted', 'confirmation');
+ }
+ else if (!$deleted)
+ {
+ $OUTPUT->show_message('errorsaving', 'error');
}
}
+if ($OUTPUT->ajax_call)
+ $OUTPUT->send();
// build table with all folders listed by server
function rcube_subscription_form($attrib)
{
- global $IMAP, $CONFIG, $OUTPUT, $JS_OBJECT_NAME;
+ global $IMAP, $CONFIG, $OUTPUT;
list($form_start, $form_end) = get_form_tags($attrib, 'folders');
unset($attrib['form']);
-
if (!$attrib['id'])
$attrib['id'] = 'rcmSubscriptionlist';
- // allow the following attributes to be added to the <table> tag
- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
-
- $out = "$form_start\n<table" . $attrib_str . ">\n";
-
+ $table = new html_table();
// add table header
- $out .= "<thead><tr>\n";
- $out .= sprintf('<td>%s</td><td>%s</td><td></td>', rcube_label('foldername'), rcube_label('subscribed'));
- $out .= "\n</tr></thead>\n<tbody>\n";
+ $table->add_header('name', rcube_label('foldername'));
+ $table->add_header('msgcount', rcube_label('messagecount'));
+ $table->add_header('subscribed', rcube_label('subscribed'));
+ $table->add_header('rename', ' ');
+ $table->add_header('delete', ' ');
// get folders from server
+ $IMAP->clear_cache('mailboxes');
+
$a_unsubscribed = $IMAP->list_unsubscribed();
$a_subscribed = $IMAP->list_mailboxes();
- $a_js_folders = array();
-
- $checkbox_subscribe = new checkbox(array('name' => '_subscribed[]', 'onclick' => "$JS_OBJECT_NAME.command(this.checked?'subscribe':'unsubscribe',this.value)"));
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $a_js_folders = $seen_folders = $list_folders = array();
- if ($attrib['deleteicon'])
- $button = sprintf('<img src="%s%s" alt="%s" border="0" />', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete'));
- else
- $button = rcube_label('delete');
-
-
- // create list of available folders
- foreach ($a_unsubscribed as $i => $folder)
- {
- $zebra_class = $i%2 ? 'even' : 'odd';
- $folder_js = rep_specialchars_output($folder, 'js');
- $a_js_folders['rcmrow'.($i+1)] = $folder_js;
-
- $out .= sprintf('<tr id="rcmrow%d" class="%s"><td>%s</td><td>%s</td><td><a href="#delete" onclick="%s.command(\'delete-folder\',\'%s\')" title="%s">%s</a></td>',
- $i+1,
- $zebra_class,
- rep_specialchars_output(UTF7DecodeString($folder), 'html', 'all'),
- $checkbox_subscribe->show(in_array($folder, $a_subscribed)?$folder:'', array('value' => $folder)),
- $JS_OBJECT_NAME,
- $folder_js,
- rcube_label('deletefolder'),
- $button);
+ // pre-process folders list
+ foreach ($a_unsubscribed as $i => $folder) {
+ $foldersplit = explode($delimiter, $folder);
+ $name = rcube_charset_convert(array_pop($foldersplit), 'UTF-7');
+ $parent_folder = join($delimiter, $foldersplit);
+ $level = count($foldersplit);
- $out .= "</tr>\n";
+ // add a "virtual" parent folder
+ if ($parent_folder && !$seen[$parent_folder]++) {
+ $parent_name = rcube_charset_convert($foldersplit[$level-1], 'UTF-7');
+ $list_folders[] = array('id' => $parent_folder, 'name' => $parent_name, 'level' => $level-1, 'virtual' => true);
}
+
+ $list_folders[] = array('id' => $folder, 'name' => $name, 'level' => $level);
+ $seen[$folder]++;
+ }
- $out .= "</tbody>\n</table>";
- $out .= "\n$form_end";
+ $checkbox_subscribe = new html_checkbox(array(
+ 'name' => '_subscribed[]',
+ 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
+ ));
+
+ if (!empty($attrib['deleteicon']))
+ $del_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete'), 'border' => 0));
+ else
+ $del_button = rcube_label('delete');
+
+ if (!empty($attrib['renameicon']))
+ $edit_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['renameicon'], 'alt' => rcube_label('rename'), 'border' => 0));
+ else
+ $del_button = rcube_label('rename');
+
+ // create list of available folders
+ foreach ($list_folders as $i => $folder) {
+ $idx = $i + 1;
+ $subscribed = in_array($folder['id'], $a_subscribed);
+ $protected = ($folder['virtual'] || ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders'])));
+ $classes = array($i%2 ? 'even' : 'odd');
+ $folder_js = JQ($folder['id']);
+ $display_folder = str_repeat(' ', $folder['level']) . ($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
+ $folder_utf8 = rcube_charset_convert($folder['id'], 'UTF-7');
+
+ if ($folder['virtual'])
+ $classes[] = 'virtual';
+
+ $table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes)));
+
+ $table->add('name', Q($display_folder));
+ $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id'])));
+ $table->add('subscribed', $protected ? ($subscribed ? ' •' : ' -') :
+ $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''), array('value' => $folder_utf8)));
+
+ // add rename and delete buttons
+ if (!$protected) {
+ $table->add('rename', html::a(array('href' => "#rename", 'title' => rcube_label('renamefolder')), $edit_button));
+ $table->add('delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder')), $del_button));
+ }
+ else {
+ $table->add(null, '');
+ $table->add(null, '');
+ }
+
+ $a_js_folders['rcmrow'.$idx] = array($folder_utf8, $display_folder, $protected);
+ }
- $javascript = sprintf("%s.gui_object('subscriptionlist', '%s');\n", $JS_OBJECT_NAME, $attrib['id']);
- $javascript .= sprintf("%s.set_env('subscriptionrows', %s);", $JS_OBJECT_NAME, array2js($a_js_folders));
- $OUTPUT->add_script($javascript);
+ $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);
+ $OUTPUT->set_env('subscriptionrows', $a_js_folders);
+ $OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']);
+ $OUTPUT->set_env('delimiter', $delimiter);
- return $out;
+ return $form_start . $table->show($attrib) . $form_end;
}
function rcube_create_folder_form($attrib)
{
- global $JS_OBJECT_NAME;
-
+ global $OUTPUT;
+
list($form_start, $form_end) = get_form_tags($attrib, 'create-folder');
unset($attrib['form']);
+ if ($attrib['hintbox'])
+ $OUTPUT->add_gui_object('createfolderhint', $attrib['hintbox']);
// return the complete edit form as table
$out = "$form_start\n";
- $input = new textfield(array('name' => '_folder_name'));
+ $input = new html_inputfield(array('name' => '_folder_name'));
$out .= $input->show();
if (get_boolean($attrib['button']))
{
- $button = new input_field(array('type' => 'button',
+ $button = new html_inputfield(array('type' => 'button',
'value' => rcube_label('create'),
- 'onclick' => "$JS_OBJECT_NAME.command('create-folder',this.form)"));
+ 'onclick' => JS_OBJECT_NAME.".command('create-folder',this.form)"));
$out .= $button->show();
}
@@ -178,10 +295,58 @@
return $out;
}
+function rcube_rename_folder_form($attrib)
+ {
+ global $CONFIG, $IMAP;
+
+ list($form_start, $form_end) = get_form_tags($attrib, 'rename-folder');
+ unset($attrib['form']);
+
+ // return the complete edit form as table
+ $out = "$form_start\n";
+
+ $a_unsubscribed = $IMAP->list_unsubscribed();
+ $select_folder = new html_select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
+
+ foreach ($a_unsubscribed as $i => $folder)
+ {
+ if ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']))
+ continue;
+
+ $select_folder->add($folder);
+ }
+
+ $out .= $select_folder->show();
+
+ $out .= " to ";
+ $inputtwo = new html_inputfield(array('name' => '_folder_newname'));
+ $out .= $inputtwo->show();
+
+ if (get_boolean($attrib['button']))
+ {
+ $button = new html_inputfield(array('type' => 'button',
+ 'value' => rcube_label('rename'),
+ 'onclick' => JS_OBJECT_NAME.".command('rename-folder',this.form)"));
+ $out .= $button->show();
+ }
+
+ $out .= "\n$form_end";
+
+ return $out;
+ }
+
+$OUTPUT->set_pagetitle(rcube_label('folders'));
+$OUTPUT->include_script('list.js');
+
+// register UI objects
+$OUTPUT->add_handlers(array(
+ 'foldersubscription' => 'rcube_subscription_form',
+ 'createfolder' => 'rcube_create_folder_form',
+ 'renamefolder' => 'rcube_rename_folder_form'
+));
// add some labels to client
-rcube_add_label('deletefolderconfirm');
+$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating');
-
-parse_template('managefolders');
-?>
\ No newline at end of file
+$OUTPUT->send('managefolders');
+?>
--
Gitblit v1.9.1