Merge branch 'stable-3.1'

Author: Marius Burkard

install/tpl/README.md

@@ -0,0 +1,4 @@
+Overriding templates
+--------------------
+
+Manually altered versions have to be put into `server/conf-custom/install/`, e.g. `/usr/local/ispconfig/server/conf-custom/install/`

interface/lib/classes/quota_lib.inc.php

@@ -54,19 +54,19 @@ public function get_quota_data($clientid = null, $readable = true) {
 					if($used_ratio >= 1) $sites[$i]['display_colour'] = '#cc0000';
 
 					if($sites[$i]['used'] > 1024) {
-						$sites[$i]['used'] = round($sites[$i]['used'] / 1024, 2).' MB';
+						$sites[$i]['used'] = round($sites[$i]['used'] / 1024, 1).' MB';
 					} else {
 						if ($sites[$i]['used'] != '') $sites[$i]['used'] .= ' KB';
 					}
 
 					if($sites[$i]['soft'] > 1024) {
-						$sites[$i]['soft'] = round($sites[$i]['soft'] / 1024, 2).' MB';
+						$sites[$i]['soft'] = round($sites[$i]['soft'] / 1024, 1).' MB';
 					} else {
 						$sites[$i]['soft'] .= ' KB';
 					}
 
 					if($sites[$i]['hard'] > 1024) {
-						$sites[$i]['hard'] = round($sites[$i]['hard'] / 1024, 2).' MB';
+						$sites[$i]['hard'] = round($sites[$i]['hard'] / 1024, 1).' MB';
 					} else {
 						$sites[$i]['hard'] .= ' KB';
 					}
@@ -268,14 +268,14 @@ public function get_mailquota_data($clientid = null, $readable = true) {
 					if($emails[$i]['quota'] == 0){
 						$emails[$i]['quota'] = $app->lng('unlimited');
 					} else {
-						$emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 4).' MB';
+                                               $emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 1).' MB';
 					}
 
 
 					if($emails[$i]['used'] < 1544000) {
-						$emails[$i]['used'] = round($emails[$i]['used'] / 1024, 4).' KB';
+                                               $emails[$i]['used'] = round($emails[$i]['used'] / 1024, 1).' KB';
 					} else {
-						$emails[$i]['used'] = round($emails[$i]['used'] / 1048576, 4).' MB';
+                                               $emails[$i]['used'] = round($emails[$i]['used'] / 1048576, 1).' MB';
 					}
 				}
 			}
@@ -334,9 +334,9 @@ public function get_databasequota_data($clientid = null, $readable = true) {
 
 
 					if($databases[$i]['used'] < 1544000) {
-						$databases[$i]['used'] = round($databases[$i]['used'] / 1024, 4).' KB';
+						$databases[$i]['used'] = round($databases[$i]['used'] / 1024, 1).' KB';
 					} else {
-						$databases[$i]['used'] = round($databases[$i]['used'] / 1048576, 4).' MB';
+						$databases[$i]['used'] = round($databases[$i]['used'] / 1048576, 1).' MB';
 					}
 				}
 			}

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

@@ -65,6 +65,16 @@ public function domains_domain_add($session_id, $client_id, $params)
 		return $this->insertQuery('../client/form/domain.tform.php', $client_id, $params);
 	}
 
+	//* Update a record
+	public function domains_domain_update($session_id, $client_id, $primary_id, $params)
+	{
+		if(!$this->checkPerm($session_id, 'domains_domain_update')) {
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		return $this->updateQuery('../client/form/domain.tform.php', $client_id, $primary_id, $params);
+	}
+
 	//* Delete a record
 	public function domains_domain_delete($session_id, $primary_id)
 	{

interface/lib/classes/remoting.inc.php

@@ -407,7 +407,7 @@ protected function updateQueryPrepare($formdef_file, $client_id, $primary_id, $p
 		$app->remoting_lib->loadFormDef($formdef_file);
 
 		//* get old record and merge with params, so only new values have to be set in $params
-		$old_rec = $app->remoting_lib->getDataRecord($primary_id);
+               $old_rec = $app->remoting_lib->getDataRecord($primary_id, $client_id);
 
 		foreach ($app->remoting_lib->formDef['fields'] as $fieldName => $fieldConf)
         {

interface/lib/classes/remoting_lib.inc.php

@@ -225,10 +225,10 @@ function getDeleteSQL($primary_id) {
 		return $sql;
 	}
 
-	function getDataRecord($primary_id) {
+       function getDataRecord($primary_id, $client_id = 0) {
 		global $app;
 		$escape = '`';
-		$this->loadUserProfile();
+               $this->loadUserProfile($client_id);
 		if(@is_numeric($primary_id)) {
 			if($primary_id > 0) {
 				// Return a single record

interface/lib/classes/tform_base.inc.php

@@ -1453,7 +1453,7 @@ protected function _getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $
 		} else {
 			if($this->formDef['auth'] == 'yes') {
 				if($primary_id != 0) {
-					if($api == true && $_SESSION["s"]["user"]["client_id"] > 0 && $_SESSION["s"]["user"]["iserid"] > 0 && $_SESSION["s"]["user"]["default_group"] > 0) {
+					if($api == true && $_SESSION["s"]["user"]["client_id"] > 0 && $_SESSION["s"]["user"]["userid"] > 0 && $_SESSION["s"]["user"]["default_group"] > 0) {
 						$sql_update .= '`sys_userid` = '.$this->sys_userid.', ';
 						$sql_update .= '`sys_groupid` = '.$this->sys_default_group.', ';
 					}

interface/lib/classes/validate_autoresponder.inc.php

@@ -52,8 +52,9 @@ function end_date($field_name, $field_value, $validator)
 		//$start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
 
 		// Parse date
-		$start_date_array = date_parse_from_format($app->lng('conf_format_datetime'),$start_date);
-		$end_date_array = date_parse_from_format($app->lng('conf_format_datetime'),$field_value);
+		$datetimeformat = (isset($app->remoting_lib) ? $app->remoting_lib->datetimeformat : $app->tform->datetimeformat);
+		$start_date_array = date_parse_from_format($datetimeformat,$start_date);
+		$end_date_array = date_parse_from_format($datetimeformat,$field_value);
 
 		//calculate timestamps
 		$start_date_tstamp = mktime($start_date_array['hour'], $start_date_array['minute'], $start_date_array['second'], $start_date_array['month'], $start_date_array['day'], $start_date_array['year']);

interface/web/admin/language_edit.php

@@ -49,7 +49,7 @@
 
 if(!preg_match("/^[a-z]+$/i", $lang)) die('unallowed characters in language name.');
 if(!preg_match("/^[a-z_]+$/i", $module)) die('unallowed characters in module name.');
-if(!preg_match("/^[a-z\._]+$/i", $lang_file)) die('unallowed characters in language file name.');
+if(!preg_match("/^[a-z\._]+$/i", $lang_file) || strpos($lang_file,'..') !== false || substr($lang_file,-4) != '.lng') die('unallowed characters in language file name.');
 
 $msg = '';
 

interface/web/admin/lib/lang/ar_server_config.lng

@@ -293,4 +293,5 @@ $wb['log_retention_txt'] = 'Log retention (days)';
 $wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0';
 $wb['php_default_name_txt'] = 'Description Default PHP-Version';
 $wb['php_default_name_error_empty'] = 'Description Default PHP-Version must not be empty';
+$wb['error_mailbox_message_size_txt'] = 'Mailbox size must be larger or equal to message size';
 ?>

interface/web/admin/lib/lang/bg_server_config.lng

@@ -293,4 +293,5 @@ $wb['log_retention_txt'] = 'Log retention (days)';
 $wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0';
 $wb['php_default_name_txt'] = 'Description Default PHP-Version';
 $wb['php_default_name_error_empty'] = 'Description Default PHP-Version must not be empty';
+$wb['error_mailbox_message_size_txt'] = 'Mailbox size must be larger or equal to message size';
 ?>