X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fgui.cgi;h=5abf88e99a419f9ffbf842e770c87b69312a9c8a;hb=a5cb9aca7838837e41f34b5d29c3584f708444f0;hp=6eaac2956e1b5e9efd65fd7ecedab315147f351b;hpb=ac1cfefab236b73ed52909e14f43eaffc8d6914e;p=people%2Fteissler%2Fipfire-2.x.git
diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 6eaac2956..5abf88e99 100644
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -1,13 +1,24 @@
#!/usr/bin/perl
-#
-# IPCop CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) Bill Ward
-#
-# $Id: gui.cgi,v 1.2.2.17 2005/07/06 09:21:22 franck78 Exp $
-#
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see . #
+# #
+###############################################################################
+
use strict;
@@ -15,7 +26,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,8 +36,10 @@ my %checked=();
my $errormessage='';
-$cgiparams{'JAVASCRIPT'} = 'off';
+$cgiparams{'FX'} = 'off';
+$cgiparams{'SPEED'} = 'off';
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
+$cgiparams{'REBOOTQUESTION'} = 'off';
$cgiparams{'REFRESHINDEX'} = 'off';
$cgiparams{'ACTION'} = '';
&Header::getcgihash(\%cgiparams);
@@ -56,15 +69,10 @@ 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') {
- system ('/bin/touch', "${General::swroot}/main/refreshindex");
+ system ('/usr/bin/touch', "${General::swroot}/main/refreshindex");
} else {
unlink "${General::swroot}/main/refreshindex";
}
@@ -72,32 +80,35 @@ 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 ('/bin/touch', "${General::swroot}/ppp/nobeeps");
+ system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps");
} else {
unlink "${General::swroot}/ppp/nobeeps";
}
# write cgi vars to the file.
$mainsettings{'LANGUAGE'} = $cgiparams{'lang'};
- $mainsettings{'JAVASCRIPT'} = $cgiparams{'JAVASCRIPT'};
$mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
+ $mainsettings{'REBOOTQUESTION'} = $cgiparams{'REBOOTQUESTION'};
$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'});
SAVE_ERROR:
} else {
- if ($mainsettings{'JAVASCRIPT'}) {
- $cgiparams{'JAVASCRIPT'} = $mainsettings{'JAVASCRIPT'};
- } else {
- $cgiparams{'JAVASCRIPT'} = 'on';
- }
-
if ($mainsettings{'WINDOWWITHHOSTNAME'}) {
$cgiparams{'WINDOWWITHHOSTNAME'} = $mainsettings{'WINDOWWITHHOSTNAME'};
} else {
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
}
+
+ if ($mainsettings{'REBOOTQUESTION'}) {
+ $cgiparams{'REBOOTQUESTION'} = $mainsettings{'REBOOTQUESTION'};
+ } else {
+ $cgiparams{'REBOOTQUESTION'} = 'on';
+ }
if ($mainsettings{'PPPUPDOWNBEEP'}) {
$cgiparams{'PPPUPDOWNBEEP'} = $mainsettings{'PPPUPDOWNBEEP'};
@@ -105,30 +116,53 @@ 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 {
$cgiparams{'REFRESHINDEX'} = 'off';
}
+ if($mainsettings{'SPEED'}) {
+ $cgiparams{'SPEED'} = $mainsettings{'SPEED'};
+ } else {
+ # if var is not defined it will be set to on because after installation var
+ # is not set and the speedmeter should be displayed, it can only be deactivated
+ # by manually setting the var to off
+ $cgiparams{'SPEED'} = 'on';
+ }
}
# Default settings
if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
{
- $cgiparams{'JAVASCRIPT'} = 'on';
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
+ $cgiparams{'REBOOTQUESTION'} = 'on';
$cgiparams{'PPPUPDOWNBEEP'} = 'on';
$cgiparams{'REFRESHINDEX'} = 'off';
+ $cgiparams{'FX'} = 'on';
+ $cgiparams{'SPEED'} = 'on';
+ $cgiparams{'THEME'} = 'ipfire';
}
-$checked{'JAVASCRIPT'}{'off'} = '';
-$checked{'JAVASCRIPT'}{'on'} = '';
-$checked{'JAVASCRIPT'}{$cgiparams{'JAVASCRIPT'}} = "checked='checked'";
-
$checked{'WINDOWWITHHOSTNAME'}{'off'} = '';
$checked{'WINDOWWITHHOSTNAME'}{'on'} = '';
$checked{'WINDOWWITHHOSTNAME'}{$cgiparams{'WINDOWWITHHOSTNAME'}} = "checked='checked'";
+$checked{'REBOOTQUESTION'}{'off'} = '';
+$checked{'REBOOTQUESTION'}{'on'} = '';
+$checked{'REBOOTQUESTION'}{$cgiparams{'REBOOTQUESTION'}} = "checked='checked'";
+
$checked{'PPPUPDOWNBEEP'}{'off'} = '';
$checked{'PPPUPDOWNBEEP'}{'on'} = '';
$checked{'PPPUPDOWNBEEP'}{$cgiparams{'PPPUPDOWNBEEP'}} = "checked='checked'";
@@ -137,6 +171,14 @@ $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'";
+
&Header::openpage($Lang::tr{'gui settings'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -155,17 +197,25 @@ print <