If there is no item in the group of destinations then don't the group name.

This commit is contained in:
markjcrane 2015-08-07 19:50:06 -05:00
parent e19f459cd8
commit 07e884d494
1 changed files with 25 additions and 22 deletions

View File

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