X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=a22da9a781e9bf7c165912fd06679db4b59eed5e;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=e9702ac5e0637e85ee9e593ed6118554910a0cd2;hpb=1d80c108a1d741b7dcb562ea1cf6d2214322b192;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index e9702ac5..a22da9a7 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,37 +1,37 @@
' . "\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
* @param array $res Array containing results of search
- * @param bool $includesource UNDOCUMENTED [Default=true]
+ * @param bool $includesource If true, adds backend column to address listing
*/
function addr_display_result($res, $includesource = true) {
global $color, $javascript_on, $PHP_SELF, $squirrelmail_language;
+ global $oTemplate, $oErrorHandler;
+
if (sizeof($res) <= 0) return;
- echo '
';
+ $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 --- */
@@ -171,87 +92,46 @@ if ($compose_new_win == '1') {
else {
displayPageHeader($color, $mailbox);
}
-/* Initialize addressbook */
-$abook = addressbook_init();
+/** set correct value of $default_charset */
+global $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 */
+$oTemplate->assign('use_js', false);
+$oTemplate->assign('backends', getBackends());
-/* Show personal addressbook */
-
-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 {
@@ -259,45 +139,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' );
- noframes_bottom();
- } else {
- if (sizeof($res) == 0) {
- echo html_tag( 'p', '
' .
- _("No persons matching your search was found") . "\n" ,
- 'center' );
- noframes_bottom();
- } else {
- addr_display_result($res);
- }
- }
+ if (!is_array($res)) {
+ plain_error_message(_("Your search failed with the following error(s)") .':
'. nl2br(htmlspecialchars($abook->error)));
+ } elseif (sizeof($res) == 0) {
+ $oTemplate->assign('note', _("No persons matching your search were found"));
+ $oTemplate->display('note.tpl');
+ } else {
+ addr_display_result($res);
}
+} else {
+ // not first time display, not listall and search is empty
+ // TODO: I think, this part of control structure is never reached.
+ plain_error_message(_("Nothing to search"));
}
if ($addrquery == '' || sizeof($res) == 0) {
- /* printf('