From 06932b85f70898b4a96ae7ab3270dac6a613be1c Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 19:34:57 -0700 Subject: [PATCH 1/8] Show when we are clearing the cache for *78 or *79. --- resources/install/scripts/do_not_disturb.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/install/scripts/do_not_disturb.lua b/resources/install/scripts/do_not_disturb.lua index 085ecedb68..9cf853de80 100644 --- a/resources/install/scripts/do_not_disturb.lua +++ b/resources/install/scripts/do_not_disturb.lua @@ -175,8 +175,10 @@ --clear the cache if (extension ~= nil) then + freeswitch.consoleLog("notice", "[do_not_disturb] memcache delete directory:"..extension.."@"..domain_name); api:execute("memcache", "delete directory:"..extension.."@"..domain_name); if #number_alias > 0 then + freeswitch.consoleLog("notice", "[do_not_disturb] memcache delete directory:"..number_alias.."@"..domain_name); api:execute("memcache", "delete directory:"..number_alias.."@"..domain_name); end end From c1266f3e00c3836b98e93d702a5e57ac298f0491 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 20:48:22 -0700 Subject: [PATCH 2/8] Remove the line after ?> --- app/contacts/contact_edit.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index ad313bc68d..db8e56fb92 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -755,4 +755,5 @@ else { //include the footer require_once "resources/footer.php"; -?> + +?> \ No newline at end of file From 37051d8c1df24d68a73f6e63cec930e81b547fb1 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 20:50:48 -0700 Subject: [PATCH 3/8] Remove the rss feed from the Mitel template. --- resources/templates/provision/mitel/5324/MN_{$mac}.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg index b081d013c3..354f07ba0b 100644 --- a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg +++ b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg @@ -31,7 +31,7 @@ 1 0 1 - http://rss.news.yahoo.com/rss/topstories + 135.199.77.12 135.199.77.12 128.138.141.172 @@ -135,7 +135,7 @@ 1 2 201 - sipdnld.mitel.com + ${domain_name}/app/provision sipdnld.mitel.com 1 @@ -283,11 +283,11 @@ - + - + - + From 605498c1142b17a7bf19c34bd0a74a694ca66dbd Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 20:54:48 -0700 Subject: [PATCH 4/8] Remove the round brackets as they are not needed with this dialplan. --- app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml b/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml index e0e54da53f..3ea14028df 100644 --- a/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml +++ b/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml @@ -1,7 +1,7 @@ - + From 89dd11cf3ec8e09e7951216f42c4067eff7a67a9 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 21:04:39 -0700 Subject: [PATCH 5/8] Comment out the languages not in use until they are needed. --- resources/switch.php | 2 +- resources/templates/conf/freeswitch.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/switch.php b/resources/switch.php index bf96fa85a3..c073d23a7c 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -1513,4 +1513,4 @@ if(!function_exists('find_php_by_extension')) { } } -?> +?> \ No newline at end of file diff --git a/resources/templates/conf/freeswitch.xml b/resources/templates/conf/freeswitch.xml index 7a1b1d3d15..e25bbc3f70 100644 --- a/resources/templates/conf/freeswitch.xml +++ b/resources/templates/conf/freeswitch.xml @@ -51,17 +51,17 @@ - +
- +
- + - - - + + +
From b422117500c366b85d4a6f450303bbb0afaf9ccb Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 21:07:49 -0700 Subject: [PATCH 6/8] Add hangup to the destination select list. --- app/dialplan/app_languages.php | 10 ++++++++++ resources/classes/destinations.php | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/app/dialplan/app_languages.php b/app/dialplan/app_languages.php index 9ddd161baf..268f332d55 100644 --- a/app/dialplan/app_languages.php +++ b/app/dialplan/app_languages.php @@ -118,6 +118,16 @@ $text['option-company_directory']['sv-se'] = "Företagskatalog"; $text['option-company_directory']['uk'] = "Каталог компаній"; $text['option-company_directory']['de-at'] = "Firmenverzeichnis"; +$text['option-hangup']['en-us'] = "Hangup"; +$text['option-hangup']['es-cl'] = "Colgar"; +$text['option-hangup']['pt-pt'] = "Desligar"; +$text['option-hangup']['fr-fr'] = "Raccrocher"; +$text['option-hangup']['pt-br'] = "Desligar"; +$text['option-hangup']['pl'] = "Odwieszenie"; +$text['option-hangup']['sv-se'] = "Lägg på"; +$text['option-hangup']['uk'] = "роз'єднання"; +$text['option-hangup']['de-at'] = "Auflegen"; + $text['option-record']['en-us'] = "Record"; $text['option-record']['es-cl'] = "Registro"; $text['option-record']['pt-pt'] = "Registro"; diff --git a/resources/classes/destinations.php b/resources/classes/destinations.php index ddb95690d2..d95d3d7c1a 100644 --- a/resources/classes/destinations.php +++ b/resources/classes/destinations.php @@ -97,6 +97,10 @@ class destinations { $this->destinations[$x]['result']['data'][$y]['name'] = '*411'; $this->destinations[$x]['result']['data'][$y]['destination'] = '*411 XML ${context}'; $y++; + $this->destinations[$x]['result']['data'][$y]['label'] = 'hangup'; + $this->destinations[$x]['result']['data'][$y]['name'] = 'hangup'; + $this->destinations[$x]['result']['data'][$y]['destination'] = ''; + $y++; $this->destinations[$x]['result']['data'][$y]['label'] = 'record'; $this->destinations[$x]['result']['data'][$y]['name'] = '*732'; $this->destinations[$x]['result']['data'][$y]['destination'] = '*732 XML ${context}'; From d513ddf1ea6c369b61dee0b7a3c0c7142297df17 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 12 Jan 2016 23:16:45 -0700 Subject: [PATCH 7/8] Complete adding application hangup. --- resources/classes/destinations.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/classes/destinations.php b/resources/classes/destinations.php index d95d3d7c1a..cff34ae040 100644 --- a/resources/classes/destinations.php +++ b/resources/classes/destinations.php @@ -99,6 +99,7 @@ class destinations { $y++; $this->destinations[$x]['result']['data'][$y]['label'] = 'hangup'; $this->destinations[$x]['result']['data'][$y]['name'] = 'hangup'; + $this->destinations[$x]['result']['data'][$y]['application'] = 'hangup'; $this->destinations[$x]['result']['data'][$y]['destination'] = ''; $y++; $this->destinations[$x]['result']['data'][$y]['label'] = 'record'; @@ -215,7 +216,7 @@ class destinations { } else { $label = $data['label']; - $select_label = str_replace("\${".$key."}", $text2['option-'.$label]."215", $select_label); + $select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label); } } } @@ -231,8 +232,13 @@ class destinations { $select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label); } } + //application: hangup + if (strlen($data['application']) > 0) { + $select_value = str_replace("transfer", $data['application'], $select_value); + } } } + $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); From 49a6a760dd8216685760ad6ec805bab4d2b6e24a Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Wed, 13 Jan 2016 10:21:52 +0300 Subject: [PATCH 8/8] Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts` --- .../scripts/{ => app/fax/resources/scripts}/fax_queue_monitor.lua | 0 .../{ => app/fax/resources/scripts}/fax_queue_poll_once.lua | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename resources/install/scripts/{ => app/fax/resources/scripts}/fax_queue_monitor.lua (100%) rename resources/install/scripts/{ => app/fax/resources/scripts}/fax_queue_poll_once.lua (100%) diff --git a/resources/install/scripts/fax_queue_monitor.lua b/resources/install/scripts/app/fax/resources/scripts/fax_queue_monitor.lua similarity index 100% rename from resources/install/scripts/fax_queue_monitor.lua rename to resources/install/scripts/app/fax/resources/scripts/fax_queue_monitor.lua diff --git a/resources/install/scripts/fax_queue_poll_once.lua b/resources/install/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua similarity index 100% rename from resources/install/scripts/fax_queue_poll_once.lua rename to resources/install/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua