From 745b1466fc76d5ded589e2469328086002430c1c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 22 Feb 2006 16:58:00 -0500
Subject: [PATCH] Updated localizations
---
program/steps/settings/manage_folders.inc | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 04b2a46..6f49018 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -19,8 +19,6 @@
*/
-require_once('lib/utf7.inc');
-
// init IAMP connection
rcmail_imap_init(TRUE);
@@ -29,7 +27,7 @@
if ($_action=='subscribe')
{
if (strlen($_GET['_mboxes']))
- $IMAP->subscribe(explode(',', $_GET['_mboxes']));
+ $IMAP->subscribe(array($_GET['_mboxes']));
if ($_GET['_remote'])
rcube_remote_response('// subscribed');
@@ -39,7 +37,7 @@
else if ($_action=='unsubscribe')
{
if (strlen($_GET['_mboxes']))
- $IMAP->unsubscribe(explode(',', $_GET['_mboxes']));
+ $IMAP->unsubscribe(array($_GET['_mboxes']));
if ($_GET['_remote'])
rcube_remote_response('// unsubscribed');
@@ -49,7 +47,7 @@
else if ($_action=='create-folder')
{
if (strlen($_GET['_name']))
- $create = $IMAP->create_mailbox(strip_tags(trim($_GET['_name'])), TRUE);
+ $create = $IMAP->create_mailbox(rcube_charset_convert(strip_tags(trim($_GET['_name'])), $OUTPUT->get_charset()), TRUE);
if ($create && $_GET['_remote'])
{
@@ -69,10 +67,15 @@
else if ($_action=='delete-folder')
{
if (strlen($_GET['_mboxes']))
- $IMAP->delete_mailbox(explode(',', $_GET['_mboxes']));
+ $deleted = $IMAP->delete_mailbox(array($_GET['_mboxes']));
- if ($_GET['_remote'])
- rcube_remote_response('// deleted');
+ if ($_GET['_remote'] && $deleted)
+ rcube_remote_response(sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_mboxes'], 'js')));
+ else if ($_GET['_remote'])
+ {
+ $commands = show_message('errorsaving', 'error');
+ rcube_remote_response($commands);
+ }
}
@@ -124,7 +127,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>',
$i+1,
$zebra_class,
- rep_specialchars_output(UTF7DecodeString($folder), 'html', 'all'),
+ 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,
@@ -174,5 +177,9 @@
}
+// add some labels to client
+rcube_add_label('deletefolderconfirm');
+
+
parse_template('managefolders');
?>
\ No newline at end of file
--
Gitblit v1.9.1