X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=update.cgi;h=e6ba638e6f32019899d6b6db9aaebab41f02cd73;hp=d109bf77fb09013009c7a9ed44c725de1c077819;hb=3ebf6f8a1e6353a8fa332a3d6533051de98c5afb;hpb=b33011c65aeb65e4b06b127077d6a225f764d042

diff --git a/update.cgi b/update.cgi
index d109bf7..e6ba638 100755
--- a/update.cgi
+++ b/update.cgi
@@ -3,6 +3,7 @@
 # $Id: update.cgi,v 1.13 2006/12/28 02:44:02 rmurray Exp $
 # (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
 # (c) 2006 Ryan Murray. Licensed under the GPL. <rmurray@debian.org>
+# Copyright (c) 2008, 2011, 2012, 2014, 2015 Peter Palfrader
 
 use lib '.';
 use strict vars;
@@ -97,8 +98,6 @@ if (!($query->param('doupdate'))) {
     $data{$_} = CGI::escapeHTML($data{$_}) if defined $data{$_};
   }
 
-  $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;
@@ -132,15 +131,6 @@ if (!($query->param('doupdate'))) {
   
   $data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
 
-  my $genderselect = '<select name="gender">'
-		   . '<option value="9"'
-		   . ($data{gender} == 9 ? ' selected' : '')
-		   . '>unspecified'
-		   . '<option value="1"'
-		   . ($data{gender} == 1 ? ' selected' : '')
-		   . '>male<option value="2"'
-		   . ($data{gender} == 2 ? ' selected' : '')
-                   . '>female</select>';
   my $mailcontentselect = '<select name="mailcontentinspection">'
                         . '<option value="blackhole"'
                         . ($data{mailcontentinspectionaction} eq 'blackhole' ? ' selected' : '')
@@ -182,7 +172,7 @@ if (!($query->param('doupdate'))) {
     }
   };
   if ($confirmstring ne '') {
-    $confirmstring = "<br>To confirm your new sudo passwords send signed mail to changes\@db.debian.org with a signed body containing these lines:<br><pre>$confirmstring</pre>";
+    $confirmstring = "<br>To confirm your new sudo passwords send signed mail to changes\@$config{maildomain} with a signed body containing these lines:<br><pre>$confirmstring</pre>";
   }
 
   my $sudopasswordhosts = '<select name="newsudopass-host"> <option value="*">ALL';
@@ -200,7 +190,6 @@ if (!($query->param('doupdate'))) {
   open (F, "<$config{webupdatehtml}") || &Util::HTMLError($!);
   while (<F>) {
     s/~(.+?)~/$data{$1}/g;
-    s/<\?genderselect>/$genderselect/;
     s/<\?mailcontentselect>/$mailcontentselect/;
     s/<\?sudopassword>/$sudopassword/;
     s/<\?sudopasswordhosts>/$sudopasswordhosts/;
@@ -283,11 +272,6 @@ 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])$/) {
@@ -369,7 +353,7 @@ if (!($query->param('doupdate'))) {
   my %delete_uuids = map { s/^sudopassword-delete-//; $_ => 1} grep { $query->param($_) eq 'delete' } grep { /^sudopassword-delete-/ } $query->param;
   my @keepsudo;
   for my $entry (@{$entry->{'sudopassword'}}) {
-    my ($uuid, $status, $hosts, $crypted) = ($entry =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$/);
+    my ($uuid, $status, $hosts, $crypted) = ($entry =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}) (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*-]+) ([^ ]+)$/);
     next unless defined ($uuid);
     next if (defined $delete_uuids{$uuid});
     my %hosts = map { $_ => 1 } split(/,/, $hosts);
@@ -398,7 +382,6 @@ 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'));
   &Util::LDAPUpdate($ldap, $editdn, 'mailCallout', $callout);