projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for security token missing in newmail plugin (#2919418).
[squirrelmail.git]
/
plugins
/
filters
/
spamoptions.php
diff --git
a/plugins/filters/spamoptions.php
b/plugins/filters/spamoptions.php
index b228298f3fc2bf6b3fd22816e52795dfd20bf8b6..7bd7842fa188905e939317ff81076ebda5028a50 100644
(file)
--- a/
plugins/filters/spamoptions.php
+++ b/
plugins/filters/spamoptions.php
@@
-3,7
+3,7
@@
/**
* Message and Spam Filter Plugin - Spam Options
*
/**
* Message and Spam Filter Plugin - Spam Options
*
- * @copyright
© 1999-2006
The SquirrelMail Project Team
+ * @copyright
1999-2009
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
@@
-20,15
+20,12
@@
include_once(SM_PATH . 'functions/imap_messages.php');
include_once(SM_PATH . 'plugins/filters/filters.php');
/* get globals */
include_once(SM_PATH . 'plugins/filters/filters.php');
/* get globals */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('action', $action, SQ_GET);
/* end globals */
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('action', $action, SQ_GET);
/* end globals */
-displayPageHeader($color
, 'None'
);
+displayPageHeader($color);
if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) {
$spam_filters = load_spam_filters();
if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) {
$spam_filters = load_spam_filters();
@@
-80,7
+77,7
@@
if ($SpamFilters_YourHop == ' ') {
if (isset($action) && $action == 'spam') {
if (isset($action) && $action == 'spam') {
- $imapConnection = sqimap_login($username,
$key
, $imapServerAddress, $imapPort, 0);
+ $imapConnection = sqimap_login($username,
false
, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list($imapConnection);
sqimap_logout($imapConnection);
$numboxes = count($boxes);
$boxes = sqimap_mailbox_list($imapConnection);
sqimap_logout($imapConnection);
$numboxes = count($boxes);
@@
-215,4
+212,4
@@
if (isset($action) && $action == 'spam') {
echo '</table>';
}
?>
echo '</table>';
}
?>
-</body></html>
\ No newline at end of file
+</body></html>