fix add/edit domain due to wrong access to settings; setting version …

…to 0.9.39.4 for bugfix release Signed-off-by: Michael Kaufmann (d00p) <[email protected]>
froxlor · Feb 13, 2018 · 6befe85 · 6befe85
1 parent 27f8c8b
commit 6befe85
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/install/froxlor.sql b/install/froxlor.sql
@@ -687,7 +687,7 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char_required', '0'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
-	('panel', 'version', '0.9.39.3'),
+	('panel', 'version', '0.9.39.4'),
 	('panel', 'db_version', '201802130');
 
 

diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3927,3 +3927,9 @@
 	showUpdateStep("Updating from 0.9.39.2 to 0.9.39.3", false);
 	updateToVersion('0.9.39.3');
 }
+
+if (isFroxlorVersion('0.9.39.3')) {
+
+	showUpdateStep("Updating from 0.9.39.3 to 0.9.39.4", false);
+	updateToVersion('0.9.39.4');
+}
diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php
@@ -133,7 +133,7 @@
 						'rows' => 12
 					),
 					'notryfiles' => array(
-						'visible' => (Settings('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
+						'visible' => (Settings::Get('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
 						'label' => $lng['admin']['notryfiles']['title'],
 						'desc' => $lng['admin']['notryfiles']['description'],
 						'type' => 'checkbox',

diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php
@@ -163,7 +163,7 @@
 						)
 					),
 					'notryfiles' => array(
-						'visible' => (Settings('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
+						'visible' => (Settings::Get('system.webserver') == 'nginx' && $userinfo['change_serversettings'] == '1'),
 						'label' => $lng['admin']['notryfiles']['title'],
 						'desc' => $lng['admin']['notryfiles']['description'],
 						'type' => 'checkbox',

diff --git a/lib/version.inc.php b/lib/version.inc.php
@@ -16,7 +16,7 @@
  */
 
 // Main version variable
-$version = '0.9.39.3';
+$version = '0.9.39.4';
 
 // Database version (YYYYMMDDC where C is a daily counter)
 $dbversion = '201802130';