Hardcode theme to ipfire

[ipfire-2.x.git] / html / cgi-bin / gui.cgi

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index a56a20d2ceb54310871496ed7b7c4de7e5b69d3c..1b316a2a2187091452c4bacb1ffbbe56a9fcf5da 100644 (file)
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -36,7 +36,6 @@ my %checked=();
 my $errormessage='';
 
 
-$cgiparams{'FX'} = 'off';
 $cgiparams{'SPEED'} = 'off';
 $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
 $cgiparams{'REFRESHINDEX'} = 'off';
@@ -64,7 +63,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
        close (FILE);
        if ( $found == 0 )
        {
-               $errormessage="$errormessage<P>$Lang::tr{'invalid input'}";
+               $errormessage="$errormessage<p>$Lang::tr{'invalid input'}</p>";
                goto SAVE_ERROR;
        }
 
@@ -79,18 +78,16 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
         # Beep on ip-up or ip-down. Default is ON.
         if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') {
             $cgiparams{'PPPUPDOWNBEEP'} = 'off';
-            system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps");
+            system ('/usr/bin/touch', "${General::swroot}/red/nobeeps");
         } else {
-            unlink "${General::swroot}/ppp/nobeeps";
+            unlink "${General::swroot}/red/nobeeps";
         }
 
         # write cgi vars to the file.
        $mainsettings{'LANGUAGE'} = $cgiparams{'lang'};
        $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
        $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'};
-       $mainsettings{'FX'} = $cgiparams{'FX'};
        $mainsettings{'SPEED'} = $cgiparams{'SPEED'};
-       $mainsettings{'THEME'} = $cgiparams{'theme'};
        $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'};
        &General::writehash("${General::swroot}/main/settings", \%mainsettings);
        &Lang::reload($cgiparams{'lang'});
@@ -99,7 +96,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
        if ($mainsettings{'WINDOWWITHHOSTNAME'}) {
                $cgiparams{'WINDOWWITHHOSTNAME'} = $mainsettings{'WINDOWWITHHOSTNAME'};
        } else {
-               $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
+               $cgiparams{'WINDOWWITHHOSTNAME'} = 'on';
        }
 
        if ($mainsettings{'PPPUPDOWNBEEP'}) {
@@ -108,18 +105,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
                $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        }
 
-       if ($mainsettings{'FX'}) {
-               $cgiparams{'FX'} = $mainsettings{'FX'};
-       } else {
-               $cgiparams{'FX'} = 'on';
-       }
-
-       if ($mainsettings{'THEME'}) {
-               $cgiparams{'THEME'} = $mainsettings{'THEME'};
-       } else {
-               $cgiparams{'THEME'} = 'ipfire';
-       }
-
        if($mainsettings{'REFRESHINDEX'}) {
                $cgiparams{'REFRESHINDEX'} = $mainsettings{'REFRESHINDEX'};
        } else {
@@ -138,12 +123,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
 # Default settings
 if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
 {
-       $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
+       $cgiparams{'WINDOWWITHHOSTNAME'} = 'on';
        $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        $cgiparams{'REFRESHINDEX'} = 'off';
-       $cgiparams{'FX'} = 'on';
        $cgiparams{'SPEED'} = 'on';
-       $cgiparams{'THEME'} = 'ipfire';
 }
 
 $checked{'WINDOWWITHHOSTNAME'}{'off'} = '';
@@ -158,10 +141,6 @@ $checked{'REFRESHINDEX'}{'off'} = '';
 $checked{'REFRESHINDEX'}{'on'} = '';
 $checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "checked='checked'";
 
-$checked{'FX'}{'off'} = '';
-$checked{'FX'}{'on'} = '';
-$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'";
-
 $checked{'SPEED'}{'off'} = '';
 $checked{'SPEED'}{'on'} = '';
 $checked{'SPEED'}{$cgiparams{'SPEED'}} = "checked='checked'";
@@ -175,18 +154,11 @@ if ($errormessage) {
        &Header::closebox();
 }
 
-&Header::openbox('100%','left',$Lang::tr{'gui settings'});
+&Header::openbox('100%','left',$Lang::tr{'display'});
 
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='100%'>
-<tr>
-    <td colspan='2'><p><b>$Lang::tr{'display'}</b></td>
-</tr>
-<tr>
-    <td><input type='checkbox' name='FX' $checked{'FX'}{'on'} /></td>
-    <td>$Lang::tr{'display webinterface effects'}</td>
-</tr>
 <tr>
     <td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td>
     <td>$Lang::tr{'display hostname in window title'}</td>
@@ -232,55 +204,26 @@ END
 
 print <<END
 </select></td></tr>
-<tr>
-    <td colspan='2'><hr /><p><b>$Lang::tr{'theme'}</b></td>
-</tr>
-<tr>
-    <td>&nbsp;</td>
-    <td><select name='theme'>
+</table>
 END
 ;
-
-my $dir = "/srv/web/ipfire/html/themes";
-local *DH;
-my ($item, $file);
-my @files;
-
-# Foreach directory create am theme entry to be selected by user
-
-opendir (DH, $dir);
-while ($file = readdir (DH)) {
-       next if ( $file =~ /^\./ );
-       push (@files, $file);
-}
-closedir (DH);
-
-foreach $item (sort (@files)) {
-       if ( "$mainsettings{'THEME'}" eq "$item" ) {
-               print "<option value='$item' selected='selected'>$item</option>\n";
-       } else {
-               print "<option value='$item'>$item</option>\n";
-       }
-}
-
+&Header::closebox();
+&Header::openbox('100%','left',$Lang::tr{'sound'});
 print <<END
-</select></td></tr>
-<tr>
-    <td colspan='2'><hr /><p><b>$Lang::tr{'sound'}</b></td>
-</tr>
 <tr>
     <td><input type ='checkbox' name='PPPUPDOWNBEEP' $checked{'PPPUPDOWNBEEP'}{'on'} /></td>
     <td>$Lang::tr{'beep when ppp connects or disconnects'}</td>
 </tr>
 <tr>
-    <td colspan='2'><hr /></td>
+    <td colspan='2'></td>
 </tr>
 </table>
-<div align='center'>
-<table width='80%'>
+<div align='right'>
+<br>
+<table width='100%'>
 <tr>
-    <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' /></td>
-    <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+    <td width='90%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' /></td>
+    <td width='10%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
 </tr>
 </table>
 </div>