X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=8470069f43f3eed1b6d14d03f1ab29b23de304a8;hp=b41bc5109c42e02fd4f227c274a506ab768cca0b;hb=cd9a4fd36723c95a9e847922dd99c8ea22bd947c;hpb=b831fe0b0056d63f5206dbbee8db742658cdd43a
diff --git a/src/right_main.php b/src/right_main.php
index b41bc510..8470069f 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -12,13 +12,18 @@
* $Id$
*/
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/date.php');
-require_once('../functions/array.php');
-require_once('../functions/mime.php');
-require_once('../functions/mailbox_display.php');
-require_once('../functions/display_messages.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/array.php');
+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');
/***********************************************************
* incoming variables from URL: *
@@ -29,16 +34,71 @@ require_once('../functions/display_messages.php');
* $mailbox Full Mailbox name *
* *
* incoming from cookie: *
- * $username duh *
* $key pass *
+ * incoming from session: *
+ * $username duh *
+ * *
***********************************************************/
-$bob = getHashedFile($username, $data_dir, "username.pref");
+
+/* lets get the global vars we may need */
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$onetimepad = $_SESSION['onetimepad'];
+$base_uri = $_SESSION['base_uri'];
+$delimiter = $_SESSION['delimiter'];
+
+if (isset($_GET['startMessage'])) {
+ $startMessage = $_GET['startMessage'];
+} elseif (isset($_POST['startMessage'])) {
+ $startMessage = $_POST['startMessage'];
+}
+if (isset($_GET['mailbox'])) {
+ $mailbox = $_GET['mailbox'];
+} else if (isset($_POST['mailbox'])) {
+ $mailbox = $_POST['mailbox'];
+}
+if (isset($_GET['PG_SHOWNUM'])) {
+ $PG_SHOWNUM = $_GET['PG_SHOWNUM'];
+}
+elseif (isset($_SESSION['PG_SHOWNUM'])) {
+ $PG_SHOWNUM = $_SESSION['PG_SHOWNUM'];
+}
+if (isset($_GET['PG_SHOWALL'])) {
+ $PG_SHOWALL = $_GET['PG_SHOWALL'];
+}
+if (isset($_GET['newsort'])) {
+ $newsort = $_GET['newsort'];
+}
+if (isset($_GET['checkall'])) {
+ $checkall = $_GET['checkall'];
+}
+if (isset($_GET['set_thread'])) {
+ $set_thread = $_GET['set_thread'];
+}
+if (isset($_SESSION['lastTargetMailbox'])) {
+ $lastTargetMailbox =$_SESSION['lastTargetMailbox'];
+}
+
+/* end of get globals */
+
/* Open a connection on the imap port (143) */
+
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-if( isset( $PG_SHOWNUM ) ) {
+if (isset($PG_SHOWALL)) {
+ if ($PG_SHOWALL) {
+ $PG_SHOWNUM=999999;
+ $show_num=$PG_SHOWNUM;
+ sqsession_register($PG_SHOWNUM, 'PG_SHOWNUM');
+ }
+ else {
+ sqsession_unregister('PG_SHOWNUM');
+ unset($PG_SHOWNUM);
+ }
+}
+else if( isset( $PG_SHOWNUM ) ) {
$show_num = $PG_SHOWNUM;
}
@@ -46,13 +106,16 @@ if (isset($newsort) && $newsort != $sort) {
setPref($data_dir, $username, 'sort', $newsort);
}
+
+
/* 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;
}
@@ -63,34 +126,66 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
$mailbox = 'INBOX';
}
+/* decide if we are thread sorting or not */
+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;
+}
+
+do_hook ('generic_header');
+
sqimap_mailbox_select($imapConnection, $mailbox);
-displayPageHeader($color, $mailbox);
-echo "
\n";
+if (isset($composenew) && $composenew) {
+ $comp_uri = '../src/compose.php?mailbox='. urlencode($mailbox).
+ "&session=$composesession";
+ displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
+} else {
+ displayPageHeader($color, $mailbox);
+}
do_hook('right_main_after_header');
-
if (isset($note)) {
- echo "
$note
\n";
+ echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n";
}
-if ($just_logged_in == true) {
- $just_logged_in = false;
-
- if (strlen(trim($motd)) > 0) {
- echo "
" .
- '' .
- "" .
- "$motd";
- do_hook('motd');
- echo ' | ' .
- ' ' .
- ' |
';
+if (isset($_SESSION['just_logged_in'])) {
+ $just_logged_in = $_SESSION['just_logged_in'];
+ if ($just_logged_in == true) {
+ $just_logged_in = false;
+
+ if (strlen(trim($motd)) > 0) {
+ echo html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td',
+ html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', $motd, 'center' )
+ ) ,
+ '', $color[4], 'width="100%" cellpadding="5" cellspacing="1" border="0"' )
+ )
+ ) ,
+ 'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
+ }
}
}
if (isset($newsort)) {
$sort = $newsort;
- session_register('sort');
+ sqsession_register($sort, 'sort');
}
/*********************************************************************
@@ -103,13 +198,6 @@ if (! isset($use_mailbox_cache)) {
$use_mailbox_cache = 0;
}
-/* There is a problem with registered vars in 4.1 */
-/*
-if( substr( phpversion(), 0, 3 ) == '4.1' ) {
- $use_mailbox_cache = FALSE;
-}
-*/
-
if ($use_mailbox_cache && session_is_registered('msgs')) {
showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
} else {
@@ -132,22 +220,21 @@ if ($use_mailbox_cache && session_is_registered('msgs')) {
$use_mailbox_cache);
if (session_is_registered('msgs') && isset($msgs)) {
- session_register('msgs');
+ sqsession_register($msgs, 'msgs');
$_SESSION['msgs'] = $msgs;
}
if (session_is_registered('msort') && isset($msort)) {
- session_register('msort');
+ sqsession_register($msort, 'msort');
$_SESSION['msort'] = $msort;
}
- session_register('numMessages');
+ sqsession_register($numMessages, 'numMessages');
$_SESSION['numMessages'] = $numMessages;
}
-
do_hook('right_main_bottom');
sqimap_logout ($imapConnection);
-echo '