diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 72bd38e7..efd2d0f9 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -667,12 +667,8 @@ class apache // After inserting the AWStats information, // be sure to build the awstats conf file as well // and chown it using $awstats_params, #258 - $awstats_params = array( - 'loginname' => $domain['loginname'], - 'guid' => $domain['guid'], - 'documentroot' => $domain['documentroot'] - ); - createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params); + // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations + createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain); } } diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index a9d33955..986318a9 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -618,12 +618,8 @@ class lighttpd // After inserting the AWStats information, // be sure to build the awstats conf file as well // and chown it using $awstats_params, #258 - $awstats_params = array( - 'loginname' => $domain['loginname'], - 'guid' => $domain['guid'], - 'documentroot' => $domain['documentroot'] - ); - createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params); + // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations + createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain); } } diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 9c82d593..b1d552fc 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -855,12 +855,8 @@ class nginx // After inserting the AWStats information, // be sure to build the awstats conf file as well // and chown it using $awstats_params, #258 - $awstats_params = array( - 'loginname' => $domain['loginname'], - 'guid' => $domain['guid'], - 'documentroot' => $domain['documentroot'] - ); - createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params); + // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations + createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain); } }