/* lets get the global vars we may need */
-sqgetGlobalVar('username', $username, 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);
$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
}
// 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);
}
-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') {
$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->display('empty_folder.tpl');
}
-do_hook('right_main_bottom');
+do_hook('right_main_bottom', $null);
sqimap_logout ($imapConnection);
$oTemplate->display('footer.tpl');