Before the shutdown, the user will ask if he really wants to shutdown the system

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 680952cf926340a6e79a91bc996b70bc948f34f2..b0a90181d1e4328437e783c07f29fb122505d33c 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -167,8 +167,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
 
 if ($death == 0 && $rebirth == 0) {
 
-
-
 if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
        print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -179,6 +177,22 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
   <tr>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+</tr>
+</table>
+</form>
+END
+;
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) {
+       print <<END
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='100%'>
+  <tr>
+    <td colspan="3" align='right'><font color="red">$Lang::tr{'shutdown sure'}</font></td>
+    </tr>
+  <tr>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
 </tr>
 </table>
@@ -192,7 +206,7 @@ print <<END
 <tr>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
-       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
 </tr>
 </table>
 </form>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 9e61482a9794055afe60aff1e77995cf0f285015..014262d4a3c95ec91d8d277a22589d5304e9f24e 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1377,7 +1377,7 @@
 'real address' => 'Reale Addresse',
 'reboot' => 'Neustart',
 'reboot ask' => 'Neustart?',
-'reboot sure' => 'Sind Sie sicher das Sie neustarten wollen?',
+'reboot sure' => 'Sind Sie sicher, dass Sie neustarten wollen?',
 'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts',
 'rebooting' => 'Starte neu ...',
 'rebooting ipfire' => 'Starte IPFire neu',
@@ -1488,6 +1488,8 @@
 'show root certificate' => 'Root-Zertifikat anzeigen',
 'show share options' => 'Anzeige der Freigabeeinstellungen',
 'shutdown' => 'Herunterfahren',
+'shutdown ask' => 'Herunterfahren?',
+'shutdown sure' => 'Sind Sie sicher, dass Sie herunterfahren wollen?',
 'shutdown control' => 'Herunterfahren',
 'shutdown2' => 'Herunterfahren:',
 'shutting down' => 'Fahre herunter',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d204a3c4e963affd721ddc5b476d9472c48fe0a8..76aaae9f040d1f1c646276692c8b1bb0e053dc34 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1406,7 +1406,7 @@
 'real address' => 'Real Address',
 'reboot' => 'Reboot',
 'reboot ask' => 'Reboot?',
-'reboot sure' => 'Are you sure that you want to restart?',
+'reboot sure' => 'Are you sure that you want to reboot?',
 'reboot schedule' => 'Schedule IPFire reboots',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
@@ -1520,6 +1520,8 @@
 'show root certificate' => 'Show Root Certificate',
 'show share options' => 'show shares options',
 'shutdown' => 'Shutdown',
+'shutdown ask' => 'Shutdown?',
+'shutdown sure' => 'Are you sure that you want to shutdown?',
 'shutdown control' => 'Shutdown control',
 'shutdown2' => 'Shutdown:',
 'shutting down' => 'Shutting down',