Merged revisions 3803-3844 from stable branch.

tbrehm

2013-02-22 526b997c9891a796b152cdbab8e329b356b1f596

 server/plugins-available/cron_jailkit_plugin.inc.php

@@ -124,7 +124,7 @@
            
            $this->_add_jailkit_user();
            
            $command .= 'usermod -U '.escapeshellcmd($parent_domain["system_user"]);
            $command .= 'usermod -U '.escapeshellcmd($parent_domain["system_user"]).' 2>/dev/null';
            exec($command);
            
            $this->_update_website_security_level();
@@ -223,7 +223,7 @@
            $command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh';
            $command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
            $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\'';
            exec($command);
            exec($command.' 2>/dev/null');
            
            $this->app->log("Added jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
            
@@ -262,24 +262,28 @@
   
   function _add_jailkit_programs()
   {
      global $app;
		
      //copy over further programs and its libraries
      $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
      $command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
      $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_programs'].'\'';
      exec($command);
      exec($command.' 2>/dev/null');
      
      $this->app->log("Added programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
        
        $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
        $command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
        $command .= ' \''.$this->jailkit_config['jailkit_chroot_cron_programs'].'\'';
        exec($command);
        exec($command.' 2>/dev/null');
        
        $this->app->log("Added cron programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
   }
   
   function _add_jailkit_user()
   {
         global $app;
			
         //add the user to the chroot
            $jailkit_chroot_userhome = $this->_get_home_dir($this->parent_domain['system_user']);
         
@@ -295,7 +299,7 @@
         $command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
         $command .= ' '.$jailkit_chroot_userhome;
         $command .= ' '.escapeshellcmd("/bin/bash");
         exec($command);
         exec($command.' 2>/dev/null');
            
         $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);