diff --git a/actions/admin/settings/140.statistics.php b/actions/admin/settings/140.statistics.php index a8a09fe3..cbb19b97 100644 --- a/actions/admin/settings/140.statistics.php +++ b/actions/admin/settings/140.statistics.php @@ -49,6 +49,15 @@ return array( 'default' => '/usr/bin/', 'save_method' => 'storeSettingField', ), + 'system_awstats_awstatspath' => array( + 'label' => $lng['serversettings']['awstats_awstatspath'], + 'settinggroup' => 'system', + 'varname' => 'awstats_awstatspath', + 'type' => 'string', + 'string_type' => 'dir', + 'default' => '/usr/bin/', + 'save_method' => 'storeSettingField', + ), 'system_awstats_conf' => array( 'label' => $lng['serversettings']['awstats_conf'], 'settinggroup' => 'system', diff --git a/install/froxlor.sql b/install/froxlor.sql index b3c7bc30..87d74c4b 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -455,7 +455,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.12-svn3'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.12-svn4'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); @@ -583,6 +583,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (148, 'system', 'mod_fcgid_httpgroup', 'froxlorlocal'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (149, 'perl', 'suexecworkaround', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (150, 'perl', 'suexecpath', '/var/www/cgi-bin/'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (151, 'system', 'awstats_awstatspath', '/usr/bin/'); # -------------------------------------------------------- diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 2ede4bc1..073ed2af 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -960,7 +960,7 @@ if(isFroxlorVersion('0.9.12-svn1')) showUpdateStep("Updating from 0.9.12-svn1 to 0.9.12-svn2", false); $update_perl_suexecworkaround = isset($_POST['update_perl_suexecworkaround']) ? (int)$_POST['update_perl_suexecworkaround'] : '0'; - $update_perl_suexecpath = isset($_POST['update_perl_suexecpath']) ? $_POST['update_perl_suexecpath'] : '/var/www/cgi-bin/'; + $update_perl_suexecpath = isset($_POST['update_perl_suexecpath']) ? makeCorrectPath($_POST['update_perl_suexecpath']) : '/var/www/cgi-bin/'; if($update_perl_suexecpath == '') { $update_perl_suexecpath = '/var/www/cgi-bin/'; @@ -984,3 +984,16 @@ if(isFroxlorVersion('0.9.12-svn2')) updateToVersion('0.9.12-svn3'); } + +if(isFroxlorVersion('0.9.12-svn3')) +{ + showUpdateStep("Updating from 0.9.12-svn3 to 0.9.12-svn4", false); + + $update_awstats_awstatspath = isset($_POST['update_awstats_awstatspath']) ? makeCorrectPath($_POST['update_awstats_awstatspath']) : $settings['system']['awstats_path']; + + showUpdateStep("Adding new settings for awstats"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_awstatspath', '".$db->escape($update_awstats_awstatspath)."');"); + lastStepStatus(0); + + updateToVersion('0.9.12-svn4'); +} diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 705c7c49..ce563638 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -267,4 +267,16 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) $question.= '
'; eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } + + if(versionInUpdate($current_version, '0.9.12-svn4')) + { + if((int)$settings['system']['awstats_enabled'] == 1) + { + $has_preconfig = true; + $description = 'Due to different paths of awstats_buildstaticpages.pl and awstats.pl you can set a different path for awstats.pl now.'; + $question = 'Path to \'awstats.pl\'?: '; + $question.= '
'; + eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + } + } } diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 099f21c4..b69e9602 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.12-svn3'; +$version = '0.9.12-svn4'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index ac6b26bc..514105b9 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1487,4 +1487,7 @@ $lng['admin']['templates']['USR_NAME'] = 'FTP username'; $lng['admin']['templates']['USR_PASS'] = 'FTP password'; $lng['admin']['templates']['USR_PATH'] = 'FTP homedir (relative to customer-docroot)'; +// ADDED IN FROXLOR 0.9.12-svn4 +$lng['serversettings']['awstats_awstatspath'] = 'Path to AWStats \'awstats.pl\''; + ?> diff --git a/lng/german.lng.php b/lng/german.lng.php index 95f92fb2..e9c47165 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1470,4 +1470,7 @@ $lng['admin']['templates']['USR_NAME'] = 'FTP Benutzername'; $lng['admin']['templates']['USR_PASS'] = 'FTP Passwort'; $lng['admin']['templates']['USR_PATH'] = 'FTP Heimatverzeichnis (relativ zum Kunden-Heimatverzeichnis)'; +// ADDED IN FROXLOR 0.9.12-svn4 +$lng['serversettings']['awstats_awstatspath'] = 'Pfad zu AWStats \'awstats.pl\''; + ?> diff --git a/scripts/jobs/cron_traffic.inc.functions.php b/scripts/jobs/cron_traffic.inc.functions.php index a246642f..f95eb517 100644 --- a/scripts/jobs/cron_traffic.inc.functions.php +++ b/scripts/jobs/cron_traffic.inc.functions.php @@ -78,7 +78,7 @@ function awstatsDoSingleDomain($domain, $outputdir) * check for correct path of awstats_buildstaticpages.pl */ $awbsp = makeCorrectFile($settings['system']['awstats_path'].'/awstats_buildstaticpages.pl'); - $awprog = makeCorrectFile($settings['system']['awstats_path'].'/awstats.pl'); + $awprog = makeCorrectFile($settings['system']['awstats_awstatspath'].'/awstats.pl'); if (!file_exists($awbsp)) { echo "WANRING: Necessary awstats_buildstaticpages.pl script could not be found, no traffic is being calculated and no stats are generated. Please check your AWStats-Path setting";