projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for socket-based database connections
[squirrelmail.git]
/
functions
/
mailbox_display.php
diff --git
a/functions/mailbox_display.php
b/functions/mailbox_display.php
index f44e1ebe44939beba991aa25dfb2409ebae2dada..b38eefd50275f63d1542aa3b9ca1dbe73f1b5a31 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
0
The SquirrelMail Project Team
+ * @copyright 1999-201
6
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
@@
-554,11
+554,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) {
@@
-578,7
+578,7
@@
function prepareMessageList(&$aMailbox, $aProps) {
$sTmp = $sTrunc;
}
}
$sTmp = $sTrunc;
}
}
- $value = ($sTmp) ?
$sTmp
: $sUnknown;
+ $value = ($sTmp) ?
(substr($sTmp, 0, 6) == '"' && substr($sTmp, -6) == '"' ? substr(substr($sTmp, 0, -6), 6) : $sTmp)
: $sUnknown;
break;
case SQM_COL_SUBJ:
// subject is mime encoded, decode it.
break;
case SQM_COL_SUBJ:
// subject is mime encoded, decode it.
@@
-593,7
+593,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
+620,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,
@@
-1041,7
+1045,7
@@
function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) {
$trash_folder) ? true : false; //
$showUndelete = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' &&
$trash_folder) ? true : false; //
$showUndelete = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' &&
- in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)
&& !$trash_folder
) ? true : false;
+ in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)
/* trash folder unrelated methinks: && !$trash_folder*/
) ? true : false;
$showMove = ($aMailbox['RIGHTS'] != 'READ-ONLY') ? true : false;
$showExpunge = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' &&
in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) ? true : false;
$showMove = ($aMailbox['RIGHTS'] != 'READ-ONLY') ? true : false;
$showExpunge = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' &&
in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) ? true : false;
@@
-1297,7
+1301,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)