projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NULL not accepted as a replacement for empty arrays as of PHP 5.3
[squirrelmail.git]
/
functions
/
mailbox_display.php
diff --git
a/functions/mailbox_display.php
b/functions/mailbox_display.php
index 3b917b741ab322a450b8f5cfe7a08ce205b6afb4..17cbca41b64ce57026406704d66d3fead939000b 100644
(file)
--- a/
functions/mailbox_display.php
+++ b/
functions/mailbox_display.php
@@
-6,7
+6,7
@@
* This contains functions that display mailbox information, such as the
* table row that has sender, date, subject, etc...
*
* This contains functions that display mailbox information, such as the
* table row that has sender, date, subject, etc...
*
- * @copyright
©
1999-2009 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 squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-975,7
+975,7
@@
function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) {
$source_url = $php_self;
}
$source_url = $php_self;
}
- $baseurl = $source_url.'?mailbox=' . urlencode($aMailbox['NAME']) .'&account='.$aMailbox['ACCOUNT'];
+ $baseurl = $source_url.'?mailbox=' . urlencode($aMailbox['NAME']) .'&account='.$aMailbox['ACCOUNT']
. (strpos($source_url, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : '')
;
$where = urlencode($aMailbox['SEARCH'][$iSetIndx][0]);
$what = urlencode($aMailbox['SEARCH'][$iSetIndx][1]);
$baseurl .= '&where=' . $where . '&what=' . $what;
$where = urlencode($aMailbox['SEARCH'][$iSetIndx][0]);
$what = urlencode($aMailbox['SEARCH'][$iSetIndx][1]);
$baseurl .= '&where=' . $where . '&what=' . $what;
@@
-1343,8
+1343,7
@@
function handleMessageListForm($imapConnection, &$aMailbox, $sButton='',
// don't do anything to any messages until we have done security check
// FIXME: not sure this code really belongs here, but there's nowhere else to put it with this architecture
// don't do anything to any messages until we have done security check
// FIXME: not sure this code really belongs here, but there's nowhere else to put it with this architecture
- // FIXME: we might need to open this up to SQ_FORM instead, especially for plugins (?)
- sqgetGlobalVar('smtoken', $submitted_token, SQ_POST, '');
+ sqgetGlobalVar('smtoken', $submitted_token, SQ_FORM, '');
sm_validate_security_token($submitted_token, 3600, TRUE);
// make sure message UIDs are sanitized (BIGINT)
sm_validate_security_token($submitted_token, 3600, TRUE);
// make sure message UIDs are sanitized (BIGINT)