From a39cbaf09409d8bc2aa47aff8f9ffdd3df3066b1 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 22 May 2014 04:20:28 +0000 Subject: [PATCH] Add a dialplan domain select only available to a user in the superadmin group --- app/dialplan/app_config.php | 4 ++++ app/dialplan/app_languages.php | 15 ++++++++++++++ app/dialplan/dialplan_edit.php | 36 ++++++++++++++++++++++++++++++++-- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app/dialplan/app_config.php b/app/dialplan/app_config.php index 1e6635d7b3..c552a5cabd 100644 --- a/app/dialplan/app_config.php +++ b/app/dialplan/app_config.php @@ -95,6 +95,10 @@ $apps[$x]['permissions'][$y]['name'] = "dialplan_detail_delete"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = 'dialplan_domain'; + $apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; + $y++; //schema details $y = 0; //table array index diff --git a/app/dialplan/app_languages.php b/app/dialplan/app_languages.php index b20a046b12..e1c49a39c3 100644 --- a/app/dialplan/app_languages.php +++ b/app/dialplan/app_languages.php @@ -195,6 +195,21 @@ $text['label-order']['pt-pt'] = "Ordem"; $text['label-order']['fr-fr'] = "Ordre"; + $text['label-domain']['en-us'] = "Domain"; + $text['label-domain']['es-cl'] = "Dominio"; + $text['label-domain']['pt-pt'] = "Domínio"; + $text['label-domain']['fr-fr'] = "Domaine"; + + $text['description-domain']['en-us'] = ""; + $text['description-domain']['es-cl'] = ""; + $text['description-domain']['pt-pt'] = ""; + $text['description-domain']['fr-fr'] = ""; + + $text['select-global']['en-us'] = "Global"; + $text['select-global']['es-cl'] = "Global"; + $text['select-global']['pt-pt'] = "Global"; + $text['select-global']['fr-fr'] = "Mondial"; + $text['label-enabled']['en-us'] = "Enabled"; $text['label-enabled']['es-cl'] = "Activado"; $text['label-enabled']['pt-pt'] = "Habilitado"; diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php index 1d77a48840..98e0aa9e57 100644 --- a/app/dialplan/dialplan_edit.php +++ b/app/dialplan/dialplan_edit.php @@ -113,10 +113,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $dialplan_name = str_replace("/", "", $dialplan_name); //build the array - $array['domain_uuid'] = $_SESSION['domain_uuid']; if (strlen($row["dialplan_uuid"]) > 0) { $array['dialplan_uuid'] = $_POST["dialplan_uuid"]; } + else { + $array['domain_uuid'] = $_SESSION['domain_uuid']; + } $array['dialplan_name'] = $dialplan_name; $array['dialplan_number'] = $_POST["dialplan_number"]; $array['dialplan_context'] = $_POST["dialplan_context"]; @@ -127,10 +129,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $x = 0; foreach ($_POST["dialplan_details"] as $row) { if (strlen($row["dialplan_detail_tag"]) > 0) { - $array['dialplan_details'][$x]['domain_uuid'] = $_SESSION['domain_uuid']; if (strlen($row["dialplan_detail_uuid"]) > 0) { $array['dialplan_details'][$x]['dialplan_detail_uuid'] = $row["dialplan_detail_uuid"]; } + else { + $array['dialplan_details'][$x]['domain_uuid'] = $_SESSION['domain_uuid']; + } $array['dialplan_details'][$x]['dialplan_detail_tag'] = $row["dialplan_detail_tag"]; $array['dialplan_details'][$x]['dialplan_detail_type'] = $row["dialplan_detail_type"]; $array['dialplan_details'][$x]['dialplan_detail_data'] = $row["dialplan_detail_data"]; @@ -428,6 +432,34 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + if (permission_exists('dialplan_domain')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-domain'].":\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-domain_name']."\n"; + echo "\n"; + echo "\n"; + } + echo "\n"; echo "\n"; echo " ".$text['label-enabled']."\n";