X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fgui.cgi;h=80a059675a8b752228dd16f367156faee866c5c8;hb=5e4262245e8166717b7d44dedebbf1c903d03181;hp=991a31fceb21d6daaa7d40bd489ad410fda073e3;hpb=78331e301975a38f952ad9311a7ff3201e5a5e2e;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index 991a31fceb..80a059675a 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -1,13 +1,24 @@ #!/usr/bin/perl -# -# IPFire 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,7 +36,7 @@ my %checked=(); my $errormessage=''; -$cgiparams{'JAVASCRIPT'} = 'off'; +$cgiparams{'SPEED'} = 'off'; $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'ACTION'} = ''; @@ -59,7 +70,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") # 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"; } @@ -67,7 +78,7 @@ 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"; } @@ -76,6 +87,8 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $mainsettings{'LANGUAGE'} = $cgiparams{'lang'}; $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'}; $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'}; + $mainsettings{'SPEED'} = $cgiparams{'SPEED'}; + $mainsettings{'THEME'} = $cgiparams{'theme'}; $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'}; &General::writehash("${General::swroot}/main/settings", \%mainsettings); &Lang::reload($cgiparams{'lang'}); @@ -84,7 +97,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'}) { @@ -93,19 +106,35 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $cgiparams{'PPPUPDOWNBEEP'} = '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{'WINDOWWITHHOSTNAME'} = 'off'; + $cgiparams{'WINDOWWITHHOSTNAME'} = 'on'; $cgiparams{'PPPUPDOWNBEEP'} = 'on'; $cgiparams{'REFRESHINDEX'} = 'off'; + $cgiparams{'SPEED'} = 'on'; + $cgiparams{'THEME'} = 'ipfire'; } $checked{'WINDOWWITHHOSTNAME'}{'off'} = ''; @@ -120,6 +149,10 @@ $checked{'REFRESHINDEX'}{'off'} = ''; $checked{'REFRESHINDEX'}{'on'} = ''; $checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "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); @@ -129,14 +162,11 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%','left',$Lang::tr{'gui settings'}); +&Header::openbox('100%','left',$Lang::tr{'display'}); print < - - - @@ -145,6 +175,10 @@ print < + + + + @@ -178,22 +212,63 @@ END print < +

$Lang::tr{'display'}

$Lang::tr{'display hostname in window title'}$Lang::tr{'refresh index page while connected'}
$Lang::tr{'show ajax speedmeter in footer'}
  $Lang::tr{'languagepurpose'}
+END +; +&Header::closebox(); +&Header::openbox('100%','left',$Lang::tr{'theme'}); +print< -

$Lang::tr{'sound'} - +   + $Lang::tr{'beep when ppp connects or disconnects'} -

+ -
- +
+
+
- - + +