X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=d858149488494e9319db85986d6a8f28ce3a736f;hp=0fd724bfd407a8a3c6501a1647b8d8efc3d636f8;hb=d7f8e6e69e33b218bf6d7775a53c811d839bce61;hpb=76b684a5e8035dd5781262fab912c18ef2998ec9
diff --git a/src/right_main.php b/src/right_main.php
index 0fd724bf..d8581494 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -39,23 +39,36 @@ $bob = getHashedFile($username, $data_dir, "username.pref");
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-if( isset( $PG_SHOWNUM ) ) {
+global $PG_SHOWNUM;
+if (isset($PG_SHOWALL)) {
+ if ($PG_SHOWALL) {
+ $PG_SHOWNUM=999999;
+ $show_num=$PG_SHOWNUM;
+ session_register('PG_SHOWNUM');
+ }
+ else {
+ session_unregister('PG_SHOWNUM');
+ unset($PG_SHOWNUM);
+ }
+}
+else if( isset( $PG_SHOWNUM ) ) {
$show_num = $PG_SHOWNUM;
}
if (isset($newsort) && $newsort != $sort) {
setPref($data_dir, $username, 'sort', $newsort);
- $sort = $newsort;
- session_register('sort');
}
+
+
/* If the page has been loaded without a specific mailbox, */
/* send them to the inbox */
if (!isset($mailbox)) {
$mailbox = 'INBOX';
$startMessage = 1;
}
-
+
+
if (!isset($startMessage) || ($startMessage == '')) {
$startMessage = 1;
}
@@ -65,33 +78,46 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
substr($mailbox, 0, 1) == '/')) {
$mailbox = 'INBOX';
}
-global $color;
+/* decide if we are thread sorting or not */
+global $allow_thread_sort;
+if ($allow_thread_sort == TRUE) {
+ if (isset($set_thread)) {
+ if ($set_thread == 1) {
+ setPref($data_dir, $username, "thread_$mailbox", 1);
+ $thread_sort_messages = '1';
+ }
+ elseif ($set_thread == 2) {
+ setPref($data_dir, $username, "thread_$mailbox", 0);
+ $thread_sort_messages = '0';
+ }
+ }
+ else {
+ $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox");
+ }
+}
+else {
+ $thread_sort_messages = 0;
+}
+
+global $color;
if( isset($do_hook) && $do_hook ) {
do_hook ("generic_header");
}
sqimap_mailbox_select($imapConnection, $mailbox);
-if (isset($composenew)) {
- $width= getPref($username, $data_dir, 'editor_size', 76);
- if ($width < 65) {
- $pix_width = 560;
- } else {
- $width = (.9*$width);
- $pix_width = intval($width).'0';
- }
- $features = "toolbar=no, width=$pix_width, height=650, scrollbars=yes, resizable=yes target=_blank";
- $location = 'compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
- $onload= "window.open(\"$location\",\"compose_window_$session\", \"$features\");";
- displayPageHeader($color, $mailbox, $onload);
+if (isset($composenew) && $composenew) {
+ $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
+ "&session=$composesession&attachedmessages=true&";
+
+ displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
}
echo "
\n";
do_hook('right_main_after_header');
-
if (isset($note)) {
echo "