X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=search.cgi;h=bbdec50e7596264448b26b1dc13218316ee0a3e4;hp=16d00b0c6ec1b6807b6e48956daef74fb6c3a492;hb=HEAD;hpb=3bce39d94939aaf999189e4aaed805858a996153

diff --git a/search.cgi b/search.cgi
index 16d00b0..bbdec50 100755
--- a/search.cgi
+++ b/search.cgi
@@ -4,6 +4,7 @@
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 # (c) 2004 Martin Schulze. Licensed under the GPL. <joey@debian.org>
 # (c) 2006 Ryan Murray. Licensed under the GPL. <rmurray@debian.org>
+# Copyright (c) 2008, 2011, 2013, 2015 Peter Palfrader
 
 use lib '.';
 use strict vars;
@@ -19,10 +20,19 @@ my %config = &Util::ReadConfigFile;
 my $query = new CGI;
 my $id = $query->param('id');
 my $authtoken = $query->param('authtoken');
-my $password = &Util::CheckAuthToken($authtoken);
-my $dosearch = $query->param('dosearch');
-my $searchdn = $query->param('searchdn');
+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");
 
@@ -30,7 +40,7 @@ sub DieHandler {
   $ldap->unbind if (defined($ldap));
 }
 
-$SIG{__DIE__} = \&DieHandler;
+#$SIG{__DIE__} = \&DieHandler;
 
 if (!$dosearch) {
   # No action yet, send back the search form...
@@ -61,7 +71,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})) {
@@ -119,7 +129,7 @@ if (!$dosearch) {
     my $ok = 0;
     # These are local variables.. i have enough global vars as it is... <sigh>
     my ($ufdn, $login, $name, $icquin, $jabberjid, $email, $fingerprint,
-	$address, $latlong, $vacation, $created, $modified, $lastseen, $gender) = undef;
+	$address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
 
     # Last seen information (Echelon)
     $lastseen = &Util::FormatLastSeen($entries->{$dn}->{"activity-pgp"}->[0],
@@ -166,19 +176,6 @@ if (!$dosearch) {
     $latlong .= " / ";
     $latlong .= $data->{longitude}->[0] || "none";    
 
-    # Gender
-    if ($data->{gender}->[0]) {
-	if ($data->{gender}->[0] == 1) {
-	    $gender = $dataspecref->{male};
-	} elsif ($data->{gender}->[0] == 2) {
-	    $gender = $dataspecref->{female};
-	} else {
-	    $gender = $dataspecref->{unspecified};
-	}
-    } else {
-        $gender = $dataspecref->{unspecified};
-    }
-
     # Modified/created time. TODO: maybe add is the name of the creator/modifier
     $modified = &Util::FormatTimestamp($data->{modifytimestamp}->[0]);
     $created =  &Util::FormatTimestamp($data->{createtimestamp}->[0]);
@@ -191,7 +188,7 @@ if (!$dosearch) {
     $vacation = $data->{onvacation}->[0] if ($authtoken && $id);
 
     # OK, now generate output... (i.e. put the output into the buffer )
-    $outsub{searchresults} .= '<table border=2 cellpadding=2 cellspacing=0 bgcolor="#DDDDDD" width="80%">';
+    $outsub{searchresults} .= '<table class="debform" border=2 cellpadding=2 cellspacing=0 bgcolor="#DDDDDD" width="80%">';
     $outsub{searchresults} .= '<tr><th bgcolor="#44CCCC" colspan=2><font size=+1>'."$name</font> ";
     $outsub{searchresults} .= "($ufdn)</th></tr>\n";
     
@@ -200,7 +197,6 @@ if (!$dosearch) {
     }
 
     $outsub{searchresults} .= FormatEntry($dataspecref->{uid}, $login);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{gender}, $gender);
     if ($data->{ircnick}->[0]) {
       $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]);
     }
@@ -236,7 +232,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} .= "<a href=\"$proto://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id&authtoken=$authtoken&editdn=".uri_escape($dn, "\x00-\x40\x7f-\xff")."\">Edit my settings</a>\n";
+      $outsub{searchresults} .= "<a href=\"$proto://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id;authtoken=$authtoken\">Edit my settings</a>\n";
     }
     
     $outsub{searchresults} .= "<br><br><br>\n";