summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-01-30 10:13:28 -0500
committerjim-p <jimp@pfsense.org>2013-01-30 10:22:03 -0500
commit256a2a51b7cbe7788db7d31d509101c18c37a2c0 (patch)
treeb6da2aea21f88891e2a15f0494ebb9ccae7165f6 /usr/local
parentee6bd11d4c2988a32050c19841bbcf080ed3e602 (diff)
downloadpfsense-256a2a51b7cbe7788db7d31d509101c18c37a2c0.zip
pfsense-256a2a51b7cbe7788db7d31d509101c18c37a2c0.tar.gz
Change output style to follow halt.php and reboot.php so the shutdown output appears in the correct location on the page.
Conflicts: usr/local/www/diag_defaults.php
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/diag_defaults.php23
1 files changed, 13 insertions, 10 deletions
diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php
index 612e02a..d5116ff 100755
--- a/usr/local/www/diag_defaults.php
+++ b/usr/local/www/diag_defaults.php
@@ -44,15 +44,9 @@
require("guiconfig.inc");
-if ($_POST) {
- if ($_POST['Submit'] != " No ") {
- reset_factory_defaults();
- system_reboot();
- $rebootmsg = gettext("The system has been reset to factory defaults and is now rebooting. This may take one minute.");
- } else {
- header("Location: index.php");
- exit;
- }
+if ($_POST['Submit'] == " " . gettext("No") . " ") {
+ header("Location: index.php");
+ exit;
}
$pgtitle = array(gettext("Diagnostics"),gettext("Factory defaults"));
@@ -62,7 +56,16 @@ include("head.inc");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?>
+
+<?php if ($_POST['Submit'] == " " . gettext("Yes") . " "):
+ print_info_box(gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on your hardware.")); ?>
+<pre>
+<?php
+ reset_factory_defaults();
+ system_reboot();
+?>
+</pre>
+<?php else: ?>
<form action="diag_defaults.php" method="post">
<p><strong> <?=gettext("If you click") . " &quot;" . gettext("Yes") . "&quot;, " . gettext("the firewall will:")?>
OpenPOWER on IntegriCloud