From 4d672a63e8640eaf30bb4a52ea082cf86d93d615 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 22 Jan 2015 11:21:18 +0000 Subject: [PATCH] Show global gateways. --- app/gateways/gateway_edit.php | 4 ++-- app/gateways/gateways.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 0fd695bd5a..b8ca72bdb8 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -79,7 +79,7 @@ else { $description = check_str($_POST["description"]); } -if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { +if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $msg = ''; if ($action == "update") { @@ -296,7 +296,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { header("Location: gateways.php"); return; } -} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) +} //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) //pre-populate the form if (count($_GET) > 0 && $_POST["persistformvar"] != "true") { diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index 6a37d3209c..8e4326b08c 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -108,7 +108,7 @@ else { //prepare to page the results $sql = "select count(*) as num_rows from v_gateways "; - $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "where (domain_uuid = '$domain_uuid' or domain_uuid is null) "; $prep_statement = $db->prepare($sql); if ($prep_statement) { $prep_statement->execute(); @@ -123,7 +123,7 @@ else { //get the list $sql = "select * from v_gateways "; - $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "where (domain_uuid = '$domain_uuid' or domain_uuid is null) "; if (strlen($order_by) == 0) { $sql .= "order by gateway asc "; }