X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=ac0be5609901293ef996935f7239efd147327d13;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=1e71b23dc7b6c0d7dd1cd77af42ada670b7e43e8;hpb=3d0cada30b60e39d6627ab1df7b44b3e9c2e3c91;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 1e71b23d..ac0be560 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,88 +1,100 @@
' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '' . "\n" .
- '\n" . '' .
- "\n";
+ 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('identity', $identity).
+ addHidden('mailbox', $mailbox).
+ addHidden('from_htmladdr_search', 'true');
+}
+
-/* List search results */
+/**
+ * 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 $color, $javascript_on, $PHP_SELF;
+ global $color, $javascript_on, $PHP_SELF, $squirrelmail_language;
if (sizeof($res) <= 0) return;
- echo '
';
+ '' .
+ addHidden('html_addr_search_done', '1').
+ '';
}
/* --- End functions --- */
-global $mailbox;
if ($compose_new_win == '1') {
compose_Header($color, $mailbox);
}
else {
displayPageHeader($color, $mailbox);
}
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
/* Initialize addressbook */
$abook = addressbook_init();
-echo '
' .
+echo '
' .
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', '' . _("Address Book Search") . '', 'center', $color[0] )
@@ -154,63 +176,52 @@ html_tag( 'table',
/* Search form */
-echo '' .
+echo '' .
html_tag( 'table', '', 'center', '', 'border="0"' ) .
html_tag( 'tr' ) .
- html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
- '
';
do_hook('addrbook_html_search_below');
/* End search form */
-/* Show personal addressbook */
-
-if ( !empty( $listall ) ){
- $addrquery = '*';
-}
-
-if ($addrquery == '' && empty($listall)) {
-
+/* 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"; */
+ /* echo '' . $abook->backends[$backend]->sname) . "
\n"; */
$res = $abook->list_addr($backend);
@@ -218,8 +229,8 @@ if ($addrquery == '' && empty($listall)) {
usort($res,'alistcmp');
addr_display_result($res, false);
} else {
- echo html_tag( 'p', '
' .
- sprintf(_("Unable to list addresses from %s"),
+ echo html_tag( 'p', '
' .
+ sprintf(_("Unable to list addresses from %s"),
$abook->backends[$backend]->sname) . "\n" ,
'center' );
}
@@ -229,45 +240,47 @@ 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