Load tpl in _setup_jailkit_chroot

Check prior creating symlinks in SFTP home directory if the symlinks already exists

Author: ms217

server/plugins-available/cron_jailkit_plugin.inc.php

@@ -242,6 +242,8 @@ function _setup_jailkit_chroot()
 	{
 		global $app, $conf;
 
+		$app->load('tpl');
+
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
 			if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {
 				$options = array('hardlink');

server/plugins-available/shelluser_base_plugin.inc.php

@@ -174,9 +174,9 @@ function insert($event_name, $data) {
 				}
 
 				// Create symlinks for conveniance, SFTP user should not land in an empty dir.
-				symlink('../../web', $homedir.'/web');
-				symlink('../../log', $homedir.'/log');
-				symlink('../../private', $homedir.'/private');
+				if(!is_link($homedir.'/web')) symlink('../../web', $homedir.'/web');
+				if(!is_link($homedir.'/log')) symlink('../../log', $homedir.'/log');
+				if(!is_link($homedir.'/private')) symlink('../../private', $homedir.'/private');
 
 				//* Disable shell user temporarily if we use jailkit
 				if($data['new']['chroot'] == 'jailkit') {

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -330,6 +330,8 @@ function _setup_jailkit_chroot()
 	{
 		global $app, $conf;
 
+		$app->load('tpl');
+
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
 			if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {
 				$options = array('hardlink');
@@ -724,7 +726,7 @@ function _add_bashrc_jailkit() {
 		}
 
 		if($app->system->is_redhat_os() == true) {
-			$bashrc = $this->web['document_root'] . '/home/' . $this->web['system_user'] . '/.bashrc';
+			$bashrc = $this->web['document_root'] . '/etc/bashrc';
 		} else {
 			$bashrc = $this->web['document_root'] . '/etc/bash.bashrc';
 		}