From cc99433ec8dce19b5399c45ffbf381cd94ae065f Mon Sep 17 00:00:00 2001
From: jmunro <jmunro@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 4 Feb 2002 16:12:51 +0000
Subject: [PATCH] Fix for "list all" on LDAP backend. All is good with the HTML
 addressbook now.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2359 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/addrbook_search_html.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 98cbe4ca..4b16fe1e 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -158,7 +158,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 == '') {
@@ -185,11 +190,8 @@ if ($addrquery == '' || !empty($listall)) {
         addr_display_result($res, true);
     }
     exit;
-
-    if ( !empty( $listall ) ){
-        $addrquery = '*';
-    }
-} else {
+}
+else {
 
     /* Do the search */
     if (!empty($addrquery)) {
@@ -225,4 +227,4 @@ if ($addrquery == '' || sizeof($res) == 0) {
 }
 
 ?>
-</body></html>
\ No newline at end of file
+</body></html>
-- 
2.25.1