maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set version to 0.9.38.1 b/c of hsts includeSubdomains flag for domains not being saved; added http2-flag for nginx as setting

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-11-18 10:10:03 +01:00
parent 1984aced9d
commit 9540cb158c
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql
View File

@@ -577,7 +577,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char_required', '0'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''), ('panel', 'customer_hide_options', ''),
('panel', 'version', '0.9.38'), ('panel', 'version', '0.9.38.1'),
('panel', 'db_version', '201611180'); ('panel', 'db_version', '201611180');

10
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -3516,8 +3516,8 @@ if (isFroxlorVersion('0.9.38-rc1')) {
if (isFroxlorVersion('0.9.38-rc2')) { if (isFroxlorVersion('0.9.38-rc2')) {
showUpdateStep("Updating from 0.9.38-rc2 to 0.9.38 final", false); showUpdateStep("Updating from 0.9.38-rc2 to 0.9.38 final", false);
updateToVersion('0.9.38'); updateToVersion('0.9.38');
} }
if (isDatabaseVersion('201610070')) { if (isDatabaseVersion('201610070')) {
@@ -3528,3 +3528,9 @@ if (isDatabaseVersion('201610070')) {
updateToDbVersion('201611180'); updateToDbVersion('201611180');
} }
if (isFroxlorVersion('0.9.38')) {
showUpdateStep("Updating from 0.9.38 to 0.9.38.1", false);
updateToVersion('0.9.38.1');
}

2
lib/formfields/admin/domains/formfield.domains_add.php
View File

@@ -175,7 +175,7 @@ return array(
'int_max' => 94608000, // 3-years 'int_max' => 94608000, // 3-years
'value' => 0 'value' => 0
), ),
'hsts_incsub' => array( 'hsts_sub' => array(
'visible' => ($ssl_ipsandports != '' ? true : false), 'visible' => ($ssl_ipsandports != '' ? true : false),
'label' => $lng['admin']['domain_hsts_incsub']['title'], 'label' => $lng['admin']['domain_hsts_incsub']['title'],
'desc' => $lng['admin']['domain_hsts_incsub']['description'], 'desc' => $lng['admin']['domain_hsts_incsub']['description'],

2
lib/formfields/admin/domains/formfield.domains_edit.php
View File

@@ -198,7 +198,7 @@ return array(
'int_max' => 94608000, // 3-years 'int_max' => 94608000, // 3-years
'value' => $result['hsts'] 'value' => $result['hsts']
), ),
'hsts_incsub' => array( 'hsts_sub' => array(
'visible' => ($ssl_ipsandports != '' ? true : false), 'visible' => ($ssl_ipsandports != '' ? true : false),
'label' => $lng['admin']['domain_hsts_incsub']['title'], 'label' => $lng['admin']['domain_hsts_incsub']['title'],
'desc' => $lng['admin']['domain_hsts_incsub']['description'], 'desc' => $lng['admin']['domain_hsts_incsub']['description'],

2
lib/version.inc.php
View File

@@ -16,7 +16,7 @@
*/ */
// Main version variable // Main version variable
$version = '0.9.38'; $version = '0.9.38.1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
$dbversion = '201611180'; $dbversion = '201611180';