Clean up

Author: ms217

server/plugins-available/cron_plugin.inc.php

@@ -260,8 +260,8 @@ function _write_crontab() {
 					}
 
 					$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"
+					if($this->parent_domain['php_cli_binary'] == '' || $job['type'] == 'chrooted') {
+						// PHP cli binary not set or default was selected or it is a chrooted web, 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 {

server/plugins-available/shelluser_base_plugin.inc.php

@@ -332,32 +332,37 @@ function update($event_name, $data) {
 						$app->system->chgrp($homedir.'/.profile', $data['new']['pgroup']);
 					}
 
-
-
 					// Create .bashrc file
 					$app->load('tpl');
 
 					$tpl = new tpl();
 					$tpl->newTemplate("bash.bashrc.master");
 
+					// This is not a Jailkit chroot
 					$tpl->setVar('jailkit_chroot', false);
-					//$tpl->setVar('domain', $web['domain']);
 					$php_bin_dir = dirname($web['php_cli_binary']);
-					//$tpl->setVar('home_dir', $this->_get_home_dir(""));
 
+					// FIXME: Check if we need to add an additional field for the path environment variable that contains the path to the php binary
 					if($web['server_php_id'] > 0) {
-						$tpl->setVar('use_site_php', false);
-						$tpl->setVar('php_bin_dir', $php_bin_dir);
-						$tpl->setVar('use_php_alias', true);
-						$tpl->setVar('php_alias', $web['php_cli_binary']);
+						if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir))
+						{
+							$tpl->setVar('use_site_php', false);
+							$tpl->setVar('use_php_alias', true);
+							$tpl->setVar('php_alias', $web['php_cli_binary']);
+						} else {
+							$tpl->setVar('use_site_php', true);
+							$tpl->setVar('use_php_alias', false);
+							$tpl->setVar('php_bin_dir', $php_bin_dir);
+						}
 					} else {
 						$tpl->setVar('use_site_php', false);
+						$tpl->setVar('use_php_alias', false);
 					}
 
 					$bashrc = $homedir .'/.bashrc';
 					if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
 
-					$app->system->file_put_contents($bashrc, $tpl->grab());
+					file_put_contents($bashrc, $tpl->grab());
 					unset($tpl);
 
 					$app->log("Added bashrc script: ".$bashrc, LOGLEVEL_DEBUG);

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -361,7 +361,7 @@ function _setup_jailkit_chroot()
 			$bashrc = $this->data['new']['dir'].'/etc/bash.bashrc';
 			if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
 
-			$app->system->file_put_contents($bashrc, $tpl->grab());
+			file_put_contents($bashrc, $tpl->grab());
 
 
 			unset($tpl);