- moved splitting for programs and sections (jailkit) to lib

- fixed warning in chmod

Author: Marius Burkard

server/lib/classes/system.inc.php

@@ -2136,6 +2136,8 @@ public function create_jailkit_user($username, $home_dir, $user_home_dir, $shell
 	public function create_jailkit_programs($home_dir, $programs = array()) {
 		if(empty($programs)) {
 			return true;
+		} elseif(is_string($programs)) {
+			$programs = preg_split('/[\s,]+/', $programs);
 		}
 		$program_args = '';
 		foreach($programs as $prog) {
@@ -2151,6 +2153,8 @@ public function create_jailkit_programs($home_dir, $programs = array()) {
 	public function create_jailkit_chroot($home_dir, $app_sections = array()) {
 		if(empty($app_sections)) {
 			return true;
+		} elseif(is_string($app_sections)) {
+			$app_sections = preg_split('/[\s,]+/', $app_sections);
 		}
 
 		// Change ownership of the chroot directory to root
@@ -2170,11 +2174,11 @@ public function create_jailkit_chroot($home_dir, $app_sections = array()) {
 		if(!is_dir($home_dir . '/tmp')) {
 			$this->mkdirpath($home_dir . '/tmp', 0777);
 		} else {
-			$this->chmod($home_dir . '/tmp', 0777);
+			$this->chmod($home_dir . '/tmp', 0777, true);
 		}
 
 		// Fix permissions of the root firectory
-		$this->chmod($home_dir . '/bin', 0755);  // was chmod g-w $CHROOT_HOMEDIR/bin
+		$this->chmod($home_dir . '/bin', 0755, true);  // was chmod g-w $CHROOT_HOMEDIR/bin
 
 		// mysql needs the socket in the chrooted environment
 		$this->mkdirpath($home_dir . '/var/run/mysqld');

server/plugins-available/cron_jailkit_plugin.inc.php

@@ -216,7 +216,7 @@ function _setup_jailkit_chroot()
 		//check if the chroot environment is created yet if not create it with a list of program sections from the config
 		if (!is_dir($this->parent_domain['document_root'].'/etc/jailkit'))
 		{
-			$app->system->create_jailkit_chroot($this->parent_domain['document_root'], preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']));
+			$app->system->create_jailkit_chroot($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_app_sections']);
 
 			$this->app->log("Added jailkit chroot", LOGLEVEL_DEBUG);
 
@@ -256,10 +256,10 @@ function _add_jailkit_programs()
 		global $app;
 
 		//copy over further programs and its libraries
-		$app->system->create_jailkit_programs($this->parent_domain['document_root'], preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_programs']));
+		$app->system->create_jailkit_programs($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_app_programs']);
 		$this->app->log("Added app programs to jailkit chroot", LOGLEVEL_DEBUG);
 
-		$app->system->create_jailkit_programs($this->parent_domain['document_root'], preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_cron_programs']));
+		$app->system->create_jailkit_programs($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_cron_programs']);
 		$this->app->log("Added cron programs to jailkit chroot", LOGLEVEL_DEBUG);
 	}
 

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -273,7 +273,7 @@ function _setup_jailkit_chroot()
 		//check if the chroot environment is created yet if not create it with a list of program sections from the config
 		if (!is_dir($this->data['new']['dir'].'/etc/jailkit'))
 		{
-			$app->system->create_jailkit_chroot($this->data['new']['dir'], preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']));
+			$app->system->create_jailkit_chroot($this->data['new']['dir'], $this->jailkit_config['jailkit_chroot_app_sections']);
 			$this->app->log("Added jailkit chroot", LOGLEVEL_DEBUG);
 
 			$this->_add_jailkit_programs();