X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=search.cgi;h=bbdec50e7596264448b26b1dc13218316ee0a3e4;hp=59b6471ec50729170336bed03365535f91d291cd;hb=HEAD;hpb=b33011c65aeb65e4b06b127077d6a225f764d042 diff --git a/search.cgi b/search.cgi index 59b6471..bbdec50 100755 --- a/search.cgi +++ b/search.cgi @@ -4,6 +4,7 @@ # (c) 1999 Randolph Chung. Licensed under the GPL. # (c) 2004 Martin Schulze. Licensed under the GPL. # (c) 2006 Ryan Murray. Licensed under the GPL. +# Copyright (c) 2008, 2011, 2013, 2015 Peter Palfrader use lib '.'; use strict vars; @@ -128,7 +129,7 @@ if (!$dosearch) { my $ok = 0; # These are local variables.. i have enough global vars as it is... 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], @@ -175,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]); @@ -209,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]); }