From 0f818697e134fd41850f94bb068d4365187c7fd6 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 10 Sep 2021 08:53:51 -0600
Subject: [PATCH] Fix some indentaition hide response -ERR no reply to prevent
 confusion.

---
 app/devices/cmd.php | 60 +++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/app/devices/cmd.php b/app/devices/cmd.php
index 7faeea7ffd..56abca9a6e 100644
--- a/app/devices/cmd.php
+++ b/app/devices/cmd.php
@@ -17,35 +17,36 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2014
+	Portions created by the Initial Developer are Copyright (C) 2008-2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists("device_key_add") || permission_exists("device_key_edit") || if_group("superadmin")) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists("device_key_add") || permission_exists("device_key_edit") || if_group("superadmin")) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
 //set the variables
-	$cmd = check_str($_GET['cmd']);
-	$rdr = check_str($_GET['rdr']);
-	$domain = check_str($_GET['domain']);
-	$show = check_str($_GET['show']);
-	$user = check_str($_GET['user']);
-	$agent = check_str($_GET['agent']);
-	$vendor = device::get_vendor_by_agent($agent);
+	$cmd = $_GET['cmd'];
+	$user = $_GET['user'];
+	$domain = $_GET['domain'];
+	$vendor = device::get_vendor_by_agent($_GET['agent']);
 
 //create the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
@@ -53,6 +54,7 @@ else {
 		// Get the SIP profiles for the user
 		$command = "sofia_contact */{$user}";
 		$contact_string = event_socket_request($fp, "api ".$command);
+
 		// The first value in the array will be full matching text, the second one will be the array of profile matches
 		preg_match_all('/sofia\/([^,]+)\/(?:[^,]+)/', $contact_string, $matches);
 		if (sizeof($matches) != 2 || sizeof($matches[1]) < 1) {
@@ -67,18 +69,25 @@ else {
 			if ($cmd == "unregister") {
 				$command = "sofia profile {$profile} flush_inbound_reg {$user} reboot";
 			}
-			else {
+			elseif ($cmd == "check_sync") {
 				$command = "lua app.lua event_notify {$profile} {$cmd} {$user} {$vendor}";
 				//if ($cmd == "check_sync") {
 				//	$command = "sofia profile ".$profile." check_sync ".$user;
 				//}
 			}
+
 			//send the command
 			$response = event_socket_request($fp, "api {$command}");
 			event_socket_request($fp, "api log notice {$command}");
 
+			//prepare the response
+			$message = $text['message-command_sent'];
+			if (trim($response) != '-ERR no reply') {
+				$message .= ' '.htmlentities($response);
+			}
+
 			//show the response
-			message::add($text['label-event']." ".ucwords($cmd)."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".$text['label-response'].htmlentities($response));
+			message::add($text['label-event']." ".$message, 'positive', 3500);
 		}
 
 		//close the connection
@@ -86,18 +95,15 @@ else {
 	}
 
 //redirect the user
-	if ($rdr == "false") {
+	if ($_GET['rdr'] == "false") {
 		//redirect false
 		echo $response;
 	}
 	else {
-		//send the message
-			message::add($text['button-applied'], 'positive', 3500);
-
 		//send the redirect
-			if (isset($_SERVER['HTTP_REFERER'])) {
-				header("Location: ".$_SERVER['HTTP_REFERER']);
-			}
+		if (isset($_SERVER['HTTP_REFERER'])) {
+			header("Location: ".$_SERVER['HTTP_REFERER']);
+		}
 	}
 
 ?>