From: rmurray <> Date: Fri, 22 Dec 2006 07:58:50 +0000 (+0000) Subject: add support for some new fields and some output cleanups. X-Git-Tag: release-0.3.33~78 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=632ec5349cd7921ebb17a4693a27d36424e64d74 add support for some new fields and some output cleanups. --- diff --git a/debian/changelog b/debian/changelog index e261b8d..ea84574 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ userdir-ldap-cgi (0.3.8) unstable; urgency=low + Changes by Martin Schulze: * search.cgi - Added support for displaying the Jabber ID - Ignore the vacation request when the user hasn't logged in * update.cgi - Added support for updating the Jabber ID - -- + Changes by Ryan Murray: + - change charset to utf-8, as our LDAP schema is utf-8 + - Add support for gender, birthDate, and mailDisableMessage + - Other misc. output cleanups and fixes. + + -- Ryan Murray Fri, 22 Dec 2006 01:54:12 -0700 userdir-ldap-cgi (0.3.7) stable; urgency=low diff --git a/debian/rules b/debian/rules index 58b4264..25ca05b 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,7 @@ binary-indep: build install -m 755 *.cgi $(i)/var/www/userdir-ldap/ install -m 644 Util.pm $(i)/var/www/userdir-ldap/ - chown www-data.www-data $(i)/var/cache/userdir-ldap/web-cookies/ + chown www-data:www-data $(i)/var/cache/userdir-ldap/web-cookies/ chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/web-cookies/ install -m 644 apache-config.txt $(i)/usr/share/doc/$(package) diff --git a/login.cgi b/login.cgi index 1e04ef4..6a32547 100755 --- a/login.cgi +++ b/login.cgi @@ -1,7 +1,8 @@ #!/usr/bin/perl -# $Id: login.cgi,v 1.9 2006/06/27 04:37:45 rmurray Exp $ +# $Id: login.cgi,v 1.10 2006/12/22 08:58:50 rmurray Exp $ # (c) 1999 Randolph Chung. Licensed under the GPL. +# (c) 2006 Ryan Murray. Licensed under the GPL. use lib '.'; use strict; @@ -18,7 +19,7 @@ my $query = new CGI; my $proto = ($ENV{HTTPS} ? "https" : "http"); if ($proto eq "http" || !($query->param('username')) || !($query->param('password'))) { - print "Location: https://$ENV{SERVER_NAME}/$config{webloginurl}\n\n"; + print "Location: https://$ENV{SERVER_NAME}/$config{webloginhtml}\n\n"; exit; } diff --git a/search.cgi b/search.cgi index 2174d52..2a1a51e 100755 --- a/search.cgi +++ b/search.cgi @@ -1,8 +1,9 @@ #!/usr/bin/perl -# $Id: search.cgi,v 1.13 2006/06/27 04:37:45 rmurray Exp $ +# $Id: search.cgi,v 1.14 2006/12/22 08:58:50 rmurray Exp $ # (c) 1999 Randolph Chung. Licensed under the GPL. # (c) 2004 Martin Schulze. Licensed under the GPL. +# (c) 2006 Ryan Murray. Licensed under the GPL. use lib '.'; use strict vars; @@ -33,7 +34,7 @@ $SIG{__DIE__} = \&DieHandler; if (!$dosearch) { # No action yet, send back the search form... - print "Content-type: text/html; charset=utf-8\n\n"; + &Util::HTMLSendHeader; open (F, "<$config{websearchhtml}") || &Util::HTMLError($!); while () { s/~id~/$id/g; @@ -60,7 +61,7 @@ if (!$dosearch) { # go through %searchdata and pull out all the search criteria the user # specified... - my $filter = undef; + my $filter = "(objectclass=inetOrgPerson)"; foreach (keys(%searchdata)) { if ($query->param($searchdata{$_}{formname})) { if ($query->param($searchdata{$_}{fuzzy})) { @@ -114,11 +115,12 @@ if (!$dosearch) { # Format the output.... foreach $dn (sort {$entries->{$a}->{sn}->[0] <=> $entries->{$b}->{sn}->[0]} keys(%$entries)) { + my $ok = 0; $data = $entries->{$dn}; # These are local variables.. i have enough global vars as it is... my ($ufdn, $login, $name, $icquin, $jabberjid, $email, $fingerprint, - $address, $latlong, $vacation, $created, $modified, $lastseen) = undef; + $address, $latlong, $vacation, $created, $modified, $lastseen, $gender) = undef; $ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :) @@ -156,6 +158,19 @@ if (!$dosearch) { $latlong .= " / "; $latlong .= $data->{longitude}->[0] || "none"; + # Gender + if ($data->{gender}->[0]) { + if ($data->{gender}->[0] == 1) { + $gender = $dataspecref->{male}; + } elsif ($data->{gender}->[0] == 2) { + $gender = $dataspecref->{female}; + } else { + $gender = $dataspecref->{unspecified}; + } + } else { + $gender = $dataspecref->{unspecified}; + } + # Modified/created time. TODO: maybe add is the name of the creator/modifier $modified = &Util::FormatTimestamp($data->{modifytimestamp}->[0]); $created = &Util::FormatTimestamp($data->{createtimestamp}->[0]); @@ -165,8 +180,8 @@ if (!$dosearch) { $data->{"activity-from"}->[0]); # Link in the debian login id - $login = $data->{uid}->[0]."\@debian.org"; - $login = "$login"; + $login = $data->{uid}->[0]; + $login = "$login"; # See if the user has a vacation message, non-public $vacation = $data->{onvacation}->[0] if ($authtoken && $id); @@ -181,27 +196,36 @@ 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); + $outsub{searchresults} .= FormatEntry($dataspecref->{gender}, $gender); + if ($data->{ircnick}->[0]) { + $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]); + } + if ($data->{jabberjid}->[0]) { + $outsub{searchresults} .= FormatEntry($dataspecref->{jabberjid}, $data->{jabberjid}->[0]); + } if ($icquin) { $outsub{searchresults} .= FormatEntry($dataspecref->{icquin}, $icquin); } - + $outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]); + $outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint); + if ($data->{maildisablemessage}->[0]) { + $outsub{searchresults} .= FormatEntry($dataspecref->{maildisablemessage}, $data->{maildisablemessage}->[0]); + } + if ($auth) { # Some data should only be available to authorized users... if ($id eq $data->{uid}->[0]) { $outsub{searchresults} .= FormatEntry($dataspecref->{email}, $email); } + $outsub{searchresults} .= FormatEntry($dataspecref->{birthdate}, $data->{birthdate}->[0]); $outsub{searchresults} .= FormatEntry($dataspecref->{address}, $address); $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); } - $outsub{searchresults} .= FormatEntry($dataspecref->{created}, $created); - $outsub{searchresults} .= FormatEntry($dataspecref->{modified}, $modified); $outsub{searchresults} .= ""; diff --git a/update.cgi b/update.cgi index a8e7ba0..7dd776b 100755 --- a/update.cgi +++ b/update.cgi @@ -1,7 +1,8 @@ #!/usr/bin/perl -# $Id: update.cgi,v 1.11 2004/11/18 19:17:00 joey Exp $ +# $Id: update.cgi,v 1.12 2006/12/22 08:58:50 rmurray Exp $ # (c) 1999 Randolph Chung. Licensed under the GPL. +# (c) 2006 Ryan Murray. Licensed under the GPL. use lib '.'; use strict vars; @@ -21,8 +22,8 @@ my $authtoken = $query->param('authtoken'); my $password = &Util::CheckAuthToken($authtoken); my $editdn = $query->param('editdn'); -if (!($id && $password)) { - print "Location: $proto://$ENV{SERVER_NAME}/$config{webloginurl}\n\n"; +if ($proto eq "http" || !($id && $password)) { + print "Location: https://$ENV{SERVER_NAME}/$config{webloginhtml}\n\n"; exit; } @@ -43,7 +44,7 @@ $auth = ($mesg->code == LDAP_SUCCESS); if (!$auth) { $ldap->unbind; - &Util::HTMLError("You have not been authenticated. Please Login"); + &Util::HTMLError("You have not been authenticated. Please Login"); } # Authenticated.... @@ -70,6 +71,8 @@ if (!($query->param('doupdate'))) { $data{$_} = $entry->{$_}->[0]; } + $data{gender} = 9 if not $data{gender}; + # Now we have to fill in the rest that needs some processing... $data{id} = $id; $data{authtoken} = $authtoken; @@ -80,12 +83,23 @@ if (!($query->param('doupdate'))) { $data{email} = join(", ", @{$entry->{emailforward}}); + my $genderselect = ''; + # finally we can send output... my ($sub, $substr); &Util::HTMLSendHeader; open (F, "<$config{webupdatehtml}") || &Util::HTMLError($!); while () { s/~(.+?)~/$data{$1}/g; + s/<\?genderselect>/$genderselect/; print; } close F; @@ -115,7 +129,36 @@ if (!($query->param('doupdate'))) { $newstaddress = $query->param('staddress'); $newstaddress =~ s/\n/\$/m; + + my $gender = $query->param('gender'); + if ($gender != 1 && $gender != 2) { + $gender = 9; # unspecified + } + my ($bd_ok, $bd_yr, $bd_mo, $bd_day); + + if ($query->param('birthdate') =~ /^([1-9][0-9]{3})([01][0-9])([0-3][0-9])$/) { + $bd_yr = $1; $bd_mo = $2; $bd_day = $3; + if ($bd_yr > 1850 and $bd_mo > 0 and $bd_mo <= 12 and $bd_day > 0) { + if ($bd_mo == 2) { + if ($bd_day == 29 and ($bd_yr % 4 == 0 && ($bd_yr % 100 != 0 || $bd_yr % 400 == 0))) { + $bd_ok = 1; + } elsif ($bd_day <= 28) { + $bd_ok = 1; + } + } elsif ($bd_mo == 4 or $bd_mo == 6 or $bd_mo == 9 or $bd_mo == 11) { + if ($bd_day <= 30) { + $bd_ok = 1; + } + } else { + if ($bd_day <= 31) { + $bd_ok = 1; + } + } + } + } elsif (not defined($query->param('birthdate')) or $query->param('birthdate') =~ /^\s*$/) { + $bd_ok = 1; + } my ($lat, $long); ($lat, $long) = &Util::CheckLatLong($query->param('latitude'), $query->param('longitude')); @@ -136,12 +179,14 @@ if (!($query->param('doupdate'))) { &Util::LDAPUpdate($ldap, $editdn, 'jabberJID', $query->param('jabberjid')); &Util::LDAPUpdate($ldap, $editdn, 'labeledURI', $query->param('labeleduri')); &Util::LDAPUpdate($ldap, $editdn, 'onVacation', $query->param('onvacation')); + &Util::LDAPUpdate($ldap, $editdn, 'gender', $gender); + &Util::LDAPUpdate($ldap, $editdn, 'birthDate', $query->param('birthdate')) if $bd_ok; + &Util::LDAPUpdate($ldap, $editdn, 'mailDisableMessage', $query->param('maildisablemessage')); # when we are done, reload the page with the updated details. - my $url = "$proto://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id&authtoken=$authtoken&editdn="; + my $url = "https://$ENV{SERVER_NAME}/$config{webupdateurl}?id=$id&authtoken=$authtoken&editdn="; $url .= uri_escape($editdn, "\x00-\x40\x7f-\xff"); print "Location: $url\n\n"; } $ldap->unbind; -