From 07e884d49424b2ba0c8a7fac8bb8ccd9bae85b4b Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Fri, 7 Aug 2015 19:50:06 -0500
Subject: [PATCH] If there is no item in the group of destinations then don't
 the group name.

---
 resources/classes/destinations.php | 47 ++++++++++++++++--------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/resources/classes/destinations.php b/resources/classes/destinations.php
index 918db86b5f..29e72e2f2f 100644
--- a/resources/classes/destinations.php
+++ b/resources/classes/destinations.php
@@ -168,32 +168,34 @@ class destinations {
 					$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/'.$name);
 				}
 
-				$response .= "		<optgroup label='".$text2['title-'.$label]."'>\n";
-				foreach ($row['result']['data'] as $data) {
-					$select_value = $row['select_value'][$destination_type];
-					$select_label = $row['select_label'];
-					foreach ($row['field'] as $key => $value) {
-						if ($key == 'destination' and is_array($value)){
-							if ($value['type'] == 'csv') {
-								$array = explode($value['delimiter'], $data[$key]);
-								$select_value = str_replace("\${destination}", $array[0], $select_value);
-								$select_label = str_replace("\${destination}", $array[0], $select_label);
+				if (count($row['result']['data']) > 0 and strlen($row['select_value'][$destination_type]) > 0) {
+					$response .= "		<optgroup label='".$text2['title-'.$label]."'>\n";
+					foreach ($row['result']['data'] as $data) {
+						$select_value = $row['select_value'][$destination_type];
+						$select_label = $row['select_label'];
+						foreach ($row['field'] as $key => $value) {
+							if ($key == 'destination' and is_array($value)){
+								if ($value['type'] == 'csv') {
+									$array = explode($value['delimiter'], $data[$key]);
+									$select_value = str_replace("\${destination}", $array[0], $select_value);
+									$select_label = str_replace("\${destination}", $array[0], $select_label);
+								}
+							}
+							else {
+								$select_value = str_replace("\${".$key."}", $data[$key], $select_value);
+								$select_label = str_replace("\${".$key."}", $data[$key], $select_label);
 							}
 						}
-						else {
-							$select_value = str_replace("\${".$key."}", $data[$key], $select_value);
-							$select_label = str_replace("\${".$key."}", $data[$key], $select_label);
-						}
+						$select_value = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_value);
+						$select_value = str_replace("\${context}", $_SESSION['context'], $select_value); //to do: context can come from the array
+						$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label);
+						$select_label = str_replace("\${context}", $_SESSION['context'], $select_label);
+						if ($select_value == $destination_value) { $selected = "selected='selected' "; } else { $selected = ''; }
+						$response .= "			<option value='".$select_value."' $selected>".trim($select_label)."</option>\n";
 					}
-					$select_value = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_value);
-					$select_value = str_replace("\${context}", $_SESSION['context'], $select_value); //to do: context can come from the array
-					$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label);
-					$select_label = str_replace("\${context}", $_SESSION['context'], $select_label);
-					if ($select_value == $destination_value) { $selected = "selected='selected' "; } else { $selected = ''; }
-					$response .= "			<option value='".$select_value."' $selected>".trim($select_label)."</option>\n";
+					$response .= "		</optgroup>\n";
+					unset($text);
 				}
-				$response .= "		</optgroup>\n";
-				unset($text);
 			}
 			$response .= "	</select>\n";
 			if (if_group("superadmin")) {
@@ -206,6 +208,7 @@ class destinations {
 }
 /*
 $obj = new destinations;
+//$destinations = $obj->destinations;
 echo $obj->select('ivr', 'example1', 'menu-exec-app:transfer 32 XML voip.fusionpbx.com');
 echo $obj->select('ivr', 'example2', '');
 echo $obj->select('ivr', 'example3', '');