From 146acc1149d7aedc95b68bba3673883260a74481 Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Thu, 31 Aug 2006 18:12:27 +0000 Subject: [PATCH 1/1] Templating for searching email git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11667 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/search.php | 598 ++++++-------------- templates/default/search.tpl | 91 +++ templates/default/search_advanced.tpl | 142 +++++ templates/default/search_list.tpl | 106 ++++ templates/default/search_result_empty.tpl | 25 + templates/default/search_result_mailbox.tpl | 28 + templates/default/search_result_top.tpl | 54 ++ templates/default/stylesheet.tpl | 100 +++- 8 files changed, 708 insertions(+), 436 deletions(-) create mode 100644 templates/default/search.tpl create mode 100644 templates/default/search_advanced.tpl create mode 100644 templates/default/search_list.tpl create mode 100644 templates/default/search_result_empty.tpl create mode 100644 templates/default/search_result_mailbox.tpl create mode 100644 templates/default/search_result_top.tpl diff --git a/src/search.php b/src/search.php index 127a96b1..7e037d22 100644 --- a/src/search.php +++ b/src/search.php @@ -47,47 +47,6 @@ define('ASEARCH_MAX', 7); */ define('ASEARCH_CRITERIA', 'criteria'); -/** Builds a href with params - * @param string $params optional parameters to GET - * @since 1.5.1 - * @private - */ -function asearch_get_href($params = '') -{ - $href = 'search.php'; - if ($params != '') - $href .= '?' . $params; - return $href; -} - -/** Builds a [link] - * @param string $href (reference) URL - * @param string $text link name - * @param string $title link title attribute value - * @since 1.5.1 - * @private - */ -function asearch_get_link(&$href, $text, $title = '') -{ - if ($title != '') - $title = ' title="' . $title . '"'; - return '' . $text . ''; -} - -/** Builds a toggle [link] - * @param integer $value - * @param string $action - * @param array $text_array - * @param array $title_array - * @since 1.5.1 - * @private - */ -function asearch_get_toggle_link($value, $action, $text_array, $title_array = array()) -{ - $asearch_nz=asearch_nz($title_array[$value]); - $asearch_get_href=asearch_get_href($action . '=' . (int)$value); - return asearch_get_link($asearch_get_href, $text_array[$value], $asearch_nz); -} /** * Array sort callback used to sort $imap_asearch_options @@ -103,20 +62,6 @@ 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) - * @since 1.5.0 - * @private - */ -function imap_get_mailbox_display($mailbox) -{ - if (strtoupper($mailbox) == 'INBOX') - return _("INBOX"); - return imap_utf7_decode_local($mailbox); -} - /** * @param string $mailbox mailbox name or special case 'All Folders' * @return string mailbox name ready to display (utf7 decoded or localized 'All Folders') @@ -125,32 +70,12 @@ function imap_get_mailbox_display($mailbox) */ function asearch_get_mailbox_display($mailbox) { - if ($mailbox == 'All Folders') + if ($mailbox == 'All Folders') { return _("All Folders"); - return imap_get_mailbox_display($mailbox); -} - -/** - * @param array $color color array (unused) - * @param string $txt text to display - * @return string title ready to display - * @since 1.5.0 - * @private - */ -function asearch_get_title_display($color, $txt) -{ - return '' . $txt . ''; -} -/** - * @param array $color color array - * @param string $txt text to display - * @return string error text ready to display - * @since 1.5.0 - * @private - */ -function asearch_get_error_display($color, $txt) -{ - return '' . '' . $txt . ''; + } elseif (strtoupper($mailbox) == 'INBOX') { + return _("INBOX"); + } + return imap_utf7_decode_local($mailbox); } /** @@ -651,7 +576,7 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno $cur_mailbox = 'INBOX'; $biop = asearch_nz($biop_array[$crit_num]); if (($query_display == '') || ($cur_mailbox != $last_mailbox)) { - $mailbox_display = ' ' . htmlspecialchars(asearch_get_mailbox_display($cur_mailbox)) . ''; + $mailbox_display = ' ' . htmlspecialchars(asearch_get_mailbox_display($cur_mailbox)) . ''; if ($query_display == '') $biop_display = _("In"); else @@ -672,25 +597,25 @@ function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno $what = $what_array[$crit_num]; if ($what_type) { /* Check opcode parameter */ if ($what == '') - $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)")); + $what_display = ' ' . _("(Missing argument)") .''; else { if ($what_type == 'adate') $what_display = asearch_get_date_display($what); else $what_display = htmlspecialchars($what); - $what_display = ' ' . $what_display . ''; + $what_display = ' ' . $what_display . ''; } } else { if ($what) - $what_display = ' ' . asearch_get_error_display($color, _("(Spurious argument)")); + $what_display = ' ' . _("(Spurious argument)") .''; else $what_display = ''; } if ($mailbox_display != '') - $query_display .= ' ' . $biop_display . '' . $mailbox_display . ' ' . $where_display . '' . $what_display; + $query_display .= ' ' . $biop_display . '' . $mailbox_display . ' ' . $where_display . '' . $what_display; else - $query_display .= ' ' . $biop_display . ' ' . $where_display . '' . $what_display; + $query_display .= ' ' . $biop_display . ' ' . $where_display . '' . $what_display; } } return $query_display; @@ -716,28 +641,6 @@ function getButton($type, $name, $value, $js = '', $enabled = TRUE) { '" style="padding: 0px; margin: 0px" />'; } - -/** Handle the alternate row colors - * @param array $color color theme array - * @param integer $row_num - * @return string color value - * @since 1.5.0 - * @private - */ -function asearch_get_row_color(&$color, $row_num) -{ -/*$color_string = ($row_num%2 ? $color[0] : $color[4]);*/ - $color_string = $color[4]; - if ($GLOBALS['alt_index_colors']) { - if (($row_num % 2) == 0) { - if (!isset($color[12])) - $color[12] = '#EAEAEA'; - $color_string = $color[12]; - } - } - return $color_string; -} - /** * Print a whole query array, recent or saved * @@ -753,58 +656,49 @@ function asearch_get_row_color(&$color, $row_num) */ function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$action_array, $title, $show_pref) { - global $color; global $data_dir, $username; - global $use_icons, $icon_theme; + global $icon_theme_path; + global $oTemplate; $show_flag = getPref($data_dir, $username, $show_pref, 0) & 1; - $use_icons_flag = ($use_icons) && ($icon_theme != 'none'); - if ($use_icons_flag) - $text_array = array('', - ''); - else - $text_array = array('-', '+'); - $toggle_link = asearch_get_toggle_link(!$show_flag, $show_pref, $text_array, array(_("Fold"), _("Unfold"))); - if (!$use_icons_flag) - $toggle_link = '[' . $toggle_link . ']'; - - echo "
\n"; - echo html_tag('table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"'); - echo html_tag('tr', - html_tag('td', $toggle_link, 'center', $color[5], 'width="5%"') - . html_tag('td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=4')); - if ($show_flag) { - $main_key = $query_keys[ASEARCH_WHERE]; - $query_count = count($query_array[$main_key]); - for ($query_num = 0, $row_num = 0; $query_num < $query_count; $query_num++) { - if (!empty($query_array[$main_key][$query_num])) { - echo html_tag('tr', '', '', asearch_get_row_color($color, $row_num)); - - unset($search_array); - foreach ($query_keys as $query_key) { - $search_array[] = asearch_unserialize($query_array[$query_key][$query_num]); - } - $where_array = $search_array[ASEARCH_WHERE]; - $mailbox_array = $search_array[ASEARCH_MAILBOX]; - $what_array = $search_array[ASEARCH_WHAT]; - $unop_array = $search_array[ASEARCH_UNOP]; - $biop_array = asearch_nz($search_array[ASEARCH_BIOP], array()); - $exclude_array = asearch_nz($search_array[ASEARCH_EXCLUDE], array()); - $sub_array = asearch_nz($search_array[ASEARCH_SUB], array()); - $query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); - - echo html_tag('td', $query_num + 1, 'right'); - echo html_tag('td', $query_display, 'center', '', 'width="80%"'); - foreach ($action_array as $action => $action_display) { - echo html_tag('td', '' . $action_display . '', 'center'); - } - - echo '' . "\n"; - $row_num++; + $a = array(); + $main_key = $query_keys[ASEARCH_WHERE]; + $query_count = count($query_array[$main_key]); + for ($query_num = 0, $row_num = 0; $query_num < $query_count; $query_num++) { + if (!empty($query_array[$main_key][$query_num])) { + unset($search_array); + foreach ($query_keys as $query_key) { + $search_array[] = asearch_unserialize($query_array[$query_key][$query_num]); } + + $where_array = $search_array[ASEARCH_WHERE]; + $mailbox_array = $search_array[ASEARCH_MAILBOX]; + $what_array = $search_array[ASEARCH_WHAT]; + $unop_array = $search_array[ASEARCH_UNOP]; + $biop_array = asearch_nz($search_array[ASEARCH_BIOP], array()); + $exclude_array = asearch_nz($search_array[ASEARCH_EXCLUDE], array()); + $sub_array = asearch_nz($search_array[ASEARCH_SUB], array()); + $query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array); + + $a[$query_num] = $query_display; } } - echo '' . "\n"; + + $oTemplate->assign('list_title', $title); + $oTemplate->assign('show_list', $show_flag==1); + $oTemplate->assign('is_recent_list', $title==_("Recent Searches")); + $oTemplate->assign('expand_collapse_toggle', '../src/search.php?'.$show_pref.'='.($show_flag==1 ? 0 : 1)); + $oTemplate->assign('query_list', $a); + + $oTemplate->assign('save_recent', '../src/search.php?submit=save_recent&rownum='); + $oTemplate->assign('do_recent', '../src/search.php?submit=search_recent&rownum='); + $oTemplate->assign('forget_recent', '../src/search.php?submit=forget_recent&rownum='); + + $oTemplate->assign('edit_saved', '../src/search.php?submit=edit_saved&rownum='); + $oTemplate->assign('do_saved', '../src/search.php?submit=search_saved&rownum='); + $oTemplate->assign('delete_saved', '../src/search.php?submit=delete_saved&rownum='); + + $oTemplate->display('search_list.tpl'); } /** Print the saved array @@ -850,39 +744,6 @@ function asearch_print_recent(&$boxes) } } -/** - * Build an ' . "\n"; -} - -/** Build a ' . "\n"; - foreach($opt_array as $val => $display) - $output .= asearch_opt($val, $cur_val, asearch_nz($display, $val)); - $output .= '' . "\n"; - return $output; -} - /** Verify that a mailbox exists * @param string $mailbox * @param array $boxes @@ -900,125 +761,6 @@ function asearch_mailbox_exists($mailbox, &$boxes) return FALSE; } -/** - * Build the mailbox select - * @param stream $imapConnection - * @param array $boxes - * @param string $mailbox - * @param integer $row_num - * @since 1.5.1 - * @private - */ -function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num = 0) -{ - if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) { - $missing = asearch_opt($mailbox, $mailbox, '[' . _("Missing") . '] ' . htmlspecialchars(asearch_get_mailbox_display($mailbox))); - } else { - $missing = ''; - } - return ''; -} - -/** - * Build the Include subfolders checkbox - * @param string $sub - * @param integer $row_num - * @return string - * @since 1.5.1 - * @private - */ -function asearch_get_form_sub($sub, $row_num = 0) -{ - return addCheckBox('sub[' . $row_num .']', $sub); -} - -/** Build the 2 unop and where selects - * @param string $unop default value - * @param string $where default value - * @param integer $row_num - * @return string - * @since 1.5.1 - * @private - */ -function asearch_get_form_location($unop, $where, $row_num = 0) -{ - global $imap_asearch_unops, $imap_asearch_options; - - return asearch_opt_array('unop[' . $row_num . ']', $imap_asearch_unops, $unop) - . asearch_opt_array('where[' . $row_num . ']', $imap_asearch_options, $where); -} - -/** Build the what text input - * @param string $what - * @param integer $row_num - * @return string - * @since 1.5.1 - * @private - */ -function asearch_get_form_what($what, $row_num = 0) -{ - return addInput('what[' . $row_num . ']', $what, '35'); -} - -/** Build the Exclude criteria checkbox - * @param boolean $exclude - * @param integer $row_num - * @return string - * @since 1.5.1 - * @private - */ -function asearch_get_form_exclude($exclude, $row_num = 0) -{ - return addCheckBox('exclude['.$row_num.']', $exclude); -} - -/** Print one advanced form row - * @param stream $imapConnection - * @param array $boxes - * @param string $mailbox - * @param mixed $biop - * @param string $unop - * @param string $where - * @param string $what - * @param boolean $exclude - * @param mixed $sub - * @param integer $row_num - * @since 1.5.0 - * @private - */ -function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num) -{ - global $imap_asearch_biops_in; - global $color; - - echo html_tag('tr', '', '', $color[4]); - -//Binary operator - echo html_tag('td', $row_num ? - asearch_opt_array('biop[' . $row_num . ']', $imap_asearch_biops_in, $biop) - : '' . _("In") . '', 'center') . "\n"; - -//Mailbox list and Include Subfolders - echo html_tag('td', - asearch_get_form_mailbox($imapConnection, $boxes, $mailbox, $row_num) - . _("and subfolders:") . asearch_get_form_sub($sub, $row_num), 'center') . "\n"; - -//Unary operator and Search location - echo html_tag('td', asearch_get_form_location($unop, $where, $row_num), 'center') . "\n"; - -//Text input - echo html_tag('td', asearch_get_form_what($what, $row_num), 'center') . "\n"; - -//Exclude criteria - echo html_tag('td', _("Exclude Criteria:") . asearch_get_form_exclude($exclude, $row_num), 'center') . "\n"; - - echo "\n"; -} - /** Print the advanced search form * @param stream $imapConnection * @param array $boxes @@ -1034,74 +776,55 @@ function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop */ function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array) { - global $search_button_html, $add_criteria_button_html, $del_excluded_button_html, $del_all_button_html; - global $color; - -//Search Form - echo "
\n"; - echo '
' . "\n"; + global $oTemplate, $allow_advanced_search, $search_advanced, + $imap_asearch_unops, $imap_asearch_biops_in, $imap_asearch_options; - echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="1" border="0"'); - echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Criteria")), 'center', $color[5], 'colspan=5')); - $row_count = count($where_array); - for ($row_num = 0; $row_num < $row_count; $row_num++) { + # Build the criteria array + $c = array(); + for ($row_num = 0; $row_num < count($where_array); $row_num++) { $mailbox = asearch_nz($mailbox_array[$row_num]); - $biop = strip_tags(asearch_nz($biop_array[$row_num])); - $unop = strip_tags(asearch_nz($unop_array[$row_num])); - $where = strip_tags(asearch_nz($where_array[$row_num])); - $what = asearch_nz($what_array[$row_num]); - $exclude = strip_tags(asearch_nz($exclude_array[$row_num])); - $sub = strip_tags(asearch_nz($sub_array[$row_num])); - asearch_print_form_row($imapConnection, $boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num); + $a = array(); + $a['MailboxSel'] = asearch_nz($mailbox_array[$row_num]); + $a['LogicSel'] = strip_tags(asearch_nz($biop_array[$row_num])); + $a['UnarySel'] = strip_tags(asearch_nz($unop_array[$row_num])); + $a['WhereSel'] = strip_tags(asearch_nz($where_array[$row_num])); + $a['What'] = asearch_nz($what_array[$row_num]); + $a['Exclude'] = strip_tags(asearch_nz($exclude_array[$row_num])) == 'on'; + $a['IncludeSubfolders'] = strip_tags(asearch_nz($sub_array[$row_num])) == 'on'; + + $c[$row_num] = $a; } - echo '' . "\n"; - -//Submit buttons - echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"'); - echo html_tag('tr', - html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n" - . html_tag('td', getButton('submit', 'submit', $add_criteria_button_html), 'center') . "\n" - . html_tag('td', getButton('submit', 'submit', $del_all_button_html), 'center') . "\n" - . html_tag('td', getButton('submit', 'submit', $del_excluded_button_html), 'center') . "\n" - ); - echo '' . "\n"; - echo '
' . "\n"; -} - -/** Print one basic form row - * @param stream $imapConnection - * @param array $boxes - * @param string $mailbox - * @param mixed $biop - * @param mixed $unop - * @param string $where - * @param string $what - * @param boolean $exclude - * @param mixed $sub - * @param integer $row_num - * @since 1.5.1 - * @private - */ -function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num) -{ - global $search_button_html; - global $color; - - echo html_tag('tr', '', '', $color[4]); - -//Mailbox list - echo html_tag('td', '' . _("In") . ' ' . asearch_get_form_mailbox($imapConnection, $boxes, $mailbox), 'center') . "\n"; - -//Unary operator and Search location - echo html_tag('td', asearch_get_form_location($unop, $where), 'center') . "\n"; - -//Text input - echo html_tag('td', asearch_get_form_what($what), 'center') . "\n"; - -//Submit button - echo html_tag('td', getButton('submit', 'submit', $search_button_html), 'center') . "\n"; - - echo "\n"; + + # Build the mailbox array + $a = array(); + if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) { + $a[$mailbox] = '[' . _("Missing") . '] ' . htmlspecialchars(asearch_get_mailbox_display($mailbox)); + } + $a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']'; + $a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL)); + + if ($allow_advanced_search > 1) { + $link = '../src/search.php?advanced='.($search_advanced ? 0 : 1); + $txt = $search_advanced ? _("Standard Search") : _("Advanced search"); + } else { + $link = NULL; + $txt = NULL; + } + + $oTemplate->assign('allow_advanced_search', $allow_advanced_search > 1); + $oTemplate->assign('adv_toggle_text', $txt); + $oTemplate->assign('adv_toggle_link', $link); + + $oTemplate->assign('mailbox_options', $a); + $oTemplate->assign('logical_options', $imap_asearch_biops_in); + $oTemplate->assign('unary_options', $imap_asearch_unops); + $oTemplate->assign('where_options', $imap_asearch_options); + + $oTemplate->assign('criteria', $c); + + echo '
' . "\n"; + $oTemplate->display('search_advanced.tpl'); + echo "
\n"; } /** Print the basic search form @@ -1119,27 +842,49 @@ function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, */ function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array) { - global $color; - -//Search Form - echo "
\n"; - echo '
' . "\n"; - - echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="1" border="0"'); - //echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Criteria")), 'center', $color[5], 'colspan=4')); - $row_count = count($where_array); - for ($row_num = 0; $row_num < $row_count; $row_num++) { - $mailbox = asearch_nz($mailbox_array[$row_num]); - $biop = strip_tags(asearch_nz($biop_array[$row_num])); - $unop = strip_tags(asearch_nz($unop_array[$row_num])); - $where = strip_tags(asearch_nz($where_array[$row_num])); - $what = asearch_nz($what_array[$row_num]); - $exclude = strip_tags(asearch_nz($exclude_array[$row_num])); - $sub = strip_tags(asearch_nz($sub_array[$row_num])); - asearch_print_form_row_basic($imapConnection, $boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num); + global $allow_advanced_search, $search_advanced, $oTemplate, $imap_asearch_unops, $imap_asearch_options; + + $row_num = 0; + $mailbox = asearch_nz($mailbox_array[$row_num]); + $biop = strip_tags(asearch_nz($biop_array[$row_num])); + $unop = strip_tags(asearch_nz($unop_array[$row_num])); + $where = strip_tags(asearch_nz($where_array[$row_num])); + $what = asearch_nz($what_array[$row_num]); + $exclude = strip_tags(asearch_nz($exclude_array[$row_num])); + $sub = strip_tags(asearch_nz($sub_array[$row_num])); + + # Build the mailbox array + $a = array(); + if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) { + $a[$mailbox] = '[' . _("Missing") . '] ' . htmlspecialchars(asearch_get_mailbox_display($mailbox)); } - echo '' . "\n"; - echo '
' . "\n"; + $a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']'; + $a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL)); + + if ($allow_advanced_search > 1) { + $link = '../src/search.php?advanced='.($search_advanced ? 0 : 1); + $txt = $search_advanced ? _("Standard Search") : _("Advanced search"); + } else { + $link = NULL; + $txt = NULL; + } + + $oTemplate->assign('allow_advanced_search', $allow_advanced_search > 1); + $oTemplate->assign('adv_toggle_text', $txt); + $oTemplate->assign('adv_toggle_link', $link); + + $oTemplate->assign('mailbox_options', $a); + $oTemplate->assign('unary_options', $imap_asearch_unops); + $oTemplate->assign('where_options', $imap_asearch_options); + + $oTemplate->assign('mailbox_sel', strtolower(htmlspecialchars($mailbox))); + $oTemplate->assign('unary_sel', $unop); + $oTemplate->assign('where_sel', $where); + $oTemplate->assign('what_val', $what); + + echo '
' . "\n"; + $oTemplate->display('search.tpl'); + echo "
\n"; } @@ -1173,7 +918,6 @@ if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) { */ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); - $search_button_html = _("Search"); $search_button_text = asearch_unhtmlentities($search_button_html); $add_criteria_button_html = _("Add New Criteria"); @@ -1370,12 +1114,6 @@ if ( sqgetGlobalVar('account', $temp, SQ_GET) ) { $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 */ @@ -1648,26 +1386,13 @@ if (isset($aMailbox['FORWARD_SESSION'])) { } if (isset($note)) { - echo html_tag( 'div', '' . htmlspecialchars($note) .'', 'center' ) . "
\n"; + $oTemplate->assign('note', $note); + $oTemplate->display('note.tpl'); } - do_hook('search_before_form'); if (!$search_silent) { - //Add a link to the other search mode if allowed - if ($allow_advanced_search > 1) - $toggle_link = ' - [' - . asearch_get_toggle_link(!$search_advanced, 'advanced', array(_("Standard search"), _("Advanced search"))) - . ']'; - else - $toggle_link = ''; - - echo html_tag('table', - html_tag('tr', "\n" - . html_tag('td', asearch_get_title_display($color, _("Search")) . $toggle_link, 'center', $color[0]) - ) , - '', '', 'width="100%"') . "\n"; asearch_print_saved($boxes); asearch_print_recent($boxes); if (empty($where_array)) { @@ -1707,17 +1432,18 @@ do_hook('search_after_form'); if ($submit == $search_button_text) { $msgsfound = false; - echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"'); - echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Results")), 'center', $color[5])); - echo html_tag('tr', html_tag('td', asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array), 'center', $color[4])); - echo '' . "\n"; + $err = asearch_check_query($where_array, $what_array, $exclude_array); + + $oTemplate->assign('query_has_error', $err!=''); + $oTemplate->assign('query_error', $err=='' ? NULL : $err); + $oTemplate->assign('query', asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)); + + $oTemplate->display('search_result_top.tpl'); + flush(); $iMsgCnt = 0; - $query_error = asearch_check_query($where_array, $what_array, $exclude_array); - if ($query_error != '') { - echo '
' . html_tag('div', asearch_get_error_display($color, $query_error), 'center') . "\n"; - } else { + if ($err == '') { $mboxes_array = sqimap_asearch_get_selectable_unformatted_mailboxes($boxes); /** * Retrieve the search queries @@ -1855,8 +1581,9 @@ if ($submit == $search_button_text) { */ sqgetGlobalVar('align',$align,SQ_SESSION); - $oTemplate = new Template($sTplDir); - + /** + * TODO: Clean up handling of message list once the template is cleaned up. + */ if ($aMailbox['EXISTS'] > 0) { if ($iError) { // TODO @@ -1866,6 +1593,16 @@ if ($submit == $search_button_text) { $oTemplate->assign($k, $v); } + $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']); + if (strtoupper($mbx) == 'INBOX') { + $mailbox_display = _("INBOX"); + } else { + $mailbox_display = imap_utf7_decode_local($mbx); + } + + $oTemplate->assign('mailbox_name', htmlspecialchars($mailbox_display)); + $oTemplate->display('search_result_mailbox.tpl'); + $oTemplate->assign('page_selector', $page_selector); $oTemplate->assign('page_selector_max', $page_selector_max); $oTemplate->assign('compact_paginator', $compact_paginator); @@ -1878,15 +1615,6 @@ if ($submit == $search_button_text) { $oTemplate->assign('color', $color); $oTemplate->assign('align', $align); - $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:") . ' '. htmlspecialchars($mailbox_display) . ' '; - $oTemplate->display('message_list.tpl'); } } @@ -1898,13 +1626,13 @@ if ($submit == $search_button_text) { } } if(!$iMsgCnt) { - echo '
' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n"; + $oTemplate->display('search_result_empty.tpl'); } } do_hook('search_bottom'); sqimap_logout($imapConnection); + $oTemplate->display('footer.tpl'); sqsession_register($mailbox_cache,'mailbox_cache'); - -?> +?> \ No newline at end of file diff --git a/templates/default/search.tpl b/templates/default/search.tpl new file mode 100644 index 00000000..bfb80064 --- /dev/null +++ b/templates/default/search.tpl @@ -0,0 +1,91 @@ + +
+ + + + + + + + + + +
+ + + - [] + +
+ + + + +   + + + + + " /> +
+
\ No newline at end of file diff --git a/templates/default/search_advanced.tpl b/templates/default/search_advanced.tpl new file mode 100644 index 00000000..e9226420 --- /dev/null +++ b/templates/default/search_advanced.tpl @@ -0,0 +1,142 @@ + +
+ + + + + $rule) { + $mailbox_sel = strtolower($rule['MailboxSel']); + $logical_sel = $rule['LogicSel']; + $unary_sel = $rule['UnarySel']; + $subfolders = $rule['IncludeSubfolders']; + $where_sel = $rule['WhereSel']; + $what_val = $rule['What']; + $exclude = $rule['Exclude']; + ?> + + + + + + + + + + + +
+ + + - [] + +
+ + + + + + + /> + + +   + + + + + + /> +
+ " />   + " />   + " />   + " />   +
+
\ No newline at end of file diff --git a/templates/default/search_list.tpl b/templates/default/search_list.tpl new file mode 100644 index 00000000..4ae0c014 --- /dev/null +++ b/templates/default/search_list.tpl @@ -0,0 +1,106 @@ + +
+ + + + + + $desc) { + if ($count%2 == 0) + $class = 'even'; + else $class = 'odd'; + ?> + + + + + + + + + + + + + + +
+ + + + + +
+   + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/templates/default/search_result_empty.tpl b/templates/default/search_result_empty.tpl new file mode 100644 index 00000000..d3a81d88 --- /dev/null +++ b/templates/default/search_result_empty.tpl @@ -0,0 +1,25 @@ + +
+

+
\ No newline at end of file diff --git a/templates/default/search_result_mailbox.tpl b/templates/default/search_result_mailbox.tpl new file mode 100644 index 00000000..05626b4a --- /dev/null +++ b/templates/default/search_result_mailbox.tpl @@ -0,0 +1,28 @@ + +
+

:

+
\ No newline at end of file diff --git a/templates/default/search_result_top.tpl b/templates/default/search_result_top.tpl new file mode 100644 index 00000000..8e02a085 --- /dev/null +++ b/templates/default/search_result_top.tpl @@ -0,0 +1,54 @@ + +
+
+ + + + + + + + + + + + +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/templates/default/stylesheet.tpl b/templates/default/stylesheet.tpl index 6f57fa0b..0ae3d9ce 100644 --- a/templates/default/stylesheet.tpl +++ b/templates/default/stylesheet.tpl @@ -176,6 +176,14 @@ td.header3 { padding-bottom: 4px; } +td.header4 { + background: ; + font-weight: bold; + padding-top:2px; + padding-bottom: 2px; + text-align: center; +} + tr.even { background: ; } @@ -753,4 +761,94 @@ tr.odd { #vCard td.fieldValue { text-align: ; -} \ No newline at end of file +} + +.search table { + margin-top: 12px; + margin-bottom: 12px; +} + +.search td.header4 { + border-bottom: 1px solid ; + vertical-align: bottom; +} + +.search td.queryAction { + text-align: center; + font-size: small; + width: 1%; + padding-left: 8px; + padding-right: 8px; + border-left: 1px solid ; + border-top: 1px solid ; + border-bottom: 1px solid ; +} + +.search td.queryDesc { + border-top: 1px solid ; + border-bottom: 1px solid ; +} + +.search span { + padding-left: 2px; + padding-right: 2px; +} + +.search span.operator { + font-weight: normal; + text-decoration: underline; + font-style: italic; +} + +.search span.mailbox { + font-weight: bold +} + +.search span.conditions { + font-weight: normal; + text-decoration: underline; + font-style: italic; +} + +.search span.value { + font-weight: bold; +} + +.search span.error { + color: ; + font-weight: bold; + font-size: 125%; +} + +.search td.searchForm { + border-right: 1px solid ; + border-left: 1px solid ; + font-weight: bold; + text-align: center; +} + +.search td.queryError { + color: ; + font-weight: bold; + text-align: center; + padding: 4px; +} + +.search td.header1 input { + font-size: 80%; + margin: 2px; +} + +.search h1 { + font-weight: bold; + font-size: 150%; + margin-top: 6px; + margin-bottom: 2px; +} + +.search h2 { + color: ; + font-weight: bold; + text-align: center; +} + -- 2.25.1