From acfe8a40b77e0f05d872086a1c1b42d6b291b226 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 20 Mar 2013 21:14:56 +0100 Subject: [PATCH] a bit of beautification, now fixes #536 Signed-off-by: Michael Kaufmann (d00p) --- actions/admin/settings/120.system.php | 2 +- admin_index.php | 4 +++- install/updates/preconfig/0.9/preconfig_0.9.inc.php | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/actions/admin/settings/120.system.php b/actions/admin/settings/120.system.php index f721365c..5008e700 100644 --- a/actions/admin/settings/120.system.php +++ b/actions/admin/settings/120.system.php @@ -37,7 +37,7 @@ return array( 'settinggroup' => 'system', 'varname' => 'documentroot_use_default_value', 'type' => 'bool', - 'default' => true, + 'default' => false, 'save_method' => 'storeSettingField', ), 'system_ipaddress' => array( diff --git a/admin_index.php b/admin_index.php index 748a78c8..e233e274 100644 --- a/admin_index.php +++ b/admin_index.php @@ -104,7 +104,9 @@ if($page == 'overview') $_message = isset($latestversion[1]) ? $latestversion[1] : ''; $_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes'); - $lookfornewversion_lable = $_version; + // add the branding so debian guys are not gettings confused + // about their version-number + $lookfornewversion_lable = $_version.$branding; $lookfornewversion_link = $_link; $lookfornewversion_addinfo = $_message; 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 f26bdff8..453a731a 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -453,7 +453,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) } if (versionInUpdate($current_version, '0.9.28-svn6')) { - + if ($settings['system']['webserver'] == 'apache2') { $has_preconfig = true; $description = 'Froxlor now supports the new Apache 2.4. Please be aware that you need to load additional apache-modules in ordner to use it.
'; @@ -471,14 +471,14 @@ LoadModule authz_host_module modules/mod_authz_host.so
'; } } - if(versionInUpdate($current_version, '0.9.28-rc2')) - { + if (versionInUpdate($current_version, '0.9.28-rc2')) { + $has_preconfig = true; - $description = 'This version will add an option to set default path for all domains and subdomains, to be the full subdomain or domain name.
'; - $description .= 'You can enable or disable this feature anytime from Server -> Settings -> System settings.
'; + $description = 'This version adds an option to append the domain-name to the document-root for domains and subdomains.
'; + $description .= 'You can enable or disable this feature anytime from settings -> system settings.
'; - $question .= 'Do you want to Use domain name as default value for DocumentRoot path?: '; + $question .= 'Do you want to automatically append the domain-name to the documentroot of newly created domains?: '; $question.= makeyesno('update_system_documentroot_use_default_value', '1', '0', '1'); eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");