X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=56e7956baa1cdecaf8eb4a873034f53dd1ce3cee;hb=bc3acc5a08b71cd6c73daff3e3a524f76223be4e;hp=778c52e2688de90f8cc8ad4cd569cdc56d77fabf;hpb=db48e3f5d3a7dfaeb19e9e87b9d6a8f6effe11dc;p=squirrelmail.git diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 778c52e2..56e7956b 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -1,181 +1,143 @@ ' . "\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 '
'; + echo addForm($PHP_SELF, 'post', 'addressbook'). + addHidden('html_addr_search_done', 'true'); + addr_insert_hidden(); + + $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 { @@ -183,45 +145,39 @@ if ($addrquery == '' || !empty($listall)) { usort($res,'alistcmp'); addr_display_result($res, true); } + $oTemplate->display('footer.tpl'); exit; - - if ( !empty( $listall ) ){ - $addrquery = '*'; - } -} else { - +} elseif (!empty($addrquery)) { /* Do the search */ - if (!empty($addrquery)) { - - 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 . "