From 91c27aee3c2f6c883b2996827567999e291cfd19 Mon Sep 17 00:00:00 2001 From: stekkel Date: Thu, 14 Apr 2005 22:09:03 +0000 Subject: [PATCH] Templates git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9277 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/constants.php | 88 +- functions/imap_messages.php | 182 ++- functions/mailbox_display.php | 2342 ++++++++++----------------------- functions/page_header.php | 441 +------ functions/strings.php | 19 +- include/load_prefs.php | 77 +- include/options/display.php | 10 +- src/compose.php | 36 +- src/download.php | 5 +- src/options_order.php | 305 +++-- src/read_body.php | 105 +- src/right_main.php | 202 ++- src/search.php | 352 +++-- 13 files changed, 1678 insertions(+), 2486 deletions(-) diff --git a/functions/constants.php b/functions/constants.php index 17bffe92..dedf720c 100644 --- a/functions/constants.php +++ b/functions/constants.php @@ -7,8 +7,8 @@ * Licensed under the GNU GPL. For full terms see the file COPYING. * * Loads constants used by the rest of the SquirrelMail source. - * This file is included by functions/date.php, include/load_prefs.php, - * plugins/administrator/defines.php, src/login.php and src/redirect.php. + * This file is include by src/login.php, src/redirect.php and + * src/load_prefs.php. * * @version $Id$ * @package squirrelmail @@ -17,9 +17,9 @@ /** Need to enable plugin functions for a hook */ require_once(SM_PATH . 'functions/plugin.php'); /* Required for the hook */ -//////////////////////////////////////////////////////////////// -// Set values for constants used by SquirrelMail preferences. // -//////////////////////////////////////////////////////////////// +/**************************************************************/ +/* Set values for constants used by SquirrelMail preferences. */ +/**************************************************************/ /* Define basic, general purpose preference constants. */ define('SMPREF_NO', 0); @@ -53,6 +53,84 @@ define('SMPREF_JS_OFF', 0); define('SMPREF_JS_ON', 1); define('SMPREF_JS_AUTODETECT', 2); +/** + * default value for page_selector_max + */ +define('PG_SEL_MAX', 10); + + +/** + * The number of pages to cache msg headers + */ +define('SQM_MAX_PAGES_IN_CACHE',5); + +/** + * The number of mailboxes to cache msg headers + */ +define('SQM_MAX_MBX_IN_CACHE',3); + +/** + * Sort constants used for sorting of messages + */ +define('SQSORT_NONE',0); +define('SQSORT_DATE_ASC',1); +define('SQSORT_DATE_DESC',2); +define('SQSORT_FROM_ASC',3); +define('SQSORT_FROM_DESC',4); +define('SQSORT_SUBJ_ASC',5); +define('SQSORT_SUBJ_DESC',6); +define('SQSORT_SIZE_ASC',7); +define('SQSORT_SIZE_DESC',8); +define('SQSORT_TO_ASC',9); +define('SQSORT_TO_DESC',10); +define('SQSORT_CC_ASC',11); +define('SQSORT_CC_DESC',12); +define('SQSORT_INT_DATE_ASC',13); +define('SQSORT_INT_DATE_DESC',14); + +/** + * Special sort constant thread which is added to above sort mode. + * By doing a bitwise check ($sort & SQSORT_THREAD) we know if the mailbox + * is sorted by thread. + */ +define('SQSORT_THREAD',32); + +/** + * Mailbox preference array keys + */ +define('MBX_PREF_SORT',0); +define('MBX_PREF_LIMIT',1); +define('MBX_PREF_AUTO_EXPUNGE',2); +define('MBX_PREF_INTERNALDATE',3); +define('MBX_PREF_COLUMNS',4); +// define('MBX_PREF_FUTURE',unique integer key); + +/** + * Email address array keys + */ +define('SQM_ADDR_PERSONAL', 0); +define('SQM_ADDR_ADL', 1); +define('SQM_ADDR_MAILBOX', 2); +define('SQM_ADDR_HOST', 3); + +/** + * Supported columns to show in a messages list + * The MBX_PREF_COLUMNS contains an ordered array with these columns + */ +define('SQM_COL_CHECK',0); +define('SQM_COL_FROM',1); +define('SQM_COL_DATE', 2); +define('SQM_COL_SUBJ', 3); +define('SQM_COL_FLAGS', 4); +define('SQM_COL_SIZE', 5); +define('SQM_COL_PRIO', 6); +define('SQM_COL_ATTACHMENT', 7); +define('SQM_COL_INT_DATE', 8); +define('SQM_COL_TO', 9); +define('SQM_COL_CC', 10); +define('SQM_COL_BCC', 11); + + do_hook('loading_constants'); ?> \ No newline at end of file diff --git a/functions/imap_messages.php b/functions/imap_messages.php index 740a6b1d..952f2598 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -21,7 +21,7 @@ * @param string $id The list of messages to copy * @param string $mailbox The destination to copy to * @param bool $handle_errors Show error messages in case of a NO, BAD or BYE response - * @return bool If the copy completed without errors + * @return bool If the copy completed without errors */ function sqimap_msgs_list_copy($imap_stream, $id, $mailbox, $handle_errors = true) { $msgs_id = sqimap_message_list_squisher($id); @@ -581,7 +581,7 @@ function parseArray($read,&$i) { /** * Retrieves a list with headers, flags, size or internaldate from the imap server * - * WARNING: function is not portable between SquirrelMail 1.2.x, 1.4.x and 1.5.x. + * WARNING: function is not portable between SquirrelMail 1.2.x, 1.4.x and 1.5.x. * Output format, third argument and $msg_list array format requirements differ. * @param stream $imap_stream imap connection * @param array $msg_list array with id's to create a msgs set from @@ -591,11 +591,19 @@ function parseArray($read,&$i) { * @since 1.1.3 */ function sqimap_get_small_header_list($imap_stream, $msg_list, - $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Importance', 'Priority', 'Content-Type'), + $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type'), $aFetchItems = array('FLAGS', 'RFC822.SIZE', 'INTERNALDATE')) { $aMessageList = array(); + /** + * Catch other priority headers as well + */ + if (in_array('X-Priority',$aHeaderFields,true)) { + $aHeaderFields[] = 'Importance'; + $aHeaderFields[] = 'Priority'; + } + $bUidFetch = ! in_array('UID', $aFetchItems, true); /* Get the small headers for each message in $msg_list */ @@ -645,22 +653,23 @@ function sqimap_get_small_header_list($imap_stream, $msg_list, * @author Marc Groot Koerkamp */ function parseFetch($aResponse,$aMessageList = array()) { - foreach ($aResponse as $r) { - $msg = array(); - // use unset because we do isset below - $read = implode('',$r); + for ($j=0,$iCnt=count($aResponse);$j<$iCnt;++$j) { + $aMsg = array(); + $read = implode('',$aResponse[$j]); + // free up memmory + unset($aResponse[$j]); /* unset does not reindex the array. the for loop is safe */ /* - * #idFETCH( - */ + * #idFETCH( + */ /* extract the message id */ - $i_space = strpos($read,' ',2); - $id = substr($read,2,$i_space-2); - $msg['ID'] = $id; + $i_space = strpos($read,' ',2);/* position 2ed */ + $id = substr($read,2/* skip "*" */,$i_space -2); + $aMsg['ID'] = $id; $fetch = substr($read,$i_space+1,5); if (!is_numeric($id) && $fetch !== 'FETCH') { - $msg['ERROR'] = $read; // htmlspecialchars should be done just before display. this is backend code + $aMsg['ERROR'] = $read; // htmlspecialchars should be done just before display. this is backend code break; } $i = strpos($read,'(',$i_space+5); @@ -674,6 +683,9 @@ function parseFetch($aResponse,$aMessageList = array()) { $i = strpos($read,' '); $arg = substr($read,0,$i); ++$i; + /* + * use allcaps for imap items and lowcaps for headers as key for the $aMsg array + */ switch ($arg) { case 'UID': @@ -696,7 +708,7 @@ function parseFetch($aResponse,$aMessageList = array()) { $flag = strtolower($flag); $aFlags[$flag] = true; } - $msg['FLAGS'] = $aFlags; + $aMsg['FLAGS'] = $aFlags; break; case 'RFC822.SIZE': $i_pos = strpos($read,' ',$i); @@ -704,77 +716,81 @@ function parseFetch($aResponse,$aMessageList = array()) { $i_pos = strpos($read,')',$i); } if ($i_pos) { - $msg['SIZE'] = substr($read,$i,$i_pos-$i); + $aMsg['SIZE'] = substr($read,$i,$i_pos-$i); $i = $i_pos+1; } else { break 3; } - break; case 'ENVELOPE': - break; // to be implemented, moving imap code out of the nessages class - sqimap_parse_address($read,$i,$msg); - break; // to be implemented, moving imap code out of the nessages class + // sqimap_parse_address($read,$i,$aMsg); + break; // to be implemented, moving imap code out of the Message class case 'BODYSTRUCTURE': - break; + break; // to be implemented, moving imap code out of the Message class case 'INTERNALDATE': - $msg['INTERNALDATE'] = trim(str_replace(' ', ' ',parseString($read,$i))); + $aMsg['INTERNALDATE'] = trim(str_replace(' ', ' ',parseString($read,$i))); break; case 'BODY.PEEK[HEADER.FIELDS': case 'BODY[HEADER.FIELDS': - $i = strpos($read,'{',$i); + $i = strpos($read,'{',$i); // header is always returned as literal because it contain \n characters $header = parseString($read,$i); if ($header === false) break 2; /* First we replace all \r\n by \n, and unfold the header */ $hdr = trim(str_replace(array("\r\n", "\n\t", "\n "),array("\n", ' ', ' '), $header)); - /* Now we can make a new header array with */ - /* each element representing a headerline */ - $hdr = explode("\n" , $hdr); + /* Now we can make a new header array with + each element representing a headerline */ + $aHdr = explode("\n" , $hdr); $aReceived = array(); - foreach ($hdr as $line) { + foreach ($aHdr as $line) { $pos = strpos($line, ':'); if ($pos > 0) { $field = strtolower(substr($line, 0, $pos)); if (!strstr($field,' ')) { /* valid field */ $value = trim(substr($line, $pos+1)); - switch($field) - { - case 'to': $msg['TO'] = $value; break; - case 'cc': $msg['CC'] = $value; break; - case 'from': $msg['FROM'] = $value; break; - case 'date': - $msg['DATE'] = str_replace(' ', ' ', $value); - break; - case 'x-priority': - case 'importance': - case 'priority': - $msg['PRIORITY'] = parsePriority($value); break; - case 'subject': $msg['SUBJECT'] = $value; break; - case 'content-type': - $type = $value; - if ($pos = strpos($type, ";")) { - $type = substr($type, 0, $pos); - } - $type = explode("/", $type); - if(!is_array($type) || count($type) < 2) { - $msg['TYPE0'] = 'text'; - $msg['TYPE1'] = 'plain'; - } else { - $msg['TYPE0'] = strtolower($type[0]); - $msg['TYPE1'] = strtolower($type[1]); - } - break; - case 'received': - $aReceived[] = $value; - break; - default: break; + switch($field) { + case 'date': + $aMsg['date'] = trim(str_replace(' ', ' ', $value)); + break; + case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value{0} : 3; break; + case 'priority': + case 'importance': + if (!isset($aMsg['x-priority'])) { + $value = strtolower(array_shift(split('/\w/',trim($value)))); + if (is_numeric($value)) { + $value = (int) $value; + } elseif ( $value == 'non-urgent' || $value == 'low' ) { + $value = 3; + } elseif ( $value == 'urgent' || $value == 'high' ) { + $value = 1; + } else { + // default is normal priority + $value = 3; + } + $aMsg['x-priority'] = $value; + } + break; + case 'content-type': + $type = $value; + if ($pos = strpos($type, ";")) { + $type = substr($type, 0, $pos); + } + $type = explode("/", $type); + if(!is_array($type) || count($type) < 2) { + $aMsg['content-type'] = array('text','plain'); + } else { + $aMsg['content-type'] = array(strtolower($type[0]),strtolower($type[1])); + } + break; + case 'received': + $aMsg['received'][] = $value; + break; + default: + $aMsg[$field] = $value; + break; } } } } - if (count($aReceived)) { - $msg['RECEIVED'] = $aReceived; - } break; default: ++$i; @@ -783,14 +799,11 @@ function parseFetch($aResponse,$aMessageList = array()) { } $msgi ="$unique_id"; $msg['UID'] = $unique_id; - - $aMessageList[$msgi] = $msg; - ++$msgi; + $aMessageList[$msgi] = $aMsg; } return $aMessageList; } - /** * Work in process * @private @@ -949,45 +962,4 @@ function sqimap_get_message($imap_stream, $id, $mailbox) { return $msg; } - -/** - * Deprecated !!!!!!! DO NOT USE THIS, use sqimap_msgs_list_copy instead - */ -function sqimap_messages_copy($imap_stream, $start, $end, $mailbox) { - $read = sqimap_run_command ($imap_stream, "COPY $start:$end " . sqimap_encode_mailbox_name($mailbox), true, $response, $message, TRUE); -} - - -/** - * Deprecated !!!!!!! DO NOT USE THIS, use sqimap_msgs_list_delete instead - */ -function sqimap_messages_delete($imap_stream, $start, $end, $mailbox, $bypass_trash=false) { - global $move_to_trash, $trash_folder; - - if (($move_to_trash == true) && ($bypass_trash != true) && - (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) { - sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder); - } - sqimap_messages_flag ($imap_stream, $start, $end, "Deleted", true); -} - - -/** - * Deprecated !!!!!!! DO NOT USE THIS, use sqimap_toggle_flag instead - * Set a flag on the provided uid list - * @param resource imap connection - */ -function sqimap_messages_flag($imap_stream, $start, $end, $flag, $handle_errors) { - $read = sqimap_run_command ($imap_stream, "STORE $start:$end +FLAGS (\\$flag)", $handle_errors, $response, $message, TRUE); -} - - -/** - * @deprecated - */ -function sqimap_get_small_header($imap_stream, $id, $sent) { - $res = sqimap_get_small_header_list($imap_stream, $id, $sent); - return $res[0]; -} - ?> diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 06f10138..47e70ba8 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,570 +1,27 @@ 1 ) { - $where = $aMsg['SEARCH'][0]; - $what = $aMsg['SEARCH'][1]; - } else { - $where = false; - $what = false; - } - $iIndent = $aMsg['INDENT']; - - $sSubject = (isset($msg['SUBJECT']) && $msg['SUBJECT'] != '') ? $msg['SUBJECT'] : _("(no subject)"); - $sFrom = (isset($msg['FROM'])) ? $msg['FROM'] : _("Unknown sender"); - $sTo = (isset($msg['TO'])) ? $msg['TO'] : _("Unknown recipient"); - $sCc = (isset($msg['CC'])) ? $msg['CC'] : ''; - $aFlags = (isset($msg['FLAGS'])) ? $msg['FLAGS'] : array(); - $iPrio = (isset($msg['PRIORITY'])) ? $msg['PRIORITY'] : 3; - $iSize = (isset($msg['SIZE'])) ? $msg['SIZE'] : 0; - - // These don't appear to be used... are they safe to remove - $sType0 = (isset($msg['TYPE0'])) ? $msg['TYPE0'] : 'text'; - $sType1 = (isset($msg['TYPE1'])) ? $msg['TYPE1'] : 'plain'; - if (isset($msg['INTERNALDATE'])) { - $sDate = getDateString(getTimeStamp(explode(' ',$msg['INTERNALDATE']))); - } else { - $sDate = (isset($msg['DATE'])) ? getDateString(getTimeStamp(explode(' ',$msg['DATE']))) : ''; - } - $iId = (isset($msg['UID'])) ? $msg['UID'] : false; - - if (!$iId) { - return; - } - - if ($GLOBALS['alt_index_colors']) { - if (!($t % 2)) { - if (!isset($color[12])) { - $color[12] = '#EAEAEA'; - } - $color_string = $color[12]; - } - } - - $urlMailbox = urlencode($mailbox); - - // FIXME, foldertype should be set in right_main.php - // in other words, handle as sent is obsoleted from now. - // We replace that by providing an array to aMailbox with the to shown headers - // that way we are free to show the user different layouts for different folders - $bSentFolder = handleAsSent($mailbox); - if ((!$bSentFolder) && ($show_recipient_instead)) { - // If the From address is the same as $email_address, then handle as Sent - $from_array = parseAddress($sFrom, 1); - if (!isset($email_address)) { - global $data_dir, $username; - $email_address = getPref($data_dir, $username, 'email_address'); - } - $bHandleAsSent = ((isset($from_array[0][0])) && ($from_array[0][0] == $email_address)); - } else { - $bHandleAsSent = $bSentFolder; - } - // If this is a Sent message, display To address instead of From - if ($bHandleAsSent) { - $sFrom = $sTo; - } - // Passing 1 below results in only 1 address being parsed, thus defeating the following code - $sFrom = parseAddress($sFrom/*,1*/); - - /* - * This is done in case you're looking into Sent folders, - * because you can have multiple receivers. - */ - $senderNames = $sFrom; - $senderName = ''; - $senderAddress = ''; - if (sizeof($senderNames)){ - foreach ($senderNames as $senderNames_part) { - if ($senderName != '') { - $senderName .= ', '; - $senderAddress .= ', '; - } - $sender_address_part = htmlspecialchars($senderNames_part[0]); - $sender_name_part = str_replace(' ',' ', decodeHeader($senderNames_part[1])); - if ($sender_name_part) { - $senderName .= $sender_name_part; - $senderAddress .= $sender_name_part . ' <' . $sender_address_part . '>'; - } else { - $senderName .= $sender_address_part; - $senderAddress .= $sender_address_part; - } - } - } - // If Sent, prefix with To: but only if not Sent folder - if ($bHandleAsSent ^ $bSentFolder) { - $senderName = _("To") . ': ' . $senderName; - $senderAddress = _("To") . ': ' . $senderAddress; - } - - // this is a column property which can apply to multiple columns. Do not use vars for one column - // only. instead we should use something like this: - // 1ed column $aMailbox['columns']['SUBJECT'] value: aray with properties ... - // 2ed column $aMailbox['columns']['FROM'] value: aray with properties ... - // NB in case of the sentfolder this could be the TO field - // properties array example: - // 'truncate' => length (0 is no truncate) - // 'prefix => if (x in b then do that ) - if ($truncate_sender > 0) { - $senderName = truncateWithEntities($senderName, $truncate_sender); - } - - $flag = $flag_end = $fontstr = $fontstr_end = $italic = $italic_end = ''; - $bold = ''; - $bold_end = ''; - - foreach ($aFlags as $sFlag => $value) { - switch ($sFlag) { - case '\\flagged': - if ($value) { - $flag = ""; - $flag_end = ''; - } - break; - case '\\seen': - if ($value) { - $bold = ''; - $bold_end = ''; - } - break; - case '\\deleted': - if ($value) { - $fontstr = ""; - $fontstr_end = ''; - } - break; - } - } - if ($bHandleAsSent) { - $italic = ''; - $italic_end = ''; - } - - if ($where && $what) { - $searchstr = '&where='.$where.'&what='.$what; - } else { - $searchstr = ''; - } - /* - * Message highlight code - */ - $matches = array('TO' => 'sTo', 'CC' => 'sCc', 'FROM' => 'sFrom', 'SUBJECT' => 'sSubject'); - if (is_array($message_highlight_list) && count($message_highlight_list)) { - $sTo = parseAddress($sTo); - $sCc = parseAddress($sCc); - foreach ($message_highlight_list as $message_highlight_list_part) { - if (trim($message_highlight_list_part['value']) != '') { - $high_val = strtolower($message_highlight_list_part['value']); - $match_type = strtoupper($message_highlight_list_part['match_type']); - if($match_type == 'TO_CC') { - $match = array('TO', 'CC'); - } else { - $match = array($match_type); - } - foreach($match as $match_type) { - switch($match_type) { - case('TO'): - case('CC'): - case('FROM'): - foreach ($$matches[$match_type] as $address) { - $address[0] = decodeHeader($address[0], true, false); - $address[1] = decodeHeader($address[1], true, false); - if (strstr('^^' . strtolower($address[0]), $high_val) || - strstr('^^' . strtolower($address[1]), $high_val)) { - $hlt_color = $message_highlight_list_part['color']; - break 4; - } - } - break; - default: - $headertest = strtolower(decodeHeader($$matches[$match_type], true, false)); - if (strstr('^^' . $headertest, $high_val)) { - $hlt_color = $message_highlight_list_part['color']; - break 3; - } - break; - } - } - } - } - } /* end Message highlight code */ - - if (!isset($hlt_color)) { - $hlt_color = $color_string; - } - - $col = 0; - $sSubject = str_replace(' ', ' ', decodeHeader($sSubject)); - $subject = processSubject($sSubject, $iIndent); - - - $row_extra = 'valign="top"'; - - - // this stuff does the auto row highlighting on mouseover - // - if ($javascript_on && $fancy_index_highlite) { - - $mouseoverColor = $color[5]; - - // set this to an empty string to turn off extra - // highlighting of checked rows - // - //$clickedColor = ''; - if (!empty($color[16])) - $clickedColor = $color[16]; - else - $clickedColor = $color[2]; - - $row_extra .= ' onmouseover="setPointer(this, ' . $t . ', \'over\', \'' . $hlt_color . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');" onmouseout="setPointer(this, ' . $t . ', \'out\', \'' . $hlt_color . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');" onmousedown="setPointer(this, ' . $t . ', \'click\', \'' . $hlt_color . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');"'; - - } - - - if ($javascript_on && $fancy_index_highlite) - echo ""; - echo html_tag( 'tr', '', '', '', $row_extra) . "\n"; - - - // this does the auto-checking of the checkbox no matter - // where on the row you click - // - $javascript_auto_click = ''; - $checkbox_javascript = ''; - if ($javascript_on && $fancy_index_highlite) { - $javascript_auto_click = ' onMouseDown="row_click(\'msg[' . $t . ']\')"'; - $checkbox_javascript = ' onClick="this.checked = !this.checked;"'; - } - - - if (sizeof($index_order)) { - - // 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 - // - $show_label_columns = array(); - if (!($javascript_on && $fancy_index_highlite)) { - $get_next_two = 0; - $last_order_part = 0; - $last_last_order_part = 0; - foreach ($index_order as $index_order_part) { - - if ($index_order_part == 1) { - $get_next_two = 1; - if ($last_last_order_part != 4) - $show_label_columns[] = $last_last_order_part; - if ($last_order_part != 4) - $show_label_columns[] = $last_order_part; - - } else if ($get_next_two > 0 && $get_next_two < 3 && $index_order_part != 4) { - $show_label_columns[] = $index_order_part; - $get_next_two++; - } - $last_last_order_part = $last_order_part; - $last_order_part = $index_order_part; - } - } - - - // build the actual columns for display - // - foreach ($index_order as $index_order_part) { - if (in_array($index_order_part, $show_label_columns)) { - $label_start = ''; - } else { - $label_start = ''; - $label_end = ''; - } - switch ($index_order_part) { - case 1: /* checkbox */ - echo html_tag( 'td', - addCheckBox("msg[$t]", $checkall, $iId, $checkbox_javascript), - 'center', - $hlt_color, $javascript_auto_click); - break; - case 2: /* from */ - if ($senderAddress != $senderName) { - $senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS))); - $title = ' title="' . str_replace(array('"', '<', '>'), array("''", '<', '>'), $senderAddress) . '"'; - } else { - $title = ''; - } - echo html_tag( 'td', - $label_start . $italic . $bold . $flag . $fontstr . $senderName . - $fontstr_end . $flag_end . $bold_end . $italic_end . $label_end, - 'left', - $hlt_color, $title . $javascript_auto_click); - break; - case 3: /* date */ - if ($sDate == '') { - $sDate = _("Unknown date"); - } - echo html_tag( 'td', - $label_start . $bold . $flag . $fontstr . $sDate . - $fontstr_end . $flag_end . $bold_end . $label_end, - 'center', - $hlt_color, - 'style="white-space: nowrap;"' . $javascript_auto_click ); - break; - case 4: /* subject */ - $td_str = $bold; - if ($iIndent) { - $td_str .= str_repeat("    ",$iIndent); - } - $td_str .= ''), array("''", '<', '>'), $title); - $td_str .= " title=\"$title\""; - } - $td_str .= ">$flag$subject$flag_end$bold_end"; - echo html_tag( 'td', $td_str, 'left', $hlt_color, $javascript_auto_click ); - break; - case 5: /* flags */ - - // icon message markers - // - if ($use_icons && $icon_theme != 'none') { - $td_str = ""; - if (isset($aFlags['\\flagged']) && $aFlags['\\flagged'] == true) { - $td_str .= ' '; - } - if ($default_use_priority) { - if ( ($iPrio == 1) || ($iPrio == 2) ) { - $td_str .= ' '; - } - else if ($iPrio == 5) { - $td_str .= ' '; - } - else { - $td_str .= ' '; - } - } - if ($sType1 == 'mixed') { - $td_str .= ''; - } else { - $td_str .= ''; - } - - $msg_icon = ''; - if (!isset($aFlags['\\seen']) || ($aFlags['\\seen']) == false) { - $msg_alt = '(' . _("New") . ')'; - $msg_title = '(' . _("New") . ')'; - $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_new'; - } else { - $msg_alt = '(' . _("Read") . ')'; - $msg_title = '(' . _("Read") . ')'; - $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_read'; - } - if (isset($aFlags['\\deleted']) && ($aFlags['\\deleted']) == true) { - $msg_icon .= '_deleted'; - } - if (isset($aFlags['\\answered']) && ($aFlags['\\answered']) == true) { - $msg_alt = '(' . _("Answered") . ')'; - $msg_title = '(' . _("Answered") . ')'; - $msg_icon .= '_reply'; - } - $td_str .= ''. $msg_alt . ''; - $td_str .= ''; - echo html_tag( 'td', - $label_start . $td_str . $label_end, - 'right', - $hlt_color, - 'style="white-space: nowrap;"' . $javascript_auto_click ); - } - - // plain text message markers - // - else { - $stuff = false; - $td_str = ""; - if (isset($aFlags['\\answered']) && $aFlags['\\answered'] == true) { - $td_str .= _("A"); - $stuff = true; - } - if ($sType1 == 'mixed') { - $td_str .= '+'; - $stuff = true; - } - if ($default_use_priority) { - if ( ($iPrio == 1) || ($iPrio == 2) ) { - $td_str .= "!"; - $stuff = true; - } - if ($iPrio == 5) { - $td_str .= "?"; - $stuff = true; - } - } - if (isset($aFlags['\\deleted']) && $aFlags['\\deleted'] == true) { - $td_str .= "D"; - $stuff = true; - } - if (!$stuff) { - $td_str .= ' '; - } - $td_str .= ''; - echo html_tag( 'td', - $label_start . $td_str . $label_end, - 'center', - $hlt_color, - 'style="white-space: nowrap;"' . $javascript_auto_click ); - } - break; - case 6: /* size */ - echo html_tag( 'td', - $label_start . $bold . $fontstr . show_readable_size($iSize) . - $fontstr_end . $bold_end . $label_end, - 'right', - $hlt_color, $javascript_auto_click ); - break; - } - ++$col; - } - } - /* html for separationlines between rows */ - if ($last) { - echo ''."\n"; - } else { - echo '' . "\n" . '' . "\n"; - } -} - - -function setUserPref($username, $pref, $value) { - global $data_dir; - setPref($data_dir,$username,$pref,$value); -} /** * Selects a mailbox for header retrieval. @@ -577,32 +34,16 @@ function setUserPref($username, $pref, $value) { * @return array $aMailbox mailbox array with all relevant information * @author Marc Groot Koerkamp */ -function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { +function sqm_api_mailbox_select($imapConnection,$account,$mailbox,$aConfig,$aProps) { + /** * NB: retrieve this from the session before accessing this function * and make sure you write it back at the end of the script after * the aMailbox var is added so that the headers are added to the cache */ global $mailbox_cache; - /** - * In case the properties arrays are empty set the defaults. - */ - // Doesn't appear to be used... safe to remove? - $aDefaultMbxPref = array (); -// MBX_PREF_SORT => 0, -// MBX_PREF_LIMIT => 15, -// MBX_PREF_AUTO_EXPUNGE => 0, -// MBX_PREF_INTERNALDATE => 0 -// ); - /* array_merge doesn't work with integers as keys */ -// foreach ($aDefaultMbxPref as $key => $value) { -// if (!isset($aProps[$key])) { -// $aProps[$key] = $value; -// } -// } + $aDefaultConfigProps = array( -// 'allow_thread_sort' => 0, - 'allow_server_sort' => sqimap_capability($imapConnection,'SORT'), // 'charset' => 'US-ASCII', 'user' => false, /* no pref storage if false */ 'setindex' => 0, @@ -611,13 +52,14 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { ); $aConfig = array_merge($aDefaultConfigProps,$aConfig); + $iSetIndx = $aConfig['setindex']; $aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox); if ($mailbox_cache) { - if (isset($mailbox_cache[$mailbox])) { - $aCachedMailbox = $mailbox_cache[$mailbox]; + if (isset($mailbox_cache[$account.'_'.$mailbox])) { + $aCachedMailbox = $mailbox_cache[$account.'_'.$mailbox]; } else { $aCachedMailbox = false; } @@ -660,6 +102,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { $aMbxResponse['UIDVALIDTY'] = $aStatus['UIDVALIDITY']; } + $aMailbox['ACCOUNT'] = $account; $aMailbox['UIDSET'][$iSetIndx] = false; $aMailbox['ID'] = false; $aMailbox['SETINDEX'] = $iSetIndx; @@ -691,6 +134,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { (!($newsort % 2) && ($newsort - 1 == $oldsort))) { $aMailbox['UIDSET'][$iSetIndx] = array_reverse($aCachedMailbox['UIDSET'][$iSetIndx]); } else { + $server_sort_array = false; $aMailbox['MSG_HEADERS'] = false; $aMailbox['ID'] = false; } @@ -698,7 +142,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { if ($aConfig['user']) { // FIXME, in ideal situation, we write back the // prefs at the end of the script - setUserPref($aConfig['user'],"pref_$mailbox",serialize($aProps)); + setUserPref($aConfig['user'],'pref_'.$account.'_'.$mailbox,serialize($aProps)); } } else { $aMailbox['UIDSET'][$iSetIndx] = $aCachedMailbox['UIDSET'][$iSetIndx]; @@ -716,6 +160,12 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { $aMailbox['OFFSET'] = (isset($aConfig['offset']) && $aConfig['offset']) ? $aConfig['offset'] -1 : 0; $aMailbox['PAGEOFFSET'] = (isset($aConfig['offset']) && $aConfig['offset']) ? $aConfig['offset'] : 1; } + /** + * Restore the number of messages in the result set + */ + if (isset($aCachedMailbox['TOTAL'][$iSetIndx]) && $aCachedMailbox['TOTAL'][$iSetIndx]) { + $aMailbox['TOTAL'][$iSetIndx] = $aCachedMailbox['TOTAL'][$iSetIndx]; + } /** * Restore the showall value no new showall value is provided. @@ -727,22 +177,32 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { $aMailbox['SHOWALL'][$iSetIndx] = (isset($aConfig['showall']) && $aConfig['showall']) ? 1 : 0; } + /** + * Restore the sort order if no new sort order is provided. + */ if (!isset($aProps[MBX_PREF_SORT]) && isset($aCachedMailbox['SORT'])) { $aMailbox['SORT'] = $aCachedMailbox['SORT']; } else { $aMailbox['SORT'] = (isset($aProps[MBX_PREF_SORT])) ? $aProps[MBX_PREF_SORT] : 0; } + /** + * Restore the number of message to show per page when no new limit is provided + */ if (!isset($aProps[MBX_PREF_LIMIT]) && isset($aCachedMailbox['LIMIT'])) { $aMailbox['LIMIT'] = $aCachedMailbox['LIMIT']; } else { $aMailbox['LIMIT'] = (isset($aProps[MBX_PREF_LIMIT])) ? $aProps[MBX_PREF_LIMIT] : 15; } - if (!isset($aProps[MBX_PREF_INTERNALDATE]) && isset($aCachedMailbox['INTERNALDATE'])) { - $aMailbox['INTERNALDATE'] = $aCachedMailbox['INTERNALDATE']; + /** + * Restore the ordered columns to show when no new ordered columns are provided + */ + if (!isset($aProps[MBX_PREF_COLUMNS]) && isset($aCachedMailbox['COLUMNS'])) { + $aMailbox['COLUMNS'] = $aCachedMailbox['COLUMNS']; } else { - $aMailbox['INTERNALDATE'] = (isset($aProps[MBX_PREF_INTERNALDATE])) ? $aProps[MBX_PREF_INTERNALDATE] : false; + $aMailbox['COLUMNS'] = (isset($aProps[MBX_PREF_COLUMNS])) ? $aProps[MBX_PREF_COLUMNS] : + array(SQM_COL_FLAGS,SQM_COL_FROM, SQM_COL_SUBJ, SQM_COL_FLAGS); } if (!isset($aProps[MBX_PREF_AUTO_EXPUNGE]) && isset($aCachedMailbox['AUTO_EXPUNGE'])) { @@ -750,19 +210,11 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { } else { $aMailbox['AUTO_EXPUNGE'] = (isset($aProps[MBX_PREF_AUTO_EXPUNGE])) ? $aProps[MBX_PREF_AUTO_EXPUNGE] : false; } - - if (!isset($aConfig['allow_thread_sort']) && isset($aCachedMailbox['ALLOW_THREAD'])) { - $aMailbox['ALLOW_THREAD'] = $aCachedMailbox['ALLOW_THREAD']; - } else { - $aMailbox['ALLOW_THREAD'] = (isset($aConfig['allow_thread_sort'])) ? $aConfig['allow_thread_sort'] : false; - } - if (!isset($aConfig['search']) && isset($aCachedMailbox['SEARCH'][$iSetIndx])) { $aMailbox['SEARCH'][$iSetIndx] = $aCachedMailbox['SEARCH'][$iSetIndx]; } else { $aMailbox['SEARCH'][$iSetIndx] = (isset($aConfig['search'])) ? $aConfig['search'] : 'ALL'; } - if (!isset($aConfig['charset']) && isset($aCachedMailbox['CHARSET'][$iSetIndx])) { $aMailbox['CHARSET'][$iSetIndx] = $aCachedMailbox['CHARSET'][$iSetIndx]; } else { @@ -778,22 +230,14 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { $aMailbox['PERMANENTFLAGS'] = $aMbxResponse['PERMANENTFLAGS']; $aMailbox['RIGHTS'] = $aMbxResponse['RIGHTS']; - - /* decide if we are thread sorting or not */ - if (!$aMailbox['ALLOW_THREAD']) { - if ($aMailbox['SORT'] & SQSORT_THREAD) { - $aMailbox['SORT'] -= SQSORT_THREAD; - } - } if ($aMailbox['SORT'] & SQSORT_THREAD) { - $aMailbox['SORT_METHOD'] = 'THREAD'; - $aMailbox['THREAD_INDENT'] = $aCachedMailbox['THREAD_INDENT']; - } else if (isset($aConfig['allow_server_sort']) && $aConfig['allow_server_sort']) { - $aMailbox['SORT_METHOD'] = 'SERVER'; - $aMailbox['THREAD_INDENT'] = false; + if (!sqimap_capability($imapConnection,'THREAD')) { + $aMailbox['SORT'] ^= SQSORT_THREAD; + } else { + $aMailbox['THREAD_INDENT'] = $aCachedMailbox['THREAD_INDENT']; + } } else { - $aMailbox['SORT_METHOD'] = 'SQUIRREL'; $aMailbox['THREAD_INDENT'] = false; } @@ -802,106 +246,20 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { return $aMailbox; } - - /** - * Does the $srt $_GET var to field mapping + * Fetch the message headers for a mailbox. Settings are part of the aMailbox + * array. * - * @param int $srt Field to sort on - * @param bool $bServerSort Server sorting is true - * @return string $sSortField Field to sort on + * @param resource $imapConnection imap socket handle + * @param array $aMailbox (reference) mailbox retrieved from sqm_api_mailbox_select + * @return error $error error number + * @author Marc Groot Koerkamp */ -function getSortField($sort,$bServerSort) { - switch($sort) { - case SQSORT_NONE: - $sSortField = 'UID'; - break; - case SQSORT_DATE_ASC: - case SQSORT_DATE_DEC: - $sSortField = 'DATE'; - break; - case SQSORT_FROM_ASC: - case SQSORT_FROM_DEC: - $sSortField = 'FROM'; - break; - case SQSORT_SUBJ_ASC: - case SQSORT_SUBJ_DEC: - $sSortField = 'SUBJECT'; - break; - case SQSORT_SIZE_ASC: - case SQSORT_SIZE_DEC: - $sSortField = ($bServerSort) ? 'SIZE' : 'RFC822.SIZE'; - break; - case SQSORT_TO_ASC: - case SQSORT_TO_DEC: - $sSortField = 'TO'; - break; - case SQSORT_CC_ASC: - case SQSORT_CC_DEC: - $sSortField = 'CC'; - break; - case SQSORT_INT_DATE_ASC: - case SQSORT_INT_DATE_DEC: - $sSortField = ($bServerSort) ? 'ARRIVAL' : 'INTERNALDATE'; - break; - case SQSORT_THREAD: - break; - default: $sSortField = 'UID'; - break; +function fetchMessageHeaders($imapConnection, &$aMailbox, $aFetchHeaders) { - } - return $sSortField; -} - -function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) { - $iSetIndx = (isset($aMailbox['SETINDEX'])) ? $aMailbox['SETINDEX'] : 0; - $bDirection = ($aMailbox['SORT'] % 2); - $error = false; - if (!$aMailbox['SEARCH'][$iSetIndx]) { - $aMailbox['SEARCH'][$iSetIndx] = 'ALL'; - } - switch ($aMailbox['SORT_METHOD']) { - case 'THREAD': - $aRes = get_thread_sort($imapConnection,$aMailbox['SEARCH'][$iSetIndx]); - if ($aRes === false) { - $error = '
' . - _("Thread sorting is not supported by your IMAP server.") . '
' . - _("Please contact your system administrator and report this error.") . - '
'; - $aMailbox['SORT'] -= SQSORT_THREAD; - } else { - $aMailbox['UIDSET'][$iSetIndx] = $aRes[0]; - $aMailbox['THREAD_INDENT'][$iSetIndx] = $aRes[1]; - } - break; - case 'SERVER': - $sSortField = getSortField($aMailbox['SORT'],true); - $id = sqimap_get_sort_order($imapConnection, $sSortField, $bDirection, $aMailbox['SEARCH'][$iSetIndx]); - if ($id === false) { - $error = '
' . - _("Server-side sorting is not supported by your IMAP server.") . '
' . - _("Please contact your system administrator and report this error.") . - '
'; - } else { - $aMailbox['UIDSET'][$iSetIndx] = $id; - } - break; - default: - $id = NULL; - if ($aMailbox['SEARCH'][$iSetIndx] != 'ALL') { - $id = sqimap_run_search($imapConnection, $aMailbox['SEARCH'][$iSetIndx], $aMailbox['CHARSET'][$iSetIndx]); - } - $sSortField = getSortField($aMailbox['SORT'],false); - $aMailbox['UIDSET'][$iSetIndx] = get_squirrel_sort($imapConnection, $sSortField, $bDirection, $id); - break; - } - return $error; -} - - - - -function fetchMessageHeaders($imapConnection, &$aMailbox) { + /* FIX ME, this function is kind of big, maybe we can split it up in + a couple of functions. Make sure the functions are private and starts with _ + Also make sure that the error codes are propagated */ /** * Retrieve the UIDSET. @@ -922,32 +280,39 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) { $start_msg = 1; } } - - + //sm_print_r($aMailbox); if (is_array($aMailbox['UIDSET'])) { $aUid =& $aMailbox['UIDSET'][$iSetIndx]; } else { $aUid = false; } + $iError = 0; + $aFetchItems = $aHeaderItems = array(); // initialize the fields we want to retrieve: - $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Importance', 'Priority', 'Content-Type'); - $aFetchItems = array('FLAGS', 'RFC822.SIZE'); - - // Are we sorting on internaldate then retrieve the internaldate value as well - if ($aMailbox['INTERNALDATE']) { - $aFetchItems[] = 'INTERNALDATE'; + foreach ($aFetchHeaders as $v) { + switch ($v) { + case SQM_COL_DATE: $aHeaderFields[] = 'Date'; break; + case SQM_COL_TO: $aHeaderFields[] = 'To'; break; + case SQM_COL_CC: $aHeaderFields[] = 'Cc'; break; + case SQM_COL_FROM: $aHeaderFields[] = 'From'; break; + case SQM_COL_SUBJ: $aHeaderFields[] = 'Subject'; break; + case SQM_COL_PRIO: $aHeaderFields[] = 'X-Priority'; break; + case SQM_COL_ATTACHMENT: $aHeaderFields[] = 'Content-Type'; break; + case SQM_COL_INT_DATE: $aFetchItems[] = 'INTERNALDATE'; break; + case SQM_COL_FLAGS: $aFetchItems[] = 'FLAGS'; break; + case SQM_COL_SIZE: $aFetchItems[] = 'RFC822.SIZE'; break; + default: break; + } } - /** * A uidset with sorted uid's is available. We can use the cache */ - if (($aMailbox['SORT'] != SQSORT_NONE || $aMailbox['SEARCH'][$iSetIndx] != 'ALL') && - isset($aUid) && $aUid ) { + if (isset($aUid) && $aUid ) { // limit the cache to SQM_MAX_PAGES_IN_CACHE - if (!$aMailbox['SHOWALL'][$iSetIndx]) { + if (!$aMailbox['SHOWALL'][$iSetIndx] && isset($aMailbox['MSG_HEADERS'])) { $iMaxMsgs = $iLimit * SQM_MAX_PAGES_IN_CACHE; $iCacheSize = count($aMailbox['MSG_HEADERS']); if ($iCacheSize > $iMaxMsgs) { @@ -965,8 +330,14 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) { $id_slice = array_slice($aUid,$start_msg-1,$iLimit); /* do some funky cache checks */ - $aUidCached = array_keys($aMailbox['MSG_HEADERS']); + if (isset($aMailbox['MSG_HEADERS'])) { + $aUidCached = array_keys($aMailbox['MSG_HEADERS']); + } else { + $aMailbox['MSG_HEADERS'] = array(); + $aUidCached = array(); + } $aUidNotCached = array_values(array_diff($id_slice,$aUidCached)); + /** * $aUidNotCached contains an array with UID's which need to be fetched to * complete the needed message headers. @@ -977,937 +348,693 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) { // append the msgs to the existend headers $aMailbox['MSG_HEADERS'] += $aMsgs; } - } else { /** - * Initialize the sorted UID list and fetch the visible message headers + * Initialize the sorted UID list or initiate a UID list with search + * results and fetch the visible message headers */ - if ($aMailbox['SORT'] != SQSORT_NONE || $aMailbox['SEARCH'][$iSetIndx] != 'ALL') {// || $aMailbox['SORT_METHOD'] & SQSORT_THREAD 'THREAD') { - $error = false; + if ($aMailbox['SEARCH'][$iSetIndx] != 'ALL') { // in case of a search request + if ($aMailbox['SEARCH'][$iSetIndx] && $aMailbox['SORT'] == 0) { $aUid = sqimap_run_search($imapConnection, $aMailbox['SEARCH'][$iSetIndx], $aMailbox['CHARSET'][$iSetIndx]); } else { - $error = get_sorted_msgs_list($imapConnection,$aMailbox,$error); + + $iError = 0; + $iError = _get_sorted_msgs_list($imapConnection,$aMailbox,$iError); $aUid = $aMailbox['UIDSET'][$iSetIndx]; } - if ($error === false) { + if (!$iError) { + /** + * Number of messages is the resultset + */ + $aMailbox['TOTAL'][$iSetIndx] = count($aUid); $id_slice = array_slice($aUid,$aMailbox['OFFSET'], $iLimit); if (count($id_slice)) { $aMailbox['MSG_HEADERS'] = sqimap_get_small_header_list($imapConnection,$id_slice, $aHeaderFields,$aFetchItems); } else { - return false; - } - - } else { - // FIX ME, format message and fallback to squirrel sort - if ($error) { - echo $error; + $iError = 1; // FIX ME, define an error code } } - } else { - // limit the cache to SQM_MAX_PAGES_IN_CACHE - if (!$aMailbox['SHOWALL'][$iSetIndx] && isset($aMailbox['MSG_HEADERS']) && is_array($aMailbox['MSG_HEADERS'])) { - $iMaxMsgs = $iLimit * SQM_MAX_PAGES_IN_CACHE; - $iCacheSize = count($aMailbox['MSG_HEADERS']); - if ($iCacheSize > $iMaxMsgs) { - $iReduce = $iCacheSize - $iMaxMsgs; - foreach ($aMailbox['MSG_HEADERS'] as $iUid => $value) { - if ($iReduce) { - $iId = $aMailbox['MSG_HEADERS'][$iUid]['ID']; - unset($aMailbox['MSG_HEADERS'][$iUid]); - unset($aMailbox['ID'][$iId]); - } else { - break; - } - --$iReduce; - } - } - } - - /** - * retrieve messages by sequence id's and fetch the UID to retrieve - * the UID. for sorted lists this is not needed because a UID FETCH - * automaticly add the UID value in fetch results - **/ - $aFetchItems[] = 'UID'; - - //create id range - $iRangeStart = $aMailbox['EXISTS'] - $aMailbox['OFFSET']; - $iRangeEnd = ($iRangeStart > $iLimit) ? - ($iRangeStart - $iLimit+1):1; - - $id_slice = range($iRangeStart, $iRangeEnd); - /** - * Non sorted mailbox with cached message headers - */ - if (isset($aMailbox['ID']) && is_array($aMailbox['ID'])) { - // the fetched id => uid relation - $aId = $aMailbox['ID']; - $aIdCached = array(); - foreach ($aId as $iId => $iUid) { - if (isset($aMailbox['MSG_HEADERS'][$iUid])) { - if ($iId <= $iRangeStart && $iId >= $iRangeEnd) { - $aIdCached[] = $iId; - } - } - } - $aIdNotCached = array_diff($id_slice,$aIdCached); - } else { - $aIdNotCached = $id_slice; - } - - if (count($aIdNotCached)) { - $aMsgs = sqimap_get_small_header_list($imapConnection,$aIdNotCached, - $aHeaderFields,$aFetchItems); - // append the msgs to the existend headers - if (isset($aMailbox['MSG_HEADERS']) && is_array($aMailbox['MSG_HEADERS'])) { - $aMailbox['MSG_HEADERS'] += $aMsgs; + } else { // + $iError = 0; + $iError = _get_sorted_msgs_list($imapConnection,$aMailbox,$iError); + $aUid = $aMailbox['UIDSET'][$iSetIndx]; + + if (!$iError) { + /** + * Number of messages is the resultset + */ + $aMailbox['TOTAL'][$iSetIndx] = count($aUid); + $id_slice = array_slice($aUid,$aMailbox['OFFSET'], $iLimit); + if (count($id_slice)) { + $aMailbox['MSG_HEADERS'] = sqimap_get_small_header_list($imapConnection,$id_slice, + $aHeaderFields,$aFetchItems); } else { - $aMailbox['MSG_HEADERS'] = $aMsgs; - } - // update the ID array - foreach ($aMsgs as $iUid => $aMsg) { - if (isset($aMsg['ID'])) { - $aMailbox['ID'][$aMsg['ID']] = $iUid; - } - } - } - - /** - * In unsorted state we show newest messages first which means - * that the UIDSET which represents the order of the messages - * should contain a high to low ordered UID list - */ - $aSortedUidList = array(); - foreach ($id_slice as $iId) { - if (isset($aMailbox['ID'][$iId])) { - $aSortedUidList[] = $aMailbox['ID'][$iId]; + $iError = 1; // FIX ME, define an error code } } - $aMailbox['UIDSET'][$iSetIndx] = $aSortedUidList; - $aMailbox['OFFSET'] = 0; - } - } - return true; -} - -/** - * This function loops through a group of messages in the mailbox - * and shows them to the user. - * - * @param mixed $imapConnection - * @param array $aMailbox associative array with mailbox related vars - */ -function showMessagesForMailbox($imapConnection, &$aMailbox) { - global $color, $javascript_on, $compact_paginator; - - // to retrieve the internaldate pref: (I know this is not the right place to do that, move up in front - // and use a properties array as function argument to provide user preferences - global $data_dir, $username; - - if (!fetchMessageHeaders($imapConnection, $aMailbox)) { - return false; - } - $iSetIndx = $aMailbox['SETINDEX']; - $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $aMailbox['EXISTS'] : $aMailbox['LIMIT']; - $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $aMailbox['EXISTS']) ? - $aMailbox['PAGEOFFSET'] + $iLimit - 1 : $aMailbox['EXISTS']; - - $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'], - $aMailbox['EXISTS'], $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]); - - $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$aMailbox['EXISTS']); - - do_hook('mailbox_index_before'); - - if ($javascript_on && $compact_paginator) { - // Insert compact paginator javascript - echo "\n\n" - . "\n" - . "\n"; - } - mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str); -?> - - - - - - - -
- - -
-
- - - - - $aHeaders[$aId[$i]], - 'INDX' => $t, - 'OFFSET' => $iOffset, - 'PAGEOFFSET' => $iPageOffset, - 'SORT' => $sort, - 'SEARCH' => $aSearch, - 'MAILBOX' => $sMailbox, - 'INDENT' => $indent, - 'LAST' => $bLast - ); - printMessageInfo($aMsg); - ++$t; - } else { - break; - } - } -} - -/** - * Displays the standard message list header. - * - * To finish the table, you need to do a ""; - * - * @param resource $imapConnection - * @param array $aMailbox associative array with mailbox related information - * @param string $msg_cnt_str - * @param string $paginator Paginator string - */ -function mail_message_listing_beginning ($imapConnection, - $aMailbox, - $msg_cnt_str = '', - $paginator = ' ' - ) { - global $color, $show_flag_buttons, $PHP_SELF; - global $lastTargetMailbox, $boxes; - - $php_self = $PHP_SELF; - - if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) { - $source_url = $regs[1]; - } else { - $source_url = $php_self; - } - $php_self = str_replace('&', '&', $php_self); - - if (!isset($msg)) { - $msg = ''; - } - - $moveFields = addHidden('msg', $msg). - addHidden('mailbox', $aMailbox['NAME']). - addHidden('startMessage', $aMailbox['PAGEOFFSET']); - - /* build thread sorting links */ - $sort = $aMailbox['SORT']; - if ($aMailbox['ALLOW_THREAD']) { - if ($aMailbox['SORT'] & SQSORT_THREAD) { - $sort -= SQSORT_THREAD; - $thread_name = _("Unthread View"); - } else { - $thread_name = _("Thread View"); - $sort = $aMailbox['SORT'] + SQSORT_THREAD; } - $thread_link_str = '[' . $thread_name - . ']'; - } else { - $thread_link_str =''; } - /* - * This is the beginning of the message list table. - * It wraps around all messages - */ - $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $aMailbox['NAME']); - $form_name = "FormMsgs" . $safe_name; - - echo '
' ."\n" - . $moveFields; - echo ' - - - - - - $v) { + switch ($k) { + case SQM_COL_FROM: $aCol[SQM_COL_FROM] = 'from'; break; + case SQM_COL_DATE: $aCol[SQM_COL_DATE] = 'date'; break; + case SQM_COL_SUBJ: $aCol[SQM_COL_SUBJ] = 'subject'; break; + case SQM_COL_FLAGS: $aCol[SQM_COL_FLAGS] = 'FLAGS'; break; + case SQM_COL_SIZE: $aCol[SQM_COL_SIZE] = 'SIZE'; break; + case SQM_COL_PRIO: $aCol[SQM_COL_PRIO] = 'x-priority'; break; + case SQM_COL_ATTACHMENT: $aCol[SQM_COL_ATTACHMENT] = 'content-type'; break; + case SQM_COL_INT_DATE: $aCol[SQM_COL_INT_DATE] = 'INTERNALDATE'; break; + case SQM_COL_TO: $aCol[SQM_COL_TO] = 'to'; break; + case SQM_COL_CC: $aCol[SQM_COL_CC] = 'cc'; break; + case SQM_COL_BCC: $aCol[SQM_COL_BCC] = 'bcc'; break; + default: break; + } + } + $aFormattedMessages = array(); + + + $iSetIndx = $aMailbox['SETINDEX']; + $aId = $aMailbox['UIDSET'][$iSetIndx]; + $aHeaders =& $aMailbox['MSG_HEADERS']; /* use a reference to avoid a copy. + MSG_HEADERS can contain large amounts of data */ + $iOffset = $aMailbox['OFFSET']; + $sort = $aMailbox['SORT']; + $iPageOffset = $aMailbox['PAGEOFFSET']; + $sMailbox = $aMailbox['NAME']; + $sSearch = (isset($aMailbox['SEARCH'][$aMailbox['SETINDEX']]) && + $aMailbox['SEARCH'][$aMailbox['SETINDEX']] != 'ALL') ? $aMailbox['SEARCH'][$aMailbox['SETINDEX']] : false; + $aSearch = ($sSearch) ? array('search.php',$aMailbox['SETINDEX']) : null; + /* avoid improper usage */ + if ($sMailbox && isset($iAccount) && $sTargetModule) { + $aInitQuery = array("account=$iAccount",'mailbox='.urlencode($sMailbox)); } else { - $showsort = false; + $aInitQuery = false; } - echo html_tag( 'tr' ,'' , 'center', $color[5] ); - - /* calculate the width of the subject column based on the - * widths of the other columns */ - $widths = array(1=>1,2=>25,3=>5,4=>0,5=>1,6=>5); - $subjectwidth = 100; - foreach($index_order as $item) { - $subjectwidth -= $widths[$item]; + if ($aMailbox['SORT'] & SQSORT_THREAD) { + $aIndentArray =& $aMailbox['THREAD_INDENT'][$aMailbox['SETINDEX']]; + $bThread = true; + } else { + $bThread = false; + } + /* + * Retrieve value for checkbox column + */ + if (!sqgetGlobalVar('checkall',$checkall,SQ_GET)) { + $checkall = false; } - foreach ($index_order as $item) { - switch ($item) { - case 1: /* checkbox */ - echo html_tag( 'td',get_selectall_link($aMailbox) , '', '', 'width="1%"' ); - break; - case 5: /* flags */ - echo html_tag( 'td',' ' , '', '', 'width="1%"' ); - break; - case 2: /* from */ - if (handleAsSent($aMailbox['NAME'])) { - echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) - . '' . _("To") . ''; - if ($showsort) { - ShowSortButton($aMailbox, SQSORT_TO_ASC, SQSORT_TO_DEC); - } - } else { - echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) - . '' . _("From") . ''; - if ($showsort) { - ShowSortButton($aMailbox, SQSORT_FROM_ASC, SQSORT_FROM_DEC); - } + /* + * Loop through and display the info for each message. + */ + $iEnd = ($aMailbox['SHOWALL'][$iSetIndx]) ? $aMailbox['EXISTS'] : $iOffset + $aMailbox['LIMIT']; + for ($i=$iOffset,$t=0;$i<$iEnd;++$i) { + if (isset($aId[$i])) { + + $bHighLight = false; + $value = $title = $link = $target = ''; + $aQuery = ($aInitQuery !== false) ? $aInitQuery : false; + $aMsg = $aHeaders[$aId[$i]]; + if (isset($aSearch) && count($aSearch) > 1 && $aQuery) { + $aQuery[] = "where=". $aSearch[0]; + $aQuery[] = "what=" . $aSearch[1]; } - echo "\n"; - break; - case 3: /* date */ - echo html_tag( 'td' ,'' , 'left', '', 'width="5%" style="white-space: nowrap;"' ) - . '' . _("Date") . ''; - if ($showsort) { - if ($internal_date_sort) { - ShowSortButton($aMailbox, SQSORT_INT_DATE_ASC, SQSORT_INT_DATE_DEC); - } else { - ShowSortButton($aMailbox, SQSORT_DATE_ASC, SQSORT_DATE_DEC); - } + $iUid = (isset($aMsg['UID'])) ? $aMsg['UID'] : $aId[$i]; + if ($aQuery) { + $aQuery[] = "passed_id=$aId[$i]"; + $aQuery[] = "startMessage=$iPageOffset"; } - echo "\n"; - break; - case 4: /* subject */ - echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' ) - . '' . _("Subject") . ''; - if ($showsort) { - ShowSortButton($aMailbox, SQSORT_SUBJ_ASC, SQSORT_SUBJ_DEC); + + foreach ($aCol as $k => $v) { + $link = $target = $title = ''; + $aColumns[$k] = array(); + $value = (isset($aMsg[$v])) ? $aMsg[$v] : ''; + $sUnknown = _("Unknown recipient"); + switch ($k) { + case SQM_COL_FROM: + $sUnknown = _("Unknown sender"); + case SQM_COL_TO: + case SQM_COL_CC: + case SQM_COL_BCC: + $sTmp = false; + if ($value) { + if ($highlight_list && !$bHighLight) { + $bHighLight = highlightMessage($aCol[$k], $value, $highlight_list,$aFormattedMessages[$iUid]); + } + $sTmp = getAddressString(parseRFC822Address($value),array('best' => true)); + if (isset($aColumnDesc[$k]['truncate']) && $aColumnDesc[$k]['truncate']) { + $sTrunc = truncateWithEntities($sTmp, $aColumnDesc[$k]['truncate']); + $title = ($sTrunc != $sTmp) ? htmlspecialchars($sTmp) : ''; + $sTmp = $sTrunc; + } + } + $value = ($sTmp) ? htmlspecialchars($sTmp) : $sUnknown; + break; + case SQM_COL_SUBJ: + if ($highlight_list && !$bHighLight) { + $bHighLight = highlightMessage('SUBJECT', $value, $highlight_list, $aFormattedMessages[$iUid]); + } + $iIndent = (isset($aIndentArray[$aId[$i]])) ? $aIndentArray[$aId[$i]] : 0; + if (isset($aColumnDesc[$k]['truncate']) && $aColumnDesc[$k]['truncate']) { + $sTmp = truncateWithEntities($value, $aColumnDesc[$k]['truncate']-$iIndent); + $title = ($sTmp != $value) ? htmlspecialchars($value) : ''; + $value = $sTmp; + } + /* generate the link to the message */ + if ($aQuery) { + // TODO, $sTargetModule should be a query parameter so that we can use a single entrypoint + $link = $sTargetModule.'.php?' . implode('&',$aQuery); + } + + $value = (trim($value)) ? $value : _("(no subject)"); + /* add thread indentation */ + $aColumns[$k]['indent'] = $iIndent; + $value = htmlspecialchars($value); + break; + case SQM_COL_SIZE: + $value = show_readable_size($value); + break; + case SQM_COL_DATE: + case SQM_COL_INT_DATE: + $value = getDateString(getTimeStamp(explode(' ',trim($value)))); + break; + case SQM_COL_FLAGS: + $aFlagColumn = array('seen' => false, + 'deleted'=>false, + 'answered'=>false, + 'flagged' => false, + 'draft' => false); + foreach ($value as $sFlag => $value) { + 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; + default: break; + } + } + $value = $aFlagColumn; + break; + case SQM_COL_PRIO: + $value = ($value) ? (int) $value : 3; + break; + case SQM_COL_ATTACHMENT: + $value = (is_array($value) && $value[0] == 'multipart' && $value[1] == 'mixed') ? true : false; + break; + case SQM_COL_CHECK: + $value = $checkall; + break; + default : break; + } + if ($title) { $aColumns[$k]['title'] = $title; } + if ($link) { $aColumns[$k]['link'] = $link; } + if ($target) { $aColumns[$k]['target'] = $target; } + $aColumns[$k]['value'] = $value; } - echo "\n"; - break; - case 6: /* size */ - echo html_tag( 'td', '', 'center','','width="5%" style="white-space: nowrap;"') - . '' . _("Size") . ''; - if ($showsort) { - ShowSortButton($aMailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC); + /* columns which will not be displayed but should be inspected + because the highlight list contains rules with those columns */ + foreach ($aExtraColumns as $k) { + if ($highlight_list && !$bHighLight) { + $bHighLight = highlightMessage($k, $value, $highlight_list,$aFormattedMessages[$iUid]); + } } - echo "\n"; + $aFormattedMessages[$iUid]['columns'] = $aColumns; + + } else { break; } } - echo "\n"; + return $aFormattedMessages; } -/** - * This function shows the sort button. Isn't this a good comment? - * - * @param array $aMailbox - * @param integer $Down - * @param integer $Up - */ -function ShowSortButton($aMailbox, $Down, $Up ) { - global $PHP_SELF; - /* Figure out which image we want to use. */ - if ($aMailbox['SORT'] != $Up && $aMailbox['SORT'] != $Down) { - $img = 'sort_none.png'; - $which = $Up; - } elseif ($aMailbox['SORT'] == $Up) { - $img = 'up_pointer.png'; - $which = $Down; - } else { - $img = 'down_pointer.png'; - $which = 0; - } +function highlightMessage($sCol, $sVal, $highlight_list, &$aFormat) { - if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) { - $source_url = $regs[1]; + + if (!is_array($highlight_list) && count($highlight_list) == 0) { + return false; + } + $hlt_color = false; + $sCol = strtoupper($sCol); + //echo "$sCol $sVal
"; + foreach ($highlight_list as $highlight_list_part) { + if (trim($highlight_list_part['value'])) { + $high_val = strtolower($highlight_list_part['value']); + $match_type = strtoupper($highlight_list_part['match_type']); + if($match_type == 'TO_CC') { + if ($sCol == 'TO' || $sCol == 'CC') { + $match_type = $sCol; + } else { + continue; + } + } else { + if ($match_type != $sCol) { + continue; + } + } + if (strpos(strtolower($sVal),$high_val) !== false) { + $hlt_color = $highlight_list_part['color']; + break; + } + } + } + if ($hlt_color) { + $aFormat['row']['color'] = $hlt_color; + return true; } else { - $source_url = $PHP_SELF; + return false; } +} - /* Now that we have everything figured out, show the actual button. */ - echo ' sort'; +function setUserPref($username, $pref, $value) { + global $data_dir; + setPref($data_dir,$username,$pref,$value); } /** - * FIXME: Undocumented function - * - * @param array $aMailbox - */ -function get_selectall_link($aMailbox) { - global $checkall, $javascript_on, $fancy_index_highlite, $color; - global $PHP_SELF; - - // set this to an empty string to turn off extra - // highlighting of checked rows - // - //$clickedColor = ''; - if (!empty($color[16])) - $clickedColor = $color[16]; - else - $clickedColor = $color[2]; - - $result = ''; - if ($javascript_on) { - $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $aMailbox['NAME']); - $func_name = "CheckAll" . $safe_name; - $form_name = "FormMsgs" . $safe_name; - $result = '' - . ''; -// . ' . _("Toggle All") -// . "\n"; - } else { - $result .= ""; - $result .= _("All"); - $result .= "\n"; } - - /* Return our final result. */ - return ($result); + return $error; } /** - * This function computes the "Viewing Messages..." string. - * - * @param integer $start_msg first message number - * @param integer $end_msg last message number - * @param integer $num_msgs total number of message in folder - * @return string - */ -function get_msgcnt_str($start_msg, $end_msg, $num_msgs) { - /* Compute the $msg_cnt_str. */ - $result = ''; - if ($start_msg < $end_msg) { - $result = sprintf(_("Viewing Messages: %s to %s (%s total)"), - ''.$start_msg.'', ''.$end_msg.'', $num_msgs); - } else if ($start_msg == $end_msg) { - $result = sprintf(_("Viewing Message: %s (%s total)"), ''.$start_msg.'', $num_msgs); - } else { - $result = '
'; +* Does the $srt $_GET var to field mapping +* +* @param int $srt Field to sort on +* @param bool $bServerSort Server sorting is true +* @return string $sSortField Field to sort on +* @private +*/ +function _getSortField($sort,$bServerSort) { + switch($sort) { + case SQSORT_NONE: + $sSortField = 'UID'; + break; + case SQSORT_DATE_ASC: + case SQSORT_DATE_DESC: + $sSortField = 'DATE'; + break; + case SQSORT_FROM_ASC: + case SQSORT_FROM_DESC: + $sSortField = 'FROM'; + break; + case SQSORT_SUBJ_ASC: + case SQSORT_SUBJ_DESC: + $sSortField = 'SUBJECT'; + break; + case SQSORT_SIZE_ASC: + case SQSORT_SIZE_DESC: + $sSortField = ($bServerSort) ? 'SIZE' : 'RFC822.SIZE'; + break; + case SQSORT_TO_ASC: + case SQSORT_TO_DESC: + $sSortField = 'TO'; + break; + case SQSORT_CC_ASC: + case SQSORT_CC_DESC: + $sSortField = 'CC'; + break; + case SQSORT_INT_DATE_ASC: + case SQSORT_INT_DATE_DESC: + $sSortField = ($bServerSort) ? 'ARRIVAL' : 'INTERNALDATE'; + break; + case SQSORT_THREAD: + break; + default: $sSortField = 'UID'; + break; + } - /* Return our result string. */ - return ($result); + return $sSortField; } -/** - * Generate a paginator link. - * - * @param mixed $box Mailbox name - * @param mixed $start_msg Message Offset - * @param mixed $use - * @param string $text text used for paginator link - * @return string - */ -function get_paginator_link($box, $start_msg, $text) { - sqgetGlobalVar('PHP_SELF',$php_self,SQ_SERVER); - $result = "$text"; - - return ($result); -} -/** - * This function computes the paginator string. - * - * @param string $box mailbox name - * @param integer $iOffset offset in total number of messages - * @param integer $iTotal total number of messages - * @param integer $iLimit maximum number of messages to show on a page - * @param bool $bShowAll show all messages at once (non paginate mode) - * @return string $result paginate string with links to pages - */ -function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll) { - global $username, $data_dir, $javascript_on; - // page selector globals - global $page_selector, $page_selector_max, $compact_paginator; - sqgetGlobalVar('PHP_SELF',$php_self,SQ_SERVER); - - /* Initialize paginator string chunks. */ - $prv_str = ''; - $nxt_str = ''; - $pg_str = ''; - $all_str = ''; - - $box = urlencode($box); - - /* Create simple strings that will be creating the paginator. */ - $spc = ' '; /* This will be used as a space. */ - $sep = '|'; /* This will be used as a seperator. */ - - /* Make sure that our start message number is not too big. */ - $iOffset = min($iOffset, $iTotal); - - /* Compute the starting message of the previous and next page group. */ - $next_grp = $iOffset + $iLimit; - $prev_grp = $iOffset - $iLimit; - - if (!$bShowAll) { - /* Compute the basic previous and next strings. */ - if ($compact_paginator) { - if (($next_grp <= $iTotal) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, '<'); - $nxt_str = get_paginator_link($box, $next_grp, '>'); - } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, '<'); - $nxt_str = '>'; - } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { - $prv_str = '<'; - $nxt_str = get_paginator_link($box, $next_grp, '>'); - } - } else { - if (($next_grp <= $iTotal) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, _("Previous")); - $nxt_str = get_paginator_link($box, $next_grp, _("Next")); - } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, _("Previous")); - $nxt_str = _("Next"); - } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { - $prv_str = _("Previous"); - $nxt_str = get_paginator_link($box, $next_grp, _("Next")); - } - } - /* Page selector block. Following code computes page links. */ - if ($iLimit != 0 && $page_selector && ($iTotal > $iLimit)) { - /* Most importantly, what is the current page!!! */ - $cur_pg = intval($iOffset / $iLimit) + 1; - /* Compute total # of pages and # of paginator page links. */ - $tot_pgs = ceil($iTotal / $iLimit); /* Total number of Pages */ +/** +* This function loops through a group of messages in the mailbox +* and shows them to the user. +* +* @param resource $imapConnection +* @param array $aMailbox associative array with mailbox related vars +* @param array $aProps +* @param int $iError error code, 0 is no error +*/ +function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) { + global $PHP_SELF; + global $boxes; + + $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; + $aColumnsDesc = (isset($aProps['columns'])) ? $aProps['columns'] : false; + $iAccount = (isset($aProps['account'])) ? (int) $aProps['account'] : 0; + $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; + $lastTargetMailbox = (isset($aProps['config']['lastTargetMailbox'])) ? $aProps['config']['lastTargetMailbox'] : ''; + $aOrder = array_keys($aProps['columns']); + $trash_folder = (isset($aProps['config']['trash_folder']) && $aProps['config']['trash_folder']) + ? $aProps['config']['trash_folder'] : false; + $sent_folder = (isset($aProps['config']['sent_folder']) && $aProps['config']['sent_folder']) + ? $aProps['config']['sent_folder'] : false; + $draft_folder = (isset($aProps['config']['draft_folder']) && $aProps['config']['draft_folder']) + ? $aProps['config']['draft_folder'] : false; + $page_selector = (isset($aProps['config']['page_selector'])) ? $aProps['config']['page_selector'] : false; + $page_selector_max = (isset($aProps['config']['page_selector_max'])) ? $aProps['config']['page_selector_max'] : 10; + $color = $aProps['config']['color']; - if (!$compact_paginator) { - $vis_pgs = min($page_selector_max, $tot_pgs - 1); /* Visible Pages */ - /* Compute the size of the four quarters of the page links. */ + /* + * Form ID + */ + static $iFormId; - /* If we can, just show all the pages. */ - if (($tot_pgs - 1) <= $page_selector_max) { - $q1_pgs = $cur_pg - 1; - $q2_pgs = $q3_pgs = 0; - $q4_pgs = $tot_pgs - $cur_pg; + if (!isset($iFormId)) { + $iFormId=1; + } else { + ++$iFormId; + } + /* + * Remove the checkbox column because we cannot fetch it from the imap server + */ + $aFetchColumns = $aColumnsDesc; + if (isset($aFetchColumns[SQM_COL_CHECK])) { + unset($aFetchColumns[SQM_COL_CHECK]); + } - /* Otherwise, compute some magic to choose the four quarters. */ - } else { - /* - * Compute the magic base values. Added together, - * these values will always equal to the $pag_pgs. - * NOTE: These are DEFAULT values and do not take - * the current page into account. That is below. - */ - $q1_pgs = floor($vis_pgs/4); - $q2_pgs = round($vis_pgs/4, 0); - $q3_pgs = ceil($vis_pgs/4); - $q4_pgs = round(($vis_pgs - $q2_pgs)/3, 0); - - /* Adjust if the first quarter contains the current page. */ - if (($cur_pg - $q1_pgs) < 1) { - $extra_pgs = ($q1_pgs - ($cur_pg - 1)) + $q2_pgs; - $q1_pgs = $cur_pg - 1; - $q2_pgs = 0; - $q3_pgs += ceil($extra_pgs / 2); - $q4_pgs += floor($extra_pgs / 2); - - /* Adjust if the first and second quarters intersect. */ - } else if (($cur_pg - $q2_pgs - ceil($q2_pgs/3)) <= $q1_pgs) { - $extra_pgs = $q2_pgs; - $extra_pgs -= ceil(($cur_pg - $q1_pgs - 1) * 3/4); - $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 3/4); - $q3_pgs += ceil($extra_pgs / 2); - $q4_pgs += floor($extra_pgs / 2); - - /* Adjust if the fourth quarter contains the current page. */ - } else if (($cur_pg + $q4_pgs) >= $tot_pgs) { - $extra_pgs = ($q4_pgs - ($tot_pgs - $cur_pg)) + $q3_pgs; - $q3_pgs = 0; - $q4_pgs = $tot_pgs - $cur_pg; - $q1_pgs += floor($extra_pgs / 2); - $q2_pgs += ceil($extra_pgs / 2); - - /* Adjust if the third and fourth quarter intersect. */ - } else if (($cur_pg + $q3_pgs + 1) >= ($tot_pgs - $q4_pgs + 1)) { - $extra_pgs = $q3_pgs; - $extra_pgs -= ceil(($tot_pgs - $cur_pg - $q4_pgs) * 3/4); - $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 3/4); - $q1_pgs += floor($extra_pgs / 2); - $q2_pgs += ceil($extra_pgs / 2); - } + /* + * Before we fetch the message headers, check if we need to fetch extra columns + * to make the message highlighting work + */ + if (is_array($highlight_list) && count($highlight_list)) { + $aHighlightColumns = array(); + foreach ($highlight_list as $highlight_list_part) { + if (trim($highlight_list_part['value'])) { + $match_type = strtoupper($highlight_list_part['match_type']); + $aHighlightColumns = array(); + switch ($match_type) { + case 'TO_CC': + $aHighlightColumns[SQM_COL_TO] = true; + $aHighlightColumns[SQM_COL_CC] = true; + break; + case 'TO': $aHighlightColumns[SQM_COL_TO] = true; break; + case 'CC': $aHighlightColumns[SQM_COL_CC] = true; break; + case 'FROM': $aHighlightColumns[SQM_COL_FROM] = true; break; + case 'SUBJECT':$aHighlightColumns[SQM_COL_SUBJ] = true; break; } + } + } + $aExtraColumns = array(); + foreach ($aHighlightColumns as $k => $v) { + if (!isset($aFetchColumns[$k])) { + $aExtraColumns[] = $k; + $aFetchColumns[$k] = true; + } + } + if (count($aExtraColumns)) { + $aProps['extra_columns'] = $aExtraColumns; + } + } + $aFetchColumns = array_keys($aFetchColumns); + // store the columns to fetch to the session so we can pick them up in read_body + // where we validate the cache. + /////// sqsession_register($aFetchColumns,'aFetchColumns'); - /* - * I am leaving this debug code here, commented out, because - * it is a really nice way to see what the above code is doing. - * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = " - * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; - */ + $iError = fetchMessageHeaders($imapConnection, $aMailbox, $aFetchColumns); + if ($iError) { + return array(); + } else { + $aMessages = prepareMessageList($aMailbox, $aProps); + } - /* Print out the page links from the compute page quarters. */ + $iSetIndx = $aMailbox['SETINDEX']; + $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $aMailbox['EXISTS'] : $aMailbox['LIMIT']; + $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $aMailbox['EXISTS']) ? + $aMailbox['PAGEOFFSET'] + $iLimit - 1 : $aMailbox['EXISTS']; - /* Start with the first quarter. */ - if (($q1_pgs == 0) && ($cur_pg > 1)) { - $pg_str .= "...$spc"; - } else { - for ($pg = 1; $pg <= $q1_pgs; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start, $pg) . $spc; - } - if ($cur_pg - $q2_pgs - $q1_pgs > 1) { - $pg_str .= "...$spc"; - } - } + $iNumberOfMessages = $aMailbox['TOTAL'][$iSetIndx]; - /* Continue with the second quarter. */ - for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start, $pg) . $spc; - } + $php_self = $PHP_SELF; - /* Now print the current page. */ - $pg_str .= $cur_pg . $spc; + $urlMailbox = urlencode($aMailbox['NAME']); - /* Next comes the third quarter. */ - for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start, $pg) . $spc; - } + if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) { + $source_url = $regs[1]; + } else { + $source_url = $php_self; + } - /* And last, print the forth quarter page links. */ - if (($q4_pgs == 0) && ($cur_pg < $tot_pgs)) { - $pg_str .= "...$spc"; - } else { - if (($tot_pgs - $q4_pgs) > ($cur_pg + $q3_pgs)) { - $pg_str .= "...$spc"; - } - for ($pg = $tot_pgs - $q4_pgs + 1; $pg <= $tot_pgs; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start,$pg) . $spc; - } - } - } - $last_grp = (($tot_pgs - 1) * $iLimit) + 1; + $baseurl = $source_url.'?mailbox=' . urlencode($aMailbox['NAME']) .'&account='.$aMailbox['ACCOUNT']; + $where = urlencode($aMailbox['SEARCH'][$iSetIndx][0]); + $what = urlencode($aMailbox['SEARCH'][$iSetIndx][1]); + $baseurl .= '&where=' . $where . '&what=' . $what; + + /* build thread sorting links */ + $newsort = $aMailbox['SORT']; + if (sqimap_capability($imapConnection,'THREAD')) { + if ($aMailbox['SORT'] & SQSORT_THREAD) { + $newsort -= SQSORT_THREAD; + $thread_name = _("Unthread View"); + } else { + $thread_name = _("Thread View"); + $newsort = $aMailbox['SORT'] + SQSORT_THREAD; } + $thread_link_str = '[' . $thread_name + . ']'; } else { - $pg_str = "" ._("Paginate") . ''; + $thread_link_str =''; } + $sort = $aMailbox['SORT']; - /* Put all the pieces of the paginator string together. */ + /* FIX ME ADD CHECKBOX CONTROL. No checkbox => no buttons */ + + + + /* future admin control over displayable buttons */ + + $aAdminControl = array( + 'markUnflagged' => 1, + 'markFlagged' => 1, + 'markRead' => 1, + 'markUnread' => 1, + 'delete' => 1, + 'undeleteButton'=> 1, + 'bypass_trash' => 1, + 'expungeButton' => 1, + 'moveButton' => 1, + 'forward' => 1 + ); + /* user prefs control */ + $aUserControl = array ( + 'markUnflagged' => $show_flag_buttons, + 'markFlagged' => $show_flag_buttons, + 'markRead' => 1, + 'markUnread' => 1, + 'delete' => 1, + 'undeleteButton'=> 1, + 'bypass_trash' => 1, + 'expungeButton' => 1, + 'moveButton' => 1, + 'forward' => 1 + ); + + $showDelete = ($aMailbox['RIGHTS'] != 'READ-ONLY' && + in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) ? true : false; + $showByPassTrash = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' && + in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) && + $trash_folder ? true : false; // + $showUndelete = (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY' && + in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true) && !$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; + $aImapControl = array ( + 'markUnflagged' => in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true), + 'markFlagged' => in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true), + 'markRead' => in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true), + 'markUnread' => in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true), + 'delete' => $showDelete, + 'undeleteButton'=> $showUndelete, + 'bypass_trash' => $showByPassTrash, + 'expungeButton' => $showExpunge, + 'moveButton' => $showMove, + 'forward' => 1 + ); + $aButtonStrings = array( + 'markUnflagged' => _("Unflag"), + 'markFlagged' => _("Flag"), + 'markRead' => _("Read"), + 'markUnread' => _("Unread"), + 'delete' => _("Delete"), + 'undeleteButton' => _("Undelete"), + 'bypass_trash' => _("Bypass Trash"), + 'expungeButton' => _("Expunge"), + 'moveButton' => _("Move"), + 'forward' => _("Forward") + ); /** - * Hairy code... But let's leave it like it is since I am not certain - * a different approach would be any easier to read. ;) + * Register buttons in order to an array + * The key is the "name", the first element of the value array is the "value", second argument is the type. */ - $result = ''; - if ( $prv_str || $nxt_str ) { - - /* Compute the 'show all' string. */ - $all_str = "" . _("Show All") . ''; - } - - if ($compact_paginator) { - if ( $prv_str || $nxt_str ) { - $result .= '[' . get_paginator_link($box, 1, '<<') . ']'; - $result .= '[' . $prv_str . ']'; - - $pg_url = $php_self . '?mailbox=' . $box; - - $result .= '[' . $nxt_str . ']'; - $result .= '[' . get_paginator_link($box, $last_grp, '>>') . ']'; - - if ($page_selector) { - $result .= $spc . ''; - - if ($javascript_on) { - $result .= ''; - } else { - $result .= addSubmit(_("Go")); - } + $aFormElements = array(); + foreach($aAdminControl as $k => $v) { + if ($v & $aUserControl[$k] & $aImapControl[$k]) { + switch ($k) { + case 'markUnflagged': + case 'markFlagged': + case 'markRead': + case 'markUnread': + case 'delete': + case 'undeleteButton': + case 'expungeButton': + case 'forward': + $aFormElements[$k] = array($aButtonStrings[$k],'submit'); + break; + case 'bypass_trash': + $aFormElements[$k] = array($aButtonStrings[$k],'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'); + break; } } + $aFormElements['account'] = array($iAccount,'hidden'); + } - $result .= ($pg_str != '' ? '['.$pg_str.']' . $spc : ''); - $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : ''); - } else { - if ( $prv_str || $nxt_str ) { - $result .= '['; - $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); - $result .= ($nxt_str != '' ? $nxt_str : ''); - $result .= ']' . $spc ; - } + /* + * This is the beginning of the message list table. + * It wraps around all messages + */ + $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $aMailbox['NAME']); + $form_name = "FormMsgs" . $safe_name; - $result .= ($pg_str != '' ? $spc . '['.$spc.$pg_str.']' . $spc : ''); - $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : ''); - } - /* If the resulting string is blank, return a non-breaking space. */ - if ($result == '') { - $result = ' '; - } - /* Return our final magical paginator string. */ - return ($result); + //if (!sqgetGlobalVar('align',$align,SQ_SESSION)) { + $align = array('left' => 'left', 'right' => 'right'); + //} + //sm_print_r($align); + + /* finally set the template vars */ + + // FIX ME, before we support multiple templates we must review the names of the vars + + + + $aTemplate['color'] = $color; + $aTemplate['form_name'] = "FormMsgs" . $safe_name; + $aTemplate['form_id'] = 'mbx_'.$iFormId; + $aTemplate['page_selector'] = $page_selector; + $aTemplate['page_selector_max'] = $page_selector_max; + $aTemplate['messagesPerPage'] = $aMailbox['LIMIT']; + $aTemplate['showall'] = $aMailbox['SHOWALL'][$iSetIndx]; + $aTemplate['end_msg'] = $iEnd; + $aTemplate['align'] = $align; + $aTemplate['iNumberOfMessages'] = $iNumberOfMessages; + $aTemplate['aOrder'] = $aOrder; + $aTemplate['aFormElements'] = $aFormElements; + $aTemplate['sort'] = $sort; + $aTemplate['pageOffset'] = $aMailbox['PAGEOFFSET']; + $aTemplate['baseurl'] = $baseurl; + $aTemplate['aMessages'] =& $aMessages; + $aTemplate['trash_folder'] = $trash_folder; + $aTemplate['sent_folder'] = $sent_folder; + $aTemplate['draft_folder'] = $draft_folder; + $aTemplate['thread_link_str'] = $thread_link_str; + $aTemplate['php_self'] = str_replace('&','&',$php_self); + $aTemplate['mailbox'] = $sMailbox; + $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['use_icons'] = (isset($aProps['config']['use_icons'])) ? $aProps['config']['use_icons'] : false; + $aTemplate['alt_index_colors'] = (isset($aProps['config']['alt_index_colors'])) ? $aProps['config']['alt_index_colors'] : false; + $aTemplate['fancy_index_highlite'] = $fancy_index_highlite; + + return $aTemplate; } + /** - * FIXME: Undocumented function - */ +* FIXME: Undocumented function +*/ function truncateWithEntities($subject, $trim_at) { $ent_strlen = strlen($subject); @@ -1917,11 +1044,11 @@ function truncateWithEntities($subject, $trim_at) global $languages, $squirrelmail_language; /* - * see if this is entities-encoded string - * If so, Iterate through the whole string, find out - * the real number of characters, and if more - * than $trim_at, substr with an updated trim value. - */ + * see if this is entities-encoded string + * If so, Iterate through the whole string, find out + * the real number of characters, and if more + * than $trim_at, substr with an updated trim value. + */ $trim_val = $trim_at; $ent_offset = 0; $ent_loc = 0; @@ -1945,67 +1072,13 @@ function truncateWithEntities($subject, $trim_at) return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_strimwidth', $subject, $trim_val); } - return substr_replace($subject, '...', $trim_val + 1); -} - -/** - * FIXME: Undocumented function - */ -function processSubject($subject, $threadlevel = 0) { - /* Shouldn't ever happen -- caught too many times in the IMAP functions */ - if ($subject == '') { - return _("(no subject)"); - } - - global $truncate_subject; /* number of characters for Subject field (<= 0 for unchanged) */ - $trim_at = $truncate_subject; - - /* if this is threaded, subtract two chars per indentlevel */ - if (($threadlevel > 0) && ($threadlevel <= 10)) - $trim_at -= (2*$threadlevel); - - return truncateWithEntities($subject, $trim_at); -} - - -/** - * Creates button - * - * @deprecated see form functions available in 1.5.1 and 1.4.3. - * @param string $type - * @param string $name - * @param string $value - * @param string $js - * @param bool $enabled - */ -function getButton($type, $name, $value, $js = '', $enabled = TRUE) { - $disabled = ( $enabled ? '' : 'disabled ' ); - $js = ( $js ? $js.' ' : '' ); - return ''; -} - -/** - * Puts string into cell, aligns it and adds tag - * - * @param string $string string - * @param string $align alignment - */ -function getSmallStringCell($string, $align) { - return html_tag('td', - '' . $string . ':  ', - $align, - '', - 'style="white-space: nowrap;"' ); + return substr_replace($subject, '...', $trim_val); } /** - * This should go in imap_mailbox.php - * @param string $mailbox - */ +* This should go in imap_mailbox.php +* @param string $mailbox +*/ function handleAsSent($mailbox) { global $handleAsSent_result; @@ -2032,13 +1105,12 @@ function handleAsSent($mailbox) { * @author Marc Groot Koerkamp */ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = array()) { - /* incoming formdata */ $sButton = (sqgetGlobalVar('moveButton', $sTmp, SQ_POST)) ? 'move' : $sButton; $sButton = (sqgetGlobalVar('expungeButton', $sTmp, SQ_POST)) ? 'expunge' : $sButton; - $sButton = (sqgetGlobalVar('attache', $sTmp, SQ_POST)) ? 'attache' : $sButton; + $sButton = (sqgetGlobalVar('forward', $sTmp, SQ_POST)) ? 'forward' : $sButton; $sButton = (sqgetGlobalVar('delete', $sTmp, SQ_POST)) ? 'setDeleted' : $sButton; - $sButton = (sqgetGlobalVar('undeleteButton', $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; @@ -2046,13 +1118,14 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_POST); sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_POST); sqgetGlobalVar('msg', $msg, SQ_POST); - + if (sqgetGlobalVar('account', $iAccount, SQ_POST) === false) { + $iAccount = 0; + } $sError = ''; $mailbox = $aMailbox['NAME']; /* retrieve the check boxes */ $aUid = (isset($msg) && is_array($msg)) ? array_values($msg) : $aUid; - if (count($aUid) && $sButton != 'expunge') { $aUpdatedMsgs = false; $bExpunge = false; @@ -2065,6 +1138,7 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar } $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash); $bExpunge = true; + //} break; case 'unsetDeleted': case 'setSeen': @@ -2081,7 +1155,7 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar sqsession_register($targetMailbox,'lastTargetMailbox'); $bExpunge = true; break; - case 'attache': + case 'forward': $aMsgHeaders = array(); foreach ($aUid as $iUid) { $aMsgHeaders[$iUid] = $aMailbox['MSG_HEADERS'][$iUid]; @@ -2093,9 +1167,9 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar } break; default: - // Hook for plugin buttons - do_hook_function('mailbox_display_button_action', $aUid); - break; + // Hook for plugin buttons + do_hook_function('mailbox_display_button_action', $aUid); + break; } /** * Updates messages is an array containing the result of the untagged @@ -2155,12 +1229,12 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar // update EXISTS info if ($iExpungedMessages) { $aMailbox['EXISTS'] -= (int) $iExpungedMessages; + $aMailbox['TOTAL'][$aMailbox['SETINDEX']] -= (int) $iExpungedMessages; } - // Change the startMessage number if the mailbox was changed if (($aMailbox['PAGEOFFSET']-1) >= $aMailbox['EXISTS']) { $aMailbox['PAGEOFFSET'] = ($aMailbox['PAGEOFFSET'] > $aMailbox['LIMIT']) ? $aMailbox['PAGEOFFSET'] - $aMailbox['LIMIT'] : 1; - $aMailbox['OFFSET'] = $aMailbox['PAGEOFFSET'] - 1 ; + $aMailbox['OFFSET'] = $aMailbox['PAGEOFFSET'] - 1 ; } } } @@ -2176,10 +1250,7 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar * server does not need to generate the untagged expunge responses */ sqimap_run_command($imapConnection,'CLOSE',false,$result,$message); - $aMbxResponse = sqimap_mailbox_select($imapConnection,$aMailbox['NAME']); - // update the $aMailbox array - $aMailbox['EXISTS'] = $aMbxResponse['EXISTS']; - $aMailbox['UIDSET'] = false; + $aMailbox = sqm_api_mailbox_select($imapConnection,$iAccount, $aMailbox['NAME'],array(),array()); } else { if ($sButton) { $sError = _("No messages were selected."); @@ -2191,10 +1262,12 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar function attachSelectedMessages($imapConnection,$aMsgHeaders) { global $username, $attachment_dir, - $data_dir, $composesession, - $compose_messages; + $data_dir; + - if (!isset($compose_messages)) { + sqgetGlobalVar('composesession', $composesession, SQ_SESSION); + sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION); + if (!isset($compose_messages)|| is_null($compose_messages)) { $compose_messages = array(); sqsession_register($compose_messages,'compose_messages'); } @@ -2219,9 +1292,9 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) { * Retrieve the full message */ $body_a = sqimap_run_command($imapConnection, "FETCH $iUid RFC822", true, $response, $readmessage, TRUE); - if ($response == 'OK') { - $subject = (isset($aMsgHeader['SUBJECT'])) ? $aMsgHeader['SUBJECT'] : $iUid; + + $subject = (isset($aMsgHeader['subject'])) ? $aMsgHeader['subject'] : $iUid; array_shift($body_a); array_pop($body_a); @@ -2244,5 +1317,4 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) { return $composesession; } -// vim: et ts=4 ?> diff --git a/functions/page_header.php b/functions/page_header.php index d62321fa..6ece0a39 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -68,7 +68,6 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = true echo "\n"; echo '' . "\n"; } - if ($do_hook) { do_hook('generic_header'); } @@ -137,375 +136,40 @@ function displayInternalLink($path, $text, $target='') { * * @param array color the array of theme colors * @param string mailbox the current mailbox name to display - * @param string xtra extra html code to add - * @param bool session + * @param string sHeaderJs javascipt code to be inserted in a script block in the header + * @param string sBodyTagJs js events to be inserted in the body tag * @return void */ -function displayPageHeader($color, $mailbox, $xtra='', $session=false) { - global $hide_sm_attributions, $PHP_SELF, $frame_top, - $compose_new_win, $compose_width, $compose_height, +function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') { + global $hide_sm_attributions, $frame_top, $provider_name, $provider_uri, $startMessage, - $javascript_on, $default_use_mdn, $mdn_user_support; + $javascript_on; - sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION ); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION ); - $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 ); - if ($qmark = strpos($module, '?')) { - $module = substr($module, 0, $qmark); - } + if (!isset($frame_top)) { $frame_top = '_top'; } - if ($session) { - $compose_uri = $base_uri.'src/compose.php?mailbox='.urlencode($mailbox).'&attachedmessages=true&session='."$session"; - } else { - $compose_uri = $base_uri.'src/compose.php?newmessage=1'; - $session = 0; - } - if( $javascript_on || strpos($xtra, 'new_js_autodetect_results.value') ) { - - switch ( $module ) { - case 'src/read_body.php': - $js =''; - - // compose in new window code - if ($compose_new_win == '1') { - if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { - $compose_width = '640'; - } - if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) { - $compose_height = '550'; - } - $js .= "function comp_in_new_form(comp_uri, button, myform) {\n". - ' if (!comp_uri) {'."\n". - ' comp_uri = "'.$compose_uri."\";\n". - ' }'. "\n". - ' comp_uri += "&" + button.name + "=1";'."\n". - ' for ( var i=0; i < myform.elements.length; i++ ) {'."\n". - ' if ( myform.elements[i].type == "checkbox" && myform.elements[i].checked )'."\n". - ' comp_uri += "&" + myform.elements[i].name + "=1";'."\n". - ' }'."\n". - ' var newwin = window.open(comp_uri' . - ', "_blank",'. - '"width='.$compose_width. ',height='.$compose_height. - ',scrollbars=yes,resizable=yes,status=yes");'."\n". - "}\n\n"; - $js .= "function comp_in_new(comp_uri) {\n". - " if (!comp_uri) {\n". - ' comp_uri = "'.$compose_uri."\";\n". - ' }'. "\n". - ' var newwin = window.open(comp_uri' . - ', "_blank",'. - '"width='.$compose_width. ',height='.$compose_height. - ',scrollbars=yes,resizable=yes,status=yes");'."\n". - "}\n\n"; - } - - // javascript for sending read receipts - if($default_use_mdn && $mdn_user_support) { - $js .= 'function sendMDN() {'."\n". - " mdnuri=window.location+'&sendreceipt=1'; ". - "var newwin = window.open(mdnuri,'right');". - "\n}\n\n"; - } - - // if any of the above passes, add the JS tags too. - if($js) { - $js = "\n".'\n"; - } - - displayHtmlHeader ('SquirrelMail', $js); - $onload = $xtra; - break; - case 'src/compose.php': - $js = '\n"; - $onload = 'onload="checkForm();"'; - displayHtmlHeader ('SquirrelMail', $js); - break; - - case 'src/right_main.php': - global $fancy_index_highlite; - if (!$fancy_index_highlite) { - $js = ''; - } else //{ putting braces around this block creats strange PHP errors - // following code graciously borrowed from - // phpMyAdmin project at: - // http://www.phpmyadmin.net - $js = << exits - if ((thePointerColor == '' && theMarkColor == '') - || typeof(theRow.style) == 'undefined') { - return false; - } - - // 2. Gets the current row and exits if the browser can't get it - if (typeof(document.getElementsByTagName) != 'undefined') { - theCells = theRow.getElementsByTagName('td'); - } - else if (typeof(theRow.cells) != 'undefined') { - theCells = theRow.cells; - } - else { - return false; - } - - // 3. Gets the current color... - var rowCellsCnt = theCells.length; - var domDetect = null; - var currentColor = null; - var newColor = null; - // 3.1 ... with DOM compatible browsers except Opera that does not return - // valid values with "getAttribute" - if (typeof(window.opera) == 'undefined' - && typeof(theCells[0].getAttribute) != 'undefined') { - currentColor = theCells[0].getAttribute('bgcolor'); - domDetect = true; - } - // 3.2 ... with other browsers - else { - currentColor = theCells[0].style.backgroundColor; - domDetect = false; - } // end 3 - - // 3.3 ... Opera changes colors set via HTML to rgb(r,g,b) format so fix it - if (currentColor.indexOf("rgb") >= 0) - { - var rgbStr = currentColor.slice(currentColor.indexOf('(') + 1, - currentColor.indexOf(')')); - var rgbValues = rgbStr.split(","); - currentColor = "#"; - var hexChars = "0123456789ABCDEF"; - for (var i = 0; i < 3; i++) - { - var v = rgbValues[i].valueOf(); - currentColor += hexChars.charAt(v/16) + hexChars.charAt(v%16); - } - } - - // 4. Defines the new color - // 4.1 Current color is the default one - if (currentColor == '' - || currentColor.toLowerCase() == theDefaultColor.toLowerCase()) { - if (theAction == 'over' && thePointerColor != '') { - newColor = thePointerColor; - } - else if (theAction == 'click' && theMarkColor != '') { - newColor = theMarkColor; - marked_row[theRowNum] = true; - // deactivated onclick marking of the checkbox because it's also executed - // when an action (clicking on the checkbox itself) on a single item is - // performed. Then the checkbox would get deactived, even though we need - // it activated. Maybe there is a way to detect if the row was clicked, - // and not an item therein... - //document.getElementById('msg[' + theRowNum + ']').checked = true; - } - } - // 4.1.2 Current color is the pointer one - else if (currentColor.toLowerCase() == thePointerColor.toLowerCase() - && (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])) { - if (theAction == 'out') { - newColor = theDefaultColor; - } - else if (theAction == 'click' && theMarkColor != '') { - newColor = theMarkColor; - marked_row[theRowNum] = true; - //document.getElementById('msg[' + theRowNum + ']').checked = true; - } - } - // 4.1.3 Current color is the marker one - else if (currentColor.toLowerCase() == theMarkColor.toLowerCase()) { - if (theAction == 'click') { - newColor = (thePointerColor != '') - ? thePointerColor - : theDefaultColor; - marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum]) - ? true - : null; - //document.getElementById('msg[' + theRowNum + ']').checked = false; - } - } // end 4 - - // 5. Sets the new color... - if (newColor) { - var c = null; - // 5.1 ... with DOM compatible browsers except Opera - if (domDetect) { - for (c = 0; c < rowCellsCnt; c++) { - theCells[c].setAttribute('bgcolor', newColor, 0); - } // end for - } - // 5.2 ... with other browsers - else { - for (c = 0; c < rowCellsCnt; c++) { - theCells[c].style.backgroundColor = newColor; - } - } - } // end 5 - - return true; -} // end of the 'setPointer()' function -EOS; - //} putting braces around this block creats strange PHP errors - $js = "\n".'\n"; - $onload = ''; - displayHtmlHeader ('SquirrelMail', $js); - break; - - default: - $js = '\n"; - - $onload = 'onload="checkForm();"'; - displayHtmlHeader ('SquirrelMail', $js); - break; - + if ($sHeaderJs) { + $sJsBlock = "\n\n"; + } else { + $sJsBlock = ''; } - } else { + $sJsBlock .= "\n" . '' ."\n"; + displayHtmlHeader ('SquirrelMail', $sJsBlock); + } else { /* do not use JavaScript */ displayHtmlHeader ('SquirrelMail'); - $onload = ''; + $sBodyTagJs = ''; } - echo "\n\n"; + echo "\n\n"; + /** Here is the header and wrapping table **/ $shortBoxName = htmlspecialchars(imap_utf7_decode_local( readShortMailboxName($mailbox, $delimiter))); @@ -569,75 +233,30 @@ EOS; * * @param array color the array of theme colors * @param string mailbox the current mailbox name to display + * @param string sHeaderJs javascipt code to be inserted in a script block in the header + * @param string sBodyTagJs js events to be inserted in the body tag * @return void */ -function compose_Header($color, $mailbox) { - +function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = 'onload="checkForm();"') { global $javascript_on; - /* * Locate the first displayable form element (only when JavaScript on) */ if($javascript_on) { - global $base_uri, $PHP_SELF, $data_dir, $username; - - $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 ); - - switch ( $module ) { - case 'src/search.php': - $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1; - $onload = "onload=\"document.forms[$pos].elements[2].focus();\""; - displayHtmlHeader (_("Compose")); - break; - default: - $js = '\n"; - $onload = 'onload="checkForm();"'; - displayHtmlHeader (_("Compose"), $js); - break; + if ($sHeaderJs) { + $sJsBlock = "\n\n"; + } else { + $sJsBlock = ''; } + $sJsBlock .= "\n" . '' ."\n"; + displayHtmlHeader (_("Compose"), $sJsBlock); } else { /* javascript off */ displayHtmlHeader(_("Compose")); $onload = ''; } - - echo "\n\n"; + echo "\n\n"; } - ?> diff --git a/functions/strings.php b/functions/strings.php index dab833d4..ea629125 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -735,7 +735,7 @@ function show_readable_size($bytes) { settype($bytes, 'integer'); } - return $bytes . ' ' . $type . ''; + return $bytes . ' ' . $type; } /** @@ -859,6 +859,7 @@ function makeComposeLink($url, $text = null, $target='') * The output is wrapped in <
> and <
> tags. * Since 1.4.2 accepts unlimited number of arguments. * @since 1.4.1 + * * @return void */ function sm_print_r() { @@ -1094,13 +1095,13 @@ function sq_mb_list_encodings() { * Function returns number of characters in string. * * Returned number might be different from number of bytes in string, - * if $charset is multibyte charset. Detection depends on mbstring + * if $charset is multibyte charset. Detection depends on mbstring * functions. If mbstring does not support tested multibyte charset, - * vanilla string length function is used. + * vanilla string length function is used. * @param string $str string * @param string $charset charset * @since 1.5.1 - * @return integer number of characters in string + * @return integer number of characters in string */ function sq_strlen($str, $charset=''){ // default option @@ -1123,7 +1124,7 @@ function sq_strlen($str, $charset=''){ if (in_array($charset,$aList_of_mb_charsets) && in_array($charset,sq_mb_list_encodings())) { $real_length = mb_strlen($str,$charset); } else { - // own strlen detection code is removed because missing strpos, + // own strlen detection code is removed because missing strpos, // strtoupper and substr implementations break string wrapping. $real_length=strlen($str); } @@ -1137,7 +1138,7 @@ function sq_strlen($str, $charset=''){ * @param string $string original string * @param integer $width padded string width * @param string $pad padding symbols - * @param integer $padtype padding type + * @param integer $padtype padding type * (internal php defines, see str_pad() description) * @param string $charset charset used in original string * @return string padded string @@ -1183,7 +1184,7 @@ function sq_substr($string,$start,$length,$charset='auto') { $charset=$default_charset; } $charset = strtolower($charset); - if (function_exists('mb_internal_encoding') && + if (function_exists('mb_internal_encoding') && in_array($charset,sq_mb_list_encodings())) { return mb_substr($string,$start,$length,$charset); } @@ -1213,7 +1214,7 @@ function sq_strpos($haystack,$needle,$offset,$charset='auto') { $charset=$default_charset; } $charset = strtolower($charset); - if (function_exists('mb_internal_encoding') && + if (function_exists('mb_internal_encoding') && in_array($charset,sq_mb_list_encodings())) { return mb_strpos($haystack,$needle,$offset,$charset); } @@ -1241,7 +1242,7 @@ function sq_strtoupper($string,$charset='auto') { $charset=$default_charset; } $charset = strtolower($charset); - if (function_exists('mb_strtoupper') && + if (function_exists('mb_strtoupper') && in_array($charset,sq_mb_list_encodings())) { return mb_strtoupper($string,$charset); } diff --git a/include/load_prefs.php b/include/load_prefs.php index 2f1affeb..27a998ca 100644 --- a/include/load_prefs.php +++ b/include/load_prefs.php @@ -156,7 +156,7 @@ $timezone = getPref($data_dir, $username, 'timezone', SMPREF_NONE ); /* Load preferences for reply citation style. */ $reply_citation_style = - getPref($data_dir, $username, 'reply_citation_style', 'date_time_author' ); + getPref($data_dir, $username, 'reply_citation_style', SMPREF_NONE ); $reply_citation_start = getPref($data_dir, $username, 'reply_citation_start'); $reply_citation_end = getPref($data_dir, $username, 'reply_citation_end'); @@ -196,20 +196,69 @@ if( $ser = getPref($data_dir, $username, 'hililist') ) { setPref($data_dir, $username, 'hililist', serialize($message_highlight_list)); } +/* use the internal date of the message for sorting instead of the supplied header date */ +/* OBSOLETE */ + +$internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON); + /* Index order lets you change the order of the message index */ $order = getPref($data_dir, $username, 'order1'); -for ($i = 1; $order; ++$i) { - $index_order[$i] = $order; - $order = getPref($data_dir, $username, 'order'.($i+1)); +if (isset($order1)) { + removePref($data_dir, $username, 'order1'); + for ($i = 1; $order; ++$i) { + $index_order[$i-1] = $order -1; + $order = getPref($data_dir, $username, 'order'.($i+1)); + removePref($data_dir, $username, 'order'.($i+1)); + } + if (isset($internal_date_sort) && $internal_date_sort) { + if (in_array(SQM_COL_DATE,$index_order)) { + $k = array_search(SQM_COL_DATE,$index_order,true); + $index_order[$k] = SQM_COL_INT_DATE; + } + } + setPref($data_dir, $username, 'index_order', serialize($index_order)); } -if (!isset($index_order)) { - $index_order[1] = 1; - $index_order[2] = 2; - $index_order[3] = 3; - $index_order[4] = 5; - $index_order[5] = 4; +$index_order = getPref($data_dir, $username, 'index_order'); +if (is_string($index_order)) { + $index_order = unserialize($index_order); } + +// new Index order handling +//$default_mailbox_pref = unserialize(getPref($data_dir, $username, 'default_mailbox_pref')); + +if (!$index_order) { + if (isset($internal_date_sort) && $internal_date_sort == false) { + $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ); + } else { + $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_INT_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ); + } + setPref($data_dir, $username, 'index_order', serialize($index_order)); +} + + + +if (!isset($default_mailbox_pref)) { + $show_num = (isset($show_num)) ? $show_num : 15; + + $default_mailbox_pref = array ( + MBX_PREF_SORT => 0, + MBX_PREF_LIMIT => $show_num, + MBX_PREF_AUTO_EXPUNGE => $auto_expunge, + MBX_PREF_COLUMNS => $index_order); + // setPref($data_dir, $username, 'default_mailbox_pref', serialize($default_mailbox_pref)); + // clean up the old prefs +// if (isset($prefs_cache['internal_date_sort'])) { +// unset($prefs_cache['internal_date_sort']); +// removePref($data_dir,$username,'internal_date_sort'); +// } +// if (isset($prefs_cache['show_num'])) { +// unset($prefs_cache['show_num']); +// removePref($data_dir,$username,'show_num'); +// } +} + + $alt_index_colors = getPref($data_dir, $username, 'alt_index_colors', SMPREF_ON ); @@ -235,6 +284,7 @@ $show_xmailer_default = getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF ); $attachment_common_show_images = getPref($data_dir, $username, 'attachment_common_show_images', SMPREF_OFF ); + /* message disposition notification support setting */ $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', SMPREF_ON); @@ -251,7 +301,7 @@ $date_format = getPref($data_dir, $username, 'date_format', 3); $hour_format = getPref($data_dir, $username, 'hour_format', SMPREF_TIME_12HR); /* compose in new window setting */ -$compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0); +$compose_new_win = getPref($data_dir, $username, 'compose_new_win', SMPREF_OFF); $compose_height = getPref($data_dir, $username, 'compose_height', 550); $compose_width = getPref($data_dir, $username, 'compose_width', 640); @@ -284,11 +334,12 @@ $search_memory = getPref($data_dir, $username, 'search_memory', SMPREF_OFF); $show_only_subscribed_folders = getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON); + $forward_cc = getPref($data_dir, $username, 'forward_cc', SMPREF_OFF); /* How are mailbox select lists displayed: 0. full names, 1. indented (default), * 3. delimited) */ -$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', 1); +$mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_ON); /* Allow user to customize, and display the full date, instead of day, or time based on time distance from date of message */ @@ -305,4 +356,4 @@ $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_disp do_hook('loading_prefs'); -?> +?> \ No newline at end of file diff --git a/include/options/display.php b/include/options/display.php index 40a35970..7a79573e 100644 --- a/include/options/display.php +++ b/include/options/display.php @@ -277,7 +277,8 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE, 'size' => SMOPT_SIZE_TINY ); - +/* + disabled because the template doesn't support it (yet?) $optvals[SMOPT_GRP_MAILBOX][] = array( 'name' => 'show_recipient_instead', 'caption' => _("Show recipient name if the message is from your default identity"), @@ -285,13 +286,8 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE, 'size' => SMOPT_SIZE_TINY ); +*/ - $optvals[SMOPT_GRP_MAILBOX][] = array( - 'name' => 'internal_date_sort', - 'caption' => _("Sort by Received Date"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_ALL - ); if ($allow_thread_sort == TRUE) { $optvals[SMOPT_GRP_MAILBOX][] = array( 'name' => 'sort_by_ref', diff --git a/src/compose.php b/src/compose.php index 0e30edb8..5667c4d9 100644 --- a/src/compose.php +++ b/src/compose.php @@ -175,6 +175,7 @@ function getReplyCitation($orig_from, $orig_date) { } else { $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); } + // $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); /* First, return an empty string when no citation style selected. */ @@ -204,7 +205,7 @@ function getReplyCitation($orig_from, $orig_date) { case 'date_time_author': /** * To translators: - * first %s is for date string, second %s is for author's name. Date uses + * first %s is for date string, second %s is for author's name. Date uses * formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations. * Example string: * "On Sat, December 24, 2004 23:59, Santa said:" @@ -230,9 +231,9 @@ function getReplyCitation($orig_from, $orig_date) { /** * Creates header fields in forwarded email body * - * $default_charset global must be set correctly before you call this function. + * $default_charset global must be set correctly before you call this function. * @param object $orig_header - * @return $string + * @return $string */ function getforwardHeader($orig_header) { global $editor_size, $default_charset; @@ -311,7 +312,13 @@ if (sqsession_is_registered('session_expired_post')) { if ($compose_new_win == '1') { compose_Header($color, $mailbox); } else { - displayPageHeader($color, $mailbox); + $sHeaderJs = (isset($sHeaderJs)) ? $sHeaderJs : ''; + if (strpos($action, 'reply') !== false && $reply_focus) { + $sBodyTagJs = 'onload="checkForm(\''.$replyfocus.'\');"'; + } else { + $sBodyTagJs = 'onload="checkForm();"'; + } + displayPageHeader($color, $mailbox,$sHeaderJs,$sBodyTagJs); } showInputForm($session, false); exit(); @@ -330,6 +337,7 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) { if (!isset($compose_messages)) { $compose_messages = array(); } + if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) { /* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */ $composeMessage = new Message(); @@ -337,6 +345,7 @@ if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL) $composeMessage->rfc822_header = $rfc822_header; $composeMessage->reply_rfc822_header = ''; $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages,'compose_messages'); } else { $composeMessage=$compose_messages[$session]; @@ -364,7 +373,7 @@ if ($draft) { $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false); sqimap_mailbox_select($imap_stream, $draft_folder); // force bypass_trash=true because message should be saved when deliverMessage() returns true. - // in current implementation of sqimap_msgs_list_flag() single message id can + // in current implementation of sqimap_msgs_list_flag() single message id can // be submitted as string. docs state that it should be array. sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true); if ($auto_expunge) { @@ -443,7 +452,7 @@ if ($send) { $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, false); sqimap_mailbox_select($imap_stream, $draft_folder); // bypass_trash=true because message should be saved when deliverMessage() returns true. - // in current implementation of sqimap_msgs_list_flag() single message id can + // in current implementation of sqimap_msgs_list_flag() single message id can // be submitted as string. docs state that it should be array. sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true); if ($auto_expunge) { @@ -793,6 +802,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se // forwarded message text should be as undisturbed as possible, so commenting out this call // sqUnWordWrap($body); $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + //add a blank line after the forward headers $body = "\n" . $body; break; @@ -878,7 +888,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se * @param integer $passed_id * @param mixed $entities * @param mixed $imapConnection - * @return object + * @return object */ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) { global $attachment_dir, $username, $data_dir, $squirrelmail_language, $languages; @@ -923,9 +933,7 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap /* Write Attachment to file */ $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb'); - fputs($fp, decodeBody(mime_fetch_body($imapConnection, - $passed_id, $message->entity_id), - $message->header->encoding)); + mime_print_body_lines ($imapConnection, $passed_id, $message->entity_id, $message->header->encoding, $fp); fclose ($fp); } } else { @@ -979,6 +987,7 @@ function showInputForm ($session, $values=false) { $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first, $username, $compose_messages, $composesession, $default_charset; + $composeMessage = $compose_messages[$session]; if ($values) { $send_to = $values['send_to']; @@ -1116,7 +1125,7 @@ function showInputForm ($session, $values=false) { /* * FIXME: test is specific to ja_JP translation implementation. * This test might apply incorrect conversion to other translations, but - * use of 7bit iso-2022-jp charset in other translations might have other + * use of 7bit iso-2022-jp charset in other translations might have other * issues too. */ if ($default_charset == 'iso-2022-jp') { @@ -1342,7 +1351,6 @@ function checkInput ($show) { function saveAttachedFiles($session) { global $_FILES, $attachment_dir, $attachments, $username, $data_dir, $compose_messages; - /* get out of here if no file was attached at all */ if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) { return true; @@ -1615,7 +1623,7 @@ function deliverMessage($composeMessage, $draft=false) { ClearAttachments($composeMessage); if ($action == 'reply' || $action == 'reply_all') { sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); + sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false); } sqimap_logout($imap_stream); } @@ -1623,4 +1631,4 @@ function deliverMessage($composeMessage, $draft=false) { } // vim: et ts=4 -?> +?> \ No newline at end of file diff --git a/src/download.php b/src/download.php index de1c449c..c5b8efb6 100644 --- a/src/download.php +++ b/src/download.php @@ -39,6 +39,9 @@ sqgetGlobalVar('absolute_dl',$absolute_dl, SQ_GET); if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) { $passed_id = (int) $temp; } +if (!sqgetGlobalVar('account', $account, SQ_GET) ) { + $account = 0; +} global $default_charset; set_my_charset(); @@ -46,7 +49,7 @@ set_my_charset(); /* end globals */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array(),array()); +$aMailbox = sqm_api_mailbox_select($imapConnection, $account, $mailbox,array(),array()); if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) && is_object($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) ) { diff --git a/src/options_order.php b/src/options_order.php index a91f865d..dd01c57e 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -3,7 +3,7 @@ /** * options_order.php * - * Copyright (c) 1999-2005 The SquirrelMail Project Team + * Copyright (c) 1999-2004 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Displays messagelist column order options @@ -26,133 +26,216 @@ require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/plugin.php'); require_once(SM_PATH . 'functions/html.php'); require_once(SM_PATH . 'functions/forms.php'); +require_once(SM_PATH . 'functions/arrays.php'); +require_once(SM_PATH . 'functions/options.php'); /* get globals */ -sqgetGlobalVar('num', $num, SQ_GET); -sqgetGlobalVar('add', $add, SQ_POST); +if (sqgetGlobalVar('num', $num, SQ_GET)) { + $num = (int) $num; +} else { + $num = false; +} +if (!sqgetGlobalVar('method', $method)) { + $method = ''; +} else { + $method = htmlspecialchars($method); +} +if (!sqgetGlobalVar('positions', $pos, SQ_GET)) { + $pos = 0; +} else { + $pos = (int) $pos; +} + +if (!sqgetGlobalVar('account', $account, SQ_GET)) { + $iAccount = 0; +} else { + $iAccount = (int) $account; +} + +if (sqgetGlobalVar('mailbox', $mailbox, SQ_GET)) { + $aMailboxPrefs = unserialize(getPref($data_dir, $username, "pref_".$iAccount.'_'.urldecode($mailbox))); + if (isset($aMailboxPrefs[MBX_PREF_COLUMNS])) { + $index_order = $aMailboxPrefs[MBX_PREF_COLUMNS]; + } +} else { + $index_order_ser = getPref($data_dir, $username, 'index_order'); + if ($index_order_ser) { + $index_order=unserialize($index_order_ser); + } +} +if (!isset($index_order)) { + if (isset($internal_date_sort) && $internal_date_sort == false) { + $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ); + } else { + $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_INT_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ); + } +} + +if (!sqgetGlobalVar('account', $account, SQ_GET)) { + $account = 0; // future work, multiple imap accounts +} else { + $account = (int) $account; +} -sqgetGlobalVar('submit', $submit); -sqgetGlobalVar('method', $method); /* end of get globals */ -displayPageHeader($color, 'None'); - - echo - html_tag( 'table', '', 'center', '', 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[0] ) . - '' . _("Options") . ' - ' . _("Index Order") . '' . - html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="8" cellspacing="0"' ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[4] ); - - $available[1] = _("Checkbox"); - $available[2] = _("From"); - $available[3] = _("Date"); - $available[4] = _("Subject"); - $available[5] = _("Flags"); - $available[6] = _("Size"); - - if (! isset($method)) { $method = ''; } - - if ($method == 'up' && $num > 1) { - $prev = $num-1; - $tmp = $index_order[$prev]; - $index_order[$prev] = $index_order[$num]; - $index_order[$num] = $tmp; - } else if ($method == 'down' && $num < count($index_order)) { - $next = $num++; - $tmp = $index_order[$next]; - $index_order[$next] = $index_order[$num]; - $index_order[$num] = $tmp; - } else if ($method == 'remove' && $num) { - for ($i=1; $i < 8; $i++) { - removePref($data_dir, $username, "order$i"); - } - for ($j=1,$i=1; $i <= count($index_order); $i++) { - if ($i != $num) { - $new_ary[$j] = $index_order[$i]; - $j++; - } - } - $index_order = array(); - $index_order = $new_ary; - if (count($index_order) < 1) { - include_once(SM_PATH . 'include/load_prefs.php'); +/***************************************************************/ +/* Finally, display whatever page we are supposed to show now. */ +/***************************************************************/ + +displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); + + +/** + * Change the column order of a mailbox + * + * @param array $index_order (reference) contains an ordered list with columns + * @param string $method action to take, move, add and remove are supported + * @param int $num target column + * @param int $pos positions to move a column in the index_order array + * @return bool $r A change in the ordered list took place. + */ +function change_columns_list(&$index_order,$method,$num,$pos=0) { + $r = false; + switch ($method) { + case 'move': $r = sqm_array_move_value($index_order,$num,$pos); break; + case 'add': + $index_order[] = (int) $num; $r = true; + /** + * flush the cache in order to retrieve the new columns + */ + sqsession_unregister('mailbox_cache'); + break; + case 'remove': + if(in_array($num, $index_order)) { + unset($index_order[array_search($num, $index_order)]); + $index_order = array_values($index_order); + $r = true; } - } else if ($method == 'add' && $add) { - /* User should not be able to insert PHP-code here */ - $add = str_replace ('', '..', $add); - $add = str_replace ('<%', '..', $add); - $index_order[count($index_order)+1] = $add; + break; + default: break; } + return $r; +} +/** + * Column to string translation array + */ +$available[SQM_COL_CHECK] = _("Checkbox"); +$available[SQM_COL_FROM] = _("From"); +$available[SQM_COL_DATE] = _("Date"); +$available[SQM_COL_SUBJ] = _("Subject"); +$available[SQM_COL_FLAGS] = _("Flags"); +$available[SQM_COL_SIZE] = _("Size"); +$available[SQM_COL_PRIO] = _("Priority"); +$available[SQM_COL_ATTACHMENT] = _("Attachments"); +$available[SQM_COL_INT_DATE] = _("Received"); +$available[SQM_COL_TO] = _("To"); +$available[SQM_COL_CC] = _("Cc"); +$available[SQM_COL_BCC] = _("bcc"); + +if (change_columns_list($index_order,$method,$num,$pos)) { if ($method) { - for ($i=1; $i <= count($index_order); $i++) { - setPref($data_dir, $username, "order$i", $index_order[$i]); - } + // TODO, bound index_order to mailbox and make a difference between the global index_order and mailbox bounded index_order + setPref($data_dir, $username, 'index_order', serialize($index_order)); } - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs.") - ) - ) , - '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "
\n"; - - if (count($index_order)) - { - echo html_tag( 'table', '', '', '', ' cellspacing="0" cellpadding="0" border="0"' ) . "\n"; - for ($i=1; $i <= count($index_order); $i++) { - $tmp = $index_order[$i]; - echo html_tag( 'tr' ); - echo html_tag( 'td', ''. _("up") .'' ); - echo html_tag( 'td', ' | ' ); - echo html_tag( 'td', ''. _("down") .'' ); - echo html_tag( 'td', ' | ' ); - echo html_tag( 'td' ); - /* Always show the subject */ - if ($tmp != 4) - echo '' . _("remove") . ''; - else - echo ' '; - echo ''; - echo html_tag( 'td', ' - ' ); - echo html_tag( 'td', $available[$tmp] ); - echo '' . "\n"; - } - echo '
'; - - $button_str = ''; - // display flag buttons only if supported - if ($show_flag_buttons && - in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true) ) { - $button_str .= getButton('submit', 'markUnflagged', _("Unflag")); - $button_str .= getButton('submit', 'markFlagged', _("Flag")); - $button_str .= " \n"; - } - if (in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true)) { - $button_str .= getButton('submit', 'markUnread', _("Unread")); - $button_str .= getButton('submit', 'markRead', _("Read")); - $button_str .= " \n"; - } - $button_str .= getButton('submit', 'attache',_("Forward")) . - " \n"; - if (in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) { - $button_str .= getButton('submit', 'delete',_("Delete")); - $button_str .= '' . _("Bypass Trash"); - $button_str .= " \n"; - } - if (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY') { - $button_str .= getButton('submit', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; - $button_str .= ' '; - } -?> - - - - - - - -
- - - ' . $paginator . $thread_link_str . '', 'left') . "\n"; ?> - - ' . $msg_cnt_str . '', 'right') . "\n"; ?> - -
-
- - - - - - - - - - -   -   - - - - - -
-
-
- - - - -
- - - ' . $paginator_str . '', 'left'); ?> - ' . $msg_cnt_str . '', 'right'); ?> - -
-
-
' . "\n"; +} + + +$opts = array(); +if (count($index_order) != count($available)) { + for ($i=0; $i < count($available); $i++) { + if (!in_array($i,$index_order)) { + $opts[$i] = $available[$i]; + } } +} + - if (count($index_order) != count($available)) { - - $opts = array(); - for ($i=1; $i <= count($available); $i++) { - $found = false; - for ($j=1; $j <= count($index_order); $j++) { - if ($index_order[$j] == $i) { - $found = true; - } - } - if (!$found) { - $opts[$i] = $available[$i]; - } - } - echo addForm('options_order.php', 'post', 'f'); - echo addSelect('add', $opts, '', TRUE); +viewOrderForm($available, $index_order,$opts,urldecode($mailbox)); + + + +// FOOD for html designers +function viewOrderForm($aColumns, $aOrder, $aOpts, $mailbox) { + global $color; +?> + + + + -
+ - + + + +
+ + + + +
+ +
+
+ + + + $iCol) { + $sQuery = "&num=$iCol"; + if (isset($mailbox) && $mailbox) { + $sQuery .= '&mailbox='.urlencode($mailbox); + } + +?> + + + + + + + + + + + + + + + + + + + + + + +
  |    |    | 
+ +'; } - - echo html_tag( 'p', '' . _("Return to options page") . '


' ); - ?> +


+
+ + - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/read_body.php b/src/read_body.php index f32330b1..094b3266 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -29,6 +29,7 @@ require_once(SM_PATH . 'functions/url_parser.php'); require_once(SM_PATH . 'functions/html.php'); require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/identity.php'); +include_once(SM_PATH . 'functions/arrays.php'); require_once(SM_PATH . 'functions/mailbox_display.php'); /** @@ -45,18 +46,12 @@ function findNextMessage($uidset,$passed_id='backwards') { if ($passed_id=='backwards' || !is_array($uidset)) { // check for backwards compattibilty gpg plugin $passed_id = $uidset; } - $result = -1; - $count = count($uidset) - 1; - foreach($uidset as $key=>$value) { - if ($passed_id == $value) { - if ($key == $count) { - break; - } - $result = $uidset[$key + 1]; - break; - } + $result = sqm_array_get_value_by_offset($uidset,$passed_id,1); + if ($result === false) { + return -1; + } else { + return $result; } - return $result; } /** @@ -71,17 +66,12 @@ function findPreviousMessage($uidset, $passed_id) { if (!is_array($uidset)) { return -1; } - $result = -1; - foreach($uidset as $key=>$value) { - if ($passed_id == $value) { - if ($key != 0) { - $result = $uidset[$key - 1]; - } - break; - } + $result = sqm_array_get_value_by_offset($uidset,$passed_id,-1); + if ($result === false) { + return -1; + } else { + return $result; } - - return $result; } /** @@ -469,7 +459,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed $startMessage, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, $username, $delete_prev_next_display, - $compose_new_win, $javascript_on; + $compose_new_win, $javascript_on, $compose_width, $compose_height; //FIXME cleanup argument list, use $aMailbox where possible $mailbox = $aMailbox['NAME']; @@ -501,7 +491,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed } $prev_link = _("Previous"); - if($entities[$passed_ent_id] > 1) { + if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] > 1) { $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1]; $prev_link = ''; +} + + /***************************/ /* Main of read_body.php */ /***************************/ @@ -780,6 +797,12 @@ if ( sqgetGlobalVar('view_hdr', $temp, SQ_GET) ) { $view_hdr = (int) $temp; } +if ( sqgetGlobalVar('account', $temp, SQ_GET) ) { + $iAccount = (int) $temp; +} else { + $iAccount = 0; +} + /** GET/POST VARS */ sqgetGlobalVar('passed_ent_id', $passed_ent_id); sqgetGlobalVar('mailbox', $mailbox); @@ -804,7 +827,19 @@ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); global $sqimap_capabilities, $lastTargetMailbox; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array('setindex' => $what),array()); +$aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); + +/** + * Check if cache is still valid + */ +$iSetIndex = $aMailbox['SETINDEX']; +$aMailbox['CURRENT_MSG'][$iSetIndex] = $passed_id; +//$aMailbox['OFFSET'] = $startMessage -1; + +sqgetGlobalVar('aFetchColumns',$aFetchColumns,SQ_SESSION); +if (!is_array($aMailbox['UIDSET'][$what])) { + fetchMessageHeaders($imapConnection, $aMailbox, $aFetchColumns); +} /** * Update the seen state @@ -820,8 +855,6 @@ if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) { */ if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) { handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id)); -// sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox); -// sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox,$delete_id); } /** @@ -848,11 +881,18 @@ if (isset($passed_ent_id) && $passed_ent_id) { $rfc822_header = new Rfc822Header(); $rfc822_header->parseHeader($read); $message->rfc822_header = $rfc822_header; +} else if ($message->type0 == 'message' && $message->type1 == 'rfc822' && isset($message->entities[0])) { + $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[1.HEADER]", true, $response, $msg, TRUE); + $rfc822_header = new Rfc822Header(); + $rfc822_header->parseHeader($read); + $message->rfc822_header = $rfc822_header; } else { $passed_ent_id = 0; } $header = $message->header; +$header = $message->header; + /****************************************/ /* Block for handling incoming url vars */ @@ -961,10 +1001,11 @@ formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE); do_hook('read_body_bottom'); sqimap_logout($imapConnection); -/* sessions are written at the end of the script. it's better to register - them at the end so we avoid double session_register calls */ -/* add the mailbox to the cache */ -$mailbox_cache[$aMailbox['NAME']] = $aMailbox; + +/** + * Write mailbox with updated seen flag information back to cache. + */ +$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; sqsession_register($mailbox_cache,'mailbox_cache'); ?> \ No newline at end of file diff --git a/src/right_main.php b/src/right_main.php index a25c460e..c977767c 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -1,9 +1,8 @@ 0, - MBX_PREF_LIMIT => (int) $show_num, - MBX_PREF_AUTO_EXPUNGE => (bool) $auto_expunge, - MBX_PREF_INTERNALDATE => (bool) getPref($data_dir, $username, 'internal_date_sort') - // MBX_PREF_FUTURE => (var) $future - ); - /* not sure if this hook should be capable to alter the global pref array */ do_hook ('generic_header'); -$aMailboxPrefSer=getPref($data_dir, $username, "pref_$mailbox"); +$aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$account.'_'.$mailbox); if ($aMailboxPrefSer) { $aMailboxPref = unserialize($aMailboxPrefSer); + $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; // index_order contains the columns to show and the order of the columns } else { - setUserPref($username,"pref_$mailbox",serialize($aMailboxGlobalPref)); - $aMailboxPref = $aMailboxGlobalPref; + setUserPref($username,'pref_'.$account.'_'.$mailbox,serialize($default_mailbox_pref)); + $aMailboxPref = $default_mailbox_pref; } if (isset($srt)) { $aMailboxPref[MBX_PREF_SORT] = (int) $srt; } +$trash_folder = (isset($trash_folder)) ? $trash_folder : false; +$sent_folder = (isset($sent_folder)) ? $sent_folder : false; +$draft_folder = (isset($draft_folder)) ? $draft_folder : false; + /** * until there is no per mailbox option screen to set prefs we override @@ -128,17 +120,78 @@ if (isset($srt)) { $aMailboxPref[MBX_PREF_LIMIT] = (int) $show_num; $aMailboxPref[MBX_PREF_AUTO_EXPUNGE] = (bool) $auto_expunge; $aMailboxPref[MBX_PREF_INTERNALDATE] = (bool) getPref($data_dir, $username, 'internal_date_sort'); +$aMailboxPref[MBX_PREF_COLUMNS] = $index_order; + +/** + * Replace From => To in case it concerns a draft or sent folder + */ +if (($mailbox == $sent_folder || $mailbox == $draft_folder) && + !in_array(SQM_COL_TO,$aMailboxPref[MBX_PREF_COLUMNS])) { + $aNewOrder = array(); // nice var name ;) + foreach($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) { + if ($iCol == SQM_COL_FROM) { + $iCol = SQM_COL_TO; + } + $aNewOrder[] = $iCol; + } + $aMailboxPref[MBX_PREF_COLUMNS] = $aNewOrder; + setUserPref($username,'pref_'.$account.'_'.$mailbox,serialize($aMailboxPref)); +} + + + +/** + * Set the config options for the messages list + */ +$aColumns = array(); // contains settings per column. Switch to key -> value based array, order is the order of the array keys +foreach ($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) { + $aColumns[$iCol] = array(); + switch ($iCol) { + case SQM_COL_SUBJ: + if ($truncate_subject) { + $aColumns[$iCol]['truncate'] = $truncate_subject; + } + break; + case SQM_COL_FROM: + case SQM_COL_TO: + case SQM_COL_CC: + case SQM_COL_BCC: + if ($truncate_sender) { + $aColumns[$iCol]['truncate'] = $truncate_sender; + } + break; + } +} + +/** + * Properties required by showMessagesForMailbox + */ +$aProps = array( + 'columns' => $aColumns, // columns bound settings + 'config' => array('alt_index_colors' => $alt_index_colors, // alternating row colors (should be a template thing) + 'highlight_list' => $message_highlight_list, // row highlighting rules + 'fancy_index_highlite' => $fancy_index_highlite, // highlight rows on hover or on click -> check + 'show_flag_buttons' => (isset($show_flag_buttons)) ? $show_flag_buttons : true, + 'lastTargetMailbox' => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '', // last mailbox where messages are moved/copied to + 'trash_folder' => $trash_folder, + 'sent_folder' => $sent_folder, + 'draft_folder' => $draft_folder, + 'color' => $color, + 'enablesort' => true // enable sorting on columns + ), + 'mailbox' => $mailbox, + 'account' => (isset($account)) ? $account : 0, // future usage if we support multiple imap accounts + 'module' => 'read_body', + 'email' => false); /** * system wide admin settings and incoming vars. */ $aConfig = array( - 'allow_thread_sort' => $allow_thread_sort, - 'allow_server_sort' => $allow_server_sort, 'user' => $username, // incoming vars - 'offset' => $startMessage + 'offset' => $startMessage // offset in paginator ); /** * The showall functionality is for the moment added to the config array @@ -146,17 +199,34 @@ $aConfig = array( * this behaviour later and add it to $aMailboxPref instead */ if (isset($showall)) { - $aConfig['showall'] = $showall; + $aConfig['showall'] = $showall; // show all messages in a mailbox (paginator is disabled) +} else { + $showall = false; } + /** * Retrieve the mailbox cache from the session. */ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); +/** + * Select the mailbox and retrieve the cached info. + */ +$aMailbox = sqm_api_mailbox_select($imapConnection,$account, $mailbox,$aConfig,$aMailboxPref); -$aMailbox = sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aMailboxPref); - +/** + * MOVE THIS to a central init section !!!! + */ +if (!sqgetGlobalVar('align',$align,SQ_SESSION)) { + $dir = ( isset( $languages[$squirrelmail_language]['DIR']) ) ? $languages[$squirrelmail_language]['DIR'] : 'ltr'; + if ( $dir == 'ltr' ) { + $align = array('left' => 'left', 'right' => 'right'); + } else { + $align = array('left' => 'right', 'right' => 'left'); + } + sqsession_register($align, 'align'); +} /* * After initialisation of the mailbox array it's time to handle the FORM data @@ -166,20 +236,40 @@ if ($sError) { $note = $sError; } +/** + * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates + */ +$sTplDir = SM_PATH . 'templates/default/'; + + /* * If we try to forward messages as attachment we have to open a new window * in case of compose in new window or redirect to compose.php */ if (isset($aMailbox['FORWARD_SESSION'])) { if ($compose_new_win) { + /* add the mailbox to the cache */ + $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); // write the session in order to make sure that the compose window has // access to the composemessages array which is stored in the session session_write_close(); sqsession_is_active(); + + if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { + $compose_width = '640'; + } + if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) { + $compose_height = '550'; + } + // do not use &, it will break the query string and $session will not be detected!!! $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). - '&session='.$aMailbox['FORWARD_SESSION']; - displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false); + '&session='.$aMailbox['FORWARD_SESSION']; + displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", false); } else { + $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); + // save mailboxstate sqsession_register($aMailbox,'aLastSelectedMailbox'); session_write_close(); @@ -191,6 +281,7 @@ if (isset($aMailbox['FORWARD_SESSION'])) { } } else { displayPageHeader($color, $mailbox); +// $compose_uri = $base_uri.'src/compose.php?newmessage=1'; } do_hook('right_main_after_header'); @@ -223,8 +314,43 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { } } } + +/** + * In the future, move this the the initialisation area + */ + + +$oTemplate = new Template($sTplDir); + if ($aMailbox['EXISTS'] > 0) { - showMessagesForMailbox($imapConnection,$aMailbox); + $aTemplateVars =& showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError); + if ($iError) { + + } + foreach ($aTemplateVars as $k => $v) { + $oTemplate->assign($k, $v); + } + + /* + * TODO: To many config related vars. We should move all config related vars to + * one single associative array and assign that to the template + */ + $oTemplate->assign('page_selector', $page_selector); + $oTemplate->assign('page_selector_max', $page_selector_max); + $oTemplate->assign('compact_paginator', $compact_paginator); + $oTemplate->assign('javascript_on', $javascript_on); + $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false); + // Aaaaaahhhhhhh FIX ME DO NOT USE the string "none" for a var when you mean the boolean false or null + $oTemplate->assign('icon_theme', (isset($icon_theme) && $icon_theme !== 'none') ? $icon_theme : false); + $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false); + $oTemplate->assign('aOrder', array_keys($aColumns)); + $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false); + $oTemplate->assign('color', $color); + $oTemplate->assign('align', $align); + $oTemplate->assign('showall', $showall); + + $oTemplate->display('message_list.tpl'); + } else { $string = '' . _("THIS FOLDER IS EMPTY") . ''; echo ' '; @@ -245,7 +371,7 @@ sqimap_logout ($imapConnection); echo ''; /* add the mailbox to the cache */ -$mailbox_cache[$aMailbox['NAME']] = $aMailbox; +$mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox; sqsession_register($mailbox_cache,'mailbox_cache'); -?> \ No newline at end of file +?> diff --git a/src/search.php b/src/search.php index 934ff491..6de459f9 100644 --- a/src/search.php +++ b/src/search.php @@ -31,6 +31,7 @@ require_once(SM_PATH . 'functions/imap_mailbox.php'); require_once(SM_PATH . 'functions/imap_messages.php'); require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()... +include_once(SM_PATH . 'class/template/template.class.php'); /** Prefs array ordinals. Must match $recent_prefkeys and $saved_prefkeys */ @@ -91,6 +92,7 @@ function asearch_unhtml_strcoll($a, $b) return strcoll(asearch_unhtmlentities($a), asearch_unhtmlentities($b)); } + /** * @param string $mailbox mailbox name utf7 encoded inc. special case INBOX * @return string mailbox name ready to display (utf7 decoded or localized INBOX) @@ -122,7 +124,6 @@ function asearch_get_title_display(&$color, $txt) { return '' . $txt . ''; } - /** * @param array $color color array * @param string $txt text to display @@ -549,6 +550,27 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno return $query_display; } +/** + * Creates button + * + * @deprecated see form functions available in 1.5.1 and 1.4.3. + * @param string $type + * @param string $name + * @param string $value + * @param string $js + * @param bool $enabled + */ +function getButton($type, $name, $value, $js = '', $enabled = TRUE) { + $disabled = ( $enabled ? '' : 'disabled ' ); + $js = ( $js ? $js.' ' : '' ); + return ''; +} + + /** Handle the alternate row colors * @return string color value */ @@ -857,72 +879,6 @@ function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $bio echo '' . "\n"; } -/** Print the $msgs messages from $mailbox mailbox - */ - -function asearch_print_mailbox_msgs($imapConnection, &$aMailbox, $color) { - global $javascript_on, $compact_paginator; - /** - * A mailbox can contain different sets with uid's. Default, for normal - * message list view we use '0' as setindex and for search a different - * setindex. - */ - $iSetIndx = $aMailbox['SETINDEX']; - - $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']); - $mailbox_title = '' . _("Folder:") . ' '. $mailbox_display . ' '; - - /** - * UIDSET contains the array with uid's returned by a search - */ - $cnt = count($aMailbox['UIDSET'][$iSetIndx]); - - $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $cnt : $aMailbox['LIMIT']; - $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $cnt) ? - $aMailbox['PAGEOFFSET'] + ($iLimit - 1) : $cnt; - - $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'], - $cnt, $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]); - - if ($javascript_on && $compact_paginator) { - echo "\n\n" - . "\n" - . "\n"; - } - - $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$cnt); - - echo '
'; - - echo ''; - - echo ''; - - echo ''; - - echo '
'; - mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title . " $paginator_str"); - echo '
'; - echo ' '; - echo ' '; - echo '
'; - - echo ' '; - echo ' '; - echo '
'; - printHeader($aMailbox); - displayMessageArray($imapConnection, $aMailbox); - echo '
'; - echo '
'; - mail_message_listing_end($cnt, '', $msg_cnt_str); - echo '
'; -} /** * @param array $boxes mailboxes array (reference) @@ -1059,7 +1015,7 @@ $aConfig = array( 'allow_thread_sort' => $allow_thread_sort, 'allow_server_sort' => $allow_server_sort, 'user' => $username, - 'max_cache_size' + 'setindex' => 1 ); /** Binary operators @@ -1130,19 +1086,32 @@ if (isset($_GET['rownum'])) { if (sqgetGlobalVar('srt', $temp, SQ_GET)) { $srt = (int) $temp; asearch_edit_last(1); - asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); } if (sqgetGlobalVar('startMessage', $temp, SQ_GET)) { $startMessage = (int) $temp; asearch_edit_last(1); - asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); } if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) { $showall = (int) $temp; asearch_edit_last(1); - asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); +// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); } + +if ( sqgetGlobalVar('account', $temp, SQ_GET) ) { + $iAccount = (int) $temp; +} else { + $iAccount = 0; +} + +/** + * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates + */ +$sTplDir = SM_PATH . 'templates/default/'; + + /** * Incoming submit buttons from the message list with search results */ @@ -1346,13 +1315,77 @@ $mailbox = asearch_nz($mailbox_array[0]); if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?) $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;) -if (isset($composenew) && $composenew) { - $comp_uri = "../src/compose.php?mailbox=" . urlencode($mailbox) - . "&session=$composesession&attachedmessages=true&"; - displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false); + +/** +* Handle form actions like flag / unflag, seen / unseen, delete +*/ +if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) { + if ($postMailbox) { + /** + * system wide admin settings and incoming vars. + */ + $aConfig = array( + 'user' => $username, + ); + $aConfig['setindex'] = 1; // $what $where = 'search' + /** + * Set the max cache size to the number of mailboxes to avoid cache cleanups + * when searching all mailboxes + */ + $aConfig['max_cache_size'] = count($boxes) +1; + + $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $postMailbox,$aConfig,array()); + $sError = handleMessageListForm($imapConnection,$aMailbox); + /* add the mailbox to the cache */ + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + + if ($sError) { + $note = $sError; + } + } +} + +if (isset($aMailbox['FORWARD_SESSION'])) { + /* add the mailbox to the cache */ + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); + + if ($compose_new_win) { + // write the session in order to make sure that the compose window has + // access to the composemessages array which is stored in the session + session_write_close(); + sqsession_is_active(); + + if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { + $compose_width = '640'; + } + if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) { + $compose_height = '550'; + } + // do not use &, it will break the query string and $session will not be detected!!! + $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). + '&session='.$aMailbox['FORWARD_SESSION']; + displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", false); + } else { + // save mailboxstate + sqsession_register($aMailbox,'aLastSelectedMailbox'); + session_write_close(); + // we have to redirect to the compose page + $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). + '&session='.$aMailbox['FORWARD_SESSION']; + header("Location: $location"); + exit; + } } else { displayPageHeader($color, $mailbox); +// $compose_uri = $base_uri.'src/compose.php?newmessage=1'; +} + +if (isset($note)) { + echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n"; } + + do_hook('search_before_form'); if (!$search_silent) { @@ -1425,32 +1458,28 @@ if ($submit == $search_button_text) { */ $mboxes_mailbox = sqimap_asearch($imapConnection, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array, $mboxes_array); foreach($mboxes_mailbox as $mbx => $search) { - $aMailboxPrefSer=getPref($data_dir, $username, "pref_$mbx"); + /** + * until there is no per mailbox option screen to set prefs we override + * the mailboxprefs by the default ones + */ + + $aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$iAccount.'_'.$mbx); if ($aMailboxPrefSer) { $aMailboxPref = unserialize($aMailboxPrefSer); + $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; } else { - setUserPref($username,"pref_$mbx",serialize($aMailboxGlobalPref)); - $aMailboxPref = $aMailboxGlobalPref; + setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($default_mailbox_pref)); + $aMailboxPref = $default_mailbox_pref; } if (isset($srt) && $targetmailbox == $mbx) { $aMailboxPref[MBX_PREF_SORT] = (int) $srt; } - if (isset($startMessage) && $targetmailbox == $mbx) { - $aConfig['offset'] = $startMessage; - } else if (isset($aConfig['offset'])) { - unset($aConfig['offset']); - } - if (isset($showall) && $targetmailbox == $mbx) { - $aConfig['showall'] = $showall; - } else if (isset($aConfig['showall'])) { - unset($aConfig['showall']); - } - /** - * Set the max cache size to the number of mailboxes to avoid cache cleanups - * when searching all mailboxes - */ - $aConfig['max_cache_size'] = count($mboxes_mailbox) +1; + + $trash_folder = (isset($trash_folder)) ? $trash_folder : false; + $sent_folder = (isset($sent_folder)) ? $sent_folder : false; + $draft_folder = (isset($draft_folder)) ? $draft_folder : false; + /** * until there is no per mailbox option screen to set prefs we override @@ -1459,28 +1488,141 @@ if ($submit == $search_button_text) { $aMailboxPref[MBX_PREF_LIMIT] = (int) $show_num; $aMailboxPref[MBX_PREF_AUTO_EXPUNGE] = (bool) $auto_expunge; $aMailboxPref[MBX_PREF_INTERNALDATE] = (bool) getPref($data_dir, $username, 'internal_date_sort'); + $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; + + /** + * Replace From => To in case it concerns a draft or sent folder + */ + if (($mbx == $sent_folder || $mbx == $draft_folder) && + !in_array(SQM_COL_TO,$aMailboxPref[MBX_PREF_COLUMNS])) { + $aNewOrder = array(); // nice var name ;) + foreach($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) { + if ($iCol == SQM_COL_FROM) { + $iCol = SQM_COL_TO; + } + $aNewOrder[] = $iCol; + } + $aMailboxPref[MBX_PREF_COLUMNS] = $aNewOrder; + setUserPref($username,'pref_'.$account.'_'.$mbx,serialize($aMailboxPref)); + } $aConfig['search'] = $search['search']; $aConfig['charset'] = $search['charset']; - $aConfig['setindex'] = 1; // $what $where = 'search' - $aMailbox = sqm_api_mailbox_select($imapConnection,$mbx,$aConfig,$aMailboxPref); /** - * Handle form actions like flag / unflag, seen / unseen, delete + * Set the max cache size to the number of mailboxes to avoid cache cleanups + * when searching all mailboxes + */ + $aConfig['max_cache_size'] = count($mboxes_mailbox) +1; + if (isset($startMessage) && $targetmailbox == $mbx) { + $aConfig['offset'] = $startMessage; + } else if (isset($aConfig['offset'])) { + unset($aConfig['offset']); + } + if (isset($showall) && $targetmailbox == $mbx) { + $aConfig['showall'] = $showall; + } else { + if (isset($aConfig['showall'])) { + unset($aConfig['showall']); + } + $showall = false; + } + + /** + * Set the config options for the messages list */ - if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) { - if ($postMailbox === $mbx) { - handleMessageListForm($imapConnection,$aMailbox); + $aColumns = array(); + foreach ($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) { + $aColumns[$iCol] = array(); + switch ($iCol) { + case SQM_COL_SUBJ: + if ($truncate_subject) { + $aColumns[$iCol]['truncate'] = $truncate_subject; + } + break; + case SQM_COL_FROM: + case SQM_COL_TO: + case SQM_COL_CC: + case SQM_COL_BCC: + if ($truncate_sender) { + $aColumns[$iCol]['truncate'] = $truncate_sender; + } + break; } } - if (fetchMessageHeaders($imapConnection, $aMailbox)) { - $msgsfound = true; - echo '
'; - asearch_print_mailbox_msgs($imapConnection, $aMailbox, $color); - flush(); + + + $aProps = array( + 'columns' => $aColumns, + 'config' => array('alt_index_colors' => $alt_index_colors, + 'highlight_list' => $message_highlight_list, + 'fancy_index_highlite' => $fancy_index_highlite, + 'show_flag_buttons' => (isset($show_flag_buttons)) ? $show_flag_buttons : true, + 'lastTargetMailbox' => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '', + 'trash_folder' => $trash_folder, + 'sent_folder' => $sent_folder, + 'draft_folder' => $draft_folder, + 'enablesort' => true, + 'color' => $color + ), + 'mailbox' => $mbx, + 'account' => (isset($iAccount)) ? $iAccount : 0, + 'module' => 'read_body', + 'email' => false); + + + $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mbx,$aConfig,$aMailboxPref); + + $iError = 0; + $aTemplate = showMessagesForMailbox($imapConnection, $aMailbox,$aProps, $iError); + if ($iError) { + // error handling + } else { + /** + * In the future, move this the the initialisation area + */ + sqgetGlobalVar('align',$align,SQ_SESSION); + + $oTemplate = new Template($sTplDir); + + if ($aMailbox['EXISTS'] > 0) { + // $aTemplate =& showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError); + if ($iError) { + + } + foreach ($aTemplate as $k => $v) { + $oTemplate->assign($k, $v); + } + $oTemplate->assign('page_selector', $page_selector); + $oTemplate->assign('page_selector_max', $page_selector_max); + $oTemplate->assign('compact_paginator', $compact_paginator); + $oTemplate->assign('javascript_on', $javascript_on); + $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false); + // Aaaaaahhhhhhh FIX ME DO NOT USE the string "none" for a var when you mean the boolean false or null + $oTemplate->assign('icon_theme', (isset($icon_theme) && $icon_theme !== 'none') ? $icon_theme : false); + $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false); + $oTemplate->assign('aOrder', array_keys($aColumns)); + $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false); + $oTemplate->assign('color', $color); + $oTemplate->assign('align', $align); + $oTemplate->assign('showall', $showall); + + $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']); + if (strtoupper($mbx) == 'INBOX') { + $mailbox_display = _("INBOX"); + } else { + $mailbox_display = imap_utf7_decode_local($mbx); + } + + echo '
' . _("Folder:") . ' '. $mailbox_display . ' '; + + + $oTemplate->display('message_list.tpl'); + } } + /* add the mailbox to the cache */ - $mailbox_cache[$aMailbox['NAME']] = $aMailbox; + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; } } -- 2.25.1