summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG8
-rw-r--r--program/include/rcube_imap.php32
-rw-r--r--program/js/app.js85
-rw-r--r--program/steps/settings/manage_folders.inc100
4 files changed, 124 insertions, 101 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f0cbe5b83..b9cfdf13a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/05/30 (alec)
+----------
+- Support for subfolders in default/protected folders (#1484665)
+
+2008/05/29 (alec)
+----------
+- Polish localization folder renamed to pl_PL
+
2008/05/28 (alec)
----------
- Fixed sorting of folders with non-ascii characters
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 12cce6e2e..ee2eafe6f 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2489,10 +2489,12 @@ class rcube_imap
*/
function _sort_mailbox_list($a_folders)
{
- $a_out = $a_defaults = array();
+ $a_out = $a_defaults = $folders = $subfolders = array();
+
+ $delimiter = $this->get_hierarchy_delimiter();
// find default folders and skip folders starting with '.'
- foreach($a_folders as $i => $folder)
+ foreach ($a_folders as $i => $folder)
{
if ($folder{0}=='.')
continue;
@@ -2500,15 +2502,31 @@ class rcube_imap
if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
$a_defaults[$p] = $folder;
else
- {
- $l_folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF-7'));
- }
+ $folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF-7'));
}
- asort($l_folders, SORT_LOCALE_STRING);
+ asort($folders, SORT_LOCALE_STRING);
ksort($a_defaults);
- return array_merge($a_defaults, array_keys($l_folders));
+ $folders = array_merge($a_defaults, array_keys($folders));
+
+ // finally we must rebuild the list to move
+ // subfolders of default folders to their place
+ while (list($key, $folder) = each($folders)) {
+ $a_out[] = $folder;
+ unset($folders[$key]);
+ if (in_array(strtolower($folder), $this->default_folders_lc)) {
+ foreach ($folders as $idx => $f) {
+ if (strpos($f, $folder.$delimiter) === 0) {
+ $a_out[] = $f;
+ unset($folders[$idx]);
+ }
+ }
+ reset($folders);
+ }
+ }
+
+ return $a_out;
}
/**
diff --git a/program/js/app.js b/program/js/app.js
index 808c58597..bebf561a7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2575,12 +2575,13 @@ function rcube_webmail()
var row, folder;
var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
- if (this.drag_active && (row = document.getElementById(id)))
+ if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
(folder = this.env.subscriptionrows[id][0]))
{
if (this.check_droptarget(folder) &&
- (folder != this.env.folder.replace(reg, '')) &&
+ !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
+ (folder != this.env.folder.replace(reg, '')) &&
(!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))))
{
this.set_env('dstfolder', folder);
@@ -2612,8 +2613,7 @@ function rcube_webmail()
var id, folder;
if ((id = list.get_single_selection()) &&
this.env.subscriptionrows['rcmrow'+id] &&
- (folder = this.env.subscriptionrows['rcmrow'+id][0]) &&
- (find_in_array(this.env.defaultfolders, folder)!=0))
+ (folder = this.env.subscriptionrows['rcmrow'+id][0]))
this.set_env('folder', folder);
else
this.set_env('folder', null);
@@ -2665,20 +2665,20 @@ function rcube_webmail()
var temp, row, form;
// reset current renaming
- if (temp = this.edit_folder)
- {
- this.reset_folder_rename();
- if (temp == id)
- return;
- }
+ if (temp = this.edit_folder)
+ {
+ this.reset_folder_rename();
+ if (temp == id)
+ return;
+ }
if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id)))
{
var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
this.name_input = document.createElement('INPUT');
- this.name_input.value = this.env.subscriptionrows[id][1].replace(reg, '');
+ this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.style.width = '100%';
-
+
reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
@@ -2697,11 +2697,9 @@ function rcube_webmail()
this.reset_folder_rename = function()
{
var cell = this.name_input ? this.name_input.parentNode : null;
+
if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
- {
- var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
- cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1].replace(reg, '    ');
- }
+ cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1];
this.edit_folder = null;
};
@@ -2744,20 +2742,20 @@ function rcube_webmail()
if (this.gui_objects.createfolderhint)
this.gui_objects.createfolderhint.innerHTML = '';
-
}
};
// add a new folder to the subscription list by cloning a folder row
- this.add_folder_row = function(name, display_name, replace)
+ this.add_folder_row = function(name, display_name, replace, before)
{
name = name.replace('\\',"");
if (!this.gui_objects.subscriptionlist)
return false;
+ // find not protected folder
for (var refid in this.env.subscriptionrows)
- if (this.env.subscriptionrows[refid]!=null)
+ if (this.env.subscriptionrows[refid]!=null && !this.env.subscriptionrows[refid][2])
break;
var refrow, form;
@@ -2781,14 +2779,18 @@ function rcube_webmail()
// clone a table row if there are existing rows
var row = this.clone_table_row(refrow);
row.id = id;
- if (replace)
- tbody.replaceChild(row, replace);
+
+ if (before && (before = this.get_folder_row_id(before)))
+ tbody.insertBefore(row, document.getElementById(before));
else
- tbody.appendChild(row);
+ tbody.appendChild(row);
+
+ if (replace)
+ tbody.removeChild(replace);
}
-
+
// add to folder/row-ID map
- this.env.subscriptionrows[row.id] = [name, display_name];
+ this.env.subscriptionrows[row.id] = [name, display_name, 0];
// set folder name
row.cells[0].innerHTML = display_name;
@@ -2812,7 +2814,6 @@ function rcube_webmail()
form.elements['_folder_name'].value = '';
}
- this.sort_subscription_list();
this.init_subscription_list();
if (selection && document.getElementById('rcmrow'+selection))
this.subscription_list.select_row(selection);
@@ -2823,13 +2824,13 @@ function rcube_webmail()
// replace an existing table row with a new folder line
- this.replace_folder_row = function(oldfolder, newfolder, display_name)
+ this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
var id = this.get_folder_row_id(oldfolder);
var row = document.getElementById(id);
// replace an existing table row (if found)
- this.add_folder_row(newfolder, display_name, row);
+ this.add_folder_row(newfolder, display_name, row, before);
// rename folder in rename-folder dropdown
var form, elm;
@@ -2848,7 +2849,7 @@ function rcube_webmail()
form.elements['_folder_newname'].value = '';
}
};
-
+
// remove the table row of a specific mailbox from the table
// (the row will not be removed, just hidden)
@@ -2857,7 +2858,7 @@ function rcube_webmail()
var row;
var id = this.get_folder_row_id(folder);
if (id && (row = document.getElementById(id)))
- row.style.display = 'none';
+ row.style.display = 'none';
// remove folder from rename-folder list
var form;
@@ -2924,32 +2925,6 @@ function rcube_webmail()
return new_row;
};
- // sort subscription folder list
- this.sort_subscription_list = function()
- {
- var index = new Array();
- var tbody = this.gui_objects.subscriptionlist.tBodies[0];
- var swapped = false;
- for (var i = 0; i<tbody.childNodes.length; i++)
- if (this.env.subscriptionrows[tbody.childNodes[i].id]!=null)
- index.push(i);
- for (i = 0; i<(index.length-1); i++)
- {
- var one = tbody.childNodes[index[i]];
- var two = tbody.childNodes[index[i+1]];
- if (this.env.subscriptionrows[one.id][0].toLowerCase()>
- this.env.subscriptionrows[two.id][0].toLowerCase())
- {
- var swap = one.cloneNode(true);
- tbody.replaceChild(swap, two);
- tbody.replaceChild(two, one);
- swapped = true;
- }
- }
- if (swapped)
- this.sort_subscription_list();
- };
-
/*********************************************************/
/********* GUI functionality *********/
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 6c056a147..54d8dfeaa 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -19,7 +19,7 @@
*/
-$OUTPUT->set_pagetitle(rcube_label('folders'));
+// WARNING: folder names in UI are encoded with UTF-8
// init IMAP connection
$RCMAIL->imap_init(true);
@@ -27,21 +27,15 @@ $RCMAIL->imap_init(true);
// subscribe to one or more mailboxes
if ($RCMAIL->action=='subscribe')
{
- if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF-7'))
$IMAP->subscribe(array($mbox));
-
- if ($OUTPUT->ajax_call)
- $OUTPUT->remote_response('// subscribed');
}
// unsubscribe one or more mailboxes
else if ($RCMAIL->action=='unsubscribe')
{
- if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF-7'))
$IMAP->unsubscribe(array($mbox));
-
- if ($OUTPUT->ajax_call)
- $OUTPUT->remote_response('// unsubscribed');
}
// create a new mailbox
@@ -50,7 +44,7 @@ else if ($RCMAIL->action=='create-folder')
if (!empty($_POST['_name']))
{
$name = trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7'));
- // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
+ // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
$name = str_replace('&-', '&', $name);
$create = $IMAP->create_mailbox($name, TRUE);
}
@@ -58,9 +52,15 @@ else if ($RCMAIL->action=='create-folder')
if ($create && $OUTPUT->ajax_call)
{
$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], 'UTF-7') : false;
+
+ $create = rcube_charset_convert($create, 'UTF-7');
$foldersplit = explode($delimiter, $create);
- $display_create = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', substr_count($create, $delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
- $OUTPUT->command('add_folder_row', $create, $display_create);
+ $display_create = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', substr_count($create, $delimiter)) . $foldersplit[count($foldersplit)-1];
+
+ $OUTPUT->command('add_folder_row', $create, $display_create, false, $before);
}
else if (!$create)
{
@@ -73,30 +73,51 @@ else if ($RCMAIL->action=='rename-folder')
{
if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname']))
{
- $name = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, FALSE, 'UTF-7'));
- // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
+ $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, 'UTF-8', 'UTF-7');
+ $oldname = rcube_charset_convert($oldname_utf8, 'UTF-8', 'UTF-7');
+
+ // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
$name = str_replace('&-', '&', $name);
- $rename = $IMAP->rename_mailbox(($oldname = get_input_value('_folder_oldname', RCUBE_INPUT_POST)), $name);
+
+ $rename = $IMAP->rename_mailbox($oldname, $name);
}
if ($rename && $OUTPUT->ajax_call)
{
- $a_mboxes = array_unique(array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed()));
+ $folderlist = $IMAP->list_unsubscribed();
$delimiter = $IMAP->get_hierarchy_delimiter();
- $foldersplit = explode($delimiter, $rename);
- $level = count($foldersplit) - 1;
- $display_rename = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $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))
+ $regexp = '/^' . preg_quote($rename . $delimiter, '/') . '/';
+
+ // subfolders
+ for ($x=sizeof($folderlist)-1; $x>=0; $x--)
+ {
+ if (preg_match($regexp, $folderlist[$x]))
{
- $c_rename = preg_replace('/^'.preg_quote($oldname, '/').'/', $rename, $mbox);
- $foldersplit = explode($delimiter, $c_rename);
+ $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]);
+ $foldersplit = explode($delimiter, $folderlist[$x]);
$level = count($foldersplit) - 1;
- $display_rename = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
- $OUTPUT->command('replace_folder_row', $mbox, $c_rename, $display_rename);
+ $display_rename = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $level)
+ . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+
+ $before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF-7') : false;
+
+ $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF-7'),
+ rcube_charset_convert($folderlist[$x], 'UTF-7'), $display_rename, $before);
}
+ }
+
+ $foldersplit = explode($delimiter, $rename);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
+ $index = array_search($rename, $folderlist);
+ $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF-7') : false;
+
+ $OUTPUT->command('replace_folder_row', $oldname_utf8, rcube_charset_convert($rename, 'UTF-7'),
+ $display_rename, $before);
+
$OUTPUT->command('reset_folder_rename');
}
else if (!$rename && $OUTPUT->ajax_call)
@@ -111,22 +132,23 @@ else if ($RCMAIL->action=='rename-folder')
// delete an existing IMAP mailbox
else if ($RCMAIL->action=='delete-folder')
{
- $a_mboxes = array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed());
+ $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, 'UTF-8', 'UTF-7');
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
+ 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)
{
- $regex = get_input_value('_mboxes', RCUBE_INPUT_POST) . $delimiter;
- $regex = preg_quote($regex, '/');
- if (preg_match('/^'. $regex .'/', $mbox))
+ if (preg_match('/^'. preg_quote($mboxes.$delimiter, '/') .'/', $mbox))
{
- $OUTPUT->command('remove_folder_row', $mbox);
+ $OUTPUT->command('remove_folder_row', rcube_charset_convert($mbox, 'UTF-7'));
}
}
$OUTPUT->show_message('folderdeleted', 'confirmation');
@@ -149,7 +171,6 @@ function rcube_subscription_form($attrib)
list($form_start, $form_end) = get_form_tags($attrib, 'folders');
unset($attrib['form']);
-
if (!$attrib['id'])
$attrib['id'] = 'rcmSubscriptionlist';
@@ -175,7 +196,7 @@ function rcube_subscription_form($attrib)
$a_subscribed = $IMAP->list_mailboxes();
$delimiter = $IMAP->get_hierarchy_delimiter();
$a_js_folders = array();
-
+
$checkbox_subscribe = new html_checkbox(array('name' => '_subscribed[]', 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)"));
if (!empty($attrib['deleteicon']))
@@ -199,9 +220,9 @@ function rcube_subscription_form($attrib)
$level = count($foldersplit) - 1;
$display_folder = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
$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'));
+ $folder_utf8 = rcube_charset_convert($folder, 'UTF-7');
+
+ $a_js_folders['rcmrow'.($i+1)] = array($folder_utf8, $display_folder, $protected);
$out .= sprintf('<tr id="rcmrow%d" class="%s"><td class="name">%s</td><td class="msgcount">%d</td>',
$i+1,
@@ -212,7 +233,7 @@ function rcube_subscription_form($attrib)
if ($protected)
$out .= '<td class="subscribed">&nbsp;'.($subscribed ? '&#x2022;' : '-').'</td>';
else
- $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder:'', array('value' => $folder)).'</td>';
+ $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder_utf8:'', array('value' => $folder_utf8)).'</td>';
// add rename and delete buttons
if (!$protected)
@@ -309,6 +330,7 @@ function rcube_rename_folder_form($attrib)
return $out;
}
+$OUTPUT->set_pagetitle(rcube_label('folders'));
$OUTPUT->include_script('list.js');
// register UI objects