Fixed jquery controlled chroot/full placeholders

Author: ms217

interface/web/sites/ajax_get_json.php

@@ -251,33 +251,49 @@
 
 if($type == 'getcronplaceholders') {
 
-	$web = $app->db->queryOneRecord("SELECT `domain`, `document_root`, `php_cli_binary`
-	FROM `web_domain`
-		LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
-	WHERE `domain_id` = ? AND ".$app->tform->getAuthSQL('r'), $web_id);
+	$web_docroot_client = '';
 
+	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 = ? AND ".$app->tform->getAuthSQL('r'), $web_id);
 
+		$php_cli_binary = $web['php_cli_binary'];
 
-	if($cron_type != 'chrooted') {
-		$web_docroot_client = $web['document_root'];
-	} else {
-		$web_docroot_client = '';
-	}
+		$domain = $web['domain'];
 
-	if(empty($web['php_cli_binary'])) {
-		$web['php_cli_binary'] = "/usr/bin/php";
+		$domain_owner = $app->db->queryOneRecord("SELECT limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $web["sys_groupid"]);
+
+		//* True when the site is assigned to a client
+		if(isset($domain_owner["limit_cron_type"])) {
+			if($domain_owner["limit_cron_type"] == 'full') {
+				$cron_type = 'full';
+			} else {
+				$cron_type = 'chrooted';
+			}
+		} else {
+			//* True when the site is assigned to the admin
+			$cron_type = 'full';
+		}
+
+		if($cron_type != 'chrooted') {
+			$web_docroot_client = $web['document_root'];
+		}
 	}
 
 	$web_docroot_client .= '/web';
 
+	if(empty($web['php_cli_binary'])) {
+		$php_cli_binary = "/usr/bin/php";
+	}
+
 	$json = json_encode(array(
-		'php_cli_binary' => $web['php_cli_binary'],
+		'php_cli_binary' => $php_cli_binary,
 		'docroot_client' => $web_docroot_client,
-		'domain' => $web['domain']
+		//'cron_type' => $cron_type,
+		'domain' => $domain
 	));
-
-
-
 }
 
 header('Content-type: application/json');

interface/web/sites/cron_edit.php

@@ -83,23 +83,30 @@ function onShowEnd() {
 			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'];
 
 		if($this->dataRecord['type'] != 'chrooted') {
 			$web_docroot_client = $parent_domain['document_root'];
 		} else {
 			$web_docroot_client = '';
 		}
 
-		//TODO: Fix cron type detection
-		$app->tpl->setVar("cron_type", $this->dataRecord['type']);
+		if(empty($parent_domain['php_cli_binary'])) {
+			$php_cli_binary = "/usr/bin/php";
+		}
+
+		if(empty($parent_domain['domain'])) {
+			$domain = $app->tform->wordbook["domain_not_selected_placeholder_txt"];
+		}
 
 		// web folder is hardcoded to /web:
 		$web_docroot_client .= '/web';
 
 		// Example values for placeholders.
-		$app->tpl->setVar("php_cli_binary", $parent_domain['php_cli_binary']);
+		$app->tpl->setVar("php_cli_binary", $php_cli_binary);
 		$app->tpl->setVar("docroot_client", $web_docroot_client);
-		$app->tpl->setVar("domain", $parent_domain['domain']);
+		$app->tpl->setVar("domain", $domain);
 
 		parent::onShowEnd();
 	}

interface/web/sites/lib/lang/ar_cron.lng

@@ -23,4 +23,5 @@ $wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with htt
 $wb['command_error_empty'] = 'Command is empty.';
 $wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or https://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
 $wb['log_output_txt'] = 'Log output';
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';
 ?>

interface/web/sites/lib/lang/bg_cron.lng

@@ -23,4 +23,5 @@ $wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with htt
 $wb['command_error_empty'] = 'Command is empty.';
 $wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or https://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
 $wb['log_output_txt'] = 'Log output';
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';
 ?>

interface/web/sites/lib/lang/br_cron.lng

@@ -24,3 +24,4 @@ $wb['log_output_txt'] = 'Gravar saída do log';
 $wb['limit_cron_url_txt'] = 'Somente URL no Cron. Por favor insira uma URL iniciando com https:// como um comando no Cron.';
 $wb['command_error_empty'] = 'Comando a executar está vazio.';
 $wb['Cron Job'] = 'Tarefas no Cron';
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';

interface/web/sites/lib/lang/ca_cron.lng

@@ -23,4 +23,5 @@ $wb['limit_cron_url_txt'] = 'Cron de type URL seulement. Merci d\'introduire une
 $wb['command_error_empty'] = 'Le champ Commande à exécuter est vide.';
 $wb['command_hint_txt'] = 'par exemple /var/www/clients/clientX/webY/monscript.sh ou https://www.mondomaine.com/chemin/script.php, vous pouvez utiliser la constante [web_root] qui sera remplacée par /var/www/clients/clientX/webY/web.';
 $wb['log_output_txt'] = 'Journaliser la sortie du cron';
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';
 ?>

interface/web/sites/lib/lang/cn_cron.lng

@@ -23,4 +23,5 @@ $wb['command_hint_txt'] = '例如，/var/www/clients/clientX/webY/myscript.sh 
 $wb['log_output_txt'] = '记录输出';
 $wb['limit_cron_url_txt'] = '仅限 URL 计划任务。请将以 https:// 开头的 URL 作为计划任务命令输入。';
 $wb['command_error_empty'] = '命令为空。';
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';
 ?>

interface/web/sites/lib/lang/cz_cron.lng

@@ -23,3 +23,4 @@ $wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with htt
 $wb['command_error_empty'] = 'Command is empty.';
 $wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
 $wb['log_output_txt'] = 'Log output';
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';

interface/web/sites/lib/lang/de_cron.lng

@@ -24,4 +24,5 @@ $wb['log_output_txt'] = 'Ausgabe loggen';
 $wb['limit_cron_url_txt'] = 'Es sind nur URL cronjobs möglich. Der Cron-Befehl muss mit https:// beginnen.';
 $wb['command_error_empty'] = 'Befehl ist leer.';
 $wb['variables_txt'] = 'Variablen';
-?>
+$wb['domain_not_selected_placeholder_txt'] = 'Bitte wähle eine Domain aus';
+

interface/web/sites/lib/lang/dk_cron.lng

@@ -23,4 +23,4 @@ $wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with htt
 $wb['command_error_empty'] = 'Command er tom.';
 $wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or https://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
 $wb['log_output_txt'] = 'Log output';
-?>
+$wb['domain_not_selected_placeholder_txt'] = 'No Domain selected';