X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=search.cgi;h=37695386b8bbde31bc82e6e303219247c776d582;hb=49c05461dc2851df308933e0e2976feb16dec0f3;hp=dc9f948a97e07e81bc654316406ea3c2c7adc75f;hpb=ecbd088ad0cff8af77e5d7abcea1c7b8af796c20;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/search.cgi b/search.cgi
index dc9f948..3769538 100755
--- a/search.cgi
+++ b/search.cgi
@@ -18,7 +18,7 @@ my %config = &Util::ReadConfigFile;
 
 my $query = new CGI;
 my $id = uri_escape($query->param('id'));
-my $authtoken = uri_escape($query->param('authtoken'));
+my $authtoken = $query->param('authtoken');
 my $password = &Util::CheckAuthToken($authtoken);
 my $dosearch = uri_escape($query->param('dosearch'));
 my $searchdn = uri_escape($query->param('searchdn'));
@@ -61,7 +61,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})) {