Fixes #3753 Removed method related code from password recovery

html/class_passwordRecovery.inc

@@ -29,7 +29,6 @@ class passwordRecovery {
   var $uid;
   var $message = array();
   var $email_address;
-  var $method;
   var $directory;
 
   var $step = 1;
@@ -119,20 +118,6 @@ class passwordRecovery {
 
     $ssl = $this->checkForSSL();
 
-    /* Check for selected password method */
-    $this->method = $this->config->get_cfg_value("passwordDefaultHash", "ssha");
-    if (isset($_GET['method'])) {
-      $this->method = validate($_GET['method']);
-      $tmp = new passwordMethod($this->config);
-      $available = $tmp->get_available_methods();
-      if (!isset($available[$this->method])) {
-        msg_dialog::display(_("Password method"),
-                            _("Error: Password method not available!"),
-                            FATAL_ERROR_DIALOG);
-        exit();
-      }
-    }
-
     if (isset($_GET['email_address']) && $_GET['email_address'] != "") {
       $this->email_address = validate($_GET['email_address']);
       $smarty->assign('email_address', $this->email_address);
@@ -292,7 +277,6 @@ class passwordRecovery {
     $smarty->assign('params', "");
     $smarty->assign('message', "");
     $smarty->assign('changed', FALSE);
-    $smarty->assign('other_method', FALSE);
   }
 
   static function generateRandomHash()
@@ -456,7 +440,6 @@ class passwordRecovery {
   /* find the uid of for the given email address */
   function step2()
   {
-    /* Ask for the method */
     if ($_POST['email_address'] == "") {
       $this->message[] = msgPool::required(_("Email address"));
       return;
@@ -491,7 +474,7 @@ class passwordRecovery {
     $smarty->assign('uid', $this->uid);
     $smarty->assign('email_address', $this->email_address);
     $this->step = 2;
-    $params = $this->encodeParams(array('uid', 'method', 'directory', 'email_address'));
+    $params = $this->encodeParams(array('uid', 'directory', 'email_address'));
     $smarty->assign('params', $params);
   }
 
@@ -550,7 +533,7 @@ class passwordRecovery {
     $this->uniq = $uniq_id_from_mail;
     $this->step = 4;
     $smarty->assign('uid', $this->uid);
-    $params = $this->encodeParams(array('uid', 'method', 'directory', 'email_address', 'uniq'));
+    $params = $this->encodeParams(array('uid', 'directory', 'email_address', 'uniq'));
     $smarty->assign('params', $params);
 
     if (isset($_POST['change'])) {
@@ -581,7 +564,7 @@ class passwordRecovery {
         return;
       }
     }
-    if (!change_password($dn, $_POST['new_password'], 0, $this->method)) {
+    if (!change_password($dn, $_POST['new_password'])) {
       return;
     }
     fusiondirectory_log("User ".$this->uid." password has been changed");

ihtml/themes/default/recovery.tpl

@@ -35,9 +35,6 @@
     </p>
 
     <p class="infotext">
-      {if $other_method}
-        {t}Available methods{/t}
-      {/if}
       <ul>
         <li>{t}Receive by email a link that allows you to reset your password{/t} :
           <input type="submit" name="send"  value="{t}Send{/t}"
@@ -45,14 +42,6 @@
           <input type="hidden" id="email_address" maxlength="60" value="{$email_address}">
           <input type="hidden" id="uid" maxlength="60" value="{$uid}">
         </li>
-        {if $other_method}
-          <li>
-             Dummy recuperation method
-          </li>
-          <li>
-            <div style="color:red;">{t}If none of the above methods suits you, contact your administrator to change your password{/t}</div>
-          </li>
-        {/if}
       </ul>
     </p>
 {elseif $step==3}