X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=a22da9a781e9bf7c165912fd06679db4b59eed5e;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=585680dc018a97fca25e5353d740929272afd36d;hpb=43fdb2a474b990b8b7db21bfb05b30a70ac768a0;p=squirrelmail.git diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 585680dc..a22da9a7 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -1,181 +1,137 @@ ' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '\n" . '' . - "\n"; + $identity, $session; + + if (substr($body, 0, 1) == "\r") { + echo addHidden('body', "\n".$body); + } else { + echo addHidden('body', $body); } + echo addHidden('session', $session). + addHidden('subject', $subject). + addHidden('send_to', $send_to). + addHidden('send_to_bcc', $send_to_bcc). + addHidden('send_to_cc', $send_to_cc). + addHidden('identity', $identity). + addHidden('mailbox', $mailbox). + addHidden('from_htmladdr_search', 'true'); +} + -/* List search results */ +/** + * List search results + * @param array $res Array containing results of search + * @param bool $includesource If true, adds backend column to address listing + */ function addr_display_result($res, $includesource = true) { - global $color, $PHP_SELF; + global $color, $javascript_on, $PHP_SELF, $squirrelmail_language; + global $oTemplate, $oErrorHandler; + if (sizeof($res) <= 0) return; - echo '
'; + $oTemplate->assign('use_js', false); + $oTemplate->assign('include_abook_name', $includesource); + $oTemplate->assign('addresses', formatAddressList($res)); + + $oTemplate->display('addrbook_search_list.tpl'); + + echo ''; } /* --- End functions --- */ -global $mailbox; -displayPageHeader($color, $mailbox); +if ($compose_new_win == '1') { + compose_Header($color, $mailbox); +} +else { + displayPageHeader($color, $mailbox); +} + +/** set correct value of $default_charset */ +global $default_charset; +set_my_charset(); /* Initialize addressbook */ $abook = addressbook_init(); -?> - -
- |
\n" . - ' |
' . - sprintf(_("Unable to list addresses from %s"), - $abook->backends[$backend]->sname) . - "
\n"; + plain_error_message(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname); } } else { @@ -183,42 +139,39 @@ if ($addrquery == '' || !empty($listall)) { usort($res,'alistcmp'); addr_display_result($res, true); } + $oTemplate->display('footer.tpl'); exit; - -} else { - +} elseif (!empty($addrquery)) { /* Do the search */ - if (!empty($addrquery) && empty($listall)) { - - if ($backend == -1) { - $res = $abook->s_search($addrquery); - } else { - $res = $abook->s_search($addrquery, $backend); - } + if ($backend == -1) { + $res = $abook->s_search($addrquery); + } else { + $res = $abook->s_search($addrquery, $backend); + } - if (!is_array($res)) { - echo '
' .
- _("Your search failed with the following error(s)") . ':
' .
- $abook->error . "