diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master
index b7dbea6300a8cc251c64e2b2a2b4e25748f737b1..22a9484b13304b02279e35454179b00100bad882 100644
--- a/install/tpl/debian_postfix.conf.master
+++ b/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
diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
index 25bc1e8f3f64441f9700f14497fab5137a39d3d9..0a1f890b968742df8dd3874a66bc3393c79d59c9 100644
--- a/interface/lib/classes/remote.d/mail.inc.php
+++ b/interface/lib/classes/remote.d/mail.inc.php
@@ -219,8 +219,8 @@ class remoting_mail extends remoting {
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
diff --git a/remoting_client/examples/mail_user_add.php b/remoting_client/examples/mail_user_add.php
index 3b7d240eccea9805b43526959ed5298ed025cc86..26d942066b7dbb38ec2cd940b8cb521841284b34 100644
--- a/remoting_client/examples/mail_user_add.php
+++ b/remoting_client/examples/mail_user_add.php
@@ -42,9 +42,9 @@ try {
'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."
";
+ echo "New user: ".$mailuser_id."
";
if($client->logout($session_id)) {
echo 'Logged out.
';
diff --git a/remoting_client/examples/soap-database-add.php b/remoting_client/examples/soap-database-add.php
deleted file mode 100644
index 5ff7e4b79df4af0c913c40a8956b930694edd1b5..0000000000000000000000000000000000000000
--- a/remoting_client/examples/soap-database-add.php
+++ /dev/null
@@ -1,47 +0,0 @@
- $soap_location,
- 'uri' => $soap_uri));
-try {
- if($session_id = $client->login($username, $password)) {
- echo "Logged:".$session_id."
\n";
- }
-
- $database_type = 'mysql'; //Only mysql type avaliable more types coming soon.
- $database_name = 'yourdbname';
- $database_username = 'yourusername';
- $database_password = 'yourpassword';
- $database_charset = ''; // blank = db default, latin1 or utf8
- $database_remoteips = ''; //remote ip´s separated by commas
-
- $params = array(
- 'server_id' => 1,
- 'type' => $database_type,
- 'database_name' => $database_name,
- 'database_user' => $database_username,
- 'database_password' => $database_password,
- 'database_charset' => $database_charset,
- 'remote_access' => 'n', // n disabled - y enabled
- 'active' => 'y', // n disabled - y enabled
- 'remote_ips' => $database_remoteips
- );
-
- $client_id = 1;
- $database_id = $client->sites_database_add($session_id, $client_id, $params);
-
- if($client->logout($session_id)) {
- echo "Logout.
\n";
- }
-
-
-} catch (SoapFault $e) {
- die('Error: '.$e->getMessage());
-}
-
-?>
diff --git a/remoting_client/readme b/remoting_client/readme
index 1392888bc0e44213c4bde4a0a2cf13523fbfae2e..6e2ef10e6de7f57451712ffed331e5d3418f8adb 100644
--- a/remoting_client/readme
+++ b/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
diff --git a/server/cron.php b/server/cron.php
index 261abd983bc290d7b5f0821876d9f2fb2ae72711..23eeaa0235edbae15376217eab5dedbbfa0dfc4c 100644
--- a/server/cron.php
+++ b/server/cron.php
@@ -37,7 +37,7 @@ if (is_file($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock')) {
$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;
}
}