fixed 'list all' in addressbook #506624, thanks to Kurt Yoder

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2237 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 5cb11ff1081d385c530e6f61afafeaed7e0ea140..fca02aff45349c7f7a9da7f6426acfc4aa2ad7ad 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -197,7 +197,7 @@ if ($show == 'form') {
 } else {
 
     /* Show personal addressbook */
-    if ($show == 'blank' || !empty($listall)) {
+    if ($show == 'blank' && empty($listall)) {
 
         if($backend != -1 || $show == 'blank') {
             if ($show == 'blank') {
@@ -221,9 +221,12 @@ if ($show == 'form') {
         }
 
     } else {
+        if( !empty( $listall ) ){
+          $query = '*';
+        }
 
         /* Do the search */
-        if (!empty($query) && empty($listall)) {
+        if (!empty($query)) {
     
             if($backend == -1) {
                 $res = $abook->s_search($query);

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index aac9971659f0ad51c46b20ebbf4f80ef995ede1c..778c52e2688de90f8cc8ad4cd569cdc56d77fabf 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -185,10 +185,13 @@ if ($addrquery == '' || !empty($listall)) {
     }
     exit;
 
+    if ( !empty( $listall ) ){
+        $addrquery = '*';
+    }
 } else {
 
     /* Do the search */
-    if (!empty($addrquery) && empty($listall)) {
+    if (!empty($addrquery)) {
 
         if ($backend == -1) {
             $res = $abook->s_search($addrquery);