Fixed: FS#2398 - Setting autoresponder start/end dates for a mailbox fails

tbrehm

2012-10-17 1c73edaf45252dfadc3e04a8f6b5eff38ef8ba04

 server/plugins-available/cron_jailkit_plugin.inc.php

@@ -117,6 +117,8 @@
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
            
            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($parent_domain['document_root'],false);
         
            $this->_setup_jailkit_chroot();
            
@@ -126,6 +128,8 @@
            exec($command);
            
            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($parent_domain['document_root'],true);
         }
      
         $app->log("Jailkit Plugin (Cron) -> insert username:".$parent_domain['system_user'],LOGLEVEL_DEBUG);
@@ -181,13 +185,16 @@
            $this->data = $data;
            $this->app = $app;
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
				

            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($parent_domain['document_root'],false);
         
            $this->_setup_jailkit_chroot();
            $this->_add_jailkit_user();
            
            $this->_update_website_security_level();
            $app->system->web_folder_protection($parent_domain['document_root'],true);
         }
      
         $app->log("Jailkit Plugin (Cron) -> update username:".$parent_domain['system_user'],LOGLEVEL_DEBUG);
@@ -230,7 +237,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);
@@ -243,7 +250,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());
            
@@ -291,8 +298,8 @@
         $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
            
         mkdir(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), 0755, true);
         chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome, escapeshellcmd($this->parent_domain['system_user']));
         chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome, escapeshellcmd($this->parent_domain['system_group']));
         chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_user']));
         chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_group']));
         
   }
   
@@ -308,13 +315,18 @@
      // load the server configuration options
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
				
      //* If the security level is set to high
      if($web_config['security_level'] == 20) {
         $this->_exec('chmod 755 '.escapeshellcmd($this->parent_domain['document_root']));
         $this->_exec('chown root:root '.escapeshellcmd($this->parent_domain['document_root']));
      }
      
      // Get the parent website of this shell user
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$this->data['new']['parent_domain_id']);
		
      //* If the security level is set to high
      if($web_config['security_level'] == 20 && is_array($web)) {
         $app->system->web_folder_protection($web["document_root"],false);
         $app->system->chmod($web["document_root"],0755);
         $app->system->chown($web["document_root"],'root');
         $app->system->chgrp($web["document_root"],'root');
         $app->system->web_folder_protection($web["document_root"],true);
      }
   }
   
   //* Wrapper for exec function for easier debugging