It's a utf-8 world

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

diff --git a/search.cgi b/search.cgi
index 79586f3..2174d52 100755 (executable)
--- a/search.cgi
+++ b/search.cgi
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 
-# $Id: search.cgi,v 1.9 2004/11/18 14:32:00 joey 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,7 +117,8 @@ 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 :)
     
@@ -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) {