From e70d6ea64e711096af36b1234f8545b870ea5f45 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 05 Apr 2008 08:49:21 -0400
Subject: [PATCH] Apply changes from trunk to 0.1-stable
---
program/steps/settings/manage_folders.inc | 205 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 139 insertions(+), 66 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index dd321f0..9cf188a 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: |
@@ -22,80 +22,118 @@
// init IMAP connection
rcmail_imap_init(TRUE);
+$OUTPUT->include_script('list.js');
+
// subscribe to one or more mailboxes
if ($_action=='subscribe')
{
- if (strlen($_GET['_mboxes']))
- $IMAP->subscribe(array($_GET['_mboxes']));
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ $IMAP->subscribe(array($mbox));
- if ($REMOTE_REQUEST)
- rcube_remote_response('// subscribed');
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->remote_response('// subscribed');
}
// unsubscribe one or more mailboxes
else if ($_action=='unsubscribe')
{
- if (strlen($_GET['_mboxes']))
- $IMAP->unsubscribe(array($_GET['_mboxes']));
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ $IMAP->unsubscribe(array($mbox));
- if ($REMOTE_REQUEST)
- rcube_remote_response('// unsubscribed');
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->remote_response('// unsubscribed');
}
// create a new mailbox
else if ($_action=='create-folder')
{
- if (!empty($_GET['_name']))
- $create = $IMAP->create_mailbox(trim(get_input_value('_name', RCUBE_INPUT_GET)), TRUE);
+ if (!empty($_POST['_name']))
+ $create = $IMAP->create_mailbox(trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7')), TRUE);
- if ($create && $REMOTE_REQUEST)
+ if ($create && $OUTPUT->ajax_call)
{
- $commands = sprintf("this.add_folder_row('%s')", rep_specialchars_output($create, 'js'));
- rcube_remote_response($commands);
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $foldersplit = explode($delimiter, $create);
+ $display_create = str_repeat(' ', substr_count($create, $delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
+ $OUTPUT->command('add_folder_row', $create, $display_create);
+ $OUTPUT->send();
}
- else if (!$create && $REMOTE_REQUEST)
+ else if (!$create && $OUTPUT->ajax_call)
{
- $commands = show_message('errorsaving', 'error');
- rcube_remote_response($commands);
+ $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->remote_response();
}
else if (!$create)
- show_message('errorsaving', 'error');
+ $OUTPUT->show_message('errorsaving', 'error');
}
// rename a mailbox
else if ($_action=='rename-folder')
{
- if (!empty($_GET['_folder_oldname']) && !empty($_GET['_folder_newname']))
- $rename = $IMAP->rename_mailbox(get_input_value('_folder_oldname', RCUBE_INPUT_GET), trim(get_input_value('_folder_newname', RCUBE_INPUT_GET)), TRUE);
+ $a_mboxes = array_unique(array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed()));
+ $delimiter = $IMAP->get_hierarchy_delimiter();
- if ($rename && $REMOTE_REQUEST)
+ if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname']))
+ $rename = $IMAP->rename_mailbox(($oldname = get_input_value('_folder_oldname', RCUBE_INPUT_POST)), trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, FALSE, 'UTF-7')));
+
+ if ($rename && $OUTPUT->ajax_call)
{
- $commands = sprintf("this.add_folder_row('%s');", rep_specialchars_output($rename, 'js'));
- $commands .= sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_folder_oldname'], 'js'));
- rcube_remote_response($commands);
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $foldersplit = explode($delimiter, $rename);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+ $OUTPUT->command('replace_folder_row', $oldname, $rename, $display_rename);
+ foreach ($a_mboxes as $mbox)
+ if (preg_match('/^'.preg_quote($oldname . $delimiter, '/').'/', $mbox))
+ {
+ $c_rename = preg_replace('/^'.preg_quote($oldname, '/').'/', $rename, $mbox);
+ $foldersplit = explode($delimiter, $c_rename);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+ $OUTPUT->command('replace_folder_row', $mbox, $c_rename, $display_rename);
+ }
+ $OUTPUT->command('reset_folder_rename');
+ $OUTPUT->send();
}
- else if (!$rename && $REMOTE_REQUEST)
+ else if (!$rename && $OUTPUT->ajax_call)
{
- $commands = show_message('errorsaving', 'error');
- rcube_remote_response($commands);
+ $OUTPUT->command('reset_folder_rename');
+ $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->send();
}
else if (!$rename)
- show_message('errorsaving', 'error');
+ $OUTPUT->show_message('errorsaving', 'error');
}
// delete an existing IMAP mailbox
else if ($_action=='delete-folder')
{
- if (strlen($_GET['_mboxes']))
- $deleted = $IMAP->delete_mailbox(array($_GET['_mboxes']));
+ $a_mboxes = array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed());
+ $delimiter = $IMAP->get_hierarchy_delimiter();
- if ($REMOTE_REQUEST && $deleted)
- rcube_remote_response(sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_mboxes'], 'js')));
- else if ($REMOTE_REQUEST)
+ if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
+ $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', get_input_value('_mboxes', RCUBE_INPUT_POST));
+ foreach ($a_mboxes as $mbox)
+ {
+ $regex = get_input_value('_mboxes', RCUBE_INPUT_POST) . $delimiter;
+ $regex = preg_quote($regex, '/');
+ if (preg_match('/^'. $regex .'/', $mbox))
+ {
+ $OUTPUT->command('remove_folder_row', $mbox);
+ }
+ }
+ $OUTPUT->show_message('folderdeleted', 'confirmation');
+ $OUTPUT->send();
+ }
+ else if ($OUTPUT->ajax_call)
+ {
+ $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->send();
}
}
@@ -104,7 +142,7 @@
// 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']);
@@ -121,42 +159,69 @@
// add table header
$out .= "<thead><tr>\n";
- $out .= sprintf('<td>%s</td><td>%s</td><td></td>', rcube_label('foldername'), rcube_label('subscribed'));
+ $out .= sprintf('<td class="name">%s</td><td class="msgcount">%s</td><td class="subscribed">%s</td>'.
+ '<td class="rename"> </td><td class="delete"> </td>',
+ rcube_label('foldername'), rcube_label('messagecount'), rcube_label('subscribed'));
+
$out .= "\n</tr></thead>\n<tbody>\n";
// get folders from server
+ $IMAP->clear_cache('mailboxes');
+
$a_unsubscribed = $IMAP->list_unsubscribed();
$a_subscribed = $IMAP->list_mailboxes();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
$a_js_folders = array();
- $checkbox_subscribe = new checkbox(array('name' => '_subscribed[]', 'onclick' => "$JS_OBJECT_NAME.command(this.checked?'subscribe':'unsubscribe',this.value)"));
+ $checkbox_subscribe = new checkbox(array('name' => '_subscribed[]', 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)"));
- if ($attrib['deleteicon'])
- $button = sprintf('<img src="%s%s" alt="%s" border="0" />', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete'));
+ if (!empty($attrib['deleteicon']))
+ $del_button = sprintf('<img src="%s%s" alt="%s" border="0" />', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete'));
else
- $button = rcube_label('delete');
+ $del_button = rcube_label('delete');
+ if (!empty($attrib['renameicon']))
+ $edit_button = sprintf('<img src="%s%s" alt="%s" border="0" />', $CONFIG['skin_path'], $attrib['renameicon'], rcube_label('rename'));
+ else
+ $del_button = rcube_label('rename');
// create list of available folders
foreach ($a_unsubscribed as $i => $folder)
{
- if ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']))
- continue;
-
+ $subscribed = in_array($folder, $a_subscribed);
+ $protected = ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']));
$zebra_class = $i%2 ? 'even' : 'odd';
- $folder_js = rep_specialchars_output($folder, 'js');
- $a_js_folders['rcmrow'.($i+1)] = $folder_js;
+ $folder_js = JQ($folder);
+ $foldersplit = explode($delimiter, $folder);
+ $level = count($foldersplit) - 1;
+ $display_folder = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+ $folder_html = $CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders']) ? rcmail_localize_foldername($folder) : $display_folder;
+
+ if (!$protected)
+ $a_js_folders['rcmrow'.($i+1)] = array($folder, rcube_charset_convert($folder, 'UTF-7'));
- $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>',
+ $out .= sprintf('<tr id="rcmrow%d" class="%s"><td class="name">%s</td><td class="msgcount">%d</td>',
$i+1,
$zebra_class,
- rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7', 'UTF-8'), 'html', 'all'),
- $checkbox_subscribe->show(in_array($folder, $a_subscribed)?$folder:'', array('value' => $folder)),
- $JS_OBJECT_NAME,
- $folder_js,
- rcube_label('deletefolder'),
- $button);
+ Q($folder_html),
+ $IMAP->messagecount($folder));
+
+ if ($protected)
+ $out .= '<td class="subscribed"> '.($subscribed ? '•' : '-').'</td>';
+ else
+ $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder:'', array('value' => $folder)).'</td>';
+
+ // add rename and delete buttons
+ if (!$protected)
+ $out .= sprintf('<td class="rename"><a href="#rename" title="%s">%s</a>'.
+ '<td class="delete"><a href="#delete" title="%s">%s</a></td>',
+ rcube_label('renamefolder'),
+ $edit_button,
+ rcube_label('deletefolder'),
+ $del_button);
+ else
+ $out .= '<td></td><td></td>';
$out .= "</tr>\n";
}
@@ -164,10 +229,10 @@
$out .= "</tbody>\n</table>";
$out .= "\n$form_end";
-
- $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;
}
@@ -175,11 +240,13 @@
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";
@@ -191,7 +258,7 @@
{
$button = new input_field(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();
}
@@ -202,7 +269,7 @@
function rcube_rename_folder_form($attrib)
{
- global $CONFIG, $IMAP, $JS_OBJECT_NAME;
+ global $CONFIG, $IMAP;
list($form_start, $form_end) = get_form_tags($attrib, 'rename-folder');
unset($attrib['form']);
@@ -231,19 +298,25 @@
{
$button = new input_field(array('type' => 'button',
'value' => rcube_label('rename'),
- 'onclick' => "$JS_OBJECT_NAME.command('rename-folder',this.form)"));
+ 'onclick' => JS_OBJECT_NAME.".command('rename-folder',this.form)"));
$out .= $button->show();
}
$out .= "\n$form_end";
-
+
return $out;
}
+// 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');
+rcube_add_label('deletefolderconfirm','addsubfolderhint');
-
-parse_template('managefolders');
+$OUTPUT->send('managefolders');
?>
--
Gitblit v1.9.1