From f7b7da0dd45146f92a39aaac87042fa2cb46ccc5 Mon Sep 17 00:00:00 2001
From: Alexey Melnichuk <mimir@newmail.ru>
Date: Wed, 23 Mar 2016 14:02:33 +0300
Subject: [PATCH] Fix. Display correct gateway name in URI on `Fax Active` page

---
 app/fax/fax_active.php     | 12 ++++++++++++
 app/fax/fax_active_inc.php |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/app/fax/fax_active.php b/app/fax/fax_active.php
index 4729e91ab8..0b176e0e72 100644
--- a/app/fax/fax_active.php
+++ b/app/fax/fax_active.php
@@ -48,6 +48,18 @@ else {
 		$fax_uuid = check_str($_REQUEST["id"]);
 	}
 
+//load gateways into a session variable
+	$sql = "select gateway_uuid, domain_uuid, gateway from v_gateways where enabled = 'true'";
+	$prep_statement = $db->prepare($sql);
+	if ($prep_statement) {
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach ($result as $row) {
+			$_SESSION['gateways'][$row['gateway_uuid']] = $row['gateway'];
+		}
+	}
+	unset($sql, $prep_statement, $result, $row);
+
 //show the header
 	$document['title'] = $text['title'];
 	require_once "resources/header.php";
diff --git a/app/fax/fax_active_inc.php b/app/fax/fax_active_inc.php
index 9e13e1cc6a..54b708397d 100644
--- a/app/fax/fax_active_inc.php
+++ b/app/fax/fax_active_inc.php
@@ -202,6 +202,13 @@ HERE;
 					$task_files .= '<br/>&nbsp;' . basename($row['greeting']);
 				}
 
+				//replace gateway uuid with name
+					if (sizeof($_SESSION['gateways']) > 0) {
+						foreach ($_SESSION['gateways'] as $gateway_uuid => $gateway_name) {
+							$fax_uri = str_replace($gateway_uuid, $gateway_name, $fax_uri);
+						}
+					}
+
 				echo "<tr>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>" . $fax_server     . "&nbsp;</td>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>" . $task_enabled   . "&nbsp;</td>\n";