X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=85fe06c0beceff23e82fcf044bcdd884cdcbf570;hb=2741e6248be474e1cd2c58aaf5f7c6682db2e59f;hp=058ff5b88d3d89c35a8eb42c6aafc6ca595ad92c;hpb=49719da8ab883a085650df95fa977038f18a5e78;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 058ff5b8..85fe06c0 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,45 +1,42 @@
AssignDelayedErrors($delayed_errors);
+ sqsession_unregister("delayed_errors");
+}
sqgetGlobalVar('mailbox', $mailbox);
sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
sqgetGlobalVar('targetMailbox', $lastTargetMailbox, SQ_POST);
@@ -47,7 +44,7 @@ sqgetGlobalVar('note', $note, SQ_GET);
sqgetGlobalVar('mail_sent', $mail_sent, SQ_GET);
-if ( sqgetGlobalVar('startMessage', $temp) ) {
+if ( sqGetGlobalVarMultiple('startMessage', $temp, 'paginator_submit') ) {
$startMessage = (int) $temp;
} else {
$startMessage = 1;
@@ -77,25 +74,16 @@ if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
/* Open an imap connection */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
$mailbox = (isset($mailbox) && $mailbox) ? $mailbox : 'INBOX';
-/* compensate for the UW vulnerability. */
-if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
- substr($mailbox, 0, 1) == '/')) {
- $mailbox = 'INBOX';
-}
/**
* Set the global settings for a mailbox and merge them with the usersettings
* for the mailbox. In the future we can add more mailbox specific preferences
* preferences.
*/
-
-/* not sure if this hook should be capable to alter the global pref array */
-do_hook ('generic_header');
-
$aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$account.'_'.$mailbox);
if ($aMailboxPrefSer) {
$aMailboxPref = unserialize($aMailboxPrefSer);
@@ -236,10 +224,6 @@ if ($sError) {
$note = $sError;
}
-/**
- * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates
- */
-$sTplDir = SM_PATH . 'templates/default/';
/*
@@ -256,7 +240,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
session_write_close();
// restart the session. Do not use sqsession_is_active because the session_id
// isn't empty after a session_write_close
- session_start();
+ sqsession_start();
if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
$compose_width = '640';
}
@@ -265,7 +249,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
}
// do not use &, it will break the query string and $session will not be detected!!!
$comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
- '&session='.$aMailbox['FORWARD_SESSION'];
+ '&session='.urlencode($aMailbox['FORWARD_SESSION']);
displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", '');
} else {
$mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
@@ -276,7 +260,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
session_write_close();
// we have to redirect to the compose page
$location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
- '&session='.$aMailbox['FORWARD_SESSION'];
+ '&session='.$aMailbox['FORWARD_SESSION'];
header("Location: $location");
exit;
}
@@ -284,14 +268,15 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
displayPageHeader($color, $mailbox);
}
-do_hook('right_main_after_header');
+do_hook('right_main_after_header', $null);
/* display a message to the user that their mail has been sent */
if (isset($mail_sent) && $mail_sent == 'yes') {
$note = _("Your Message has been sent.");
}
if (isset($note)) {
- echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n";
+ $oTemplate->assign('note', htmlspecialchars($note));
+ $oTemplate->display('note.tpl');
}
if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
@@ -299,31 +284,17 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
$just_logged_in = false;
sqsession_register($just_logged_in, 'just_logged_in');
- 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"' );
+ $motd = trim($motd);
+ if (strlen($motd) > 0) {
+ $oTemplate->assign('motd', $motd);
+ $oTemplate->display('motd.tpl');
}
}
}
-/**
- * In the future, move this the the initialisation area
- */
-
-
-$oTemplate = new Template($sTplDir);
if ($aMailbox['EXISTS'] > 0) {
- $aTemplateVars =& showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError);
+ $aTemplateVars = showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError);
if ($iError) {
}
@@ -338,11 +309,10 @@ if ($aMailbox['EXISTS'] > 0) {
$oTemplate->assign('page_selector', $page_selector);
$oTemplate->assign('page_selector_max', $page_selector_max);
$oTemplate->assign('compact_paginator', $compact_paginator);
- $oTemplate->assign('javascript_on', $javascript_on);
+ $oTemplate->assign('javascript_on', checkForJavascript());
+ $oTemplate->assign('base_uri', sqm_baseuri());
$oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
- // Aaaaaahhhhhhh FIX ME DO NOT USE the string "none" for a var when you mean the boolean false or null
- $oTemplate->assign('icon_theme', (isset($icon_theme) && $icon_theme !== 'none') ? $icon_theme : false);
- $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);
+ $oTemplate->assign('icon_theme_path', $icon_theme_path);
$oTemplate->assign('aOrder', array_keys($aColumns));
$oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false);
$oTemplate->assign('color', $color);
@@ -351,26 +321,14 @@ if ($aMailbox['EXISTS'] > 0) {
$oTemplate->display('message_list.tpl');
} else {
- $string = '' . _("THIS FOLDER IS EMPTY") . '';
- echo '
';
- echo ' ';
- echo ' ';
- echo ' ';
- echo ' ';
- echo ' ' . html_tag( 'td', $string."\n", 'left')
- . ' ';
- echo ' ';
- echo '
| ';
- echo ' |
';
- echo '
';
+ $oTemplate->display('empty_folder.tpl');
}
-do_hook('right_main_bottom');
+do_hook('right_main_bottom', $null);
sqimap_logout ($imapConnection);
-echo '