* This contains functions that display mailbox information, such as the
* table row that has sender, date, subject, etc...
*
- * @copyright © 1999-2007 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
function prepareMessageList(&$aMailbox, $aProps) {
/* Globalize link attributes so plugins can share in modifying them */
- global $link, $title, $target, $onclick, $link_extra;
+ global $link, $title, $target, $onclick, $link_extra, $preselected;
/* retrieve the properties */
$my_email_address = (isset($aProps['email'])) ? $aProps['email'] : false;
$sTrunc = truncateWithEntities($sTmp, $aColumnDesc[$k]['truncate']);
if ($sTrunc != $sTmp) {
if (!$title) {
- $title = htmlspecialchars($sTmp);
+ $title = $sTmp;
} else if ($title_maybe) {
$title = $title .', '.$title_maybe;
$title = substr($title,0,-2); // strip ', ';
// $onclick, $link_extra, $title, and so forth)
// plugins are responsible for sharing nicely (such as for
// setting the target, etc)
- do_hook('subject_link', $temp=array(&$iPageOffset, &$sSearch, &$aSearch));
+ $temp = array(&$iPageOffset, &$sSearch, &$aSearch, $aMsg);
+ do_hook('subject_link', $temp);
}
$value = (trim($value)) ? $value : _("(no subject)");
/* add thread indentation */
$aFlagColumn = array('seen' => false,
'deleted'=>false,
'answered'=>false,
+ 'forwarded'=>false,
'flagged' => false,
'draft' => false);
if(!is_array($value)) $value = array();
- foreach ($value as $sFlag => $value) {
+ foreach ($value as $sFlag => $v) {
switch ($sFlag) {
- case '\\seen' : $aFlagColumn['seen'] = true; break;
- case '\\deleted' : $aFlagColumn['deleted'] = true; break;
- case '\\answered': $aFlagColumn['answered'] = true; break;
- case '\\flagged' : $aFlagColumn['flagged'] = true; break;
- case '\\draft' : $aFlagColumn['draft'] = true; break;
+ case '\\seen' : $aFlagColumn['seen'] = true; break;
+ case '\\deleted' : $aFlagColumn['deleted'] = true; break;
+ case '\\answered': $aFlagColumn['answered'] = true; break;
+ case '$forwarded': $aFlagColumn['forwarded'] = true; break;
+ case '\\flagged' : $aFlagColumn['flagged'] = true; break;
+ case '\\draft' : $aFlagColumn['draft'] = true; break;
default: break;
}
}
$value = (is_array($value) && $value[0] == 'multipart' && $value[1] == 'mixed') ? true : false;
break;
case SQM_COL_CHECK:
- $value = $checkall;
+ $value = ($checkall || in_array($iUid, $preselected));
break;
default : break;
}
$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;
/* future admin control over displayable buttons */
$aAdminControl = array(
- 'markUnflagged' => 1,
'markFlagged' => 1,
+ 'markUnflagged' => 1,
'markRead' => 1,
'markUnread' => 1,
'forward' => 1,
/* user prefs control */
$aUserControl = array (
- 'markUnflagged' => $show_flag_buttons,
'markFlagged' => $show_flag_buttons,
+ 'markUnflagged' => $show_flag_buttons,
'markRead' => 1,
'markUnread' => 1,
'forward' => 1,
);
/* Button strings */
$aButtonStrings = array(
- 'markUnflagged' => _("Unflag"),
- 'markFlagged' => _("Flag"),
- 'markRead' => _("Read"),
- 'markUnread' => _("Unread"),
- 'forward' => _("Forward"),
- 'delete' => _("Delete"),
- 'undeleteButton' => _("Undelete"),
- 'bypass_trash' => _("Bypass Trash"),
- 'expungeButton' => _("Expunge"),
- 'moveButton' => _("Move"),
- 'copyButton' => _("Copy")
+ 'markFlagged' => _("Flag"),
+ 'markUnflagged' => _("Unflag"),
+ 'markRead' => _("Read"),
+ 'markUnread' => _("Unread"),
+ 'forward' => _("Forward"),
+ 'delete' => _("Delete"),
+ 'undeleteButton' => _("Undelete"),
+ 'bypass_trash' => _("Bypass Trash"),
+ 'expungeButton' => _("Expunge"),
+ 'moveButton' => _("Move"),
+ 'copyButton' => _("Copy")
+ );
+ /* Button access keys */
+ global $accesskey_mailbox_flag, $accesskey_mailbox_unflag,
+ $accesskey_mailbox_read, $accesskey_mailbox_unread,
+ $accesskey_mailbox_forward, $accesskey_mailbox_delete,
+ $accesskey_mailbox_undelete, $accesskey_mailbox_bypass_trash,
+ $accesskey_mailbox_expunge, $accesskey_mailbox_move,
+ $accesskey_mailbox_copy, $accesskey_mailbox_move_to;
+ $aButtonAccessKeys = array(
+ 'markFlagged' => $accesskey_mailbox_flag,
+ 'markUnflagged' => $accesskey_mailbox_unflag,
+ 'markRead' => $accesskey_mailbox_read,
+ 'markUnread' => $accesskey_mailbox_unread,
+ 'forward' => $accesskey_mailbox_forward,
+ 'delete' => $accesskey_mailbox_delete,
+ 'undeleteButton' => $accesskey_mailbox_undelete,
+ 'bypass_trash' => $accesskey_mailbox_bypass_trash,
+ 'expungeButton' => $accesskey_mailbox_expunge,
+ 'moveButton' => $accesskey_mailbox_move,
+ 'copyButton' => $accesskey_mailbox_copy,
);
foreach($aAdminControl as $k => $v) {
if ($v & $aUserControl[$k] & $aImapControl[$k]) {
switch ($k) {
- case 'markUnflagged':
case 'markFlagged':
+ case 'markUnflagged':
case 'markRead':
case 'markUnread':
case 'delete':
case 'expungeButton':
case 'forward':
$aFormElements[$k]
- = array('value' => $aButtonStrings[$k], 'type' => 'submit');
+ = array('value' => $aButtonStrings[$k], 'type' => 'submit', 'accesskey' => (isset($aButtonAccessKeys[$k]) ? $aButtonAccessKeys[$k] : 'NONE'));
break;
case 'bypass_trash':
$aFormElements[$k]
- = array('value' => $aButtonStrings[$k], 'type' => 'checkbox');
+ = array('value' => $aButtonStrings[$k], 'type' => 'checkbox', 'accesskey' => (isset($aButtonAccessKeys[$k]) ? $aButtonAccessKeys[$k] : 'NONE'));
break;
case 'moveButton':
case 'copyButton':
$aFormElements['targetMailbox']
= array('options_list' => sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes),
- 'type' => 'select');
+ 'type' => 'select',
+ 'accesskey' => $accesskey_mailbox_move_to);
$aFormElements['mailbox']
= array('value' => $aMailbox['NAME'], 'type' => 'hidden');
$aFormElements['startMessage']
= array('value' => $aMailbox['PAGEOFFSET'], 'type' => 'hidden');
$aFormElements[$k]
- = array('value' => $aButtonStrings[$k], 'type' => 'submit');
+ = array('value' => $aButtonStrings[$k], 'type' => 'submit', 'accesskey' => (isset($aButtonAccessKeys[$k]) ? $aButtonAccessKeys[$k] : 'NONE'));
break;
}
}
}
-/**
- * This should go in imap_mailbox.php
- * @param string $mailbox
- */
-function handleAsSent($mailbox) {
- global $handleAsSent_result;
-
- /* First check if this is the sent or draft folder. */
- $handleAsSent_result = isSentMailbox($mailbox) || isDraftMailbox($mailbox);
-
- /* Then check the result of the handleAsSent hook. */
- do_hook('check_handleAsSent_result', $mailbox);
-
- /* And return the result. */
- return $handleAsSent_result;
-}
-
/**
* Process messages list form and handle the cache gracefully. If $sButton and
* $aUid are provided as argument then you can fake a message list submit and
* use it i.e. in read_body.php for del move next and update the cache
*
* @param resource $imapConnection imap connection
- * @param array $aMailbox (reference) cached mailbox
- * @param string $sButton fake a submit button
- * @param array $aUid fake the $msg array
+ * @param array $aMailbox (reference) cached mailbox
+ * @param string $sButton fake a submit button
+ * @param array $aUid fake the $msg array
+ * @param string $targetMailbox fake the target mailbox for move operations
+ * @param boolean $bypass_trash fake the bypass trash checkbox for delete operations
* @return string $sError error string in case of an error
* @since 1.5.1
* @author Marc Groot Koerkamp
*/
-function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = array()) {
+function handleMessageListForm($imapConnection, &$aMailbox, $sButton='',
+ $aUid = array(), $targetMailbox='', $bypass_trash=NULL) {
/* incoming formdata */
$sButton = (sqgetGlobalVar('moveButton', $sTmp, SQ_FORM)) ? 'move' : $sButton;
$sButton = (sqgetGlobalVar('copyButton', $sTmp, SQ_FORM)) ? 'copy' : $sButton;
$sButton = (sqgetGlobalVar('markUnread', $sTmp, SQ_FORM)) ? 'unsetSeen' : $sButton;
$sButton = (sqgetGlobalVar('markFlagged', $sTmp, SQ_FORM)) ? 'setFlagged' : $sButton;
$sButton = (sqgetGlobalVar('markUnflagged', $sTmp, SQ_FORM)) ? 'unsetFlagged' : $sButton;
- sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_FORM);
- sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_FORM);
+ if (empty($targetMailbox)) sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_FORM);
+ if (is_null($bypass_trash)) sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_FORM);
sqgetGlobalVar('msg', $msg, SQ_FORM);
if (sqgetGlobalVar('account', $iAccount, SQ_FORM) === false) {
$iAccount = 0;
/* retrieve the check boxes */
$aUid = (isset($msg) && is_array($msg)) ? array_values($msg) : $aUid;
if (count($aUid) && $sButton != 'expunge') {
+
+ // 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);
+
+ // make sure message UIDs are sanitized (BIGINT)
+ foreach ($aUid as $i => $uid)
+ $aUid[$i] = (preg_match('/^[0-9]+$/', $uid) ? $uid : '0');
+
$aUpdatedMsgs = false;
$bExpunge = false;
switch ($sButton) {
if (count($aMsgHeaders)) {
$composesession = attachSelectedMessages($imapConnection,$aMsgHeaders);
// dirty hack, add info to $aMailbox
- $aMailbox['FORWARD_SESSION'] = $composesession;
+ $aMailbox['FORWARD_SESSION']['SESSION_NUMBER'] = $composesession;
+ $aMailbox['FORWARD_SESSION']['UIDS'] = $aUid;
}
break;
default:
// Hook for plugin buttons
- do_hook('mailbox_display_button_action', $aUid);
+ $temp = array(&$sButton, &$aMailbox, $iAccount, $aMailbox['NAME'], &$aUid);
+ do_hook('mailbox_display_button_action', $temp);
break;
}
/**
- * Updates messages is an array containing the result of the untagged
+ * $aUpdatedMsgs is an array containing the result of the untagged
* fetch responses send by the imap server due to a flag change. That
- * response is parsed in a array with msg arrays by the parseFetch function
+ * response is parsed in an array with msg arrays by the parseFetch function
*/
if ($aUpdatedMsgs) {
// Update the message headers cache
if (isset($aMailbox['MSG_HEADERS'][$iUid])) {
$aMailbox['MSG_HEADERS'][$iUid]['FLAGS'] = $aMsg['FLAGS'];
}
+ /**
+ * Also update flags in message object
+ */
+//FIXME: WHY are we keeping flags in TWO places?!? This is error-prone and some core code uses the is_xxxx message object values while other code uses the flags array above. That's a mess.
+ if (isset($aMailbox['MSG_HEADERS'][$iUid]['MESSAGE_OBJECT'])) {
+ $message = $aMailbox['MSG_HEADERS'][$iUid]['MESSAGE_OBJECT'];
+ $message->is_seen = false;
+ $message->is_answered = false;
+ $message->is_forwarded = false;
+ $message->is_deleted = false;
+ $message->is_flagged = false;
+ $message->is_mdnsent = false;
+ foreach ($aMsg['FLAGS'] as $flag => $value) {
+ if (strtolower($flag) == '\\seen' && $value)
+ $message->is_seen = true;
+ else if (strtolower($flag) == '\\answered' && $value)
+ $message->is_answered = true;
+ else if (strtolower($flag) == '$forwarded' && $value)
+ $message->is_forwarded = true;
+ else if (strtolower($flag) == '\\deleted' && $value)
+ $message->is_deleted = true;
+ else if (strtolower($flag) == '\\flagged' && $value)
+ $message->is_flagged = true;
+ else if (strtolower($flag) == '$mdnsent' && $value)
+ $message->is_mdnsent = true;
+ }
+ $aMailbox['MSG_HEADERS'][$iUid]['MESSAGE_OBJECT'] = $message;
+ }
/**
* Count the messages with the \Delete flag set so we can determine
* if the number of expunged messages equals the number of flagged
sqimap_run_command($imapConnection,'CLOSE',false,$result,$message);
$aMailbox = sqm_api_mailbox_select($imapConnection,$iAccount, $aMailbox['NAME'],array(),array());
} else {
- if ($sButton) {
+ // this is the same hook as above, but here it is called in the
+ // context of not having had any messages selected and if any
+ // plugin handles the situation, it should return TRUE so we
+ // know this was not an erroneous user action
+ //
+ global $null;
+ $temp = array(&$sButton, &$aMailbox, $iAccount, $aMailbox['NAME'], $null);
+ if (!boolean_hook_function('mailbox_display_button_action', $temp, 1)
+ && $sButton) {
$sError = _("No messages were selected.");
}
}
$body = implode('', $body_a);
$body .= "\r\n";
+ global $username, $attachment_dir;
$filename = sq_get_attach_tempfile();
- $fp = fopen($filename, 'wb');
+ $fullpath = getHashedDir($username, $attachment_dir) . '/' . $filename;
+ $fp = fopen($fullpath, 'wb');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.msg',
- $filename);
+ $composeMessage->initAttachment('message/rfc822', $subject . '.eml', $filename);
}
}
projects / squirrelmail.git / blobdiff