ISPConfig3 devel
parent: aea33775 | patch | commit | ignore whitespace
ftimme
2012-09-14 94d2cf4cff79138a836b27f626ee94485e58adec 
- Make sure ISPConfig doesn't overwrite the system's motd file when creating a chrooted cron job.
2 files modified
10 ■■■■■ changed files
server/plugins-available/cron_jailkit_plugin.inc.php 4 ●●●●● patch | view | raw | blame | history
server/plugins-available/shelluser_jailkit_plugin.inc.php 6 ●●●●● patch | view | raw | blame | history 
 server/plugins-available/cron_jailkit_plugin.inc.php


@@ -236,7 +236,7 @@


                $tpl->setVar('home_dir',$this->_get_home_dir(""));


                


                $bashrc = escapeshellcmd($this->parent_domain['document_root']).'/etc/bash.bashrc';


                if(@is_file($bashrc)) unlink($bashrc);


                if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);


                


                file_put_contents($bashrc,$tpl->grab());


                unset($tpl);


@@ -249,7 +249,7 @@


                $tpl->setVar('domain',$this->parent_domain['domain']);


                


                $motd = escapeshellcmd($this->parent_domain['document_root']).'/var/run/motd';


                if(@is_file($motd)) unlink($motd);


                if(@is_file($motd) || @is_link($motd)) unlink($motd);


                


                file_put_contents($motd,$tpl->grab());


                




 server/plugins-available/shelluser_jailkit_plugin.inc.php


@@ -227,12 +227,12 @@


                $tpl->setVar('home_dir',$this->_get_home_dir(""));


                


                $bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';


                if(@is_file($bashrc)) unlink($bashrc);


                if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);


                


                file_put_contents($bashrc,$tpl->grab());


                unset($tpl);


                


                $this->app->log("Added bashrc scrpt : ".$bashrc,LOGLEVEL_DEBUG);


                $this->app->log("Added bashrc script : ".$bashrc,LOGLEVEL_DEBUG);


                


                $tpl = new tpl();


                $tpl->newTemplate("motd.master");


@@ -240,7 +240,7 @@


                $tpl->setVar('domain',$web['domain']);


                


                $motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';


                if(@is_file($motd)) unlink($motd);


                if(@is_file($motd) || @is_link($motd)) unlink($motd);


                


                file_put_contents($motd,$tpl->grab());