From be2380fb47b05a222ec5b22deff36d5156a8c943 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 13:08:41 -0500
Subject: [PATCH] Added labels for LDAP search
---
program/steps/settings/manage_folders.inc | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 38f9e1a..c98de39 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide functionality to create/delete/rename folders |
@@ -27,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');
@@ -37,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');
@@ -47,11 +47,11 @@
else if ($_action=='create-folder')
{
if (strlen($_GET['_name']))
- $create = $IMAP->create_mailbox(trim($_GET['_name']), TRUE);
+ $create = $IMAP->create_mailbox(strip_tags(trim($_GET['_name'])), TRUE);
if ($create && $_GET['_remote'])
{
- $commands = sprintf("this.add_folder_row('%s')", rep_specialchars_output($_GET['_name'], 'js'));
+ $commands = sprintf("this.add_folder_row('%s')", rep_specialchars_output($create, 'js'));
rcube_remote_response($commands);
}
else if (!$create && $_GET['_remote'])
@@ -67,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);
+ }
}
@@ -122,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($folder, 'html'),
+ 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,
@@ -172,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