From c2e581d18e011777b9b2403cfd076ffd65a10d73 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 6 Dec 2018 09:32:39 -0700
Subject: [PATCH] Update dialplan.php

---
 app/dialplans/resources/classes/dialplan.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/dialplans/resources/classes/dialplan.php b/app/dialplans/resources/classes/dialplan.php
index 5c021ebc4d..9f0d970bb6 100644
--- a/app/dialplans/resources/classes/dialplan.php
+++ b/app/dialplans/resources/classes/dialplan.php
@@ -42,6 +42,8 @@ include "root.php";
 
 			//dialplans
 			public $dialplan_name;
+			public $dialplan_number;
+			public $dialplan_destination;
 			public $dialplan_continue;
 			public $dialplan_order;
 			public $dialplan_context;
@@ -89,12 +91,12 @@ include "root.php";
 				$sql .= "dialplan_uuid, ";
 				$sql .= "dialplan_name, ";
 				$sql .= "dialplan_number, ";
+				$sql .= "dialplan_destination, ";
 				$sql .= "dialplan_continue, ";
 				$sql .= "dialplan_order, ";
 				$sql .= "dialplan_context, ";
 				$sql .= "dialplan_enabled, ";
-				$sql .= "dialplan_description, ";
-				$sql .= "dialplan_destination ";
+				$sql .= "dialplan_description ";
 				$sql .= ")";
 				$sql .= "values ";
 				$sql .= "(";
@@ -108,12 +110,12 @@ include "root.php";
 				$sql .= "'".check_str($this->dialplan_uuid)."', ";
 				$sql .= "'".check_str($this->dialplan_name)."', ";
 				$sql .= "'".check_str($this->dialplan_number)."', ";
+				$sql .= "'".check_str($this->dialplan_destination)."', ";
 				$sql .= "'".check_str($this->dialplan_continue)."', ";
 				$sql .= "'".check_str($this->dialplan_order)."', ";
 				$sql .= "'".check_str($this->dialplan_context)."', ";
 				$sql .= "'".check_str($this->dialplan_enabled)."', ";
-				$sql .= "'".check_str($this->dialplan_description)."', ";
-				$sql .= "'".check_str($this->dialplan_destination)."' ";
+				$sql .= "'".check_str($this->dialplan_description)."' ";
 				$sql .= ")";
 				$this->db->exec(check_sql($sql));
 				unset($sql);
@@ -334,6 +336,9 @@ include "root.php";
 								$this->dialplan_uuid = uuid();
 								$this->dialplan_name = $dialplan['extension']['@attributes']['name'];
 								$this->dialplan_number = $dialplan['extension']['@attributes']['number'];
+								if (strlen($dialplan['extension']['@attributes']['destination']) > 0) {
+									$this->dialplan_destination = $dialplan['extension']['@attributes']['destination'];
+								}
 								$this->dialplan_global = false;
 								if (strlen($dialplan['extension']['@attributes']['global']) > 0) {
 									if ($dialplan['extension']['@attributes']['global'] == "true") {
@@ -348,9 +353,6 @@ include "root.php";
 								}
 								else {
 									$this->dialplan_enabled = "true";
-								}
-								if (strlen($dialplan['extension']['@attributes']['destination']) > 0) {
-									$this->dialplan_destination = $dialplan['extension']['@attributes']['destination'];
 								}								
 								$this->dialplan_description = '';
 								$this->dialplan_add();