Merge branch 'patch-1' into 'master'

Various minor code cleanups

See merge request ispconfig/ispconfig3!820

Author: Till Brehm

install/tpl/debian_postfix.conf.master

@@ -14,7 +14,7 @@ smtpd_sasl_auth_enable = yes
 broken_sasl_auth_clients = yes
 smtpd_sasl_authenticated_header = yes
 smtpd_restriction_classes = greylisting
-greylisting = check_policy_service inet:127.0.0.1:10023 
+greylisting = check_policy_service inet:127.0.0.1:10023
 smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination{rbl_list}, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{greylisting}
 smtpd_use_tls = yes
 smtpd_tls_security_level = may

interface/lib/classes/remote.d/mail.inc.php

@@ -219,8 +219,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

remoting_client/examples/mail_user_add.php

@@ -42,9 +42,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/examples/soap-database-add.php

@@ -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

remoting_client/readme

@@ -37,7 +37,7 @@
 	$pid = trim(file_get_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock'));
 	if(preg_match('/^[0-9]+$/', $pid)) {
 		if(file_exists('/proc/' . $pid)) {
-			if($conf['log_priority'] <= LOGLEVEL_WARN) print @date('d.m.Y-H:i').' - WARNING - There is already an instance of server.php running with pid ' . $pid . '.' . "\n";
+			if($conf['log_priority'] <= LOGLEVEL_WARN) print @date('d.m.Y-H:i').' - WARNING - There is already an instance of cron.php running with pid ' . $pid . '.' . "\n";
 			exit;
 		}
 	}