From 8bade64c4b9e8e65570381bd3786b42a0589b49d Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Thu, 31 Mar 2011 13:48:47 -0300
Subject: Revert "Add gettext calls on main menu"

This reverts commit 67f0f0a772722d418f0f660bf2b16ff5b4c94fd5.

system_firmware.php shouldn't be commited
---
 usr/local/www/fbegin.inc          | 16 ++++++++--------
 usr/local/www/system_firmware.php | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 89d1555..8687e3a 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -308,7 +308,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 			<div id="navigation" style="z-index:1000">
 				<ul id="menu">
 					<li class="firstdrop">
-						<div><?php echo gettext("System"); ?></div>
+						<div>System</div>
 						<ul class="subdrop">
 						<?php
 							output_menu($system_menu);
@@ -316,7 +316,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 						</ul>
 					</li>
 					<li class="drop">
-						<div><?php echo gettext("Interfaces"); ?></div>
+						<div>Interfaces</div>
 						<ul class="subdrop">
 						<?php
 							output_menu($interfaces_menu);
@@ -324,7 +324,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 						</ul>
 					</li>
 					<li class="drop">
-						<div><?php echo gettext("Firewall"); ?></div>
+						<div>Firewall</div>
 						<ul class="subdrop">
 						<?php
 							output_menu($firewall_menu);
@@ -332,7 +332,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 						</ul>
 					</li>
 					<li class="drop">
-						<div><?php echo gettext("Services"); ?></div>
+						<div>Services</div>
 						<ul class="subdrop">
 						<?
 							output_menu($services_menu);
@@ -340,7 +340,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 						</ul>
 					</li>
 					<li class="drop">
-						<div><?php echo gettext("VPN"); ?></div>
+						<div>VPN</div>
 						<ul class="subdrop">
 						<?php
 							output_menu($vpn_menu);
@@ -348,7 +348,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 						</ul>
 					</li>
 					<li class="drop">
-						<div><?php echo gettext("Status"); ?></div>
+						<div>Status</div>
 						<ul class="subdrop">
 						<?php
 							output_menu($status_menu);
@@ -356,7 +356,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 						</ul>
 					</li>
 					<li class="drop">
-						<div><?php echo gettext("Diagnostics"); ?></div>
+						<div>Diagnostics</div>
 						<ul id="diag" class="subdrop">
 						<?
 							output_menu($diagnostics_menu);
@@ -365,7 +365,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
 					</li>
 					<?php if(! $g['disablehelpmenu']): ?>
 					<li class="lastdrop">
-						<div><?php echo gettext("Help"); ?></div>
+						<div>Help</div>
 						<ul id="help" class="subdrop">
 						<?
 							output_menu($help_menu, "_new");
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index d14b0b0..9e876c9 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -124,11 +124,11 @@ if ($_POST && !is_subsystem_dirty('firmwarelock')) {
 	unset($input_errors);
 	unset($sig_warning);
 
-	if ($_POST['Enable'])
+	if (stristr($_POST['Submit'], gettext("Enable")))
 		$mode = "enable";
-	else if ($_POST['Disable'])
+	else if (stristr($_POST['Submit'], gettext("Disable")))
 		$mode = "disable";
-	else if ($_POST['Upgrade'] || $_POST['sig_override'])
+	else if (stristr($_POST['Submit'], gettext("Upgrade")) || $_POST['sig_override'])
 		$mode = "upgrade";
 	else if ($_POST['sig_no']) {
 		if(file_exists("{$g['upload_path']}/firmware.tgz"))
@@ -257,9 +257,9 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 						</p>
 						<?php if (!is_subsystem_dirty('rebootreq')): ?>
 						<?php if (!is_subsystem_dirty('firmware')): ?>
-							<input name="Enable" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>">
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>">
 						<?php else: ?>
-							<input name="Disable" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>">
+				  			<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>">
 							<br><br>
 							<strong><?=gettext("Firmware image file:");?> </strong>&nbsp;
 							<input name="ulfile" type="file" class="formfld">
@@ -289,7 +289,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 								<input name="Submit" type="submit" class="formbtn" value="Upgrade firmware" onClick="window.open('upload_progress.php?upload_id=<?=$upload_id?>','UploadMeter','width=370,height=115', true); return true;">
 								*/
 							?>
-							<input name="Upgrade" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>">
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>">
 						<?php endif; else: ?>
 							<strong><?=gettext("You must reboot the system before you can upgrade the firmware.");?></strong>
 						<?php endif; ?>
-- 
cgit v1.1