adjust awstats default paths

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

actions/admin/settings/140.statistics.php

@@ -59,7 +59,7 @@ return [
 					'varname' => 'awstats_path',
 					'type' => 'text',
 					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'default' => '/usr/share/awstats/tools/',
 					'save_method' => 'storeSettingField',
 					'visible' => Settings::Get('system.awstats_enabled') == 1
 				],
@@ -69,7 +69,7 @@ return [
 					'varname' => 'awstats_awstatspath',
 					'type' => 'text',
 					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'default' => '/usr/lib/cgi-bin/',
 					'save_method' => 'storeSettingField',
 					'visible' => Settings::Get('system.awstats_enabled') == 1
 				],

install/froxlor.sql.php

@@ -590,7 +590,7 @@ opcache.validate_timestamps'),
 	('system', 'debug_cron', '0'),
 	('system', 'store_index_file_subs', '1'),
 	('system', 'stdsubdomain', ''),
-	('system', 'awstats_path', '/usr/bin/'),
+	('system', 'awstats_path', '/usr/share/awstats/tools/'),
 	('system', 'awstats_conf', '/etc/awstats/'),
 	('system', 'awstats_logformat', '1'),
 	('system', 'defaultttl', '604800'),
@@ -612,7 +612,7 @@ opcache.validate_timestamps'),
 	('system', 'mod_fcgid_ownvhost', '0'),
 	('system', 'mod_fcgid_httpuser', 'froxlorlocal'),
 	('system', 'mod_fcgid_httpgroup', 'froxlorlocal'),
-	('system', 'awstats_awstatspath', '/usr/bin/'),
+	('system', 'awstats_awstatspath', '/usr/lib/cgi-bin/'),
 	('system', 'mod_fcgid_defaultini_ownvhost', '2'),
 	('system', 'awstats_icons', '/usr/share/awstats/icon/'),
 	('system', 'ssl_cert_chainfile', ''),

lib/Froxlor/UI/Form.php

@@ -229,7 +229,7 @@ class Form
 					if (\Froxlor\Validate\Form::validateFieldDefinition($groupdetails)) {
 						// Validate fields
 						foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
-							if (!$only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option']))) {
+							if (((isset($fielddetails['visible']) && $fielddetails['visible']) || !isset($fielddetails['visible'])) && (!$only_enabledisable || ($only_enabledisable && isset($fielddetails['overview_option'])))) {
 								$newfieldvalue = self::getFormFieldData($fieldname, $fielddetails, $input);
 								if ($newfieldvalue != $fielddetails['value']) {
 									if (($error = \Froxlor\Validate\Form::validateFormField($fieldname, $fielddetails, $newfieldvalue)) != true) {

lib/configfiles/bionic.xml

@@ -4563,7 +4563,6 @@ UPLOADGID=
 				<daemon name="awstats"
 					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
-					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>

lib/configfiles/bullseye.xml

@@ -4774,7 +4774,6 @@ UPLOADGID=
 				<daemon name="awstats"
 					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
-					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>

lib/configfiles/buster.xml

@@ -4765,7 +4765,6 @@ UPLOADGID=
 				<daemon name="awstats"
 					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
-					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>

lib/configfiles/focal.xml

@@ -3980,7 +3980,6 @@ UPLOADGID=
 				<daemon name="awstats"
 					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
-					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>

lib/configfiles/gentoo.xml

@@ -5,6 +5,8 @@
 		<!-- OS defaults to be loaded on installation -->
 		<defaults>
 			<default settinggroup="system" varname="nssextrausers" value="1"></default>
+			<default settinggroup="system" varname="awstats_path" value="/usr/bin/"></default>
+			<default settinggroup="system" varname="awstats_awstatspath" value="/usr/share/awstats/wwwroot/cgi-bin/"></default>
 			<default for="apache24" settinggroup="system" varname="apacheconf_vhost" value="/etc/apache2/vhosts.d/"></default>
 			<default for="apache24" settinggroup="system" varname="apacheconf_diroptions" value="/etc/apache2/vhosts.d/"></default>
 			<default for="apache24" settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/apache2/froxlor-htpasswd/"></default>