From: stekkel Date: Fri, 5 Jul 2002 14:12:21 +0000 (+0000) Subject: modified search to make use of mailbox_display X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=d81e351b2f345643213edbf94fd37e7866dc8c86;ds=sidebyside modified search to make use of mailbox_display git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3049 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/src/search.php b/src/search.php index 8a04fd70..73f997d0 100644 --- a/src/search.php +++ b/src/search.php @@ -15,7 +15,6 @@ require_once('../functions/imap_search.php'); require_once('../functions/imap_utf7_decode_local.php'); require_once('../functions/array.php'); require_once('../functions/strings.php'); -require_once('../functions/html.php'); global $allow_thread_sort; @@ -169,10 +168,17 @@ $search_all = 'none'; $perbox_count = array (); $recent_count = getPref($data_dir, $username, 'search_memory', 0); + /* get mailbox names */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $boxes = sqimap_mailbox_list($imapConnection); +if (isset($newsort)) { + printSearchMessages('',$mailbox, '', $imapConnection, true, $newsort); +} + + + /* set current mailbox to INBOX if none was selected or if page was called to search all folders. */ if ( !isset($mailbox) || $mailbox == 'None' || $mailbox == '' ) { @@ -212,12 +218,12 @@ elseif ($submit == 'delete') { do_hook('search_before_form'); -echo "
\n". - html_tag( 'table', - html_tag( 'tr', "\n" . - html_tag( 'td', '' . _("Search") . '', 'center', $color[0] ) - ) , - '', '', 'width="100%"') . "\n"; +echo "
\n". + "\n". + "\n". + "
\n". + "
" . _("Search") . "
\n". + "
\n"; /* update the recent and saved searches from the pref files */ $attributes = get_recent($username, $data_dir); @@ -227,46 +233,41 @@ $count_all = 0; /* Saved Search Table */ if ($saved_count > 0) { - echo "
\n" - . html_tag( 'table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"' ) - . html_tag( 'tr', - html_tag( 'td', 'Saved Searches', 'center' ) - ) - . html_tag( 'tr' ) - . html_tag( 'td' ) - . html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="2" cellspacing="2" border="0"' ); + echo "
\n" + . "" + . '
Saved Searches
' + . ''; for ($i=0; $i < $saved_count; ++$i) { if ($i % 2) { - echo html_tag( 'tr', '', '', $color[0] ); + echo ""; } else { - echo html_tag( 'tr', '', '', $color[4] ); + echo ""; } - echo html_tag( 'td', $saved_attributes['saved_folder'][$i], 'left', '', 'width="35%"' ) - . html_tag( 'td', $saved_attributes['saved_what'][$i], 'left' ) - . html_tag( 'td', $saved_attributes['saved_where'][$i], 'center' ) - . html_tag( 'td', '', 'right' ) - . '".$saved_attributes['saved_folder'][$i]."" + . "" + . "" + . ''; + . '' + . ''; } - echo "
".$saved_attributes['saved_what'][$i]."".$saved_attributes['saved_where'][$i]."' + . '' . _("edit") . '' + . '>' . _("edit") . '' . ' | ' - . '' . _("search") . '' + . '>' . _("search") . '' . ' | ' - . "" + . "" . _("delete") - . '' - . '
\n"; + echo "\n"; } -/* Recent Search Table */ if ($recent_count > 0) { echo "
\n" . html_tag( 'table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"' ) @@ -313,6 +314,61 @@ if ($recent_count > 0) { echo '
'; } +function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $usecache = false, $newsort = false) { + global $sort, $color; + + if (!$usecache) { + if (!isset($search_msgs) || !session_is_registered('search_msgs')) { + $search_msgs = array(); + $search_msgs[$mailbox] = $msgs; + session_register('search_msgs'); + } else { + $old_search_msgs = $search_msgs; + session_unregister('search_msgs'); + $old_search_msgs[$mailbox] = $msgs; + $search_msgs = $old_search_msgs; + session_register('search_msgs'); + } + } else { +// if (session_is_registered('search_msgs')) { +// global $search_msgs; + $msgs = $search_msgs[$mailbox]; +// } else { +// $msgs = $search_msgs[$mailbox]; +// } + } + if ($newsort) { + $cnt = count($msgs); + $sort = $newsort; + } + $msort = calc_msort($msgs, $sort, $cnt, true); + displayMessageArray($imapConnection, $cnt, 1, + $msgs, $msort, $mailbox, $sort, $color, + $cnt, true); +} + +if (isset($newsort)) { + $sort = $newsort; + session_register('sort'); +} + +/********************************************************************* + * Check to see if we can use cache or not. Currently the only time * + * when you will not use it is when a link on the left hand frame is * + * used. Also check to make sure we actually have the array in the * + * registered session data. :) * + *********************************************************************/ +if (! isset($use_mailbox_cache)) { + $use_mailbox_cache = 0; +} + +/* There is a problem with registered vars in 4.1 */ +/* +if( substr( phpversion(), 0, 3 ) == '4.1' ) { + $use_mailbox_cache = FALSE; +} +*/ + /* Search Form */ echo html_tag( 'div', '' . _("Current Search") . '', 'left' ) . "\n" . '
' @@ -386,17 +442,19 @@ if ($allow_thread_sort == TRUE) { if ($search_all == 'all') { $mailbox == ''; $boxcount = count($boxes); - echo '
' . + echo '
' . _("Search Results") . - "

\n"; + "

\n"; for ($x=0;$x<$boxcount;$x++) { if (!in_array('noselect', $boxes[$x]['flags'])) { $mailbox = $boxes[$x]['unformatted']; } if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) { sqimap_mailbox_select($imapConnection, $mailbox); - $count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all); - array_push($perbox_count, $count_all); + $msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all); + $count_all = count($msgs); + printSearchMessages($msgs, $mailbox, $count_all, $imapConnection); + array_push($perbox_count, $count_all); } } for ($i=0;$i' - . html_tag( 'div', '' . _("Search Results") . '', 'center' ) . "\n"; + echo '
' . + _("Search Results") . + "
\n"; sqimap_mailbox_select($imapConnection, $mailbox); - sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all); + $msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all); + printSearchMessages($msgs, $mailbox, count($msgs), $imapConnection); } } /* must have search terms to search */ if ($submit == _("Search") && empty($what)) { - echo '
' - . html_tag( 'div', 'Please enter something to search for', 'center' ) . "\n"; + echo "
Please enter something to search for
\n"; } $allow_thread_sort = $old_value; + do_hook('search_bottom'); sqimap_logout ($imapConnection); echo '';