projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When incrementing config file version numbers, we must increment what we're testing...
[squirrelmail.git]
/
src
/
right_main.php
diff --git
a/src/right_main.php
b/src/right_main.php
index a2903eb4c02a7ca1180b7b85b4ca87b2809cfa36..0e33723ec033de420f0c4e9eeb7b0ebd4e17b780 100644
(file)
--- a/
src/right_main.php
+++ b/
src/right_main.php
@@
-30,9
+30,7
@@
require_once(SM_PATH . 'functions/mailbox_display.php');
/* lets get the global vars we may need */
/* lets get the global vars we may need */
-sqgetGlobalVar('username', $username, 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);
@@
-79,11
+77,6
@@
$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort,
$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