X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Faddrbook_search_html.php;h=a9bd6c8780f30a0ff77c06c1ec3ba94e13f410db;hb=5df2efa257f7aa8ddcfa44ed517a8cef8c26b118;hp=51d2b538e77d27c168dfe862c3e325363fa9f9a9;hpb=bd9bbfefba8fa274260a37c965f7510bb6670599;p=squirrelmail.git diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 51d2b538..a9bd6c87 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -1,180 +1,144 @@ ' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '' . "\n" . - '\n" . '' . - "\n"; - } + include('../include/init.php'); +} +/** 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'); -/* List search results */ -function addr_display_result($res, $includesource = true) { - global $color, $PHP_SELF; +sqgetGlobalVar('session', $session, SQ_POST); +sqgetGlobalVar('mailbox', $mailbox, SQ_POST); +if (! sqgetGlobalVar('query', $addrquery, SQ_POST)) + $addrquery=''; +sqgetGlobalVar('listall', $listall, SQ_POST); +sqgetGlobalVar('backend', $backend, SQ_POST); - if (sizeof($res) <= 0) return; +/** + * Insert hidden data + */ +function addr_insert_hidden() { + global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio, + $request_mdn, $request_dr, $identity, $session, $composeMessage; + +//FIXME Do not echo HTML from the core. This file already uses templates mostly, so why are we echoing here at all?!? + if (substr($body, 0, 1) == "\r") { + echo addHidden('body', "\n".$body); + } else { + echo addHidden('body', $body); + } - 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 { @@ -182,42 +146,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 . "