- fixed some syntax errors from previous commit

Marius Cramer · Marius Cramer · commit a6e3ae8120a0 · 2015-04-14T19:01:12.000+02:00
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -1099,9 +1099,9 @@ public function install_ispconfig()
 		$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
 		$sql = "UPDATE `server` SET mail_server = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, vserver_server = ? WHERE server_id = ?";
 
-		$this->db->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']););
+		$this->db->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']);
 		if($conf['mysql']['master_slave_setup'] == 'y') {
-			$this->dbmaster->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']););
+			$this->dbmaster->query($sql, $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $conf['server_id']);
 		}
 
 		// chown install dir to root and chmod 755
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
@@ -70,7 +70,7 @@ function slave_dns_servers($field, $record) {
 			// Get the limits of the client
 			$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
 			$client = $app->db->queryOneRecord("SELECT default_slave_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ", $client_group_id);
-			$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?");
+			$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
 		} else {
 			$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name";
 		}
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
@@ -629,7 +629,7 @@ public function datalogInsert($tablename, $insert_data, $index_field) {
 			$params = array($tablename);
 			$v_params = array();
 			foreach($insert_data as $key => $val) {
-				$key_str .= '??,'
+				$key_str .= '??,';
 				$params[] = $key;
 				
 				$val_str .= '?,';
diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
@@ -370,7 +370,7 @@ public function mail_user_backup($session_id, $primary_id, $action_type)
 		}
 	
 		//* Save the record
-		if ($app->db->query("INSERT INTO `sys_remoteaction` SET `server_id` = ?, `tstamp` = ?, `action_type` = ?, `action_param` = ?, `action_state` = ?"), $server_id, $tstamp, $action_type, $primary_id, $action_state) {
+		if ($app->db->query("INSERT INTO `sys_remoteaction` SET `server_id` = ?, `tstamp` = ?, `action_type` = ?, `action_param` = ?, `action_state` = ?", $server_id, $tstamp, $action_type, $primary_id, $action_state)) {
 			return true;
 		} else {
 			return false;
diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
@@ -190,7 +190,7 @@ function _check_unique($domain_name, $only_domain = false) {
 		if($only_domain == false) {
 			$qrystr = "SELECT d.domain_id, IF(d.parent_domain_id != 0 AND p.domain_id IS NOT NULL, p.ip_address, d.ip_address) as `ip_address`, IF(d.parent_domain_id != 0 AND p.domain_id IS NOT NULL, p.ipv6_address, d.ipv6_address) as `ipv6_address` FROM `web_domain` as d LEFT JOIN `web_domain` as p ON (p.domain_id = d.parent_domain_id) WHERE (CONCAT(d.subdomain, '.', d.domain)= ?" . $additional_sql2 . ") AND d.server_id = ? AND d.domain_id != ?" . ($primary_id ? " AND d.parent_domain_id != ?" : "");
 			$params = array($domain_name) + $domain_params + array($domain['server_id'], $primary_id, $primary_id);
-			$checks = $app->db->queryAllRecords($qrystr, true $params);
+			$checks = $app->db->queryAllRecords($qrystr, true, $params);
 			if(is_array($checks) && !empty($checks)){
 				foreach($checks as $check){
 					if($domain['ip_address'] == '*') return false;
diff --git a/interface/lib/plugins/mail_mail_domain_plugin.inc.php b/interface/lib/plugins/mail_mail_domain_plugin.inc.php
@@ -37,7 +37,7 @@ function mail_mail_domain_edit($event_name, $page_form) {
 				$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = ?", $client_group_id);
 				$client_user_id = ($tmp['userid'] > 0)?$tmp['userid']:1;
 				$updates .= ", sys_userid = ?";
-				$update_params[] = $client_user_id
+				$update_params[] = $client_user_id;
 			}
 			$update_params[] = $page_form->id;
 			$app->db->query("UPDATE mail_domain SET " . $updates . " WHERE domain_id = ?", true, $update_params);
@@ -50,7 +50,7 @@ function mail_mail_domain_edit($event_name, $page_form) {
 				$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = ?", $client_group_id);
 				$client_user_id = ($tmp['userid'] > 0)?$tmp['userid']:1;
 				$updates .= ", sys_userid = ?";
-				$update_params[] = $client_user_id
+				$update_params[] = $client_user_id;
 			}
 			$update_params[] = $page_form->id;
 			$app->db->query("UPDATE mail_domain SET " . $updates . " WHERE domain_id = ?", true, $update_params);
diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php
@@ -149,7 +149,7 @@ function onSubmit() {
 	function onAfterInsert() {
 		global $app;
 
-		$domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"])));
+		$domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"]));
 		$app->db->query("update mail_forwarding SET sys_groupid = ? WHERE forwarding_id = ?", $domain['sys_groupid'], $this->id);
 
 	}
diff --git a/interface/web/mail/mail_domain_catchall_edit.php b/interface/web/mail/mail_domain_catchall_edit.php
@@ -127,7 +127,7 @@ function onSubmit() {
 	function onAfterInsert() {
 		global $app;
 
-		$domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"])));
+		$domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"]));
 		$app->db->query("update mail_forwarding SET sys_groupid = ? WHERE forwarding_id = ?", $domain['sys_groupid'], $this->id);
 
 	}
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
@@ -131,7 +131,7 @@ function onSubmit() {
 	function onAfterInsert() {
 		global $app;
 
-		$domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"])));
+		$domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"]));
 		$app->db->query("update mail_forwarding SET sys_groupid = ? WHERE forwarding_id = ?", $domain['sys_groupid'], $this->id);
 
 	}
diff --git a/interface/web/sites/web_folder_user_edit.php b/interface/web/sites/web_folder_user_edit.php
@@ -80,8 +80,8 @@ function onAfterInsert() {
 		// The web folder user entry shall be owned by the same group as the web folder
 		$sys_groupid = $app->functions->intval($folder['sys_groupid']);
 
-		$sql = "UPDATE web_folder_user SET sys_groupid = ? WHERE web_folder_user_id = ?", $sys_groupid, $this->id;
-		$app->db->query($sql);
+		$sql = "UPDATE web_folder_user SET sys_groupid = ? WHERE web_folder_user_id = ?";
+		$app->db->query($sql, $sys_groupid, $this->id);
 	}
 	
 	function onAfterUpdate() {
diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php
@@ -60,8 +60,8 @@ public function onRunJob() {
 		// Manage and compress web logfiles and create traffic statistics
 		//######################################################################################################
 
-		$sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') AND server_id = ?", $conf['server_id'];
-		$records = $app->db->queryAllRecords($sql);
+		$sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') AND server_id = ?";
+		$records = $app->db->queryAllRecords($sql, $conf['server_id']);
 		foreach($records as $rec) {
 
 			//* create traffic statistics based on yesterdays access log file
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
@@ -618,7 +618,7 @@ public function datalogInsert($tablename, $insert_data, $index_field) {
 			$params = array($tablename);
 			$v_params = array();
 			foreach($insert_data as $key => $val) {
-				$key_str .= '??,'
+				$key_str .= '??,';
 				$params[] = $key;
 				
 				$val_str .= '?,';

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ function slave_dns_servers($field, $record) {`
`70`	`70`	`// Get the limits of the client`
`71`	`71`	`$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);`
`72`	`72`	`$client = $app->db->queryOneRecord("SELECT default_slave_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ", $client_group_id);`
`73`		`- $sql = "SELECT server_id,server_name FROM server WHERE server_id = ?");`
	`73`	`+ $sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";`
`74`	`74`	`} else {`
`75`	`75`	`$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name";`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ public function mail_user_backup($session_id, $primary_id, $action_type)`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`//* Save the record`
`373`		- if ($app->db->query("INSERT INTO `sys_remoteaction` SET `server_id` = ?, `tstamp` = ?, `action_type` = ?, `action_param` = ?, `action_state` = ?"), $server_id, $tstamp, $action_type, $primary_id, $action_state) {
	`373`	+ if ($app->db->query("INSERT INTO `sys_remoteaction` SET `server_id` = ?, `tstamp` = ?, `action_type` = ?, `action_param` = ?, `action_state` = ?", $server_id, $tstamp, $action_type, $primary_id, $action_state)) {
`374`	`374`	`return true;`
`375`	`375`	`} else {`
`376`	`376`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ function onSubmit() {`
`149`	`149`	`function onAfterInsert() {`
`150`	`150`	`global $app;`
`151`	`151`
`152`		`- $domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"])));`
	`152`	`+ $domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"]));`
`153`	`153`	`$app->db->query("update mail_forwarding SET sys_groupid = ? WHERE forwarding_id = ?", $domain['sys_groupid'], $this->id);`
`154`	`154`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ function onSubmit() {`
`127`	`127`	`function onAfterInsert() {`
`128`	`128`	`global $app;`
`129`	`129`
`130`		`- $domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"])));`
	`130`	`+ $domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"]));`
`131`	`131`	`$app->db->query("update mail_forwarding SET sys_groupid = ? WHERE forwarding_id = ?", $domain['sys_groupid'], $this->id);`
`132`	`132`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ function onSubmit() {`
`131`	`131`	`function onAfterInsert() {`
`132`	`132`	`global $app;`
`133`	`133`
`134`		`- $domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"])));`
	`134`	`+ $domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->idn_encode($_POST["email_domain"]));`
`135`	`135`	`$app->db->query("update mail_forwarding SET sys_groupid = ? WHERE forwarding_id = ?", $domain['sys_groupid'], $this->id);`
`136`	`136`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ function onAfterInsert() {`
`80`	`80`	`// The web folder user entry shall be owned by the same group as the web folder`
`81`	`81`	`$sys_groupid = $app->functions->intval($folder['sys_groupid']);`
`82`	`82`
`83`		`- $sql = "UPDATE web_folder_user SET sys_groupid = ? WHERE web_folder_user_id = ?", $sys_groupid, $this->id;`
`84`		`- $app->db->query($sql);`
	`83`	`+ $sql = "UPDATE web_folder_user SET sys_groupid = ? WHERE web_folder_user_id = ?";`
	`84`	`+ $app->db->query($sql, $sys_groupid, $this->id);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`function onAfterUpdate() {`