projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow callers of sqm_api_mailbox_select() to determine if errors should be handled...
[squirrelmail.git]
/
functions
/
mailbox_display.php
diff --git
a/functions/mailbox_display.php
b/functions/mailbox_display.php
index f858bb4a280217333867949c19f338511470d53c..42ae26cb13d08c91a1acf23aa02a9734da7a8d5a 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-201
2
The SquirrelMail Project Team
+ * @copyright 1999-201
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
@@
-21,13
+21,20
@@
* @param string $mailbox mailbox to select and retrieve message headers from
* @param array $aConfig array with system config settings and incoming vars
* @param array $aProps mailbox specific properties
* @param string $mailbox mailbox to select and retrieve message headers from
* @param array $aConfig array with system config settings and incoming vars
* @param array $aProps mailbox specific properties
+ * @param boolean $handle_errors When TRUE, IMAP errors
+ * are handled herein, causing
+ * an error to be displayed on
+ * screen and execution to stop
+ * and when FALSE, error status
+ * is returned to the caller
+ * (OPTIONAL; default is TRUE)
*
* @return array $aMailbox mailbox array with all relevant information
*
* @since 1.5.1
* @author Marc Groot Koerkamp
*/
*
* @return array $aMailbox mailbox array with all relevant information
*
* @since 1.5.1
* @author Marc Groot Koerkamp
*/
-function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aProps) {
+function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aProps
,$handle_errors=true
) {
/**
* NB: retrieve this from the session before accessing this function
/**
* NB: retrieve this from the session before accessing this function
@@
-48,7
+55,7
@@
function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aPro
$iSetIndx = $aConfig['setindex'];
$iSetIndx = $aConfig['setindex'];
- $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox);
+ $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox
, $handle_errors
);
if ($mailbox_cache) {
if (isset($mailbox_cache[$account.'_'.$mailbox])) {
if ($mailbox_cache) {
if (isset($mailbox_cache[$account.'_'.$mailbox])) {
@@
-554,11
+561,11
@@
function prepareMessageList(&$aMailbox, $aProps) {
$sMailbox = (isset($aAddr[SQM_ADDR_MAILBOX])) ? $aAddr[SQM_ADDR_MAILBOX] : '';
$sHost = (isset($aAddr[SQM_ADDR_HOST])) ? $aAddr[SQM_ADDR_HOST] : '';
if ($sPersonal) {
$sMailbox = (isset($aAddr[SQM_ADDR_MAILBOX])) ? $aAddr[SQM_ADDR_MAILBOX] : '';
$sHost = (isset($aAddr[SQM_ADDR_HOST])) ? $aAddr[SQM_ADDR_HOST] : '';
if ($sPersonal) {
- $title .=
htmlspecial
chars($sMailbox.'@'.$sHost).', ';
+ $title .=
sm_encode_html_special_
chars($sMailbox.'@'.$sHost).', ';
} else {
// if $value gets truncated we need to add the addresses with no
// personal name as well
} else {
// if $value gets truncated we need to add the addresses with no
// personal name as well
- $title_maybe .=
htmlspecial
chars($sMailbox.'@'.$sHost).', ';
+ $title_maybe .=
sm_encode_html_special_
chars($sMailbox.'@'.$sHost).', ';
}
}
if ($title) {
}
}
if ($title) {
@@
-593,7
+600,9
@@
function prepareMessageList(&$aMailbox, $aProps) {
if (isset($aColumnDesc[$k]['truncate']) && $aColumnDesc[$k]['truncate']) {
$sTmp = sm_truncate_string($value, $aColumnDesc[$k]['truncate']-$iIndent, '...', TRUE);
// drop any double spaces since these will be displayed in the title
if (isset($aColumnDesc[$k]['truncate']) && $aColumnDesc[$k]['truncate']) {
$sTmp = sm_truncate_string($value, $aColumnDesc[$k]['truncate']-$iIndent, '...', TRUE);
// drop any double spaces since these will be displayed in the title
- $title = ($sTmp != $value) ? preg_replace('/\s{2,}/', ' ', $value) : '';
+ // Nah, it's nice to always have a roll-over
+ //$title = ($sTmp != $value) ? preg_replace('/\s{2,}/', ' ', $value) : '';
+ $title = preg_replace('/\s{2,}/', ' ', $value);
$value = $sTmp;
}
/* generate the link to the message */
$value = $sTmp;
}
/* generate the link to the message */
@@
-618,7
+627,9
@@
function prepareMessageList(&$aMailbox, $aProps) {
break;
case SQM_COL_DATE:
case SQM_COL_INT_DATE:
break;
case SQM_COL_DATE:
case SQM_COL_INT_DATE:
- $value = getDateString(getTimeStamp(explode(' ',trim($value))));
+ $value = getTimeStamp(explode(' ',trim($value)));
+ $title = getDateString($value, TRUE);
+ $value = getDateString($value);
break;
case SQM_COL_FLAGS:
$aFlagColumn = array('seen' => false,
break;
case SQM_COL_FLAGS:
$aFlagColumn = array('seen' => false,
@@
-1297,7
+1308,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
sqgetGlobalVar('smtoken', $submitted_token, SQ_FORM, '');
// 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
sqgetGlobalVar('smtoken', $submitted_token, SQ_FORM, '');
- sm_validate_security_token($submitted_token,
3600
, TRUE);
+ sm_validate_security_token($submitted_token,
-1
, TRUE);
// make sure message UIDs are sanitized (BIGINT)
foreach ($aUid as $i => $uid)
// make sure message UIDs are sanitized (BIGINT)
foreach ($aUid as $i => $uid)