diff --git a/interface/web/sites/templates/ftp_sites_stats_list.htm b/interface/web/sites/templates/ftp_sites_stats_list.htm index 9474bb2fdad7317888fe2e410909df0797a52729..f6739552fcd750b5dd3742bdfbfcd112c1910e98 100644 --- a/interface/web/sites/templates/ftp_sites_stats_list.htm +++ b/interface/web/sites/templates/ftp_sites_stats_list.htm @@ -30,10 +30,10 @@ {tmpl_var name="domain"} - {tmpl_var name="this_month_in"}/{tmpl_var name="this_month_out"} - {tmpl_var name="last_month_in"}/{tmpl_var name="last_month_out"} - {tmpl_var name="this_year_in"}/{tmpl_var name="this_year_out"} - {tmpl_var name="last_year_in"}/{tmpl_var name="last_year_out"} + {tmpl_var name="this_month_in"}/{tmpl_var name="this_month_out"} + {tmpl_var name="last_month_in"}/{tmpl_var name="last_month_out"} + {tmpl_var name="this_year_in"}/{tmpl_var name="this_year_out"} + {tmpl_var name="last_year_in"}/{tmpl_var name="last_year_out"} diff --git a/server/lib/classes/cron.d/200-ftplogfiles.inc.php b/server/lib/classes/cron.d/200-ftplogfiles.inc.php index 36b43352404153dcde58ee8e857de9bd6830011d..a88a360ae2cb32ff99face8352686f43bf7a2a07 100644 --- a/server/lib/classes/cron.d/200-ftplogfiles.inc.php +++ b/server/lib/classes/cron.d/200-ftplogfiles.inc.php @@ -32,7 +32,17 @@ class cronjob_ftplogfiles extends cronjob { // Make the ftp logfiles directories world readable to enable ftp access //###################################################################################################### - if(is_dir('/var/log/pure-ftpd/')) exec('chmod +r /var/log/pure-ftpd/*'); + $logfile = null; + + if(is_dir('/var/log/pure-ftpd/')) { + exec('chmod +r /var/log/pure-ftpd/*'); + $logfile="/var/log/pure-ftpd/transfer.log.1"; + } elseif(is_file('/var/log/pureftpd.log')) { + $logfile="/var/log/pureftpd.log"; + } else { + $app->log("The pure-ftpd log file could not be found.", LOGLEVEL_DEBUG); + return false; + } //###################################################################################################### // Manage and compress ftp logfiles and create traffic statistics @@ -71,7 +81,7 @@ class cronjob_ftplogfiles extends cronjob { } } - $fp = @fopen('/var/log/pure-ftpd/transfer.log.1', 'r'); + $fp = @fopen($logfile, 'r'); $ftp_traffic = array(); if ($fp) {