X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=f007b888704bee6adc9427e43485a651bd5ee38c;hb=7d82bcebfcbc92a35bc7066d560e64d6ae786807;hp=fb7b809fb71d143d37ed8bc55f968eb65ed87040;hpb=78cc4b1227af6ace04307afc49b85c9910978a2a;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index fb7b809f..f007b888 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,17 +34,82 @@ 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['composenew'])) {
+ $composenew = $_GET['composenew'];
+} else {
+ $composenew = false;
+}
+
+if (isset($_GET['checkall'])) {
+ $checkall = $_GET['checkall'];
+}
+if (isset($_GET['set_thread'])) {
+ $set_thread = $_GET['set_thread'];
+}
+if (isset($_SESSION['lastTargetMailbox'])) {
+ $lastTargetMailbox =$_SESSION['lastTargetMailbox'];
+}
+
+if (isset($_GET['session'])) {
+ $session = $_GET['session'];
+}
+
+
+/* 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;
}
@@ -47,26 +117,6 @@ if (isset($newsort) && $newsort != $sort) {
setPref($data_dir, $username, 'sort', $newsort);
}
-/* 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;
-}
/* If the page has been loaded without a specific mailbox, */
@@ -86,54 +136,67 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
substr($mailbox, 0, 1) == '/')) {
$mailbox = 'INBOX';
}
- global $color;
- if( isset($do_hook) && $do_hook ) {
- do_hook ("generic_header");
+/* 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);
-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 ($composenew) {
+ $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+ "&session=$session";
+ displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
}
-echo "
\n";
-
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');
}
/*********************************************************************
@@ -146,25 +209,18 @@ 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')) {
+if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
} else {
- if (session_is_registered('msgs')) {
+ if (sqsession_is_registered('msgs')) {
unset($msgs);
}
- if (session_is_registered('msort')) {
+ if (sqsession_is_registered('msort')) {
unset($msort);
}
- if (session_is_registered('numMessages')) {
+ if (sqsession_is_registered('numMessages')) {
unset($numMessages);
}
@@ -174,22 +230,22 @@ if ($use_mailbox_cache && session_is_registered('msgs')) {
$startMessage, $sort, $color, $show_num,
$use_mailbox_cache);
- if (session_is_registered('msgs') && isset($msgs)) {
- session_register('msgs');
+ if (sqsession_is_registered('msgs') && isset($msgs)) {
+ sqsession_register($msgs, 'msgs');
$_SESSION['msgs'] = $msgs;
}
- if (session_is_registered('msort') && isset($msort)) {
- session_register('msort');
+ if (sqsession_is_registered('msort') && isset($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 '