X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=7f4d7e5c23b49d4076e11bc96283c0f58ec1999d;hp=54de9f8ff27c002704a2beb7c7e6e63ce4b83ae1;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=4e16023756d809ccfee02e1c7743c90ac7ba9d0f
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 54de9f8f..7f4d7e5c 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,227 +1,146 @@
' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '\n" . '' .
- "\n";
- }
-
-
-/* List search results */
-function addr_display_result($res, $includesource = true) {
- global $color, $javascript_on, $PHP_SELF;
+/**
+ * Include the SquirrelMail initialization file.
+ * Because this file can also be included within compose we check for the $bInit
+ * var which is set inside ini.php. It's needed because compose already includes
+ * init.php.
+ */
+if (!isset($bInit)) {
+ /** This is the addrbook_search_html page */
+ define('PAGE_NAME', 'addrbook_search_html');
- if (sizeof($res) <= 0) return;
+ include('../include/init.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;
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
}
else {
displayPageHeader($color, $mailbox);
}
-/* Initialize addressbook */
-$abook = addressbook_init();
+/** set correct value of $default_charset */
+set_my_charset();
-echo '
' .
-html_tag( 'table',
- html_tag( 'tr',
- html_tag( 'td', '' . _("Address Book Search") . '', 'center', $color[0] )
- ) ,
-'center', '', 'width="95%" cellpadding="2" cellspacing="2" border="0"' );
+/* Initialize addressbook */
+$abook = addressbook_init();
/* Search form */
-echo '' .
- html_tag( 'table', '', 'center', '', 'border="0"' ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
- '' . "\n";
-addr_insert_hidden();
-echo '';
-do_hook('addrbook_html_search_below');
-/* End search form */
-
-/* Show personal addressbook */
+$oTemplate->assign('compose_addr_pop', false);
+$oTemplate->assign('backends', getBackends());
-if ( !empty( $listall ) ){
- $addrquery = '*';
-}
+$oTemplate->display('addressbook_search_form.tpl');
-if ($addrquery == '' && empty($listall)) {
+echo "\n";
+do_hook('addrbook_html_search_below', $null);
+/* End search form */
+/* List addresses. Show personal addressbook */
+if ($addrquery == '' || ! empty($listall)) {
+ // TODO: recheck all conditions and simplity if statements
if (! isset($backend) || $backend != -1 || $addrquery == '') {
- if ($addrquery == '') {
+ if ($addrquery == '' && empty($listall)) {
$backend = $abook->localbackend;
}
- /* echo '' . $abook->backends[$backend]->sname) . "
\n"; */
-
$res = $abook->list_addr($backend);
if (is_array($res)) {
usort($res,'alistcmp');
addr_display_result($res, false);
} else {
- echo html_tag( 'p', '
' .
- sprintf(_("Unable to list addresses from %s"),
- $abook->backends[$backend]->sname) . "\n" ,
- 'center' );
+ plain_error_message(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname);
}
} else {
@@ -229,45 +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)) {
-
- 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 html_tag( 'p', '
' .
- _("Your search failed with the following error(s)") .
- ':
' . $abook->error . "\n" ,
- 'center' ) .
- "\n