Add current PHP enhancements (WiP)

ms217 · ms217 · commit fc96c64464d2 · 2023-11-19T20:47:05.000+01:00
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
@@ -0,0 +1 @@
+ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
@@ -1460,6 +1460,7 @@ CREATE TABLE `server_php` (
   `php_fpm_ini_dir` varchar(255) DEFAULT NULL,
   `php_fpm_pool_dir` varchar(255) DEFAULT NULL,
   `php_fpm_socket_dir` varchar(255) DEFAULT NULL,
+	`php_cli_binary` varchar(255) DEFAULT NULL,
   `active` enum('n','y') NOT NULL DEFAULT 'y',
   `sortprio` int(20) NOT NULL DEFAULT 100,
   PRIMARY KEY (`server_php_id`)
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
@@ -248,6 +248,30 @@
 		//#################################
 	)
 );
+$form["tabs"]['php_cli'] = array (
+'title' => "PHP-CLI settings",
+'width' => 80,
+'template' => "templates/server_php_cli_edit.htm",
+'fields' => array(
+	//#################################
+	// Begin Datatable fields
+	//#################################
+	'php_cli_binary' => array(
+		'datatype' => 'VARCHAR',
+		'formtype' => 'TEXT',
+		'filters'   => array(
+				0 => array( 'event' => 'SAVE',
+				'type' => 'STRIPTAGS'),
+				1 => array( 'event' => 'SAVE',
+				'type' => 'STRIPNL')
+		),
+		'default' => '',
+		'value' => '',
+		'width' => '40',
+		'maxlength' => '255'
+	),
+)
+);
 $form["tabs"]['php_sort'] = array (
     	'title' => "PHP Sort Priority",
 	'width' => 80,
diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_php.lng b/interface/web/admin/lib/lang/bg_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_php.lng b/interface/web/admin/lib/lang/br_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'O nome não pode ser modificado.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_server_php.lng b/interface/web/admin/lib/lang/ca_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/cn_server_php.lng b/interface/web/admin/lib/lang/cn_server_php.lng
@@ -17,4 +17,9 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM套接字目录';
 $wb['active_txt'] = '激活';
 $wb['php_in_use_error'] = '此PHP版本正在使用中。';
 $wb['php_name_in_use_error'] = '名称无法更改。';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'Der Name kann nicht geändert werden.';
 $wb['PHP Sort Priority'] = 'Priorität';
 $wb['sortprio_txt'] = 'Sorting Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP Version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI-Einstellungen';
+$wb['php_cli_binary_txt'] = 'Pfad zur PHP-CLI Binary';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_server_php.lng b/interface/web/admin/lib/lang/dk_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_php.lng b/interface/web/admin/lib/lang/en_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_php.lng b/interface/web/admin/lib/lang/es_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_php.lng b/interface/web/admin/lib/lang/fi_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_php.lng b/interface/web/admin/lib/lang/fr_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_php.lng b/interface/web/admin/lib/lang/hu_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_php.lng b/interface/web/admin/lib/lang/id_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'Il nome non può essere cambiato.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_php.lng b/interface/web/admin/lib/lang/ja_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_php.lng b/interface/web/admin/lib/lang/nl_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_php.lng b/interface/web/admin/lib/lang/pt_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_php.lng b/interface/web/admin/lib/lang/ro_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_php.lng b/interface/web/admin/lib/lang/ru_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_php.lng b/interface/web/admin/lib/lang/sk_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng
@@ -20,4 +20,6 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['PHP-CLI settings'] = 'PHP-CLI settings';
+$wb['php_cli_binary_txt'] = 'Path to the PHP CLI binary';
 ?>
diff --git a/interface/web/admin/templates/server_php_cli_edit.htm b/interface/web/admin/templates/server_php_cli_edit.htm
@@ -0,0 +1,10 @@
+            <div class="form-group">
+                <label for="php_cli_binary" class="col-sm-3 control-label">{tmpl_var name='php_cli_binary_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="php_cli_binary" id="php_cli_binary" value="{tmpl_var name='php_cli_binary'}" class="form-control" /></div></div>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="clear"><div class="right">
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_php_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>
diff --git a/interface/web/sites/lib/lang/de_cron.lng b/interface/web/sites/lib/lang/de_cron.lng
@@ -23,4 +23,5 @@ $wb['command_hint_txt'] = 'z. B. /var/www/clients/clientX/webY/myscript.sh oder
 $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';
 ?>
diff --git a/interface/web/sites/lib/lang/en_cron.lng b/interface/web/sites/lib/lang/en_cron.lng
@@ -23,4 +23,5 @@ $wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or htt
 $wb['log_output_txt'] = 'Log output';
 $wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with https:// as cron command.';
 $wb['command_error_empty'] = 'Command is empty.';
-?>
+$wb['variables_txt'] = 'Variables';
+?>
diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm
@@ -51,7 +51,8 @@
                 <label for="command" class="col-sm-3 control-label">{tmpl_var name='command_txt'}</label>
                 <div class="col-sm-9">
 					<input type="text" name="command" id="command" value="{tmpl_var name='command'}" class="form-control" />
-					<p class="formHint">{tmpl_var name='command_hint_txt'}</p>
+                    <b>{tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{SITE_PHP}</a>, <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT_CLIENT}</a>,  <a href="javascript:void(0);" class="addPlaceholder">{DOMAIN}</a>
+					<br><br><p class="formHint">{tmpl_var name='command_hint_txt'}</p>
 				</div>
             </div>
             <div class="form-group">
@@ -66,7 +67,7 @@
                     {tmpl_var name='active'}
                 </div>
             </div>
-        
+
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
@@ -1443,6 +1443,25 @@ function onAfterUpdate() {
 		global $app, $conf;
 
 		if(isset($this->dataRecord['folder_directive_snippets'])) $app->db->query("UPDATE web_domain SET folder_directive_snippets = ? WHERE domain_id = ?", $this->dataRecord['folder_directive_snippets'], $this->id);
+
+		// Trigger an update of the website's cronjobs when the PHP version is changed
+		if(isset($this->dataRecord['server_php_id']) && $this->oldDataRecord['server_php_id'] != $this->dataRecord['server_php_id']) {
+			$cronjob_list = $app->db->queryAllRecords("SELECT * FROM cron WHERE parent_domain_id = ? and active = 'y'", $this->dataRecord['id']);
+			if(!empty($cronjob_list)) {
+				foreach ($cronjob_list as $cronjob) {
+					// Only update cronjobs with placeholders
+					if(preg_match("/([\{][a-zA-Z_\-0-9]+[\}]|[\[][a-zA-Z_\-0-9]+[\]])/", $cronjob['command'])) {
+						$app->db->datalogUpdate('cron', $cronjob, 'id', $cronjob['id'], true);
+					}
+				}
+			}
+			$shelluser_list = $app->db->queryAllRecords("SELECT * FROM shell_user WHERE parent_domain_id = ? and active = 'y'", $this->dataRecord['id']);
+			if(!empty($shelluser_list)) {
+				foreach ($shelluser_list as $shelluser) {
+						$app->db->datalogUpdate('shell_user', $shelluser, 'shell_user_id', $shelluser['shell_user_id'], true);
+				}
+			}
+		}
 	}
 
 	function validateDefaultFastcgiPhpVersion() {
diff --git a/server/conf/bash.bashrc.master b/server/conf/bash.bashrc.master
@@ -62,4 +62,12 @@ fi
 #alias la='ls -A'
 #alias l='ls -CF'
 
+<tmpl_if name='use_site_php'>
+# Overwrite the PHP cli binaries by using $PATH:
+export PATH=<tmpl_var name='php_bin_dir'>:$PATH
+</tmpl_if>
+
+<tmpl_if name='use_php_alias'>
+alias php="<tmpl_var name='php_alias'>"
+</tmpl_if>
 
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
@@ -93,7 +93,7 @@ function update($event_name, $data) {
 		}
 
 		//* get data from web
-		$parent_domain = $app->db->queryOneRecord("SELECT `domain_id`, `system_user`, `system_group`, `document_root`, `hd_quota` FROM `web_domain` 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;
@@ -220,7 +220,7 @@ 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.`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') {
@@ -259,8 +259,25 @@ function _write_crontab() {
 						$web_root = $this->parent_domain['document_root'];
 					}
 
+					$web_domain = $this->parent_domain['domain'];
+					if($this->parent_domain['php_cli_binary'] == '') {
+						// PHP cli binary not set or default was selected, fallback to just "php"
+						$web_php_cli = 'php';
+						$app->log("PHP CLI binary not set for the website\'s selected PHP version or Default was selected. Falling back to \"php\" for cronjob id " . $job['id'], LOGLEVEL_DEBUG);
+					} else {
+						$web_php_cli = $this->parent_domain['php_cli_binary'];
+					}
+
 					$web_root .= '/web';
-					$job['command'] = str_replace('[web_root]', $web_root, $job['command']);
+
+					$trans = array(
+                        '[web_root]' => $web_root,
+						'{DOCROOT_CLIENT}' => $web_root,
+                        '{DOMAIN}' => $web_domain,
+						'{SITE_PHP}' => $web_php_cli
+	                );
+
+					$job['command'] = strtr($job['command'], $trans);
 
 					$cron_line .= "\t";
 					//if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $cron_line .= $this->parent_domain['document_root'].'/';
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ALTER TABLE `server_php` ADD `php_cli_binary` varchar(255) DEFAULT NULL AFTER `php_fpm_socket_dir`;