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 | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 84e9928..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-2007, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -28,8 +28,8 @@
// subscribe to one or more mailboxes
if ($_action=='subscribe')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
- $IMAP->subscribe($mboxes);
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ $IMAP->subscribe(array($mbox));
if ($OUTPUT->ajax_call)
$OUTPUT->remote_response('// subscribed');
@@ -38,8 +38,8 @@
// unsubscribe one or more mailboxes
else if ($_action=='unsubscribe')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
- $IMAP->unsubscribe($mboxes);
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ $IMAP->unsubscribe(array($mbox));
if ($OUTPUT->ajax_call)
$OUTPUT->remote_response('// unsubscribed');
@@ -71,7 +71,7 @@
// rename a mailbox
else if ($_action=='rename-folder')
{
- $a_mboxes = array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed());
+ $a_mboxes = array_unique(array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed()));
$delimiter = $IMAP->get_hierarchy_delimiter();
if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname']))
@@ -85,9 +85,9 @@
$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))
+ if (preg_match('/^'.preg_quote($oldname . $delimiter, '/').'/', $mbox))
{
- $c_rename = preg_replace('/^'.preg_quote($oldname).'/', $rename, $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');
@@ -119,8 +119,14 @@
{
$OUTPUT->command('remove_folder_row', get_input_value('_mboxes', RCUBE_INPUT_POST));
foreach ($a_mboxes as $mbox)
- if (preg_match('/^'.preg_quote(get_input_value('_mboxes', RCUBE_INPUT_POST).$delimiter).'/', $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();
}
@@ -153,9 +159,9 @@
// add table header
$out .= "<thead><tr>\n";
- $out .= sprintf('<td class="name">%s</td><td class="subscribed">%s</td>'.
+ $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('subscribed'));
+ rcube_label('foldername'), rcube_label('messagecount'), rcube_label('subscribed'));
$out .= "\n</tr></thead>\n<tbody>\n";
@@ -190,37 +196,28 @@
$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']) ? rcube_label(strtolower($folder)) : $display_folder;
+ $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"' .
- ' onmouseover="return %s.focus_subscription(\'%s\')"' .
- ' onmouseout="return %s.unfocus_subscription(\'%s\')"><td>%s</td>',
+ $out .= sprintf('<tr id="rcmrow%d" class="%s"><td class="name">%s</td><td class="msgcount">%d</td>',
$i+1,
$zebra_class,
- JS_OBJECT_NAME,
- $folder_js,
- JS_OBJECT_NAME,
- $folder_js,
- Q($folder_html));
+ Q($folder_html),
+ $IMAP->messagecount($folder));
if ($protected)
- $out .= '<td> '.($subscribed ? '•' : '-').'</td>';
+ $out .= '<td class="subscribed"> '.($subscribed ? '•' : '-').'</td>';
else
- $out .= '<td>'.$checkbox_subscribe->show($subscribed?$folder:'', array('value' => $folder)).'</td>';
+ $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder:'', array('value' => $folder)).'</td>';
// add rename and delete buttons
if (!$protected)
- $out .= sprintf('<td><a href="#rename" onclick="%s.command(\'rename-folder\',\'%s\')" title="%s">%s</a>'.
- '<td><a href="#delete" onclick="%s.command(\'delete-folder\',\'%s\')" title="%s">%s</a></td>',
- JS_OBJECT_NAME,
- $folder_js,
+ $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,
- JS_OBJECT_NAME,
- $folder_js,
rcube_label('deletefolder'),
$del_button);
else
@@ -243,9 +240,13 @@
function rcube_create_folder_form($attrib)
{
+ 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";
@@ -302,7 +303,7 @@
}
$out .= "\n$form_end";
-
+
return $out;
}
@@ -315,7 +316,7 @@
));
// add some labels to client
-rcube_add_label('deletefolderconfirm');
+rcube_add_label('deletefolderconfirm','addsubfolderhint');
$OUTPUT->send('managefolders');
?>
--
Gitblit v1.9.1