From 3f04a801b847f364e214add9cc235c470b3aee2f Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sat, 14 Oct 2017 16:19:18 -0600
Subject: [PATCH] Update device_profile_edit.php

---
 app/devices/device_profile_edit.php | 56 +++++++++++++++++------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index 05a8cc7561..f488f5801e 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -222,6 +222,8 @@
 	$sql .= "WHEN 'memory' THEN 2 ";
 	$sql .= "WHEN 'programmable' THEN 3 ";
 	$sql .= "WHEN 'expansion' THEN 4 ";
+	$sql .= "WHEN 'expansion-1' THEN 5 ";
+	$sql .= "WHEN 'expansion-2' THEN 6 ";
 	$sql .= "ELSE 100 END, ";
 	if ($db_type == "mysql") {
 		$sql .= "device_key_id asc ";
@@ -425,11 +427,13 @@
 			else {
 				echo "	<option value='line'>".$text['label-line']."</option>\n";
 			}
-			if ($row['device_key_category'] == "memory") {
-				echo "	<option value='memory' selected='selected'>".$text['label-memory']."</option>\n";
-			}
-			else {
-				echo "	<option value='memory'>".$text['label-memory']."</option>\n";
+			if ($row['device_key_vendor'] !== "polycom") { 
+				if ($row['device_key_category'] == "memory") {
+					echo "	<option value='memory' selected='selected'>".$text['label-memory']."</option>\n";
+				}
+				else {
+					echo "	<option value='memory'>".$text['label-memory']."</option>\n";
+				}
 			}
 			if ($row['device_key_category'] == "programmable") {
 				echo "	<option value='programmable' selected='selected'>".$text['label-programmable']."</option>\n";
@@ -437,21 +441,13 @@
 			else {
 				echo "	<option value='programmable'>".$text['label-programmable']."</option>\n";
 			}
-			if (strlen($device_vendor) == 0) {
-				if ($row['device_key_category'] == "expansion") {
-					echo "	<option value='expansion' selected='selected'>".$text['label-expansion']."</option>\n";
-				}
-				else {
-					echo "	<option value='expansion'>".$text['label-expansion']."</option>\n";
-				}
-			}
-			else {
-				if (strtolower($device_vendor) == "cisco") {
-					if ($row['device_key_category'] == "expansion-1" || $row['device_key_category'] == "expansion") {
-						echo "	<option value='expansion-1' selected='selected'>".$text['label-expansion']." 1</option>\n";
+			if ($row['device_key_vendor'] !== "polycom") { 
+				if (strlen($row['device_key_vendor']) == 0) {
+					if ($row['device_key_category'] == "expansion") {
+						echo "	<option value='expansion' selected='selected'>".$text['label-expansion']." 1</option>\n";
 					}
 					else {
-						echo "	<option value='expansion-1'>".$text['label-expansion']." 1</option>\n";
+						echo "	<option value='expansion'>".$text['label-expansion']." 1</option>\n";
 					}
 					if ($row['device_key_category'] == "expansion-2") {
 						echo "	<option value='expansion-2' selected='selected'>".$text['label-expansion']." 2</option>\n";
@@ -461,14 +457,29 @@
 					}
 				}
 				else {
-					if ($row['device_key_category'] == "expansion") {
-						echo "	<option value='expansion' selected='selected'>".$text['label-expansion']."</option>\n";
+					if (strtolower($row['device_key_vendor']) == "cisco" or strtolower($row['device_key_vendor']) == "yealink") {
+						if ($row['device_key_category'] == "expansion-1" || $row['device_key_category'] == "expansion") {
+							echo "	<option value='expansion-1' selected='selected'>".$text['label-expansion']." 1</option>\n";
+						}
+						else {
+							echo "	<option value='expansion-1'>".$text['label-expansion']." 1</option>\n";
+						}
+						if ($row['device_key_category'] == "expansion-2") {
+							echo "	<option value='expansion-2' selected='selected'>".$text['label-expansion']." 2</option>\n";
+						}
+						else {
+							echo "	<option value='expansion-2'>".$text['label-expansion']." 2</option>\n";
+						}
 					}
 					else {
-						echo "	<option value='expansion'>".$text['label-expansion']."</option>\n";
+						if ($row['device_key_category'] == "expansion") {
+							echo "	<option value='expansion' selected='selected'>".$text['label-expansion']."</option>\n";
+						}
+						else {
+							echo "	<option value='expansion'>".$text['label-expansion']."</option>\n";
+						}
 					}
 				}
-
 			}
 			echo "	</select>\n";
 			echo "</td>\n";
@@ -662,7 +673,6 @@
 		echo "			</table>\n";
 		echo "			</td>\n";
 		echo "			</tr>\n";
-				
 
 	if (permission_exists('device_profile_domain')) {
 		echo "<tr>\n";