* This contains functions that display mailbox information, such as the
* table row that has sender, date, subject, etc...
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @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
+ *
* @return array $aMailbox mailbox array with all relevant information
+ *
* @since 1.5.1
* @author Marc Groot Koerkamp
*/
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', array($iPageOffset, $sSearch, $aSearch));
+ $temp = array(&$iPageOffset, &$sSearch, &$aSearch, $aMsg);
+ do_hook('subject_link', $temp);
}
$value = (trim($value)) ? $value : _("(no subject)");
/* add thread indentation */
'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;
$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;
}
*/
function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) {
global $PHP_SELF;
- global $boxes;
+ global $boxes, $show_copy_buttons;
$highlight_list = (isset($aProps['config']['highlight_list'])) ? $aProps['config']['highlight_list'] : false;
$fancy_index_highlite = (isset($aProps['config']['fancy_index_highlite'])) ? $aProps['config']['fancy_index_highlite'] : true;
$sMailbox = (isset($aProps['mailbox'])) ? $aProps['mailbox'] : false;
$sTargetModule = (isset($aProps['module'])) ? $aProps['module'] : 'read_body';
$show_flag_buttons = (isset($aProps['config']['show_flag_buttons'])) ? $aProps['config']['show_flag_buttons'] : true;
+
+ /* allows to control copy button in function call. If array key is not set, code follows user preferences */
+ if (isset($aProps['config']['show_copy_buttons']))
+ $show_copy_buttons = $aProps['config']['show_copy_buttons'];
+
$lastTargetMailbox = (isset($aProps['config']['lastTargetMailbox'])) ? $aProps['config']['lastTargetMailbox'] : '';
$aOrder = array_keys($aProps['columns']);
$trash_folder = (isset($aProps['config']['trash_folder']) && $aProps['config']['trash_folder'])
$thread_name = _("Thread View");
$newsort = $aMailbox['SORT'] + SQSORT_THREAD;
}
- $thread_link_str = '<small>[<a href="' . $baseurl . '&srt='
- . $newsort . '&startMessage=1">' . $thread_name
- . '</a>]</small>';
+ $thread_link_uri = $baseurl . '&srt=' . $newsort
+ . '&startMessage=1';
} else {
- $thread_link_str ='';
+ $thread_link_uri ='';
+ $thread_name = '';
}
$sort = $aMailbox['SORT'];
/* future admin control over displayable buttons */
-
$aAdminControl = array(
'markUnflagged' => 1,
'markFlagged' => 1,
'undeleteButton'=> 1,
'bypass_trash' => 1,
'expungeButton' => 1,
- 'moveButton' => 1
+ 'moveButton' => 1,
+ 'copyButton' => 1
);
+
/* user prefs control */
$aUserControl = array (
'undeleteButton'=> 1,
'bypass_trash' => 1,
'expungeButton' => 1,
- 'moveButton' => 1
+ 'moveButton' => 1,
+ 'copyButton' => $show_copy_buttons
);
$showMove = ($aMailbox['RIGHTS'] != 'READ-ONLY') ? true : false;
$showExpunge = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' &&
in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) ? true : false;
+
+ /* Button options that depend on IMAP server and selected folder */
$aImapControl = array (
'markUnflagged' => in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true),
'markFlagged' => in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true),
'undeleteButton'=> $showUndelete,
'bypass_trash' => $showByPassTrash,
'expungeButton' => $showExpunge,
- 'moveButton' => $showMove
+ 'moveButton' => $showMove,
+ 'copyButton' => 1
);
+ /* Button strings */
$aButtonStrings = array(
'markUnflagged' => _("Unflag"),
'markFlagged' => _("Flag"),
'undeleteButton' => _("Undelete"),
'bypass_trash' => _("Bypass Trash"),
'expungeButton' => _("Expunge"),
- 'moveButton' => _("Move")
+ 'moveButton' => _("Move"),
+ 'copyButton' => _("Copy")
);
case 'undeleteButton':
case 'expungeButton':
case 'forward':
- $aFormElements[$k] = array($aButtonStrings[$k],'submit');
+ $aFormElements[$k]
+ = array('value' => $aButtonStrings[$k], 'type' => 'submit');
break;
case 'bypass_trash':
- $aFormElements[$k] = array($aButtonStrings[$k],'checkbox');
+ $aFormElements[$k]
+ = array('value' => $aButtonStrings[$k], 'type' => 'checkbox');
break;
case 'moveButton':
- $aFormElements['targetMailbox'] =
- array(sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes),'select');
- $aFormElements['mailbox'] = array($aMailbox['NAME'],'hidden');
- $aFormElements['startMessage'] = array($aMailbox['PAGEOFFSET'],'hidden');
- $aFormElements[$k] = array($aButtonStrings[$k],'submit');
+ case 'copyButton':
+ $aFormElements['targetMailbox']
+ = array('options_list' => sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes),
+ 'type' => 'select');
+ $aFormElements['mailbox']
+ = array('value' => $aMailbox['NAME'], 'type' => 'hidden');
+ $aFormElements['startMessage']
+ = array('value' => $aMailbox['PAGEOFFSET'], 'type' => 'hidden');
+ $aFormElements[$k]
+ = array('value' => $aButtonStrings[$k], 'type' => 'submit');
break;
}
}
- $aFormElements['account'] = array($iAccount,'hidden');
+ $aFormElements['account'] = array('value' => $iAccount,'type' => 'hidden');
}
+ do_hook('message_list_controls', $aFormElements);
/*
* This is the beginning of the message list table.
/* finally set the template vars */
- // FIX ME, before we support multiple templates we must review the names of the vars
+// FIXME, before we support multiple templates we must review the names of the vars
+// BUMP!
$aTemplate['color'] = $color;
$aTemplate['trash_folder'] = $trash_folder;
$aTemplate['sent_folder'] = $sent_folder;
$aTemplate['draft_folder'] = $draft_folder;
- $aTemplate['thread_link_str'] = $thread_link_str;
+ $aTemplate['thread_link_uri'] = $thread_link_uri;
+ $aTemplate['thread_name'] = $thread_name;
$aTemplate['php_self'] = str_replace('&','&',$php_self);
$aTemplate['mailbox'] = $sMailbox;
+//FIXME: javascript_on is always assigned to the template object in places like init.php; is there some reason to reassign it here? is there some chance that it was changed? if not, please remove this line!
$aTemplate['javascript_on'] = (isset($aProps['config']['javascript_on'])) ? $aProps['config']['javascript_on'] : false;
$aTemplate['enablesort'] = (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false;
$aTemplate['icon_theme'] = (isset($aProps['config']['icon_theme'])) ? $aProps['config']['icon_theme'] : false;
$aTemplate['fancy_index_highlite'] = $fancy_index_highlite;
+ /**
+ * Set up sort possibilities; one could argue that this is best
+ * placed in the template, but most template authors won't understand
+ * or need to understand it, so some advanced templates can override
+ * it if they do something different.
+ */
+ if (!($aTemplate['sort'] & SQSORT_THREAD) && $aTemplate['enablesort']) {
+ $aTemplate['aSortSupported']
+ = array(SQM_COL_SUBJ => array(SQSORT_SUBJ_ASC , SQSORT_SUBJ_DESC),
+ SQM_COL_DATE => array(SQSORT_DATE_DESC , SQSORT_DATE_ASC),
+ SQM_COL_INT_DATE => array(SQSORT_INT_DATE_DESC, SQSORT_INT_DATE_ASC),
+ SQM_COL_FROM => array(SQSORT_FROM_ASC , SQSORT_FROM_DESC),
+ SQM_COL_TO => array(SQSORT_TO_ASC , SQSORT_TO_DESC),
+ SQM_COL_CC => array(SQSORT_CC_ASC , SQSORT_CC_DESC),
+ SQM_COL_SIZE => array(SQSORT_SIZE_ASC , SQSORT_SIZE_DESC));
+ } else {
+ $aTemplate['aSortSupported'] = array();
+ }
+
+
+ /**
+ * Figure out which columns should serve as labels for checkbox:
+ * we try to grab the two columns before and after the checkbox,
+ * except the subject column, since it is the link that opens
+ * the message view
+ *
+ * if $javascript_on is set, then the highlighting code takes
+ * care of this; just skip it
+ *
+ * This code also might be more appropriate in a template file, but
+ * we are moving this complex stuff out of the way of template
+ * authors; advanced template sets are always free to override
+ * the resultant values.
+ *
+ */
+ $show_label_columns = array();
+ $index_order_part = array();
+ if (!($aTemplate['javascript_on'] && $aTemplate['fancy_index_highlite'])) {
+ $get_next_two = 0;
+ $last_order_part = 0;
+ $last_last_order_part = 0;
+ foreach ($aTemplate['aOrder'] as $index_order_part) {
+ if ($index_order_part == SQM_COL_CHECK) {
+ $get_next_two = 1;
+ if ($last_last_order_part != SQM_COL_SUBJ)
+ $show_label_columns[] = $last_last_order_part;
+ if ($last_order_part != SQM_COL_SUBJ)
+ $show_label_columns[] = $last_order_part;
+
+ } else if ($get_next_two > 0 && $get_next_two < 3 && $index_order_part != SQM_COL_SUBJ) {
+ $show_label_columns[] = $index_order_part;
+ $get_next_two++;
+ }
+ $last_last_order_part = $last_order_part;
+ $last_order_part = $index_order_part;
+ }
+ }
+ $aTemplate['show_label_columns'] = $show_label_columns;
+
+
return $aTemplate;
+
}
* 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_POST)) ? 'move' : $sButton;
- $sButton = (sqgetGlobalVar('expungeButton', $sTmp, SQ_POST)) ? 'expunge' : $sButton;
- $sButton = (sqgetGlobalVar('forward', $sTmp, SQ_POST)) ? 'forward' : $sButton;
- $sButton = (sqgetGlobalVar('delete', $sTmp, SQ_POST)) ? 'setDeleted' : $sButton;
- $sButton = (sqgetGlobalVar('undeleteButton', $sTmp, SQ_POST)) ? 'unsetDeleted' : $sButton;
- $sButton = (sqgetGlobalVar('markRead', $sTmp, SQ_POST)) ? 'setSeen' : $sButton;
- $sButton = (sqgetGlobalVar('markUnread', $sTmp, SQ_POST)) ? 'unsetSeen' : $sButton;
- $sButton = (sqgetGlobalVar('markFlagged', $sTmp, SQ_POST)) ? 'setFlagged' : $sButton;
- $sButton = (sqgetGlobalVar('markUnflagged', $sTmp, SQ_POST)) ? 'unsetFlagged' : $sButton;
- sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_POST);
- sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_POST);
- sqgetGlobalVar('msg', $msg, SQ_POST);
- if (sqgetGlobalVar('account', $iAccount, SQ_POST) === false) {
+ $sButton = (sqgetGlobalVar('moveButton', $sTmp, SQ_FORM)) ? 'move' : $sButton;
+ $sButton = (sqgetGlobalVar('copyButton', $sTmp, SQ_FORM)) ? 'copy' : $sButton;
+ $sButton = (sqgetGlobalVar('expungeButton', $sTmp, SQ_FORM)) ? 'expunge' : $sButton;
+ $sButton = (sqgetGlobalVar('forward', $sTmp, SQ_FORM)) ? 'forward' : $sButton;
+ $sButton = (sqgetGlobalVar('delete', $sTmp, SQ_FORM)) ? 'setDeleted' : $sButton;
+ $sButton = (sqgetGlobalVar('undeleteButton', $sTmp, SQ_FORM)) ? 'unsetDeleted' : $sButton;
+ $sButton = (sqgetGlobalVar('markRead', $sTmp, SQ_FORM)) ? 'setSeen' : $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;
+ 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;
}
$sError = '';
/* retrieve the check boxes */
$aUid = (isset($msg) && is_array($msg)) ? array_values($msg) : $aUid;
if (count($aUid) && $sButton != 'expunge') {
+
+ // 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) {
sqsession_register($targetMailbox,'lastTargetMailbox');
$bExpunge = true;
break;
+ case 'copy':
+ // sqimap_msgs_list_copy returns true or false.
+ // If error happens - fourth argument handles it inside function.
+ sqimap_msgs_list_copy($imapConnection,$aUid,$targetMailbox,true);
+ sqsession_register($targetMailbox,'lastTargetMailbox');
+ break;
case 'forward':
$aMsgHeaders = array();
foreach ($aUid as $iUid) {
break;
default:
// Hook for plugin buttons
- do_hook_function('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_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) == '\\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.");
}
}
* @author Marc Groot Koerkamp
*/
function attachSelectedMessages($imapConnection,$aMsgHeaders) {
- global $username, $attachment_dir,
- $data_dir;
-
sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
sqsession_register($composesession,'composesession');
}
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-
$composeMessage = new Message();
$rfc822_header = new Rfc822Header();
$composeMessage->rfc822_header = $rfc822_header;
$body = implode('', $body_a);
$body .= "\r\n";
- $localfilename = GenerateRandomString(32, 'FILE', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
-
- $fp = fopen( $full_localfilename, 'wb');
+ global $username, $attachment_dir;
+ $filename = sq_get_attach_tempfile();
+ $fullpath = getHashedDir($username, $attachment_dir) . '/' . $filename;
+ $fp = fopen($fullpath, 'wb');
fwrite ($fp, $body);
fclose($fp);
- $composeMessage->initAttachment('message/rfc822',$subject.'.msg',
- $full_localfilename);
+
+ $composeMessage->initAttachment('message/rfc822', $subject . '.eml', $filename);
}
}
return $composesession;
}
-?>
projects / squirrelmail.git / blobdiff