From c38140ba6cfaf282167cf44beac6ab738fd016d8 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Mon, 29 Oct 2012 10:56:59 -0400
Subject: [PATCH] Fixed: aps_instances_settings should NOT be read from dbmaster. slave servers have no rights to select/update this database table on master.

---
 server/cron_daily.php |  394 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 315 insertions(+), 79 deletions(-)

diff --git a/server/cron_daily.php b/server/cron_daily.php
index d8a7b64..f0d5f57 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2012, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -39,7 +39,7 @@
 
 
 // Load required base-classes
-$app->uses('ini_parser,file,services,getconf');
+$app->uses('ini_parser,file,services,getconf,system');
 
 
 #######################################################################################################
@@ -113,7 +113,7 @@
 }
 
 
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type FROM web_domain WHERE stats_type = 'webalizer' AND server_id = ".$conf['server_id'];
 $records = $app->db->queryAllRecords($sql);
 
 foreach($records as $rec) {
@@ -128,10 +128,12 @@
 	}
 
 	$domain = escapeshellcmd($rec['domain']);
-	$statsdir = escapeshellcmd($rec['document_root'].'/web/stats');
+	$statsdir = escapeshellcmd($rec['document_root'].'/'.($rec['type'] == 'vhostsubdomain' ? $rec['web_folder'] : 'web').'/stats');
 	$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);
@@ -152,7 +154,7 @@
 // Create awstats statistics
 #######################################################################################################
 
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE stats_type = 'awstats' AND server_id = ".$conf['server_id'];
+$sql = "SELECT domain_id, domain, document_root, web_folder, type, system_user, system_group FROM web_domain WHERE stats_type = 'awstats' AND server_id = ".$conf['server_id'];
 $records = $app->db->queryAllRecords($sql);
 
 $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -167,53 +169,53 @@
 			continue;
 		}
 	}
-	
+    $web_folder = ($rec['type'] == 'vhostsubdomain' ? $rec['web_folder'] : 'web');
 	$domain = escapeshellcmd($rec['domain']);
-	$statsdir = escapeshellcmd($rec['document_root'].'/web/stats');
+	$statsdir = escapeshellcmd($rec['document_root'].'/'.$web_folder.'/stats');
 	$awstats_pl = $web_config['awstats_pl'];
 	$awstats_buildstaticpages_pl = $web_config['awstats_buildstaticpages_pl'];
-	
+
 	$awstats_conf_dir = $web_config['awstats_conf_dir'];
 	$awstats_website_conf_file = $web_config['awstats_conf_dir'].'/awstats.'.$domain.'.conf';
-	
+
 	if(is_file($awstats_website_conf_file)) unlink($awstats_website_conf_file);
-	
-	$sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR AND type = 'subdomain') server_id = ".$conf['server_id'];
+
+	$sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') AND parent_domain_id = ".$rec['domain_id'];
 	$aliases = $app->db->queryAllRecords($sql);
 	$aliasdomain = '';
-	
+
 	if(is_array($aliases)) {
 		foreach ($aliases as $alias) {
 			$aliasdomain.= ' '.$alias['domain']. ' www.'.$alias['domain'];
 		}
 	}
-	
+
 	if(!is_file($awstats_website_conf_file)) {
 		$awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
 LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
 SiteDomain="'.$domain.'"
-HostAliases="www.'.$domain.' localhost 127.0.0.1"'.$aliasdomain;
+HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
 		file_put_contents($awstats_website_conf_file,$awstats_conf_file_content);
 	}
-	
+
 	if(!@is_dir($statsdir)) mkdir($statsdir);
 	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("n");
+	$awyear = date("Y");
+
+	if (date("d") == 1) {
 		$awmonth = date("m")-1;
+		if (date("m") == 1) {
+			$awyear = date("Y")-1;
+			$awmonth = "12";
+		}
 	}
 
-	$awyear = date("Y");
-	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
+	// awstats_buildstaticpages.pl -update -config=mydomain.com -lang=en -dir=/var/www/domain.com/'.$web_folder.'/stats -awstatsprog=/path/to/awstats.pl
 	// $command = "$awstats_buildstaticpages_pl -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
-	
+
 	$command = "$awstats_buildstaticpages_pl -month='$awmonth' -year='$awyear' -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
 
 	if (date("d") == 2) {
@@ -227,22 +229,33 @@
 		mkdir($statsdirold);
 		$files = scandir($statsdir);
 		foreach ($files as $file) {
-			if (substr($file,0,1) != "." && !is_dir($file) && substr($file,0,1) != "w" && substr($file,0,1) != "i") copy("$statsdir"."/"."$file","$statsdirold"."$file");
+			if (substr($file,0,1) != "." && !is_dir("$statsdir"."/"."$file") && substr($file,0,1) != "w" && substr($file,0,1) != "i") copy("$statsdir"."/"."$file","$statsdirold"."$file");
 		}
 	}
-	
-	
+
+
 	if($awstats_pl != '' && $awstats_buildstaticpages_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_buildstaticpages_pl) == 0) {
 		exec($command);
-		if(is_file($rec['document_root'].'/web/stats/index.html')) unlink($rec['document_root'].'/web/stats/index.html');
-		rename($rec['document_root'].'/web/stats/awstats.'.$domain.'.html',$rec['document_root'].'/web/stats/awsindex.html');
-		if(!is_file($rec['document_root']."/web/stats/index.php")) copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/web/stats/index.php");
-		
+		if(is_file($rec['document_root'].'/'.$web_folder.'/stats/index.html')) unlink($rec['document_root'].'/'.$web_folder.'/stats/index.html');
+		rename($rec['document_root'].'/'.$web_folder.'/stats/awstats.'.$domain.'.html',$rec['document_root'].'/'.$web_folder.'/stats/awsindex.html');
+		if(!is_file($rec['document_root']."/".$web_folder."/stats/index.php")) {
+			if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+				copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+			} else {
+				copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+			}
+		}
+
 		$app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
 	} else {
 		$app->log("No awstats statistics created. Either $awstats_pl or $awstats_buildstaticpages_pl is not owned by root user.",LOGLEVEL_WARN);
 	}
-	
+
+	if(is_file($rec['document_root']."/".$web_folder."/stats/index.php")) {
+		chown($rec['document_root']."/".$web_folder."/stats/index.php",$rec['system_user']);
+		chgrp($rec['document_root']."/".$web_folder."/stats/index.php",$rec['system_group']);
+	}
+
 }
 
 
@@ -250,23 +263,55 @@
 // Make the web logfiles directories world readable to enable ftp access
 #######################################################################################################
 
-exec('chmod +r /var/log/ispconfig/httpd/*');
+if(is_dir('/var/log/ispconfig/httpd')) exec('chmod +r /var/log/ispconfig/httpd/*');
 
 #######################################################################################################
-// Manage and compress web logfiles
+// Manage and compress web logfiles and create traffic statistics
 #######################################################################################################
 
 $sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf['server_id'];
 $records = $app->db->queryAllRecords($sql);
 foreach($records as $rec) {
-	$yesterday = date('Ymd',time() - 86400*2);
-	$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
+
+	//* create traffic statistics based on yesterdays access log file
+	$yesterday = date('Ymd',time() - 86400);
+	$logfile = $rec['document_root'].'/log/'.$yesterday.'-access.log';
+	$total_bytes = 0;
+
+	$handle = @fopen($logfile, "r");
+	if ($handle) {
+		while (($line = fgets($handle, 4096)) !== false) {
+			if (preg_match('/^\S+ \S+ \S+ \[.*?\] "\S+.*?" \d+ (\d+) ".*?" ".*?"/', $line, $m)) {
+				$total_bytes += intval($m[1]);
+			}
+		}
+
+		//* Insert / update traffic in master database
+		$traffic_date = date('Y-m-d',time() - 86400);
+		$tmp = $app->dbmaster->queryOneRecord("select hostname from web_traffic where hostname='".$rec['domain']."' and traffic_date='".$traffic_date."'");
+		if(is_array($tmp) && count($tmp) > 0) {
+			$sql = "update web_traffic set traffic_bytes=traffic_bytes+"
+                  . $total_bytes
+                  . " where hostname='" . $rec['domain']
+                  . "' and traffic_date='" . $traffic_date . "'";
+		} else {
+			$sql = "insert into web_traffic (hostname, traffic_date, traffic_bytes) values ('".$rec['domain']."', '".$traffic_date."', '".$total_bytes."')";
+		}
+		$app->dbmaster->query($sql);
+
+		fclose($handle);
+	}
+
+	$yesterday2 = date('Ymd',time() - 86400*2);
+	$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday2.'-access.log');
+
+	//* Compress logfile
 	if(@is_file($logfile)) {
 		// Compress yesterdays logfile
 		exec("gzip -c $logfile > $logfile.gz");
 		unlink($logfile);
 	}
-	
+
 	// rotate and compress the error.log when it exceeds a size of 10 MB
 	$logfile = escapeshellcmd($rec['document_root'].'/log/error.log');
 	if(is_file($logfile) && filesize($logfile) > 10000000) {
@@ -280,13 +325,13 @@
 	if(@is_file($logfile)) {
 		unlink($logfile);
 	}
-	
+
 	//* Delete older Log files, in case that we missed them before due to serverdowntimes.
 	$datepart = date('Ym',time() - 86400 * 31 * 2);
-	
+
 	$logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log.gz';
 	exec('rm -f '.$logfile);
-	
+
 	$logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log';
 	exec('rm -f '.$logfile);
 }
@@ -304,6 +349,13 @@
 
 // rotate the cron.log when it exceeds a size of 10 MB
 $logfile = $conf['ispconfig_log_dir'].'/cron.log';
+if(is_file($logfile) && filesize($logfile) > 10000000) {
+	exec("gzip -c $logfile > $logfile.1.gz");
+	exec("cat /dev/null > $logfile");
+}
+
+// rotate the auth.log when it exceeds a size of 10 MB
+$logfile = $conf['ispconfig_log_dir'].'/auth.log';
 if(is_file($logfile) && filesize($logfile) > 10000000) {
 	exec("gzip -c $logfile > $logfile.1.gz");
 	exec("cat /dev/null > $logfile");
@@ -401,10 +453,12 @@
 
 if ($app->dbmaster == $app->db) {
 
+	$global_config = $app->getconf->get_global_config('mail');
+	
 	$current_month = date('Y-m');
 
 	//* Check website traffic quota
-	$sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE traffic_quota > 0 and type = 'vhost'";
+	$sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE (traffic_quota > 0 or traffic_quota_lock = 'y') and (type = 'vhost' OR type = 'vhostsubdomain')";
 	$records = $app->db->queryAllRecords($sql);
 	if(is_array($records)) {
 		foreach($records as $rec) {
@@ -424,7 +478,7 @@
 
 			//* get the traffic
 			$tmp = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) As total_traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
-			$web_traffic = (int)$tmp['total_traffic_bytes']/1024/1024;
+			$web_traffic = round($tmp['total_traffic_bytes']/1024/1024);
 
 			//* Website is over quota, we will disable it
 			/*if( ($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) ||
@@ -432,12 +486,63 @@
 				($reseller_traffic_quota > 0 && $web_traffic > $reseller_traffic_quota)) {*/
 			if($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) {
 				$app->dbmaster->datalogUpdate('web_domain', "traffic_quota_lock = 'y',active = 'n'", 'domain_id', $rec['domain_id']);
-				$app->log('Traffic quota for '.$rec['domain_id'].' exceeded. Disabling website.',LOGLEVEL_DEBUG);
+				$app->log('Traffic quota for '.$rec['domain'].' exceeded. Disabling website.',LOGLEVEL_DEBUG);
+				
+				//* Send traffic notifications
+				if($web_config['overtraffic_notify_admin'] == 'y' || $web_config['overtraffic_notify_client'] == 'y') {
+					
+					if(file_exists($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_'.$conf['language'].'.txt')) {
+						$lines = file($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_'.$conf['language'].'.txt');
+					} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_en.txt')) {
+						$lines = file($conf['rootpath'].'/conf-custom/mail/web_traffic_notification_en.txt');
+					} elseif(file_exists($conf['rootpath'].'/conf/mail/web_traffic_notification_'.$conf['language'].'.txt')) {
+						$lines = file($conf['rootpath'].'/conf/mail/web_traffic_notification_'.$conf['language'].'.txt');
+					} else {
+						$lines = file($conf['rootpath'].'/conf/mail/web_traffic_notification_en.txt');
+					}
+					
+					//* Get subject
+					$parts = explode(':',trim($lines[0]));
+					unset($parts[0]);
+					$traffic_mail_subject  = implode(':',$parts);
+					unset($lines[0]);
+		
+					//* Get message
+					$traffic_mail_message = trim(implode($lines));
+					unset($tmp);
+					
+					//* Replace placeholders
+					$traffic_mail_message = str_replace('{domain}',$rec['domain'],$traffic_mail_message);
+						
+					$mailHeaders      = "MIME-Version: 1.0" . "\n";
+					$mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
+					$mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
+					$mailHeaders     .= "From: ". $global_config['admin_mail'] . "\n";
+					$mailHeaders     .= "Reply-To: ". $global_config['admin_mail'] . "\n";
+					$mailSubject      = "=?utf-8?B?".base64_encode($traffic_mail_subject)."?=";
+					
+					//* send email to admin
+					if($global_config['admin_mail'] != '' && $web_config['overtraffic_notify_admin'] == 'y') {
+						mail($global_config['admin_mail'], $mailSubject, $traffic_mail_message, $mailHeaders);
+					}
+					
+					//* Send email to client
+					if($web_config['overtraffic_notify_admin'] == 'y') {
+						$client_group_id = $rec["sys_groupid"];
+						$client = $app->db->queryOneRecord("SELECT client.email FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+						if($client['email'] != '') {
+							mail($client['email'], $mailSubject, $traffic_mail_message, $mailHeaders);
+						}
+					}
+					
+				}
+				
+				
 			} else {
 				//* unlock the website, if traffic is lower then quota
 				if($rec['traffic_quota_lock'] == 'y') {
 					$app->dbmaster->datalogUpdate('web_domain', "traffic_quota_lock = 'n',active = 'y'", 'domain_id', $rec['domain_id']);
-					$app->log('Traffic quota for '.$rec['domain_id'].' ok again. Re-enabling website.',LOGLEVEL_DEBUG);
+					$app->log('Traffic quota for '.$rec['domain'].' ok again. Re-enabling website.',LOGLEVEL_DEBUG);
 				}
 			}
 		}
@@ -473,67 +578,117 @@
 
 $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
 $backup_dir = $server_config['backup_dir'];
+$backup_mode = $server_config['backup_mode'];
+if($backup_mode == '') $backup_mode = 'userzip';
+
+$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
+$http_server_user = $web_config['user'];
 
 if($backup_dir != '') {
-	
+
 	if(isset($server_config['backup_dir_ftpread']) && $server_config['backup_dir_ftpread'] == 'y') {
 		$backup_dir_permissions = 0755;
 	} else {
 		$backup_dir_permissions = 0750;
 	}
-	
+
 	if(!is_dir($backup_dir)) {
 		mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true);
 	} else {
 		chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
 	}
-	
-	$sql = "SELECT * FROM web_domain WHERE type = 'vhost'";
+
+	$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND backup_interval != 'none'";
 	$records = $app->db->queryAllRecords($sql);
 	if(is_array($records)) {
 		foreach($records as $rec) {
-			
-			// Create a backup
+
+			//* Do the website backup
 			if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
-				
+
 				$web_path = $rec['document_root'];
 				$web_user = $rec['system_user'];
 				$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');
-				exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print | zip -y '.escapeshellarg($web_backup_dir.'/web.zip').' -@');
-				
-				// Rename or remove old backups
-				$backup_copies = intval($rec['backup_copies']);
-				
-				//* delete any older backup copies that previously existed
-				for ($n = $backup_copies; $n <= 10; $n++) {
-					if(is_file($web_backup_dir.'/web.'.$n.'.zip')) unlink($web_backup_dir.'/web.'.$n.'.zip');
+				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');
+				}*/
+				if($backup_mode == 'userzip') {
+					//* Create a .zip backup as web user and include also files owned by apache / nginx user
+					$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.zip';
+					exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print 2> /dev/null | zip -b /tmp --exclude=backup\* --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@');
+					exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -user '.escapeshellarg($http_server_user).' -print 2> /dev/null | zip -b /tmp --exclude=backup\* --update --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@');
+				} else {
+					//* Create a tar.gz backup as root user
+					$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.tar.gz';
+					exec('tar pczf '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' --exclude=backup\* --directory '.escapeshellarg($web_path).' .');
 				}
+				chown($web_backup_dir.'/'.$web_backup_file, 'root');
+				chgrp($web_backup_dir.'/'.$web_backup_file, 'root');
+				chmod($web_backup_dir.'/'.$web_backup_file, 0750);
+
+				//* Insert web backup record in database
+				//$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
+				//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
+				$sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
+				$app->db->query($sql);
+				$app->dbmaster->query($sql);
 				
-				for($n = $backup_copies - 1; $n >= 1; $n--) {
-					if(is_file($web_backup_dir.'/web.'.$n.'.zip')) {
-						rename($web_backup_dir.'/web.'.$n.'.zip',$web_backup_dir.'/web.'.($n+1).'.zip');
+				//* Remove old backups
+				$backup_copies = intval($rec['backup_copies']);
+
+				$dir_handle = dir($web_backup_dir);
+				$files = array();
+				while (false !== ($entry = $dir_handle->read())) {
+					if($entry != '.' && $entry != '..' && substr($entry,0,3) == 'web' && is_file($web_backup_dir.'/'.$entry)) {
+						$files[] = $entry;
 					}
 				}
-			
-				if(is_file($web_backup_dir.'/web.zip')) rename($web_backup_dir.'/web.zip',$web_backup_dir.'/web.1.zip');
-			
-				// 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);
+				$dir_handle->close();
+
+				rsort($files);
+
+				for ($n = $backup_copies; $n <= 10; $n++) {
+					if(isset($files[$n]) && is_file($web_backup_dir.'/'.$files[$n])) {
+						unlink($web_backup_dir.'/'.$files[$n]);
+						$sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'";
+						$tmp = $app->dbmaster->queryOneRecord($sql);
+						//$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']);
+						$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
+						$app->db->query($sql);
+						$app->dbmaster->query($sql);
+					}
+				}
+
+				unset($files);
+				unset($dir_handle);
+
+				//* Remove backupdir symlink and create as directory instead
+				$app->uses('system');
+				$app->system->web_folder_protection($web_path,false);
 				
+				if(is_link($web_path.'/backup')) {
+					unlink($web_path.'/backup');
+				}
+				if(!is_dir($web_path.'/backup')) {
+					mkdir($web_path.'/backup');
+					chown($web_path.'/backup', $rec['system_user']);
+					chgrp($web_path.'/backup', $rec['system_group']);
+				}
+				
+				$app->system->web_folder_protection($web_path,true);
+
 			}
-			
-			/* If backup_interval is set to none and we have a 
+
+			/* If backup_interval is set to none and we have a
 			backup directory for the website, then remove the backups */
-			
 			if($rec['backup_interval'] == 'none') {
 				$web_id = $rec['domain_id'];
 				$web_user = $rec['system_user'];
@@ -544,6 +699,87 @@
 			}
 		}
 	}
+
+	$sql = "SELECT * FROM web_database WHERE server_id = '".$conf['server_id']."' AND backup_interval != 'none'";
+	$records = $app->db->queryAllRecords($sql);
+	if(is_array($records)) {
+
+		include('lib/mysql_clientdb.conf');
+
+		foreach($records as $rec) {
+
+			//* Do the database backup
+			if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
+
+				$web_id = $rec['parent_domain_id'];
+				$db_backup_dir = $backup_dir.'/web'.$web_id;
+				if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0750);
+				chmod($web_backup_dir, 0750);
+				chown($web_backup_dir, 'root');
+				chgrp($web_backup_dir, 'root');
+
+				//* Do the mysql database backup with mysqldump
+				$db_id = $rec['database_id'];
+				$db_name = $rec['database_name'];
+				$db_backup_file = 'db_'.$db_name.'_'.date('Y-m-d_H-i').'.sql';
+				$command = "mysqldump -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' -c --add-drop-table --create-options --quick --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'";
+				exec($command);
+
+				//* Compress the backup with gzip
+				exec("gzip -c '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'");
+				chmod($db_backup_dir.'/'.$db_backup_file.'.gz', 0750);
+				chown($db_backup_dir.'/'.$db_backup_file.'.gz', fileowner($db_backup_dir));
+				chgrp($db_backup_dir.'/'.$db_backup_file.'.gz', filegroup($db_backup_dir));
+
+				//* Insert web backup record in database
+				//$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",$web_id,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz')";
+				//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
+				$sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",$web_id,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz')";
+				$app->db->query($sql);
+				$app->dbmaster->query($sql);
+
+				//* Remove the uncompressed file
+				unlink($db_backup_dir.'/'.$db_backup_file);
+
+				//* Remove old backups
+				$backup_copies = intval($rec['backup_copies']);
+
+				$dir_handle = dir($db_backup_dir);
+				$files = array();
+				while (false !== ($entry = $dir_handle->read())) {
+					if($entry != '.' && $entry != '..' && preg_match('/^db_(.*?)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql.gz$/', $entry, $matches) && is_file($db_backup_dir.'/'.$entry)) {
+                        if(array_key_exists($matches[1], $files) == false) $files[$matches[1]] = array();
+						$files[$matches[1]][] = $entry;
+					}
+				}
+				$dir_handle->close();
+                
+                reset($files);
+                foreach($files as $db_name => $filelist) {
+                    rsort($filelist);
+                    for ($n = $backup_copies; $n <= 10; $n++) {
+                        if(isset($filelist[$n]) && is_file($db_backup_dir.'/'.$filelist[$n])) {
+                            unlink($db_backup_dir.'/'.$filelist[$n]);
+                            $sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($filelist[$n])."'";
+                            $tmp = $app->dbmaster->queryOneRecord($sql);
+                            //$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']);
+                            $sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
+                            $app->db->query($sql);
+                            $app->dbmaster->query($sql);
+                        }
+                    }
+                }
+
+				unset($files);
+				unset($dir_handle);
+			}
+		}
+
+		unset($clientdb_host);
+		unset($clientdb_user);
+		unset($clientdb_password);
+
+	}
 }
 
 

--
Gitblit v1.9.1