#!/usr/bin/perl
-# $Id: search.cgi,v 1.7 2002/10/06 18:13:00 rmurray 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;
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;
}
}
- # 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)";
$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>";
}
$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%">';
$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) {