X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fempty_trash.php;h=4c1099b284e829a9df80eb923143263b9fbecd6a;hp=05c5f3a43a237db4ff47ebce12566088d9a8da8b;hb=f197ec8835b64975ff47dc6cd86dae75605baebf;hpb=c0d968010e710870fdfee2f22d7cc9fad370c7a9

diff --git a/src/empty_trash.php b/src/empty_trash.php
index 05c5f3a4..4c1099b2 100644
--- a/src/empty_trash.php
+++ b/src/empty_trash.php
@@ -6,7 +6,7 @@
  * Handles deleting messages from the trash folder without
  * deleting subfolders.
  *
- * @copyright 1999-2012 The SquirrelMail Project Team
+ * @copyright 1999-2016 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -32,9 +32,10 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
 // first do a security check
 sqgetGlobalVar('smtoken', $submitted_token, SQ_GET, '');
-sm_validate_security_token($submitted_token, 3600, TRUE);
+sm_validate_security_token($submitted_token, -1, TRUE);
 
-$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+global $imap_stream_options; // in case not defined in config
+$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
 
 $mailbox = $trash_folder;
 $boxes = sqimap_mailbox_list($imap_stream);