projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test
[squirrelmail.git]
/
src
/
right_main.php
diff --git
a/src/right_main.php
b/src/right_main.php
index a53c361e7784dece20385680ce7cd217a313fef1..85fe06c0beceff23e82fcf044bcdd884cdcbf570 100644
(file)
--- a/
src/right_main.php
+++ b/
src/right_main.php
@@
-27,14
+27,11
@@
require_once(SM_PATH . 'functions/imap_messages.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'functions/mailbox_display.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'functions/mailbox_display.php');
+require_once(SM_PATH . 'functions/compose.php');
/* lets get the global vars we may need */
/* lets get the global vars we may need */
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
if (is_array($delayed_errors)) {
$oErrorHandler->AssignDelayedErrors($delayed_errors);
sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
if (is_array($delayed_errors)) {
$oErrorHandler->AssignDelayedErrors($delayed_errors);
@@
-47,7
+44,7
@@
sqgetGlobalVar('note', $note, SQ_GET);
sqgetGlobalVar('mail_sent', $mail_sent, SQ_GET);
sqgetGlobalVar('mail_sent', $mail_sent, SQ_GET);
-if ( sq
getGlobalVar('startMessage', $temp
) ) {
+if ( sq
GetGlobalVarMultiple('startMessage', $temp, 'paginator_submit'
) ) {
$startMessage = (int) $temp;
} else {
$startMessage = 1;
$startMessage = (int) $temp;
} else {
$startMessage = 1;
@@
-77,15
+74,10
@@
if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
/* Open an imap connection */
/* 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';
$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
/**
* 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
@@
-257,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).
}
// 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;
displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", '');
} else {
$mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
@@
-276,7
+268,7
@@
if (isset($aMailbox['FORWARD_SESSION'])) {
displayPageHeader($color, $mailbox);
}
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') {
/* display a message to the user that their mail has been sent */
if (isset($mail_sent) && $mail_sent == 'yes') {
@@
-317,7
+309,8
@@
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('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);
$oTemplate->assign('icon_theme_path', $icon_theme_path);
$oTemplate->assign('aOrder', array_keys($aColumns));
$oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
$oTemplate->assign('icon_theme_path', $icon_theme_path);
$oTemplate->assign('aOrder', array_keys($aColumns));
@@
-331,7
+324,7
@@
if ($aMailbox['EXISTS'] > 0) {
$oTemplate->display('empty_folder.tpl');
}
$oTemplate->display('empty_folder.tpl');
}
-do_hook('right_main_bottom');
+do_hook('right_main_bottom'
, $null
);
sqimap_logout ($imapConnection);
$oTemplate->display('footer.tpl');
sqimap_logout ($imapConnection);
$oTemplate->display('footer.tpl');