add voippasswords

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/html/searchform.wml b/html/searchform.wml
index 43c3436..c6e98d1 100644 (file)
--- a/html/searchform.wml
+++ b/html/searchform.wml
@@ -34,7 +34,7 @@
       close (DOMAINS);
     }
     foreach (sort keys %domain) {
       close (DOMAINS);
     }
     foreach (sort keys %domain) {

-      printf "    <option value=%s>%s\n", lc($domain{$_}), encode_entities($_);
+      printf "    <option value=%s>%s\n", lc($domain{$_}), $_

     }
 :>
 </select>
     }
 :>
 </select>

diff --git a/html/update.wml b/html/update.wml
index 9d7e9e8..b5ca5a4 100644 (file)
--- a/html/update.wml
+++ b/html/update.wml
@@ -61,7 +61,7 @@
       close (DOMAINS);
     }
     foreach (sort keys %domain) {
       close (DOMAINS);
     }
     foreach (sort keys %domain) {

-      printf "    <option value=%s>%s\n", lc($domain{$_}), encode_entities($_);
+      printf "    <option value=%s>%s\n", lc($domain{$_}), $_;

     }
 :>
     </select>
     }
 :>
     </select>


@@ -196,6 +196,13 @@
     <input size=30 name=newwebpassvrfy type=password>
   </td></tr>
 
     <input size=30 name=newwebpassvrfy type=password>
   </td></tr>
 

+  <tr><td class=right>
+    <b>Change voip password:</b><br><font size="-1">(re-enter to verify)</font>
+  </td><td>
+    <input size=30 name=newvoippass type=password><br>
+    <input size=30 name=newvoippassvrfy type=password>
+  </td></tr>
+

   <tr><td class="left" colspan=2>
     <b>sudo passwords:</b><br>
     <table border=2>
   <tr><td class="left" colspan=2>
     <b>sudo passwords:</b><br>
     <table border=2>

diff --git a/update.cgi b/update.cgi
index 5a59a34..3663169 100755 (executable)
--- a/update.cgi
+++ b/update.cgi
@@ -207,7 +207,7 @@ if (!($query->param('doupdate'))) {
 
 
   # Actually update stuff...
 
 
   # Actually update stuff...

-  my ($newpassword, $newstaddress, $newwebpassword);
+  my ($newpassword, $newstaddress, $newwebpassword, $newvoippassword);

   
   # Good god, why would we want to do that here?  it breaks password setting
   # etc, and it doesn't prevent people from setting eveil stuff in ldap
   
   # Good god, why would we want to do that here?  it breaks password setting
   # etc, and it doesn't prevent people from setting eveil stuff in ldap


@@ -253,6 +253,21 @@ if (!($query->param('doupdate'))) {
     
     &Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
   }  
     
     &Util::LDAPUpdate($ldap, $editdn, 'webPassword', $newwebpassword);
   }  

+  if ($query->param('newvoippass') && $query->param('newvoippassvrfy')) {
+    if ($query->param('newvoippass') ne $query->param('newvoippassvrfy')) {
+      # passwords don't match...
+      &Util::HTMLError("The voip-passwords you specified do not match. Please go back and try again.");
+    }
+
+    my ($r, $msg) = &Util::checkPasswordQuality($query->param('newvoippass'), undef, [@ldapinfo_for_pwcheck]);
+    if ($r) {
+      &Util::HTMLError("Password check failed for voip-password: $msg.  Please go back and try again.");
+    }
+    # create a md5 crypted password
+    $newvoippassword = '{crypt}'.crypt($query->param('newpass'), &Util::CreateCryptSalt(1));
+
+    &Util::LDAPUpdate($ldap, $editdn, 'voipPassword', $newvoippassword);
+  }  

 
   $newstaddress = $query->param('staddress');
   $newstaddress =~ s/\n/\$/m;
 
   $newstaddress = $query->param('staddress');
   $newstaddress =~ s/\n/\$/m;