Indents

Author: helmo

interface/web/sites/ajax_get_json.php

@@ -255,9 +255,9 @@
 	if($web_id > 0) {
 
 		$web = $app->db->queryOneRecord("SELECT wd.sys_groupid, wd.domain, wd.document_root, sp.php_cli_binary
-		FROM web_domain wd
-		LEFT JOIN server_php sp ON wd.server_php_id = sp.server_php_id
-		WHERE wd.domain_id = ?", $web_id);
+			FROM web_domain wd
+				LEFT JOIN server_php sp ON wd.server_php_id = sp.server_php_id
+			WHERE wd.domain_id = ?", $web_id);
 
 		$php_cli_binary = $web['php_cli_binary'];
 		$domain = $web['domain'];

interface/web/sites/cron_edit.php

@@ -79,9 +79,9 @@ function onShowEnd() {
 		}
 
 		$parent_domain = $app->db->queryOneRecord("SELECT `domain_id`, `system_user`, `system_group`, `domain`, `document_root`, `hd_quota`, `php_cli_binary`
-		FROM `web_domain`
-		LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
-		WHERE `domain_id` = ?", $this->dataRecord["parent_domain_id"]);
+			FROM `web_domain`
+				LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
+			WHERE `domain_id` = ?", $this->dataRecord["parent_domain_id"]);
 
 		$php_cli_binary = $parent_domain['php_cli_binary'];
 		$domain = $parent_domain['domain'];

server/plugins-available/cron_plugin.inc.php

@@ -93,7 +93,10 @@ function update($event_name, $data) {
 		}
 
 		//* get data from web
-		$parent_domain = $app->db->queryOneRecord("SELECT `domain_id`, `system_user`, `system_group`, `domain`, `document_root`, `hd_quota`, `php_cli_binary` FROM `web_domain` LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
+		$parent_domain = $app->db->queryOneRecord("SELECT `domain_id`, `system_user`, `system_group`, `domain`, `document_root`, `hd_quota`, `php_cli_binary`
+			FROM `web_domain`
+				LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
+			WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
 		if(!$parent_domain["domain_id"]) {
 			$app->log("Parent domain not found", LOGLEVEL_WARN);
 			return 0;
@@ -222,7 +225,10 @@ function _write_crontab() {
 		$chr_cmd_count = 0;
 
 		//* read all active cron jobs from database and write them to file
-		$cron_jobs = $app->db->queryAllRecords("SELECT c.`id`, c.`run_min`, c.`run_hour`, c.`run_mday`, c.`run_month`, c.`run_wday`, c.`command`, c.`type`, c.`log`, `web_domain`.`domain` as `domain` FROM `cron` as c INNER JOIN `web_domain` ON `web_domain`.`domain_id` = c.`parent_domain_id` WHERE c.`parent_domain_id` = ? AND c.`active` = 'y'", $this->parent_domain["domain_id"]);
+		$cron_jobs = $app->db->queryAllRecords("SELECT c.`id`, c.`run_min`, c.`run_hour`, c.`run_mday`, c.`run_month`, c.`run_wday`, c.`command`, c.`type`, c.`log`, `web_domain`.`domain` as `domain`
+			FROM `cron` as c
+				INNER JOIN `web_domain` ON `web_domain`.`domain_id` = c.`parent_domain_id`
+			WHERE c.`parent_domain_id` = ? AND c.`active` = 'y'", $this->parent_domain["domain_id"]);
 		if($cron_jobs && count($cron_jobs) > 0) {
 			foreach($cron_jobs as $job) {
 				if($job['run_month'] == '@reboot') {

server/plugins-available/shelluser_base_plugin.inc.php

@@ -80,7 +80,9 @@ function insert($event_name, $data) {
 		}
 
 		//* Check if the resulting path is inside the docroot
-		$web = $app->db->queryOneRecord("SELECT * FROM web_domain LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
+		$web = $app->db->queryOneRecord("SELECT * FROM web_domain
+			LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
+			WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
 
 		$this->web = $web;
 
@@ -223,7 +225,9 @@ function update($event_name, $data) {
 		}
 
 		//* Check if the resulting path is inside the docroot
-		$web = $app->db->queryOneRecord("SELECT * FROM web_domain LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
+		$web = $app->db->queryOneRecord("SELECT * FROM web_domain
+			LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
+			WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
 
 		$this->web = $web;