- use directory validation regex for the php_cli_binary field

ms217 · ms217 · commit 9745f2ca6167 · 2025-02-20T15:58:32.000+01:00
- updated .lng files
- minor simplification of the PHP cli binary handling code
- minor clean up (leftovers from use_php_alias)
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
@@ -260,11 +260,12 @@
 	'php_cli_binary' => array(
 		'datatype' => 'VARCHAR',
 		'formtype' => 'TEXT',
-		'filters'   => array(
-				0 => array( 'event' => 'SAVE',
-				'type' => 'STRIPTAGS'),
-				1 => array( 'event' => 'SAVE',
-				'type' => 'STRIPNL')
+		'validators' => array(
+			0 => array (
+				'type' => 'REGEX',
+				'regex' => '/^\/[a-zA-Z0-9\/\-\_\ ]*$/',
+				'errmsg'=> 'php_cli_binary_error_regex'
+			),
 		),
 		'default' => '',
 		'value' => '',
diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Vollständiger Pfad zur PHP-CLI Binary (ink
 $wb['php_jk_section_txt'] = 'PHP Jailkit Sektion';
 $wb['tooltip_php_jk_section_txt'] = 'Bezeichner der PHP-Version in der jk_init.ini (Angabe ohne eckige Klammern)';
 $wb['php_cli_jk_section_error_regex'] = 'Ungültige Jaikit chroot-Sektion';
+$wb['php_cli_binary_error_regex'] = 'Ungültiger 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
@@ -22,4 +22,9 @@ $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';
+$wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the filename';
+$wb['php_jk_section_txt'] = 'PHP Jailkit section';
+$wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
+$wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -22,4 +22,9 @@ $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';
+$wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the filename';
+$wb['php_jk_section_txt'] = 'PHP Jailkit section';
+$wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
+$wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to 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
@@ -26,4 +26,5 @@ $wb['tooltip_php_cli_binary_txt'] = 'Path to the PHP CLI binary including the fi
 $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
+$wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
 ?>
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
@@ -2885,6 +2885,7 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 		}
 
 		if($options['jk_php_maintenance_check'] == 'yes') {
+			$alternatives_php = $home_dir . '/etc/alternatives/php';
 
 			if(!empty($options['php_cli_binary'])) {
 				$php_bin_dir = dirname($options['php_cli_binary']);
@@ -2895,18 +2896,18 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 					$fallback_php_bin = str_replace($home_dir, '', $fallback_php);
 
 					if(!empty($fallback_php) && file_exists($fallback_php_bin)) {
-						if(is_link($home_dir . '/etc/alternatives/php') || is_file($home_dir . '/etc/alternatives/php')) {
-							unlink($home_dir . '/etc/alternatives/php');
-							symlink($fallback_php_bin, $home_dir . '/etc/alternatives/php');
+						if(is_link($alternatives_php) || is_file($alternatives_php) || !file_exists($alternatives_php)) {
+							unlink($alternatives_php);
+							symlink($fallback_php_bin, $alternatives_php);
 							$app->log("update_jailkit_chroot: Found " . $fallback_php_bin . " as a fallback for alternatives/php in the jail of " . $options['domain'], LOGLEVEL_DEBUG);
 						}
 					}
 				} else {
 					if($used_os_type == "debian" || $$used_os_type == "ubuntu") {
 						$app->log("update_jailkit_chroot: setting alternatives/php to " . $options['php_cli_binary'], LOGLEVEL_DEBUG);
-						if(is_link($home_dir . '/etc/alternatives/php') || is_file($home_dir . '/etc/alternatives/php')) {
-							unlink($home_dir . '/etc/alternatives/php');
-							symlink($options['php_cli_binary'], $home_dir . '/etc/alternatives/php');
+						if(is_link($alternatives_php) || is_file($alternatives_php) || !file_exists($alternatives_php)) {
+							unlink($alternatives_php);
+							symlink($options['php_cli_binary'], $alternatives_php);
 						}
 					}
 				}
diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php
@@ -415,16 +415,15 @@ function _setup_php_jailkit() {
 		$tpl->setVar('jailkit_chroot', 'y');
 		$tpl->setVar('domain', $this->parent_domain['domain']);
 		$tpl->setVar('home_dir', $this->_get_home_dir(""));
-
 		$tpl->setVar('use_php_path', false);
 
 
 		if(($this->parent_domain['server_php_id'] > 0) && !empty($this->parent_domain['php_cli_binary'])) {
 			$php_bin_dir = dirname($this->parent_domain['php_cli_binary']);
+			$alternatives_php = $this->parent_domain['document_root'] . '/etc/alternatives/php';
 
 			if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir)) {
 				$tpl->setVar('use_php_path', false);
-				$tpl->setVar('use_php_alias', true);
 			} else {
 				$tpl->setVar('use_php_path', true);
 				$tpl->setVar('php_bin_dir', $php_bin_dir);
@@ -439,21 +438,21 @@ function _setup_php_jailkit() {
 					$fallback_php_bin = str_replace($this->parent_domain['document_root'], '', $fallback_php);
 
 					if(!empty($fallback_php) && file_exists($fallback_php_bin)) {
-						if(is_link($this->parent_domain['document_root'] . '/etc/alternatives/php') || is_file($this->parent_domain['document_root'] . '/etc/alternatives/php')) {
-							unlink($this->parent_domain['document_root'] . '/etc/alternatives/php');
-							symlink($fallback_php_bin, $this->parent_domain['document_root'] . '/etc/alternatives/php');
+						if(is_link($alternatives_php) || is_file($alternatives_php) || !file_exists($alternatives_php)) {
+							unlink($alternatives_php);
+							symlink($fallback_php_bin, $alternatives_php);
 							$app->log("Found " . $fallback_php_bin . " as a fallback for alternatives/php in the jail of ". $this->parent_domain['domain'], LOGLEVEL_DEBUG);
 						}
 					}
 				}
 			} else {
 				if($used_os_type == "debian" || $used_os_type == "ubuntu") {
-					if(is_link($this->parent_domain['document_root'] . '/etc/alternatives/php') || is_file($this->parent_domain['document_root'] . '/etc/alternatives/php'))
+					if(is_link($alternatives_php) || is_file($alternatives_php) || !file_exists($alternatives_php))
 					{
-						unlink($this->parent_domain['document_root'] . '/etc/alternatives/php');
-						symlink($this->parent_domain['php_cli_binary'], $this->parent_domain['document_root'] . '/etc/alternatives/php');
+						unlink($alternatives_php);
+						symlink($this->parent_domain['php_cli_binary'], $alternatives_php);
 					} else {
-						symlink($this->parent_domain['php_cli_binary'], $this->parent_domain['document_root'] . '/etc/alternatives/php');
+						symlink($this->parent_domain['php_cli_binary'], $alternatives_php);
 					}
 				}
 			}
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -617,7 +617,6 @@ function _add_user_bashrc() {
 		// Predefine some template vars
 		$tpl->setVar('jailkit_chroot', 'n');
 		$tpl->setVar('use_php_path', false);
-		$tpl->setVar('use_php_alias', false);
 
 		$os_type = $app->system->get_os_type();
 		if (isset($os_type['type'])) {
@@ -645,23 +644,23 @@ function _add_user_bashrc() {
 
 		if(($this->web['server_php_id'] > 0) && !empty($this->web['php_cli_binary'])) {
 			$php_bin_dir = dirname($this->web['php_cli_binary']);
+			$home_php = $user_home_dir . '/.local/bin' . '/php';
 
 			if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir)) {
 				$tpl->setVar('use_php_path', false);
 
 				if(!is_dir($user_home_dir . '/.local/bin')) $app->system->mkdirpath($user_home_dir . '/.local/bin', 0750, $this->data['new']['username'], $this->data['new']['pgroup']);
 
-				if(is_link($user_home_dir . '/.local/bin' . '/php') || is_file($user_home_dir . '/.local/bin' . '/php')) {
-					unlink($user_home_dir . '/.local/bin' . '/php');
-					symlink($this->web['php_cli_binary'], $user_home_dir . '/.local/bin' . '/php');
+				if(is_link($home_php) || is_file($home_php) || !file_exists($home_php)) {
+					unlink($home_php);
+					symlink($this->web['php_cli_binary'], $home_php);
 				} else {
-					symlink($this->web['php_cli_binary'], $user_home_dir . '/.local/bin' . '/php');
+					symlink($this->web['php_cli_binary'], $home_php);
 				}
 
 			} else {
 				// We rely on $PATH in case that the binaries are located in a separate directory that doesn't match the regex above
 				$tpl->setVar('use_php_path', true);
-				$tpl->setVar('use_php_alias', false);
 				$tpl->setVar('php_bin_dir', $php_bin_dir);
 			}
 
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -759,6 +759,7 @@ function _setup_php_jailkit() {
 
 		if(($this->web['server_php_id'] > 0) && !empty($this->web['php_cli_binary'])) {
 			$php_bin_dir = dirname($this->web['php_cli_binary']);
+			$alternatives_php = $this->web['document_root'] . '/etc/alternatives/php';
 
 			if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir)) {
 				$tpl->setVar('use_php_path', false);
@@ -776,22 +777,22 @@ function _setup_php_jailkit() {
 					$fallback_php_bin = str_replace($this->web['document_root'], '', $fallback_php);
 
 					if(!empty($fallback_php) && file_exists($fallback_php_bin)) {
-						if(is_link($this->web['document_root'] . '/etc/alternatives/php') || is_file($this->web['document_root'] . '/etc/alternatives/php')) {
-							unlink($this->web['document_root'] . '/etc/alternatives/php');
-							symlink($fallback_php_bin, $this->web['document_root'] . '/etc/alternatives/php');
+						if(is_link($alternatives_php) || is_file($alternatives_php) || !file_exists($alternatives_php)) {
+							unlink($alternatives_php);
+							symlink($fallback_php_bin, $alternatives_php);
 							$app->log("Found " . $fallback_php_bin . " as a fallback for alternatives/php in the jail of ". $this->web['domain'], LOGLEVEL_DEBUG);
 						}
 					}
 				}
 
 			} else {
 				if($used_os_type == "debian" || $used_os_type == "ubuntu") {
-					if(is_link($this->web['document_root'] . '/etc/alternatives/php') || is_file($this->web['document_root'] . '/etc/alternatives/php'))
+					if(is_link($alternatives_php) || is_file($alternatives_php) || !file_exists($alternatives_php))
 					{
-						unlink($this->web['document_root'] . '/etc/alternatives/php');
-						symlink($this->web['php_cli_binary'], $this->web['document_root'] . '/etc/alternatives/php');
+						unlink($alternatives_php);
+						symlink($this->web['php_cli_binary'], $alternatives_php);
 					} else {
-						symlink($this->web['php_cli_binary'], $this->web['document_root'] . '/etc/alternatives/php');
+						symlink($this->web['php_cli_binary'], $alternatives_php);
 					}
 				}
 			}
