浏览代码

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

teepe 23 年之前
父节点
当前提交
2efec0b13d
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 5 2
      src/addrbook_search.php
  2. 4 1
      src/addrbook_search_html.php

+ 5 - 2
src/addrbook_search.php

@@ -197,7 +197,7 @@ if ($show == 'form') {
 } else {
 } else {
 
 
     /* Show personal addressbook */
     /* Show personal addressbook */
-    if ($show == 'blank' || !empty($listall)) {
+    if ($show == 'blank' && empty($listall)) {
 
 
         if($backend != -1 || $show == 'blank') {
         if($backend != -1 || $show == 'blank') {
             if ($show == 'blank') {
             if ($show == 'blank') {
@@ -221,9 +221,12 @@ if ($show == 'form') {
         }
         }
 
 
     } else {
     } else {
+        if( !empty( $listall ) ){
+          $query = '*';
+        }
 
 
         /* Do the search */
         /* Do the search */
-        if (!empty($query) && empty($listall)) {
+        if (!empty($query)) {
     
     
             if($backend == -1) {
             if($backend == -1) {
                 $res = $abook->s_search($query);
                 $res = $abook->s_search($query);

+ 4 - 1
src/addrbook_search_html.php

@@ -185,10 +185,13 @@ if ($addrquery == '' || !empty($listall)) {
     }
     }
     exit;
     exit;
 
 
+    if ( !empty( $listall ) ){
+        $addrquery = '*';
+    }
 } else {
 } else {
 
 
     /* Do the search */
     /* Do the search */
-    if (!empty($addrquery) && empty($listall)) {
+    if (!empty($addrquery)) {
 
 
         if ($backend == -1) {
         if ($backend == -1) {
             $res = $abook->s_search($addrquery);
             $res = $abook->s_search($addrquery);