From f9d017abbbfff8c8507da79a9010ba0f06b67dac Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 12:24:52 -0400
Subject: [PATCH] Merged revision 1779 (fix of cron_dialy.php) from trunk.
---
server/cron_daily.php | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index d173e20..5edf803 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -36,7 +36,7 @@
// make sure server_id is always an int
$conf["server_id"] = intval($conf["server_id"]);
-
+
// Load required base-classes
$app->uses('ini_parser,file,services');
@@ -49,10 +49,10 @@
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
if(@is_file($rec["maildir"].'/ispconfig_mailsize')) {
-
+
// rename file
rename($rec["maildir"].'/ispconfig_mailsize',$rec["maildir"].'/ispconfig_mailsize_save');
-
+
// Read the file
$lines = file($rec["maildir"].'/ispconfig_mailsize_save');
$mail_traffic = 0;
@@ -60,16 +60,16 @@
$mail_traffic += intval($line);
}
unset($lines);
-
+
// Delete backup file
if(@is_file($rec["maildir"].'/ispconfig_mailsize_save')) unlink($rec["maildir"].'/ispconfig_mailsize_save');
-
+
// Save the traffic stats in the sql database
$tstamp = date("Y-m");
-
+
$sql = "SELECT * FROM mail_traffic WHERE month = '$tstamp' AND mailuser_id = ".$rec["mailuser_id"];
$tr = $app->dbmaster->queryOneRecord($sql);
-
+
$mail_traffic += $tr["traffic"];
if($tr["traffic_id"] > 0) {
$sql = "UPDATE mail_traffic SET traffic = $mail_traffic WHERE traffic_id = ".$tr["traffic_id"];
@@ -78,9 +78,9 @@
}
$app->dbmaster->query($sql);
echo $sql;
-
+
}
-
+
}
#######################################################################################################
@@ -166,7 +166,7 @@
exec("gzip -c $logfile > $logfile.gz");
unlink($logfile);
}
-
+
// delete logfiles after 30 days
$month_ago = date("Ymd",time() - 86400 * 30);
$logfile = escapeshellcmd($rec["document_root"].'/log/'.$month_ago.'-access.log.gz');
@@ -179,7 +179,6 @@
// Cleanup website tmp directories
#######################################################################################################
-/*
$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
$records = $app->db->queryAllRecords($sql);
$app->uses('system');
@@ -187,22 +186,7 @@
foreach($records as $rec){
$tmp_path = realpath(escapeshellcmd($rec["document_root"].'/tmp'));
if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
- exec("cd ".$tmp_path."; find -ctime +1 -user ".escapeshellcmd($rec['system_user'])." | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
- if($app->system->is_user('www-data')) exec("cd ".$tmp_path."; find -ctime +1 -user www-data | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
- if($app->system->is_user('wwwrun')) exec("cd ".$tmp_path."; find -ctime +1 -user wwwrun | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
- }
- }
-}
-*/
-
-$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
-$records = $app->db->queryAllRecords($sql);
-$app->uses('system');
-if(is_array($records)) {
- foreach($records as $rec){
- $tmp_path = realpath(escapeshellcmd($rec["document_root"].'/tmp'));
- if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
- exec("cd ".$tmp_path."; find -mtime +2 -name 'sess_*' | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
+ exec("cd ".$tmp_path."; find -mtime +1 -name 'sess_*' | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
}
}
}
@@ -270,30 +254,30 @@
if ($app->dbmaster == $app->db) {
$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'";
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) {
foreach($records as $rec) {
-
+
$web_traffic_quota = $rec['traffic_quota'];
$domain = $rec['domain'];
-
+
// get the client
/*
$client_group_id = $rec["sys_groupid"];
$client = $app->db->queryOneRecord("SELECT limit_traffic_quota,parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
$reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota FROM client WHERE client_id = ".intval($client['parent_client_id']));
-
+
$client_traffic_quota = intval($client['limit_traffic_quota']);
$reseller_traffic_quota = intval($reseller['limit_traffic_quota']);
*/
-
+
//* get the traffic
- $tmp = $app->db->queryOneRecord("SELECT traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
- $web_traffic = $tmp['traffic_bytes']/1024/1024;
-
+ $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;
+
//* Website is over quota, we will disable it
/*if( ($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) ||
($client_traffic_quota > 0 && $web_traffic > $client_traffic_quota) ||
@@ -310,8 +294,8 @@
}
}
}
-
-
+
+
}
--
Gitblit v1.9.1