X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=8051122a078662e024720d27c9cc4c510559218e;hb=34a6b7c2cede50f12a9ce43fef49e28ce324d3b6;hp=5cb11ff1081d385c530e6f61afafeaed7e0ea140;hpb=46d38f7894542146367a4b22c63f41564829abd2;p=squirrelmail.git diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 5cb11ff1..8051122a 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -115,10 +115,10 @@ function display_result($res, $includesource = true) { 'Bcc" . ' ' . - $row['name'] . ' ' . - ' " . $row['email'] . ' ' . - ' ' . $row['label'] . ' '; + $row['name'] . '' . + '" . $row['email'] . '' . + '' . $row['label']; if ($includesource) { echo ' ' . $row['source']; } @@ -140,9 +140,10 @@ displayHtmlHeader(); /* Initialize vars */ if (!isset($query)) { $query = ''; } if (!isset($show)) { $show = ''; } +if (!isset($backend)) { $backend = ''; } /* Choose correct colors for top and bottom frame */ -if ($show == 'form') { +if ($show == 'form' && !isset($listall)) { echo '' . "\n" . '' . - '
' . "\n" . + '
' . "\n" . ' ' . _("Search for") . "\n" . - ' \n"; + ' \n"; /* List all backends to allow the user to choose where to search */ if ($abook->numbackends > 1) { @@ -187,17 +188,17 @@ if ($show == 'form') { echo '' . "\n"; } - echo '' . + echo '
'. + '' . ' | ' . "\n" . - '' . "\n" . - '' . "\n" . '
' . "\n"; } else { /* Show personal addressbook */ - if ($show == 'blank' || !empty($listall)) { + if ($show == 'blank' && empty($listall)) { if($backend != -1 || $show == 'blank') { if ($show == 'blank') { @@ -221,9 +222,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);