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 | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 33d83df..c98de39 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');
@@ -69,7 +67,7 @@
else if ($_action=='delete-folder')
{
if (strlen($_GET['_mboxes']))
- $deleted = $IMAP->delete_mailbox(explode(',', $_GET['_mboxes']));
+ $deleted = $IMAP->delete_mailbox(array($_GET['_mboxes']));
if ($_GET['_remote'] && $deleted)
rcube_remote_response(sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_mboxes'], 'js')));
@@ -129,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,
--
Gitblit v1.9.1