From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/steps/settings/manage_folders.inc | 368 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 249 insertions(+), 119 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 0d430ca..6664478 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-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,222 +19,329 @@
*/
+// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
+
// init IMAP connection
-rcmail_imap_init(TRUE);
-
-$OUTPUT->include_script('list.js');
-
+$RCMAIL->imap_connect();
// subscribe to one or more mailboxes
-if ($_action=='subscribe')
+if ($RCMAIL->action=='subscribe')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
- $IMAP->subscribe($mboxes);
-
- if ($OUTPUT->ajax_call)
- $OUTPUT->remote_response('// subscribed');
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF7-IMAP'))
+ $IMAP->subscribe(array($mbox));
}
// unsubscribe one or more mailboxes
-else if ($_action=='unsubscribe')
+else if ($RCMAIL->action=='unsubscribe')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
- $IMAP->unsubscribe($mboxes);
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF7-IMAP'))
+ $IMAP->unsubscribe(array($mbox));
+ }
- if ($OUTPUT->ajax_call)
- $OUTPUT->remote_response('// unsubscribed');
+// enable threading for one or more mailboxes
+else if ($RCMAIL->action=='enable-threading')
+ {
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF7-IMAP'))
+ rcube_set_threading($mbox, true);
+ }
+
+// enable threading for one or more mailboxes
+else if ($RCMAIL->action=='disable-threading')
+ {
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF7-IMAP'))
+ rcube_set_threading($mbox, false);
}
// create a new mailbox
-else if ($_action=='create-folder')
+else if ($RCMAIL->action=='create-folder')
{
if (!empty($_POST['_name']))
- $create = $IMAP->create_mailbox(trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7')), TRUE);
-
+ {
+ $name = trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF7-IMAP'));
+ $create = $IMAP->create_mailbox($name, TRUE);
+ }
+
if ($create && $OUTPUT->ajax_call)
{
- $foldersplit = explode($IMAP->delimiter, $create);
- $display_create = str_repeat(' ', substr_count($create, $IMAP->delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
- $OUTPUT->command('add_folder_row', $create, $display_create);
- $OUTPUT->send();
- }
- else if (!$create && $OUTPUT->ajax_call)
- {
- $OUTPUT->show_message('errorsaving', 'error');
- $OUTPUT->remote_response();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $folderlist = $IMAP->list_unsubscribed();
+ $index = array_search($create, $folderlist);
+ $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false;
+
+ $create = rcube_charset_convert($create, 'UTF7-IMAP');
+ $foldersplit = explode($delimiter, $create);
+ $display_create = str_repeat(' ', substr_count($create, $delimiter)) . $foldersplit[count($foldersplit)-1];
+
+ $OUTPUT->command('add_folder_row', $create, $display_create, false, $before);
}
else if (!$create)
+ {
$OUTPUT->show_message('errorsaving', 'error');
+ }
}
// rename a mailbox
-else if ($_action=='rename-folder')
+else if ($RCMAIL->action=='rename-folder')
{
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')));
-
+ {
+ $name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST));
+ $oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST);
+ $name = rcube_charset_convert($name_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+ $oldname = rcube_charset_convert($oldname_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+
+ $rename = $IMAP->rename_mailbox($oldname, $name);
+ }
+
+ // update per-folder options for modified folder and its subfolders
+ if ($rename) {
+ $a_threaded = $RCMAIL->config->get('message_threading', array());
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $oldprefix = '/^' . preg_quote($oldname . $delimiter, '/') . '/';
+ foreach ($a_threaded as $key => $val)
+ if ($key == $oldname) {
+ unset($a_threaded[$key]);
+ $a_threaded[$name] = true;
+ }
+ else if (preg_match($oldprefix, $key)) {
+ unset($a_threaded[$key]);
+ $a_threaded[preg_replace($oldprefix, $name.$delimiter, $key)] = true;
+ }
+
+ $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
+ }
+
if ($rename && $OUTPUT->ajax_call)
{
- $foldersplit = $IMAP->delimiter ? explode($IMAP->delimiter, $rename) : array($rename);
+ $folderlist = $IMAP->list_unsubscribed();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+
+ $regexp = '/^' . preg_quote($rename . $delimiter, '/') . '/';
+
+ // subfolders
+ for ($x=sizeof($folderlist)-1; $x>=0; $x--)
+ {
+ if (preg_match($regexp, $folderlist[$x]))
+ {
+ $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]);
+ $foldersplit = explode($delimiter, $folderlist[$x]);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level)
+ . rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP');
+
+ $before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF7-IMAP') : false;
+
+ $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF7-IMAP'),
+ rcube_charset_convert($folderlist[$x], 'UTF7-IMAP'), $display_rename, $before);
+ }
+ }
+
+ $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);
+ $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP');
+ $index = array_search($rename, $folderlist);
+ $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false;
+
+ $OUTPUT->command('replace_folder_row', $oldname_utf8, rcube_charset_convert($rename, 'UTF7-IMAP'), $display_rename, $before);
$OUTPUT->command('reset_folder_rename');
- $OUTPUT->send();
}
else if (!$rename && $OUTPUT->ajax_call)
{
$OUTPUT->command('reset_folder_rename');
$OUTPUT->show_message('errorsaving', 'error');
- $OUTPUT->send();
}
else if (!$rename)
$OUTPUT->show_message('errorsaving', 'error');
}
// delete an existing IMAP mailbox
-else if ($_action=='delete-folder')
+else if ($RCMAIL->action=='delete-folder')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
+ $a_mboxes = $IMAP->list_unsubscribed();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+
+ $mboxes_utf8 = get_input_value('_mboxes', RCUBE_INPUT_POST);
+ $mboxes = rcube_charset_convert($mboxes_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+
+ if ($mboxes)
$deleted = $IMAP->delete_mailbox(array($mboxes));
if ($OUTPUT->ajax_call && $deleted)
{
- $OUTPUT->command('remove_folder_row', get_input_value('_mboxes', RCUBE_INPUT_POST));
+ $OUTPUT->command('remove_folder_row', $mboxes_utf8);
+ foreach ($a_mboxes as $mbox)
+ {
+ if (preg_match('/^'. preg_quote($mboxes.$delimiter, '/') .'/', $mbox))
+ {
+ $OUTPUT->command('remove_folder_row', rcube_charset_convert($mbox, 'UTF7-IMAP'));
+ }
+ }
$OUTPUT->show_message('folderdeleted', 'confirmation');
- $OUTPUT->send();
}
- else if ($OUTPUT->ajax_call)
+ else if (!$deleted)
{
$OUTPUT->show_message('errorsaving', 'error');
- $OUTPUT->send();
}
}
+if ($OUTPUT->ajax_call)
+ $OUTPUT->send();
// build table with all folders listed by server
function rcube_subscription_form($attrib)
{
- global $IMAP, $CONFIG, $OUTPUT;
+ global $RCMAIL, $IMAP, $CONFIG, $OUTPUT;
+
+ $threading_supported = $IMAP->get_capability('thread=references')
+ || $IMAP->get_capability('thread=orderedsubject')
+ || $IMAP->get_capability('thread=refs');
list($form_start, $form_end) = get_form_tags($attrib, 'folders');
unset($attrib['form']);
-
if (!$attrib['id'])
$attrib['id'] = 'rcmSubscriptionlist';
- // allow the following attributes to be added to the <table> tag
- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
-
- $out = "$form_start\n<table" . $attrib_str . ">\n";
-
+ $table = new html_table();
// add table header
- $out .= "<thead><tr>\n";
- $out .= sprintf('<td class="name">%s</td><td class="subscribed">%s</td>'.
- '<td class="rename"> </td><td class="delete"> </td>',
- rcube_label('foldername'), rcube_label('subscribed'));
-
- $out .= "\n</tr></thead>\n<tbody>\n";
-
+ $table->add_header('name', rcube_label('foldername'));
+ $table->add_header('msgcount', rcube_label('messagecount'));
+ $table->add_header('subscribed', rcube_label('subscribed'));
+ if ($threading_supported)
+ $table->add_header('threaded', rcube_label('threaded'));
+ $table->add_header('rename', ' ');
+ $table->add_header('delete', ' ');
// get folders from server
$IMAP->clear_cache('mailboxes');
$a_unsubscribed = $IMAP->list_unsubscribed();
$a_subscribed = $IMAP->list_mailboxes();
- $a_js_folders = array();
-
- $checkbox_subscribe = new checkbox(array('name' => '_subscribed[]', 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)"));
+ $a_threaded = $a_threaded_copy = $RCMAIL->config->get('message_threading', array());
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $a_js_folders = $seen_folders = $list_folders = array();
+
+ // pre-process folders list
+ foreach ($a_unsubscribed as $i => $folder) {
+ $foldersplit = explode($delimiter, $folder);
+ $name = rcube_charset_convert(array_pop($foldersplit), 'UTF7-IMAP');
+ $parent_folder = join($delimiter, $foldersplit);
+ $level = count($foldersplit);
+
+ // add any necessary "virtual" parent folders
+ if ($parent_folder && !$seen[$parent_folder]) {
+ for ($i=1; $i<=$level; $i++) {
+ $ancestor_folder = join($delimiter, array_slice($foldersplit, 0, $i));
+ if ($ancestor_folder && !$seen[$ancestor_folder]++) {
+ $ancestor_name = rcube_charset_convert($foldersplit[$i-1], 'UTF7-IMAP');
+ $list_folders[] = array('id' => $ancestor_folder, 'name' => $ancestor_name, 'level' => $i-1, 'virtual' => true);
+ }
+ }
+ }
+
+ unset($a_threaded_copy[$folder]);
+
+ $list_folders[] = array('id' => $folder, 'name' => $name, 'level' => $level);
+ $seen[$folder]++;
+ }
+
+ // remove 'message_threading' option for not existing folders
+ if ($a_threaded_copy) {
+ foreach ($a_threaded_copy as $key => $val)
+ unset($a_threaded[$key]);
+ unset($a_threaded_copy);
+ $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
+ }
+
+ $checkbox_subscribe = new html_checkbox(array(
+ 'name' => '_subscribed[]',
+ 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
+ ));
+ $checkbox_threaded = new html_checkbox(array(
+ 'name' => '_threaded[]',
+ 'onclick' => JS_OBJECT_NAME.".command(this.checked?'enable-threading':'disable-threading',this.value)",
+ ));
if (!empty($attrib['deleteicon']))
- $del_button = sprintf('<img src="%s%s" alt="%s" border="0" />', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete'));
+ $del_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete')));
else
$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'));
+ $edit_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['renameicon'], 'alt' => rcube_label('rename')));
else
- $del_button = rcube_label('rename');
-
+ $edit_button = rcube_label('rename');
+
// create list of available folders
- foreach ($a_unsubscribed as $i => $folder)
- {
- $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 = JQ($folder);
- $foldersplit = $IMAP->delimiter ? explode($IMAP->delimiter, $folder) : array($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;
+ foreach ($list_folders as $i => $folder) {
+ $idx = $i + 1;
+ $subscribed = in_array($folder['id'], $a_subscribed);
+ $threaded = $a_threaded[$folder['id']];
+ $protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders']));
+ $classes = array($i%2 ? 'even' : 'odd');
+ $folder_js = JQ($folder['id']);
+ $display_folder = str_repeat(' ', $folder['level']) . ($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
+ $folder_utf8 = rcube_charset_convert($folder['id'], 'UTF7-IMAP');
- 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>',
- $i+1,
- $zebra_class,
- JS_OBJECT_NAME,
- $folder_js,
- JS_OBJECT_NAME,
- $folder_js,
- Q($folder_html));
-
- if ($protected)
- $out .= '<td> '.($subscribed ? '•' : '-').'</td>';
- else
- $out .= '<td>'.$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,
- rcube_label('renamefolder'),
- $edit_button,
- JS_OBJECT_NAME,
- $folder_js,
- rcube_label('deletefolder'),
- $del_button);
- else
- $out .= '<td></td><td></td>';
+ if ($folder['virtual'])
+ $classes[] = 'virtual';
- $out .= "</tr>\n";
+ $table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes)));
+
+ $table->add('name', Q($display_folder));
+ $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id'], 'ALL', false, false)));
+ $table->add('subscribed', $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''),
+ array('value' => $folder_utf8, 'disabled' => $protected ? 'disabled' : '')));
+ if ($threading_supported) {
+ $table->add('threaded', $folder['virtual'] ? '' :
+ $checkbox_threaded->show(($threaded ? $folder_utf8 : ''), array('value' => $folder_utf8)));
}
+
+ // add rename and delete buttons
+ if (!$protected && !$folder['virtual']) {
+ $table->add('rename', html::a(array('href' => "#rename", 'title' => rcube_label('renamefolder')), $edit_button));
+ $table->add('delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder')), $del_button));
+ }
+ else {
+ $table->add('rename', ' ');
+ $table->add('delete', ' ');
+ }
+
+ $a_js_folders['rcmrow'.$idx] = array($folder_utf8, $display_folder, $protected || $folder['virtual']);
+ }
- $out .= "</tbody>\n</table>";
- $out .= "\n$form_end";
+ rcmail::get_instance()->plugins->exec_hook('folders_list', array('table'=>$table));
$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', $IMAP->delimiter);
+ $OUTPUT->set_env('delimiter', $delimiter);
- return $out;
+ return $form_start . $table->show($attrib) . $form_end;
}
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";
- $input = new textfield(array('name' => '_folder_name'));
+ $input = new html_inputfield(array('name' => '_folder_name'));
$out .= $input->show();
if (get_boolean($attrib['button']))
{
- $button = new input_field(array('type' => 'button',
+ $button = new html_inputfield(array('type' => 'button',
'value' => rcube_label('create'),
'onclick' => JS_OBJECT_NAME.".command('create-folder',this.form)"));
$out .= $button->show();
@@ -256,7 +363,7 @@
$out = "$form_start\n";
$a_unsubscribed = $IMAP->list_unsubscribed();
- $select_folder = new select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
+ $select_folder = new html_select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
foreach ($a_unsubscribed as $i => $folder)
{
@@ -269,22 +376,45 @@
$out .= $select_folder->show();
$out .= " to ";
- $inputtwo = new textfield(array('name' => '_folder_newname'));
+ $inputtwo = new html_inputfield(array('name' => '_folder_newname'));
$out .= $inputtwo->show();
if (get_boolean($attrib['button']))
{
- $button = new input_field(array('type' => 'button',
+ $button = new html_inputfield(array('type' => 'button',
'value' => rcube_label('rename'),
'onclick' => JS_OBJECT_NAME.".command('rename-folder',this.form)"));
$out .= $button->show();
}
$out .= "\n$form_end";
-
+
return $out;
}
+
+// (un)set 'threading' for selected folder
+function rcube_set_threading($mbox, $state=true)
+ {
+ global $RCMAIL;
+ $mbox = (array)$mbox;
+ $a_prefs = (array)$RCMAIL->config->get('message_threading');
+
+ if ($state) {
+ foreach ($mbox as $box)
+ $a_prefs[$box] = true;
+ }
+ else {
+ foreach ($mbox as $box)
+ unset($a_prefs[$box]);
+ }
+
+ $RCMAIL->user->save_prefs(array('message_threading' => $a_prefs));
+ }
+
+
+$OUTPUT->set_pagetitle(rcube_label('folders'));
+$OUTPUT->include_script('list.js');
// register UI objects
$OUTPUT->add_handlers(array(
@@ -294,7 +424,7 @@
));
// add some labels to client
-rcube_add_label('deletefolderconfirm');
+$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating','foldermoving');
$OUTPUT->send('managefolders');
-?>
+
--
Gitblit v1.9.1