Merge remote-tracking branch 'ispc/master'

Author: Marius Cramer

docs/Remote_API_docs.txt

@@ -1,3 +1,3 @@
 
 
-The remote API documentation is in the remote_client/API-docs subfolder.
+The remote API documentation is in the remoting_client/API-docs subfolder.

install/lib/installer_base.lib.php

@@ -498,6 +498,13 @@ public function grant_master_database_rights($verbose = false) {
 					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
 				}
 
+				$query = "GRANT SELECT, INSERT, DELETE ON ".$value['db'].".`mail_backup` TO '".$value['user']."'@'".$host."' ";
+				if ($verbose){
+					echo $query ."\n";
+				}
+				if(!$this->dbmaster->query($query)) {
+					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
+				}
 			}
 
 			/*

install/lib/update.lib.php

@@ -160,13 +160,15 @@ function updateDbAndIni() {
 
 		//* get the version of the db schema from the server table
 		$found = true;
+		$dev_patch = false;
 		while($found == true) {
-			$next_db_version = intval($current_db_version + 1);
+			if($dev_patch == true) $next_db_version = 'dev_collection';
+			else $next_db_version = intval($current_db_version + 1);
 			$sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
 			$php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
 
 			// comma separated list of version numbers were a update has to be done silently
-			$silent_update_versions = '75';
+			$silent_update_versions = 'dev_collection,75';
 
 			if(is_file($sql_patch_filename)) {
 
@@ -204,8 +206,12 @@ function updateDbAndIni() {
 					$php_patch->onAfterSQL();
 				}
 
-				$current_db_version = $next_db_version;
+				if($dev_patch == false) $current_db_version = $next_db_version;
+				else $found = false;
+				
 				if(isset($php_patch)) unset($php_patch);
+			} elseif($dev_patch == false) {
+				$dev_patch = true;
 			} else {
 				$found = false;
 			}

install/sql/incremental/upd_dev_collection.sql

@@ -0,0 +1,10 @@
+ALTER TABLE `mail_user`
+	CHANGE `uid` `uid` int(11) NOT NULL DEFAULT '5000',
+	CHANGE `gid` `gid` int(11) NOT NULL DEFAULT '5000';
+
+ALTER TABLE `client_template` ADD `default_mailserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_webserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_dnsserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE `client_template` ADD `default_dbserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE  `client` ADD  `contact_firstname` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER  `gender`;

install/sql/ispconfig3.sql

@@ -146,6 +146,7 @@ CREATE TABLE `client` (
   `company_name` varchar(64) DEFAULT NULL,
   `company_id` varchar(255) DEFAULT NULL,
   `gender` enum('','m','f') NOT NULL DEFAULT '',
+  `contact_firstname` varchar( 64 ) NOT NULL DEFAULT '',
   `contact_name` varchar(64) DEFAULT NULL,
   `customer_no` varchar(64) DEFAULT NULL,
   `vat_id` varchar(64) DEFAULT NULL,
@@ -897,8 +898,8 @@ CREATE TABLE `mail_user` (
   `login` varchar(255) NOT NULL default '',
   `password` varchar(255) NOT NULL default '',
   `name` varchar(255) NOT NULL default '',
-  `uid` int(11) unsigned NOT NULL default '5000',
-  `gid` int(11) unsigned NOT NULL default '5000',
+  `uid` int(11) NOT NULL default '5000',
+  `gid` int(11) NOT NULL default '5000',
   `maildir` varchar(255) NOT NULL default '',
   `quota` bigint(20) NOT NULL default '-1',
   `cc` varchar(255) NOT NULL default '',

interface/lib/classes/auth.inc.php

@@ -50,7 +50,7 @@ public function has_clients($userid) {
 
 		$userid = $app->functions->intval($userid);
 		$client = $app->db->queryOneRecord("SELECT client.limit_client FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
-		if($client['limit_client'] > 0) {
+		if($client['limit_client'] != 0) {
 			return true;
 		} else {
 			return false;

interface/lib/classes/client_templates.inc.php

@@ -109,7 +109,7 @@ function apply_client_templates($clientId) {
 		$sql = "SELECT template_master, template_additional,limit_client FROM client WHERE client_id = " . $app->functions->intval($clientId);
 		$record = $app->db->queryOneRecord($sql);
 		$masterTemplateId = $record['template_master'];
-		$is_reseller = ($record['limit_client'] > 0)?true:false;
+		$is_reseller = ($record['limit_client'] != 0)?true:false;
 
 		if($record['template_additional'] != '') {
 			// we have to call the update_client_templates function
@@ -146,7 +146,7 @@ function apply_client_templates($clientId) {
 			if (is_array($addLimits)){
 				foreach($addLimits as $k => $v){
 					/* we can remove this condition, but it is easier to debug with it (don't add ids and other non-limit values) */
-					if (strpos($k, 'limit') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec'){
+					if (strpos($k, 'limit') !== false or strpos($k, 'default') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec'){
 						$app->log('Template processing key ' . $k . ' for client ' . $clientId, LOGLEVEL_DEBUG);
 
 						/* process the numerical limits */
@@ -160,6 +160,15 @@ function apply_client_templates($clientId) {
 								if ($limits[$k] < 1) $limits[$k] = 1;
 								break;
 
+							case 'default_mailserver':
+							case 'default_webserver':
+							case 'default_dnsserver':
+							case 'default_slave_dnsserver':
+							case 'default_dbserver':
+								/* additional templates don't override default server from main template */
+								if ($limits[$k] == 0) $limits[$k] = $v;
+								break;
+
 							default:
 								if ($limits[$k] > -1){
 									if ($v == -1){
@@ -225,7 +234,10 @@ function apply_client_templates($clientId) {
 		$update = '';
 		if(!$is_reseller) unset($limits['limit_client']); // Only Resellers may have limit_client set in template to ensure that we do not convert a client to reseller accidently.
 		foreach($limits as $k => $v){
-			if ((strpos($k, 'limit') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec') && !is_array($v)){
+			if (strpos($k, 'default') !== false and $v == 0) {
+				continue; // template doesn't define default server, client's default musn't be changed
+			}
+			if ((strpos($k, 'limit') !== false or strpos($k, 'default') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec') && !is_array($v)){
 				if ($update != '') $update .= ', ';
 				$update .= '`' . $k . "`='" . $v . "'";
 			}

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

@@ -182,6 +182,9 @@ public function client_update($session_id, $client_id, $reseller_id, $params)
 		$app->uses('remoting_lib');
 		$app->remoting_lib->loadFormDef('../client/form/' . (isset($params['limit_client']) && $params['limit_client'] > 0 ? 'reseller' : 'client') . '.tform.php');
 		$old_rec = $app->remoting_lib->getDataRecord($client_id);
+		
+		//* merge old record with params, so only new values have to be set in $params
+		$params = $app->functions->array_merge($old_rec,$params);
 
 		// we need the previuos templates assigned here
 		$this->oldTemplatesAssigned = $app->db->queryAllRecords('SELECT * FROM `client_template_assigned` WHERE `client_id` = ' . $client_id);

interface/lib/classes/remoting.inc.php

@@ -340,6 +340,10 @@ protected function updateQueryPrepare($formdef_file, $client_id, $primary_id, $p
 
 		//* Load the form definition
 		$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);
+		$params = $app->functions->array_merge($old_rec,$params);
 
 		//* Get the SQL query
 		$sql = $app->remoting_lib->getSQL($params, 'UPDATE', $primary_id);

interface/lib/classes/soap_handler.inc.php

@@ -49,7 +49,7 @@ public function __construct() {
 
 			$name = substr($f, 0, strpos($f, '.'));
 
-			include $dir . '/' . $f;
+			include_once $dir . '/' . $f;
 			$class_name = 'remoting_' . $name;
 			if(class_exists($class_name, false)) {
 				$this->classes[$class_name] = new $class_name();