How one identifies is not relevant to their work in Debian: remove gender attribute...

diff --git a/debian/changelog b/debian/changelog
index 5449024..406297d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ userdir-ldap-cgi (0.3.41) UNRELEASED; urgency=medium
 
   * Remove html/domains.tab from the source, it's autogenerated at
     build time.
+  * remove gender attribute from ud-ldap: How one identifies is not relevant
+    to their work in Debian.
 
  -- Peter Palfrader <weasel@debian.org>  Sun, 04 Nov 2018 13:13:10 +0100
 

diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index 5701e09..468fbe1 100644 (file)
--- a/html/doc-mail.wml
+++ b/html/doc-mail.wml
@@ -67,8 +67,7 @@ be changed are:
 <b>mailContentInspectionAction</b> (markup|blackhole|reject)
 <b>mailDefaultOptions</b> (TRUE|FALSE),
 <b>bATVToken</b>,
-<b>VoIP</b>,
-and <b>gender</b> (1|2|9|male|female|unspecified).
+and <b>VoIP</b
 
 <li>A line of the form <tt>'del field'</tt> will completly remove all
 occurrences of a field. Useful e.g. to unset your vacation status.

diff --git a/html/searchresults.wml b/html/searchresults.wml
index b539de7..379368e 100644 (file)
--- a/html/searchresults.wml
+++ b/html/searchresults.wml
@@ -30,7 +30,6 @@
 (Phone, phone)
 (Fax, fax)
 (Last seen, lastseen)
-(Gender, gender)
 (Date of birth, birthdate)
 (Mail disabled, maildisablemessage)
 (male, male)

diff --git a/html/update.wml b/html/update.wml
index d219fa7..afe4b53 100644 (file)
--- a/html/update.wml
+++ b/html/update.wml
@@ -16,11 +16,6 @@
     <b>Name:</b></td><td>~cn~ ~mn~ ~sn~
   </td></tr>
 
-  <tr><td class=right>
-    <b>Gender:</b></td><td>
-    <?genderselect>
-  </td></tr>
-
   <tr><td class=right>
     <b>Date of Birth (YYYYMMDD):</b></td><td>
     <input size=8 name=birthdate value="~birthdate~" maxlength=8>

diff --git a/search.cgi b/search.cgi
index f170025..bbdec50 100755 (executable)
--- a/search.cgi
+++ b/search.cgi
@@ -129,7 +129,7 @@ if (!$dosearch) {
     my $ok = 0;
     # These are local variables.. i have enough global vars as it is... <sigh>
     my ($ufdn, $login, $name, $icquin, $jabberjid, $email, $fingerprint,
-       $address, $latlong, $vacation, $created, $modified, $lastseen, $gender) = undef;
+       $address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
 
     # Last seen information (Echelon)
     $lastseen = &Util::FormatLastSeen($entries->{$dn}->{"activity-pgp"}->[0],
@@ -176,19 +176,6 @@ 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]);
@@ -210,7 +197,6 @@ if (!$dosearch) {
     }
 
     $outsub{searchresults} .= FormatEntry($dataspecref->{uid}, $login);
-    $outsub{searchresults} .= FormatEntry($dataspecref->{gender}, $gender);
     if ($data->{ircnick}->[0]) {
       $outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]);
     }

diff --git a/update.cgi b/update.cgi
index e526026..e6ba638 100755 (executable)
--- a/update.cgi
+++ b/update.cgi
@@ -98,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;
@@ -133,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' : '')
@@ -201,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/;
@@ -284,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])$/) {
@@ -399,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);