Add ability to show login error from the IMAP server instead of traditional "Unknown...

[squirrelmail.git] / src / empty_trash.php

diff --git a/src/empty_trash.php b/src/empty_trash.php
index a71dd7414a1631c87a143490ead7335d0b7535fc..b3f4c476fbc1cc09efadf9cc793c2f38c250aa97 100644 (file)
--- 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-2011 The SquirrelMail Project Team
+ * @copyright 1999-2014 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -30,7 +30,12 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
 /* finished globals */
 
-$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+// first do a security check
+sqgetGlobalVar('smtoken', $submitted_token, SQ_GET, '');
+sm_validate_security_token($submitted_token, -1, TRUE);
+
+global $imapSslOptions; // in case not defined in config
+$imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imapSslOptions);
 
 $mailbox = $trash_folder;
 $boxes = sqimap_mailbox_list($imap_stream);