From: philippe_mingo Date: Wed, 19 Jun 2002 15:04:54 +0000 (+0000) Subject: html output set to func system. From now it is important to use html.php X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8008456a180e245d1c81c1773547d59573b5c1bf;p=squirrelmail.git html output set to func system. From now it is important to use html.php to output html table tags, as that functions adds necessary LOCALE dependent tags. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2971 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/html.php b/functions/html.php index 75429eb2..72351c0c 100644 --- a/functions/html.php +++ b/functions/html.php @@ -1,7 +1,7 @@ " ); - } - -/* - * Zookeeper - * Copyright (c) 2001 Partridge - * Licensed under the GNU GPL. For full terms see the file COPYING. - * - * $Id$ - */ - -/** - * ZkSvc_html - * - * The ZkSvc_html class manages html output. - */ -class ZkSvc_html { - - /* Constants */ - var $name = 'html'; // Module name - var $ver = '$Id$'; - - /* Properties */ - var $buffer; // Buffered output - var $htmlmod; // Module handler - var $title; // Page title - var $head_extras; // Extra header tags - var $bgcolor; // Background color - var $text; // Text color - var $link; // Link color - var $vlink; // Visited link color - var $alink; // Active link color - var $onload; // Onload event - var $onunload; // OnUnload event - var $dir; // Text direction - - var $tag_options; // Array of tag options array - - /** CONSTRUCTOR - */ - - function ZkSvc_html() { - - GLOBAL $languages, $language; - - $this->spool = FALSE; - $this->buffer = ''; - $this->title = 'Default zkHTML Title'; - $this->head_extras = ''; - $this->bgcolor = '#FFFFFF'; - $this->text = '#000000'; - $this->link = '#3300CC'; - $this->vlink = '#993333'; - $this->alink = '#993333'; - $this->onload = ''; - $this->onunload = ''; - - /* To know if a tag exists we check that it has got a place in the following array */ - $this->tag_options = array( 'table' => array( 'tag_name' => 'table', - 'tag_closed' => TRUE ), - 'tr' => array( 'tag_name' => 'tr', - 'tag_closed' => TRUE ), - 'th' => array( 'tag_name' => 'th', - 'tag_closed' => TRUE ), - 'td' => array( 'tag_name' => 'td', - 'tag_closed' => TRUE ), - 'li' => array( 'tag_name' => 'li', - 'tag_closed' => TRUE ), - 'ol' => array( 'tag_name' => 'ol', - 'tag_closed' => TRUE ), - 'form' => array( 'tag_name' => 'form', - 'tag_closed' => TRUE ), - 'input' => array( 'tag_name' => 'input', - 'tag_closed' => FALSE ), - 'br' => array( 'tag_name' => 'br', - 'tag_closed' => FALSE ), - 'textarea' => array( 'tag_name' => 'textarea', - 'tag_closed' => TRUE ), - 'p' => array( 'tag_name' => 'p', - 'tag_closed' => TRUE ), - 'a' => array( 'tag_name' => 'a', - 'tag_closed' => TRUE ), - 'center' => array( 'name' => 'center', - 'tag_closed' => TRUE ), - 'img' => array( 'name' => 'img', - 'tag_closed' => FALSE ), - 'font' => array( 'tag_closed' => TRUE ), - 'blockquote' => array( 'tag_name' => 'blockquote', - 'tag_closed' => TRUE ) - ); - - if ( isset( $languages[$language]['DIR']) ) { - $this->dir = strtolower( $languages[$language]['DIR'] ); - } else { - $this->dir = 'ltr'; - } - - } - - /** - * Return the name of this service. - * - * @return string the name of this service - */ - function getServiceName() { - return( $this->name ); - } - - /** - * Replace the Zookeeper html module loaded for this service. (no modules yet) - * - */ - function loadModule(&$module) { - $this->htmlmod = &$module; - } - - /** - * Outputs the buffer and re-initialize it. - * - */ - function flush( $string = '' ) { - echo $this->buffer . $string; - flush(); - $this->buffer = ''; - } - - /** - * Builds a header string - * - */ - function header( $string = '' ) { - - // It initializes the buffer. - $this->buffer = '' . - "\n\n"; - - if( $this->head_extras <> '' || $this->title <> '' ) { - - $this->buffer .= "\n"; - - if( $this->title <> '' ) - $this->buffer .= "$this->title\n"; - - $this->buffer .= "$this->head_extras\n"; - } - $xtra = ''; - if ( $this->onload <> '' ) { - $xtra .= ' onload="' . $this->onload . '" '; - } - if ( $this->onunload <> '' ) { - $xtra .= ' onunload="' . $this->onunload . '" '; - } - $this->buffer .= "text\" BGCOLOR=\"$this->bgcolor\" LINK=\"$this->link\" VLINK=\"$this->vlink\" ALINK=\"$this->alink\" $xtra>\n"; - - /* See if we're asking for a closed strcuture */ - if( $string == '' ) { - $this->flush(); - } else { - $this->buffer .= $string . ''; - } - - } - - /** - * Builds a footer string - * - */ - function footer() { - - $this->buffer .= "\n\n\n"; - $this->flush(); - - } - - /** - * Builds a tag string - * - */ - function tag( $tag, $string = '', $options = '' ) { - - $ret = ''; - if( $this->tag_options[$tag] <> NULL ) { - if( $options == '' ) { - $options = $this->tag_options[$tag]; - } - switch( strtolower( $tag ) ) { - case 'td': - case 'th': - if ( $this->dir == 'rtl' && isset( $options['align'] ) ) { - - } - case 'table': - if ( $this->dir <> '' ) { - $options['DIR'] = $this->dir; - } - break; - } - $ret = zkTag_html( $tag, $string, $options, $this->tag_options[$tag]['tag_closed'] ); - } + $ret = "<$tag"; + + if ( $dir <> 'ltr' ) { + $ret .= " DIR=\"$dir\""; + } + + $ret .= "$bgc$alg"; + + if ( $xtra <> '' ) { + $ret .= " $xtra"; + } + $ret .= '>'; + + if ( $val <> '' ) { + $ret .= "$val"; + } + return( $ret ); - - } - - /** - * Builds a header string - * - */ - function h( $string, $level = '1' ) { - - $buffer = ""; - - /* See if we're asking for a closed strcuture */ - if( $string == '' ) { - $this->$buffer .= $buffer; - } else { - $buffer .= $string . ""; - } - return( $buffer ); - - } - -} - -/** - * Converts an array into a parameters tag list. - * - */ -function zkGetParms_html( $parms ) { - - $buffer = ''; - foreach( $parms as $key => $opt ) { - if( substr( $key, 0, 3 ) <> 'tag' ) { - $buffer .= " $key"; - if ($opt <> '' ) { - $buffer .= "=\"$opt\""; - } - } - } - return( $buffer ); -} - -/** - * Composes a tag string with all its parameters. - * - */ -function zkTag_html( $tag, $string, $options, $closed ) { - - /* - We must check direction tag in case we have table, td or th - */ - - $ret = "<$tag" . - zkGetParms_html( $options ) . - '>' . - $string; - - if ( $closed ) { - $ret .= ""; } - return( $ret ); -} - -function optionize( $name, $opts, $default, $xtra = '' ) { - - $ret = "\n"; - return( $ret ); -} - ?> \ No newline at end of file diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index ceed2dc4..0f7e74f7 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -14,13 +14,14 @@ require_once('../functions/strings.php'); require_once('../functions/imap_utf7_decode_local.php'); +require_once('../functions/html.php'); /* Default value for page_selector_max. */ define('PG_SEL_MAX', 10); -function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, - $start_msg, $where, $what){ - global $checkall, +function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, +$start_msg, $where, $what){ + global $checkall, $color, $msgs, $msort, $sent_folder, $draft_folder, $default_use_priority, @@ -31,478 +32,496 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $thread_sort_messages, /* thread sorting on/off */ $server_sort_order, /* sort value when using server-sorting */ $row_count, - $allow_server_sort; /* enable/disable server-side sorting */ + $allow_server_sort; /* enable/disable server-side sorting */ $color_string = $color[4]; - - if ($GLOBALS['alt_index_colors']) { - if (!isset($row_count)) { - $row_count = 0; + + if ($GLOBALS['alt_index_colors']) { + if (!isset($row_count)) { + $row_count = 0; + } + $row_count++; + if ($row_count % 2) { + if (!isset($color[12])) { + $color[12] = '#EAEAEA'; + } + $color_string = $color[12]; + } } - $row_count++; - if ($row_count % 2) { - if (!isset($color[12])) { - $color[12] = '#EAEAEA'; - } - $color_string = $color[12]; + $msg = $msgs[$key]; + + /* + * This is done in case you're looking into Sent folders, + * because you can have multiple receivers. + */ + $senderNames = explode(',', $msg['FROM']); + $senderName = ''; + if (sizeof($senderNames)){ + foreach ($senderNames as $senderNames_part) { + if ($senderName != '') { + $senderName .= ', '; + } + $senderName .= sqimap_find_displayable_name($senderNames_part); + } } - } - $msg = $msgs[$key]; - - /* - * This is done in case you're looking into Sent folders, - * because you can have multiple receivers. - */ - $senderNames = explode(',', $msg['FROM']); - $senderName = ''; - if (sizeof($senderNames)){ - foreach ($senderNames as $senderNames_part) { - if ($senderName != '') { - $senderName .= ', '; - } - $senderName .= sqimap_find_displayable_name($senderNames_part); + + if( $mailbox == 'None' ) { + $boxes = sqimap_mailbox_list($imapConnection); + $mailbox = $boxes[0]['unformatted']; + unset( $boxes ); } - } - - if( $mailbox == 'None' ) { - $boxes = sqimap_mailbox_list($imapConnection); - $mailbox = $boxes[0]['unformatted']; - unset( $boxes ); - } - $urlMailbox = urlencode($mailbox); - $subject = processSubject($msg['SUBJECT']); - echo "\n"; - - if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { - $flag = ""; - $flag_end = ''; - } else { - $flag = ''; - $flag_end = ''; - } - if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { - $bold = ''; - $bold_end = ''; - } else { - $bold = ''; - $bold_end = ''; - } - if (handleAsSent($mailbox)) { - $italic = ''; - $italic_end = ''; - } else { - $italic = ''; - $italic_end = ''; - } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { - $fontstr = ""; - $fontstr_end = ''; - } else { - $fontstr = ''; - $fontstr_end = ''; - } - - /** - * AAAAH! Make my eyes stop bleeding! - * Who wrote this?! - */ - if (sizeof($message_highlight_list)){ - foreach ($message_highlight_list as $message_highlight_list_part) { - if (trim($message_highlight_list_part['value']) != '') { - if ($message_highlight_list_part['match_type'] == 'to_cc') { - if (strstr('^^' . strtolower($msg['TO']), - strtolower($message_highlight_list_part['value'])) - || strstr('^^'.strtolower($msg['CC']), - strtolower($message_highlight_list_part['value']))) { - $hlt_color = $message_highlight_list_part['color']; - continue; - } - } else - if (strstr('^^' . strtolower($msg[strtoupper($message_highlight_list_part['match_type'])]), - strtolower($message_highlight_list_part['value']))) { - $hlt_color = $message_highlight_list_part['color']; - continue; - } - } + $urlMailbox = urlencode($mailbox); + $subject = processSubject($msg['SUBJECT']); + echo "\n"; + + if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { + $flag = ""; + $flag_end = ''; + } else { + $flag = ''; + $flag_end = ''; } - } - - if (!isset($hlt_color)) { - $hlt_color = $color_string; - } - - if ($where && $what) { - if(!isset($pos) || $pos == '') { - $pos = '0'; + if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { + $bold = ''; + $bold_end = ''; + } else { + $bold = ''; + $bold_end = ''; } - $search_stuff = "&pos=" . urlencode($pos) - . "&where=" . urlencode($where) . '&what=' . urlencode($what); - } else { - $search_stuff = ''; - } - - $checked = ($checkall == 1) ? ' checked' : ''; - - if (sizeof($index_order)){ - foreach ($index_order as $index_order_part) { - switch ($index_order_part) { - case 1: /* checkbox */ - echo " " - . "\n"; - break; - case 2: /* from */ - echo " $italic$bold$flag$fontstr" - . "$senderName$fontstr_end$flag_end$bold_end$italic_end\n"; - break; - case 3: /* date */ - echo "
$bold$flag$fontstr" - . $msg["DATE_STRING"] - . "$fontstr_end$flag_end$bold_end
\n"; - break; - case 4: /* subject */ - echo " $bold"; - if ($thread_sort_messages == 1) { - if (isset($indent_array[$msg["ID"]])) { - echo str_repeat("    ",$indent_array[$msg["ID"]]); - } + if (handleAsSent($mailbox)) { + $italic = ''; + $italic_end = ''; + } else { + $italic = ''; + $italic_end = ''; + } + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { + $fontstr = ""; + $fontstr_end = ''; + } else { + $fontstr = ''; + $fontstr_end = ''; + } + + /** + * AAAAH! Make my eyes stop bleeding! + * Who wrote this?! + */ + if (sizeof($message_highlight_list)){ + foreach ($message_highlight_list as $message_highlight_list_part) { + if (trim($message_highlight_list_part['value']) != '') { + if ($message_highlight_list_part['match_type'] == 'to_cc') { + if (strstr('^^' . strtolower($msg['TO']), + strtolower($message_highlight_list_part['value'])) + || strstr('^^'.strtolower($msg['CC']), + strtolower($message_highlight_list_part['value']))) { + $hlt_color = $message_highlight_list_part['color']; + continue; + } + } else + if (strstr('^^' . strtolower($msg[strtoupper($message_highlight_list_part['match_type'])]), + strtolower($message_highlight_list_part['value']))) { + $hlt_color = $message_highlight_list_part['color']; + continue; + } + } + } + } + + if (!isset($hlt_color)) { + $hlt_color = $color_string; + } + + if ($where && $what) { + if(!isset($pos) || $pos == '') { + $pos = '0'; + } + $search_stuff = "&pos=" . urlencode($pos) + . "&where=" . urlencode($where) . '&what=' . urlencode($what); + } else { + $search_stuff = ''; } - echo "$flag$subject$flag_end$bold_end\n"; - break; - case 5: /* flags */ - $stuff = false; - echo " \n"; - if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) { - echo _("A") . "\n"; - $stuff = true; - } - if ($msg['TYPE0'] == 'multipart') { - echo "+\n"; - $stuff = true; - } - if ($default_use_priority) { - if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { - echo "!\n"; - $stuff = true; - } - if ($msg['PRIORITY'] == 5) { - echo "?\n"; - $stuff = true; - } - } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) { - echo "D\n"; - $stuff = true; - } - if (!$stuff) { - echo " \n"; - } - echo "\n"; - break; - case 6: /* size */ - echo " $bold$fontstr" - . show_readable_size($msg['SIZE']) . "$fontstr_end$bold_end\n"; - break; - } + + $checked = ($checkall == 1) ? ' checked' : ''; + + if (sizeof($index_order)){ + foreach ($index_order as $index_order_part) { + switch ($index_order_part) { + case 1: /* checkbox */ + echo html_tag( 'td', + "", + 'center', + $hlt_color ); + break; + case 2: /* from */ + echo html_tag( 'td', + $italic . $bold . $flag . $fontstr . $senderName . + $fontstr_end . $flag_end . $bold_end . $italic_end, + '', + $hlt_color ); + break; + case 3: /* date */ + echo html_tag( 'td', + $bold . $flag . $fontstr . $msg['DATE_STRING'] . + $fontstr_end . $flag_end . $bold_end, + 'center', + $hlt_color, + 'nowrap' ); + break; + case 4: /* subject */ + $td_str = $bold; + if ($thread_sort_messages == 1) { + if (isset($indent_array[$msg["ID"]])) { + $td_str .= str_repeat("    ",$indent_array[$msg['ID']]); + } + } + $td_str .= "!"; + $stuff = true; + } + if ($msg['PRIORITY'] == 5) { + $td_str .= "?"; + $stuff = true; + } + } + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) { + $td_str .= "D"; + $stuff = true; + } + if (!$stuff) { + $td_str .= ' '; + } + $td_str .= ''; + echo html_tag( 'td', + $td_str, + 'center', + $hlt_color, + 'nowrap' ); + break; + case 6: /* size */ + + echo html_tag( 'td', + $bold . $fontstr . show_readable_size($msg['SIZE']) . + $fontstr_end . $bold_end, + 'right', + $hlt_color ); + break; + } + } } - } - echo "\n"; + echo "\n"; } /* - * This function loops through a group of messages in the mailbox - * and shows them to the user. - */ -function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, - $start_msg, $sort, $color, $show_num, - $use_cache) { - global $msgs, $msort, +* This function loops through a group of messages in the mailbox +* and shows them to the user. +*/ +function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, +$start_msg, $sort, $color, $show_num, +$use_cache) { + global $msgs, $msort, $sent_folder, $draft_folder, - $message_highlight_list, + $message_highlight_list, $auto_expunge, $thread_sort_messages, $allow_server_sort, $data_dir, $username, $server_sort_order; - /* if $start_msg is lower than $num_msgs, we probably deleted all messages + /* if $start_msg is lower than $num_msgs, we probably deleted all messages * in the last page. We need to re-adjust the start_msg */ - if($start_msg > $num_msgs) { - $start_msg -= $show_num; - if($start_msg < 1) { - $start_msg = 1; - } - } - - /* This code and the next if() block check for - * server-side sorting methods. The $id array is - * formatted and $sort is set to 6 to disable - * SM internal sorting - */ - if ($thread_sort_messages == 1) { - $id = get_thread_sort($imapConnection); - if ($id == 'no') { - echo '
Thread sorting is not'. - ' supported by your IMAP server.
Please report this'. - ' to the system administrator.
'; - $thread_sort_messages = 0; - $id = array(); - } - else { - $sort = 6; - if ($start_msg + ($show_num - 1) < $num_msgs) { - $end_msg = $start_msg + ($show_num-1); - } - else { - $end_msg = $num_msgs; - } - $id = array_slice($id, ($start_msg-1), ($end_msg)); - } - } - - if ($allow_server_sort == TRUE && $thread_sort_messages != 1) { - $server_sort_order = $sort; - $id = sqimap_get_sort_order($imapConnection, $server_sort_order); - if ($id == 'no') { - echo '
Server-side sorting'. - ' is not supported by your IMAP server.
Please report this'. - ' to the system administrator.
'; - $sort = $server_sort_order; - $allow_server_sort = FALSE; - $id = array(); - } - else { - $sort = 6; - if ($start_msg + ($show_num - 1) < $num_msgs) { - $end_msg = $start_msg + ($show_num-1); - } - else { - $end_msg = $num_msgs; - } - $id = array_slice($id, ($start_msg-1), ($end_msg)); - } - } - - /* If autoexpunge is turned on, then do it now. */ - if ($auto_expunge == true) { - sqimap_mailbox_expunge($imapConnection, $mailbox, false); - } - sqimap_mailbox_select($imapConnection, $mailbox); - $issent = handleAsSent($mailbox); - if (!$use_cache) { - /* If it is sorted... */ - if ($num_msgs >= 1) { - if ($sort < 6 ) { - $id = range(1, $num_msgs); - } - elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE && $sort == 6) { - /* if it's not sorted */ - if ($start_msg + ($show_num - 1) < $num_msgs){ - $end_msg = $start_msg + ($show_num - 1); - } else { - $end_msg = $num_msgs; - } - if ($end_msg < $start_msg) { - $start_msg = $start_msg - $show_num; - if ($start_msg < 1) { - $start_msg = 1; - } - } - - $real_startMessage = $num_msgs - $start_msg + 1; - $real_endMessage = $num_msgs - $start_msg - $show_num + 2; - if ($real_endMessage <= 0) { - $real_endMessage = 1; - } - $id = array_reverse(range($real_endMessage, $real_startMessage)); - } - $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent); -// $flags = sqimap_get_flags_list($imapConnection, $id, $issent); - if (sizeof($msgs_list)){ - foreach ($msgs_list as $hdr) { - $from[] = $hdr->from; - $date[] = $hdr->date; - $subject[] = $hdr->subject; - $to[] = $hdr->to; - $priority[] = $hdr->priority; - $cc[] = $hdr->cc; - $size[] = $hdr->size; - $type[] = $hdr->type0; - $flag_deleted[] = $hdr->flag_deleted; - $flag_answered[] = $hdr->flag_answered; - $flag_seen[] = $hdr->flag_seen; - $flag_flagged[] = $hdr->flag_flagged; - } - } + if($start_msg > $num_msgs) { + $start_msg -= $show_num; + if($start_msg < 1) { + $start_msg = 1; + } } - $j = 0; - if ($sort == 6) { - $end = $start_msg + $show_num - 1; - if ($num_msgs < $show_num) { - $end_loop = $num_msgs; - } else if ($end > $num_msgs) { - $end_loop = $num_msgs - $start_msg + 1; - } else { - $end_loop = $show_num; - } - } else { - $end = $num_msgs; - $end_loop = $end; + + /* This code and the next if() block check for + * server-side sorting methods. The $id array is + * formatted and $sort is set to 6 to disable + * SM internal sorting + */ + if ($thread_sort_messages == 1) { + $id = get_thread_sort($imapConnection); + if ($id == 'no') { + echo '
' . + _("Thread sorting is not supported by your IMAP server.
Please report this to the system administrator."). + '
'; + $thread_sort_messages = 0; + $id = array(); + } + else { + $sort = 6; + if ($start_msg + ($show_num - 1) < $num_msgs) { + $end_msg = $start_msg + ($show_num-1); + } + else { + $end_msg = $num_msgs; + } + $id = array_slice($id, ($start_msg-1), ($end_msg)); + } } - while ($j < $end_loop) { - if (isset($date[$j])) { - $date[$j] = str_replace(' ', ' ', $date[$j]); - $tmpdate = explode(' ', trim($date[$j])); - } else { - $tmpdate = $date = array('', '', '', '', '', ''); - } - - $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate); - $messages[$j]['DATE_STRING'] = - getDateString($messages[$j]['TIME_STAMP']); - $messages[$j]['ID'] = $id[$j]; - $messages[$j]['FROM'] = decodeHeader($from[$j]); - $messages[$j]['FROM-SORT'] = - strtolower(sqimap_find_displayable_name(decodeHeader($from[$j]))); - $messages[$j]['SUBJECT'] = decodeHeader($subject[$j]); - $messages[$j]['SUBJECT-SORT'] = strtolower(decodeHeader($subject[$j])); - $messages[$j]['TO'] = decodeHeader($to[$j]); - $messages[$j]['PRIORITY'] = $priority[$j]; - $messages[$j]['CC'] = $cc[$j]; - $messages[$j]['SIZE'] = $size[$j]; - $messages[$j]['TYPE0'] = $type[$j]; - $messages[$j]['FLAG_DELETED'] = $flag_deleted[$j]; - $messages[$j]['FLAG_ANSWERED'] = $flag_answered[$j]; - $messages[$j]['FLAG_SEEN'] = $flag_seen[$j]; - $messages[$j]['FLAG_FLAGGED'] = $flag_flagged[$j]; - - - /* - * fix SUBJECT-SORT to remove Re: - * vedr|sv (Danish) - * re|aw (English) - * - * TODO: i18n should be incorporated here. E.g. we catch the ones - * we know about, but also define in i18n what the localized - * "Re: " is for this or that locale. - */ - if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si", - $messages[$j]['SUBJECT-SORT'], $matches)){ - $messages[$j]['SUBJECT-SORT'] = $matches[2]; - } -/* - $num = 0; - while ($num < count($flags[$j])) { - if ($flags[$j][$num] == 'Deleted') { - $messages[$j]['FLAG_DELETED'] = true; - } else if ($flags[$j][$num] == 'Answered') { - $messages[$j]['FLAG_ANSWERED'] = true; - } else if ($flags[$j][$num] == 'Seen') { - $messages[$j]['FLAG_SEEN'] = true; - } else if ($flags[$j][$num] == 'Flagged') { - $messages[$j]['FLAG_FLAGGED'] = true; - } - $num++; - } -*/ - $j++; + if ($allow_server_sort == TRUE && $thread_sort_messages != 1) { + $server_sort_order = $sort; + $id = sqimap_get_sort_order($imapConnection, $server_sort_order); + if ($id == 'no') { + echo '
' . + _( "Server-side sorting is not supported by your IMAP server.
Please report this to the system administrator."). + '
'; + $sort = $server_sort_order; + $allow_server_sort = FALSE; + $id = array(); + } + else { + $sort = 6; + if ($start_msg + ($show_num - 1) < $num_msgs) { + $end_msg = $start_msg + ($show_num-1); + } + else { + $end_msg = $num_msgs; + } + $id = array_slice($id, ($start_msg-1), ($end_msg)); + } } - /* - * Only ignore messages flagged as deleted if we are - * using a trash folder or auto_expunge - */ - if (((isset($move_to_trash) && $move_to_trash) - || (isset($auto_expunge) && $auto_expunge)) - && $sort != 6) { - - /* Find and remove the ones that are deleted */ - $i = 0; - $j = 0; - - while ($j < $num_msgs) { - if (isset($messages[$j]['FLAG_DELETED']) - && $messages[$j]['FLAG_DELETED'] == true) { - $j++; - continue; - } - $msgs[$i] = $messages[$j]; - - $i++; - $j++; - } - $num_msgs = $i; - } else { - if (!isset($messages)) { - $messages = array(); - } - $msgs = $messages; + /* If autoexpunge is turned on, then do it now. */ + if ($auto_expunge == true) { + sqimap_mailbox_expunge($imapConnection, $mailbox, false); } - } + sqimap_mailbox_select($imapConnection, $mailbox); + $issent = handleAsSent($mailbox); + if (!$use_cache) { + /* If it is sorted... */ + if ($num_msgs >= 1) { + if ($sort < 6 ) { + $id = range(1, $num_msgs); + } + elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE && $sort == 6) { + /* if it's not sorted */ + if ($start_msg + ($show_num - 1) < $num_msgs){ + $end_msg = $start_msg + ($show_num - 1); + } else { + $end_msg = $num_msgs; + } + if ($end_msg < $start_msg) { + $start_msg = $start_msg - $show_num; + if ($start_msg < 1) { + $start_msg = 1; + } + } - /* There's gotta be messages in the array for it to sort them. */ - if (($num_msgs > 0) && (!$use_cache)) { - /* - * 0 = Date (up) - * 1 = Date (dn) - * 2 = Name (up) - * 3 = Name (dn) - * 4 = Subject (up) - * 5 = Subject (dn) - */ - session_unregister('msgs'); - if (($sort == 0) || ($sort == 1)) { - $msort = array_cleave ($msgs, 'TIME_STAMP'); - } elseif (($sort == 2) || ($sort == 3)) { - $msort = array_cleave ($msgs, 'FROM-SORT'); - } elseif (($sort == 4) || ($sort == 5)) { - $msort = array_cleave ($msgs, 'SUBJECT-SORT'); - } else { - $msort = $msgs; + $real_startMessage = $num_msgs - $start_msg + 1; + $real_endMessage = $num_msgs - $start_msg - $show_num + 2; + if ($real_endMessage <= 0) { + $real_endMessage = 1; + } + $id = array_reverse(range($real_endMessage, $real_startMessage)); + } + $msgs_list = sqimap_get_small_header_list($imapConnection, $id, $issent); + // $flags = sqimap_get_flags_list($imapConnection, $id, $issent); + if (sizeof($msgs_list)){ + foreach ($msgs_list as $hdr) { + $from[] = $hdr->from; + $date[] = $hdr->date; + $subject[] = $hdr->subject; + $to[] = $hdr->to; + $priority[] = $hdr->priority; + $cc[] = $hdr->cc; + $size[] = $hdr->size; + $type[] = $hdr->type0; + $flag_deleted[] = $hdr->flag_deleted; + $flag_answered[] = $hdr->flag_answered; + $flag_seen[] = $hdr->flag_seen; + $flag_flagged[] = $hdr->flag_flagged; + } + } + } + $j = 0; + if ($sort == 6) { + $end = $start_msg + $show_num - 1; + if ($num_msgs < $show_num) { + $end_loop = $num_msgs; + } else if ($end > $num_msgs) { + $end_loop = $num_msgs - $start_msg + 1; + } else { + $end_loop = $show_num; + } + } else { + $end = $num_msgs; + $end_loop = $end; + } + while ($j < $end_loop) { + if (isset($date[$j])) { + $date[$j] = str_replace(' ', ' ', $date[$j]); + $tmpdate = explode(' ', trim($date[$j])); + } else { + $tmpdate = $date = array('', '', '', '', '', ''); + } + + $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate); + $messages[$j]['DATE_STRING'] = + getDateString($messages[$j]['TIME_STAMP']); + $messages[$j]['ID'] = $id[$j]; + $messages[$j]['FROM'] = decodeHeader($from[$j]); + $messages[$j]['FROM-SORT'] = + strtolower(sqimap_find_displayable_name(decodeHeader($from[$j]))); + $messages[$j]['SUBJECT'] = decodeHeader($subject[$j]); + $messages[$j]['SUBJECT-SORT'] = strtolower(decodeHeader($subject[$j])); + $messages[$j]['TO'] = decodeHeader($to[$j]); + $messages[$j]['PRIORITY'] = $priority[$j]; + $messages[$j]['CC'] = $cc[$j]; + $messages[$j]['SIZE'] = $size[$j]; + $messages[$j]['TYPE0'] = $type[$j]; + $messages[$j]['FLAG_DELETED'] = $flag_deleted[$j]; + $messages[$j]['FLAG_ANSWERED'] = $flag_answered[$j]; + $messages[$j]['FLAG_SEEN'] = $flag_seen[$j]; + $messages[$j]['FLAG_FLAGGED'] = $flag_flagged[$j]; + + + /* + * fix SUBJECT-SORT to remove Re: + * vedr|sv (Danish) + * re|aw (English) + * + * TODO: i18n should be incorporated here. E.g. we catch the ones + * we know about, but also define in i18n what the localized + * "Re: " is for this or that locale. + */ + if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si", + $messages[$j]['SUBJECT-SORT'], $matches)){ + $messages[$j]['SUBJECT-SORT'] = $matches[2]; + } + /* + $num = 0; + while ($num < count($flags[$j])) { + if ($flags[$j][$num] == 'Deleted') { + $messages[$j]['FLAG_DELETED'] = true; + } else if ($flags[$j][$num] == 'Answered') { + $messages[$j]['FLAG_ANSWERED'] = true; + } else if ($flags[$j][$num] == 'Seen') { + $messages[$j]['FLAG_SEEN'] = true; + } else if ($flags[$j][$num] == 'Flagged') { + $messages[$j]['FLAG_FLAGGED'] = true; + } + $num++; + } + */ + $j++; + + } + + /* + * Only ignore messages flagged as deleted if we are + * using a trash folder or auto_expunge + */ + if (((isset($move_to_trash) && $move_to_trash) + || (isset($auto_expunge) && $auto_expunge)) + && $sort != 6) { + + /* Find and remove the ones that are deleted */ + $i = 0; + $j = 0; + + while ($j < $num_msgs) { + if (isset($messages[$j]['FLAG_DELETED']) + && $messages[$j]['FLAG_DELETED'] == true) { + $j++; + continue; + } + $msgs[$i] = $messages[$j]; + + $i++; + $j++; + } + $num_msgs = $i; + } else { + if (!isset($messages)) { + $messages = array(); + } + $msgs = $messages; + } + } + + /* There's gotta be messages in the array for it to sort them. */ + if (($num_msgs > 0) && (!$use_cache)) { + /* + * 0 = Date (up) + * 1 = Date (dn) + * 2 = Name (up) + * 3 = Name (dn) + * 4 = Subject (up) + * 5 = Subject (dn) + */ + session_unregister('msgs'); + if (($sort == 0) || ($sort == 1)) { + $msort = array_cleave ($msgs, 'TIME_STAMP'); + } elseif (($sort == 2) || ($sort == 3)) { + $msort = array_cleave ($msgs, 'FROM-SORT'); + } elseif (($sort == 4) || ($sort == 5)) { + $msort = array_cleave ($msgs, 'SUBJECT-SORT'); + } else { + $msort = $msgs; + } + + if ($sort < 6) { + if ($sort % 2) { + asort($msort); + } else { + arsort($msort); + } + } + session_register('msort'); + } elseif ($thread_sort_messages == 1 || $allow_server_sort == TRUE) { + $msort = $msgs; + session_unregister('msgs'); + session_register('msort'); } - - if ($sort < 6) { - if ($sort % 2) { - asort($msort); - } else { - arsort($msort); - } - } - session_register('msort'); - } elseif ($thread_sort_messages == 1 || $allow_server_sort == TRUE) { - $msort = $msgs; - session_unregister('msgs'); - session_register('msort'); - } - displayMessageArray($imapConnection, $num_msgs, $start_msg, $msgs, - $msort, $mailbox, $sort, $color,$show_num); - /** - * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series. - */ - session_register('msgs'); + displayMessageArray($imapConnection, $num_msgs, $start_msg, $msgs, + $msort, $mailbox, $sort, $color,$show_num); + /** + * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series. + */ + session_register('msgs'); } /* Generic function to convert the msgs array into an HTML table. */ -function displayMessageArray($imapConnection, $num_msgs, $start_msg, - &$msgs, $msort, $mailbox, $sort, $color, - $show_num) { - - global $folder_prefix, $sent_folder, - $imapServerAddress, $data_dir, $username, $use_mailbox_cache, - $index_order, $real_endMessage, $real_startMessage, $checkall, - $indent_array, $thread_sort_messages, $allow_server_sort, - $server_sort_order, $html; - +function displayMessageArray($imapConnection, $num_msgs, $start_msg, +&$msgs, $msort, $mailbox, $sort, $color, +$show_num) { + + global $folder_prefix, $sent_folder, + $imapServerAddress, $data_dir, $username, $use_mailbox_cache, + $index_order, $real_endMessage, $real_startMessage, $checkall, + $indent_array, $thread_sort_messages, $allow_server_sort, + $server_sort_order; + /* If cache isn't already set, do it now. */ if (!session_is_registered('msgs')) { session_register('msgs'); @@ -510,67 +529,73 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, if (!session_is_registered('msort')) { session_register('msort'); } - + if ($start_msg + ($show_num - 1) < $num_msgs){ $end_msg = $start_msg + ($show_num - 1); } else { $end_msg = $num_msgs; } - + if ($end_msg < $start_msg) { $start_msg = $start_msg - $show_num; if ($start_msg < 1) { $start_msg = 1; } } - + $urlMailbox = urlencode($mailbox); - + do_hook('mailbox_index_before'); - + $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); - $paginator_str = get_paginator_str($urlMailbox, $start_msg, $end_msg, - $num_msgs, $show_num, $sort); - + $paginator_str = get_paginator_str($urlMailbox, $start_msg, $end_msg, + $num_msgs, $show_num, $sort); + if (!isset($msg)) { $msg = ''; } - + /* get indent level for subject display */ if ($thread_sort_messages == 1 ) { $indent_array = get_parent_level($imapConnection); } $fstring = "move_messages.php?msg=$msg&mailbox=$urlMailbox" - . "&startMessage=$start_msg"; + . "&startMessage=$start_msg"; mail_message_listing_beginning($imapConnection, $fstring, - $mailbox, $sort, $msg_cnt_str, - $paginator_str, $start_msg); - + $mailbox, $sort, $msg_cnt_str, + $paginator_str, $start_msg); + $groupNum = $start_msg % ($show_num - 1); $real_startMessage = $start_msg; if ($sort == 6) { if ($end_msg - $start_msg < $show_num - 1) { - $end_msg = $end_msg - $start_msg + 1; - $start_msg = 1; + $end_msg = $end_msg - $start_msg + 1; + $start_msg = 1; } else if ($start_msg > $show_num) { - $end_msg = $show_num; - $start_msg = 1; + $end_msg = $show_num; + $start_msg = 1; } } $endVar = $end_msg + 1; - + /* - * Loop through and display the info for each message. + * Loop through and display the info for each message. * ($t is used for the checkbox number) */ $t = 0; if ($num_msgs == 0) { /* if there's no messages in this folder */ - echo "\n" - . "

". _("THIS FOLDER IS EMPTY") - . "
 
\n" - . ""; + echo html_tag( 'tr', + html_tag( 'td', + "
" . + _("THIS FOLDER IS EMPTY") . + "
 ", + 'center', + $color[4], + 'COLSPAN="' . count($index_order) . '"' + ) + ); + } elseif ($start_msg == $end_msg) { /* if there's only one message in the box, handle it differently. */ if ($sort != 6){ @@ -585,8 +610,8 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, next($msort); $k++; } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, - $real_startMessage, 0, 0); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, + $real_startMessage, 0, 0); } else { $i = $start_msg; reset($msort); @@ -597,559 +622,554 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, $k++; } while (isset ($key) && ($k < $i)); do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, - $sort, $real_startMessage, 0, 0); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, + $sort, $real_startMessage, 0, 0); $key = key($msort); $t++; $i++; next($msort); } while ($i && $i < $endVar); } - + echo ''; - $html->flush( - $html->tag( 'table', - $html->tag( 'tr', - $html->tag( 'td', - $html->tag( 'table', - $html->tag( 'tr', - $html->tag( 'td', $paginator_str ) . - $html->tag( 'td', $msg_cnt_str, array( 'align' => 'right' ) ) + + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', $paginator_str ) . + html_tag( 'td', $msg_cnt_str, 'right' ) ) - , array( 'bgcolor'=> $color[4], - 'width' => '100%', - 'cellpadding' => 1, - 'cellspacing' => 1 ) ) + , '', $color[4], 'width="100%" cellpadding="1" cellspacing="1"' ) ) - , array( 'bgcolor' => $color[4] ) ) - , array( 'bgcolor' => $color[9], - 'width' => '100%', - 'cellpadding' => 1, - 'cellspacing' => 1 ) ) - ); - + , '', $color[4] ) + , '', $color[9], 'width="100%" cellpadding="1" cellspacing="1"' ); + /* End of message-list table */ - + do_hook('mailbox_index_after'); echo "\n"; } /* - * Displays the standard message list header. To finish the table, - * you need to do a ""; - * - * $moveURL is the URL to submit the delete/move form to - * $mailbox is the current mailbox - * $sort is the current sorting method (-1 for no sorting available [searches]) - * $Message is a message that is centered on top of the list - * $More is a second line that is left aligned - */ - -function mail_message_listing_beginning ($imapConnection, $moveURL, - $mailbox = '', $sort = -1, - $msg_cnt_str = '', - $paginator = ' ', - $start_msg = 1) { - global $color, $index_order, $auto_expunge, $move_to_trash, $base_uri, - $checkall, $sent_folder, $draft_folder, $thread_sort_messages, +* Displays the standard message list header. To finish the table, +* you need to do a ""; +* +* $moveURL is the URL to submit the delete/move form to +* $mailbox is the current mailbox +* $sort is the current sorting method (-1 for no sorting available [searches]) +* $Message is a message that is centered on top of the list +* $More is a second line that is left aligned +*/ + +function mail_message_listing_beginning ($imapConnection, $moveURL, +$mailbox = '', $sort = -1, +$msg_cnt_str = '', +$paginator = ' ', +$start_msg = 1) { + global $color, $index_order, $auto_expunge, $move_to_trash, $base_uri, + $checkall, $sent_folder, $draft_folder, $thread_sort_messages, $allow_thread_sort, $allow_server_sort, $server_sort_order, $lastTargetMailbox; - $urlMailbox = urlencode($mailbox); - - /* - * This is the beginning of the message list table. - * It wraps around all messages - */ - echo "
\n" - . "\n' - . "
" - . " \n" - . " \n" - . "
$paginator\n"; - - echo " $msg_cnt_str
\n" - . '
\n" - . "\n" - . " \n" - . " \n" - . " \n" - . " \n" - . " \n" - . " ' . "
\n" - . '  ' . _("Move Selected To:") . "\n" - . " \n" - . '  ' . _("Transform Selected Messages") - . ":  
\n" - . "
\n" - . '  \n' + . "' + + echo "
" + . " \n" + . html_tag( 'td', $paginator, 'left' ) + . html_tag( 'td', $msg_cnt_str, 'right' ) + . "
\n" + . '
\n" + . "\n" + . " \n" + . html_tag( 'td', + ' ' . _("Move Selected To:") . '', + 'left', + '', + 'valign="middle" nowrap' ) + . html_tag( 'td', + '' . _("Transform Selected Messages") . ':  
', + 'right', + '', + 'nowrap' ) + . " \n" + . " \n" + . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' ) + . '   ' + echo '  ' . ' ' - . ' \n" . "\n"; - echo " \n" + echo " \n" . " \n" . " \n"; - /* draws thread sorting links */ - if ($allow_thread_sort == TRUE) { - if ($thread_sort_messages == 1 ) { - $set_thread = 2; - $thread_name = _("Unthread View"); - } - elseif ($thread_sort_messages == 0) { - $set_thread = 1; - $thread_name = _("Thread View"); + /* draws thread sorting links */ + if ($allow_thread_sort == TRUE) { + if ($thread_sort_messages == 1 ) { + $set_thread = 2; + $thread_name = _("Unthread View"); + } + elseif ($thread_sort_messages == 0) { + $set_thread = 1; + $thread_name = _("Thread View"); + } + echo ''; } - echo ''; - } - - echo "
"; - if (!$auto_expunge) { - echo ' ' . _("mailbox") . ' '; - } - echo '' + if (!$auto_expunge) { + echo ' ' . _("mailbox") . ' '; + } + echo '' . '' . ' ' . "
 ' . $thread_name + . ' 
 ' . $thread_name - . ' 
\n"; - do_hook('mailbox_form_before'); - echo '
\n"; + do_hook('mailbox_form_before'); + echo '
" . '" + if ($GLOBALS['alt_index_colors']){ + echo '0'; + } else { + echo '1'; + } + echo " BGCOLOR=\"$color[0]\">" . ""; - /* if using server sort we highjack the - * the $sort var and use $server_sort_order - * instead. but here we reset sort for a bit - * since its easy - */ - if ($allow_server_sort == TRUE) { - $sort = $server_sort_order; - } - /* Print the headers. */ - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { - case 1: /* checkbox */ - case 5: /* flags */ - echo ' '; - break; - case 2: /* from */ - if (handleAsSent($mailbox)) { - echo ' \n"; - break; - case 3: /* date */ - echo ' \n"; - break; - case 4: /* subject */ - echo ' \n"; - break; - case 6: /* size */ - echo ' \n"; - break; + /* if using server sort we highjack the + * the $sort var and use $server_sort_order + * instead. but here we reset sort for a bit + * since its easy + */ + if ($allow_server_sort == TRUE) { + $sort = $server_sort_order; + } + /* Print the headers. */ + for ($i=1; $i <= count($index_order); $i++) { + switch ($index_order[$i]) { + case 1: /* checkbox */ + case 5: /* flags */ + echo ' '; + break; + case 2: /* from */ + if (handleAsSent($mailbox)) { + echo ' \n"; + break; + case 3: /* date */ + echo ' \n"; + break; + case 4: /* subject */ + echo ' \n"; + break; + case 6: /* size */ + echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); + break; + } } - } - /* if using server-sorting, - * send sort back to 6 - */ - if ($allow_server_sort == TRUE) { - $sort = 6; - } - echo "\n"; + /* if using server-sorting, + * send sort back to 6 + */ + if ($allow_server_sort == TRUE) { + $sort = 6; + } + echo "\n"; } /* - * This function shows the sort button. Isn't this a good comment? - */ +* This function shows the sort button. Isn't this a good comment? +*/ function ShowSortButton($sort, $mailbox, $Up, $Down) { - /* Figure out which image we want to use. */ - if ($sort != $Up && $sort != $Down) { - $img = 'sort_none.png'; - $which = $Up; - } elseif ($sort == $Up) { - $img = 'up_pointer.png'; - $which = $Down; - } else { - $img = 'down_pointer.png'; - $which = 6; - } - - /* Now that we have everything figured out, show the actual button. */ - echo ' sort'; } function get_selectall_link($start_msg, $sort) { - global $checkall, $what, $where, $mailbox, $javascript_on; - global $PHP_SELF, $PG_SHOWNUM; - - $result = ''; - if ($javascript_on) { - $result = - '' . _("Toggle All") - . "\n"; - } else { - if (strpos($PHP_SELF, "?")) { - $result .= "' + . "\n\n" + . '' . _("Toggle All") + . "\n"; } else { - $result .= _("Select All"); + if (strpos($PHP_SELF, "?")) { + $result .= "%s to %s (%s total)"), - $start_msg, $end_msg, $num_msgs); - } else if ($start_msg == $end_msg) { - $result = sprintf(_("Viewing Message: %s (1 total)"), $start_msg); - } else { - $result = '
'; - } - - /* Return our result string. */ - return ($result); + /* 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 (1 total)"), $start_msg); + } else { + $result = '
'; + } + + /* Return our result string. */ + return ($result); } /* - * Generate a paginator link. - */ +* Generate a paginator link. +*/ function get_paginator_link($box, $start_msg, $use, $text) { - $result = "$text"; - return ($result); + return ($result); } /* - * This function computes the paginator string. - */ -function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, - $show_num, $sort) { - global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM; - - /* Initialize paginator string chunks. */ - $prv_str = ''; - $nxt_str = ''; - $pg_str = ''; - $all_str = ''; - $tgl_str = ''; - - /* 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. */ - - /* Get some paginator preference values. */ - $pg_sel = getPref($data_dir, $username, 'page_selector', SMPREF_ON); - $pg_max = getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX); - - /* Make sure that our start message number is not too big. */ - $start_msg = min($start_msg, $num_msgs); - - /* Decide whether or not we will use the mailbox cache. */ - /* Not sure why $use_mailbox_cache is even passed in. */ - if ($sort == 6) { - $use = 0; - } else { - $use = 1; - } - - /* Compute the starting message of the previous and next page group. */ - $next_grp = $start_msg + $show_num; - $prev_grp = $start_msg - $show_num; - - /* Compute the basic previous and next strings. */ - if (($next_grp <= $num_msgs) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); - $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); - } else if (($next_grp > $num_msgs) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); - $nxt_str = ""._("Next")."\n"; - } else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) { - $prv_str = ""._("Previous") . ''; - $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); - } - - /* Page selector block. Following code computes page links. */ - if ($pg_sel && ($num_msgs > $show_num)) { - /* Most importantly, what is the current page!!! */ - $cur_pg = intval($start_msg / $show_num) + 1; - - /* Compute total # of pages and # of paginator page links. */ - $tot_pgs = ceil($num_msgs / $show_num); /* Total number of Pages */ - $vis_pgs = min($pg_max, $tot_pgs - 1); /* Visible Pages */ - - /* Compute the size of the four quarters of the page links. */ - - /* If we can, just show all the pages. */ - if (($tot_pgs - 1) <= $pg_max) { - $q1_pgs = $cur_pg - 1; - $q2_pgs = $q3_pgs = 0; - $q4_pgs = $tot_pgs - $cur_pg; - - /* 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) * 0.75); - $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 0.75); - $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) * 0.75); - $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75); - $q1_pgs += floor($extra_pgs / 2); - $q2_pgs += ceil($extra_pgs / 2); - } - } - - /* - * 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) . '
'; - */ - - /* Print out the page links from the compute page quarters. */ - - /* 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) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - if ($cur_pg - $q2_pgs - $q1_pgs > 1) { - $pg_str .= "...$spc"; - } - } - - /* Continue with the second quarter. */ - for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { - $start = (($pg-1) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - - /* Now print the current page. */ - $pg_str .= $cur_pg . $spc; - - /* Next comes the third quarter. */ - for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { - $start = (($pg-1) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - - /* 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) * $show_num) + 1; - $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; - } - } - } else if ($PG_SHOWNUM == 999999) { - $pg_str = "" ._("Paginate") . '' . $spc; - } - - /* If necessary, compute the 'show all' string. */ - if (($prv_str != '') || ($nxt_str != '')) { - $all_str = "" . _("Show All") . ''; - } - - /* Last but not least, get the value for the toggle all link. */ - $tgl_str = get_selectall_link($start_msg, $sort); - - /* Put all the pieces of the paginator string together. */ - /** - * Hairy code... But let's leave it like it is since I am not certain - * a different approach would be any easier to read. ;) - */ - $result = ''; - $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); - $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . $spc : ''); - $result .= ($pg_str != '' ? $pg_str : ''); - $result .= ($all_str != '' ? $sep . $spc . $all_str . $spc : ''); - $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str); - - /* If the resulting string is blank, return a non-breaking space. */ - if ($result == '') { - $result = ' '; - } - - /* Return our final magical paginator string. */ - return ($result); +* This function computes the paginator string. +*/ +function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, +$show_num, $sort) { + global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM; + + /* Initialize paginator string chunks. */ + $prv_str = ''; + $nxt_str = ''; + $pg_str = ''; + $all_str = ''; + $tgl_str = ''; + + /* 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. */ + + /* Get some paginator preference values. */ + $pg_sel = getPref($data_dir, $username, 'page_selector', SMPREF_ON); + $pg_max = getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX); + + /* Make sure that our start message number is not too big. */ + $start_msg = min($start_msg, $num_msgs); + + /* Decide whether or not we will use the mailbox cache. */ + /* Not sure why $use_mailbox_cache is even passed in. */ + if ($sort == 6) { + $use = 0; + } else { + $use = 1; + } + + /* Compute the starting message of the previous and next page group. */ + $next_grp = $start_msg + $show_num; + $prev_grp = $start_msg - $show_num; + + /* Compute the basic previous and next strings. */ + if (($next_grp <= $num_msgs) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); + $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); + } else if (($next_grp > $num_msgs) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous")); + $nxt_str = ""._("Next")."\n"; + } else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) { + $prv_str = ""._("Previous") . ''; + $nxt_str = get_paginator_link($box, $next_grp, $use, _("Next")); + } + + /* Page selector block. Following code computes page links. */ + if ($pg_sel && ($num_msgs > $show_num)) { + /* Most importantly, what is the current page!!! */ + $cur_pg = intval($start_msg / $show_num) + 1; + + /* Compute total # of pages and # of paginator page links. */ + $tot_pgs = ceil($num_msgs / $show_num); /* Total number of Pages */ + $vis_pgs = min($pg_max, $tot_pgs - 1); /* Visible Pages */ + + /* Compute the size of the four quarters of the page links. */ + + /* If we can, just show all the pages. */ + if (($tot_pgs - 1) <= $pg_max) { + $q1_pgs = $cur_pg - 1; + $q2_pgs = $q3_pgs = 0; + $q4_pgs = $tot_pgs - $cur_pg; + + /* 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) * 0.75); + $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 0.75); + $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) * 0.75); + $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75); + $q1_pgs += floor($extra_pgs / 2); + $q2_pgs += ceil($extra_pgs / 2); + } + } + + /* + * 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) . '
'; + */ + + /* Print out the page links from the compute page quarters. */ + + /* 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) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + if ($cur_pg - $q2_pgs - $q1_pgs > 1) { + $pg_str .= "...$spc"; + } + } + + /* Continue with the second quarter. */ + for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { + $start = (($pg-1) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + + /* Now print the current page. */ + $pg_str .= $cur_pg . $spc; + + /* Next comes the third quarter. */ + for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { + $start = (($pg-1) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + + /* 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) * $show_num) + 1; + $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc; + } + } + } else if ($PG_SHOWNUM == 999999) { + $pg_str = "" ._("Paginate") . '' . $spc; + } + + /* If necessary, compute the 'show all' string. */ + if (($prv_str != '') || ($nxt_str != '')) { + $all_str = "" . _("Show All") . ''; + } + + /* Last but not least, get the value for the toggle all link. */ + $tgl_str = get_selectall_link($start_msg, $sort); + + /* Put all the pieces of the paginator string together. */ + /** + * Hairy code... But let's leave it like it is since I am not certain + * a different approach would be any easier to read. ;) + */ + $result = ''; + $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); + $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . $spc : ''); + $result .= ($pg_str != '' ? $pg_str : ''); + $result .= ($all_str != '' ? $sep . $spc . $all_str . $spc : ''); + $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str); + + /* If the resulting string is blank, return a non-breaking space. */ + if ($result == '') { + $result = ' '; + } + + /* Return our final magical paginator string. */ + return ($result); } function processSubject($subject) { - /* Shouldn't ever happen -- caught too many times in the IMAP functions */ - if ($subject == '') + /* Shouldn't ever happen -- caught too many times in the IMAP functions */ + if ($subject == '') return _("(no subject)"); - - if (strlen($subject) <= 55) - return $subject; - $ent_strlen=strlen($subject); - $trim_val=50; - $ent_offset=0; - /* - * 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 55, substr with an updated trim value. - */ - while ( (($ent_loc = strpos($subject, '&', $ent_offset)) !== false) && - (($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false) ) { - $trim_val += ($ent_loc_end-$ent_loc)+1; - $ent_strlen -= $ent_loc_end-$ent_loc; - $ent_offset = $ent_loc_end+1; - } - - if ($ent_strlen <= 55){ + if (strlen($subject) <= 55) return $subject; - } - - return substr($subject, 0, $trim_val) . '...'; + + $ent_strlen=strlen($subject); + $trim_val=50; + $ent_offset=0; + /* + * 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 55, substr with an updated trim value. + */ + while ( (($ent_loc = strpos($subject, '&', $ent_offset)) !== false) && + (($ent_loc_end = strpos($subject, ';', $ent_loc)) !== false) ) { + $trim_val += ($ent_loc_end-$ent_loc)+1; + $ent_strlen -= $ent_loc_end-$ent_loc; + $ent_offset = $ent_loc_end+1; + } + + if ($ent_strlen <= 55){ + return $subject; + } + + return substr($subject, 0, $trim_val) . '...'; } function handleAsSent($mailbox) { - global $sent_folder, $draft_folder, $handleAsSent_result; + global $sent_folder, $draft_folder, $handleAsSent_result; + + /* First check if this is the sent or draft folder. */ + $handleAsSent_result = (($mailbox == $sent_folder) + || ($mailbox == $draft_folder)); - /* First check if this is the sent or draft folder. */ - $handleAsSent_result = (($mailbox == $sent_folder) - || ($mailbox == $draft_folder)); - - /* Then check the result of the handleAsSent hook. */ - do_hook('check_handleAsSent_result', $mailbox); + /* Then check the result of the handleAsSent hook. */ + do_hook('check_handleAsSent_result', $mailbox); - /* And return the result. */ - return ($handleAsSent_result); + /* And return the result. */ + return ($handleAsSent_result); } -?> +?> \ No newline at end of file diff --git a/src/validate.php b/src/validate.php index 7292164f..4ec5b44e 100644 --- a/src/validate.php +++ b/src/validate.php @@ -73,7 +73,6 @@ $theme=array(); require_once('../config/config.php'); require_once('../src/load_prefs.php'); require_once('../functions/page_header.php'); -require_once('../functions/html.php'); /* Set up the language (i18n.php was included by auth.php). */ global $username, $data_dir; @@ -85,10 +84,4 @@ if ( $timeZone != SMPREF_NONE && ($timeZone <> '') putenv( 'TZ=' . $timeZone ); } -/* - Initialize the html object -*/ -GLOBAL $html; -$html = new ZkSvc_html(); - -?> +?> \ No newline at end of file
 ' . _("To") . ''; - } else { - echo ' ' . _("From") . ''; - } - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 2, 3); - } - echo "' . _("Date") . ''; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 0, 1); - } - echo "' . _("Subject") . ' '; - if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { - ShowSortButton($sort, $mailbox, 4, 5); - } - echo "' . _("Size") . "' . _("To") . ''; + } else { + echo ' ' . _("From") . ''; + } + if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { + ShowSortButton($sort, $mailbox, 2, 3); + } + echo "' . _("Date") . ''; + if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { + ShowSortButton($sort, $mailbox, 0, 1); + } + echo "' . _("Subject") . ' '; + if ($allow_thread_sort != TRUE || $thread_sort_messages != 1) { + ShowSortButton($sort, $mailbox, 4, 5); + } + echo "