ipfire theme: Show hostname in title by default.

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 6c1c8d81aa5bc25e57eb711cf2a47c3cd4b4e2c1..980461569ee03880719f5ab923f752351c92c52f 100644 (file)
--- 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 3bc762ced550fb4ec0042497f904591d757fa737..cf5f77c05f9d9e26ccd04bf734304b7c139e413f 100644 (file)
--- 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>";