From e89a499b2c3c14b835908786a99cc547156edea3 Mon Sep 17 00:00:00 2001
From: Alexey Melnichuk <mimir@newmail.ru>
Date: Thu, 2 Jul 2015 18:49:58 +0400
Subject: [PATCH] Change. Use number_alias as voicemail_id.

---
 app/extensions/extension_copy.php              |  6 +++---
 app/extensions/extension_edit.php              |  2 +-
 app/extensions/resources/classes/extension.php |  6 +++---
 app/hot_desking/extension_edit.php             | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php
index d406b5ef4f..1f9a8d3563 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -176,11 +176,11 @@ else {
 		//get the voicemails
 			$sql = "select * from v_voicemails ";
 			$sql .= "where domain_uuid = '$domain_uuid' ";
-			if (is_numeric($extension)) {
-				$sql .= "and voicemail_id = '$extension' ";
+			if (is_numeric($number_alias)) {
+				$sql .= "and voicemail_id = '$number_alias' ";
 			}
 			else {
-				$sql .= "and voicemail_id = '$number_alias' ";
+				$sql .= "and voicemail_id = '$extension' ";
 			}
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 3407fdeedc..2920bef162 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -849,7 +849,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			//get the voicemails
 				$sql = "select * from v_voicemails ";
 				$sql .= "where domain_uuid = '".$domain_uuid."' ";
-				$sql .= "and voicemail_id = '".((is_numeric($extension)) ? $extension : $number_alias)."' ";
+				$sql .= "and voicemail_id = '".((is_numeric($number_alias)) ? $number_alias : $extension)."' ";
 				$prep_statement = $db->prepare(check_sql($sql));
 				$prep_statement->execute();
 				$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index a1eb923c5b..dd557c8d7c 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -91,11 +91,11 @@
 		public function voicemail() {
 
 			//determine the voicemail_id
-				if (is_numeric($this->extension)) {
-					$this->voicemail_id = $this->extension;
+				if (is_numeric($this->number_alias)) {
+					$this->voicemail_id = $this->number_alias;
 				}
 				else {
-					$this->voicemail_id = $this->number_alias;
+					$this->voicemail_id = $this->extension;
 				}
 
 			//update the voicemail settings
diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php
index 86cb81dd1b..0f493eed82 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -134,11 +134,11 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 						$sql = "update v_voicemails set ";
 						$sql .= "voicemail_password = '$vm_password' ";
 						$sql .= "where domain_uuid = '$domain_uuid' ";
-						if (is_numeric($extension)) {
-							$sql .= "and voicemail_id = '$extension'";
+						if (is_numeric($number_alias)) {
+							$sql .= "and voicemail_id = '$number_alias'";
 						}
 						else {
-							$sql .= "and voicemail_id = '$number_alias'";
+							$sql .= "and voicemail_id = '$extension'";
 						}
 						$db->exec(check_sql($sql));
 						unset($sql);
@@ -181,11 +181,11 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		//get the voicemail data
 			$sql = "select * from v_voicemails ";
 			$sql .= "where domain_uuid = '$domain_uuid' ";
-			if (is_numeric($extension)) {
-				$sql .= "and voicemail_id = '$extension' ";
+			if (is_numeric($number_alias)) {
+				$sql .= "and voicemail_id = '$number_alias' ";
 			}
 			else {
-				$sql .= "and voicemail_id = '$number_alias' ";
+				$sql .= "and voicemail_id = '$extension' ";
 			}
 			//$sql .= "and voicemail_enabled = 'true' ";
 			$prep_statement = $db->prepare(check_sql($sql));