X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=8051122a078662e024720d27c9cc4c510559218e;hb=34a6b7c2cede50f12a9ce43fef49e28ce324d3b6;hp=dbaff000dfccb656f827fde9803f5b920344c8c6;hpb=ef97102b4de76ec7ae9bc35b9a850d65a6b36120;p=squirrelmail.git diff --git a/src/addrbook_search.php b/src/addrbook_search.php index dbaff000..8051122a 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -16,6 +16,7 @@ */ require_once('../src/validate.php'); +require_once('../functions/strings.php'); /* Function to include JavaScript code */ function insert_javascript() { @@ -105,7 +106,7 @@ function display_result($res, $includesource = true) { while (list($undef, $row) = each($res)) { echo '' . 'To | " . @@ -114,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']; } @@ -139,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) { @@ -186,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') { @@ -205,6 +207,7 @@ if ($show == 'form') { $res = $abook->list_addr($backend); if(is_array($res)) { + usort($res,'alistcmp'); display_result($res, false); } else { echo '

' . @@ -214,13 +217,17 @@ if ($show == 'form') { } } else { $res = $abook->list_addr(); + usort($res,'alistcmp'); display_result($res, true); } } else { + if( !empty( $listall ) ){ + $query = '*'; + } /* Do the search */ - if (!empty($query) && empty($listall)) { + if (!empty($query)) { if($backend == -1) { $res = $abook->s_search($query);