X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=search.cgi;h=2174d52d5c64571d770a627f8d53d00d9b5a99d5;hb=f1af5002f6710b37cf3d2b3903ef3103a34424a6;hp=7a541001daf90743f0ba3e481600e773ad408145;hpb=968a3c8f26adc301945f4753fc6b81806c4f51ed;p=mirror%2Fuserdir-ldap-cgi.git

diff --git a/search.cgi b/search.cgi
index 7a54100..2174d52 100755
--- a/search.cgi
+++ b/search.cgi
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 
-# $Id: search.cgi,v 1.6 2000/03/26 22:13:25 tausq Exp $
+# $Id: search.cgi,v 1.13 2006/06/27 04:37:45 rmurray Exp $
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
+# (c) 2004 Martin Schulze. Licensed under the GPL. <joey@debian.org>
 
 use lib '.';
 use strict vars;
@@ -32,7 +33,7 @@ $SIG{__DIE__} = \&DieHandler;
 
 if (!$dosearch) {
   # No action yet, send back the search form...
-  print "Content-type: text/html\n\n";
+  print "Content-type: text/html; charset=utf-8\n\n";
   open (F, "<$config{websearchhtml}") || &Util::HTMLError($!);
   while (<F>) {
     s/~id~/$id/g;
@@ -71,8 +72,8 @@ if (!$dosearch) {
     }
   }
   
-  # Vacation is a special case
-  $filter .= "(onvacation=*)" if ($query->param('vacation'));
+  # Vacation is a special case, support it only when user is authenticated
+  $filter .= "(onvacation=*)" if ($query->param('vacation') && $authtoken && $id);
 
   # AND all the search terms together
   $filter = "(&$filter)";
@@ -116,13 +117,14 @@ if (!$dosearch) {
     $data = $entries->{$dn};
 
     # These are local variables.. i have enough global vars as it is... <sigh>
-    my ($ufdn, $login, $name, $icquin, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
+    my ($ufdn, $login, $name, $icquin, $jabberjid, $email, $fingerprint,
+	$address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
     
     $ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :)
     
     # Assemble name, attach web page link if present.
     $name = $data->{cn}->[0]." ".$data->{mn}->[0]." ".$data->{sn}->[0];
-    if (my $url = $data->{labeledurl}->[0]) {
+    if (my $url = $data->{labeleduri}->[0]) {
       $name = "<a href=\"$url\">$name</a>";
     }
     
@@ -134,7 +136,7 @@ if (!$dosearch) {
 
     # ICQ 
     if ($data->{icquin}->[0]) {
-      $icquin = sprintf("<a href=\"http://wwp.icq.com/?icqnumber=%s\">%s</a>", $data->{icquin}->[0], $data->{icquin}->[0]);
+      $icquin = sprintf("<a href=\"http://wwp.icq.com/%s\">%s</a>", $data->{icquin}->[0], $data->{icquin}->[0]);
     }
     
     # Format PGP/GPG key fingerprints
@@ -166,8 +168,8 @@ if (!$dosearch) {
     $login = $data->{uid}->[0]."\@debian.org";
     $login = "<a href=\"mailto:$login\">$login</a>";
     
-    # See if the user has a vacation message
-    $vacation = $data->{onvacation}->[0];
+    # See if the user has a vacation message, non-public
+    $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%">';
@@ -180,6 +182,7 @@ 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);
     if ($icquin) {