From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Jan 2014 18:36:06 +0000 (+0100)
Subject: ipfire theme: Show hostname in title by default.
X-Git-Tag: v2.15-beta1~68^2^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fe9f7588151c5f98a73f5718cd19b1743ff1d6c2

ipfire theme: Show hostname in title by default.
---

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 6c1c8d81aa..980461569e 100644
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -99,7 +99,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
 	if ($mainsettings{'WINDOWWITHHOSTNAME'}) {
 		$cgiparams{'WINDOWWITHHOSTNAME'} = $mainsettings{'WINDOWWITHHOSTNAME'};
 	} else {
-		$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
+		$cgiparams{'WINDOWWITHHOSTNAME'} = 'on';
 	}
 	
 	if ($mainsettings{'REBOOTQUESTION'}) {
@@ -138,7 +138,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
 # Default settings
 if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
 {
-	$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
+	$cgiparams{'WINDOWWITHHOSTNAME'} = 'on';
 	$cgiparams{'REBOOTQUESTION'} = 'on';
 	$cgiparams{'PPPUPDOWNBEEP'} = 'on';
 	$cgiparams{'REFRESHINDEX'} = 'off';
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 3bc762ced5..cf5f77c05f 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -139,7 +139,7 @@ print <<END
 			<div id="logo">
 END
 ;
-	if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
 		print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
 	} else {
 		print "<h1>IPFire</h1>";