X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=search.cgi;h=59b6471ec50729170336bed03365535f91d291cd;hb=b33011c65aeb65e4b06b127077d6a225f764d042;hp=fade2a7d6c487334c38922dfaec332f8cc6f6fa8;hpb=93f39f9573613a5161a99557f8293bbdf7a435dd;p=mirror%2Fuserdir-ldap-cgi.git
diff --git a/search.cgi b/search.cgi
index fade2a7..59b6471 100755
--- a/search.cgi
+++ b/search.cgi
@@ -17,12 +17,21 @@ use Net::LDAP qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
my %config = &Util::ReadConfigFile;
my $query = new CGI;
-my $id = uri_escape($query->param('id'));
+my $id = $query->param('id');
my $authtoken = $query->param('authtoken');
-my $password = &Util::CheckAuthToken($authtoken);
my $dosearch = uri_escape($query->param('dosearch'));
my $searchdn = uri_escape($query->param('searchdn'));
+
my $ldap = undef;
+my $password = undef;
+
+if ($authtoken || $id) {
+ $password = Util::TouchAuthToken($authtoken, $id);
+} else {
+ $password = '';
+ $id = '';
+ $authtoken = '';
+}
my $proto = ($ENV{HTTPS} ? "https" : "http");
@@ -61,7 +70,7 @@ if (!$dosearch) {
# go through %searchdata and pull out all the search criteria the user
# specified...
- my $filter = "(objectclass=inetOrgPerson)";
+ my $filter = "(objectclass=inetOrgPerson)(!(accountStatus=*))";
foreach (keys(%searchdata)) {
if ($query->param($searchdata{$_}{formname})) {
if ($query->param($searchdata{$_}{fuzzy})) {
@@ -236,7 +245,7 @@ if (!$dosearch) {
# If this is ourselves, present a link to do mods
if ($auth && ($id eq $data->{uid}->[0])) { #TODO: extract this string into a url for translation...
- $outsub{searchresults} .= "Edit my settings\n";
+ $outsub{searchresults} .= "Edit my settings\n";
}
$outsub{searchresults} .= "
\n";