Merged revisions 2681-2739 from 3.0.4 stable branch.

tbrehm

2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d

 server/cron_daily.php

@@ -132,6 +132,8 @@
   $webalizer = '/usr/bin/webalizer';
   $webalizer_conf_main = '/etc/webalizer/webalizer.conf';
   $webalizer_conf = escapeshellcmd($rec['document_root'].'/log/webalizer.conf');
	
   if(is_file($statsdir.'/index.php')) unlink($statsdir.'/index.php');

   if(!@is_file($webalizer_conf)) {
      copy($webalizer_conf_main,$webalizer_conf);
@@ -200,15 +202,15 @@
   if(is_link('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log')) unlink('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log');
   symlink($logfile,'/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log');
   
   $awmonth = date("m");
   if (date("d") == 1)   {
      $awmonth = date("m")-1;
   }

   $awmonth = date("n");
   $awyear = date("Y");
   if (date("m") == 1) {
      $awyear = date("Y")-1;
      $awmonth = "12";

   if (date("d") == 1) {
      $awmonth = date("m")-1;
      if (date("m") == 1) {
         $awyear = date("Y")-1;
         $awmonth = "12";
      }
   }
   
   // awstats_buildstaticpages.pl -update -config=mydomain.com -lang=en -dir=/var/www/domain.com/web/stats -awstatsprog=/path/to/awstats.pl
@@ -501,12 +503,19 @@
            $web_group = $rec['system_group'];
            $web_id = $rec['domain_id'];
            $web_backup_dir = $backup_dir.'/web'.$web_id;
            if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0755);
				
            chmod($web_backup_dir, 0755);
            chown($web_backup_dir, 'root');
            chgrp($web_backup_dir, 'root');
            if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0750);
            chmod($web_backup_dir, 0750); 
            if(isset($server_config['backup_dir_ftpread']) && $server_config['backup_dir_ftpread'] == 'y') {
               chown($web_backup_dir, $rec['system_user']); 
               chgrp($web_backup_dir, $rec['system_group']);
            } else {
               chown($web_backup_dir, 'root');
               chgrp($web_backup_dir, 'root');
            }
            exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print | zip -y '.escapeshellarg($web_backup_dir.'/web.zip').' -@');
            chown($web_backup_dir.'/web.zip', $rec['system_user']); 
            chgrp($web_backup_dir.'/web.zip', $rec['system_group']);
            chmod($web_backup_dir.'/web.zip', 0750);
            
            // Rename or remove old backups
            $backup_copies = intval($rec['backup_copies']);
@@ -527,7 +536,9 @@
            // Create backupdir symlink
            if(is_link($web_path.'/backup')) unlink($web_path.'/backup');
            symlink($web_backup_dir,$web_path.'/backup');
            chmod($web_path.'/backup', 0755);
            // chmod($web_path.'/backup', 0755);
            chown($web_path.'/backup', $rec['system_user']); 
            chgrp($web_path.'/backup', $rec['system_group']);
            
         }