alecpl
2009-10-06 ffeab7fe7e0ccf1d458d6a863600359c38769950
plugins/password/password.php
@@ -79,20 +79,36 @@
    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
    $confirm = $rcmail->config->get('password_confirm_current');
    $required_length = intval($rcmail->config->get('password_minimum_length'));
    $check_strength = $rcmail->config->get('password_require_nonalpha');
    if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) {
      $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
    }
    else {
      $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST);
      $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST);
      $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST);
      if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd)
      if ($conpwd != $newpwd) {
        $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error');
      }
      else if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd) {
        $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
      }
      else if ($required_length && strlen($newpwd) < $required_length) {
        $rcmail->output->command('display_message', $this->gettext(
     array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
      }
      else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
        $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
      }
      else if (!($res = $this->_save($curpwd,$newpwd))) {
        $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
        $_SESSION['password'] = $rcmail->encrypt($newpwd);
      } else
      }
      else
        $rcmail->output->command('display_message', $res, 'error');
    }