diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php index dece0e186c..d27dad6e06 100644 --- a/app/dialplan_inbound/dialplan_inbound_add.php +++ b/app/dialplan_inbound/dialplan_inbound_add.php @@ -578,7 +578,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //delete the dialplan context from memcache $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if ($fp) { - $switch_cmd = "memcache delete dialplan:public@".$_SESSION['domain_name']; + $switch_cmd = "memcache delete dialplan:public"; $switch_result = event_socket_request($fp, 'api '.$switch_cmd); } diff --git a/app/ivr_menu/ivr_menu_copy.php b/app/ivr_menu/ivr_menu_copy.php index 3f00c71a39..2393ded27e 100644 --- a/app/ivr_menu/ivr_menu_copy.php +++ b/app/ivr_menu/ivr_menu_copy.php @@ -73,7 +73,6 @@ else { $ivr_menu_direct_dial = $row["ivr_menu_direct_dial"]; $ivr_menu_enabled = $row["ivr_menu_enabled"]; $ivr_menu_description = 'copy: '.$row["ivr_menu_description"]; - break; //limit to 1 row } unset ($prep_statement); @@ -175,6 +174,16 @@ else { unset($sql); } +//synchronize the xml config + save_dialplan_xml(); + +//delete the dialplan context from memcache + $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); + if ($fp) { + $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]; + $switch_result = event_socket_request($fp, 'api '.$switch_cmd); + } + //redirect the user require_once "resources/header.php"; echo "\n"; diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php index 73208850d2..376c2f8016 100644 --- a/app/ivr_menu/ivr_menu_delete.php +++ b/app/ivr_menu/ivr_menu_delete.php @@ -40,11 +40,11 @@ else { $text[$key] = $value[$_SESSION['domain']['language']['code']]; } -if (count($_GET)>0) { +if (count($_GET) > 0) { $id = check_str($_GET["id"]); } -if (strlen($id)>0) { +if (strlen($id) > 0) { //include the ivr menu class require_once "resources/classes/database.php"; require_once "resources/classes/ivr_menu.php"; @@ -55,6 +55,13 @@ if (strlen($id)>0) { //synchronize the xml config save_dialplan_xml(); + + //delete the dialplan context from memcache + $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); + if ($fp) { + $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]; + $switch_result = event_socket_request($fp, 'api '.$switch_cmd); + } } //redirect the user diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php index 13d3d3f0f8..4d843da176 100644 --- a/app/ivr_menu/ivr_menu_edit.php +++ b/app/ivr_menu/ivr_menu_edit.php @@ -264,7 +264,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } } - //redirect the user + //delete the dialplan context from memcache + $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); + if ($fp) { + $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]; + $switch_result = event_socket_request($fp, 'api '.$switch_cmd); + } + + //set the message $_SESSION['message'] = $text['message-update']; } //if ($_POST["persistformvar"] != "true") } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) diff --git a/app/ivr_menu/resources/classes/ivr_menu.php b/app/ivr_menu/resources/classes/ivr_menu.php index 8950875db6..81eea37214 100644 --- a/app/ivr_menu/resources/classes/ivr_menu.php +++ b/app/ivr_menu/resources/classes/ivr_menu.php @@ -726,7 +726,7 @@ require_once "resources/classes/dialplan.php"; //delete the dialplan context from memcache $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if ($fp) { - $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name']; + $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]; $switch_result = event_socket_request($fp, 'api '.$switch_cmd); } diff --git a/app/sql_query/sql_query.php b/app/sql_query/sql_query.php index ba18012a67..1aefdf4aae 100644 --- a/app/sql_query/sql_query.php +++ b/app/sql_query/sql_query.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2012 + Portions created by the Initial Developer are Copyright (C) 2008-2013 the Initial Developer. All Rights Reserved. Contributor(s): diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php index 7eca0c7eb6..0b923b8370 100644 --- a/app/time_conditions/time_condition_add.php +++ b/app/time_conditions/time_condition_add.php @@ -478,7 +478,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //delete the dialplan context from memcache $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if ($fp) { - $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]."@".$_SESSION['domain_name']; + $switch_cmd = "memcache delete dialplan:".$_SESSION["context"]; $switch_result = event_socket_request($fp, 'api '.$switch_cmd); }