X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=7f4d7e5c23b49d4076e11bc96283c0f58ec1999d;hp=585680dc018a97fca25e5353d740929272afd36d;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=43fdb2a474b990b8b7db21bfb05b30a70ac768a0 diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 585680dc..7f4d7e5c 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -1,181 +1,146 @@ ' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '\n" . '' . - "\n"; - } - - -/* List search results */ -function addr_display_result($res, $includesource = true) { - global $color, $PHP_SELF; + include('../include/init.php'); +} - if (sizeof($res) <= 0) return; +/** SquirrelMail required files. */ +include_once(SM_PATH . 'functions/date.php'); +include_once(SM_PATH . 'functions/addressbook.php'); +include_once(SM_PATH . 'templates/util_addressbook.php'); - echo '
'; +//FIXME: no HTML output from core + echo addForm($PHP_SELF, 'post', 'addressbook', '', '', array(), TRUE). + addHidden('html_addr_search_done', 'true'); + addr_insert_hidden(); + + $oTemplate->assign('compose_addr_pop', 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 { @@ -183,42 +148,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 . "