banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport changes from r5084 to r5090 to release branch

Browse Source
release-0.6
thomascube 13 years ago
parent b1cde954d1
commit b6cd452bd3
9 changed files with 73 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
plugins/acl/acl.js
Unescape Escape View File

@ -1,7 +1,7 @@
/**
* ACL plugin script
*
* @version 0.5
* @version 0.6
* @author Aleksander Machniak <alec@alec.pl>
*/

8
plugins/acl/acl.php
Unescape Escape View File

@ -3,7 +3,7 @@
/**
* Folders Access Control Lists Management (RFC4314, RFC2086)
*
* @version 0.5
* @version 0.6
* @author Aleksander Machniak <alec@alec.pl>
*
*
@ -427,7 +427,7 @@ class acl extends rcube_plugin
*/
private function action_save()
{
$mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true, 'UTF7-IMAP'));
$mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
$user = trim(get_input_value('_user', RCUBE_INPUT_GPC));
$acl = trim(get_input_value('_acl', RCUBE_INPUT_GPC));
$oldid = trim(get_input_value('_old', RCUBE_INPUT_GPC));
@ -464,7 +464,7 @@ class acl extends rcube_plugin
*/
private function action_delete()
{
$mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true, 'UTF7-IMAP'));
$mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); //UTF7-IMAP
$user = trim(get_input_value('_user', RCUBE_INPUT_GPC));
$user = explode(',', $user);
@ -495,7 +495,7 @@ class acl extends rcube_plugin
return;
}
$this->mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true, 'UTF7-IMAP'));
$this->mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
$advanced = trim(get_input_value('_mode', RCUBE_INPUT_GPC));
$advanced = $advanced == 'advanced' ? true : false;

26
program/include/main.inc
Unescape Escape View File

@ -1407,21 +1407,21 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength,
$out = '';
foreach ($arrFolders as $key => $folder) {
if (!empty($exceptions) && in_array($folder['id'], $exceptions)) {
continue;
}
if (!$realnames && ($folder_class = rcmail_folder_classname($folder['id'])))
$foldername = rcube_label($folder_class);
else {
$foldername = $folder['name'];
if (empty($exceptions) || !in_array($folder['id'], $exceptions)) {
if (!$realnames && ($folder_class = rcmail_folder_classname($folder['id'])))
$foldername = rcube_label($folder_class);
else {
$foldername = $folder['name'];
// shorten the folder name to a given length
if ($maxlength && $maxlength>1)
$foldername = abbreviate_string($foldername, $maxlength);
}
// shorten the folder name to a given length
if ($maxlength && $maxlength>1)
$foldername = abbreviate_string($foldername, $maxlength);
$select->add(str_repeat('&nbsp;', $nestLevel*4) . $foldername, $folder['id']);
}
$select->add(str_repeat('&nbsp;', $nestLevel*4) . $foldername, $folder['id']);
else if ($nestLevel)
continue;
if (!empty($folder['folders']))
$out .= rcmail_render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,

22
program/include/rcube_imap.php
Unescape Escape View File

@ -3083,20 +3083,36 @@ class rcube_imap
$a_folders = $this->conn->listMailboxes($root, $name,
NULL, array('SUBSCRIBED'));
// remove non-existent folders
if (is_array($a_folders)) {
// unsubscribe non-existent folders, remove from the list
if (is_array($a_folders) && $name == '*') {
foreach ($a_folders as $idx => $folder) {
if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder])
&& in_array('\\NonExistent', $opts)
) {
$this->conn->unsubscribe($folder);
unset($a_folders[$idx]);
}
}
}
}
}
// retrieve list of folders from IMAP server using LSUB
else {
$a_folders = $this->conn->listSubscribed($root, $name);
// unsubscribe non-existent folders, remove from the list
if (is_array($a_folders) && $name == '*') {
foreach ($a_folders as $idx => $folder) {
if ($this->conn->data['LIST'] && ($opts = $this->conn->data['LIST'][$folder])
&& in_array('\\Noselect', $opts)
) {
// Some servers returns \Noselect for existing folders
if (!$this->mailbox_exists($folder)) {
$this->conn->unsubscribe($folder);
unset($a_folders[$idx]);
}
}
}
}
}
}

2
program/js/app.js
Unescape Escape View File

@ -4432,7 +4432,7 @@ function rcube_webmail()
this.set_photo_actions = function(id)
{
var n, buttons = this.buttons['upload-photo'];
for (n=0; n < buttons && buttons.length; n++)
for (n=0; buttons && n < buttons.length; n++)
$('#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));
$('#ff_photo').val(id);

18
program/steps/settings/folders.inc
Unescape Escape View File

@ -278,9 +278,6 @@ function rcube_subscription_form($attrib)
$display_folder = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $folder['level'])
. Q($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
if ($sub_key !== false)
unset($a_subscribed[$sub_key]);
if ($folder['virtual']) {
$classes[] = 'virtual';
}
@ -317,6 +314,16 @@ function rcube_subscription_form($attrib)
}
}
}
// check if the folder is shared, then disable subscription option on it
if (!$disabled && $folder['virtual'] && !empty($namespace)) {
$tmp_ns = array_merge((array)$namespace['other'], (array)$namespace['shared']);
foreach ($tmp_ns as $item) {
if (strpos($folder['id'], $item[0]) === 0) {
$disabled = true;
break;
}
}
}
$table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes),
'foldername' => $folder['id']));
@ -329,11 +336,6 @@ function rcube_subscription_form($attrib)
Q($display_folder), $protected || $folder['virtual']);
}
// Unsubscribe from non-existing folders
foreach ($a_subscribed as $folder) {
$IMAP->unsubscribe($folder);
}
$RCMAIL->plugins->exec_hook('folders_list', array('table' => $table));
$OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);

25
skins/default/iehacks.css
Unescape Escape View File

@ -9,7 +9,23 @@ input, textarea
body.iframe
{
margin-top: 6px;
margin-top: 0px;
}
body.iframe div.boxcontent
{
margin-top: 20px;
z-index: 2;
}
body.iframe div.boxtitle
{
z-index: 100;
}
body.iframe #prefs-details
{
padding-top: 1px;
}
#login-form form
@ -66,6 +82,11 @@ div.messageheaderbox
margin-top: 0px;
}
body.iframe div.messageheaderbox
{
margin-top: 6px;
}
#abooktoolbar a.buttonPas
{
filter: alpha(opacity=35);
@ -254,7 +275,7 @@ table.records-table thead tr td
#contact-details
{
margin-top: 12px;
margin-top: 20px;
}
#contact-details form {

2
skins/default/templates/error.html
Unescape Escape View File

@ -6,7 +6,7 @@
</head>
<body>
<div id="header"><img src="/images/roundcube_logo.png" alt="<roundcube:object name='productname' />" /></div>
<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div>
<div style="width:400px; margin:60px auto;">
$__page_content

2
skins/default/templates/messageprint.html
Unescape Escape View File

@ -7,7 +7,7 @@
</head>
<body>
<div id="header"><img src="/images/roundcube_logo.png" alt="<roundcube:object name="productname" />" /></div>
<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div>
<div id="printmessageframe">
<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />

Write Preview
Loading…
Cancel
Save