From: thomppj Date: Mon, 7 Oct 2002 23:27:42 +0000 (+0000) Subject: Undoing button 'enhancements' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b91be0cae7a34639fdb2ce5d7322a0c8e3306d3;p=squirrelmail.git Undoing button 'enhancements' git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3801 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 617754b9..51723f54 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -451,26 +451,23 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); do_hook('mailbox_index_before'); - echo ''; - echo ''; - echo ''; - echo '
'; mail_message_listing_beginning($imapConnection, $mailbox, $sort, $msg_cnt_str, $paginator_str, $start_msg); - echo '
'; - echo ' '; - echo '
'; - echo ' '; - echo '
'; + + + echo '
'; printHeader($mailbox, $srt, $color, !$thread_sort_messages); displayMessageArray($imapConnection, $num_msgs, $start_msg, $msort, $mailbox, $sort, $color, $show_num,0,0); - echo '
'; mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color); echo '
'; + + /** + * TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series. + */ } function calc_msort($msgs, $sort) { @@ -656,6 +653,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, next($msort); } while ($i && $i < $endVar); } + echo '
'; } /* @@ -700,8 +698,9 @@ function mail_message_listing_beginning ($imapConnection, * This is the beginning of the message list table. * It wraps around all messages */ + echo "
\n" - . html_tag( 'table' , + . html_tag( 'table' ,'' , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) . html_tag( 'tr', html_tag( 'td' , html_tag( 'table' , @@ -709,18 +708,12 @@ function mail_message_listing_beginning ($imapConnection, html_tag( 'td', $paginator, 'left' ) . html_tag( 'td', $msg_cnt_str, 'right' ) ) - , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) + , '', $color[4], 'border="0" width="100%" cellpadding="2" cellspacing="0"' ) , 'left', '', '' ) , '', $color[0] ) - , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); - echo ''; - echo ''; - - echo html_tag( 'tr' ) . "\n" - . html_tag( 'td' ,'' , 'left', '', '' ) - . html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) - . '' - . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) + . html_tag( 'tr' ) . "\n" + . html_tag( 'td' ,'' , 'left', $color[0], '' ) + . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="0" cellspacing="0"' ) . html_tag( 'tr', getSmallStringCell(_("Move Selected To"), 'left') . getSmallStringCell(_("Transform Selected Messages"), 'right') @@ -771,11 +764,15 @@ function mail_message_listing_beginning ($imapConnection, , '', '', '' ); } - echo "\n"; + echo "\n"; - do_hook('mailbox_form_before'); + echo "\n"; + do_hook('mailbox_form_before'); + echo '' + . html_tag( 'tr' ) + . html_tag( 'td' ,'' , '', $color[0], '' ); /* if using server sort we highjack the * the $sort var and use $server_sort_order @@ -789,8 +786,6 @@ function mail_message_listing_beginning ($imapConnection, function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color) { if ($num_msgs) { - echo ''; - echo ''; echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', @@ -799,11 +794,11 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo html_tag( 'td', $paginator_str ) . html_tag( 'td', $msg_cnt_str, 'right' ) ) - , '', $color[4], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) + , '', $color[4], 'width="100%" cellpadding="1" cellspacing="1"' ) ) - ) - , '', $color[9], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ); - echo ''; + , '', $color[4] ) + , '', $color[9], 'width="100%" cellpadding="1" cellspacing="1"' ); + } /* End of message-list table */ @@ -814,57 +809,49 @@ function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $colo function printHeader($mailbox, $sort, $color, $showsort=true) { global $index_order; - $cols = 0; - $line = ''; - $line .= html_tag( 'tr' ,'' , 'center', $color[5] ); + echo html_tag( 'table' ,'' , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); + echo html_tag( 'tr' ,'' , 'center', $color[5] ); for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { case 1: /* checkbox */ -// ++$cols; case 5: /* flags */ - $line .= html_tag( 'td' ,' ' , '', '', 'width="1%"' ); - ++$cols; + echo html_tag( 'td' ,' ' , '', '', 'width="1%"' ); break; case 2: /* from */ if (handleAsSent($mailbox)) { - $line .= html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) . '' . _("To") . ''; } else { - $line .= html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) + echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' ) . '' . _("From") . ''; } if ($showsort) { - $line .= ShowSortButton($sort, $mailbox, 2, 3); + ShowSortButton($sort, $mailbox, 2, 3); } - $line .= "\n"; - ++$cols; + echo "\n"; break; case 3: /* date */ - $line .= html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) + echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) . '' . _("Date") . ''; if ($showsort) { - $line .= ShowSortButton($sort, $mailbox, 0, 1); + ShowSortButton($sort, $mailbox, 0, 1); } - $line .= "\n"; - ++$cols; + echo "\n"; break; case 4: /* subject */ - $line .= html_tag( 'td' ,'' , 'left', '', '' ) + echo html_tag( 'td' ,'' , 'left', '', '' ) . '' . _("Subject") . ''; if ($showsort) { - $line .= ShowSortButton($sort, $mailbox, 4, 5); + ShowSortButton($sort, $mailbox, 4, 5); } - $line .= "\n"; - ++$cols; + echo "\n"; break; case 6: /* size */ - $line .= html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); - ++$cols; + echo html_tag( 'td', '' . _("Size") . '', 'center', '', 'width="5%"' ); break; } } - $line .= "\n"; - echo $line; + echo "\n"; } @@ -892,7 +879,7 @@ function ShowSortButton($sort, $mailbox, $Up, $Down ) { } /* Now that we have everything figured out, show the actual button. */ - return ' sort'; @@ -1255,18 +1242,7 @@ function getMbxList($imapConnection) { } function getButton($type, $name, $value) { -global $color; -$style = ' STYLE="background:'.$color[4].';font-size:80%;font-weight:bold;'. - 'color:'.$color[8].';margin:0.05em;border:0.2em outset '. - $color[9].';"'; -$javascript = " onmouseover=\"this.style.color='$color[4]'". - ";this.style.borderStyle='inset'" . - ";this.style.background='$color[3]';\";" . - " onmouseout=\"this.style.color='$color[8]'". - ";this.style.borderStyle='outset'" . - ";this.style.background='$color[4]';\";"; - -return ''; +return ''; } function getSmallStringCell($string, $align) {