Added missing error messages to the dns wizard. Improved language file load...

tbrehm

2009-05-27 44d2a76d4611e27d348e1c8ed89ff0675f2d262f

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -86,13 +86,17 @@
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
         
            $this->_setup_jailkit_chroot();
				
            $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
            exec($command);
				
            $this->_add_jailkit_user();
         }
      
         $app->log("Jalikit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
         $app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
         
      } else {
         $app->log("Jalikit Plugin -> insert username:".$data['new']['username']." skipped, the user does not exist.",LOGLEVEL_WARN);
         $app->log("Jailkit Plugin -> insert username:".$data['new']['username']." skipped, the user does not exist.",LOGLEVEL_WARN);
      }
      
   }
@@ -120,10 +124,10 @@
            $this->_add_jailkit_user();
         }
      
         $app->log("Jalikit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
         $app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
         
      } else {
         $app->log("Jalikit Plugin -> update username:".$data['new']['username']." skipped, the user does not exist.",LOGLEVEL_WARN);
         $app->log("Jailkit Plugin -> update username:".$data['new']['username']." skipped, the user does not exist.",LOGLEVEL_WARN);
      }
      
   }
@@ -147,11 +151,15 @@
         //commented out proved to be dangerous on config errors
         //exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
         
			
         $app->log("Jalikit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
         if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
            $command = 'userdel -f -r';
            $command .= ' '.escapeshellcmd($data['old']['username']);
            exec($command);
            $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
         }
      }
      
      $app->log("Jalikit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
      $app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
      
      
   }
@@ -184,7 +192,7 @@
            $tpl->setVar('home_dir',$this->_get_home_dir(""));
            
            $bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
            exec('rm '.$bashrc);
            if(@is_file($bashrc)) exec('rm '.$bashrc);
            
            file_put_contents($bashrc,$tpl->grab());
            unset($tpl);
@@ -197,7 +205,7 @@
            $tpl->setVar('domain',$web['domain']);
            
            $motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
            exec('rm '.$motd);
            if(@is_file($motd)) exec('rm '.$motd);
            
            file_put_contents($motd,$tpl->grab());
            
@@ -226,30 +234,33 @@
         $jailkit_chroot_userhome = $this->_get_home_dir($this->data['new']['username']);
         $jailkit_chroot_puserhome = $this->_get_home_dir($this->data['new']['puser']);
         
         if (!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome))
         {
            $command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh';
            $command .= ' '.escapeshellcmd($this->data['new']['username']);
            $command .= ' '.escapeshellcmd($this->data['new']['dir']);
            $command .= ' '.$jailkit_chroot_userhome;
            $command .= ' '.escapeshellcmd($this->data['new']['shell']);
            $command .= ' '.$this->data['new']['puser'];
            $command .= ' '.$jailkit_chroot_puserhome;
            exec($command);
         if(!is_dir($this->data['new']['dir'].'/etc')) mkdir($this->data['new']['dir'].'/etc');
         if(!is_file($this->data['new']['dir'].'/etc/passwd')) exec('touch '.$this->data['new']['dir'].'/etc/passwd');
			
         // IMPORTANT!
         // ALWAYS create the user. Even if the user was created before
         // if we check if the user exists, then a update (no shell -> jailkit) will not work
         // and the user has FULL ACCESS to the root of the server!
         $command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh';
         $command .= ' '.escapeshellcmd($this->data['new']['username']);
         $command .= ' '.escapeshellcmd($this->data['new']['dir']);
         $command .= ' '.$jailkit_chroot_userhome;
         $command .= ' '.escapeshellcmd($this->data['new']['shell']);
         $command .= ' '.$this->data['new']['puser'];
         $command .= ' '.$jailkit_chroot_puserhome;
         exec($command);
            
            $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
         $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
            
            exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome));
            exec("chown ".$this->data['new']['username'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome));
         exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome));
         exec("chown ".$this->data['new']['username'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome));
            
            $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
         $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
			
         exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome));
         exec("chown ".$this->data['new']['puser'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome));
            
            exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome));
            exec("chown ".$this->data['new']['puser'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome));
				
            $this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
				
         }	
         $this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
   }