X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=web%2Fsearch.cgi;h=7a541001daf90743f0ba3e481600e773ad408145;hb=9bcf7bd209b5c5473c9acc36ae9ce52c411c7242;hp=3afb03ae481ab33654b9d8cdd933ce5f9a6b1c05;hpb=c4eb04f39b013155c9f99d1c0933e03fe17033d0;p=mirror%2Fuserdir-ldap.git diff --git a/web/search.cgi b/web/search.cgi index 3afb03a..7a54100 100755 --- a/web/search.cgi +++ b/web/search.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: search.cgi,v 1.4 2000/01/11 04:52:53 tausq Exp $ +# $Id: search.cgi,v 1.6 2000/03/26 22:13:25 tausq Exp $ # (c) 1999 Randolph Chung. Licensed under the GPL. use lib '.'; @@ -116,7 +116,7 @@ if (!$dosearch) { $data = $entries->{$dn}; # These are local variables.. i have enough global vars as it is... - my ($ufdn, $login, $name, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified, $lastseen) = undef; + my ($ufdn, $login, $name, $icquin, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified, $lastseen) = undef; $ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :) @@ -132,6 +132,11 @@ if (!$dosearch) { $email .= "$_"; } + # ICQ + if ($data->{icquin}->[0]) { + $icquin = sprintf("%s", $data->{icquin}->[0], $data->{icquin}->[0]); + } + # Format PGP/GPG key fingerprints my $fi; foreach (@{$data->{keyfingerprint}}) { @@ -154,7 +159,7 @@ if (!$dosearch) { $created = &Util::FormatTimestamp($data->{createtimestamp}->[0]); # Last seen information (Echelon) - $lastseen = &Util::FormatLastSeen($data->{"activity-pgp"}->[0] || + $lastseen = &Util::FormatLastSeen($data->{"activity-pgp"}->[0], $data->{"activity-from"}->[0]); # Link in the debian login id @@ -177,6 +182,9 @@ if (!$dosearch) { $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]); $outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]); $outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint); + if ($icquin) { + $outsub{searchresults} .= FormatEntry($dataspecref->{icquin}, $icquin); + } if ($auth) { # Some data should only be available to authorized users...