Merge branch 'patch-rescue' into 'develop'

Patch rescue

See merge request ispconfig/ispconfig3!1132

Author: Till Brehm

interface/lib/classes/auth.inc.php

@@ -198,6 +198,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/remote.d/mail.inc.php

@@ -222,8 +222,8 @@ public function mail_user_add($session_id, $client_id, $params){
 		if (!isset($params['gid'])) $params['gid'] = -1;
 		if (!isset($params['maildir_format'])) $params['maildir_format'] = 'maildir';
 
-		$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
-		return $affected_rows;
+		$mailuser_id = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
+		return $mailuser_id;
 	}
 
 	//* Update mail user

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/dashboard/dashlets/databasequota.php

@@ -11,6 +11,11 @@ function show() {
                        return;
                }
 
+		$modules = $_SESSION['s']['user']['modules'];
+		if (!in_array($modules, 'sites')) {
+			return '';
+		}
+
 		$tpl = new tpl;
 		$tpl->newTemplate("dashlets/templates/databasequota.htm");
 

interface/web/dashboard/dashlets/quota.php

@@ -11,6 +11,11 @@ function show() {
 				return;
 		}
 
+		$modules = $_SESSION['s']['user']['modules'];
+		if (!in_array($modules, 'sites')) {
+			return '';
+		}
+
 		$tpl = new tpl;
 		$tpl->newTemplate("dashlets/templates/quota.htm");
 

interface/web/login/password_reset.php

@@ -126,8 +126,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);

interface/web/tools/lib/lang/nl_index.lng

@@ -1,4 +1,4 @@
 <?php
 $wb['page_head_txt'] = 'ISPConfig Tools';
-$wb['page_desc_txt'] = 'Change user settings';
+$wb['page_desc_txt'] = 'Gebruikersinstellingen';
 ?>

remoting_client/examples/mail_user_add.php

@@ -43,9 +43,9 @@
 		'disablesmtp' => 'n'
 	);
 
-	$affected_rows = $client->mail_user_add($session_id, $client_id, $params);
+	$mailuser_id = $client->mail_user_add($session_id, $client_id, $params);
 
-	echo "New user: ".$affected_rows."<br>";
+	echo "New user: ".$mailuser_id."<br>";
 
 	if($client->logout($session_id)) {
 		echo 'Logged out.<br />';

remoting_client/readme

@@ -3,12 +3,12 @@
 - Remote API example files
 --------------------------------------------------------
 
-The examples folder contains a example script for every 
-Remote api function. The login details and URL for the
+The examples folder contains an example script for every
+remote api function. The login details and URL for the
 remote connection are defined in the file soap_config.php
 
 --------------------------------------------------------
 - Remote API documentation
 --------------------------------------------------------
 
-The startpage of the API documentation is main.html
+The startpage of the API documentation is API-docs/index.html