X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddrbook_search.php;h=14a2f477599c7b45e644a692f5f3b73ce4933b20;hp=f347abac3801f62e61055188629bff87aec4c7fc;hb=675c2a6fd06af5eab5890baeb35c1fbea28f2649;hpb=355861846a51d35efe50848869d680fd3b4a5316 diff --git a/src/addrbook_search.php b/src/addrbook_search.php index f347abac..14a2f477 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -1,261 +1,144 @@ - +displayHtmlHeader(); +echo "
\n"; -assign('note', htmlspecialchars(_("No persons matching your search were found"))); + $oTemplate->display('note.tpl'); +# exit; +} - // List search results - function display_result($res, $includesource = true) { - global $color; - - if(sizeof($res) <= 0) return; - - insert_javascript(); - - $line = 0; - echo '". - " | %s | %s". - " | %s", - _("Name"), _("E-mail"), _("Info")); - - if($includesource) - printf(" | %s", _("Source")); - - echo " |
---|---|---|---|---|
". - "To | ". - "Cc | ". - "Bcc". - " | %s | ". - " %s ". - " | %s ", - ($line % 2) ? " bgcolor=\"$color[0]\"" : "", - $row["email"], $row["email"], $row["email"], - $row["name"], $row["email"], $row["email"], - $row["label"]); - - if($includesource) - printf(" | %s", $row["source"]); - - echo " |
"._("Unable to list addresses from %s"). - "
\n", $abook->backends[$backend]->sname); + plain_error_message(sprintf(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname)); } - } else { - $res = $abook->list_addr(); - display_result($res, true); + $res = $abook->list_addr(); + usort($res,'alistcmp'); + display_result($res, true); } - } else + } elseif (!empty($query)) { + /* Do the search (listall is not set. query is set.)*/ - // Do the search - if(!empty($query) && empty($listall)) { - if($backend == -1) { $res = $abook->s_search($query); } else { $res = $abook->s_search($query, $backend); } - - if(!is_array($res)) { - printf("
%s:
%s