From 45d6ada5d412e886abe0999ab7e2d26f47d9a6f2 Mon Sep 17 00:00:00 2001
From: Sjon Hortensius <sjon@hortensius.net>
Date: Tue, 28 Apr 2015 13:54:06 +0200
Subject: Revert "Merge pull request #100 from sbeaver-netgate/halt"

This reverts commit 5bd406696ae634b3993d79a8b9aef03eeab42488, reversing
changes made to b9bd62735f2afb818d9ff3afd399c6c7d3b904c5.
---
 usr/local/www/halt.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'usr/local/www/halt.php')

diff --git a/usr/local/www/halt.php b/usr/local/www/halt.php
index 322fbd4..49e99c5 100755
--- a/usr/local/www/halt.php
+++ b/usr/local/www/halt.php
@@ -50,7 +50,7 @@ require("guiconfig.inc");
 require("functions.inc");
 require("captiveportal.inc");
 
-if (stristr($_POST['Submit'], gettext("No"))) {
+if ($_POST['save'] == 'No') {
 	header("Location: index.php");
 	exit;
 }
@@ -58,28 +58,28 @@ if (stristr($_POST['Submit'], gettext("No"))) {
 $pgtitle = array(gettext("Diagnostics"),gettext("Halt system"));
 include('head.inc');
 
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-?>
-	<meta http-equiv="refresh" content="70;url=/">
-	<div class="alert alert-success" role="alert">
-		<?=gettext("The system is halting now. This may take one minute or so.")?>
-	</div>
+if ($_POST['save'] == 'Yes') {
+	print('<meta http-equiv="refresh" content="70;url=/">');
+	print('<div class="alert alert-success" role="alert">'.gettext("The system is halting now. This may take one minute or so.").'</div>');
 
-<?php
 	if(DEBUG)
 	   print("Not actually halting (DEBUG is set true)<br>");
 	else
 		system_halt();
 } else {
-?>
 
+?>
 
+<!-- Simple HTML version -->
 <div class="panel panel-default">
-	<div class="panel-heading">Are you sure you want to halt the system?</div>
-	<div class="panel-body">Click "Yes" to halt the system immediately, or "No" to go to the system dashboard. (There will be a brief delay before the dashboard appears.)<br /><br />
+	<div class="panel-heading">
+		<h2 class="panel-title">Are you sure you want to halt the system?</h2>
+	</div>
+	<div class="panel-body">
+		<p>Click "Yes" to halt the system immediately, or "No" to go to the system dashboard. (There will be a brief delay before the dashboard appears.)</p>
 		<form action="halt.php" method="post">
-			<input type="submit" class="btn btn-danger pull-center" name="Submit" value="Yes">
-			<a href="/" class="btn btn-default">No</a>
+			<input type="submit" class="btn btn-danger pull-center" name="save" value="Yes">
+			<input type="submit" class="btn btn-default" name="save" value="No">
 		</form>
 	</div>
 </div>
-- 
cgit v1.1