From c67c8cd4c2fd3e307725051a54df896ae53649d3 Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Mon, 30 Nov 2020 14:15:57 -0700
Subject: [PATCH] Destination Select - Dynamic: Clear session array on
 add/toggle/delete of a destination type record.

---
 app/bridges/bridge_edit.php                        |  5 +++++
 app/bridges/resources/classes/bridges.php          | 10 ++++++++++
 app/call_centers/call_center_queue_edit.php        |  5 +++++
 app/call_centers/resources/classes/call_center.php |  5 +++++
 app/call_flows/call_flow_edit.php                  |  5 +++++
 app/call_flows/resources/classes/call_flows.php    | 10 ++++++++++
 app/conference_centers/conference_center_edit.php  |  5 +++++
 .../resources/classes/conference_centers.php       | 10 ++++++++++
 app/conferences/conference_edit.php                |  5 +++++
 app/conferences/resources/classes/conferences.php  | 10 ++++++++++
 .../resources/classes/destinations.php             | 11 +++++------
 app/dialplans/dialplan_edit.php                    |  5 +++++
 app/dialplans/resources/classes/dialplan.php       | 14 ++++++++++++++
 app/extensions/extension_edit.php                  |  6 ++++++
 app/extensions/resources/classes/extension.php     | 10 ++++++++++
 app/fax/fax_edit.php                               |  6 ++++++
 app/fax/resources/classes/fax.php                  |  5 +++++
 app/ivr_menus/ivr_menu_edit.php                    |  6 ++++++
 app/ivr_menus/resources/classes/ivr_menu.php       | 10 ++++++++++
 app/phrases/phrase_edit.php                        | 10 ++++++++++
 app/phrases/phrases.php                            |  6 +++---
 app/phrases/resources/classes/phrases.php          | 10 ++++++++++
 app/recordings/recordings.php                      |  5 +++++
 .../resources/classes/switch_recordings.php        |  5 +++++
 app/ring_groups/resources/classes/ring_groups.php  | 10 ++++++++++
 app/ring_groups/ring_group_edit.php                |  5 +++++
 .../resources/classes/time_conditions.php          | 10 ++++++++++
 app/time_conditions/time_condition_edit.php        |  5 +++++
 app/voicemails/resources/classes/voicemail.php     | 10 ++++++++++
 app/voicemails/voicemail_edit.php                  |  5 +++++
 30 files changed, 215 insertions(+), 9 deletions(-)

diff --git a/app/bridges/bridge_edit.php b/app/bridges/bridge_edit.php
index a3e2b89218..49f2a7483d 100644
--- a/app/bridges/bridge_edit.php
+++ b/app/bridges/bridge_edit.php
@@ -124,6 +124,11 @@
 			$database->save($array);
 			$message = $database->message;
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
diff --git a/app/bridges/resources/classes/bridges.php b/app/bridges/resources/classes/bridges.php
index 5254fe7d7b..f7797092e6 100644
--- a/app/bridges/resources/classes/bridges.php
+++ b/app/bridges/resources/classes/bridges.php
@@ -106,6 +106,11 @@ if (!class_exists('bridges')) {
 									$database->delete($array);
 									unset($array);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -174,6 +179,11 @@ if (!class_exists('bridges')) {
 									$database->save($array);
 									unset($array);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index 9d0a64eaf0..7889f1032f 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -379,6 +379,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
diff --git a/app/call_centers/resources/classes/call_center.php b/app/call_centers/resources/classes/call_center.php
index 4f62248265..bd9887cce9 100644
--- a/app/call_centers/resources/classes/call_center.php
+++ b/app/call_centers/resources/classes/call_center.php
@@ -369,6 +369,11 @@
 										$cache->delete("dialplan:".$_SESSION["domain_name"]);
 										remove_config_from_cache('configuration:callcenter.conf');
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//synchronize configuration
 										save_call_center_xml();
 
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index c507527df7..d7b4cc6f21 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -255,6 +255,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$call_flow_context);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
diff --git a/app/call_flows/resources/classes/call_flows.php b/app/call_flows/resources/classes/call_flows.php
index 2bb4d87647..cff8c934f0 100644
--- a/app/call_flows/resources/classes/call_flows.php
+++ b/app/call_flows/resources/classes/call_flows.php
@@ -158,6 +158,11 @@ if (!class_exists('call_flows')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -250,6 +255,11 @@ if (!class_exists('call_flows')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 468910f612..fe8b29769e 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -185,6 +185,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
diff --git a/app/conference_centers/resources/classes/conference_centers.php b/app/conference_centers/resources/classes/conference_centers.php
index 7943fc08ef..ed6b316039 100644
--- a/app/conference_centers/resources/classes/conference_centers.php
+++ b/app/conference_centers/resources/classes/conference_centers.php
@@ -375,6 +375,11 @@ if (!class_exists('conference_centers')) {
 									$cache = new cache;
 									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//apply settings reminder
 									$_SESSION["reload_xml"] = true;
 
@@ -606,6 +611,11 @@ if (!class_exists('conference_centers')) {
 									$cache = new cache;
 									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index c87d4ea371..0e12346361 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -243,6 +243,11 @@
 					$cache = new cache;
 					$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
+
 				//redirect the browser
 					header("Location: conferences.php");
 					exit;
diff --git a/app/conferences/resources/classes/conferences.php b/app/conferences/resources/classes/conferences.php
index 570ee92dca..38ce49cd9e 100644
--- a/app/conferences/resources/classes/conferences.php
+++ b/app/conferences/resources/classes/conferences.php
@@ -143,6 +143,11 @@ if (!class_exists('conferences')) {
 									$cache = new cache;
 									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 
@@ -229,6 +234,11 @@ if (!class_exists('conferences')) {
 									$cache = new cache;
 									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index f103dd8812..4521f445b3 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -457,13 +457,12 @@ if (!class_exists('destinations')) {
 
 				//get the destinations
 				$destination = new destinations;
-				if (!isset($_SESSION['destinations'][$destination_type])) {
-					unset($_SESSION['destinations'][$destination_type]);
-					$_SESSION['destinations'][$destination_type] = $destination->get($destination_type);
+				if (!isset($_SESSION['destinations']['array'][$destination_type])) {
+					$_SESSION['destinations']['array'][$destination_type] = $destination->get($destination_type);
 				}
 
 				//get the destination label
-				foreach($_SESSION['destinations'][$destination_type] as $key => $value) {
+				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
 					foreach($value as $k => $row) {
 						if ($destination_value == $row['destination']) {
 							$destination_key = $key;
@@ -479,7 +478,7 @@ if (!class_exists('destinations')) {
 				//build the destination select list in html
 				$response .= "	<select class='formfld' style='".$select_style."' onchange=\"get_destinations('".$destination_id."', '".$destination_type."', this.value);\">\n";
 				$response .= " 		<option value=''></option>\n";
-				foreach($_SESSION['destinations'][$destination_type] as $key => $value) {
+				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
 					if (permission_exists($destination->singular($key)."_destinations")) {
 						//determine if selected
 						$selected = ($key == $destination_key) ? "selected='selected'" : ''; 
@@ -499,7 +498,7 @@ if (!class_exists('destinations')) {
 				}
 				$response .= "	</select>\n";
 				$response .= "	<select id='".$destination_id."' name='".$destination_name."' class='formfld' style='".$select_style."'>\n";
-				foreach($_SESSION['destinations'][$destination_type] as $key => $value) {
+				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
 					if ($key == $destination_key) {
 						foreach($value as $k => $row) {
 							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : ''; 
diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php
index 07c204786c..25cb4186ea 100644
--- a/app/dialplans/dialplan_edit.php
+++ b/app/dialplans/dialplan_edit.php
@@ -272,6 +272,11 @@
 			}
 			$cache->delete("dialplan:".$dialplan_context);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			if ($action == "add") {
 				message::add($text['message-add']);
diff --git a/app/dialplans/resources/classes/dialplan.php b/app/dialplans/resources/classes/dialplan.php
index b93c3f6049..68cd8cd311 100644
--- a/app/dialplans/resources/classes/dialplan.php
+++ b/app/dialplans/resources/classes/dialplan.php
@@ -118,6 +118,10 @@
 					$database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
 					$database->save($array);
 					unset($array);
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
 				//revoke temporary permissions
 					$p->delete('dialplan_add', 'temp');
 			}
@@ -1054,6 +1058,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-delete'].': '.@sizeof($array[$this->table]));
 
@@ -1257,6 +1266,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-toggle']);
 								}
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 4ef2eddade..bbb3545e79 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -625,6 +625,12 @@
 							if (permission_exists('number_alias') && strlen($number_alias) > 0) {
 								$cache->delete("directory:".$number_alias."@".$user_context);
 							}
+
+						//clear the destinations session array
+							if (isset($_SESSION['destinations']['array'])) {
+								unset($_SESSION['destinations']['array']);
+							}
+
 					}
 
 				//set the message and redirect
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 29e97884c9..c538ae25d6 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -683,6 +683,11 @@ if (!class_exists('extension')) {
 										$this->xml();
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 
@@ -787,6 +792,11 @@ if (!class_exists('extension')) {
 									}
 									unset($extensions);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 992fc212b1..6961f147e6 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -356,6 +356,12 @@
 					//revoke temp permissions
 						$p->delete('fax_add', 'temp');
 						$p->delete('fax_edit', 'temp');
+
+					//clear the destinations session array
+						if (isset($_SESSION['destinations']['array'])) {
+							unset($_SESSION['destinations']['array']);
+						}
+
 				}
 
 				//get the dialplan_uuid
diff --git a/app/fax/resources/classes/fax.php b/app/fax/resources/classes/fax.php
index 77b30c2e78..c34bf2ed54 100644
--- a/app/fax/resources/classes/fax.php
+++ b/app/fax/resources/classes/fax.php
@@ -348,6 +348,11 @@ if (!class_exists('fax')) {
 									$cache = new cache;
 									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index c5a00a29a8..a79c412e2a 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -425,6 +425,12 @@
 					foreach ($parent_uuids as $x => $row) {
 						$cache->delete("configuration:ivr.conf:".$row['ivr_menu_parent_uuid']);
 					}
+
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
+
 				//set the add message
 					if ($action == "add" && permission_exists('ivr_menu_add')) {
 						message::add($text['message-add']);
diff --git a/app/ivr_menus/resources/classes/ivr_menu.php b/app/ivr_menus/resources/classes/ivr_menu.php
index 3d7aa56904..f9f33ce966 100644
--- a/app/ivr_menus/resources/classes/ivr_menu.php
+++ b/app/ivr_menus/resources/classes/ivr_menu.php
@@ -170,6 +170,11 @@ if (!class_exists('ivr_menu')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -329,6 +334,11 @@ if (!class_exists('ivr_menu')) {
 										$cache->delete("configuration:ivr.conf:".$ivr_menu_uuid);
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php
index 6550540cda..d2c6d859d3 100644
--- a/app/phrases/phrase_edit.php
+++ b/app/phrases/phrase_edit.php
@@ -174,6 +174,11 @@
 						$cache = new cache;
 						$cache->delete("languages:".$phrase_language.".".$phrase_uuid);
 
+					//clear the destinations session array
+						if (isset($_SESSION['destinations']['array'])) {
+							unset($_SESSION['destinations']['array']);
+						}
+
 					//send a redirect
 						message::add($text['message-add']);
 						header("Location: phrase_edit.php?id=".$phrase_uuid);
@@ -240,6 +245,11 @@
 						$cache = new cache;
 						$cache->delete("languages:".$phrase_language.".".$phrase_uuid);
 
+					//clear the destinations session array
+						if (isset($_SESSION['destinations']['array'])) {
+							unset($_SESSION['destinations']['array']);
+						}
+
 					//send a redirect
 						message::add($text['message-update']);
 						header("Location: phrase_edit.php?id=".$phrase_uuid);
diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php
index 2e281f9126..52c48517e7 100644
--- a/app/phrases/phrases.php
+++ b/app/phrases/phrases.php
@@ -54,21 +54,21 @@
 				if (permission_exists('phrase_add')) {
 					$obj = new phrases;
 					$obj->copy($phrases);
-					save_phrases_xml();
+					//save_phrases_xml();
 				}
 				break;
 			case 'toggle':
 				if (permission_exists('phrase_edit')) {
 					$obj = new phrases;
 					$obj->toggle($phrases);
-					save_phrases_xml();
+					//save_phrases_xml();
 				}
 				break;
 			case 'delete':
 				if (permission_exists('phrase_delete')) {
 					$obj = new phrases;
 					$obj->delete($phrases);
-					save_phrases_xml();
+					//save_phrases_xml();
 				}
 				break;
 		}
diff --git a/app/phrases/resources/classes/phrases.php b/app/phrases/resources/classes/phrases.php
index 2fcbc013bd..4ad96c540d 100644
--- a/app/phrases/resources/classes/phrases.php
+++ b/app/phrases/resources/classes/phrases.php
@@ -152,6 +152,11 @@ if (!class_exists('phrases')) {
 										$cache->delete("languages:".$phrase_language);
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -302,6 +307,11 @@ if (!class_exists('phrases')) {
 										$cache->delete("languages:".$phrase_language);
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 941c7a374d..05ca5ac758 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -128,6 +128,11 @@
 		//move the uploaded files
 			move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			message::add($text['message-uploaded'].": ".htmlentities($recording_filename));
 
diff --git a/app/recordings/resources/classes/switch_recordings.php b/app/recordings/resources/classes/switch_recordings.php
index 6806c47086..92ad64db2a 100644
--- a/app/recordings/resources/classes/switch_recordings.php
+++ b/app/recordings/resources/classes/switch_recordings.php
@@ -151,6 +151,11 @@ if (!class_exists('switch_recordings')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
diff --git a/app/ring_groups/resources/classes/ring_groups.php b/app/ring_groups/resources/classes/ring_groups.php
index 3e4d8405eb..1677f30538 100644
--- a/app/ring_groups/resources/classes/ring_groups.php
+++ b/app/ring_groups/resources/classes/ring_groups.php
@@ -166,6 +166,11 @@ if (!class_exists('ring_groups')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -335,6 +340,11 @@ if (!class_exists('ring_groups')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 61d67811a4..24f192ea81 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -435,6 +435,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$ring_group_context);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			if ($action == "add") {
 				//save the message to a session variable
diff --git a/app/time_conditions/resources/classes/time_conditions.php b/app/time_conditions/resources/classes/time_conditions.php
index 4beba427df..3adf26ddc5 100644
--- a/app/time_conditions/resources/classes/time_conditions.php
+++ b/app/time_conditions/resources/classes/time_conditions.php
@@ -123,6 +123,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-delete'].': '.@sizeof($array[$this->table]));
 
@@ -210,6 +215,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-toggle']);
 								}
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 81803862a0..d8cbb43580 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -503,6 +503,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			if ($action == "add") {
 				message::add($text['message-add']);
diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php
index 63773b2699..8390206ee0 100644
--- a/app/voicemails/resources/classes/voicemail.php
+++ b/app/voicemails/resources/classes/voicemail.php
@@ -364,6 +364,11 @@
 									$p->delete('voicemail_destination_delete', 'temp');
 									$p->delete('voicemail_greeting_delete', 'temp');
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -544,6 +549,11 @@
 									$database->save($array);
 									unset($array);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 4316b4af68..8da0561eb7 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -244,6 +244,11 @@
 						$obj->voicemail_destinations_delete($voicemail_destinations_delete);
 					}
 
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
+
 				//set message
 					if ($action == "add" && permission_exists('voicemail_add')) {
 						message::add($text['message-add']);