Geändert:

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

diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 6eaac2956e1b5e9efd65fd7ecedab315147f351b..6e2bfbc8c2f08c630e8783116ac7cf5c33088fe3 100644 (file)
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
 # This code is distributed under the terms of the GPL
 #
@@ -15,7 +15,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -25,7 +25,7 @@ my %checked=();
 my $errormessage='';
 
 
-$cgiparams{'JAVASCRIPT'} = 'off';
+$cgiparams{'FX'} = 'off';
 $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
 $cgiparams{'REFRESHINDEX'} = 'off';
 $cgiparams{'ACTION'} = '';
@@ -56,11 +56,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
                goto SAVE_ERROR;
        }
 
-       if ($cgiparams{'JAVASCRIPT'} !~ /^(on|off)$/) {
-               $errormessage = $Lang::tr{'invalid input'};
-               goto SAVE_ERROR;
-       }  
-
         # Set flag if index page is to refresh whilst ppp is up.
         # Default is NO refresh.
         if ($cgiparams{'REFRESHINDEX'} ne 'off') {
@@ -79,20 +74,14 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
 
         # write cgi vars to the file.
        $mainsettings{'LANGUAGE'} = $cgiparams{'lang'};
-       $mainsettings{'JAVASCRIPT'} = $cgiparams{'JAVASCRIPT'};
        $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
        $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'};
+       $mainsettings{'FX'} = $cgiparams{'FX'};
        $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'};
        &General::writehash("${General::swroot}/main/settings", \%mainsettings);
        &Lang::reload($cgiparams{'lang'});
        SAVE_ERROR:
 } else {
-       if ($mainsettings{'JAVASCRIPT'}) {
-               $cgiparams{'JAVASCRIPT'} = $mainsettings{'JAVASCRIPT'};
-       } else {
-               $cgiparams{'JAVASCRIPT'} = 'on';
-       }
-
        if ($mainsettings{'WINDOWWITHHOSTNAME'}) {
                $cgiparams{'WINDOWWITHHOSTNAME'} = $mainsettings{'WINDOWWITHHOSTNAME'};
        } else {
@@ -105,6 +94,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
                $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        }
 
+       if ($mainsettings{'FX'}) {
+               $cgiparams{'FX'} = $mainsettings{'FX'};
+       } else {
+               $cgiparams{'FX'} = 'on';
+       }
+
        if($mainsettings{'REFRESHINDEX'}) {
                $cgiparams{'REFRESHINDEX'} = $mainsettings{'REFRESHINDEX'};
        } else {
@@ -115,16 +110,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
 # Default settings
 if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
 {
-       $cgiparams{'JAVASCRIPT'} = 'on';
        $cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
        $cgiparams{'PPPUPDOWNBEEP'} = 'on';
        $cgiparams{'REFRESHINDEX'} = 'off';
+       $cgiparams{'FX'} = 'on';
 }
 
-$checked{'JAVASCRIPT'}{'off'} = '';
-$checked{'JAVASCRIPT'}{'on'} = '';
-$checked{'JAVASCRIPT'}{$cgiparams{'JAVASCRIPT'}} = "checked='checked'";
-
 $checked{'WINDOWWITHHOSTNAME'}{'off'} = '';
 $checked{'WINDOWWITHHOSTNAME'}{'on'} = '';
 $checked{'WINDOWWITHHOSTNAME'}{$cgiparams{'WINDOWWITHHOSTNAME'}} = "checked='checked'";
@@ -137,6 +128,10 @@ $checked{'REFRESHINDEX'}{'off'} = '';
 $checked{'REFRESHINDEX'}{'on'} = '';
 $checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "checked='checked'";
 
+$checked{'FX'}{'off'} = '';
+$checked{'FX'}{'on'} = '';
+$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'";
+
 &Header::openpage($Lang::tr{'gui settings'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -155,8 +150,8 @@ print <<END
     <td colspan='2'><p><b>$Lang::tr{'display'}</b></td>
 </tr>
 <tr>
-    <td><input type='checkbox' name='JAVASCRIPT' $checked{'JAVASCRIPT'}{'on'} />
-    <td width='100%'>$Lang::tr{'enable javascript'}</td>
+    <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>