Merge branch 'patch-min_password_length' into 'master'

Create a util function to remove duplication

See merge request ispconfig/ispconfig3!866

Author: Till Brehm

interface/lib/classes/auth.inc.php

@@ -188,6 +188,36 @@ public function check_security_permissions($permission) {
 
 	}
 
+	/**
+	 * Get the minimum password length.
+	 */
+	public function get_min_password_length() {
+		global $app;
+		$server_config_array = $app->getconf->get_global_config();
+		$min_password_length = 8;
+		if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
+		return $min_password_length;
+	}
+
+	/**
+	 * Get the minimum password strength.
+	 */
+	public function get_min_password_strength() {
+		global $app;
+		$server_config_array = $app->getconf->get_global_config();
+		$min_password_strength = 0;
+		if(isset($server_config_array['misc']['min_password_strength'])) $min_password_strength = $server_config_array['misc']['min_password_strength'];;
+		return $min_password_strength;
+	}
+
+	/**
+	 * Generate a ranmdom password.
+	 *
+	 * @param int $minLength
+	 *   Minimum number of characters.
+	 * @param boolean $special
+	 *   Include special characters, like # and !
+	 */
 	public function get_random_password($minLength = 8, $special = false) {
 		if($minLength < 8) $minLength = 8;
 		$maxLength = $minLength + 5;

interface/lib/classes/validate_password.inc.php

@@ -111,10 +111,8 @@ function password_check($field_name, $field_value, $validator) {
 		$app->uses('ini_parser,getconf');
 		$server_config_array = $app->getconf->get_global_config();
 
-		$min_password_strength = 0;
-		$min_password_length = 5;
-		if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
-		if(isset($server_config_array['misc']['min_password_strength'])) $min_password_strength = $server_config_array['misc']['min_password_strength'];
+		$min_password_length = $app->auth->get_min_password_length();
+		$min_password_strength = $app->auth->get_min_password_strength();
 
 		if($min_password_strength > 0) {
 			$lng_text = $app->lng('weak_password_txt');

interface/web/login/password_reset.php

@@ -123,8 +123,7 @@
 	} elseif ($continue) {
 		if($client['client_id'] > 0) {
 			$server_config_array = $app->getconf->get_global_config();
-			$min_password_length = 8;
-			if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
+			$min_password_length = $app->auth->get_min_password_length();
 
 			$new_password = $app->auth->get_random_password($min_password_length, true);
 			$new_password_encrypted = $app->auth->crypt_password($new_password);