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

a bit of beautification, now fixes #536

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-20 21:14:56 +01:00
parent d5fd89beb7
commit acfe8a40b7
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/120.system.php
View File

@@ -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(

4
admin_index.php
View File

@@ -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;

12
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -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.<br />';
@@ -471,14 +471,14 @@ LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
}
}
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.<br />';
$description .= 'You can enable or disable this feature anytime from Server -> Settings -> System settings.<br />';
$description = 'This version adds an option to append the domain-name to the document-root for domains and subdomains.<br />';
$description .= 'You can enable or disable this feature anytime from settings -> system settings.<br />';
$question .= '<strong>Do you want to Use domain name as default value for DocumentRoot path?:</strong>&nbsp;';
$question .= '<strong>Do you want to automatically append the domain-name to the documentroot of newly created domains?:</strong>&nbsp;';
$question.= makeyesno('update_system_documentroot_use_default_value', '1', '0', '1');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");