From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
server/cron_daily.php | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 388c327..58019f5 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -154,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, 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');
@@ -180,7 +180,7 @@
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 = '';
@@ -194,7 +194,7 @@
$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);
}
@@ -245,6 +245,11 @@
$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/stats/index.php")) {
+ chown($rec['document_root']."/web/stats/index.php",$rec['system_user']);
+ chgrp($rec['document_root']."/web/stats/index.php",$rec['system_group']);
+ }
+
}
@@ -255,14 +260,46 @@
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");
@@ -406,7 +443,7 @@
$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'";
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) {
foreach($records as $rec) {
--
Gitblit v1.9.1