diff --git a/includes/users/Member.inc.php b/includes/users/Member.inc.php index 0b71042..36c07d0 100644 --- a/includes/users/Member.inc.php +++ b/includes/users/Member.inc.php @@ -253,11 +253,11 @@ class Member { * * @param string $fullName * @param Right $rights - * @param string $password + * @param string $new_password * @param number $birthday * @param string $mail */ - public function setInformations($fullName, array $rights, $password, $birthday, $mail) { + public function setInformations($fullName, array $rights, $new_password, $birthday, $mail) { $fullName = InputSanitizer::Sanitize($fullName); $birthday = InputSanitizer::Number($birthday); @@ -267,8 +267,8 @@ class Member { $this->fullname = $fullName; $this->mail = $mail; - if ($password) { - $passwordHash = hash("sha512", $password); + if (strlen($new_password) > 4) { + $passwordHash = hash("sha512", $new_password); } else { $passwordHash = "disabled"; } diff --git a/includes/utils/InputSanitizer.inc.php b/includes/utils/InputSanitizer.inc.php index 33baec0..5acd2f2 100644 --- a/includes/utils/InputSanitizer.inc.php +++ b/includes/utils/InputSanitizer.inc.php @@ -29,6 +29,7 @@ class InputSanitizer { */ public static function Username($input) { $input = preg_replace("/[^a-z]+/i", "", $input); + $input = strtolower($input); return $input; } diff --git a/nbproject/private/configs/Production.properties b/nbproject/private/configs/Production.properties index 49d095a..39bb256 100644 --- a/nbproject/private/configs/Production.properties +++ b/nbproject/private/configs/Production.properties @@ -1,5 +1,5 @@ -remote.connection=Cransmontana.ch -remote.directory= +remote.connection=accm +remote.directory=/httpdocs remote.upload.directly=true run.as=REMOTE url=http://www.accransmontana.ch/ diff --git a/pages/UserAdministrationPage.inc.php b/pages/UserAdministrationPage.inc.php index 8837ae4..0ef40cb 100644 --- a/pages/UserAdministrationPage.inc.php +++ b/pages/UserAdministrationPage.inc.php @@ -195,10 +195,6 @@ FORM; $password = ""; } - if (!$password && $user) { - $password = $user->getPassword(); - } - if (!$user) { $user = Member::Create($fullName, $username, $password, $birthday, $mail, $memberRightsArray); } else {