X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=search.cgi;h=2a1a51e8ae415ba89e12e1613e9cc61011cd20a8;hp=2174d52d5c64571d770a627f8d53d00d9b5a99d5;hb=632ec5349cd7921ebb17a4693a27d36424e64d74;hpb=a1750087e17caa3ec1baeafc21b1a5229979df38

diff --git a/search.cgi b/search.cgi
index 2174d52..2a1a51e 100755
--- a/search.cgi
+++ b/search.cgi
@@ -1,8 +1,9 @@
 #!/usr/bin/perl
 
-# $Id: search.cgi,v 1.13 2006/06/27 04:37:45 rmurray Exp $
+# $Id: search.cgi,v 1.14 2006/12/22 08:58:50 rmurray Exp $
 # (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>
 
 use lib '.';
 use strict vars;
@@ -33,7 +34,7 @@ $SIG{__DIE__} = \&DieHandler;
 
 if (!$dosearch) {
   # No action yet, send back the search form...
-  print "Content-type: text/html; charset=utf-8\n\n";
+  &Util::HTMLSendHeader;
   open (F, "<$config{websearchhtml}") || &Util::HTMLError($!);
   while (<F>) {
     s/~id~/$id/g;
@@ -60,7 +61,7 @@ if (!$dosearch) {
 
   # go through %searchdata and pull out all the search criteria the user
   # specified...
-  my $filter = undef;
+  my $filter = "(objectclass=inetOrgPerson)";
   foreach (keys(%searchdata)) {
     if ($query->param($searchdata{$_}{formname})) {    
       if ($query->param($searchdata{$_}{fuzzy})) {
@@ -114,11 +115,12 @@ if (!$dosearch) {
 
   # Format the output....
   foreach $dn (sort {$entries->{$a}->{sn}->[0] <=> $entries->{$b}->{sn}->[0]} keys(%$entries)) {
+    my $ok = 0;
     $data = $entries->{$dn};
 
     # 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) = undef;
+	$address, $latlong, $vacation, $created, $modified, $lastseen, $gender) = undef;
     
     $ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :)
     
@@ -156,6 +158,19 @@ 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]);
@@ -165,8 +180,8 @@ if (!$dosearch) {
                                       $data->{"activity-from"}->[0]);
 
     # Link in the debian login id 
-    $login = $data->{uid}->[0]."\@debian.org";
-    $login = "<a href=\"mailto:$login\">$login</a>";
+    $login = $data->{uid}->[0];
+    $login = "$login";
     
     # See if the user has a vacation message, non-public
     $vacation = $data->{onvacation}->[0] if ($authtoken && $id);
@@ -181,27 +196,36 @@ if (!$dosearch) {
     }
 
     $outsub{searchresults} .= FormatEntry($dataspecref->{uid}, $login);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{jabberjid}, $data->{jabberjid}->[0]);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint);
+    $outsub{searchresults} .= FormatEntry($dataspecref->{gender}, $gender);
+    if ($data->{ircnick}->[0]) {
+      $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]);
+    }
+    if ($data->{jabberjid}->[0]) {
+      $outsub{searchresults} .= FormatEntry($dataspecref->{jabberjid}, $data->{jabberjid}->[0]);
+    }
     if ($icquin) {
       $outsub{searchresults} .= FormatEntry($dataspecref->{icquin}, $icquin);
     }
-    
+    $outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]);
+    $outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint);
+    if ($data->{maildisablemessage}->[0]) {
+      $outsub{searchresults} .= FormatEntry($dataspecref->{maildisablemessage}, $data->{maildisablemessage}->[0]);
+    }
+
     if ($auth) {
       # Some data should only be available to authorized users...
       if ($id eq $data->{uid}->[0]) {
         $outsub{searchresults} .= FormatEntry($dataspecref->{email}, $email);
       }
+      $outsub{searchresults} .= FormatEntry($dataspecref->{birthdate}, $data->{birthdate}->[0]);
       $outsub{searchresults} .= FormatEntry($dataspecref->{address}, $address);
       $outsub{searchresults} .= FormatEntry($dataspecref->{latlong}, $latlong);
       $outsub{searchresults} .= FormatEntry($dataspecref->{phone}, $data->{telephonenumber}->[0] || "- unlisted -");
       $outsub{searchresults} .= FormatEntry($dataspecref->{fax}, $data->{fascimiletelephonenumber}->[0] || "- unlisted -");
       $outsub{searchresults} .= FormatEntry($dataspecref->{lastseen}, $lastseen);
+#     $outsub{searchresults} .= FormatEntry($dataspecref->{created}, $created);
+#     $outsub{searchresults} .= FormatEntry($dataspecref->{modified}, $modified);
     }
-    $outsub{searchresults} .= FormatEntry($dataspecref->{created}, $created);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{modified}, $modified);
     
     $outsub{searchresults} .= "</table>";