diff --git a/actions/admin/settings/140.statistics.php b/actions/admin/settings/140.statistics.php index cbb19b97..24f238a8 100644 --- a/actions/admin/settings/140.statistics.php +++ b/actions/admin/settings/140.statistics.php @@ -66,6 +66,15 @@ return array( 'string_type' => 'dir', 'default' => '/etc/awstats/', 'save_method' => 'storeSettingField', + ), + 'system_awstats_icons' => array( + 'label' => $lng['serversettings']['awstats_icons'], + 'settinggroup' => 'system', + 'varname' => 'awstats_icons', + 'type' => 'string', + 'string_type' => 'dir', + 'default' => '/usr/share/awstats/icon/', + 'save_method' => 'storeSettingField', ) ) ) diff --git a/install/froxlor.sql b/install/froxlor.sql index 2dee75a2..044bbfcb 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -460,7 +460,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.14-svn2'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.14-svn3'); 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'); @@ -590,6 +590,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V 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/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (152, 'system', 'mod_fcgid_defaultini_ownvhost', '1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (153, 'system', 'awstats_icons', '/usr/share/awstats/icon/'); # -------------------------------------------------------- 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 52d15b39..f271d820 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1109,3 +1109,16 @@ if(isFroxlorVersion('0.9.13.1')) } updateToVersion('0.9.14-svn2'); } + +if(isFroxlorVersion('0.9.14-svn2')) +{ + showUpdateStep("Updating from 0.9.14-svn2 to 0.9.14-svn3", false); + + $update_awstats_icons = isset($_POST['update_awstats_icons']) ? makeCorrectDir($_POST['update_awstats_icons']) : $settings['system']['awstats_icons']; + + showUpdateStep("Adding AWStats icons path to the settings"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_icons', '".$db->escape($update_awstats_icons)."');"); + lastStepStatus(0); + + updateToVersion('0.9.14-svn3'); +} 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 179f094b..c6d5a60b 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -310,4 +310,16 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } } + + if(versionInUpdate($current_version, '0.9.14-svn3')) + { + if((int)$settings['system']['awstats_enabled'] == 1) + { + $has_preconfig = true; + $description = 'To have icons in AWStats statistic-pages please enter the path to AWStats icons folder.'; + $question = 'Path to AWSTats icons folder: '; + $question.= ''; + eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + } + } } diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 9229f53f..282eac32 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.14-svn2'; +$version = '0.9.14-svn3'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index 628b87ac..4a926790 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -877,13 +877,6 @@ $lng['pwdreminder']['success'] = 'Password reset successfully.
You now shou $lng['serversettings']['allow_password_reset']['title'] = 'Allow password reset by customers'; $lng['pwdreminder']['notallowed'] = 'Password reset is disabled'; -// ADDED IN 1.2.19-svn20 - -$lng['serversettings']['awstats_path']['title'] = 'Path to awstats cgi-bin folder'; -$lng['serversettings']['awstats_path']['description'] = 'e.g. /usr/share/webapps/awstats/6.1/webroot/cgi-bin/'; -$lng['serversettings']['awstats_updateall_command']['title'] = 'Path to "awstats_updateall.pl"'; -$lng['serversettings']['awstats_updateall_command']['description'] = 'e.g. /usr/bin/awstats_updateall.pl'; - // ADDED IN 1.2.19-svn21 $lng['customer']['title'] = 'Title'; @@ -1506,4 +1499,8 @@ $lng['customer']['autoresponder'] = 'Autoresponder'; // ADDED IN FROXLOR 0.9.14-svn1 $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Default PHP configuration for Froxlor-vhost'; +// ADDED IN FROXLOR 0.9.14-svn3 +$lng['serversettings']['awstats_icons']['title'] = 'Path to awstats icons folder'; +$lng['serversettings']['awstats_icons']['description'] = 'e.g. /usr/share/awstats/htdocs/icon/'; + ?> diff --git a/lng/french.lng.php b/lng/french.lng.php index 6f5ba37d..511f152e 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -894,13 +894,6 @@ $lng['pwdreminder']['success'] = 'Mot de passe correctement r $lng['serversettings']['allow_password_reset']['title'] = 'Permettre aux clients de réinitialiser leurs mots de passe'; $lng['pwdreminder']['notallowed'] = 'La réinitialisation des mots de passe est désactivée.'; -// ADDED IN 1.2.19-svn20 - -$lng['serversettings']['awstats_path']['title'] = 'Dossier CGI-BIN de AWStats'; -$lng['serversettings']['awstats_path']['description'] = 'exemple : /var/www/cgi-bin/'; -$lng['serversettings']['awstats_updateall_command']['title'] = 'Emplacement de "awstats_updateall.pl"'; -$lng['serversettings']['awstats_updateall_command']['description'] = 'exemple : /usr/share/awstats/tools/awstats_updateall.pl'; - // ADDED IN 1.2.19-svn21 $lng['customer']['title'] = 'Titre'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 3923c912..d5e807a5 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -881,13 +881,6 @@ $lng['pwdreminder']['success'] = 'Passwort erfolgreich zurückgesetzt.
$lng['serversettings']['allow_password_reset']['title'] = 'Erlaube das Zurücksetzen des Kundenpassworts'; $lng['pwdreminder']['notallowed'] = 'Das Zurücksetzen des Passworts ist deaktiviert'; -// ADDED IN 1.2.19-svn20 - -$lng['serversettings']['awstats_path']['title'] = 'Pfad zum awstats cgi-bin Ordner'; -$lng['serversettings']['awstats_path']['description'] = 'z.B. /usr/share/webapps/awstats/6.1/webroot/cgi-bin/'; -$lng['serversettings']['awstats_updateall_command']['title'] = 'Pfad zu "awstats_updateall.pl"'; -$lng['serversettings']['awstats_updateall_command']['description'] = 'z.B. /usr/bin/awstats_updateall.pl'; - // ADDED IN 1.2.19-svn21 $lng['customer']['title'] = 'Titel'; @@ -1489,4 +1482,8 @@ $lng['customer']['autoresponder'] = 'Abwesenheitsnachrichten'; // ADDED IN FROXLOR 0.9.14-svn1 $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Voreingestellte PHP Konfiguration für den Froxlor-Vhost'; +// ADDED IN FROXLOR 0.9.14-svn3 +$lng['serversettings']['awstats_icons']['title'] = 'Pfad zum Awstats icons Ordner'; +$lng['serversettings']['awstats_icons']['description'] = 'z.B. /usr/share/awstats/htdocs/icon/'; + ?> diff --git a/lng/italian.lng.php b/lng/italian.lng.php index 3863d3f7..940ec7c8 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -877,13 +877,6 @@ $lng['pwdreminder']['success'] = 'La password $lng['serversettings']['allow_password_reset']['title'] = 'Consenti ai clienti di reimpostare la password'; $lng['pwdreminder']['notallowed'] = 'Il reimposta password è disabilitato'; -// ADDED IN 1.2.19-svn20 - -$lng['serversettings']['awstats_path']['title'] = 'Percorso della cartella cgi-bin di awstats'; -$lng['serversettings']['awstats_path']['description'] = 'es. /usr/share/webapps/awstats/6.1/webroot/cgi-bin/'; -$lng['serversettings']['awstats_updateall_command']['title'] = 'Percorso di "awstats_updateall.pl"'; -$lng['serversettings']['awstats_updateall_command']['description'] = 'es. /usr/bin/awstats_updateall.pl'; - // ADDED IN 1.2.19-svn21 $lng['customer']['title'] = 'Titolo'; diff --git a/lng/polish.lng.php b/lng/polish.lng.php index 54d57731..18275015 100644 --- a/lng/polish.lng.php +++ b/lng/polish.lng.php @@ -871,13 +871,6 @@ $lng['pwdreminder']['success'] = 'Password reset successfully.
You now shou $lng['serversettings']['allow_preset'] = 'Zezwalaj na resetowanie hasła przez klientów'; $lng['pwdreminder']['notallowed'] = 'Resetowanie hasła jest nieaktywne'; -// ADDED IN 1.2.19-svn20 - -$lng['serversettings']['awstats_path']['title'] = 'Path to awstats cgi-bin folder'; -$lng['serversettings']['awstats_path']['description'] = 'e.g. /usr/share/webapps/awstats/6.1/webroot/cgi-bin/'; -$lng['serversettings']['awstats_updateall_command']['title'] = 'Path to "awstats_updateall.pl"'; -$lng['serversettings']['awstats_updateall_command']['description'] = 'e.g. /usr/bin/awstats_updateall.pl'; - // ADDED IN 1.2.19-svn21 $lng['customer']['title'] = 'Tytuł'; diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index 340940ad..f69f4ccf 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -772,10 +772,6 @@ $lng['pwdreminder']['body'] = 'Oi %s,\n\nsua senha do Froxlor foi resetada!\nA n $lng['pwdreminder']['success'] = 'Redefinição de senha com sucesso.
Você agora deve receber um e-mail com sua nova senha.'; $lng['serversettings']['allow_password_reset']['title'] = 'Aceita reset de senha por clientes'; $lng['pwdreminder']['notallowed'] = 'Reset de senhas está desativado'; -$lng['serversettings']['awstats_path']['title'] = 'Caminho para pasta awstats cgi-bin'; -$lng['serversettings']['awstats_path']['description'] = 'Exemplo: /usr/share/webapps/awstats/6.1/webroot/cgi-bin/'; -$lng['serversettings']['awstats_updateall_command']['title'] = 'Caminho para "awstats_updateall.pl"'; -$lng['serversettings']['awstats_updateall_command']['description'] = 'Exemplo: /usr/bin/awstats_updateall.pl'; $lng['customer']['title'] = 'Título'; $lng['customer']['country'] = 'País'; $lng['panel']['dateformat'] = 'AAAA-MM-DD'; diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index bcbb9b29..61e2cac7 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -449,6 +449,7 @@ class apache if($this->settings['system']['awstats_enabled'] == '1') { $stats_text.= ' Alias /awstats "' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']) . '"' . "\n"; + $stats_text.= ' Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n"; } else { @@ -460,6 +461,7 @@ class apache if($this->settings['system']['awstats_enabled'] == '1') { $stats_text.= ' Alias /awstats "' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['parentdomain']) . '"' . "\n"; + $stats_text.= ' Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n"; } else { @@ -474,6 +476,7 @@ class apache if($this->settings['system']['awstats_enabled'] == '1') { $stats_text.= ' Alias /awstats "' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']) . '"' . "\n"; + $stats_text.= ' Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n"; } else { @@ -1080,7 +1083,6 @@ class apache if(!isConfigDir($this->settings['system']['apacheconf_vhost'])) { // Save one big file - $vhosts_file = ''; foreach($this->virtualhosts_data as $vhosts_filename => $vhost_content) diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 91795e58..16dd6855 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -759,8 +759,8 @@ class lighttpd { if($this->settings['system']['awstats_enabled'] == '1') { - // @TODO see if this is correct for awstats $stats_text.= ' alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']).'" )' . "\n"; + $stats_text.= ' alias.url = ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n"; } else { @@ -771,8 +771,8 @@ class lighttpd { if($this->settings['system']['awstats_enabled'] == '1') { - // @TODO see if this is correct for awstats $stats_text.= ' alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['parentdomain']).'" )' . "\n"; + $stats_text.= ' alias.url = ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n"; } else { @@ -787,6 +787,7 @@ class lighttpd if($this->settings['system']['awstats_enabled'] == '1') { $stats_text.= ' alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']).'" )' . "\n"; + $stats_text.= ' alias.url = ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n"; } else {