projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes attachment links when viewing messages from search results
[squirrelmail.git]
/
functions
/
imap_mailbox.php
diff --git
a/functions/imap_mailbox.php
b/functions/imap_mailbox.php
index aed2c4328fa4beccbc7e29f0e220fc72ce5a0b5d..b220ee6f6042818d0f4b56b9fc7957b30a1aa4d4 100755
(executable)
--- a/
functions/imap_mailbox.php
+++ b/
functions/imap_mailbox.php
@@
-10,8
+10,8
@@
*
* $Id$
*/
*
* $Id$
*/
-require_once(
'../
functions/imap_utf7_encode_local.php');
-require_once(
'../
functions/imap_utf7_decode_local.php');
+require_once(
SM_PATH . '
functions/imap_utf7_encode_local.php');
+require_once(
SM_PATH . '
functions/imap_utf7_decode_local.php');
global $boxesnew;
class mailboxes {
global $boxesnew;
class mailboxes {
@@
-461,8
+461,8
@@
function sqimap_mailbox_list($imap_stream) {
$inbox_in_list = false;
$inbox_subscribed = false;
$inbox_in_list = false;
$inbox_subscribed = false;
- require_once(
'../src
/load_prefs.php');
- require_once(
'../
functions/array.php');
+ require_once(
SM_PATH . 'include
/load_prefs.php');
+ require_once(
SM_PATH . '
functions/array.php');
if ($noselect_fix_enable) {
$lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
if ($noselect_fix_enable) {
$lsub_args = "LSUB \"$folder_prefix\" \"*%\"";
@@
-615,7
+615,7
@@
function sqimap_mailbox_list($imap_stream) {
function sqimap_mailbox_list_all($imap_stream) {
global $list_special_folders_first, $folder_prefix, $delimiter;
function sqimap_mailbox_list_all($imap_stream) {
global $list_special_folders_first, $folder_prefix, $delimiter;
- require_once(
'../
functions/array.php');
+ require_once(
SM_PATH . '
functions/array.php');
$ssid = sqimap_session_id();
$lsid = strlen( $ssid );
$ssid = sqimap_session_id();
$lsid = strlen( $ssid );
@@
-711,8
+711,8
@@
function sqimap_mailbox_tree($imap_stream) {
$inbox_in_list = false;
$inbox_subscribed = false;
$inbox_in_list = false;
$inbox_subscribed = false;
- require_once(
'../src
/load_prefs.php');
- require_once(
'../
functions/array.php');
+ require_once(
SM_PATH . 'include
/load_prefs.php');
+ require_once(
SM_PATH . '
functions/array.php');
/* LSUB array */
$lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",
/* LSUB array */
$lsub_ary = sqimap_run_command ($imap_stream, "LSUB \"$folder_prefix\" \"*\"",
@@
-795,13
+795,19
@@
function sqimap_mailbox_tree($imap_stream) {
if (($unseen_notify == 2 && $mbx == 'INBOX')
|| $unseen_notify == 3
|| ($move_to_trash && ($mbx == $trash_folder))) {
if (($unseen_notify == 2 && $mbx == 'INBOX')
|| $unseen_notify == 3
|| ($move_to_trash && ($mbx == $trash_folder))) {
- $sorted_lsub_ary[$i]['unseen'] = sqimap_unseen_messages($imap_stream, $mbx);
+ $sorted_lsub_ary[$i]['unseen'] =
+ $sorted_lsub_ary[$i]['noselect'] ?
+ 0 : sqimap_unseen_messages($imap_stream, $mbx);
if ($unseen_type == 2 || ($move_to_trash
&& ($mbx == $trash_folder) )) {
if ($unseen_type == 2 || ($move_to_trash
&& ($mbx == $trash_folder) )) {
- $sorted_lsub_ary[$i]['nummessages'] = sqimap_get_num_messages($imap_stream, $mbx);
+ $sorted_lsub_ary[$i]['nummessages'] =
+ $sorted_lsub_ary[$i]['noselect'] ?
+ 0 : sqimap_get_num_messages($imap_stream, $mbx);
}
if ($mbx == $trash_folder) {
}
if ($mbx == $trash_folder) {
- $sorted_lsub_ary[$i]['nummessages'] = sqimap_get_num_messages($imap_stream, $mbx);
+ $sorted_lsub_ary[$i]['nummessages'] =
+ $sorted_lsub_ary[$i]['noselect'] ?
+ 0 : sqimap_get_num_messages($imap_stream, $mbx);
}
}
}
}
}
}