Merge branch 'stable-3.1'

Author: Marius Burkard

install/tpl/server.ini.master

@@ -27,6 +27,7 @@ munin_url=
 munin_user=
 munin_password=
 monitor_system_updates=y
+migration_mode=n
 
 [mail]
 module=postfix_mysql

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

@@ -103,6 +103,34 @@ public function update_record_permissions($tablename, $index_field, $index_value
 		return $app->db->datalogUpdate( $tablename, $permissions, $index_field, $index_value ) ;
 	}
 
+	/**
+	 Set a value in the system configuration
+	 @param int session id
+	 @param int server id
+	 @param string  section of the config field in the server table. Could be 'web', 'dns', 'mail', 'dns', 'cron', etc
+	 @param string key of the option that you want to set
+	 @param string option value that you want to set
+	 */
+
+
+	public function system_config_set($session_id, $section, $key, $value) {
+			global $app;
+			if(!$this->checkPerm($session_id, 'system_config_set')) {
+				throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+				return false;
+			}
+			if ($section != '' && $key != '') {
+				$app->uses('remoting_lib,getconf,ini_parser');
+				$system_config_array = $app->getconf->get_global_config();
+				$system_config_array[$section][$key] = $value;
+				$system_config_str = $app->ini_parser->get_ini_string($system_config_array);
+				$app->db->datalogUpdate('sys_ini', array("config" => $system_config_str), 'sysini_id', 1);
+			} else {
+				throw new SoapFault('invalid_function_parameter', 'Invalid function parameter.');
+				return false;
+			}
+	}
+	
 
 }
 

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

@@ -142,6 +142,34 @@ public function server_get($session_id, $server_id = null, $section ='') {
 			}
 	}
 
+	/**
+	 Set a value in the server configuration
+	 @param int session id
+	 @param int server id
+	 @param string  section of the config field in the server table. Could be 'web', 'dns', 'mail', 'dns', 'cron', etc
+	 @param string key of the option that you want to set
+	 @param string option value that you want to set
+	 */
+
+
+	public function server_config_set($session_id, $server_id, $section, $key, $value) {
+			global $app;
+			if(!$this->checkPerm($session_id, 'server_config_set')) {
+				throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+				return false;
+			}
+			if (!empty($server_id) && $server_id > 0 && $section != '' && $key != '') {
+				$app->uses('remoting_lib,getconf,ini_parser');
+				$server_config_array = $app->getconf->get_server_config($server_id);
+				$server_config_array[$section][$key] = $value;
+				$server_config_str = $app->ini_parser->get_ini_string($server_config_array);
+				$app->db->datalogUpdate('server', array("config" => $server_config_str), 'server_id', $server_id);
+			} else {
+				throw new SoapFault('invalid_function_parameter', 'Invalid function parameter.');
+				return false;
+			}
+	}
+	
 	/**
 		Gets a list of all servers
 		@param int session_id

interface/web/admin/form/filesync.tform.php

@@ -391,6 +391,12 @@
 			'default' => 'y',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'migration_mode' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		//#################################
 		// ENDE Datatable fields
 		//#################################

interface/web/admin/form/server_config.tform.php

@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
 $wb['xmpp_port_bosh_txt'] = 'BOSH';
 $wb['backup_time_txt'] = 'Backup time';
 $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
 ?>

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

@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
 $wb['xmpp_port_bosh_txt'] = 'BOSH';
 $wb['backup_time_txt'] = 'Backup time';
 $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
 ?>

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

@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
 $wb['xmpp_port_bosh_txt'] = 'BOSH';
 $wb['backup_time_txt'] = 'Hora do backup';
 $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
 ?>

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

@@ -282,4 +282,5 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
 $wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
 $wb['backup_time_txt'] = 'Backup time';
 $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
 ?>

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

@@ -282,4 +282,5 @@ $wb['hostname_error_empty'] = 'Název hostitele je prázdný';
 $wb['hostname_error_regex'] = 'Neplatný název hostitele.';
 $wb['backup_time_txt'] = 'Spustit zálohovaní v';
 $wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
 ?>