Alan Lam 8 лет назад
Родитель
Сommit
a0872bd701

+ 1 - 0
controllers/register.php

@@ -36,6 +36,7 @@ try {
 		$user_address->postal_code = http::value("postal_code");
 
 		if(!Form::checkRecaptcha()) $form_exception->addError("reCAPTCHA check failed.");
+		if(!User::validatePassword($password)) $form_exception->addError("Password must be at least 6 characters in length and contain at least one lowercase, uppercase, number and special character.");
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");
 		if(empty($user->title)) $form_exception->addError("Title is required.");
 		if(empty($user->first_name)) $form_exception->addError("First name is required.");

+ 1 - 0
controllers/settings.php

@@ -34,6 +34,7 @@ if($submit) {
 		$user->bank_account_number = http::value("bank_account_number", "trim");
 		$user->paypal_email = http::value("paypal_email", "email");
 
+		if($password && !User::validatePassword($password)) $form_exception->addError("Password must be at least 6 characters in length and contain at least one lowercase, uppercase, number and special character.");
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");
 		if(empty($user->title)) $form_exception->addError("Title is required.");
 		if(empty($user->first_name)) $form_exception->addError("First name is required.");

+ 1 - 0
controllers/user_edit.php

@@ -33,6 +33,7 @@ if($submit) {
 		$user->phone = http::value("phone", "trim");
 		$user->gender = http::value("gender", "trim");
 
+		if($password && !User::validatePassword($password)) $form_exception->addError("Password must be at least 6 characters in length and contain at least one lowercase, uppercase, number and special character.");
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");
 		if(empty($user->title)) $form_exception->addError("Title is required.");
 		if(empty($user->first_name)) $form_exception->addError("First name is required.");

+ 11 - 0
engine/user.php

@@ -41,6 +41,17 @@ class User extends Model {
 		2 => "PayPal",
 	];
 
+	// Static methods
+	public static function validatePassword($password) {
+		$lowercase = preg_match("/[a-z]/", $password);
+		$uppercase = preg_match("/[A-Z]/", $password);
+		$number = preg_match("/[0-9]/", $password);
+		$special = preg_match("/[^0-9a-zA-Z]/", $password);
+		$length = strlen($password) >= 6;
+
+		return ($lowercase && $uppercase && $number && $special && $length);
+	}
+
 	// Object methods
 	public function canAdmin() {
 		return $this->level >= User::LEVEL_ADMIN;

+ 1 - 0
views/register.php

@@ -74,6 +74,7 @@
 					<label class="col-sm-4 col-form-label"  for="password">Password</label>
 					<div class="col-sm">
 						<input class="form-control" type="password" name="password" id="password" placeholder="Enter password" required />
+						<small class="text-muted form-text">At least 6 characters. Must contain at least one lowercase, uppercase, number and special character.</small>
 					</div>
 				</div>
 				<div class="row mb-1">

+ 1 - 0
views/settings.php

@@ -57,6 +57,7 @@
 					<label class="col-sm-4 col-form-label"  for="password">Password (if changing)</label>
 					<div class="col-sm">
 						<input class="form-control" type="password" name="password" id="password" placeholder="Enter password" />
+						<small class="text-muted form-text">At least 6 characters. Must contain at least one lowercase, uppercase, number and special character.</small>
 					</div>
 				</div>
 				<div class="row mb-1">

+ 1 - 0
views/user_edit_form.php

@@ -68,6 +68,7 @@
 					<label class="col-sm-4 col-form-label"  for="password">Password (if changing)</label>
 					<div class="col-sm">
 						<input class="form-control" type="password" name="password" id="password" placeholder="Enter password" />
+						<small class="text-muted form-text">At least 6 characters. Must contain at least one lowercase, uppercase, number and special character.</small>
 					</div>
 				</div>
 				<div class="row mb-1">