X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=81cb0bc4ebf2c91ed53db422f61334ff5ca33802;hb=4a1b4092cf6b9d265a3a20f18225908f73ec3068;hp=aac9971659f0ad51c46b20ebbf4f80ef995ede1c;hpb=5177fb2b1f84da8a9e45a4fcb45156d13d44b4cb;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index aac99716..81cb0bc4 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -31,8 +31,9 @@ function addr_insert_hidden() {
$identity;
echo '' . "\n" .
'' . "\n" .
@@ -78,11 +79,11 @@ function addr_display_result($res, $includesource = true) {
if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
echo ' nowrap>
' .
' To ' .
+ htmlspecialchars($row['email']) . '"> ' . _("To") . ' ' .
' Cc ' .
+ htmlspecialchars($row['email']) . '"> ' . _("Cc") . ' ' .
' Bcc ' .
+ htmlspecialchars($row['email']) . '"> ' . _("Bcc") . ' ' .
' | ' . $row['name'] . ' | ' .
' ' . $row['email'] . ' | ' .
' ' . $row['label'] . ' | ';
@@ -104,8 +105,12 @@ function addr_display_result($res, $includesource = true) {
/* --- End functions --- */
global $mailbox;
-displayPageHeader($color, $mailbox);
-
+if ($compose_new_win == '1') {
+ compose_Header($color, $mailbox);
+}
+else {
+ displayPageHeader($color, $mailbox);
+}
/* Initialize addressbook */
$abook = addressbook_init();
@@ -157,7 +162,12 @@ do_hook('addrbook_html_search_below');
/* End search form */
/* Show personal addressbook */
-if ($addrquery == '' || !empty($listall)) {
+
+if ( !empty( $listall ) ){
+ $addrquery = '*';
+}
+
+if ($addrquery == '' && empty($listall)) {
if (! isset($backend) || $backend != -1 || $addrquery == '') {
if ($addrquery == '') {
@@ -184,11 +194,11 @@ if ($addrquery == '' || !empty($listall)) {
addr_display_result($res, true);
}
exit;
-
-} else {
+}
+else {
/* Do the search */
- if (!empty($addrquery) && empty($listall)) {
+ if (!empty($addrquery)) {
if ($backend == -1) {
$res = $abook->s_search($addrquery);