From 0ab4385a564586fe0791097e3daa851bf48908ef Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 6 Aug 2009 21:38:06 +0200 Subject: [PATCH] Added the option on gui page to remove the extra query for restart or shudown. --- html/cgi-bin/gui.cgi | 17 ++++++++ html/cgi-bin/index.cgi | 94 ++++++++++++++++++++++++------------------ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 4 files changed, 74 insertions(+), 39 deletions(-) mode change 100644 => 100755 html/cgi-bin/index.cgi diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index a56a20d2ce..5abf88e99a 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -39,6 +39,7 @@ my $errormessage=''; $cgiparams{'FX'} = 'off'; $cgiparams{'SPEED'} = 'off'; $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; +$cgiparams{'REBOOTQUESTION'} = 'off'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'ACTION'} = ''; &Header::getcgihash(\%cgiparams); @@ -87,6 +88,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") # write cgi vars to the file. $mainsettings{'LANGUAGE'} = $cgiparams{'lang'}; $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'}; + $mainsettings{'REBOOTQUESTION'} = $cgiparams{'REBOOTQUESTION'}; $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'}; $mainsettings{'FX'} = $cgiparams{'FX'}; $mainsettings{'SPEED'} = $cgiparams{'SPEED'}; @@ -101,6 +103,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") } else { $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; } + + if ($mainsettings{'REBOOTQUESTION'}) { + $cgiparams{'REBOOTQUESTION'} = $mainsettings{'REBOOTQUESTION'}; + } else { + $cgiparams{'REBOOTQUESTION'} = 'on'; + } if ($mainsettings{'PPPUPDOWNBEEP'}) { $cgiparams{'PPPUPDOWNBEEP'} = $mainsettings{'PPPUPDOWNBEEP'}; @@ -139,6 +147,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}") { $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; + $cgiparams{'REBOOTQUESTION'} = 'on'; $cgiparams{'PPPUPDOWNBEEP'} = 'on'; $cgiparams{'REFRESHINDEX'} = 'off'; $cgiparams{'FX'} = 'on'; @@ -150,6 +159,10 @@ $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'"; @@ -191,6 +204,10 @@ print < $Lang::tr{'display hostname in window title'} + + + $Lang::tr{'reboot question'} + $Lang::tr{'refresh index page while connected'} diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi old mode 100644 new mode 100755 index b0a90181d1..df78315151 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -166,55 +166,71 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) { } if ($death == 0 && $rebirth == 0) { - -if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) { - print < - - - - - - - - - -
$Lang::tr{'reboot sure'}
- + +if ($mainsettings{'REBOOTQUESTION'} eq "off") { +print < + + + + + + +
+ END ; -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) { - print < - - - - - - - - - -
$Lang::tr{'shutdown sure'}
- +} else { + if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) { +print < + + + + + + + + + +
$Lang::tr{'reboot sure'}
+ END ; -} else { + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) { print < - - - - - - -
- +
+ + + + + + + + + +
$Lang::tr{'shutdown sure'}
+
END ; + } else { +print < + + + + + + +
+ +END +; + } } print <
$Lang::tr{'network'} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 014262d4a3..6ffd0d4c97 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1379,6 +1379,7 @@ 'reboot ask' => 'Neustart?', 'reboot sure' => 'Sind Sie sicher, dass Sie neustarten wollen?', 'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts', +'reboot question' => 'Extra Abfrage bei neustart und herunterfahren einschalten', 'rebooting' => 'Starte neu ...', 'rebooting ipfire' => 'Starte IPFire neu', 'reconnect' => 'Neu Verbinden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 76aaae9f04..a2839388bb 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1407,6 +1407,7 @@ 'reboot' => 'Reboot', 'reboot ask' => 'Reboot?', 'reboot sure' => 'Are you sure that you want to reboot?', +'reboot question' => 'Extra query for restart and shutdown', 'reboot schedule' => 'Schedule IPFire reboots', 'rebooting' => 'Rebooting', 'rebooting ipfire' => 'Rebooting IPFire', -- 2.39.2