Fixed display on echelon fields

[mirror/userdir-ldap.git] / web / search.cgi

diff --git a/web/search.cgi b/web/search.cgi
index 3c21fb7..ff67109 100755 (executable)
--- a/web/search.cgi
+++ b/web/search.cgi
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-# (c) 1999 Debian and Randolph Chung. Licensed under the GPL. <tausq@debian.org>
+# $Id: search.cgi,v 1.5 2000/01/11 05:43:18 tausq Exp $
+# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 
 use lib '.';
 use strict vars;
@@ -115,7 +116,7 @@ if (!$dosearch) {
     $data = $entries->{$dn};
 
     # These are local variables.. i have enough global vars as it is... <sigh>
-    my ($ufdn, $login, $name, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified) = undef;
+    my ($ufdn, $login, $name, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
     
     $ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :)
     
@@ -152,6 +153,10 @@ if (!$dosearch) {
     $modified = &Util::FormatTimestamp($data->{modifytimestamp}->[0]);
     $created =  &Util::FormatTimestamp($data->{createtimestamp}->[0]);
 
+    # Last seen information (Echelon)
+    $lastseen = &Util::FormatLastSeen($data->{"activity-pgp"}->[0],
+                                      $data->{"activity-from"}->[0]);
+
     # Link in the debian login id 
     $login = $data->{uid}->[0]."\@debian.org";
     $login = "<a href=\"mailto:$login\">$login</a>";
@@ -182,6 +187,7 @@ if (!$dosearch) {
       $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);
@@ -190,7 +196,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&editdn=".uri_escape($dn, "\x00-\x40\x7f-\xff")."\">Edit my settings</a>\n";
     }
     
     $outsub{searchresults} .= "<br><br><br>\n";
@@ -253,3 +259,5 @@ sub FormatEntry {
   
   return "<tr><td align=right><b>$key:</b></td><td>&nbsp;$val</td></tr>\n";
 }
+
+exit 0;