projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop some unused globals
[squirrelmail.git]
/
src
/
redirect.php
diff --git
a/src/redirect.php
b/src/redirect.php
index 17623d817dd29c54695729986b9df15bf5382fc5..d30580198c9dc6e84cf64afa5d3419f64232bbe5 100644
(file)
--- a/
src/redirect.php
+++ b/
src/redirect.php
@@
-5,7
+5,7
@@
*
* Derived from webmail.php by Ralf Kraudelt <kraude@wiwi.uni-rostock.de>
*
*
* Derived from webmail.php by Ralf Kraudelt <kraude@wiwi.uni-rostock.de>
*
- * @copyright © 1999-200
6
The SquirrelMail Project Team
+ * @copyright © 1999-200
7
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-52,7
+52,7
@@
if (!isset($login_username)) {
}
if (!sqsession_is_registered('user_is_logged_in')) {
}
if (!sqsession_is_registered('user_is_logged_in')) {
- do_hook
('login_before'
);
+ do_hook
('login_before', $null
);
$onetimepad = OneTimePadCreate(strlen($secretkey));
$key = OneTimePadEncrypt($secretkey, $onetimepad);
$onetimepad = OneTimePadCreate(strlen($secretkey));
$key = OneTimePadEncrypt($secretkey, $onetimepad);
@@
-79,13
+79,9
@@
if (!sqsession_is_registered('user_is_logged_in')) {
* function which gives us full control how the cookie is set. We do that
* to add the HttpOnly cookie attribute which blocks javascript access on
* IE6 SP1.
* function which gives us full control how the cookie is set. We do that
* to add the HttpOnly cookie attribute which blocks javascript access on
* IE6 SP1.
- * sqsetcookieflush is needed to send out the headers. sqsetcookie caches
- * the cookies to be send. If we don't do that we only can send 1 single cookie
- * which is not sufficient.
*/
sqsetcookie(session_name(),session_id(),false,$base_uri);
sqsetcookie('key', $key, false, $base_uri);
*/
sqsetcookie(session_name(),session_id(),false,$base_uri);
sqsetcookie('key', $key, false, $base_uri);
- sqsetcookieflush();
sqsession_register($onetimepad, 'onetimepad');
sqsession_register($onetimepad, 'onetimepad');
@@
-116,7
+112,7
@@
if (!sqsession_is_registered('user_is_logged_in')) {
$username = $login_username;
sqsession_register ($username, 'username');
$username = $login_username;
sqsession_register ($username, 'username');
- do_hook
('login_verified'
);
+ do_hook
('login_verified', $null
);
}
/* Set the login variables. */
}
/* Set the login variables. */
@@
-176,8
+172,6
@@
exit;
function attachment_common_parse($str, $debug) {
global $attachment_common_types, $attachment_common_types_parsed;
function attachment_common_parse($str, $debug) {
global $attachment_common_types, $attachment_common_types_parsed;
- $attachment_common_types_parsed[$str] = true;
-
/*
* Replace ", " with "," and explode on that as Mozilla 1.x seems to
* use "," to seperate whilst IE, and earlier versions of Mozilla use
/*
* Replace ", " with "," and explode on that as Mozilla 1.x seems to
* use "," to seperate whilst IE, and earlier versions of Mozilla use
@@
-197,4
+191,7
@@
function attachment_common_parse($str, $debug) {
}
}
sqsession_register($attachment_common_types, 'attachment_common_types');
}
}
sqsession_register($attachment_common_types, 'attachment_common_types');
+
+ /* mark as parsed */
+ $attachment_common_types_parsed[$str] = true;
}
}