report errors adding a gateway through ajax calls

2 files changed, 22 insertions, 5 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 9c136af..208e088 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -2760,12 +2760,20 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 			selectbox.prop('selectedIndex',selectbox.children().length-1);
 			jQuery('#noteboxv6').html("<p/><strong><?=gettext("NOTE:"); ?></strong> <?=gettext("You can manage Gateways"); ?> <a target='_new' href='system_gateways.php'><?=gettext("here"); ?></a>.");
 		}
-		function report_failure() {
-			alert("Sorry, we could not create your IPv4 gateway at this time.");
+		function report_failure(request, textStatus, errorThrown) {
+			if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
+				alert(request.responseText);
+			} else {
+				alert("Sorry, we could not create your IPv4 gateway at this time.");
+			}
 			hide_add_gateway();
 		}
-		function report_failure_v6() {
-			alert("Sorry, we could not create your IPv6 gateway at this time.");
+		function report_failure_v6(request, textStatus, errorThrown) {
+			if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
+				alert(request.responseText);
+			} else {
+				alert("Sorry, we could not create your IPv6 gateway at this time.");
+			}
 			hide_add_gateway_v6();
 		}
 		function save_callback(transport) {
diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php
index a9f28cf..3fc6a0a 100755
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -269,7 +269,7 @@ if ($_POST) {
 		if ($_POST['latencyhigh'])
                		$gateway['latencyhigh'] = $_POST['latencyhigh'];
 		if ($_POST['losslow'])
-              			$gateway['losslow'] = $_POST['losslow'];
+			$gateway['losslow'] = $_POST['losslow'];
 		if ($_POST['losshigh'])
                		$gateway['losshigh'] = $_POST['losshigh'];
 		if ($_POST['down'])
@@ -294,6 +294,15 @@ if ($_POST) {
 		header("Location: system_gateways.php");
 		exit;
 	} else {
+		if ($_REQUEST['isAjax']) {
+			header("HTTP/1.0 500 Internal Server Error");
+			header("Content-type: text/plain");
+			foreach ($input_errors as $error) {
+				echo("$error\n");
+			}
+			exit;
+		}
+		
 		$pconfig = $_POST;
 		if (empty($_POST['friendlyiface']))
 			$pconfig['friendlyiface'] = $_POST['interface'];