X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=0322132feb0dc6d29b79dd3b7593c6f1918ae86f;hb=d56050e17bf919a100069eee0a454083bb9b0a05;hp=a1604e6de2da0a84338d10846d0b471601d7c65f;hpb=00a065a69448f66db8f29fda00961878926a5912;p=squirrelmail.git diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index a1604e6d..0322132f 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -1,221 +1,178 @@ ' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '\n" . '' . - "\n"; + $request_mdn, $request_dr, $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('mailprio', $mailprio). + addHidden('request_mdn', $request_mdn). + addHidden('request_dr', $request_dr). + addHidden('identity', $identity). + addHidden('mailbox', $mailbox). + addHidden('from_htmladdr_search', 'true'); +} -/* List search results */ -function addr_display_result($res, $includesource = true) { - global $color, $PHP_SELF; - if (sizeof($res) <= 0) return; +/** + * 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 $PHP_SELF, $oTemplate, $oErrorHandler; + - 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 */ +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 { $res = $abook->list_addr(); + 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 . "