projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phpdoc updates
[squirrelmail.git]
/
src
/
right_main.php
diff --git
a/src/right_main.php
b/src/right_main.php
index 1d3ef5e53f0001beda0be67ca1edb1e5aa5d88af..f4173981cce97f9cc66c64231720467dc3bb7cc9 100644
(file)
--- a/
src/right_main.php
+++ b/
src/right_main.php
@@
-1,9
+1,8
@@
<?php
<?php
-
/**
* right_main.php
*
/**
* right_main.php
*
- * Copyright (c) 1999-200
3
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
4
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This is where the mailboxes are listed. This controls most of what
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This is where the mailboxes are listed. This controls most of what
@@
-25,6
+24,7
@@
require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'functions/mailbox_display.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'functions/html.php');
require_once(SM_PATH . 'functions/mailbox_display.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/plugin.php');
/***********************************************************
* incoming variables from URL: *
/***********************************************************
* incoming variables from URL: *
@@
-100,11
+100,13
@@
else if( isset( $PG_SHOWNUM ) ) {
$show_num = $PG_SHOWNUM;
}
$show_num = $PG_SHOWNUM;
}
-if (isset($newsort) && $newsort != $sort) {
- setPref($data_dir, $username, 'sort', $newsort);
-}
-
+if (isset($newsort) ) {
+ if ( $newsort != $sort )
+ setPref($data_dir, $username, 'sort', $newsort);
+ $sort = $newsort;
+ sqsession_register($sort, 'sort');
+}
/* If the page has been loaded without a specific mailbox, */
/* send them to the inbox */
/* If the page has been loaded without a specific mailbox, */
/* send them to the inbox */
@@
-129,11
+131,11
@@
if ($allow_thread_sort == TRUE) {
if (isset($set_thread)) {
if ($set_thread == 1) {
setPref($data_dir, $username, "thread_$mailbox", 1);
if (isset($set_thread)) {
if ($set_thread == 1) {
setPref($data_dir, $username, "thread_$mailbox", 1);
- $thread_sort_messages = '1';
+ $thread_sort_messages = '1';
}
elseif ($set_thread == 2) {
setPref($data_dir, $username, "thread_$mailbox", 0);
}
elseif ($set_thread == 2) {
setPref($data_dir, $username, "thread_$mailbox", 0);
- $thread_sort_messages = '0';
+ $thread_sort_messages = '0';
}
}
else {
}
}
else {
@@
-142,7
+144,7
@@
if ($allow_thread_sort == TRUE) {
}
else {
$thread_sort_messages = 0;
}
else {
$thread_sort_messages = 0;
-}
+}
do_hook ('generic_header');
do_hook ('generic_header');
@@
-150,7
+152,7
@@
sqimap_mailbox_select($imapConnection, $mailbox);
if ($composenew) {
$comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
if ($composenew) {
$comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-
"&session=$session";
+ "&session=$session";
displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
@@
-173,7
+175,7
@@
if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
if (strlen(trim($motd)) > 0) {
echo html_tag( 'table',
html_tag( 'tr',
if (strlen(trim($motd)) > 0) {
echo html_tag( 'table',
html_tag( 'tr',
- html_tag( 'td',
+ html_tag( 'td',
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', $motd, 'center' )
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', $motd, 'center' )
@@
-186,10
+188,6
@@
if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
}
}
}
}
-if (isset($newsort)) {
- $sort = $newsort;
- sqsession_register($sort, 'sort');
-}
/*********************************************************************
* Check to see if we can use cache or not. Currently the only time *
/*********************************************************************
* Check to see if we can use cache or not. Currently the only time *
@@
-218,7
+216,7
@@
if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
$numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
$numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
$startMessage, $sort, $color, $show_num,
$use_mailbox_cache);
$startMessage, $sort, $color, $show_num,
$use_mailbox_cache);