Update authentication.php

Update database.php
Update check_auth.php
2016-09-11 12:52:15 -06:00 · 2016-09-11 12:45:39 -06:00 · 2016-09-11 12:28:12 -06:00 · 2016-09-11 09:52:29 -06:00 · 2016-09-11 09:09:16 -06:00
1156 changed files with 59145 additions and 271306 deletions
@@ -4,9 +4,4 @@
 resources/config.php
 secure/mailto.bat
 secure/*.db
-secure/*.sqlite
-.DS_Store
-
-*.php~
-
-app/yealink/resources/firmware/*
+secure/*.sqlite
@@ -1,46 +1,43 @@
-RewriteEngine    On
+RewriteEngine	On

 # $mac or $mac.cfg/xml
-RewriteRule     ^.*([A-Fa-f0-9]{12})(?:\.xml|\.cfg)?$                           app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^.*([A-Fa-f0-9]{12})(?:\.xml|\.cfg)?$							app/provision/index.php?mac=$1 [QSA]

 # $m:a:c or $m:a:c.cfg/xml
-RewriteRule     ^.*((?:[A-Fa-f0-9]{2}[:-]){5}[A-Fa-f0-9]{2})(?:\.xml|\.cfg)?$   app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^.*((?:[A-Fa-f0-9]{2}[:-]){5}[A-Fa-f0-9]{2})(?:\.xml|\.cfg)?$	app/provision/index.php?mac=$1 [QSA]

 # kt*-$mac.xml
-RewriteRule     ^kt.*?-([A-Fa-f0-9]{12})\.xml$                                  app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^kt.*?-([A-Fa-f0-9]{12})\.xml$								app/provision/index.php?mac=$1 [QSA]

 # cfg-$mac.xml
-RewriteRule     ^.*cfg([A-Fa-f0-9]{12})\.xml$                                   app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^.*cfg([A-Fa-f0-9]{12})\.xml$									app/provision/index.php?mac=$1 [QSA]

 #Snom m3
-RewriteRule     ^m3/settings/([A-Fa-f0-9]{12})(?:\.cfg)?$                       app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^m3/settings/([A-Fa-f0-9]{12})(?:\.cfg)?$					app/provision/index.php?mac=$1 [QSA]

 #Grandstream
-RewriteRule     ^.*/cfg([A-Fa-f0-9]{12})(?:\.xml|\.cfg)?$                       app/provision/?mac=$1 [QSA]
+RewriteRule     ^.*/cfg([A-Fa-f0-9]{12})(?:\.xml|\.cfg)?$			app/provision/?mac=$1 [QSA]

 #Yealink and Polycom
-RewriteRule     ^.*/([A-Fa-f0-9]{12})(?:\.xml|\.cfg)?$                          app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})(?:\.xml|\.cfg)?$				app/provision/index.php?mac=$1 [QSA]

 #Polycom
-RewriteRule     ^provision/000000000000.cfg$                                    app/provision/?mac=$1&file={$mac}.cfg [QSA]
-RewriteRule     ^provision/features.cfg$                                        app/provision/?mac=$1&file=features.cfg [QSA]
-RewriteRule     ^provision/([A-Fa-f0-9]{12})-sip.cfg$                           app/provision/?mac=$1&file=sip.cfg [QSA]
-RewriteRule     ^provision/([A-Fa-f0-9]{12})-phone.cfg$                         app/provision/?mac=$1 [QSA]
-RewriteRule     ^provision/([A-Fa-f0-9]{12})-registration.cfg$                  app/provision/?mac=$1&file={$mac}-registration.cfg [QSA]
-RewriteRule     ^provision/([A-Fa-f0-9]{12})-site.cfg$                          app/provision/?mac=$1&file=site.cfg [QSA]
-RewriteRule     ^provision/([A-Fa-f0-9]{12})-web.cfg$                           app/provision/?mac=$1&file=web.cfg [QSA]
-RewriteRule     ^provision/([A-Fa-f0-9]{12})-directory.xml$                     app/provision/?mac=$1&file=directory.xml [QSA]
+RewriteRule     ^.*/000000000000.cfg$								app/provision/?mac=$1&file={$mac}.cfg [QSA]
+RewriteRule     ^.*/features.cfg$									app/provision/?mac=$1&file=features.cfg [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})-sip.cfg$						app/provision/?mac=$1&file=sip.cfg [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})-phone.cfg$						app/provision/?mac=$1 [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})-registration.cfg$				app/provision/?mac=$1&file={$mac}-registration.cfg [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})-site.cfg$						app/provision/?mac=$1&file=site.cfg [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})-web.cfg$						app/provision/?mac=$1&file=web.cfg [QSA]
+RewriteRule     ^.*/([A-Fa-f0-9]{12})-directory.xml$					app/provision/?mac=$1&file=directory.xml [QSA]

 #Escene
-RewriteRule     ^.*/([0-9]{1,11})_Extern.xml$                                   app/provision/?ext=$1&file={$mac}_extern.xml [QSA]
-RewriteRule     ^.*/([0-9]{1,11})_Phonebook.xml$                                app/provision/?ext=$1&file={$mac}_phonebook.xml [QSA]
-
-#Aastra
-RewriteRule     ^provision/aastra.cfg$                                          app/provision/index.php?file=aastra.cfg [QSA]
+RewriteRule     ^.*/provision/([0-9]{1,11})_Extern.xml$              app/provision/?ext=$1&file={$mac}_extern.xml [QSA]
+RewriteRule     ^.*/provision/([0-9]{1,11})_Phonebook.xml$           app/provision/?ext=$1&file={$mac}_phonebook.xml [QSA]

 Options -Indexes

 #PHP settings
-php_value upload_max_filesize   25M
-php_value post_max_size         35M
-php_value memory_limit          512M
+php_value upload_max_filesize	25M
+php_value post_max_size			35M
+php_value memory_limit			512M
@@ -1,34 +1,31 @@
 What is [FusionPBX](http://fusionpbx.com/)?
 --------------------------------------
-
-[FusionPBX](http://fusionpbx.com/) can be used as a single or domain based multi-tenant PBX, carrier grade switch, call center server, fax server, VoIP server, voicemail server, conference server, voice application server, multi-tenant appliance framework and more. [FreeSWITCH™](http://freeswitch.org) is a highly scalable, multi-threaded, multi-platform communication platform. 
-
-It provides the functionality your business needs and brings carrier grade switching, and corporate-level phone system features to small, medium, and large businesses. Read more at [FusionPBX](http://fusionpbx.com/). [Please visit our youtube channel](https://www.youtube.com/FusionPBX)
+[FusionPBX](http://fusionpbx.com/) is a flexible, customizable administration web GUI that takes [FreeSwitch](http://freeswitch.org) and converts it into a single- or multi-tenant gateway or PBX system out of the box.
+It can be run on any operating system and x86-based hardware of your choice.
+It provides the functionality your business needs and brings corporate-level phone system features to small, medium, and large businesses. Read more at [FusionPBX](http://fusionpbx.com/).

 In addition to providing all of the usual PBX functionality, FusionPBX allows you to configure:

 - Multi-Tenant
 - Unlimited Extensions
 - Voicemail-to-Email
- Device Provisioning
 - Music on Hold
 - Call Parking
 - Automatic Call Distribution
 - Interactive Voice Response
 - Ring Groups
 - Find Me / Follow Me
- Hot desking
- High Availability and Redundancy
- Dialplan Programming that allow nearly endless possibilities
- [Many other Features](http://docs.fusionpbx.com/en/latest/features/features.html)
+- Dialplan Features that can be endlessly combined for your preferences
+- [Many other Features](http://wiki.fusionpbx.com/index.php?title=Features)

 Free Support
 --------------------------------------
 We provide several avenues for you to get your system up and running on your own and learn the basics of the system.

-1. [Youtube Channel](https://www.youtube.com/channel/UCN5j2ITmjua1MfjGR8jX9TA)
-2. [Documentation](http://docs.fusionpbx.com)
+1. [Old Documentation](http://wiki.fusionpbx.com/index.php?title=Main_Page)
+2. [New Documentation](http://docs.fusionpbx.com)
 3. [How to Contribute](https://github.com/Fusionpbx/opensource)
+4. [IRC](http://webchat.freenode.net/) in the #fusionpbx channel

 Commercial Support
 --------------------------------------
@@ -42,25 +39,28 @@ These options support the project and cover any kind of help you might need from

 Software Requirements
 --------------------------------------
+- [Debian Jessie](http://cdimage.debian.org/debian-cd/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-netinst.iso) - Recommended
+This is the distribution recommended by the FreeSwitch team
+- Fusion will also install on Debian Wheezy, Ubuntu 10.10 LTS and is known to work on FreeBSD
+- [FusionPBX Installer](http://fusionpbx.com)

- FusionPBX will run on Debian 8, FreeBSD 10 & 11, CentOS, and more.
- [FusionPBX Installer](http://fusionpbx.com/download.php)

 Community
 --------------------------------------
 We have a pretty thriving community. You can find us here:

+- [IRC](http://webchat.freenode.net/) in the #fusionpbx channel
 - [Twitter](http://twitter.com/fusionpbx)
 - [Website](http://fusionpbx.com)

 Contributing
 ---------------------------------------

-### Requirements
+###Requirements
 It's easy to contribute to FusionPBX the only thing we ask before accepting your pull request is that you sign a Contributor License Agreement.
 We ask that you sign the Contributor License Agreement for the following reasons:

-1. It protects FusionPBX by you guaranteeing that your contributions are yours to contribute and not the property of an employer or something found on the web.
+1. It protects FusionPBX by you gauranteeing that your contributions are yours to contribute and not the property of an employer or something found on the web.
 2. It protects you from using code that belongs to others that is subject unfriendly licensing.

 ### How to Contribute
@@ -39,18 +39,13 @@
 			$prep_statement->execute();
 			unset($sql);

-		//clear the cache
-			$cache = new cache;
-			$cache->delete("configuration:acl.conf");
-		
-		//create the event socket connection
-			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-			if ($fp) { event_socket_request($fp, "api reloadacl"); }
+		// clear cache
+			remove_config_from_cache('configuration:acl.conf');
 	}

 //redirect the user
-	messages::add($text['message-delete']);
+	$_SESSION['message'] = $text['message-delete'];
 	header('Location: access_controls.php');


-?>
+?>
@@ -36,13 +36,12 @@

 if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

-	//get the primary key
-		if ($action == "update") {
-			$access_control_uuid = check_str($_POST["access_control_uuid"]);
-		}
+	$msg = '';
+	if ($action == "update") {
+		$access_control_uuid = check_str($_POST["access_control_uuid"]);
+	}

 	//check for all required data
-		$msg = '';
 		if (strlen($access_control_name) == 0) { $msg .= $text['message-required']." ".$text['label-access_control_name']."<br>\n"; }
 		if (strlen($access_control_default) == 0) { $msg .= $text['message-required']." ".$text['label-access_control_default']."<br>\n"; }
 		//if (strlen($access_control_description) == 0) { $msg .= $text['message-required']." ".$text['label-access_control_description']."<br>\n"; }
@@ -62,7 +61,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//add or update the database
 		if ($_POST["persistformvar"] != "true") {
 			if ($action == "add" && permission_exists('access_control_add')) {
-				//update the database
 				$sql = "insert into v_access_controls ";
 				$sql .= "(";
 				$sql .= "access_control_uuid, ";
@@ -80,25 +78,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);

-				//clear the cache
-				$cache = new cache;
-				$cache->delete("configuration:acl.conf");
-
-				//create the event socket connection
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				if ($fp) { event_socket_request($fp, "api reloadacl"); }
-
-				//add the message
-				messages::add($text['message-add']);
-				
-				//redirect the user
+				remove_config_from_cache('configuration:acl.conf');
+				$_SESSION["message"] = $text['message-add'];
 				header("Location: access_controls.php");
 				return;

 			} //if ($action == "add")

 			if ($action == "update" && permission_exists('access_control_edit')) {
-				//update the database
 				$sql = "update v_access_controls set ";
 				$sql .= "access_control_name = '$access_control_name', ";
 				$sql .= "access_control_default = '$access_control_default', ";
@@ -107,18 +94,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);

-				//clear the cache
-				$cache = new cache;
-				$cache->delete("configuration:acl.conf");
-
-				//create the event socket connection
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				if ($fp) { event_socket_request($fp, "api reloadacl"); }
-
-				//add the message
-				messages::add($text['message-update']);
-
-				//redirect the user
+				remove_config_from_cache('configuration:acl.conf');
+				$_SESSION["message"] = $text['message-update'];
 				header("Location: access_controls.php");
 				return;

@@ -222,4 +199,4 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

 //include the footer
 	require_once "resources/footer.php";
-?>
+?>
@@ -1,49 +1,37 @@
 <?php
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('access_control_node_delete')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('access_control_node_delete')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

 //get the id
-	if (count($_GET) > 0) {
+	if (count($_GET)>0) {
 		$id = check_str($_GET["id"]);
 		$access_control_uuid = check_str($_GET["access_control_uuid"]);
 	}

 //delete access_control_node
-	if (strlen($id) > 0) {
-		//update the database
+	if (strlen($id)>0) {
 		$sql = "delete from v_access_control_nodes ";
 		$sql .= "where access_control_node_uuid = '$id' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
 		unset($sql);
-
-		//clear the cache
-		$cache = new cache;
-		$cache->delete("configuration:acl.conf");
-
-		//create the event socket connection
-		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-		if ($fp) { event_socket_request($fp, "api reloadacl"); }
+		remove_config_from_cache('configuration:acl.conf');
 	}

-//redirect the browser
-	messages::add($text['message-delete']);
+//redirect the user
+	$_SESSION['message'] = $text['message-delete'];
 	header('Location: access_control_edit.php?id='.$access_control_uuid);

-?>
+?>
@@ -1,18 +1,14 @@
 <?php
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('access_control_node_add') || permission_exists('access_control_node_edit')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('access_control_node_add') || permission_exists('access_control_node_edit')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -42,24 +38,16 @@

 if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

-	//get the uuid
-		if ($action == "update") {
-			$access_control_node_uuid = check_str($_POST["access_control_node_uuid"]);
-		}
+	$msg = '';
+	if ($action == "update") {
+		$access_control_node_uuid = check_str($_POST["access_control_node_uuid"]);
+	}

 	//check for all required data
-		$msg = '';
 		if (strlen($node_type) == 0) { $msg .= $text['message-required']." ".$text['label-node_type']."<br>\n"; }
 		//if (strlen($node_cidr) == 0) { $msg .= $text['message-required']." ".$text['label-node_cidr']."<br>\n"; }
 		//if (strlen($node_domain) == 0) { $msg .= $text['message-required']." ".$text['label-node_domain']."<br>\n"; }
 		//if (strlen($node_description) == 0) { $msg .= $text['message-required']." ".$text['label-node_description']."<br>\n"; }
-
-	// check IPv4 and IPv6 CIDR notation
-	  	$pattern4 = '/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/';
-		$pattern6 = '/^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))$/';
-
-		if ($node_cidr != '' && (preg_match($pattern4, $node_cidr) == 0) && (preg_match($pattern6, $node_cidr) == 0)) { $msg .= $text['message-required']." ".$text['label-node_cidr']."<br>\n"; }
-	   
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			require_once "resources/header.php";
 			require_once "resources/persist_form_var.php";
@@ -76,7 +64,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	//add or update the database
 		if ($_POST["persistformvar"] != "true") {
 			if ($action == "add" && permission_exists('access_control_node_add')) {
-				//update the database
 				$sql = "insert into v_access_control_nodes ";
 				$sql .= "(";
 				$sql .= "access_control_node_uuid, ";
@@ -98,26 +85,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);

-				//clear the cache
-				$cache = new cache;
-				$cache->delete("configuration:acl.conf");
-
-				//create the event socket connection
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				if ($fp) { event_socket_request($fp, "api reloadacl"); }
-
-				//add the message
-				messages::add($text['message-add']);
-
-				//redirect the browser
+				remove_config_from_cache('configuration:acl.conf');
+				$_SESSION['message'] = $text['message-add'];
 				header('Location: access_control_edit.php?id='.$access_control_uuid);
 				return;

 			} //if ($action == "add")

 			if ($action == "update" && permission_exists('access_control_node_edit')) {
-
-				//update the database
 				$sql = "update v_access_control_nodes set ";
 				$sql .= "access_control_uuid = '$access_control_uuid', ";
 				$sql .= "node_type = '$node_type', ";
@@ -128,18 +103,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);

-				//clear the cache
-				$cache = new cache;
-				$cache->delete("configuration:acl.conf");
-
-				//create the event socket connection
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				if ($fp) { event_socket_request($fp, "api reloadacl"); }
-
-				//add the message
-				messages::add($text['message-update']);
-
-				//redirect the browser
+				remove_config_from_cache('configuration:acl.conf');
+				$_SESSION['message'] = $text['message-update'];
 				header('Location: access_control_edit.php?id='.$access_control_uuid);
 				return;

@@ -169,6 +134,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";

 //show the content
+
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
@@ -251,4 +217,4 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

 //include the footer
 	require_once "resources/footer.php";
-?>
+?>
@@ -1,115 +1,129 @@
 <?php
-
 	//application details
-		$apps[$x]['name'] = "Access Controls";
-		$apps[$x]['uuid'] = "1416a250-f6e1-4edc-91a6-5c9b883638fd";
-		$apps[$x]['category'] = "";
-		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
-		$apps[$x]['license'] = "Mozilla Public License 1.1";
-		$apps[$x]['url'] = "http://www.fusionpbx.com";
-		$apps[$x]['description']['en-us'] = "Manage access control lists";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Zugriffssteuerungslisten verwalten";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Zugriffssteuerungslisten verwalten";
-		$apps[$x]['description']['es-cl'] = "";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "";
-		$apps[$x]['description']['pt-pt'] = "";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['name'] = 'Access Controls';
+		$apps[$x]['uuid'] = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+		$apps[$x]['category'] = '';
+		$apps[$x]['subcategory'] = '';
+		$apps[$x]['version'] = '';
+		$apps[$x]['license'] = 'Mozilla Public License 1.1';
+		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['description']['en-us'] = '';

 	//permission details
-		$y=0;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y = 0;
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_node_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_node_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_node_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_node_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_node_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_node_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "access_control_node_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['name'] = 'access_control_node_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;

 	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_access_controls";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = 'v_access_controls';
+		//$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
+		//$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'access_control_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_name";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'access_control_name';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Insira o nome';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_default";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the default type.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'access_control_default';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the default type.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Selecione o tipo padrão.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_description";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'access_control_description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Insira com uma descrição';

-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_access_control_nodes";
-		$apps[$x]['db'][$y]['table']['parent'] = "v_access_controls";
-		$z=0;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_node_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$y = 1; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = 'v_access_control_nodes';
+		//$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
+		//$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'access_control_node_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "access_control_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_access_control";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "access_control_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'access_control_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_access_control';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'access_control_uuid';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "node_type";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the type.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'node_type';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the type.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Selecione o tipo.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "node_cidr";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the IP CIDR range.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'node_cidr';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the IP CIDR range.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Insira o intervalo IP CIDR.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "node_domain";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the domain.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'node_domain';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the domain.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Insira com o domínio.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'node_description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Insira a descrição.';
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "node_description";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
-
 ?>
@@ -129,12 +129,10 @@
 					unset($prep_statement);

 				//rename the file
-					if (file_exists($xml_dir.'/acl.conf.xml')) {
-						rename($xml_dir.'/acl.conf.xml', $xml_dir.'/acl.conf');
-					}
+					rename($xml_dir.'/acl.conf.xml', $xml_dir.'/acl.conf');
 			}
 		}

 	}

-?>
+?>
@@ -1,424 +1,289 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC

 $text['title-access_controls']['en-us'] = "Access Controls";
-$text['title-access_controls']['ar-eg'] = "عناصر التحكم في الوصول";
-$text['title-access_controls']['de-at'] = " Zugriffskontrolle"; //copied from de-de
-$text['title-access_controls']['de-ch'] = " Zugriffskontrolle"; //copied from de-de
-$text['title-access_controls']['de-de'] = " Zugriffskontrolle";
 $text['title-access_controls']['es-cl'] = "Controles de acceso";
-$text['title-access_controls']['es-mx'] = "Controles de acceso"; //copied from es-cl
-$text['title-access_controls']['fr-ca'] = "Contrôle d'accès"; //copied from fr-fr
-$text['title-access_controls']['fr-fr'] = "Contrôle d'accès";
-$text['title-access_controls']['he-il'] = "בקרת גישה";
-$text['title-access_controls']['it-it'] = "Controllo Accessi";
-$text['title-access_controls']['nl-nl'] = "";
-$text['title-access_controls']['pl-pl'] = "Kontrola dostępu";
-$text['title-access_controls']['pt-br'] = "Controles de Acesso"; //copied from pt-pt
 $text['title-access_controls']['pt-pt'] = "Controles de Acesso";
-$text['title-access_controls']['ro-ro'] = "Controale de acces";
-$text['title-access_controls']['ru-ru'] = "Контроль доступа";
+$text['title-access_controls']['fr-fr'] = "Contrôle d'accès";
+$text['title-access_controls']['pt-br'] = "Controles de Acesso";
+$text['title-access_controls']['he'] = "בקרת גישה";
+$text['title-access_controls']['de-at'] = " Zugriffskontrolle";
+$text['title-access_controls']['pl'] = "Kontrola dostępu";
+$text['title-access_controls']['ro'] = "Controale de acces";
+$text['title-access_controls']['uk'] = "контроль доступу";
 $text['title-access_controls']['sv-se'] = "Åtkomstkontroll";
-$text['title-access_controls']['uk-ua'] = "контроль доступу";
+$text['title-access_controls']['ar-eg'] = "عناصر التحكم في الوصول";

 $text['title-access_control_nodes']['en-us'] = "Nodes";
-$text['title-access_control_nodes']['ar-eg'] = "العقد";
-$text['title-access_control_nodes']['de-at'] = "Knoten"; //copied from de-de
-$text['title-access_control_nodes']['de-ch'] = "Knoten"; //copied from de-de
-$text['title-access_control_nodes']['de-de'] = "Knoten";
 $text['title-access_control_nodes']['es-cl'] = "Nodos";
-$text['title-access_control_nodes']['es-mx'] = "Nodos"; //copied from es-cl
-$text['title-access_control_nodes']['fr-ca'] = " nœuds"; //copied from fr-fr
-$text['title-access_control_nodes']['fr-fr'] = " nœuds";
-$text['title-access_control_nodes']['he-il'] = "בלוטות";
-$text['title-access_control_nodes']['it-it'] = "Nodi";
-$text['title-access_control_nodes']['nl-nl'] = "";
-$text['title-access_control_nodes']['pl-pl'] = "węzły";
-$text['title-access_control_nodes']['pt-br'] = "Nodes";
 $text['title-access_control_nodes']['pt-pt'] = " Nodes";
-$text['title-access_control_nodes']['ro-ro'] = "Noduri";
-$text['title-access_control_nodes']['ru-ru'] = "Узлы";
+$text['title-access_control_nodes']['fr-fr'] = " nœuds";
+$text['title-access_control_nodes']['pt-br'] = "Nodes";
+$text['title-access_control_nodes']['he'] = "בלוטות";
+$text['title-access_control_nodes']['de-at'] = "Knoten";
+$text['title-access_control_nodes']['pl'] = "węzły";
+$text['title-access_control_nodes']['ro'] = "Noduri";
+$text['title-access_control_nodes']['uk'] = "вузли";
 $text['title-access_control_nodes']['sv-se'] = "Noder";
-$text['title-access_control_nodes']['uk-ua'] = "вузли";
+$text['title-access_control_nodes']['ar-eg'] = "العقد";

 $text['title-access_control_node']['en-us'] = "Node";
-$text['title-access_control_node']['ar-eg'] = "العقدة";
-$text['title-access_control_node']['de-at'] = "Netzknoten"; //copied from de-de
-$text['title-access_control_node']['de-ch'] = "Netzknoten"; //copied from de-de
-$text['title-access_control_node']['de-de'] = "Netzknoten";
 $text['title-access_control_node']['es-cl'] = "Nodo";
-$text['title-access_control_node']['es-mx'] = "Nodo"; //copied from es-cl
-$text['title-access_control_node']['fr-ca'] = " noeud"; //copied from fr-fr
-$text['title-access_control_node']['fr-fr'] = " noeud";
-$text['title-access_control_node']['he-il'] = "צומת";
-$text['title-access_control_node']['it-it'] = "Nodo";
-$text['title-access_control_node']['nl-nl'] = "";
-$text['title-access_control_node']['pl-pl'] = "węzeł";
-$text['title-access_control_node']['pt-br'] = "Nó"; //copied from pt-pt
 $text['title-access_control_node']['pt-pt'] = "Nó";
-$text['title-access_control_node']['ro-ro'] = "Nod";
-$text['title-access_control_node']['ru-ru'] = "Узел";
+$text['title-access_control_node']['fr-fr'] = " noeud";
+$text['title-access_control_node']['pt-br'] = "Nó";
+$text['title-access_control_node']['he'] = "צומת";
+$text['title-access_control_node']['de-at'] = "Netzknoten";
+$text['title-access_control_node']['pl'] = "węzeł";
+$text['title-access_control_node']['ro'] = "Nod";
+$text['title-access_control_node']['uk'] = "вузол";
 $text['title-access_control_node']['sv-se'] = "Nod";
-$text['title-access_control_node']['uk-ua'] = "вузол";
+$text['title-access_control_node']['ar-eg'] = "العقدة";

 $text['title-access_control']['en-us'] = "Access Control";
-$text['title-access_control']['ar-eg'] = "التحكم في الوصول";
-$text['title-access_control']['de-at'] = " Zugangskontrolle"; //copied from de-de
-$text['title-access_control']['de-ch'] = " Zugangskontrolle"; //copied from de-de
-$text['title-access_control']['de-de'] = " Zugangskontrolle";
 $text['title-access_control']['es-cl'] = "Control de acceso";
-$text['title-access_control']['es-mx'] = "Control de acceso"; //copied from es-cl
-$text['title-access_control']['fr-ca'] = "Contrôle d'accès"; //copied from fr-fr
-$text['title-access_control']['fr-fr'] = "Contrôle d'accès";
-$text['title-access_control']['he-il'] = "בקרת גישה";
-$text['title-access_control']['it-it'] = "Controllo Accesso";
-$text['title-access_control']['nl-nl'] = "";
-$text['title-access_control']['pl-pl'] = "Kontrola dostępu";
-$text['title-access_control']['pt-br'] = "Controle de acesso"; //copied from pt-pt
 $text['title-access_control']['pt-pt'] = "Controle de acesso";
-$text['title-access_control']['ro-ro'] = "Controlul accesului";
-$text['title-access_control']['ru-ru'] = "Управление доступом";
+$text['title-access_control']['fr-fr'] = "Contrôle d'accès";
+$text['title-access_control']['pt-br'] = "Controle de acesso";
+$text['title-access_control']['he'] = "בקרת גישה";
+$text['title-access_control']['de-at'] = " Zugangskontrolle";
+$text['title-access_control']['pl'] = "Kontrola dostępu";
+$text['title-access_control']['ro'] = "Controlul accesului";
+$text['title-access_control']['uk'] = "Управління доступом";
 $text['title-access_control']['sv-se'] = "Åtkomstkontroll";
-$text['title-access_control']['uk-ua'] = "Управління доступом";
+$text['title-access_control']['ar-eg'] = "التحكم في الوصول";

 $text['label-node_type']['en-us'] = "Type";
-$text['label-node_type']['ar-eg'] = "اكتب";
-$text['label-node_type']['de-at'] = "Art"; //copied from de-de
-$text['label-node_type']['de-ch'] = "Art"; //copied from de-de
-$text['label-node_type']['de-de'] = "Art";
 $text['label-node_type']['es-cl'] = "Escribe";
-$text['label-node_type']['es-mx'] = "Escribe"; //copied from es-cl
-$text['label-node_type']['fr-ca'] = "Type"; //copied from fr-fr
-$text['label-node_type']['fr-fr'] = "Type";
-$text['label-node_type']['he-il'] = "סוג";
-$text['label-node_type']['it-it'] = "Tipo";
-$text['label-node_type']['nl-nl'] = "";
-$text['label-node_type']['pl-pl'] = "typ";
-$text['label-node_type']['pt-br'] = "Tipo"; //copied from pt-pt
 $text['label-node_type']['pt-pt'] = "Tipo";
-$text['label-node_type']['ro-ro'] = "Tip";
-$text['label-node_type']['ru-ru'] = "Тип";
+$text['label-node_type']['fr-fr'] = "Type";
+$text['label-node_type']['pt-br'] = "Tipo";
+$text['label-node_type']['he'] = "סוג";
+$text['label-node_type']['de-at'] = "Art";
+$text['label-node_type']['pl'] = "typ";
+$text['label-node_type']['ro'] = "Tip";
+$text['label-node_type']['uk'] = "Тип";
 $text['label-node_type']['sv-se'] = "Typ";
-$text['label-node_type']['uk-ua'] = "Тип";
+$text['label-node_type']['ar-eg'] = "اكتب";

 $text['label-node_domain']['en-us'] = "Domain";
-$text['label-node_domain']['ar-eg'] = "مجال";
-$text['label-node_domain']['de-at'] = " Domäne"; //copied from de-de
-$text['label-node_domain']['de-ch'] = " Domäne"; //copied from de-de
-$text['label-node_domain']['de-de'] = " Domäne";
 $text['label-node_domain']['es-cl'] = "Dominio";
-$text['label-node_domain']['es-mx'] = "Dominio"; //copied from es-cl
-$text['label-node_domain']['fr-ca'] = "Domaine"; //copied from fr-fr
-$text['label-node_domain']['fr-fr'] = "Domaine";
-$text['label-node_domain']['he-il'] = "תחום";
-$text['label-node_domain']['it-it'] = "Dominio";
-$text['label-node_domain']['nl-nl'] = "";
-$text['label-node_domain']['pl-pl'] = "domeny";
-$text['label-node_domain']['pt-br'] = "Domínio"; //copied from pt-pt
 $text['label-node_domain']['pt-pt'] = "Domínio";
-$text['label-node_domain']['ro-ro'] = "Domeniu";
-$text['label-node_domain']['ru-ru'] = "Домен";
+$text['label-node_domain']['fr-fr'] = "Domaine";
+$text['label-node_domain']['pt-br'] = "Domínio";
+$text['label-node_domain']['he'] = "תחום";
+$text['label-node_domain']['de-at'] = " Domäne";
+$text['label-node_domain']['pl'] = "domeny";
+$text['label-node_domain']['ro'] = "Domeniu";
+$text['label-node_domain']['uk'] = "домен";
 $text['label-node_domain']['sv-se'] = "Domän";
-$text['label-node_domain']['uk-ua'] = "домен";
+$text['label-node_domain']['ar-eg'] = "مجال";

 $text['label-node_description']['en-us'] = "Description";
-$text['label-node_description']['ar-eg'] = "وصف";
-$text['label-node_description']['de-at'] = "Beschreibung"; //copied from de-de
-$text['label-node_description']['de-ch'] = "Beschreibung"; //copied from de-de
-$text['label-node_description']['de-de'] = "Beschreibung";
 $text['label-node_description']['es-cl'] = "Descripción";
-$text['label-node_description']['es-mx'] = "Descripción"; //copied from es-cl
-$text['label-node_description']['fr-ca'] = "Description"; //copied from fr-fr
-$text['label-node_description']['fr-fr'] = "Description";
-$text['label-node_description']['he-il'] = "תיאור";
-$text['label-node_description']['it-it'] = "Descrizione";
-$text['label-node_description']['nl-nl'] = "";
-$text['label-node_description']['pl-pl'] = "opis";
-$text['label-node_description']['pt-br'] = "Descrição"; //copied from pt-pt
 $text['label-node_description']['pt-pt'] = "Descrição";
-$text['label-node_description']['ro-ro'] = "Descriere";
-$text['label-node_description']['ru-ru'] = "Описание";
+$text['label-node_description']['fr-fr'] = "Description";
+$text['label-node_description']['pt-br'] = "Descrição";
+$text['label-node_description']['he'] = "תיאור";
+$text['label-node_description']['de-at'] = "Beschreibung";
+$text['label-node_description']['pl'] = "opis";
+$text['label-node_description']['ro'] = "Descriere";
+$text['label-node_description']['uk'] = "опис";
 $text['label-node_description']['sv-se'] = "Beskrivning";
-$text['label-node_description']['uk-ua'] = "опис";
+$text['label-node_description']['ar-eg'] = "وصف";

 $text['label-node_cidr']['en-us'] = "CIDR";
-$text['label-node_cidr']['ar-eg'] = "CIDR";
-$text['label-node_cidr']['de-at'] = "CIDR"; //copied from de-de
-$text['label-node_cidr']['de-ch'] = "CIDR"; //copied from de-de
-$text['label-node_cidr']['de-de'] = "CIDR";
 $text['label-node_cidr']['es-cl'] = "CIDR";
-$text['label-node_cidr']['es-mx'] = "CIDR"; //copied from es-cl
-$text['label-node_cidr']['fr-ca'] = "CIDR"; //copied from fr-fr
-$text['label-node_cidr']['fr-fr'] = "CIDR";
-$text['label-node_cidr']['he-il'] = "CIDR";
-$text['label-node_cidr']['it-it'] = "CIDR";
-$text['label-node_cidr']['nl-nl'] = "";
-$text['label-node_cidr']['pl-pl'] = "CIDR";
-$text['label-node_cidr']['pt-br'] = "CIDR"; //copied from pt-pt
 $text['label-node_cidr']['pt-pt'] = "CIDR";
-$text['label-node_cidr']['ro-ro'] = "CIDR";
-$text['label-node_cidr']['ru-ru'] = "CIDR";
+$text['label-node_cidr']['fr-fr'] = "CIDR";
+$text['label-node_cidr']['pt-br'] = "CIDR";
+$text['label-node_cidr']['he'] = "CIDR";
+$text['label-node_cidr']['de-at'] = "CIDR";
+$text['label-node_cidr']['pl'] = "CIDR";
+$text['label-node_cidr']['ro'] = "CIDR";
+$text['label-node_cidr']['uk'] = "CIDR";
 $text['label-node_cidr']['sv-se'] = "CIDR";
-$text['label-node_cidr']['uk-ua'] = "CIDR";
+$text['label-node_cidr']['ar-eg'] = "CIDR";

 $text['label-deny']['en-us'] = "deny";
-$text['label-deny']['ar-eg'] = "تنكر";
-$text['label-deny']['de-at'] = " verbieten"; //copied from de-de
-$text['label-deny']['de-ch'] = " verbieten"; //copied from de-de
-$text['label-deny']['de-de'] = " verbieten";
 $text['label-deny']['es-cl'] = "Negar";
-$text['label-deny']['es-mx'] = "Negar"; //copied from es-cl
-$text['label-deny']['fr-ca'] = " nier"; //copied from fr-fr
-$text['label-deny']['fr-fr'] = " nier";
-$text['label-deny']['he-il'] = "להכחיש";
-$text['label-deny']['it-it'] = "nega";
-$text['label-deny']['nl-nl'] = "";
-$text['label-deny']['pl-pl'] = "zaprzeczać";
-$text['label-deny']['pt-br'] = "negar"; //copied from pt-pt
 $text['label-deny']['pt-pt'] = "negar";
-$text['label-deny']['ro-ro'] = "Nega";
-$text['label-deny']['ru-ru'] = "запретить";
+$text['label-deny']['fr-fr'] = " nier";
+$text['label-deny']['pt-br'] = "negar";
+$text['label-deny']['he'] = "להכחיש";
+$text['label-deny']['de-at'] = " leugnen";
+$text['label-deny']['pl'] = "zaprzeczać";
+$text['label-deny']['ro'] = "Nega";
+$text['label-deny']['uk'] = "правда";
 $text['label-deny']['sv-se'] = "förneka";
-$text['label-deny']['uk-ua'] = "правда";
+$text['label-deny']['ar-eg'] = "تنكر";

 $text['label-allow']['en-us'] = "allow";
-$text['label-allow']['ar-eg'] = "السماح";
-$text['label-allow']['de-at'] = "erlauben"; //copied from de-de
-$text['label-allow']['de-ch'] = "erlauben"; //copied from de-de
-$text['label-allow']['de-de'] = "erlauben";
 $text['label-allow']['es-cl'] = "Permitir";
-$text['label-allow']['es-mx'] = "Permitir"; //copied from es-cl
-$text['label-allow']['fr-ca'] = " permettre"; //copied from fr-fr
-$text['label-allow']['fr-fr'] = " permettre";
-$text['label-allow']['he-il'] = "לאפשר";
-$text['label-allow']['it-it'] = "permetti";
-$text['label-allow']['nl-nl'] = "";
-$text['label-allow']['pl-pl'] = "dopuszczać";
-$text['label-allow']['pt-br'] = "permitir"; //copied from pt-pt
 $text['label-allow']['pt-pt'] = "permitir";
-$text['label-allow']['ro-ro'] = "Permite";
-$text['label-allow']['ru-ru'] = "разрешить";
+$text['label-allow']['fr-fr'] = " permettre";
+$text['label-allow']['pt-br'] = "permitir";
+$text['label-allow']['he'] = "לאפשר";
+$text['label-allow']['de-at'] = "erlauben";
+$text['label-allow']['pl'] = "dopuszczać";
+$text['label-allow']['ro'] = "Permite";
+$text['label-allow']['uk'] = "дозволяти";
 $text['label-allow']['sv-se'] = "tillåta";
-$text['label-allow']['uk-ua'] = "дозволяти";
+$text['label-allow']['ar-eg'] = "السماح";

 $text['label-access_control_name']['en-us'] = "Name";
-$text['label-access_control_name']['ar-eg'] = "اسم";
-$text['label-access_control_name']['de-at'] = "Name"; //copied from de-de
-$text['label-access_control_name']['de-ch'] = "Name"; //copied from de-de
-$text['label-access_control_name']['de-de'] = "Name";
 $text['label-access_control_name']['es-cl'] = "Nombre";
-$text['label-access_control_name']['es-mx'] = "Nombre"; //copied from es-cl
-$text['label-access_control_name']['fr-ca'] = "Nom"; //copied from fr-fr
-$text['label-access_control_name']['fr-fr'] = "Nom";
-$text['label-access_control_name']['he-il'] = "שם";
-$text['label-access_control_name']['it-it'] = "Nome";
-$text['label-access_control_name']['nl-nl'] = "";
-$text['label-access_control_name']['pl-pl'] = " Imię";
-$text['label-access_control_name']['pt-br'] = "Nome"; //copied from pt-pt
 $text['label-access_control_name']['pt-pt'] = "Nome";
-$text['label-access_control_name']['ro-ro'] = "Nume";
-$text['label-access_control_name']['ru-ru'] = "Имя";
+$text['label-access_control_name']['fr-fr'] = "Nom";
+$text['label-access_control_name']['pt-br'] = "Nome";
+$text['label-access_control_name']['he'] = "שם";
+$text['label-access_control_name']['de-at'] = "Name";
+$text['label-access_control_name']['pl'] = " Imię";
+$text['label-access_control_name']['ro'] = "Nume";
+$text['label-access_control_name']['uk'] = "ім'я";
 $text['label-access_control_name']['sv-se'] = "namn";
-$text['label-access_control_name']['uk-ua'] = "ім'я";
+$text['label-access_control_name']['ar-eg'] = "اسم";

 $text['label-access_control_description']['en-us'] = "Description";
-$text['label-access_control_description']['ar-eg'] = "وصف";
-$text['label-access_control_description']['de-at'] = "Beschreibung"; //copied from de-de
-$text['label-access_control_description']['de-ch'] = "Beschreibung"; //copied from de-de
-$text['label-access_control_description']['de-de'] = "Beschreibung";
 $text['label-access_control_description']['es-cl'] = "Descripción";
-$text['label-access_control_description']['es-mx'] = "Descripción"; //copied from es-cl
-$text['label-access_control_description']['fr-ca'] = "Description"; //copied from fr-fr
-$text['label-access_control_description']['fr-fr'] = "Description";
-$text['label-access_control_description']['he-il'] = "תיאור";
-$text['label-access_control_description']['it-it'] = "Descrizione";
-$text['label-access_control_description']['nl-nl'] = "";
-$text['label-access_control_description']['pl-pl'] = "opis";
-$text['label-access_control_description']['pt-br'] = "Descrição"; //copied from pt-pt
 $text['label-access_control_description']['pt-pt'] = "Descrição";
-$text['label-access_control_description']['ro-ro'] = "Descriere";
-$text['label-access_control_description']['ru-ru'] = "Описание";
+$text['label-access_control_description']['fr-fr'] = "Description";
+$text['label-access_control_description']['pt-br'] = "Descrição";
+$text['label-access_control_description']['he'] = "תיאור";
+$text['label-access_control_description']['de-at'] = "Beschreibung";
+$text['label-access_control_description']['pl'] = "opis";
+$text['label-access_control_description']['ro'] = "Descriere";
+$text['label-access_control_description']['uk'] = "опис";
 $text['label-access_control_description']['sv-se'] = "Beskrivning";
-$text['label-access_control_description']['uk-ua'] = "опис";
+$text['label-access_control_description']['ar-eg'] = "وصف";

 $text['label-access_control_default']['en-us'] = "Default";
-$text['label-access_control_default']['ar-eg'] = "افتراضي";
-$text['label-access_control_default']['de-at'] = "Standard"; //copied from de-de
-$text['label-access_control_default']['de-ch'] = "Standard"; //copied from de-de
-$text['label-access_control_default']['de-de'] = "Standard";
 $text['label-access_control_default']['es-cl'] = "Defecto";
-$text['label-access_control_default']['es-mx'] = "Defecto"; //copied from es-cl
-$text['label-access_control_default']['fr-ca'] = "Par défaut"; //copied from fr-fr
-$text['label-access_control_default']['fr-fr'] = "Par défaut";
-$text['label-access_control_default']['he-il'] = " ברירת מחדל";
-$text['label-access_control_default']['it-it'] = "Predefinito";
-$text['label-access_control_default']['nl-nl'] = "";
-$text['label-access_control_default']['pl-pl'] = "Domyślnie";
-$text['label-access_control_default']['pt-br'] = "Padrão"; //copied from pt-pt
 $text['label-access_control_default']['pt-pt'] = "Padrão";
-$text['label-access_control_default']['ro-ro'] = "Implicit";
-$text['label-access_control_default']['ru-ru'] = "По умолчанию";
+$text['label-access_control_default']['fr-fr'] = "Par défaut";
+$text['label-access_control_default']['pt-br'] = "Padrão";
+$text['label-access_control_default']['he'] = " ברירת מחדל";
+$text['label-access_control_default']['de-at'] = "Standard";
+$text['label-access_control_default']['pl'] = "Domyślnie";
+$text['label-access_control_default']['ro'] = "Implicit";
+$text['label-access_control_default']['uk'] = "дефолт";
 $text['label-access_control_default']['sv-se'] = "Standard";
-$text['label-access_control_default']['uk-ua'] = "дефолт";
+$text['label-access_control_default']['ar-eg'] = "افتراضي";

 $text['description-node_type']['en-us'] = "Select the type.";
-$text['description-node_type']['ar-eg'] = "حدد نوع.";
-$text['description-node_type']['de-at'] = " Wählen Sie den Typ."; //copied from de-de
-$text['description-node_type']['de-ch'] = " Wählen Sie den Typ."; //copied from de-de
-$text['description-node_type']['de-de'] = " Wählen Sie den Typ.";
 $text['description-node_type']['es-cl'] = "Seleccione el tipo.";
-$text['description-node_type']['es-mx'] = "Seleccione el tipo."; //copied from es-cl
-$text['description-node_type']['fr-ca'] = " Sélectionnez le type"; //copied from fr-fr
-$text['description-node_type']['fr-fr'] = " Sélectionnez le type";
-$text['description-node_type']['he-il'] = " בחר את הסוג.";
-$text['description-node_type']['it-it'] = "Seleziona il tipo.";
-$text['description-node_type']['nl-nl'] = "";
-$text['description-node_type']['pl-pl'] = "Wybierz rodzaj.";
-$text['description-node_type']['pt-br'] = "Selecione o tipo."; //copied from pt-pt
 $text['description-node_type']['pt-pt'] = "Selecione o tipo.";
-$text['description-node_type']['ro-ro'] = "Selectați tipul.";
-$text['description-node_type']['ru-ru'] = "Выберите тип.";
+$text['description-node_type']['fr-fr'] = " Sélectionnez le type";
+$text['description-node_type']['pt-br'] = "Selecione o tipo.";
+$text['description-node_type']['he'] = " בחר את הסוג.";
+$text['description-node_type']['de-at'] = " Wählen Sie den Typ.";
+$text['description-node_type']['pl'] = "Wybierz rodzaj.";
+$text['description-node_type']['ro'] = "Selectați tipul.";
+$text['description-node_type']['uk'] = "Виберіть тип.";
 $text['description-node_type']['sv-se'] = "Välj typ.";
-$text['description-node_type']['uk-ua'] = "Виберіть тип.";
+$text['description-node_type']['ar-eg'] = "حدد نوع.";

 $text['description-node_domain']['en-us'] = "Enter the domain name.";
-$text['description-node_domain']['ar-eg'] = "أدخل اسم المجال.";
-$text['description-node_domain']['de-at'] = "Geben Sie den Domain-Namen."; //copied from de-de
-$text['description-node_domain']['de-ch'] = "Geben Sie den Domain-Namen."; //copied from de-de
-$text['description-node_domain']['de-de'] = "Geben Sie den Domain-Namen.";
 $text['description-node_domain']['es-cl'] = "Introduzca el nombre de dominio.";
-$text['description-node_domain']['es-mx'] = "Introduzca el nombre de dominio."; //copied from es-cl
-$text['description-node_domain']['fr-ca'] = "Entrez le nom de domaine."; //copied from fr-fr
-$text['description-node_domain']['fr-fr'] = "Entrez le nom de domaine.";
-$text['description-node_domain']['he-il'] = " הזן את שם הדומיין.";
-$text['description-node_domain']['it-it'] = "Inserisci il dominio.";
-$text['description-node_domain']['nl-nl'] = "";
-$text['description-node_domain']['pl-pl'] = " Wprowadź nazwę domeny.";
-$text['description-node_domain']['pt-br'] = "Digite o nome de domínio."; //copied from pt-pt
 $text['description-node_domain']['pt-pt'] = "Digite o nome de domínio.";
-$text['description-node_domain']['ro-ro'] = "Introduceți numele de domeniu.";
-$text['description-node_domain']['ru-ru'] = "Введите имя домена.";
+$text['description-node_domain']['fr-fr'] = "Entrez le nom de domaine.";
+$text['description-node_domain']['pt-br'] = "Digite o nome de domínio.";
+$text['description-node_domain']['he'] = " הזן את שם הדומיין.";
+$text['description-node_domain']['de-at'] = "Geben Sie den Domain-Namen.";
+$text['description-node_domain']['pl'] = " Wprowadź nazwę domeny.";
+$text['description-node_domain']['ro'] = "Introduceți numele de domeniu.";
+$text['description-node_domain']['uk'] = "Введіть ім'я домену.";
 $text['description-node_domain']['sv-se'] = "Ange domännamnet.";
-$text['description-node_domain']['uk-ua'] = "Введіть ім'я домену.";
+$text['description-node_domain']['ar-eg'] = "أدخل اسم المجال.";

 $text['description-node_description']['en-us'] = "Enter the description.";
-$text['description-node_description']['ar-eg'] = "أدخل الوصف.";
-$text['description-node_description']['de-at'] = "Geben Sie die Beschreibung ein."; //copied from de-de
-$text['description-node_description']['de-ch'] = "Geben Sie die Beschreibung ein."; //copied from de-de
-$text['description-node_description']['de-de'] = "Geben Sie die Beschreibung ein.";
 $text['description-node_description']['es-cl'] = " Introduzca la descripción.";
-$text['description-node_description']['es-mx'] = " Introduzca la descripción."; //copied from es-cl
-$text['description-node_description']['fr-ca'] = "Entrez la description."; //copied from fr-fr
-$text['description-node_description']['fr-fr'] = "Entrez la description.";
-$text['description-node_description']['he-il'] = " הזן את התיאור.";
-$text['description-node_description']['it-it'] = "Inserisci la descrizione.";
-$text['description-node_description']['nl-nl'] = "";
-$text['description-node_description']['pl-pl'] = " Wprowadź opis.";
-$text['description-node_description']['pt-br'] = "Digite a descrição.";
 $text['description-node_description']['pt-pt'] = " Digite a descrição.";
-$text['description-node_description']['ro-ro'] = "Introduceți descrierea.";
-$text['description-node_description']['ru-ru'] = "Введите описание.";
+$text['description-node_description']['fr-fr'] = "Entrez la description.";
+$text['description-node_description']['pt-br'] = "Digite a descrição.";
+$text['description-node_description']['he'] = " הזן את התיאור.";
+$text['description-node_description']['de-at'] = "Geben Sie die Beschreibung.";
+$text['description-node_description']['pl'] = " Wprowadź opis.";
+$text['description-node_description']['ro'] = "Introduceți descrierea.";
+$text['description-node_description']['uk'] = "Введіть опис.";
 $text['description-node_description']['sv-se'] = "Ange beskrivningen.";
-$text['description-node_description']['uk-ua'] = "Введіть опис.";
+$text['description-node_description']['ar-eg'] = "أدخل الوصف.";

 $text['description-node_cidr']['en-us'] = "Enter the IP CIDR range.";
-$text['description-node_cidr']['ar-eg'] = "أدخل نطاق IP CIDR.";
-$text['description-node_cidr']['de-at'] = " Geben Sie die IP CIDR-Bereich an."; //copied from de-de
-$text['description-node_cidr']['de-ch'] = " Geben Sie die IP CIDR-Bereich an."; //copied from de-de
-$text['description-node_cidr']['de-de'] = " Geben Sie die IP CIDR-Bereich an.";
 $text['description-node_cidr']['es-cl'] = " Introduzca el rango de direcciones IP CIDR.";
-$text['description-node_cidr']['es-mx'] = " Introduzca el rango de direcciones IP CIDR."; //copied from es-cl
-$text['description-node_cidr']['fr-ca'] = "Entrez la plage IP CIDR."; //copied from fr-fr
-$text['description-node_cidr']['fr-fr'] = "Entrez la plage IP CIDR.";
-$text['description-node_cidr']['he-il'] = " הזן את טווח ה- IP CIDR.";
-$text['description-node_cidr']['it-it'] = "Inserisci il range IP CIDR.";
-$text['description-node_cidr']['nl-nl'] = "";
-$text['description-node_cidr']['pl-pl'] = "Wprowadź zakres IP CIDR.";
-$text['description-node_cidr']['pt-br'] = "Digite o intervalo IP CIDR."; //copied from pt-pt
 $text['description-node_cidr']['pt-pt'] = "Digite o intervalo IP CIDR.";
-$text['description-node_cidr']['ro-ro'] = "Introduceți intervalul de IP CIDR.";
-$text['description-node_cidr']['ru-ru'] = "Введите диапазон IP CIDR.";
+$text['description-node_cidr']['fr-fr'] = "Entrez la plage IP CIDR.";
+$text['description-node_cidr']['pt-br'] = "Digite o intervalo IP CIDR.";
+$text['description-node_cidr']['he'] = " הזן את טווח ה- IP CIDR.";
+$text['description-node_cidr']['de-at'] = " Geben Sie die IP CIDR-Bereich.";
+$text['description-node_cidr']['pl'] = "Wprowadź zakres IP CIDR.";
+$text['description-node_cidr']['ro'] = "Introduceți intervalul de IP CIDR.";
+$text['description-node_cidr']['uk'] = "Введіть діапазон IP-CIDR.";
 $text['description-node_cidr']['sv-se'] = "Ange IP CIDR sortimentet.";
-$text['description-node_cidr']['uk-ua'] = "Введіть діапазон IP-CIDR.";
+$text['description-node_cidr']['ar-eg'] = "أدخل نطاق IP CIDR.";
+
+$text['description-access_control_node']['en-us'] = "";
+$text['description-access_control_node']['es-cl'] = "";
+$text['description-access_control_node']['pt-pt'] = "";
+$text['description-access_control_node']['fr-fr'] = "";
+$text['description-access_control_node']['pt-br'] = "";
+$text['description-access_control_node']['he'] = "";
+$text['description-access_control_node']['de-at'] = "";
+$text['description-access_control_node']['pl'] = "";
+$text['description-access_control_node']['ro'] = "";
+$text['description-access_control_node']['uk'] = "";
+$text['description-access_control_node']['sv-se'] = "";
+$text['description-access_control_node']['ar-eg'] = "";

 $text['description-access_control_name']['en-us'] = "Enter the name.";
-$text['description-access_control_name']['ar-eg'] = "أدخل اسم.";
-$text['description-access_control_name']['de-at'] = "Namen eingeben."; //copied from de-de
-$text['description-access_control_name']['de-ch'] = "Namen eingeben."; //copied from de-de
-$text['description-access_control_name']['de-de'] = "Namen eingeben.";
 $text['description-access_control_name']['es-cl'] = " Introduzca el nombre.";
-$text['description-access_control_name']['es-mx'] = " Introduzca el nombre."; //copied from es-cl
-$text['description-access_control_name']['fr-ca'] = "Entrez le nom."; //copied from fr-fr
-$text['description-access_control_name']['fr-fr'] = "Entrez le nom.";
-$text['description-access_control_name']['he-il'] = " הזן את השם.";
-$text['description-access_control_name']['it-it'] = "Inserisci il nome.";
-$text['description-access_control_name']['nl-nl'] = "";
-$text['description-access_control_name']['pl-pl'] = " Wpisz nazwę.";
-$text['description-access_control_name']['pt-br'] = "Digite o nome."; //copied from pt-pt
 $text['description-access_control_name']['pt-pt'] = "Digite o nome.";
-$text['description-access_control_name']['ro-ro'] = "Introduceți numele.";
-$text['description-access_control_name']['ru-ru'] = "Введите имя.";
+$text['description-access_control_name']['fr-fr'] = "Entrez le nom.";
+$text['description-access_control_name']['pt-br'] = "Digite o nome.";
+$text['description-access_control_name']['he'] = " הזן את השם.";
+$text['description-access_control_name']['de-at'] = "Geben Sie den Namen.";
+$text['description-access_control_name']['pl'] = " Wpisz nazwę.";
+$text['description-access_control_name']['ro'] = "Introduceți numele.";
+$text['description-access_control_name']['uk'] = "Введіть ім'я.";
 $text['description-access_control_name']['sv-se'] = "Ange namnet.";
-$text['description-access_control_name']['uk-ua'] = "Введіть ім'я.";
+$text['description-access_control_name']['ar-eg'] = "أدخل اسم.";

 $text['description-access_control_description']['en-us'] = "Enter the description";
-$text['description-access_control_description']['ar-eg'] = "دخل وصف";
-$text['description-access_control_description']['de-at'] = "Beschreibung eingeben."; //copied from de-de
-$text['description-access_control_description']['de-ch'] = "Beschreibung eingeben."; //copied from de-de
-$text['description-access_control_description']['de-de'] = "Beschreibung eingeben.";
 $text['description-access_control_description']['es-cl'] = "Introduzca la descripción";
-$text['description-access_control_description']['es-mx'] = "Introduzca la descripción"; //copied from es-cl
-$text['description-access_control_description']['fr-ca'] = "Entrez la description."; //copied from fr-fr
-$text['description-access_control_description']['fr-fr'] = "Entrez la description.";
-$text['description-access_control_description']['he-il'] = " הזן את התיאור";
-$text['description-access_control_description']['it-it'] = "Inserisci la descrizione";
-$text['description-access_control_description']['nl-nl'] = "";
-$text['description-access_control_description']['pl-pl'] = "Wprowadź opis";
-$text['description-access_control_description']['pt-br'] = "Digite a descrição.";
 $text['description-access_control_description']['pt-pt'] = "Digite a descrição";
-$text['description-access_control_description']['ro-ro'] = "Introduceți descrierea";
-$text['description-access_control_description']['ru-ru'] = "Введите описание";
-$text['description-access_control_description']['sv-se'] = "Ange en beskrivning";
-$text['description-access_control_description']['uk-ua'] = "Введіть опис";
+$text['description-access_control_description']['fr-fr'] = "Entrez la description.";
+$text['description-access_control_description']['pt-br'] = "Digite a descrição.";
+$text['description-access_control_description']['he'] = " הזן את התיאור";
+$text['description-access_control_description']['de-at'] = "Geben Sie die Beschreibung";
+$text['description-access_control_description']['pl'] = "Wprowadź opis";
+$text['description-access_control_description']['ro'] = "Introduceți descrierea";
+$text['description-access_control_description']['uk'] = "Введіть опис";
+$text['description-access_control_description']['sv-se'] = "Skriv en beskrivning";
+$text['description-access_control_description']['ar-eg'] = "دخل وصف";

 $text['description-access_control_default']['en-us'] = "Select the default type.";
-$text['description-access_control_default']['ar-eg'] = "حدد نوع الافتراضي.";
-$text['description-access_control_default']['de-at'] = " Wählen Sie den Standardtyp."; //copied from de-de
-$text['description-access_control_default']['de-ch'] = " Wählen Sie den Standardtyp."; //copied from de-de
-$text['description-access_control_default']['de-de'] = " Wählen Sie den Standardtyp.";
 $text['description-access_control_default']['es-cl'] = "Seleccione el tipo de defecto.";
-$text['description-access_control_default']['es-mx'] = "Seleccione el tipo de defecto."; //copied from es-cl
-$text['description-access_control_default']['fr-ca'] = "Sélectionnez le type de défaut"; //copied from fr-fr
-$text['description-access_control_default']['fr-fr'] = "Sélectionnez le type de défaut";
-$text['description-access_control_default']['he-il'] = " בחר את סוג ברירת המחדל.";
-$text['description-access_control_default']['it-it'] = "Scegli il tipo di default.";
-$text['description-access_control_default']['nl-nl'] = "";
-$text['description-access_control_default']['pl-pl'] = "Wybierz typ domyślny.";
-$text['description-access_control_default']['pt-br'] = "Selecione o tipo de padrão."; //copied from pt-pt
 $text['description-access_control_default']['pt-pt'] = "Selecione o tipo de padrão.";
-$text['description-access_control_default']['ro-ro'] = "Selectați tipul implicit.";
-$text['description-access_control_default']['ru-ru'] = "Выберите тип по умолчанию.";
+$text['description-access_control_default']['fr-fr'] = "Sélectionnez le type de défaut";
+$text['description-access_control_default']['pt-br'] = "Selecione o tipo de padrão.";
+$text['description-access_control_default']['he'] = " בחר את סוג ברירת המחדל.";
+$text['description-access_control_default']['de-at'] = " Wählen Sie den Standardtyp.";
+$text['description-access_control_default']['pl'] = "Wybierz typ domyślny.";
+$text['description-access_control_default']['ro'] = "Selectați tipul implicit.";
+$text['description-access_control_default']['uk'] = "Вибір типу за замовчуванням.";
 $text['description-access_control_default']['sv-se'] = "Välj standardtypen.";
-$text['description-access_control_default']['uk-ua'] = "Вибір типу за замовчуванням.";
+$text['description-access_control_default']['ar-eg'] = "حدد نوع الافتراضي.";

 $text['description-access_control']['en-us'] = "Access control list can allow or deny ranges of IP addresses.";
-$text['description-access_control']['ar-eg'] = "قائمة التحكم بالوصول يمكن السماح أو الرفض نطاقات العناوين.";
-$text['description-access_control']['de-at'] = " Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen."; //copied from de-de
-$text['description-access_control']['de-ch'] = " Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen."; //copied from de-de
-$text['description-access_control']['de-de'] = " Die Zugriffskontrollliste kann Bereiche von IP Adressen zulassen oder ablehnen.";
 $text['description-access_control']['es-cl'] = " Lista de control de acceso puede permitir o denegar los rangos de direcciones IP.";
-$text['description-access_control']['es-mx'] = " Lista de control de acceso puede permitir o denegar los rangos de direcciones IP."; //copied from es-cl
-$text['description-access_control']['fr-ca'] = " Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP."; //copied from fr-fr
-$text['description-access_control']['fr-fr'] = " Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP.";
-$text['description-access_control']['he-il'] = " רשימת בקרת גישה יכולה לאפשר או למנוע טווחים של כתובות IP.";
-$text['description-access_control']['it-it'] = "Le liste per il controllo di accesso permettono o negano l'accesso a range di IP.";
-$text['description-access_control']['nl-nl'] = "";
-$text['description-access_control']['pl-pl'] = "Lista kontroli dostępu może umożliwić lub zablokować zakresy adresów IP.";
-$text['description-access_control']['pt-br'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP."; //copied from pt-pt
 $text['description-access_control']['pt-pt'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP.";
-$text['description-access_control']['ro-ro'] = "Lista de control al accesului poate permite sau refuza intervale de adrese IP.";
-$text['description-access_control']['ru-ru'] = "Контроль доступа может разрешить или запретить диапазоны IP адресов.";
+$text['description-access_control']['fr-fr'] = " Liste de contrôle d'accès peut autoriser ou refuser des plages d'adresses IP.";
+$text['description-access_control']['pt-br'] = "Lista de controle de acesso pode permitir ou negar intervalos de endereços IP.";
+$text['description-access_control']['he'] = " רשימת בקרת גישה יכולה לאפשר או למנוע טווחים של כתובות IP.";
+$text['description-access_control']['de-at'] = " Zugriffssteuerungsliste kann zulassen oder ablehnen Bereiche von IP-Adressen.";
+$text['description-access_control']['pl'] = "Lista kontroli dostępu może umożliwić lub zablokować zakresy adresów IP.";
+$text['description-access_control']['ro'] = "Lista de control al accesului poate permite sau refuza intervale de adrese IP.";
+$text['description-access_control']['uk'] = "Список контролю доступу може дозволити або заборонити діапазони IP-адрес.";
 $text['description-access_control']['sv-se'] = "Åtkomstkontrollista kan tillåta eller neka intervall av IP-adresser.";
-$text['description-access_control']['uk-ua'] = "Список контролю доступу може дозволити або заборонити діапазони IP-адрес.";
+$text['description-access_control']['ar-eg'] = "قائمة التحكم بالوصول يمكن السماح أو الرفض نطاقات العناوين.";

-?>
+?>
@@ -1,29 +1,21 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Access Controls";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "عناصر التحكم في الوصول";
-	$apps[$x]['menu'][$y]['title']['de-at'] = " Zugriffskontrolle";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = " Zugriffskontrolle";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Controles de acceso";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Contrôles d'accès";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "בקרת גישה";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Controlli Accesso";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Kontrola dostępu";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Controles de Acesso";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Controles de Acesso";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "Controale de acces";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Контроль доступа";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "контроль доступу";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Åtkomstkontroll";
-	$apps[$x]['menu'][$y]['uuid'] = "bd47c972-5498-4541-b44a-d4bbfac69496";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/access_controls/access_controls.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Access Controls";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Contrôles d'accès";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Controles de Acesso";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Controles de Acesso";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Controles de acceso";
+$apps[$x]['menu'][0]['title']['he'] = "בקרת גישה";
+$apps[$x]['menu'][0]['title']['de-at'] = " Zugriffskontrolle";
+$apps[$x]['menu'][0]['title']['pl'] = "Kontrola dostępu";
+$apps[$x]['menu'][0]['title']['ro'] = "Controale de acces";
+$apps[$x]['menu'][0]['title']['uk'] = "контроль доступу";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Åtkomstkontroll";
+$apps[$x]['menu'][0]['title']['ar-eg'] = "عناصر التحكم في الوصول";
+$apps[$x]['menu'][0]['uuid'] = "bd47c972-5498-4541-b44a-d4bbfac69496";
+$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/access_controls/access_controls.php";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";

 ?>
@@ -9,38 +9,19 @@
 		$apps[$x]['license'] = "http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0";
 		$apps[$x]['url'] = "http://www.adminer.org/";
 		$apps[$x]['description']['en-us'] = "Adminer (formerly phpMinAdmin) is a full-featured database management tool written in PHP. Adminer is available for MySQL, PostgreSQL, SQLite, MS SQL and Oracle.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Adminer (ehemals phpMinAdmin) ist ein umfassendes Werkzeug für die Datenbankverwaltung welches in PHP geschrieben wurde. Es ist für MySQL, PostgreSQL, SQLite, MS SQL und Oracle verfügbar.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Adminer (ehemals phpMinAdmin) ist ein umfassendes Werkzeug für die Datenbankverwaltung welches in PHP geschrieben wurde. Es ist für MySQL, PostgreSQL, SQLite, MS SQL und Oracle verfügbar.";
 		$apps[$x]['description']['es-cl'] = "Adminer (anteriormente phpMinAdmin) es una herramienta completa para la gestión de bases de datos escrita en PHP. Adminer está disponible para MySQL, PostgreSQL, SQLite, MS SQL y Oracle)";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Adminer (précédemment phpMinAdmin) est un outil gestion de base de données complet écrite en php. Adminer est disponible pour MySQL, PostgreSQL, SQLite, MS SQL et Oracle.";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Adminer (anteriormente phpMinAdmin) é uma ferramenta completa para gestão de bases de dados escrita em PHP. O Adminer está disponível para MySQL, PostgreSQL, SQLite, MS SQL e Oracle.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "Adminer (в прошлом phpMinAdmin) это полнофункциональный инструмент управления базами данных, написанный на PHP. Adminer доступен для for MySQL, PostgreSQL, SQLite, MS SQL и Oracle.";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "";

 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "adminer";
 		$apps[$x]['permissions'][0]['menu']['uuid'] = "1f59d07b-b4f7-4f9e-bde9-312cf491d66e";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";

-	//default settings
-		$y=0;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e34b276a-1b64-4d11-9470-ae3ea977c47e";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "adminer";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "auto_login";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set whether to auto-login to Adminer, or require a username and password.";
-
 ?>
@@ -1,32 +1,65 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//proccess this only one time
-if ($domains_processed == 1) {
-
-}
-
-?>
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2015
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+//proccess this only one time
+if ($domains_processed == 1) {
+
+	//define array of settings
+		$x = 0;
+		$array[$x]['default_setting_category'] = 'adminer';
+		$array[$x]['default_setting_subcategory'] = 'auto_login';
+		$array[$x]['default_setting_name'] = 'boolean';
+		$array[$x]['default_setting_value'] = 'true';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set whether to auto-login to Adminer, or require a username and password.';
+		$x++;
+
+	//iterate and add each, if necessary
+		foreach ($array as $index => $default_settings) {
+			//add the default setting
+			$sql = "select count(*) as num_rows from v_default_settings ";
+			$sql .= "where default_setting_category = '".$default_settings['default_setting_category']."' ";
+			$sql .= "and default_setting_subcategory = '".$default_settings['default_setting_subcategory']."' ";
+			$sql .= "and default_setting_name = '".$default_settings['default_setting_name']."' ";
+			$prep_statement = $db->prepare($sql);
+			if ($prep_statement) {
+				$prep_statement->execute();
+				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+				unset($prep_statement);
+				if ($row['num_rows'] == 0) {
+					$orm = new orm;
+					$orm->name('default_settings');
+					$orm->save($array[$index]);
+					$message = $orm->message;
+					//print_r($message);
+				}
+				unset($row);
+			}
+		}
+
+}
+
+?>
@@ -1,30 +1,20 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Adminer";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Adminer";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Adminer";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Administrador";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Admin BDD";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Adminer";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Adminer";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Administrador";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Администрирование БД";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "1f59d07b-b4f7-4f9e-bde9-312cf491d66e";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "external";
-	$apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window";
-	$apps[$x]['menu'][$y]['path'] = "/app/adminer/index.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+	$apps[$x]['menu'][0]['title']['en-us'] = "Adminer";
+	$apps[$x]['menu'][0]['title']['es-cl'] = "Administrador";
+	$apps[$x]['menu'][0]['title']['de-de'] = "";
+	$apps[$x]['menu'][0]['title']['de-ch'] = "";
+	$apps[$x]['menu'][0]['title']['de-at'] = "";
+	$apps[$x]['menu'][0]['title']['fr-fr'] = "Admin BDD";
+	$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][0]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][0]['title']['pt-pt'] = "Administrador";
+	$apps[$x]['menu'][0]['title']['pt-br'] = "Adminer";
+	$apps[$x]['menu'][0]['uuid'] = "1f59d07b-b4f7-4f9e-bde9-312cf491d66e";
+	$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+	$apps[$x]['menu'][0]['category'] = "external";
+	$apps[$x]['menu'][0]['icon'] = "glyphicon-new-window";
+	$apps[$x]['menu'][0]['path'] = "/app/adminer/index.php";
+	$apps[$x]['menu'][0]['groups'][] = "superadmin";

 ?>
@@ -1,198 +0,0 @@
-<?php
-
-class azure{
-
-  public static $formats = array (
-    'English-Zira' => 
-      array (
-        'lang' => 'en-US',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-US, ZiraRUS)'
-      ),
-    'English-Jessa' => 
-      array (
-        'lang' => 'en-US',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-US, JessaRUS)'
-      ),
-    'English-Benjamin' => 
-      array (
-        'lang' => 'en-US',
-        'gender' => 'Male',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-US, BenjaminRUS)'
-      ),
-    'British-Susan' => 
-      array (
-        'lang' => 'en-GB',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-GB, Susan, Apollo)'
-      ),
-    'British-Hazel' => 
-      array (
-        'lang' => 'en-GB',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-GB, HazelRUS)'
-      ),
-    'British-George' => 
-      array (
-        'lang' => 'en-GB',
-        'gender' => 'Male',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-GB, George, Apollo)'
-      ),
-    'Australian-Catherine' => 
-      array (
-        'lang' => 'en-AU',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (en-AU, Catherine)'
-      ),
-    'Spanish-Helena' => 
-      array (
-        'lang' => 'es-ES',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (es-ES, HelenaRUS)'
-      ),
-    'Spanish-Laura' => 
-      array (
-        'lang' => 'es-ES',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (es-ES, Laura, Apollo)'
-      ),
-    'Spanish-Pablo' => 
-      array (
-        'lang' => 'es-ES',
-        'gender' => 'Male',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (es-ES, Pablo, Apollo)'
-      ),
-    'French-Julie' => 
-      array (
-        'lang' => 'fr-FR',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (fr-FR, Julie, Apollo)'
-      ),
-    'French-Hortense' => 
-      array (
-        'lang' => 'fr-FR',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (fr-FR, HortenseRUS)'
-      ),
-    'French-Paul' => 
-      array (
-        'lang' => 'fr-FR',
-        'gender' => 'Male',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (fr-FR, Paul, Apollo)'
-      ),
-    'German-Hedda' => 
-      array (
-        'lang' => 'de-DE',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (de-DE, Hedda)'
-      ),
-    'Russian-Irina' => 
-      array (
-        'lang' => 'ru-RU',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (ru-RU, Irina, Apollo)'
-      ),
-    'Russian-Pavel' => 
-      array (
-        'lang' => 'ru-RU',
-        'gender' => 'Male',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (ru-RU, Pavel, Apollo)'
-      ),
-    'Chinese-Huihui' => 
-      array (
-        'lang' => 'zh-CN',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (zh-CN, HuihuiRUS)'
-      ),
-    'Chinese-Yaoyao' => 
-      array (
-        'lang' => 'zh-CN',
-        'gender' => 'Female',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (zh-CN, Yaoyao, Apollo)'
-      ),
-    'Chinese-Kangkang' => 
-      array (
-        'lang' => 'zh-CN',
-        'gender' => 'Male',
-        'name' => 'Microsoft Server Speech Text to Speech Voice (zh-CN, Kangkang, Apollo)'
-      )
-    );
-
-    private static function getTokenUrl(){
-        return "https://api.cognitive.microsoft.com/sts/v1.0/issueToken";
-    }
-
-    private static function getApiUrl(){
-        return "https://speech.platform.bing.com/synthesize";
-    }
-
-    private static function getSubscriptionKey(){
-        return $_SESSION['azure]['key']['text'];
-    }
-
-    private static function _getToken(){
-        $url = self::getTokenUrl();
-        $subscriptionKey = self::getSubscriptionKey();
-
-        $headers = array();
-        $headers[] = 'Ocp-Apim-Subscription-Key: '. $subscriptionKey;
-        $headers[] = 'Content-Length: 0';
-
-        $ch = curl_init();
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-        curl_setopt ( $ch, CURLOPT_URL, $url );
-        //curl_setopt($ch, CURLOPT_SSLVERSION, 1);
-        curl_setopt ( $ch, CURLOPT_CONNECTTIMEOUT, 60 );
-        curl_setopt ( $ch, CURLOPT_TIMEOUT, 300 );
-        curl_setopt ( $ch, CURLOPT_VERBOSE, false);
-        curl_setopt($ch, CURLOPT_POST, true);
-        //curl_setopt($ch, CURLOPT_POSTFIELDS, $xml_post_string);
-        
-        $response = curl_exec($ch);
-
-        curl_close($ch);
-        return $response;
-    }
-
-    public static function synthesize($data,$formate_key){
-
-        $lang = self::$formats[$formate_key]['lang'];
-        $gender = self::$formats[$formate_key]['gender'];
-        $name = self::$formats[$formate_key]['name'];
-        $token = self::_getToken();
-
-        $url = self::getApiUrl();
-        
-        $headers = array();
-        $headers[] = 'Authorization: Bearer '. $token;
-        $headers[] = 'Content-Type: application/ssml+xml';
-        $headers[] = 'X-Microsoft-OutputFormat: riff-16khz-16bit-mono-pcm';
-        $headers[] = 'User-Agent: TTS';
-
-        $xml_post_string = "<speak version='1.0' xml:lang='".$lang."'>
-        <voice xml:lang='".$lang."' xml:gender='".$gender."' name='".$name."'>";
-        $xml_post_string .= $data;
-        $xml_post_string .= "</voice>
-        </speak>";
-
-        $ch = curl_init();
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-        curl_setopt ( $ch, CURLOPT_URL, $url );
-        //curl_setopt($ch, CURLOPT_SSLVERSION, 1);
-        curl_setopt ( $ch, CURLOPT_CONNECTTIMEOUT, 60 );
-        curl_setopt ( $ch, CURLOPT_TIMEOUT, 300 );
-        curl_setopt ( $ch, CURLOPT_VERBOSE, true);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $xml_post_string);
-        
-        $response = curl_exec($ch);
-        $filename = "tts_".time().".wav";
-        file_put_contents("/var/www/html/fusionpbx/app/voiplyrecording/tts_record/".$filename, $response);
-
-        curl_close($ch);
-        return $filename;  
-    }
-}
@@ -1,40 +1,32 @@
 <?php
-
 	//application details
 		$apps[$x]['name'] = "Backup";
 		$apps[$x]['uuid'] = "1df70270-8274-44e9-a43e-5074684649ad";
 		$apps[$x]['category'] = "App";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
-		$apps[$x]['description']['en-us'] = "Manage backups";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Datensicherung";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Datensicherung";
+		$apps[$x]['description']['en-us'] = "";
 		$apps[$x]['description']['es-cl'] = "";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "";

 	//permission details
-		$y=0;
+		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "backup_download";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "7e174c3c-e494-4bb0-a52a-4ea55209ffeb";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "backup_upload";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;

 ?>
@@ -1,404 +1,193 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC

 $text['title-backup']['en-us'] = "Backup";
-$text['title-backup']['ar-eg'] = "";
-$text['title-backup']['de-at'] = "Datensicherung"; //copied from de-de
-$text['title-backup']['de-ch'] = "Datensicherung"; //copied from de-de
-$text['title-backup']['de-de'] = "Datensicherung";
 $text['title-backup']['es-cl'] = "Copia de seguridad";
-$text['title-backup']['es-mx'] = "Copia de seguridad"; //copied from es-cl
-$text['title-backup']['fr-ca'] = "Sauvegarde"; //copied from fr-fr
-$text['title-backup']['fr-fr'] = "Sauvegarde";
-$text['title-backup']['he-il'] = "";
-$text['title-backup']['it-it'] = "Backup";
-$text['title-backup']['nl-nl'] = "";
-$text['title-backup']['pl-pl'] = "Kopie zapasowe";
-$text['title-backup']['pt-br'] = "Backup"; //copied from pt-pt
 $text['title-backup']['pt-pt'] = "Backup";
-$text['title-backup']['ro-ro'] = "";
-$text['title-backup']['ru-ru'] = "Резервное копирование";
+$text['title-backup']['fr-fr'] = "Sauvegarde";
+$text['title-backup']['pt-br'] = "Backup";
+$text['title-backup']['pl'] = "Kopie zapasowe";
 $text['title-backup']['sv-se'] = "Backup";
-$text['title-backup']['uk-ua'] = "Резервна копія";
+$text['title-backup']['uk'] = "Резервна копія";
+$text['title-backup']['de-at'] = "Sicherung";

 $text['option-file_download']['en-us'] = "File Download";
-$text['option-file_download']['ar-eg'] = "";
-$text['option-file_download']['de-at'] = "Datei herunterladen"; //copied from de-de
-$text['option-file_download']['de-ch'] = "Datei herunterladen"; //copied from de-de
-$text['option-file_download']['de-de'] = "Datei herunterladen";
 $text['option-file_download']['es-cl'] = "Descarga de archivos";
-$text['option-file_download']['es-mx'] = "Descarga de archivos"; //copied from es-cl
-$text['option-file_download']['fr-ca'] = "Télécharger le fichier"; //copied from fr-fr
-$text['option-file_download']['fr-fr'] = "Télécharger le fichier";
-$text['option-file_download']['he-il'] = "";
-$text['option-file_download']['it-it'] = "Scarica File";
-$text['option-file_download']['nl-nl'] = "";
-$text['option-file_download']['pl-pl'] = "Pobierz plik";
-$text['option-file_download']['pt-br'] = "Download do arquivo";
 $text['option-file_download']['pt-pt'] = "download do arquivo";
-$text['option-file_download']['ro-ro'] = "";
-$text['option-file_download']['ru-ru'] = "Скачать архив";
+$text['option-file_download']['fr-fr'] = "Télécharger le fichier";
+$text['option-file_download']['pt-br'] = "Download do arquivo";
+$text['option-file_download']['pl'] = "Pobierz plik";
 $text['option-file_download']['sv-se'] = "Ladda Ned Fil";
-$text['option-file_download']['uk-ua'] = "Скачування файлу";
+$text['option-file_download']['uk'] = "Скачування файлу";
+$text['option-file_download']['de-at'] = "Datei Download";

 $text['option-command']['en-us'] = "Command";
-$text['option-command']['ar-eg'] = "";
-$text['option-command']['de-at'] = "Befehl"; //copied from de-de
-$text['option-command']['de-ch'] = "Befehl"; //copied from de-de
-$text['option-command']['de-de'] = "Befehl";
 $text['option-command']['es-cl'] = "Comando";
-$text['option-command']['es-mx'] = "Comando"; //copied from es-cl
-$text['option-command']['fr-ca'] = "Commandementt"; //copied from fr-fr
-$text['option-command']['fr-fr'] = "Commandementt";
-$text['option-command']['he-il'] = "";
-$text['option-command']['it-it'] = "Comando";
-$text['option-command']['nl-nl'] = "";
-$text['option-command']['pl-pl'] = "Polecenie";
-$text['option-command']['pt-br'] = "Comando"; //copied from pt-pt
 $text['option-command']['pt-pt'] = "Comando";
-$text['option-command']['ro-ro'] = "";
-$text['option-command']['ru-ru'] = "Команда";
+$text['option-command']['fr-fr'] = "Commandementt";
+$text['option-command']['pt-br'] = "Comando";
+$text['option-command']['pl'] = "Polecenie";
 $text['option-command']['sv-se'] = "Komando";
-$text['option-command']['uk-ua'] = "Команда";
+$text['option-command']['uk'] = "Команда";
+$text['option-command']['de-at'] = "Befehl";

 $text['message-restore_failed_upload']['en-us'] = "Restore Failed - File Upload Failed";
-$text['message-restore_failed_upload']['ar-eg'] = "";
-$text['message-restore_failed_upload']['de-at'] = "Wiederherstellung fehlgeschlagen - Datei hochladen fehlgeschlagen"; //copied from de-de
-$text['message-restore_failed_upload']['de-ch'] = "Wiederherstellung fehlgeschlagen - Datei hochladen fehlgeschlagen"; //copied from de-de
-$text['message-restore_failed_upload']['de-de'] = "Wiederherstellung fehlgeschlagen - Datei hochladen fehlgeschlagen";
 $text['message-restore_failed_upload']['es-cl'] = "Falló la recup - Cargar archivo Error";
-$text['message-restore_failed_upload']['es-mx'] = "Falló la recup - Cargar archivo Error"; //copied from es-cl
-$text['message-restore_failed_upload']['fr-ca'] = "Echec de la restauration - Echec du téléchargement"; //copied from fr-fr
-$text['message-restore_failed_upload']['fr-fr'] = "Echec de la restauration - Echec du téléchargement";
-$text['message-restore_failed_upload']['he-il'] = "";
-$text['message-restore_failed_upload']['it-it'] = "Ripristino Fallito - Caricamente File Fallito.";
-$text['message-restore_failed_upload']['nl-nl'] = "";
-$text['message-restore_failed_upload']['pl-pl'] = "Przywracanie oraz  przesłanie pliku nie powiodło się";
-$text['message-restore_failed_upload']['pt-br'] = "Falha de restauração - Upload de arquivo falhou ";
 $text['message-restore_failed_upload']['pt-pt'] = "Falha de restauração - Upload de arquivo falhou";
-$text['message-restore_failed_upload']['ro-ro'] = "";
-$text['message-restore_failed_upload']['ru-ru'] = "Ошибка восстановления - Загрузка файла не удалась";
+$text['message-restore_failed_upload']['fr-fr'] = "Echec de la restauration - Echec du téléchargement";
+$text['message-restore_failed_upload']['pt-br'] = "Falha de restauração - Upload de arquivo falhou ";
+$text['message-restore_failed_upload']['pl'] = "Przywracanie oraz  przesłanie pliku nie powiodło się";
 $text['message-restore_failed_upload']['sv-se'] = "Återställning Misslyckades - Filöverföring misslyckades";
-$text['message-restore_failed_upload']['uk-ua'] = "Помилка відновлення: неможливо завантажити файл";
+$text['message-restore_failed_upload']['uk'] = "Помилка відновлення: неможливо завантажити файл";
+$text['message-restore_failed_upload']['de-at'] = "Wiederherstellung fehlgeschlagen - Datei hochladen fehlgeschlagen";

 $text['message-restore_failed_format']['en-us'] = "Restore Failed - Invalid File Format";
-$text['message-restore_failed_format']['ar-eg'] = "";
-$text['message-restore_failed_format']['de-at'] = "Wiederherstellung fehlgeschlagen - Ungültiges Dateiformat"; //copied from de-de
-$text['message-restore_failed_format']['de-ch'] = "Wiederherstellung fehlgeschlagen - Ungültiges Dateiformat"; //copied from de-de
-$text['message-restore_failed_format']['de-de'] = "Wiederherstellung fehlgeschlagen - Ungültiges Dateiformat";
 $text['message-restore_failed_format']['es-cl'] = "Restaurar Error - Formato de archivo no válido";
-$text['message-restore_failed_format']['es-mx'] = "Restaurar Error - Formato de archivo no válido"; //copied from es-cl
-$text['message-restore_failed_format']['fr-ca'] = "Échec de la restauration - Format de fichier incorrect"; //copied from fr-fr
-$text['message-restore_failed_format']['fr-fr'] = "Échec de la restauration - Format de fichier incorrect";
-$text['message-restore_failed_format']['he-il'] = "";
-$text['message-restore_failed_format']['it-it'] = "Ripristino Fallito - Formato File non Valido.";
-$text['message-restore_failed_format']['nl-nl'] = "";
-$text['message-restore_failed_format']['pl-pl'] = "Przywracanie  nie powiodło się - niepoprawny format pliku";
-$text['message-restore_failed_format']['pt-br'] = "Falha na restauração - Formato de arquivo inválido"; //copied from pt-pt
 $text['message-restore_failed_format']['pt-pt'] = "Falha na restauração - Formato de arquivo inválido";
-$text['message-restore_failed_format']['ro-ro'] = "";
-$text['message-restore_failed_format']['ru-ru'] = "Ошибка восстановления - Неверный формат файла";
+$text['message-restore_failed_format']['fr-fr'] = "Échec de la restauration - Format de fichier incorrect";
+$text['message-restore_failed_format']['pt-br'] = "Falha na restauração - Formato de arquivo inválido";
+$text['message-restore_failed_format']['pl'] = "Przywracanie  nie powiodło się - niepoprawny format pliku";
 $text['message-restore_failed_format']['sv-se'] = "Återställning Misslyckades - Ogiltigt Filformat";
-$text['message-restore_failed_format']['uk-ua'] = "Помилка відновлення: хибний формат файлу";
-
-$text['message-restore_failed_extract']['en-us'] = "Restore Failed - Extraction Error";
-$text['message-restore_failed_extract']['ar-eg'] = "";
-$text['message-restore_failed_extract']['de-at'] = "Wiederherstellung fehlgeschlagen - Die Extraktion ist fehlgeschlagen"; //copied from de-de
-$text['message-restore_failed_extract']['de-ch'] = "Wiederherstellung fehlgeschlagen - Die Extraktion ist fehlgeschlagen"; //copied from de-de
-$text['message-restore_failed_extract']['de-de'] = "Wiederherstellung fehlgeschlagen - Die Extraktion ist fehlgeschlagen";
-$text['message-restore_failed_extract']['es-cl'] = "Restaurar Error - Error de extracción";
-$text['message-restore_failed_extract']['es-mx'] = "Restaurar Error - Error de extracción"; //copied from es-cl
-$text['message-restore_failed_extract']['fr-ca'] = "Échec de la restauration - Échec de l'extraction"; //copied from fr-fr
-$text['message-restore_failed_extract']['fr-fr'] = "Échec de la restauration - Échec de l'extraction";
-$text['message-restore_failed_extract']['he-il'] = "";
-$text['message-restore_failed_extract']['it-it'] = "Ripristino Fallito - Errore di Estrazione";
-$text['message-restore_failed_extract']['nl-nl'] = "";
-$text['message-restore_failed_extract']['pl-pl'] = "Przywracanie  nie powiodło się - Ekstrakcja zawiodły";
-$text['message-restore_failed_extract']['pt-br'] = "Falha na restauração - Falha na extração"; //copied from pt-pt
-$text['message-restore_failed_extract']['pt-pt'] = "Falha na restauração - Falha na extração";
-$text['message-restore_failed_extract']['ro-ro'] = "";
-$text['message-restore_failed_extract']['ru-ru'] = "Ошибка восстановления - Ошибка при извлечении";
-$text['message-restore_failed_extract']['sv-se'] = "Återställning Misslyckades - extraktion misslyckades";
-$text['message-restore_failed_extract']['uk-ua'] = "Помилка відновлення: Помилка при вилученні";
+$text['message-restore_failed_format']['uk'] = "Помилка відновлення: хибний формат файлу";
+$text['message-restore_failed_format']['de-at'] = "Wiederherstellung fehlgeschlagen - Ungültiges Dateiformat";

 $text['message-restore_completed']['en-us'] = "Restore Completed";
-$text['message-restore_completed']['ar-eg'] = "";
-$text['message-restore_completed']['de-at'] = "Wiederherstellung erfolgreich"; //copied from de-de
-$text['message-restore_completed']['de-ch'] = "Wiederherstellung erfolgreich"; //copied from de-de
-$text['message-restore_completed']['de-de'] = "Wiederherstellung erfolgreich";
 $text['message-restore_completed']['es-cl'] = "Restaurar Completado";
-$text['message-restore_completed']['es-mx'] = "Restaurar Completado"; //copied from es-cl
-$text['message-restore_completed']['fr-ca'] = "Restaurer Terminé"; //copied from fr-fr
-$text['message-restore_completed']['fr-fr'] = "Restaurer Terminé";
-$text['message-restore_completed']['he-il'] = "";
-$text['message-restore_completed']['it-it'] = "Ripristino Completato";
-$text['message-restore_completed']['nl-nl'] = "";
-$text['message-restore_completed']['pl-pl'] = "Przywracanie zakończono pomyślnie.";
-$text['message-restore_completed']['pt-br'] = "Restauração Concluída";
 $text['message-restore_completed']['pt-pt'] = "Concluída a Restauração";
-$text['message-restore_completed']['ro-ro'] = "";
-$text['message-restore_completed']['ru-ru'] = "Восстановление завершено";
+$text['message-restore_completed']['fr-fr'] = "Restaurer Terminé";
+$text['message-restore_completed']['pt-br'] = "Restauração Concluída";
+$text['message-restore_completed']['pl'] = "Przywracanie zakończono pomyślnie.";
 $text['message-restore_completed']['sv-se'] = "Återställning Genomförd";
-$text['message-restore_completed']['uk-ua'] = "Відновлено";
+$text['message-restore_completed']['uk'] = "Відновлено";
+$text['message-restore_completed']['de-at'] = "Wiederherstellung erfolgreich";

 $text['message-backup_failed_paths']['en-us'] = "Backup Failed - No Backup Paths Defined";
-$text['message-backup_failed_paths']['ar-eg'] = "";
-$text['message-backup_failed_paths']['de-at'] = "Sicherung fehlgeschlagen - Kein Sicherungspfad angegeben"; //copied from de-de
-$text['message-backup_failed_paths']['de-ch'] = "Sicherung fehlgeschlagen - Kein Sicherungspfad angegeben"; //copied from de-de
-$text['message-backup_failed_paths']['de-de'] = "Sicherung fehlgeschlagen - Kein Sicherungspfad angegeben";
 $text['message-backup_failed_paths']['es-cl'] = "Fallidos de copia de seguridad - No hay rutas de copia de seguridad definida";
-$text['message-backup_failed_paths']['es-mx'] = "Fallidos de copia de seguridad - No hay rutas de copia de seguridad definida"; //copied from es-cl
-$text['message-backup_failed_paths']['fr-ca'] = "Echec de sauvegarde - Pas de chemins sauvegarde définis"; //copied from fr-fr
-$text['message-backup_failed_paths']['fr-fr'] = "Echec de sauvegarde - Pas de chemins sauvegarde définis";
-$text['message-backup_failed_paths']['he-il'] = "";
-$text['message-backup_failed_paths']['it-it'] = "Backup Fallito - Path di Backup non definiti.";
-$text['message-backup_failed_paths']['nl-nl'] = "";
-$text['message-backup_failed_paths']['pl-pl'] = "Przywracanie  nie powiodło się – ścieżki nie zostały zdefiniowane.";
-$text['message-backup_failed_paths']['pt-br'] = "Backup falhou - Sem destino para o backup definido";
 $text['message-backup_failed_paths']['pt-pt'] = "Backup falhou - Sem Caminhos backup definido";
-$text['message-backup_failed_paths']['ro-ro'] = "";
-$text['message-backup_failed_paths']['ru-ru'] = "Ошибка - Не указаны пути сохранения резервной копии";
+$text['message-backup_failed_paths']['fr-fr'] = "Echec de sauvegarde - Pas de chemins sauvegarde définis";
+$text['message-backup_failed_paths']['pt-br'] = "Backup falhou - Sem destino para o backup definido";
+$text['message-backup_failed_paths']['pl'] = "Przywracanie  nie powiodło się – ścieżki nie zostały zdefiniowane.";
 $text['message-backup_failed_paths']['sv-se'] = "Backup misslyckades - Ingen Backup Sökväg Definierad";
-$text['message-backup_failed_paths']['uk-ua'] = "Помилка: не вказано шлях для збереження файлу резервної копії";
+$text['message-backup_failed_paths']['uk'] = "Помилка: не вказано шлях для збереження файлу резервної копії";
+$text['message-backup_failed_paths']['de-at'] = "Sicherung fehlgeschlagen - Kein Sicherungspfad angegeben";

 $text['message-backup_failed_format']['en-us'] = "Backup Failed - Unable to Create Backup File";
-$text['message-backup_failed_format']['ar-eg'] = "";
-$text['message-backup_failed_format']['de-at'] = "Sicherung fehlgeschlagen - Sicherungsdatei kann nicht erstellt werden"; //copied from de-de
-$text['message-backup_failed_format']['de-ch'] = "Sicherung fehlgeschlagen - Sicherungsdatei kann nicht erstellt werden"; //copied from de-de
-$text['message-backup_failed_format']['de-de'] = "Sicherung fehlgeschlagen - Sicherungsdatei kann nicht erstellt werden";
 $text['message-backup_failed_format']['es-cl'] = "Copia de seguridad Error - No se puede crear archivo de copia de seguridad";
-$text['message-backup_failed_format']['es-mx'] = "Copia de seguridad Error - No se puede crear archivo de copia de seguridad"; //copied from es-cl
-$text['message-backup_failed_format']['fr-ca'] = "Echec de la sauvegarde - Impossible de créer le fichier de sauvegarde"; //copied from fr-fr
-$text['message-backup_failed_format']['fr-fr'] = "Echec de la sauvegarde - Impossible de créer le fichier de sauvegarde";
-$text['message-backup_failed_format']['he-il'] = "";
-$text['message-backup_failed_format']['it-it'] = "Backup Fallito - Impossibile creare File di Backup.";
-$text['message-backup_failed_format']['nl-nl'] = "";
-$text['message-backup_failed_format']['pl-pl'] = "Przywracanie  nie powiodło się - nie można utworzyć pliku kopii zapasowej";
-$text['message-backup_failed_format']['pt-br'] = "Falha no backup - Não é possível criar arquivo de backup ";
 $text['message-backup_failed_format']['pt-pt'] = "Falha no backup - Não é possível criar arquivo de backup";
-$text['message-backup_failed_format']['ro-ro'] = "";
-$text['message-backup_failed_format']['ru-ru'] = "Ошибка - Невозможно создать файл резервной копии";
+$text['message-backup_failed_format']['fr-fr'] = "Echec de la sauvegarde - Impossible de créer le fichier de sauvegarde";
+$text['message-backup_failed_format']['pt-br'] = "Falha no backup - Não é possível criar arquivo de backup ";
+$text['message-backup_failed_format']['pl'] = "Przywracanie  nie powiodło się - nie można utworzyć pliku kopii zapasowej";
 $text['message-backup_failed_format']['sv-se'] = "Backup misslyckades - Kunde Inte Skapa Backup Fil";
-$text['message-backup_failed_format']['uk-ua'] = "Помилка: неможливо створити файл резервної копії";
+$text['message-backup_failed_format']['uk'] = "Помилка: неможливо створити файл резервної копії";
+$text['message-backup_failed_format']['de-at'] = "Sicherung fehlgeschlagen - Sicherungsdatei kann nicht erstellt werden";

 $text['label-target_type']['en-us'] = "Target Type";
-$text['label-target_type']['ar-eg'] = "";
-$text['label-target_type']['de-at'] = "Ziel Typ"; //copied from de-de
-$text['label-target_type']['de-ch'] = "Ziel Typ"; //copied from de-de
-$text['label-target_type']['de-de'] = "Ziel Typ";
 $text['label-target_type']['es-cl'] = "Tipo de destino";
-$text['label-target_type']['es-mx'] = "Tipo de destino"; //copied from es-cl
-$text['label-target_type']['fr-ca'] = "type de cible"; //copied from fr-fr
-$text['label-target_type']['fr-fr'] = "type de cible";
-$text['label-target_type']['he-il'] = "";
-$text['label-target_type']['it-it'] = "Tipo Destinazione";
-$text['label-target_type']['nl-nl'] = "";
-$text['label-target_type']['pl-pl'] = "Typ docelowy";
-$text['label-target_type']['pt-br'] = "Tipo de destino";
 $text['label-target_type']['pt-pt'] = "Tipo de Destino";
-$text['label-target_type']['ro-ro'] = "";
-$text['label-target_type']['ru-ru'] = "Тип";
+$text['label-target_type']['fr-fr'] = "type de cible";
+$text['label-target_type']['pt-br'] = "Tipo de destino";
+$text['label-target_type']['pl'] = "Typ docelowy";
 $text['label-target_type']['sv-se'] = "Mål Typ";
-$text['label-target_type']['uk-ua'] = "Призначення";
+$text['label-target_type']['uk'] = "Призначення";
+$text['label-target_type']['de-at'] = "Ziel Typ";

 $text['label-source_paths']['en-us'] = "Source Paths";
-$text['label-source_paths']['ar-eg'] = "";
-$text['label-source_paths']['de-at'] = "Quell Pfade"; //copied from de-de
-$text['label-source_paths']['de-ch'] = "Quell Pfade"; //copied from de-de
-$text['label-source_paths']['de-de'] = "Quell Pfade";
 $text['label-source_paths']['es-cl'] = "Fuente Caminos";
-$text['label-source_paths']['es-mx'] = "Fuente Caminos"; //copied from es-cl
-$text['label-source_paths']['fr-ca'] = "Chemins Source"; //copied from fr-fr
-$text['label-source_paths']['fr-fr'] = "Chemins Source";
-$text['label-source_paths']['he-il'] = "";
-$text['label-source_paths']['it-it'] = "Path Sorgenti";
-$text['label-source_paths']['nl-nl'] = "";
-$text['label-source_paths']['pl-pl'] = " Ścieżki źródłowe";
-$text['label-source_paths']['pt-br'] = "Destino de origem";
 $text['label-source_paths']['pt-pt'] = "Fonte Caminhos";
-$text['label-source_paths']['ro-ro'] = "";
-$text['label-source_paths']['ru-ru'] = "Объекты резервного копирования";
+$text['label-source_paths']['fr-fr'] = "Chemins Source";
+$text['label-source_paths']['pt-br'] = "Destino de origem";
+$text['label-source_paths']['pl'] = " Ścieżki źródłowe";
 $text['label-source_paths']['sv-se'] = "Källa Sökväg";
-$text['label-source_paths']['uk-ua'] = "Об’єкти для резервного копіювання";
+$text['label-source_paths']['uk'] = "Об’єкти для резервного копіювання";
+$text['label-source_paths']['de-at'] = "Quell Pfade";

 $text['label-select_backup']['en-us'] = "Select Backup File";
-$text['label-select_backup']['ar-eg'] = "";
-$text['label-select_backup']['de-at'] = "Wählen Sie eine Sicherungsdatei aus"; //copied from de-de
-$text['label-select_backup']['de-ch'] = "Wählen Sie eine Sicherungsdatei aus"; //copied from de-de
-$text['label-select_backup']['de-de'] = "Wählen Sie eine Sicherungsdatei aus";
 $text['label-select_backup']['es-cl'] = "Seleccione Copia de Seguridad";
-$text['label-select_backup']['es-mx'] = "Seleccione Copia de Seguridad"; //copied from es-cl
-$text['label-select_backup']['fr-ca'] = "Sélectionnez le Fichier de Sauvegarde"; //copied from fr-fr
-$text['label-select_backup']['fr-fr'] = "Sélectionnez le Fichier de Sauvegarde";
-$text['label-select_backup']['he-il'] = "";
-$text['label-select_backup']['it-it'] = "Scegli File di Backup";
-$text['label-select_backup']['nl-nl'] = "";
-$text['label-select_backup']['pl-pl'] = "Wybierz plik kopii zapasowej";
-$text['label-select_backup']['pt-br'] = "Selecione o arquivo de Backup";
 $text['label-select_backup']['pt-pt'] = "Selecione Backup";
-$text['label-select_backup']['ro-ro'] = "";
-$text['label-select_backup']['ru-ru'] = "Выберите файл резервной копии";
+$text['label-select_backup']['fr-fr'] = "Sélectionnez le Fichier de Sauvegarde";
+$text['label-select_backup']['pt-br'] = "Selecione o arquivo de Backup";
+$text['label-select_backup']['pl'] = "Wybierz plik kopii zapasowej";
 $text['label-select_backup']['sv-se'] = "Välj Backup Fil";
-$text['label-select_backup']['uk-ua'] = "Виберіть файл резервної копії";
+$text['label-select_backup']['uk'] = "Виберіть файл резервної копії";
+$text['label-select_backup']['de-at'] = "Wählen Sie eine Sicherungsdatei";

 $text['label-file_format']['en-us'] = "File Format";
-$text['label-file_format']['ar-eg'] = "";
-$text['label-file_format']['de-at'] = "Dateiformat"; //copied from de-de
-$text['label-file_format']['de-ch'] = "Dateiformat"; //copied from de-de
-$text['label-file_format']['de-de'] = "Dateiformat";
 $text['label-file_format']['es-cl'] = "Formato de Archivo";
-$text['label-file_format']['es-mx'] = "Formato de Archivo"; //copied from es-cl
-$text['label-file_format']['fr-ca'] = "Format de Fichier"; //copied from fr-fr
-$text['label-file_format']['fr-fr'] = "Format de Fichier";
-$text['label-file_format']['he-il'] = "";
-$text['label-file_format']['it-it'] = "Formato File";
-$text['label-file_format']['nl-nl'] = "";
-$text['label-file_format']['pl-pl'] = "Format pliku";
-$text['label-file_format']['pt-br'] = "Formato do arquivo";
 $text['label-file_format']['pt-pt'] = "Formato de arquivo";
-$text['label-file_format']['ro-ro'] = "";
-$text['label-file_format']['ru-ru'] = "Формат файла";
+$text['label-file_format']['fr-fr'] = "Format de Fichier";
+$text['label-file_format']['pt-br'] = "Formato do arquivo";
+$text['label-file_format']['pl'] = "Format pliku";
 $text['label-file_format']['sv-se'] = "Filformat";
-$text['label-file_format']['uk-ua'] = "Формат файлу";
+$text['label-file_format']['uk'] = "Формат файлу";
+$text['label-file_format']['de-at'] = "Dateiformat";

 $text['label-command']['en-us'] = "Command";
-$text['label-command']['ar-eg'] = "";
-$text['label-command']['de-at'] = "Befehl"; //copied from de-de
-$text['label-command']['de-ch'] = "Befehl"; //copied from de-de
-$text['label-command']['de-de'] = "Befehl";
 $text['label-command']['es-cl'] = "Comando";
-$text['label-command']['es-mx'] = "Comando"; //copied from es-cl
-$text['label-command']['fr-ca'] = "Commandementt"; //copied from fr-fr
-$text['label-command']['fr-fr'] = "Commandementt";
-$text['label-command']['he-il'] = "";
-$text['label-command']['it-it'] = "Comando";
-$text['label-command']['nl-nl'] = "";
-$text['label-command']['pl-pl'] = "Polecenie";
-$text['label-command']['pt-br'] = "Comando"; //copied from pt-pt
 $text['label-command']['pt-pt'] = "Comando";
-$text['label-command']['ro-ro'] = "";
-$text['label-command']['ru-ru'] = "Команда";
+$text['label-command']['fr-fr'] = "Commandementt";
+$text['label-command']['pt-br'] = "Comando";
+$text['label-command']['pl'] = "Polecenie";
 $text['label-command']['sv-se'] = "Komando";
-$text['label-command']['uk-ua'] = "Команда";
+$text['label-command']['uk'] = "Команда";
+$text['label-command']['de-at'] = "Befehl";

 $text['header-restore']['en-us'] = "Restore";
-$text['header-restore']['ar-eg'] = "";
-$text['header-restore']['de-at'] = "Wiederherstellen"; //copied from de-de
-$text['header-restore']['de-ch'] = "Wiederherstellen"; //copied from de-de
-$text['header-restore']['de-de'] = "Wiederherstellen";
 $text['header-restore']['es-cl'] = "Restaurar";
-$text['header-restore']['es-mx'] = "Restaurar"; //copied from es-cl
-$text['header-restore']['fr-ca'] = "Restaurer"; //copied from fr-fr
-$text['header-restore']['fr-fr'] = "Restaurer";
-$text['header-restore']['he-il'] = "";
-$text['header-restore']['it-it'] = "Ripristina";
-$text['header-restore']['nl-nl'] = "";
-$text['header-restore']['pl-pl'] = "Przywracanie kopii zapasowej";
-$text['header-restore']['pt-br'] = "Restaurar"; //copied from pt-pt
 $text['header-restore']['pt-pt'] = "Restaurar";
-$text['header-restore']['ro-ro'] = "";
-$text['header-restore']['ru-ru'] = "Восстановление";
+$text['header-restore']['fr-fr'] = "Restaurer";
+$text['header-restore']['pt-br'] = "Restaurar";
+$text['header-restore']['pl'] = "Przywracanie kopii zapasowej";
 $text['header-restore']['sv-se'] = "Återställ";
-$text['header-restore']['uk-ua'] = "Відновлення";
+$text['header-restore']['uk'] = "Відновлення";
+$text['header-restore']['de-at'] = "Wiederherstellen";

 $text['header-backup']['en-us'] = "Backup";
-$text['header-backup']['ar-eg'] = "";
-$text['header-backup']['de-at'] = "Sichern"; //copied from de-de
-$text['header-backup']['de-ch'] = "Sichern"; //copied from de-de
-$text['header-backup']['de-de'] = "Sichern";
 $text['header-backup']['es-cl'] = "Copia de seguridad";
-$text['header-backup']['es-mx'] = "Copia de seguridad"; //copied from es-cl
-$text['header-backup']['fr-ca'] = "Sauvegarde"; //copied from fr-fr
-$text['header-backup']['fr-fr'] = "Sauvegarde";
-$text['header-backup']['he-il'] = "";
-$text['header-backup']['it-it'] = "Backup";
-$text['header-backup']['nl-nl'] = "";
-$text['header-backup']['pl-pl'] = "Tworzenie kopii zapasowej";
-$text['header-backup']['pt-br'] = "Backup"; //copied from pt-pt
 $text['header-backup']['pt-pt'] = "Backup";
-$text['header-backup']['ro-ro'] = "";
-$text['header-backup']['ru-ru'] = "Резервная копия";
+$text['header-backup']['fr-fr'] = "Sauvegarde";
+$text['header-backup']['pt-br'] = "Backup";
+$text['header-backup']['pl'] = "Tworzenie kopii zapasowej";
 $text['header-backup']['sv-se'] = "Backup";
-$text['header-backup']['uk-ua'] = "Резервна копія";
+$text['header-backup']['uk'] = "Резервна копія";
+$text['header-backup']['de-at'] = "Sichern";

 $text['description-restore_warning']['en-us'] = "Warning: Existing files, if any, will be overwritten.";
-$text['description-restore_warning']['ar-eg'] = "";
-$text['description-restore_warning']['de-at'] = "Warnung: Existierende Dateien, falls vorhanden, werden überschrieben."; //copied from de-de
-$text['description-restore_warning']['de-ch'] = "Warnung: Existierende Dateien, falls vorhanden, werden überschrieben."; //copied from de-de
-$text['description-restore_warning']['de-de'] = "Warnung: Existierende Dateien, falls vorhanden, werden überschrieben.";
 $text['description-restore_warning']['es-cl'] = "Advertencia: Los archivos existentes, si los hay, se sobrescribirá.";
-$text['description-restore_warning']['es-mx'] = "Advertencia: Los archivos existentes, si los hay, se sobrescribirá."; //copied from es-cl
-$text['description-restore_warning']['fr-ca'] = "Attention: les fichiers existants, s'il y en a, seront écrasés."; //copied from fr-fr
-$text['description-restore_warning']['fr-fr'] = "Attention: les fichiers existants, s'il y en a, seront écrasés.";
-$text['description-restore_warning']['he-il'] = "";
-$text['description-restore_warning']['it-it'] = "Attenzione: I file esistenti saranno sovrascritti.";
-$text['description-restore_warning']['nl-nl'] = "";
-$text['description-restore_warning']['pl-pl'] = "Uwaga - obecne pliki (jeżeli istnieją), zostaną nadpisane";
-$text['description-restore_warning']['pt-br'] = "Aviso: Os arquivos existentes, se houver, serão todos substituidos";
 $text['description-restore_warning']['pt-pt'] = "Aviso: Os arquivos existentes, se houver, serão substituídos.";
-$text['description-restore_warning']['ro-ro'] = "";
-$text['description-restore_warning']['ru-ru'] = "Внимание! Существующие файлы будут перезаписаны.";
+$text['description-restore_warning']['fr-fr'] = "Attention: les fichiers existants, s'il y en a, seront écrasés.";
+$text['description-restore_warning']['pt-br'] = "Aviso: Os arquivos existentes, se houver, serão todos substituidos";
+$text['description-restore_warning']['pl'] = "Uwaga - obecne pliki (jeżeli istnieją), zostaną nadpisane";
 $text['description-restore_warning']['sv-se'] = "Varning: Befintliga filer, om någon, kommer att skrivas över.";
-$text['description-restore_warning']['uk-ua'] = "Увага! Файли, які вже існують, будуть перезаписані.";
+$text['description-restore_warning']['uk'] = "Увага! Файли, які вже існують, будуть перезаписані.";
+$text['description-restore_warning']['de-at'] = "Warnung: Existierende Dateien, falls vorhanden, werden überschrieben.";

 $text['description-restore']['en-us'] = "To restore a backup from a file on your local system, click 'Browse' then select the desired backup file (eg. 'backup_[YYMMDD]_[HHMMSS].tgz'), then click the 'Restore' button.";
-$text['description-restore']['ar-eg'] = "";
-$text['description-restore']['de-at'] = "Um das System von einer lokalen Datei wiederherzustellen klicken Sie 'Durchsuchen' und wählen Sie die gewünschte Sicherungsdatei."; //copied from de-de
-$text['description-restore']['de-ch'] = "Um das System von einer lokalen Datei wiederherzustellen klicken Sie 'Durchsuchen' und wählen Sie die gewünschte Sicherungsdatei."; //copied from de-de
-$text['description-restore']['de-de'] = "Um das System von einer lokalen Datei wiederherzustellen klicken Sie 'Durchsuchen' und wählen Sie die gewünschte Sicherungsdatei.";
 $text['description-restore']['es-cl'] = "Para restaurar una copia de seguridad de un archivo en el sistema local, haga clic en 'Examinar' y seleccione el archivo de copia de seguridad que desee (por ejemplo, 'backup_[YYMMDD]_[HHMMSS].tgz'), a continuación, haga clic en el botón 'Restaurar'.";
-$text['description-restore']['es-mx'] = "Para restaurar una copia de seguridad de un archivo en el sistema local, haga clic en 'Examinar' y seleccione el archivo de copia de seguridad que desee (por ejemplo, 'backup_[YYMMDD]_[HHMMSS].tgz'), a continuación, haga clic en el botón 'Restaurar'."; //copied from es-cl
-$text['description-restore']['fr-ca'] = "Pour restaurer une sauvegarde à partir d'un fichier sur votre système local, cliquez sur 'Parcourir' puis sélectionnez le fichier de sauvegarde souhaité (par exemple, 'backup_[YYMMDD]_[HHMMSS].tgz'), puis cliquez sur le bouton 'Restaurer'."; //copied from fr-fr
-$text['description-restore']['fr-fr'] = "Pour restaurer une sauvegarde à partir d'un fichier sur votre système local, cliquez sur 'Parcourir' puis sélectionnez le fichier de sauvegarde souhaité (par exemple, 'backup_[YYMMDD]_[HHMMSS].tgz'), puis cliquez sur le bouton 'Restaurer'.";
-$text['description-restore']['he-il'] = "";
-$text['description-restore']['it-it'] = "Per ripristinare un backup da un file nel tuo sistema locale, clicca su 'Sfoglia' quindi seleziona il file di backup desiderato (es. 'backup_[YYMMDD]_[HHMMSS].tgz'), quindi clicca su Ripristina.";
-$text['description-restore']['nl-nl'] = "";
-$text['description-restore']['pl-pl'] = "Aby przywrócić kopię zapasową z pliku w systemie lokalnym, kliknij  'Przeglądaj', wybierz żądany plik kopii zapasowej (np. 'Backup_ [ YYMMDD ] _ [ GGMMSS ] .tgz' ), a następnie kliknij przycisk 'Przywróć ustawienia domyślne'.";
-$text['description-restore']['pt-br'] = "Para restaurar um backup de um arquivo em seu sistema local, clique em 'Procurar' e selecione o arquivo de backup desejado (por exemplo, 'backup_[AAMMDD]_[HHMMSS].tgz'), então clique no botão 'Restaurar'. ";
 $text['description-restore']['pt-pt'] = "Para restaurar um backup de um arquivo em seu sistema local, clique em 'Procurar' e selecione o arquivo de backup desejado (por exemplo, 'backup_[YYMMDD]_[HHMMSS].tgz'), então clique no botão 'Restaurar'.";
-$text['description-restore']['ro-ro'] = "";
-$text['description-restore']['ru-ru'] = "Для восстановления резервной копии из файла, нажмите кнопку 'Обзор' и выберите нужный файл (например, 'backup_[YYMMDD]_[HHMMSS].tgz'), а затем нажмите кнопку 'Восстановить'.";
+$text['description-restore']['fr-fr'] = "Pour restaurer une sauvegarde à partir d'un fichier sur votre système local, cliquez sur 'Parcourir' puis sélectionnez le fichier de sauvegarde souhaité (par exemple, 'backup_[YYMMDD]_[HHMMSS].tgz'), puis cliquez sur le bouton 'Restaurer'.";
+$text['description-restore']['pt-br'] = "Para restaurar um backup de um arquivo em seu sistema local, clique em 'Procurar' e selecione o arquivo de backup desejado (por exemplo, 'backup_[AAMMDD]_[HHMMSS].tgz'), então clique no botão 'Restaurar'. ";
+$text['description-restore']['pl'] = "Aby przywrócić kopię zapasową z pliku w systemie lokalnym, kliknij  'Przeglądaj', wybierz żądany plik kopii zapasowej (np. 'Backup_ [ YYMMDD ] _ [ GGMMSS ] .tgz' ), a następnie kliknij przycisk 'Przywróć ustawienia domyślne'.";
 $text['description-restore']['sv-se'] = "För att återställa en säkerhetskopia från en fil på ditt lokala system,  klicka på ' Bläddra ' och välj sedan önskad säkerhetskopia (t.ex. . ' Backup_ [ ÅÅMMDD ] _ [ HHMMSS ] .tgz ' ) och klicka på ' Återställ ' -knappen.";
-$text['description-restore']['uk-ua'] = "Для відновлення резервної копії з файлу, натисніть кнопку 'Огляд' і виберіть потрібний файл резервної копії, а потім натисніть кнопку 'Відновити '.";
+$text['description-restore']['uk'] = "Для відновлення резервної копії з файлу, натисніть кнопку 'Огляд' і виберіть потрібний файл резервної копії, а потім натисніть кнопку 'Відновити '.";
+$text['description-restore']['de-at'] = "Um das System von einer lokalen Datei Wiederherzustellen klicken Sie 'Durchsuchen' und wählen Sie die gewünschte Sicherungsdatei.";

 $text['description-backup']['en-us'] = "To create a backup of the Source Paths below (defined in Default Settings), select the desired File Format and Target Type.";
-$text['description-backup']['ar-eg'] = "";
-$text['description-backup']['de-at'] = "Um eine Sicherung der unten angeführten Quell-Pfade (in Standard-Einstellungen definiert) zu erstellen, wählen Sie das gewünschte Dateiformat und den Ziel Typ."; //copied from de-de
-$text['description-backup']['de-ch'] = "Um eine Sicherung der unten angeführten Quell-Pfade (in Standard-Einstellungen definiert) zu erstellen, wählen Sie das gewünschte Dateiformat und den Ziel Typ."; //copied from de-de
-$text['description-backup']['de-de'] = "Um eine Sicherung der unten angeführten Quell-Pfade (in Standard-Einstellungen definiert) zu erstellen, wählen Sie das gewünschte Dateiformat und den Ziel Typ.";
 $text['description-backup']['es-cl'] = "Para crear una copia de seguridad de las rutas de origen siguientes (definidos en la configuración predeterminada), seleccione el formato de archivo deseado y tipo de destino.";
-$text['description-backup']['es-mx'] = "Para crear una copia de seguridad de las rutas de origen siguientes (definidos en la configuración predeterminada), seleccione el formato de archivo deseado y tipo de destino."; //copied from es-cl
-$text['description-backup']['fr-ca'] = "Pour créer une sauvegarde des chemins source ci-dessous (défini dans les paramètres par défaut), sélectionnez le format de fichier désiré et Type de cible."; //copied from fr-fr
-$text['description-backup']['fr-fr'] = "Pour créer une sauvegarde des chemins source ci-dessous (défini dans les paramètres par défaut), sélectionnez le format de fichier désiré et Type de cible.";
-$text['description-backup']['he-il'] = "";
-$text['description-backup']['it-it'] = "Per creare un backup dei Path Sorgente sottostanti (definiti in Parametri di Default), seleziona il Formato File desiderato e il Tipo di Destinazione.";
-$text['description-backup']['nl-nl'] = "";
-$text['description-backup']['pl-pl'] = "Aby utworzyć kopię zapasową scieżki zródłowej zdefiniowanej w ustawieniach  domyślnych, wybierz żądany format pliku i typ docelowy.";
-$text['description-backup']['pt-br'] = "Para criar uma cópia de segurança dos caminhos de origem abaixo (definidos em Configurações Padrão), selecione o formato de arquivo desejado e Tipo de destino. ";
 $text['description-backup']['pt-pt'] = "Para criar uma cópia de segurança dos caminhos de origem abaixo (definidos em Default Settings), selecione o formato de arquivo desejado e Target Type.";
-$text['description-backup']['ro-ro'] = "";
-$text['description-backup']['ru-ru'] = "Чтобы создать резервную копию исходных путей ниже (определяется в настройках по умолчанию), выберите нужный тип формата файла и Target.";
+$text['description-backup']['fr-fr'] = "Pour créer une sauvegarde des chemins source ci-dessous (défini dans les paramètres par défaut), sélectionnez le format de fichier désiré et Type de cible.";
+$text['description-backup']['pt-br'] = "Para criar uma cópia de segurança dos caminhos de origem abaixo (definidos em Configurações Padrão), selecione o formato de arquivo desejado e Tipo de destino. ";
+$text['description-backup']['pl'] = "Aby utworzyć kopię zapasową scieżki zródłowej zdefiniowanej w ustawieniach  domyślnych, wybierz żądany format pliku i typ docelowy.";
 $text['description-backup']['sv-se'] = "För att skapa en säkerhetskopia av Källa Sökväg nedan (som definieras i standardinställningar), välj önskad Filformat och Mål Typ.";
-$text['description-backup']['uk-ua'] = "Щоб створити резервну копію  вказаних нижче об’єктів (вказано у налаштуваннях за замовчуванням), виберіть потрібний формат і призначення";
+$text['description-backup']['uk'] = "Щоб створити резервну копію  вказаних нижче об’єктів (вказано у налаштуваннях за замовчуванням), виберіть потрібний формат і призначення";
+$text['description-backup']['de-at'] = "Um eine Sicherung der unten angeführten Quell Pfade (in Standard Einstellungen definiert) zu erstellen, wählen Sie das gewünschte Dateiformat und den Ziel Typ.";

 $text['button-generate']['en-us'] = "Generate";
-$text['button-generate']['ar-eg'] = "";
-$text['button-generate']['de-at'] = "Erzeugen"; //copied from de-de
-$text['button-generate']['de-ch'] = "Erzeugen"; //copied from de-de
-$text['button-generate']['de-de'] = "Erzeugen";
 $text['button-generate']['es-cl'] = "Generar";
-$text['button-generate']['es-mx'] = "Generar"; //copied from es-cl
-$text['button-generate']['fr-ca'] = "Générer"; //copied from fr-fr
-$text['button-generate']['fr-fr'] = "Générer";
-$text['button-generate']['he-il'] = "";
-$text['button-generate']['it-it'] = "Genera";
-$text['button-generate']['nl-nl'] = "";
-$text['button-generate']['pl-pl'] = "Generuj";
-$text['button-generate']['pt-br'] = "Geração";
 $text['button-generate']['pt-pt'] = "Gerar";
-$text['button-generate']['ro-ro'] = "";
-$text['button-generate']['ru-ru'] = "Сгенерировать";
+$text['button-generate']['fr-fr'] = "Générer";
+$text['button-generate']['pt-br'] = "Geração";
+$text['button-generate']['pl'] = "Generuj";
 $text['button-generate']['sv-se'] = "Generera";
-$text['button-generate']['uk-ua'] = "Згенерувати";
+$text['button-generate']['uk'] = "Згенерувати";
+$text['button-generate']['de-at'] = "Generieren";

-?>
+?>
@@ -1,29 +1,16 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Backup";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Datensicherung";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Datensicherung";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Sauvegarde";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Kopie zapasowe";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Backup";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Резервное копирование";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Backup";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Резервна копія";
-	$apps[$x]['menu'][$y]['uuid'] = "7e174c3c-e494-4bb0-a52a-4ea55209ffeb";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/backup/index.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Backup";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Sauvegarde";
+$apps[$x]['menu'][0]['title']['pl'] = "Kopie zapasowe";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Backup";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Backup";
+$apps[$x]['menu'][0]['title']['uk'] = "Резервна копія";
+$apps[$x]['menu'][0]['title']['de-at'] = "Sicherung";
+$apps[$x]['menu'][0]['uuid'] = "7e174c3c-e494-4bb0-a52a-4ea55209ffeb";
+$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/backup/index.php";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";

 ?>
@@ -58,9 +58,7 @@ else {
 				if (isset($_SESSION['backup']['path'])) foreach ($_SESSION['backup']['path'] as $value) {
 					$cmd .= $value.' ';
 				}
-				$cmd .= " 2>&1";
-				exec($cmd, $response, $restore_errlevel);
-				$response_txt = "<br>" . implode("<br>", $response);
+				exec($cmd);

 			//download the file
 				session_cache_limiter('public');
@@ -81,14 +79,14 @@ else {
 				}
 				else {
 					//set response message
-					messages::add($text['message-backup_failed_format'] . $response_txt, 'negative');
+					$_SESSION["message"] = $text['message-backup_failed_format'];
 					header("Location: ".$_SERVER['PHP_SELF']);
 					exit;
 				}
 			}
 			else {
 				//set response message
-				messages::add($text['message-backup_failed_paths'], 'negative');
+				$_SESSION["message"] = $text['message-backup_failed_paths'];
 				header("Location: ".$_SERVER['PHP_SELF']);
 				exit;
 			}
@@ -124,29 +122,21 @@ else {
 			}
 			if (!$valid_format) {
 				@unlink($backup_path.'/'.$backup_file);
-				messages::add($text['message-restore_failed_format'], 'negative');
+				$_SESSION["message"] = $text['message-restore_failed_format'];
 				header("Location: ".$_SERVER['PHP_SELF']);
 				exit;
 			}
 			else {
-				$cmd .= ' 2>&1';
-				exec($cmd, $response, $restore_errlevel);
-				$response_txt = "<br>" . implode("<br>", $response);
-				if ($restore_errlevel == 0) {
-					//set response message
-					messages::add($text['message-restore_completed']);
-					header("Location: ".$_SERVER['PHP_SELF']);
-					exit;
-				} else {
-					messages::add($text['message-restore_failed_extract'] . $response_txt, 'negative');
-					header("Location: ".$_SERVER['PHP_SELF']);
-					exit;
-				}
+				exec($cmd);
+				//set response message
+				$_SESSION["message"] = $text['message-restore_completed'];
+				header("Location: ".$_SERVER['PHP_SELF']);
+				exit;
 			}
 		}
 		else {
 			//set response message
-			messages::add($text['message-restore_failed_upload'], 'negative');
+			$_SESSION["message"] = $text['message-restore_failed_upload'];
 			header("Location: ".$_SERVER['PHP_SELF']);
 			exit;
 		}
@@ -1,87 +0,0 @@
-<?php
-
-	//application details
-		$apps[$x]['name'] = 'Bridges';
-		$apps[$x]['uuid'] = 'a6a7c4c5-340a-43ce-bcbc-2ed9bab8659d';
-		$apps[$x]['category'] = '';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = '';
-
-	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'bridge_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'bridge_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'bridge_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'bridge_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'bridge_all';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-
-	//destination details
-		$y = 0;
-		$apps[$x]['destinations'][$y]['type'] = "sql";
-		$apps[$x]['destinations'][$y]['label'] = "bridges";
-		$apps[$x]['destinations'][$y]['name'] = "bridges";
-		//$apps[$x]['destinations'][$y]['sql'] = "select bridge_name, bridge_destination, bridge_description from v_bridges ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and bridge_enabled = 'true'";
-		$apps[$x]['destinations'][$y]['order_by'] = "bridge_name asc";
-		$apps[$x]['destinations'][$y]['field']['name'] = "bridge_name";
-		$apps[$x]['destinations'][$y]['field']['destination'] = "bridge_destination";
-		$apps[$x]['destinations'][$y]['field']['description'] = "bridge_description";
-		$apps[$x]['destinations'][$y]['select_value']['dialplan'] = "bridge:\${destination}";
-		$apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:bridge \${destination}";
-		$apps[$x]['destinations'][$y]['select_label'] = "\${name} \${description} ";
-		$y++;
-
-	//Bridges
-		$y = 0;
-		$apps[$x]['db'][$y]['table']['name'] = 'v_bridges';
-		$apps[$x]['db'][$y]['table']['parent'] = '';
-		$z = 0;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'bridge_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'bridge_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'bridge_destination';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the destination.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'bridge_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select to enable or disable.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'bridge_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description. ';
-		$z++;
-
-?>
@@ -1,224 +0,0 @@
-<?php
-
-	//Bridges
-		$text['title-bridges']['en-us'] = 'Bridges';
-		$text['title-bridges']['ar-eg'] = '';
-		$text['title-bridges']['de-at'] = '';
-		$text['title-bridges']['de-ch'] = '';
-		$text['title-bridges']['de-de'] = '';
-		$text['title-bridges']['es-cl'] = '';
-		$text['title-bridges']['es-mx'] = '';
-		$text['title-bridges']['fr-ca'] = '';
-		$text['title-bridges']['fr-fr'] = '';
-		$text['title-bridges']['he-il'] = '';
-		$text['title-bridges']['it-it'] = '';
-		$text['title-bridges']['nl-nl'] = '';
-		$text['title-bridges']['pl-pl'] = '';
-		$text['title-bridges']['pt-br'] = '';
-		$text['title-bridges']['pt-pt'] = '';
-		$text['title-bridges']['ro-ro'] = '';
-		$text['title-bridges']['ru-ru'] = '';
-		$text['title-bridges']['sv-se'] = '';
-		$text['title-bridges']['uk-ua'] = '';
-
-		$text['title-bridge']['en-us'] = 'Bridge';
-		$text['title-bridge']['ar-eg'] = '';
-		$text['title-bridge']['de-at'] = '';
-		$text['title-bridge']['de-ch'] = '';
-		$text['title-bridge']['de-de'] = '';
-		$text['title-bridge']['es-cl'] = '';
-		$text['title-bridge']['es-mx'] = '';
-		$text['title-bridge']['fr-ca'] = '';
-		$text['title-bridge']['fr-fr'] = '';
-		$text['title-bridge']['he-il'] = '';
-		$text['title-bridge']['it-it'] = '';
-		$text['title-bridge']['nl-nl'] = '';
-		$text['title-bridge']['pl-pl'] = '';
-		$text['title-bridge']['pt-br'] = '';
-		$text['title-bridge']['pt-pt'] = '';
-		$text['title-bridge']['ro-ro'] = '';
-		$text['title-bridge']['ru-ru'] = '';
-		$text['title-bridge']['sv-se'] = '';
-		$text['title-bridge']['uk-ua'] = '';
-
-		$text['title_description-bridge']['en-us'] = 'Add bridge statements to destination select list.';
-		$text['title_description-bridge']['ar-eg'] = '';
-		$text['title_description-bridge']['de-at'] = '';
-		$text['title_description-bridge']['de-ch'] = '';
-		$text['title_description-bridge']['de-de'] = '';
-		$text['title_description-bridge']['es-cl'] = '';
-		$text['title_description-bridge']['es-mx'] = '';
-		$text['title_description-bridge']['fr-ca'] = '';
-		$text['title_description-bridge']['fr-fr'] = '';
-		$text['title_description-bridge']['he-il'] = '';
-		$text['title_description-bridge']['it-it'] = '';
-		$text['title_description-bridge']['nl-nl'] = '';
-		$text['title_description-bridge']['pl-pl'] = '';
-		$text['title_description-bridge']['pt-br'] = '';
-		$text['title_description-bridge']['pt-pt'] = '';
-		$text['title_description-bridge']['ro-ro'] = '';
-		$text['title_description-bridge']['ru-ru'] = '';
-		$text['title_description-bridge']['sv-se'] = '';
-		$text['title_description-bridge']['uk-ua'] = '';
-
-		$text['label-bridge_name']['en-us'] = 'Name';
-		$text['label-bridge_name']['ar-eg'] = '';
-		$text['label-bridge_name']['de-at'] = '';
-		$text['label-bridge_name']['de-ch'] = '';
-		$text['label-bridge_name']['de-de'] = '';
-		$text['label-bridge_name']['es-cl'] = '';
-		$text['label-bridge_name']['es-mx'] = '';
-		$text['label-bridge_name']['fr-ca'] = '';
-		$text['label-bridge_name']['fr-fr'] = '';
-		$text['label-bridge_name']['he-il'] = '';
-		$text['label-bridge_name']['it-it'] = '';
-		$text['label-bridge_name']['nl-nl'] = '';
-		$text['label-bridge_name']['pl-pl'] = '';
-		$text['label-bridge_name']['pt-br'] = '';
-		$text['label-bridge_name']['pt-pt'] = '';
-		$text['label-bridge_name']['ro-ro'] = '';
-		$text['label-bridge_name']['ru-ru'] = '';
-		$text['label-bridge_name']['sv-se'] = '';
-		$text['label-bridge_name']['uk-ua'] = '';
-
-		$text['description-bridge_name']['en-us'] = 'Enter the name.';
-		$text['description-bridge_name']['ar-eg'] = '';
-		$text['description-bridge_name']['de-at'] = '';
-		$text['description-bridge_name']['de-ch'] = '';
-		$text['description-bridge_name']['de-de'] = '';
-		$text['description-bridge_name']['es-cl'] = '';
-		$text['description-bridge_name']['es-mx'] = '';
-		$text['description-bridge_name']['fr-ca'] = '';
-		$text['description-bridge_name']['fr-fr'] = '';
-		$text['description-bridge_name']['he-il'] = '';
-		$text['description-bridge_name']['it-it'] = '';
-		$text['description-bridge_name']['nl-nl'] = '';
-		$text['description-bridge_name']['pl-pl'] = '';
-		$text['description-bridge_name']['pt-br'] = '';
-		$text['description-bridge_name']['pt-pt'] = '';
-		$text['description-bridge_name']['ro-ro'] = '';
-		$text['description-bridge_name']['ru-ru'] = '';
-		$text['description-bridge_name']['sv-se'] = '';
-		$text['description-bridge_name']['uk-ua'] = '';
-
-		$text['label-bridge_destination']['en-us'] = 'Destination';
-		$text['label-bridge_destination']['ar-eg'] = '';
-		$text['label-bridge_destination']['de-at'] = '';
-		$text['label-bridge_destination']['de-ch'] = '';
-		$text['label-bridge_destination']['de-de'] = '';
-		$text['label-bridge_destination']['es-cl'] = '';
-		$text['label-bridge_destination']['es-mx'] = '';
-		$text['label-bridge_destination']['fr-ca'] = '';
-		$text['label-bridge_destination']['fr-fr'] = '';
-		$text['label-bridge_destination']['he-il'] = '';
-		$text['label-bridge_destination']['it-it'] = '';
-		$text['label-bridge_destination']['nl-nl'] = '';
-		$text['label-bridge_destination']['pl-pl'] = '';
-		$text['label-bridge_destination']['pt-br'] = '';
-		$text['label-bridge_destination']['pt-pt'] = '';
-		$text['label-bridge_destination']['ro-ro'] = '';
-		$text['label-bridge_destination']['ru-ru'] = '';
-		$text['label-bridge_destination']['sv-se'] = '';
-		$text['label-bridge_destination']['uk-ua'] = '';
-
-		$text['description-bridge_destination']['en-us'] = 'Enter the destination.';
-		$text['description-bridge_destination']['ar-eg'] = '';
-		$text['description-bridge_destination']['de-at'] = '';
-		$text['description-bridge_destination']['de-ch'] = '';
-		$text['description-bridge_destination']['de-de'] = '';
-		$text['description-bridge_destination']['es-cl'] = '';
-		$text['description-bridge_destination']['es-mx'] = '';
-		$text['description-bridge_destination']['fr-ca'] = '';
-		$text['description-bridge_destination']['fr-fr'] = '';
-		$text['description-bridge_destination']['he-il'] = '';
-		$text['description-bridge_destination']['it-it'] = '';
-		$text['description-bridge_destination']['nl-nl'] = '';
-		$text['description-bridge_destination']['pl-pl'] = '';
-		$text['description-bridge_destination']['pt-br'] = '';
-		$text['description-bridge_destination']['pt-pt'] = '';
-		$text['description-bridge_destination']['ro-ro'] = '';
-		$text['description-bridge_destination']['ru-ru'] = '';
-		$text['description-bridge_destination']['sv-se'] = '';
-		$text['description-bridge_destination']['uk-ua'] = '';
-
-		$text['label-bridge_enabled']['en-us'] = 'Enabled';
-		$text['label-bridge_enabled']['ar-eg'] = '';
-		$text['label-bridge_enabled']['de-at'] = '';
-		$text['label-bridge_enabled']['de-ch'] = '';
-		$text['label-bridge_enabled']['de-de'] = '';
-		$text['label-bridge_enabled']['es-cl'] = '';
-		$text['label-bridge_enabled']['es-mx'] = '';
-		$text['label-bridge_enabled']['fr-ca'] = '';
-		$text['label-bridge_enabled']['fr-fr'] = '';
-		$text['label-bridge_enabled']['he-il'] = '';
-		$text['label-bridge_enabled']['it-it'] = '';
-		$text['label-bridge_enabled']['nl-nl'] = '';
-		$text['label-bridge_enabled']['pl-pl'] = '';
-		$text['label-bridge_enabled']['pt-br'] = '';
-		$text['label-bridge_enabled']['pt-pt'] = '';
-		$text['label-bridge_enabled']['ro-ro'] = '';
-		$text['label-bridge_enabled']['ru-ru'] = '';
-		$text['label-bridge_enabled']['sv-se'] = '';
-		$text['label-bridge_enabled']['uk-ua'] = '';
-
-		$text['description-bridge_enabled']['en-us'] = 'Select to enable or disable.';
-		$text['description-bridge_enabled']['ar-eg'] = '';
-		$text['description-bridge_enabled']['de-at'] = '';
-		$text['description-bridge_enabled']['de-ch'] = '';
-		$text['description-bridge_enabled']['de-de'] = '';
-		$text['description-bridge_enabled']['es-cl'] = '';
-		$text['description-bridge_enabled']['es-mx'] = '';
-		$text['description-bridge_enabled']['fr-ca'] = '';
-		$text['description-bridge_enabled']['fr-fr'] = '';
-		$text['description-bridge_enabled']['he-il'] = '';
-		$text['description-bridge_enabled']['it-it'] = '';
-		$text['description-bridge_enabled']['nl-nl'] = '';
-		$text['description-bridge_enabled']['pl-pl'] = '';
-		$text['description-bridge_enabled']['pt-br'] = '';
-		$text['description-bridge_enabled']['pt-pt'] = '';
-		$text['description-bridge_enabled']['ro-ro'] = '';
-		$text['description-bridge_enabled']['ru-ru'] = '';
-		$text['description-bridge_enabled']['sv-se'] = '';
-		$text['description-bridge_enabled']['uk-ua'] = '';
-
-		$text['label-bridge_description']['en-us'] = 'Description';
-		$text['label-bridge_description']['ar-eg'] = '';
-		$text['label-bridge_description']['de-at'] = '';
-		$text['label-bridge_description']['de-ch'] = '';
-		$text['label-bridge_description']['de-de'] = '';
-		$text['label-bridge_description']['es-cl'] = '';
-		$text['label-bridge_description']['es-mx'] = '';
-		$text['label-bridge_description']['fr-ca'] = '';
-		$text['label-bridge_description']['fr-fr'] = '';
-		$text['label-bridge_description']['he-il'] = '';
-		$text['label-bridge_description']['it-it'] = '';
-		$text['label-bridge_description']['nl-nl'] = '';
-		$text['label-bridge_description']['pl-pl'] = '';
-		$text['label-bridge_description']['pt-br'] = '';
-		$text['label-bridge_description']['pt-pt'] = '';
-		$text['label-bridge_description']['ro-ro'] = '';
-		$text['label-bridge_description']['ru-ru'] = '';
-		$text['label-bridge_description']['sv-se'] = '';
-		$text['label-bridge_description']['uk-ua'] = '';
-
-		$text['description-bridge_description']['en-us'] = 'Enter the description. ';
-		$text['description-bridge_description']['ar-eg'] = '';
-		$text['description-bridge_description']['de-at'] = '';
-		$text['description-bridge_description']['de-ch'] = '';
-		$text['description-bridge_description']['de-de'] = '';
-		$text['description-bridge_description']['es-cl'] = '';
-		$text['description-bridge_description']['es-mx'] = '';
-		$text['description-bridge_description']['fr-ca'] = '';
-		$text['description-bridge_description']['fr-fr'] = '';
-		$text['description-bridge_description']['he-il'] = '';
-		$text['description-bridge_description']['it-it'] = '';
-		$text['description-bridge_description']['nl-nl'] = '';
-		$text['description-bridge_description']['pl-pl'] = '';
-		$text['description-bridge_description']['pt-br'] = '';
-		$text['description-bridge_description']['pt-pt'] = '';
-		$text['description-bridge_description']['ro-ro'] = '';
-		$text['description-bridge_description']['ru-ru'] = '';
-		$text['description-bridge_description']['sv-se'] = '';
-		$text['description-bridge_description']['uk-ua'] = '';
-
-?>
@@ -1,19 +0,0 @@
-<?php
-
-$apps[$x]['menu'][0]['title']['en-us'] = 'Bridges';
-$apps[$x]['menu'][0]['title']['es-cl'] = '';
-$apps[$x]['menu'][0]['title']['fr-fr'] = '';
-$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-$apps[$x]['menu'][0]['title']['pl'] = '';
-$apps[$x]['menu'][0]['title']['sv-se'] = '';
-$apps[$x]['menu'][0]['title']['uk'] = '';
-$apps[$x]['menu'][0]['title']['de-at'] = '';
-$apps[$x]['menu'][0]['uuid'] = '345f0aad-8321-4a8b-9f08-c4730297660c';
-$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-$apps[$x]['menu'][0]['category'] = 'internal';
-$apps[$x]['menu'][0]['path'] = '/app/bridges/bridges.php';
-$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-//$apps[$x]['menu'][0]['groups'][] = 'admin';
-//$apps[$x]['menu'][0]['groups'][] = 'user';
-
-?>
@@ -1,57 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//delete the message
-	messages::add($text['message-delete']);
-
-//delete the data
-	if (isset($_GET["id"]) && is_uuid($_GET["id"]) && permission_exists('bridge_delete')) {
-
-		//get the id
-			$id = check_str($_GET["id"]);
-
-		//delete bridge
-			$sql = "delete from v_bridges ";
-			$sql .= "where bridge_uuid = '$id' ";
-			$sql .= "and domain_uuid = '$domain_uuid' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			unset($sql);
-
-		//redirect the user
-			header('Location: bridges.php');
-	}
-
-
-?>
@@ -1,219 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018
-	the Initial Developer. All Rights Reserved.
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permissions
-	require_once "resources/check_auth.php";
-	if (permission_exists('bridge_add') || permission_exists('bridge_edit')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//action add or update
-	if (isset($_REQUEST["id"])) {
-		$action = "update";
-		$bridge_uuid = check_str($_REQUEST["id"]);
-		$id = check_str($_REQUEST["id"]);
-	}
-	else {
-		$action = "add";
-	}
-
-//get http post variables and set them to php variables
-	if (is_array($_POST)) {
-		$bridge_uuid = check_str($_POST["bridge_uuid"]);
-		$bridge_name = check_str($_POST["bridge_name"]);
-		$bridge_destination = check_str($_POST["bridge_destination"]);
-		$bridge_enabled = check_str($_POST["bridge_enabled"]);
-	}
-
-//process the user data and save it to the database
-	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
-
-		//get the uuid from the POST
-			if ($action == "update") {
-				$bridge_uuid = check_str($_POST["bridge_uuid"]);
-			}
-
-		//check for all required data
-			$msg = '';
-			if (strlen($bridge_name) == 0) { $msg .= $text['message-required']." ".$text['label-bridge_name']."<br>\n"; }
-			if (strlen($bridge_destination) == 0) { $msg .= $text['message-required']." ".$text['label-bridge_destination']."<br>\n"; }
-			if (strlen($bridge_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-bridge_enabled']."<br>\n"; }
-			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "resources/header.php";
-				require_once "resources/persist_form_var.php";
-				echo "<div align='center'>\n";
-				echo "<table><tr><td>\n";
-				echo $msg."<br />";
-				echo "</td></tr></table>\n";
-				persistformvar($_POST);
-				echo "</div>\n";
-				require_once "resources/footer.php";
-				return;
-			}
-
-		//set the domain_uuid
-				$_POST["domain_uuid"] = $_SESSION["domain_uuid"];
-
-		//add the bridge_uuid
-			if (strlen($_POST["bridge_uuid"]) == 0) {
-				$bridge_uuid = uuid();
-				$_POST["bridge_uuid"] = $bridge_uuid;
-			}
-
-		//prepare the array
-			$array['bridges'][0] = $_POST;
-
-		//save to the data
-			$database = new database;
-			$database->app_name = 'bridges';
-			$database->app_uuid = null;
-			if (strlen($bridge_uuid) > 0) {
-				$database->uuid($bridge_uuid);
-			}
-			$database->save($array);
-			$message = $database->message;
-
-		//debug info
-			//echo "<pre>";
-			//print_r($message);
-			//echo "</pre>";
-			//exit;
-
-		//redirect the user
-			if (isset($action)) {
-				if ($action == "add") {
-					$_SESSION["message"] = $text['message-add'];
-				}
-				if ($action == "update") {
-					$_SESSION["message"] = $text['message-update'];
-				}
-				header('Location: bridge_edit.php?id='.$bridge_uuid);
-				return;
-			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
-
-//pre-populate the form
-	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
-		$bridge_uuid = check_str($_GET["id"]);
-		$sql = "select * from v_bridges ";
-		$sql .= "where bridge_uuid = '$bridge_uuid' ";
-		//$sql .= "and domain_uuid = '$domain_uuid' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		foreach ($result as &$row) {
-			$bridge_name = $row["bridge_name"];
-			$bridge_destination = $row["bridge_destination"];
-			$bridge_enabled = $row["bridge_enabled"];
-		}
-		unset ($prep_statement);
-	}
-
-//show the header
-	require_once "resources/header.php";
-
-//show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
-	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
-
-	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-bridge']."</b><br><br></td>\n";
-	echo "<td width='70%' align='right' valign='top'>\n";
-	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='bridges.php'\" value='".$text['button-back']."'>";
-	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-bridge_name']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='bridge_name' maxlength='255' value=\"$bridge_name\">\n";
-	echo "<br />\n";
-	echo $text['description-bridge_name']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-bridge_destination']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='bridge_destination' maxlength='255' value=\"$bridge_destination\">\n";
-	echo "<br />\n";
-	echo $text['description-bridge_destination']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-bridge_enabled']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<select class='formfld' name='bridge_enabled'>\n";
-	echo "		<option value=''></option>\n";
-	if ($bridge_enabled == "true") {
-		echo "		<option value='true' selected='selected'>".$text['label-true']."</option>\n";
-	}
-	else {
-		echo "		<option value='true'>".$text['label-true']."</option>\n";
-	}
-	if ($bridge_enabled == "false") {
-		echo "		<option value='false' selected='selected'>".$text['label-false']."</option>\n";
-	}
-	else {
-		echo "		<option value='false'>".$text['label-false']."</option>\n";
-	}
-	echo "	</select>\n";
-	echo "<br />\n";
-	echo $text['description-bridge_enabled']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "	<tr>\n";
-	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='bridge_uuid' value='$bridge_uuid'>\n";
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "		</td>\n";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</form>";
-	echo "<br /><br />";
-
-//include the footer
-	require_once "resources/footer.php";
-
-?>
@@ -1,263 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('bridge_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//get the action
-	if (is_array($_POST["bridges"])) {
-		$bridges = $_POST["bridges"];
-		foreach($bridges as $row) {
-			if ($row['action'] == 'delete') {
-				$action = 'delete';
-				break;
-			}
-		}
-	}
-
-//delete the bridges
-	if (permission_exists('bridge_delete')) {
-		if ($action == "delete") {
-			//download
-				$obj = new bridges;
-				$obj->delete($bridges);
-			//delete message
-				messages::add($text['message-delete']);
-		}
-	}
-
-//get variables used to control the order
-	$order_by = check_str($_GET["order_by"]);
-	$order = check_str($_GET["order"]);
-
-//add the search term
-	$search = strtolower(check_str($_GET["search"]));
-	if (strlen($search) > 0) {
-		$sql_search = " (";
-		$sql_search .= "lower(bridge_name) like '%".$search."%' ";
-		$sql_search .= "or lower(bridge_destination) like '%".$search."%' ";
-		$sql_search .= "or lower(bridge_enabled) like '%".$search."%' ";
-		$sql_search .= ") ";
-	}
-
-//additional includes
-	require_once "resources/header.php";
-	require_once "resources/paging.php";
-
-//prepare to page the results
-	$sql = "select count(bridge_uuid) as num_rows from v_bridges ";
-	if ($_GET['show'] == "all" && permission_exists('bridge_all')) {
-		if (isset($sql_search)) {
-			$sql .= "where ".$sql_search;
-		}
-	} else {
-		$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
-		if (isset($sql_search)) {
-			$sql .= "and ".$sql_search;
-		}
-	}
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$prep_statement = $db->prepare($sql);
-	if ($prep_statement) {
-		$prep_statement->execute();
-		$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-		if ($row['num_rows'] > 0) {
-			$num_rows = $row['num_rows'];
-		}
-		else {
-			$num_rows = '0';
-		}
-	}
-
-//prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
-	if ($_GET['show'] == "all" && permission_exists('bridge_all')) {
-		$param .= "&show=all";
-	}
-	$page = $_GET['page'];
-	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	$offset = $rows_per_page * $page;
-
-//get the list
-	$sql = "select * from v_bridges ";
-	if ($_GET['show'] == "all" && permission_exists('bridge_all')) {
-		if (isset($sql_search)) {
-			$sql .= "where ".$sql_search;
-		}
-	} else {
-		$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
-		if (isset($sql_search)) {
-			$sql .= "and ".$sql_search;
-		}
-	}
-	if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; }
-	$sql .= "limit $rows_per_page offset $offset ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
-
-//alternate the row style
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
-
-//define the checkbox_toggle function
-	echo "<script type=\"text/javascript\">\n";
-	echo "	function checkbox_toggle(item) {\n";
-	echo "		var inputs = document.getElementsByTagName(\"input\");\n";
-	echo "		for (var i = 0, max = inputs.length; i < max; i++) {\n";
-	echo "		    if (inputs[i].type === 'checkbox') {\n";
-	echo "		       	if (document.getElementById('checkbox_all').checked == true) {\n";
-	echo "				inputs[i].checked = true;\n";
-	echo "			}\n";
-	echo "				else {\n";
-	echo "					inputs[i].checked = false;\n";
-	echo "				}\n";
-	echo "			}\n";
-	echo "		}\n";
-	echo "	}\n";
-	echo "</script>\n";
-
-//show the content
-	echo "<table width='100%' border='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-bridges']."</b></td>\n";
-	echo "		<form method='get' action=''>\n";
-	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
-
-	if (permission_exists('bridge_all')) {
-		if ($_GET['show'] == 'all') {
-			echo "		<input type='hidden' name='show' value='all'>";
-		}
-		else {
-			echo "		<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='bridges.php?show=all';\">\n";
-		}
-	}
-
-	echo "				<input type='text' class='txt' style='width: 150px; margin-left: 15px;' name='search' id='search' value='".$search."'>\n";
-	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
-	echo "			</td>\n";
-	echo "		</form>\n";
-	echo "	</tr>\n";
-	echo "	<tr>\n";
-	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$text['title_description-bridge']."<br /><br />\n";
-	echo "		</td>\n";
-	echo "	</tr>\n";
-	echo "</table>\n";
-
-	echo "<form method='post' action=''>\n";
-	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo "	<th style='width:30px;'>\n";
-	echo "		<input type='checkbox' name='checkbox_all' id='checkbox_all' value='' onclick=\"checkbox_toggle();\">\n";
-	echo "	</th>\n";
-	echo th_order_by('bridge_name', $text['label-bridge_name'], $order_by, $order);
-	echo th_order_by('bridge_destination', $text['label-bridge_destination'], $order_by, $order);
-	echo th_order_by('bridge_enabled', $text['label-bridge_enabled'], $order_by, $order);
-	echo "	<td class='list_control_icons'>";
-	if (permission_exists('bridge_add')) {
-		echo "		<a href='bridge_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
-	}
-	else {
-		echo "&nbsp;\n";
-	}
-	echo "	</td>\n";
-	echo "<tr>\n";
-
-	if (is_array($result)) {
-		$x = 0;
-		foreach($result as $row) {
-			if (permission_exists('bridge_edit')) {
-				$tr_link = "href='bridge_edit.php?id=".$row['bridge_uuid']."'";
-			}
-			echo "<tr ".$tr_link.">\n";
-			echo "	<td valign='top' class='".$row_style[$c]." tr_link_void' style='align: center; padding: 3px 3px 0px 8px;'>\n";
-			echo "		<input type='checkbox' name=\"bridges[$x][checked]\" id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('chk_all_".$x."').checked = false; }\">\n";
-			echo "		<input type='hidden' name=\"bridges[$x][bridge_uuid]\" value='".$row['bridge_uuid']."' />\n";
-			echo "	</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['bridge_name'])."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['bridge_destination'])."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['bridge_enabled'])."&nbsp;</td>\n";
-			echo "	<td class='list_control_icons'>";
-			if (permission_exists('bridge_edit')) {
-				echo "<a href='bridge_edit.php?id=".$row['bridge_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
-			}
-			if (permission_exists('bridge_delete')) {
-				echo "<button type='submit' class='btn btn-default list_control_icon' name=\"bridges[$x][action]\" alt='".$text['button-delete']."' value='delete'><span class='glyphicon glyphicon-remove'></span></button>";
-			}
-			echo "	</td>\n";
-			echo "</tr>\n";
-			$x++;
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result, $row_count);
-	} //end if results
-
-	echo "<tr>\n";
-	echo "<td colspan='5' align='left'>\n";
-	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
-	echo "		<td class='list_control_icons'>";
-	if (permission_exists('bridge_add')) {
-		echo 		"<a href='bridge_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
-	}
-	else {
-		echo 		"&nbsp;";
-	}
-	echo "		</td>\n";
-	echo "	</tr>\n";
- 	echo "	</table>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-	echo "</table>";
-	echo "</form>\n";
-	echo "<br /><br />";
-
-//include the footer
-	require_once "resources/footer.php";
-
-?>
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * call_recordings class
- *
- * @method null download
- */
-if (!class_exists('bridges')) {
-	class bridges {
-
-		public $db;
-
-		/**
-		 * Called when the object is created
-		 */
-		public function __construct() {
-			//connect to the database if not connected
-			if (!$this->db) {
-				require_once "resources/classes/database.php";
-				$database = new database;
-				$database->connect();
-				$this->db = $database->db;
-			}
-		}
-
-		/**
-		 * Called when there are no references to a particular object
-		 * unset the variables used in the class
-		 */
-		public function __destruct() {
-			foreach ($this as $key => $value) {
-				unset($this->$key);
-			}
-		}
-
-		/**
-		 * delete bridges
-		 */
-		public function delete($bridges) {
-			if (permission_exists('bridge_delete')) {
-
-				//delete multiple bridges
-					if (is_array($bridges)) {
-						//get the action
-							foreach($bridges as $row) {
-								if ($row['action'] == 'delete') {
-									$action = 'delete';
-									break;
-								}
-							}
-						//delete the checked rows
-							if ($action == 'delete') {
-								foreach($bridges as $row) {
-									if ($row['action'] == 'delete' or $row['checked'] == 'true') {
-										$sql = "delete from v_bridges ";
-										$sql .= "where bridge_uuid = '".$row['bridge_uuid']."'; ";
-										$this->db->query($sql);
-										unset($sql);
-									}
-								}
-								unset($bridges);
-							}
-					}
-			}
-		} //end the delete function
-
-	}  //end the class
-}
-
-/*
-$obj = new bridges;
-$obj->delete();
-*/
-
-?>
@@ -1,90 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-// make sure the PATH_SEPARATOR is defined
-	umask(2);
-	if (!defined("PATH_SEPARATOR")) {
-		if (strpos($_ENV["OS"], "Win") !== false) {
-			define("PATH_SEPARATOR", ";");
-		} else {
-			define("PATH_SEPARATOR", ":");
-		}
-	}
-
-	if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
-
-	// make sure the document_root is set
-	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
-	if(PHP_SAPI == 'cli'){
-		chdir(pathinfo(realpath($_SERVER["PHP_SELF"]), PATHINFO_DIRNAME));
-		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
-		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
-		if (file_exists('/project_root.php')) {
-			$path = '/';
-		} else {
-			$i    = 1;
-			$path = '';
-			while ($i < count($dirs)) {
-				$path .= '/' . $dirs[$i];
-				if (file_exists($path. '/project_root.php')) {
-					break;
-				}
-				$i++;
-			}
-		}
-		$_SERVER["DOCUMENT_ROOT"] = $path;
-	}else{
-		$_SERVER["DOCUMENT_ROOT"]   = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
-	}
-	$_SERVER["DOCUMENT_ROOT"]   = realpath($_SERVER["DOCUMENT_ROOT"]);
-// try to detect if a project path is being used
-	if (!defined('PROJECT_PATH')) {
-		if (is_dir($_SERVER["DOCUMENT_ROOT"]. '/fusionpbx')) {
-			define('PROJECT_PATH', '/fusionpbx');
-		} elseif (file_exists($_SERVER["DOCUMENT_ROOT"]. '/project_root.php')) {
-			define('PROJECT_PATH', '');
-		} else {
-			$dirs = explode('/', str_replace('\\', '/', pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME)));
-			$i    = 1;
-			$path = $_SERVER["DOCUMENT_ROOT"];
-			while ($i < count($dirs)) {
-				$path .= '/' . $dirs[$i];
-				if (file_exists($path. '/project_root.php')) {
-					break;
-				}
-				$i++;
-			}
-			if(!file_exists($path. '/project_root.php')){
-				die("Failed to locate the Project Root by searching for project_root.php please contact support for assistance");
-			}
-			$project_path = str_replace($_SERVER["DOCUMENT_ROOT"], "", $path);
-			define('PROJECT_PATH', $project_path);
-		}
-		$_SERVER["PROJECT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH);
-		set_include_path(get_include_path() . PATH_SEPARATOR . $_SERVER["PROJECT_ROOT"]);
-	}
-
-?>
@@ -5,31 +5,22 @@
 		$apps[$x]['uuid'] = "9ed63276-e085-4897-839c-4f2e36d92d6c";
 		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "A tool to block incoming numbers.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Ein Werkzeug um eingehende Rufnummern zu sperren.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Ein Werkzeug um eingehende Rufnummern zu sperren.";
 		$apps[$x]['description']['es-cl'] = "Una herramineta para bloquear números entrantes";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Outil pour bloquer les numéro d'appelant";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "Uma ferramenta para bloquear números que entram.";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Uma ferramenta para bloquear números indesejados";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "Uma ferramenta para bloquear números que entram.";

 	//permission details
-		$y=0;
+		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "call_block_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "29295c90-b1b9-440b-9c7E-c8363c6e8975";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -46,12 +37,12 @@
 		$apps[$x]['permissions'][$y]['name'] = "call_block_delete";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;

 	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_call_block";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_call_block";
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -71,30 +62,37 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_name";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_caller_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the name.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Insira o nome.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_number";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_caller_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the full phone number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the full phone number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Insira o número de telefone completo.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_count";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_call_count";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number of calls.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Number of calls.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Número de chamadas.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_action";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_call_action";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Action for call.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Action for call.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Ação para a chamada.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "date_added";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Date/Time number was added.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Date/Time number was added.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Data/Hora que o número foi adicionado.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "block_call_enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enable/disable blocking the call.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enable/disable blocking the call.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Habilitar/desabilitar bloqueamento da chamada.";
+		$z++;

 ?>
@@ -1,624 +1,434 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC

 $text['title-call-block']['en-us'] = "Call Block";
-$text['title-call-block']['ar-eg'] = "حظر المكالمات";
-$text['title-call-block']['de-at'] = "Sperrlisten"; //copied from de-de
-$text['title-call-block']['de-ch'] = "Sperrlisten"; //copied from de-de
-$text['title-call-block']['de-de'] = "Sperrlisten";
 $text['title-call-block']['es-cl'] = "Bloqueo de llamadas";
-$text['title-call-block']['es-mx'] = "Bloqueo de llamadas"; //copied from es-cl
-$text['title-call-block']['fr-ca'] = "Liste noire"; //copied from fr-fr
-$text['title-call-block']['fr-fr'] = "Liste noire";
-$text['title-call-block']['he-il'] = "חסימת מספר";
-$text['title-call-block']['it-it'] = "Blocco Chiamate";
-$text['title-call-block']['nl-nl'] = "";
-$text['title-call-block']['pl-pl'] = "Blokowanie rozmów";
-$text['title-call-block']['pt-br'] = "Bloqueio de chamadas";
 $text['title-call-block']['pt-pt'] = "Bloqueio de Chamadas";
-$text['title-call-block']['ro-ro'] = "Blocare apel";
-$text['title-call-block']['ru-ru'] = "Черный список";
+$text['title-call-block']['fr-fr'] = "Liste noire";
+$text['title-call-block']['nl-nl'] = "";
+$text['title-call-block']['pt-br'] = "Bloqueio de chamadas";
+$text['title-call-block']['pl'] = "Blokowanie rozmów";
 $text['title-call-block']['sv-se'] = "Blockera Samtal";
-$text['title-call-block']['uk-ua'] = "Блокування дзвінків";
+$text['title-call-block']['uk'] = "Блокування дзвінків";
+$text['title-call-block']['ro'] = "Blocare apel";
+$text['title-call-block']['de-at'] = "Sperrlisten";
+$text['title-call-block']['ar-eg'] = "حظر المكالمات";
+$text['title-call-block']['he'] = "חסימת מספר";

 $text['prompt-block_recent_name']['en-us'] = "Block Recent Call - Edit the Name, if desired...";
-$text['prompt-block_recent_name']['ar-eg'] = "";
-$text['prompt-block_recent_name']['de-at'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht..."; //copied from de-de
-$text['prompt-block_recent_name']['de-ch'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht..."; //copied from de-de
-$text['prompt-block_recent_name']['de-de'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht...";
 $text['prompt-block_recent_name']['es-cl'] = "Bloqueo de llamadas recientes - Edite el nombre, si lo desea...";
-$text['prompt-block_recent_name']['es-mx'] = "Bloqueo de llamadas recientes - Edite el nombre, si lo desea..."; //copied from es-cl
-$text['prompt-block_recent_name']['fr-ca'] = "Bloquer appels récents - Modifiez le nom, si vous le souhaitez..."; //copied from fr-fr
-$text['prompt-block_recent_name']['fr-fr'] = "Bloquer appels récents - Modifiez le nom, si vous le souhaitez...";
-$text['prompt-block_recent_name']['he-il'] = "";
-$text['prompt-block_recent_name']['it-it'] = "Blocca le chiamate recenti - Inserire il Nome, se desiderato...";
-$text['prompt-block_recent_name']['nl-nl'] = "";
-$text['prompt-block_recent_name']['pl-pl'] = "Zablokuj ostatnią rozmowę. Edytuj nazwę";
-$text['prompt-block_recent_name']['pt-br'] = "Bloquear chamadas recentes, edite o nome se assim desejar...";
 $text['prompt-block_recent_name']['pt-pt'] = "Bloquear Chamadas Recentes - Edite o nome, se desejar...";
-$text['prompt-block_recent_name']['ro-ro'] = "Blocare apel recent - Editați  numele dacă doriți";
-$text['prompt-block_recent_name']['ru-ru'] = "Блокировать недавний вызов. Отредактируйте название, если необходимо...";
-$text['prompt-block_recent_name']['sv-se'] = "Blockera Senaste Samtal, editera namnet om nödvändigt...";
-$text['prompt-block_recent_name']['uk-ua'] = "Блокувати недавній дзвінок. Відредагуйте назву за бажанням";
+$text['prompt-block_recent_name']['fr-fr'] = "Bloquer appels récents - Modifiez le nom, si vous le souhaitez...";
+$text['prompt-block_recent_name']['nl-nl'] = "";
+$text['prompt-block_recent_name']['pt-br'] = "Bloquear chamadas recentes, edite o nome se assim desejar...";
+$text['prompt-block_recent_name']['pl'] = "Zablokuj ostatnią rozmowę. Edytuj nazwę";
+$text['prompt-block_recent_name']['sv-se'] = "Blockera Senaste Samtal, meditera namnet om nödvändigt...";
+$text['prompt-block_recent_name']['uk'] = "Блокувати недавній дзвінок. Відредагуйте назву за бажанням";
+$text['prompt-block_recent_name']['ro'] = "Blocare apel recent - Editați  numele dacă doriți";
+$text['prompt-block_recent_name']['de-at'] = "Kürzliche Anrufe Blockieren - Bearbeiten Sie den Namen, falls gewünscht...";
+$text['prompt-block_recent_name']['ar-eg'] = "";
+$text['prompt-block_recent_name']['he'] = "";

 $text['label-update-complete']['en-us'] = "Update Complete";
-$text['label-update-complete']['ar-eg'] = "اكتمال التحديث";
-$text['label-update-complete']['de-at'] = "Aktualisierung abgeschlossen"; //copied from de-de
-$text['label-update-complete']['de-ch'] = "Aktualisierung abgeschlossen"; //copied from de-de
-$text['label-update-complete']['de-de'] = "Aktualisierung abgeschlossen";
 $text['label-update-complete']['es-cl'] = "Actualización Completa";
-$text['label-update-complete']['es-mx'] = "Actualización Completa"; //copied from es-cl
-$text['label-update-complete']['fr-ca'] = "Mise à jour effectuée"; //copied from fr-fr
-$text['label-update-complete']['fr-fr'] = "Mise à jour effectuée";
-$text['label-update-complete']['he-il'] = "העדכון הושלם";
-$text['label-update-complete']['it-it'] = "Aggiornamento Completato";
-$text['label-update-complete']['nl-nl'] = "";
-$text['label-update-complete']['pl-pl'] = "Zaktualizowano poprawnie";
-$text['label-update-complete']['pt-br'] = "Atualização Completa";
 $text['label-update-complete']['pt-pt'] = "Actualização Efectuada";
-$text['label-update-complete']['ro-ro'] = "Actualizare completă";
-$text['label-update-complete']['ru-ru'] = "Обновление завершено";
+$text['label-update-complete']['fr-fr'] = "Mise à jour effectuée";
+$text['label-update-complete']['nl-nl'] = "";
+$text['label-update-complete']['pt-br'] = "Atualização Completa";
+$text['label-update-complete']['pl'] = "Zaktualizowano poprawnie";
 $text['label-update-complete']['sv-se'] = "Uppdatering Klar";
-$text['label-update-complete']['uk-ua'] = "Оновлено";
+$text['label-update-complete']['uk'] = "Оновлено";
+$text['label-update-complete']['ro'] = "Actualizare completă";
+$text['label-update-complete']['de-at'] = "Aktualisierung abgeschlossen";
+$text['label-update-complete']['ar-eg'] = "اكتمال التحديث";
+$text['label-update-complete']['he'] = "העדכון הושלם";

 $text['label-reject']['en-us'] = "Reject";
-$text['label-reject']['ar-eg'] = "رفض";
-$text['label-reject']['de-at'] = "Zurückweisen"; //copied from de-de
-$text['label-reject']['de-ch'] = "Zurückweisen"; //copied from de-de
-$text['label-reject']['de-de'] = "Zurückweisen";
 $text['label-reject']['es-cl'] = "Rechazar";
-$text['label-reject']['es-mx'] = "Rechazar"; //copied from es-cl
-$text['label-reject']['fr-ca'] = "Rejeter"; //copied from fr-fr
-$text['label-reject']['fr-fr'] = "Rejeter";
-$text['label-reject']['he-il'] = "לדחות";
-$text['label-reject']['it-it'] = "Blocca";
-$text['label-reject']['nl-nl'] = "";
-$text['label-reject']['pl-pl'] = "Odrzuć ";
-$text['label-reject']['pt-br'] = "Rejeitar"; //copied from pt-pt
 $text['label-reject']['pt-pt'] = "Rejeitar";
-$text['label-reject']['ro-ro'] = "";
-$text['label-reject']['ru-ru'] = "Отклонить";
+$text['label-reject']['fr-fr'] = "Rejeter";
+$text['label-reject']['nl-nl'] = "";
+$text['label-reject']['pt-br'] = "Rejeitar";
+$text['label-reject']['pl'] = "Odrzuć ";
 $text['label-reject']['sv-se'] = "Neka";
-$text['label-reject']['uk-ua'] = "Відхилити";
+$text['label-reject']['uk'] = "Відхилити";
+$text['label-reject']['ro'] = "";
+$text['label-reject']['de-at'] = "Zurückweisen";
+$text['label-reject']['ar-eg'] = "رفض";
+$text['label-reject']['he'] = "לדחות";

 $text['label-provide-number']['en-us'] = "Please provide: Number";
-$text['label-provide-number']['ar-eg'] = "من فضلك أدخل: الرقم";
-$text['label-provide-number']['de-at'] = "Bitte geben Sie die Nummer an"; //copied from de-de
-$text['label-provide-number']['de-ch'] = "Bitte geben Sie die Nummer an"; //copied from de-de
-$text['label-provide-number']['de-de'] = "Bitte geben Sie die Nummer an";
 $text['label-provide-number']['es-cl'] = "Por favor agregue: Número";
-$text['label-provide-number']['es-mx'] = "Por favor agregue: Número"; //copied from es-cl
-$text['label-provide-number']['fr-ca'] = "Merci d'indiquer: Numéro"; //copied from fr-fr
-$text['label-provide-number']['fr-fr'] = "Merci d'indiquer: Numéro";
-$text['label-provide-number']['he-il'] = "אנא הכנס מספר";
-$text['label-provide-number']['it-it'] = "Prego fornire: Numero";
-$text['label-provide-number']['nl-nl'] = "";
-$text['label-provide-number']['pl-pl'] = " Wprowadź numer";
-$text['label-provide-number']['pt-br'] = "Por favor indique: Número"; //copied from pt-pt
 $text['label-provide-number']['pt-pt'] = "Por favor indique: Número";
-$text['label-provide-number']['ro-ro'] = "";
-$text['label-provide-number']['ru-ru'] = "Введите номер";
+$text['label-provide-number']['fr-fr'] = "Merci d'indiquer: Numéro";
+$text['label-provide-number']['nl-nl'] = "";
+$text['label-provide-number']['pt-br'] = "Por favor indique: Número";
+$text['label-provide-number']['pl'] = " Wprowadź numer";
 $text['label-provide-number']['sv-se'] = "Ange: Nummer";
-$text['label-provide-number']['uk-ua'] = "Введіть номер";
+$text['label-provide-number']['uk'] = "Введіть номер";
+$text['label-provide-number']['ro'] = "";
+$text['label-provide-number']['de-at'] = "Bitte geben Sie die Nummer an";
+$text['label-provide-number']['ar-eg'] = "من فضلك أدخل: الرقم";
+$text['label-provide-number']['he'] = "אנא הכנס מספר";

 $text['label-provide-name']['en-us'] = "Please provide: Name";
-$text['label-provide-name']['ar-eg'] = "من فضلك أدخل: الأسم";
-$text['label-provide-name']['de-at'] = "Bitte geben Sie den Namen an"; //copied from de-de
-$text['label-provide-name']['de-ch'] = "Bitte geben Sie den Namen an"; //copied from de-de
-$text['label-provide-name']['de-de'] = "Bitte geben Sie den Namen an";
 $text['label-provide-name']['es-cl'] = "Por favor agregue: Nombre";
-$text['label-provide-name']['es-mx'] = "Por favor agregue: Nombre"; //copied from es-cl
-$text['label-provide-name']['fr-ca'] = "Merci d'indiquer: Nom"; //copied from fr-fr
-$text['label-provide-name']['fr-fr'] = "Merci d'indiquer: Nom";
-$text['label-provide-name']['he-il'] = "אנא הכנס שם";
-$text['label-provide-name']['it-it'] = "Prego fornire: Nome";
-$text['label-provide-name']['nl-nl'] = "";
-$text['label-provide-name']['pl-pl'] = " Wprowadź nazwę ";
-$text['label-provide-name']['pt-br'] = "Por favor indique: Nome"; //copied from pt-pt
 $text['label-provide-name']['pt-pt'] = "Por favor indique: Nome";
-$text['label-provide-name']['ro-ro'] = "";
-$text['label-provide-name']['ru-ru'] = "Пожалуйста, введите: Имя";
+$text['label-provide-name']['fr-fr'] = "Merci d'indiquer: Nom";
+$text['label-provide-name']['nl-nl'] = "";
+$text['label-provide-name']['pt-br'] = "Por favor indique: Nome";
+$text['label-provide-name']['pl'] = " Wprowadź nazwę ";
 $text['label-provide-name']['sv-se'] = "Ange: Namn";
-$text['label-provide-name']['uk-ua'] = "Введіть назву";
+$text['label-provide-name']['uk'] = "Введіть назву";
+$text['label-provide-name']['ro'] = "";
+$text['label-provide-name']['de-at'] = "Bitte geben Sie den Namen an";
+$text['label-provide-name']['ar-eg'] = "من فضلك أدخل: الأسم";
+$text['label-provide-name']['he'] = "אנא הכנס שם";

 $text['label-provide-enabled']['en-us'] = "Please provide: Enabled";
-$text['label-provide-enabled']['ar-eg'] = "";
-$text['label-provide-enabled']['de-at'] = "Bitte geben Sie folgendes an: Aktiv"; //copied from de-de
-$text['label-provide-enabled']['de-ch'] = "Bitte geben Sie folgendes an: Aktiv"; //copied from de-de
-$text['label-provide-enabled']['de-de'] = "Bitte geben Sie folgendes an: Aktiv";
 $text['label-provide-enabled']['es-cl'] = "Por favor agregue: Activo";
-$text['label-provide-enabled']['es-mx'] = "Por favor agregue: Activo"; //copied from es-cl
-$text['label-provide-enabled']['fr-ca'] = "Merci d'indiquer: Actif"; //copied from fr-fr
-$text['label-provide-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
-$text['label-provide-enabled']['he-il'] = "";
-$text['label-provide-enabled']['it-it'] = "Prego fornire: Abilitazione";
-$text['label-provide-enabled']['nl-nl'] = "";
-$text['label-provide-enabled']['pl-pl'] = " Wprowadź: Włączony";
-$text['label-provide-enabled']['pt-br'] = "Por favor indique se está habilitado";
 $text['label-provide-enabled']['pt-pt'] = "Por favor indique: Activado";
-$text['label-provide-enabled']['ro-ro'] = "";
-$text['label-provide-enabled']['ru-ru'] = "Пожалуйста, введите: Включить";
+$text['label-provide-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
+$text['label-provide-enabled']['nl-nl'] = "";
+$text['label-provide-enabled']['pt-br'] = "Por favor indique se está habilitado";
+$text['label-provide-enabled']['pl'] = " Wprowadź: Włączony";
 $text['label-provide-enabled']['sv-se'] = "Ange: Aktiverad";
-$text['label-provide-enabled']['uk-ua'] = "Включити/відключити";
+$text['label-provide-enabled']['uk'] = "Включити/відключити";
+$text['label-provide-enabled']['ro'] = "";
+$text['label-provide-enabled']['de-at'] = "Bitte geben Sie folgendes an: Aktiv";
+$text['label-provide-enabled']['ar-eg'] = "";
+$text['label-provide-enabled']['he'] = "";

 $text['label-number']['en-us'] = "Number";
-$text['label-number']['ar-eg'] = "رقم";
-$text['label-number']['de-at'] = "Nummer"; //copied from de-de
-$text['label-number']['de-ch'] = "Nummer"; //copied from de-de
-$text['label-number']['de-de'] = "Nummer";
 $text['label-number']['es-cl'] = "Número";
-$text['label-number']['es-mx'] = "Número"; //copied from es-cl
-$text['label-number']['fr-ca'] = "Numéro"; //copied from fr-fr
-$text['label-number']['fr-fr'] = "Numéro";
-$text['label-number']['he-il'] = "מספר";
-$text['label-number']['it-it'] = "Numero";
-$text['label-number']['nl-nl'] = "";
-$text['label-number']['pl-pl'] = "Numer";
-$text['label-number']['pt-br'] = "Número"; //copied from pt-pt
 $text['label-number']['pt-pt'] = "Número";
-$text['label-number']['ro-ro'] = "Număr";
-$text['label-number']['ru-ru'] = "Номер";
+$text['label-number']['fr-fr'] = "Numéro";
+$text['label-number']['nl-nl'] = "";
+$text['label-number']['pt-br'] = "Número";
+$text['label-number']['pl'] = "Numer";
 $text['label-number']['sv-se'] = "Nummer";
-$text['label-number']['uk-ua'] = "Номер";
+$text['label-number']['uk'] = "Номер";
+$text['label-number']['ro'] = "Număr";
+$text['label-number']['de-at'] = "Nummer";
+$text['label-number']['ar-eg'] = "رقم";
+$text['label-number']['he'] = "מספר";

 $text['label-message']['en-us'] = "Message";
-$text['label-message']['ar-eg'] = "رسالة";
-$text['label-message']['de-at'] = "Nachricht"; //copied from de-de
-$text['label-message']['de-ch'] = "Nachricht"; //copied from de-de
-$text['label-message']['de-de'] = "Nachricht";
 $text['label-message']['es-cl'] = "Mensaje";
-$text['label-message']['es-mx'] = "Mensaje"; //copied from es-cl
-$text['label-message']['fr-ca'] = "Message"; //copied from fr-fr
-$text['label-message']['fr-fr'] = "Message";
-$text['label-message']['he-il'] = "הודעה";
-$text['label-message']['it-it'] = "Messaggio";
-$text['label-message']['nl-nl'] = "";
-$text['label-message']['pl-pl'] = "Wiadomość";
-$text['label-message']['pt-br'] = "Mensagem"; //copied from pt-pt
 $text['label-message']['pt-pt'] = "Mensagem";
-$text['label-message']['ro-ro'] = "Mesaj";
-$text['label-message']['ru-ru'] = "Сообщение";
+$text['label-message']['fr-fr'] = "Message";
+$text['label-message']['nl-nl'] = "";
+$text['label-message']['pt-br'] = "Mensagem";
+$text['label-message']['pl'] = "Wiadomość";
 $text['label-message']['sv-se'] = "Meddelande";
-$text['label-message']['uk-ua'] = "Повідомлення";
+$text['label-message']['uk'] = "Повідомлення";
+$text['label-message']['ro'] = "Mesaj";
+$text['label-message']['de-at'] = "Nachricht";
+$text['label-message']['ar-eg'] = "رسالة";
+$text['label-message']['he'] = "הודעה";

 $text['label-local']['en-us'] = "Local";
-$text['label-local']['ar-eg'] = "محلي";
-$text['label-local']['de-at'] = "Lokal"; //copied from de-de
-$text['label-local']['de-ch'] = "Lokal"; //copied from de-de
-$text['label-local']['de-de'] = "Lokal";
 $text['label-local']['es-cl'] = "Local";
-$text['label-local']['es-mx'] = "Local"; //copied from es-cl
-$text['label-local']['fr-ca'] = "Local"; //copied from fr-fr
-$text['label-local']['fr-fr'] = "Local";
-$text['label-local']['he-il'] = "מקומי";
-$text['label-local']['it-it'] = "Locale";
-$text['label-local']['nl-nl'] = "";
-$text['label-local']['pl-pl'] = "Lokalny";
-$text['label-local']['pt-br'] = "Local"; //copied from pt-pt
 $text['label-local']['pt-pt'] = "Local";
-$text['label-local']['ro-ro'] = "Local";
-$text['label-local']['ru-ru'] = "Локальный";
+$text['label-local']['fr-fr'] = "Local";
+$text['label-local']['nl-nl'] = "";
+$text['label-local']['pt-br'] = "Local";
+$text['label-local']['pl'] = "Lokalny";
 $text['label-local']['sv-se'] = "Lokal";
-$text['label-local']['uk-ua'] = "Місцевий";
+$text['label-local']['uk'] = "Місцевий";
+$text['label-local']['ro'] = "Local";
+$text['label-local']['de-at'] = "Lokal";
+$text['label-local']['ar-eg'] = "محلي";
+$text['label-local']['he'] = "מקומי";

 $text['label-inbound']['en-us'] = "Inbound";
-$text['label-inbound']['ar-eg'] = "";
-$text['label-inbound']['de-at'] = "Eingehend"; //copied from de-de
-$text['label-inbound']['de-ch'] = "Eingehend"; //copied from de-de
-$text['label-inbound']['de-de'] = "Eingehend";
 $text['label-inbound']['es-cl'] = "Entrada";
-$text['label-inbound']['es-mx'] = "Entrada"; //copied from es-cl
-$text['label-inbound']['fr-ca'] = "Entrant"; //copied from fr-fr
-$text['label-inbound']['fr-fr'] = "Entrant";
-$text['label-inbound']['he-il'] = "";
-$text['label-inbound']['it-it'] = "In ingresso";
-$text['label-inbound']['nl-nl'] = "";
-$text['label-inbound']['pl-pl'] = "Przychodzący";
-$text['label-inbound']['pt-br'] = "Entrada"; //copied from pt-pt
 $text['label-inbound']['pt-pt'] = "Entrada";
-$text['label-inbound']['ro-ro'] = "";
-$text['label-inbound']['ru-ru'] = "Входящий";
+$text['label-inbound']['fr-fr'] = "Entrant";
+$text['label-inbound']['nl-nl'] = "";
+$text['label-inbound']['pt-br'] = "Entrada";
+$text['label-inbound']['pl'] = "Przychodzący";
 $text['label-inbound']['sv-se'] = "Inkommande";
-$text['label-inbound']['uk-ua'] = "Вихідний";
+$text['label-inbound']['uk'] = "Вихідний";
+$text['label-inbound']['ro'] = "";
+$text['label-inbound']['de-at'] = "Eingehend";
+$text['label-inbound']['ar-eg'] = "";
+$text['label-inbound']['he'] = "";

 $text['label-edit-note']['en-us'] = "Block calls from a number. Edit the name and enable/disable below.";
-$text['label-edit-note']['ar-eg'] = "";
-$text['label-edit-note']['de-at'] = "Anrufe von einer Rufnummer sperren. Bearbeiten Sie den Namen und aktivieren/deaktivieren Sie diesen unten."; //copied from de-de
-$text['label-edit-note']['de-ch'] = "Anrufe von einer Rufnummer sperren. Bearbeiten Sie den Namen und aktivieren/deaktivieren Sie diesen unten."; //copied from de-de
-$text['label-edit-note']['de-de'] = "Anrufe von einer Rufnummer sperren. Bearbeiten Sie den Namen und aktivieren/deaktivieren Sie diesen unten.";
 $text['label-edit-note']['es-cl'] = "Bloquea llamadas desde un número. Edite el nombre y active/desactive abajo.";
-$text['label-edit-note']['es-mx'] = "Bloquea llamadas desde un número. Edite el nombre y active/desactive abajo."; //copied from es-cl
-$text['label-edit-note']['fr-ca'] = "Bloquer les appels à partir d'un numéro. Editer le nom et activer/désactiver ci-dessous."; //copied from fr-fr
-$text['label-edit-note']['fr-fr'] = "Bloquer les appels à partir d'un numéro. Editer le nom et activer/désactiver ci-dessous.";
-$text['label-edit-note']['he-il'] = "";
-$text['label-edit-note']['it-it'] = "Blocca le chiamate da un numero. Inserire il nome e abilitare/disabilitare qui sotto.";
-$text['label-edit-note']['nl-nl'] = "";
-$text['label-edit-note']['pl-pl'] = "Blokowanie połączeń z danego numeru. Edytuj nazwę i włącz/wyłącz poniżej.";
-$text['label-edit-note']['pt-br'] = "Bloquear chamadas a partir de um número. Edite o nome e ative ou desative";
 $text['label-edit-note']['pt-pt'] = "Bloquear chamadas a partir de um número. Edite o nome e active/desactive.";
-$text['label-edit-note']['ro-ro'] = "Blocați apelurile de la un număr. Editați numele și activați/dezactivați mai jos.";
-$text['label-edit-note']['ru-ru'] = "Блокировать вызовы от номера. Отредактируйте имя и включено/выключено ниже.";
+$text['label-edit-note']['fr-fr'] = "Bloquer les appels à partir d'un numéro. Editer le nom et activer/désactiver ci-dessous.";
+$text['label-edit-note']['nl-nl'] = "";
+$text['label-edit-note']['pt-br'] = "Bloquear chamadas a partir de um número. Edite o nome e ative ou desative";
+$text['label-edit-note']['pl'] = "Blokowanie połączeń z danego numeru. Edytuj nazwę i włącz/wyłącz poniżej.";
 $text['label-edit-note']['sv-se'] = "Blockera samtal från nummer. Editera namn och Aktiv/Inaktiv nedan.";
-$text['label-edit-note']['uk-ua'] = "Блокувати дзвінки з номера. Змініть ім'я і включіть/відключіть нижче.";
+$text['label-edit-note']['uk'] = "Блокувати дзвінки з номера. Змініть ім'я і включіть/відключіть нижче.";
+$text['label-edit-note']['ro'] = "Blocați apelurile de la un număr. Editați numele și activați/dezactivați mai jos.";
+$text['label-edit-note']['de-at'] = "Anrufe von Nummer Blockieren. Bearbeiten Sie den Namen und aktivieren/deaktivieren Sie unten.";
+$text['label-edit-note']['ar-eg'] = "";
+$text['label-edit-note']['he'] = "";

 $text['label-edit-edit']['en-us'] = "Call Block";
-$text['label-edit-edit']['ar-eg'] = "";
-$text['label-edit-edit']['de-at'] = "Sperrlisten"; //copied from de-de
-$text['label-edit-edit']['de-ch'] = "Sperrlisten"; //copied from de-de
-$text['label-edit-edit']['de-de'] = "Sperrlisten";
 $text['label-edit-edit']['es-cl'] = "Bloqueo de llamada";
-$text['label-edit-edit']['es-mx'] = "Bloqueo de llamada"; //copied from es-cl
-$text['label-edit-edit']['fr-ca'] = "Liste noire"; //copied from fr-fr
-$text['label-edit-edit']['fr-fr'] = "Liste noire";
-$text['label-edit-edit']['he-il'] = "חסימת שיחה";
-$text['label-edit-edit']['it-it'] = "Blocco Chiamate";
-$text['label-edit-edit']['nl-nl'] = "";
-$text['label-edit-edit']['pl-pl'] = "Blokowanie rozmów";
-$text['label-edit-edit']['pt-br'] = "Bloqueio de chamadas";
 $text['label-edit-edit']['pt-pt'] = "Bloqueio de Chamadas";
-$text['label-edit-edit']['ro-ro'] = "Blocare apel";
-$text['label-edit-edit']['ru-ru'] = "Черный список";
+$text['label-edit-edit']['fr-fr'] = "Liste noire";
+$text['label-edit-edit']['nl-nl'] = "";
+$text['label-edit-edit']['pt-br'] = "Bloqueio de chamadas";
+$text['label-edit-edit']['pl'] = "Blokowanie rozmów";
 $text['label-edit-edit']['sv-se'] = "Blockera Samtal";
-$text['label-edit-edit']['uk-ua'] = "Блокування дзвінків";
+$text['label-edit-edit']['uk'] = "Блокування дзвінків";
+$text['label-edit-edit']['ro'] = "Blocare apel";
+$text['label-edit-edit']['de-at'] = "Sperrlisten";
+$text['label-edit-edit']['ar-eg'] = "";
+$text['label-edit-edit']['he'] = "חסימת שיחה";

 $text['label-edit-add-recent']['en-us'] = "Recent Calls";
-$text['label-edit-add-recent']['ar-eg'] = "";
-$text['label-edit-add-recent']['de-at'] = "Kürzliche Anrufe"; //copied from de-de
-$text['label-edit-add-recent']['de-ch'] = "Kürzliche Anrufe"; //copied from de-de
-$text['label-edit-add-recent']['de-de'] = "Kürzliche Anrufe";
 $text['label-edit-add-recent']['es-cl'] = "Llamadas Recientes";
-$text['label-edit-add-recent']['es-mx'] = "Llamadas Recientes"; //copied from es-cl
-$text['label-edit-add-recent']['fr-ca'] = "Appels Récents"; //copied from fr-fr
-$text['label-edit-add-recent']['fr-fr'] = "Appels Récents";
-$text['label-edit-add-recent']['he-il'] = "שיחות אחרונות";
-$text['label-edit-add-recent']['it-it'] = "Chiamate Recenti";
-$text['label-edit-add-recent']['nl-nl'] = "";
-$text['label-edit-add-recent']['pl-pl'] = "Ostatnie rozmowy";
-$text['label-edit-add-recent']['pt-br'] = "Chamadas recentes";
 $text['label-edit-add-recent']['pt-pt'] = "Chamadas Recentes";
-$text['label-edit-add-recent']['ro-ro'] = "Apeluri recente";
-$text['label-edit-add-recent']['ru-ru'] = "Недавние вызовы";
+$text['label-edit-add-recent']['fr-fr'] = "Appels Récents";
+$text['label-edit-add-recent']['nl-nl'] = "";
+$text['label-edit-add-recent']['pt-br'] = "Chamadas recentes";
+$text['label-edit-add-recent']['pl'] = "Ostatnie rozmowy";
 $text['label-edit-add-recent']['sv-se'] = "Senaste Samtal";
-$text['label-edit-add-recent']['uk-ua'] = "Останні дзвінки";
+$text['label-edit-add-recent']['uk'] = "Останні дзвінки";
+$text['label-edit-add-recent']['ro'] = "Apeluri recente";
+$text['label-edit-add-recent']['de-at'] = "Kürzliche Anrufe";
+$text['label-edit-add-recent']['ar-eg'] = "";
+$text['label-edit-add-recent']['he'] = "שיחות אחרונות";

 $text['label-edit-add']['en-us'] = "Call Block";
-$text['label-edit-add']['ar-eg'] = "حظر المكالمات";
-$text['label-edit-add']['de-at'] = "Sperrlisten"; //copied from de-de
-$text['label-edit-add']['de-ch'] = "Sperrlisten"; //copied from de-de
-$text['label-edit-add']['de-de'] = "Sperrlisten";
 $text['label-edit-add']['es-cl'] = "Agregar bloqueo de llamada";
-$text['label-edit-add']['es-mx'] = "Agregar bloqueo de llamada"; //copied from es-cl
-$text['label-edit-add']['fr-ca'] = "Ajouter bloquage d'appel"; //copied from fr-fr
-$text['label-edit-add']['fr-fr'] = "Ajouter bloquage d'appel";
-$text['label-edit-add']['he-il'] = "חסימת שיחה";
-$text['label-edit-add']['it-it'] = "Blocco Chiamate";
-$text['label-edit-add']['nl-nl'] = "";
-$text['label-edit-add']['pl-pl'] = "Blokowaie rozmów";
-$text['label-edit-add']['pt-br'] = "Adicionar bloqueio de chamadas";
 $text['label-edit-add']['pt-pt'] = "Adicionar Bloqueio de Chamadas";
-$text['label-edit-add']['ro-ro'] = "Blocare apel";
-$text['label-edit-add']['ru-ru'] = "Черный список";
+$text['label-edit-add']['fr-fr'] = "Ajouter bloquage d'appel";
+$text['label-edit-add']['nl-nl'] = "";
+$text['label-edit-add']['pt-br'] = "Adicionar bloqueio de chamadas";
+$text['label-edit-add']['pl'] = "Blokowaie rozmów";
 $text['label-edit-add']['sv-se'] = "Blockera Samtal";
-$text['label-edit-add']['uk-ua'] = "Блокування дзвінків";
+$text['label-edit-add']['uk'] = "Блокування дзвінків";
+$text['label-edit-add']['ro'] = "Blocare apel";
+$text['label-edit-add']['de-at'] = "Sperrlisten";
+$text['label-edit-add']['ar-eg'] = "حظر المكالمات";
+$text['label-edit-add']['he'] = "חסימת שיחה";

 $text['label-duration']['en-us'] = "Duration";
-$text['label-duration']['ar-eg'] = "المدة";
-$text['label-duration']['de-at'] = "Dauer"; //copied from de-de
-$text['label-duration']['de-ch'] = "Dauer"; //copied from de-de
-$text['label-duration']['de-de'] = "Dauer";
 $text['label-duration']['es-cl'] = "Duración";
-$text['label-duration']['es-mx'] = "Duración"; //copied from es-cl
-$text['label-duration']['fr-ca'] = "Durée"; //copied from fr-fr
-$text['label-duration']['fr-fr'] = "Durée";
-$text['label-duration']['he-il'] = "משך השיחה";
-$text['label-duration']['it-it'] = "Durata";
-$text['label-duration']['nl-nl'] = "";
-$text['label-duration']['pl-pl'] = "Czas trwania";
-$text['label-duration']['pt-br'] = "Duração"; //copied from pt-pt
 $text['label-duration']['pt-pt'] = "Duração";
-$text['label-duration']['ro-ro'] = "Durată";
-$text['label-duration']['ru-ru'] = "Длительность";
+$text['label-duration']['fr-fr'] = "Durée";
+$text['label-duration']['nl-nl'] = "";
+$text['label-duration']['pt-br'] = "Duração";
+$text['label-duration']['pl'] = "Czas trwania";
 $text['label-duration']['sv-se'] = "Samtalstid";
-$text['label-duration']['uk-ua'] = "Тривалість";
+$text['label-duration']['uk'] = "Тривалість";
+$text['label-duration']['ro'] = "Durată";
+$text['label-duration']['de-at'] = "Dauer";
+$text['label-duration']['ar-eg'] = "المدة";
+$text['label-duration']['he'] = "משך השיחה";

 $text['label-delete-complete']['en-us'] = "Delete Complete";
-$text['label-delete-complete']['ar-eg'] = "اكتمال المسح";
-$text['label-delete-complete']['de-at'] = "Erfolgreich gelöscht"; //copied from de-de
-$text['label-delete-complete']['de-ch'] = "Erfolgreich gelöscht"; //copied from de-de
-$text['label-delete-complete']['de-de'] = "Erfolgreich gelöscht";
 $text['label-delete-complete']['es-cl'] = "Eliminar Completo";
-$text['label-delete-complete']['es-mx'] = "Eliminar Completo"; //copied from es-cl
-$text['label-delete-complete']['fr-ca'] = "Supprimé"; //copied from fr-fr
-$text['label-delete-complete']['fr-fr'] = "Supprimé";
-$text['label-delete-complete']['he-il'] = "המחיקה הושלמה";
-$text['label-delete-complete']['it-it'] = "Cancellazione Completata";
-$text['label-delete-complete']['nl-nl'] = "";
-$text['label-delete-complete']['pl-pl'] = "Usunięto poprawnie";
-$text['label-delete-complete']['pt-br'] = "Remoção efetuada";
 $text['label-delete-complete']['pt-pt'] = "Remoção Efectuada";
-$text['label-delete-complete']['ro-ro'] = "Ștergere completă";
-$text['label-delete-complete']['ru-ru'] = "Удаление завершено";
+$text['label-delete-complete']['fr-fr'] = "Supprimé";
+$text['label-delete-complete']['nl-nl'] = "";
+$text['label-delete-complete']['pt-br'] = "Remoção efetuada";
+$text['label-delete-complete']['pl'] = "Usunięto poprawnie";
 $text['label-delete-complete']['sv-se'] = "Borttagning Klar";
-$text['label-delete-complete']['uk-ua'] = "Видалено";
+$text['label-delete-complete']['uk'] = "Видалено";
+$text['label-delete-complete']['ro'] = "Ștergere completă";
+$text['label-delete-complete']['de-at'] = "Erfolgreich gelöscht";
+$text['label-delete-complete']['ar-eg'] = "اكتمال المسح";
+$text['label-delete-complete']['he'] = "המחיקה הושלמה";

 $text['label-date-added']['en-us'] = "Date Added";
-$text['label-date-added']['ar-eg'] = "تم اضافة التاريخ";
-$text['label-date-added']['de-at'] = "Datum hinzugefügt"; //copied from de-de
-$text['label-date-added']['de-ch'] = "Datum hinzugefügt"; //copied from de-de
-$text['label-date-added']['de-de'] = "Datum hinzugefügt";
 $text['label-date-added']['es-cl'] = "Fecha de ingreso";
-$text['label-date-added']['es-mx'] = "Fecha de ingreso"; //copied from es-cl
-$text['label-date-added']['fr-ca'] = "Date d'ajout"; //copied from fr-fr
-$text['label-date-added']['fr-fr'] = "Date d'ajout";
-$text['label-date-added']['he-il'] = "התאריך נוסף";
-$text['label-date-added']['it-it'] = "Data Aggiunta";
-$text['label-date-added']['nl-nl'] = "";
-$text['label-date-added']['pl-pl'] = "Dodano datę";
-$text['label-date-added']['pt-br'] = "Data adicionada"; //copied from pt-pt
 $text['label-date-added']['pt-pt'] = "Data adicionada";
-$text['label-date-added']['ro-ro'] = "Data adăugării";
-$text['label-date-added']['ru-ru'] = "Дата добавления";
+$text['label-date-added']['fr-fr'] = "Date d'ajout";
+$text['label-date-added']['nl-nl'] = "";
+$text['label-date-added']['pt-br'] = "Data adicionada";
+$text['label-date-added']['pl'] = "Dodano datę";
 $text['label-date-added']['sv-se'] = "Datum Tillagt";
-$text['label-date-added']['uk-ua'] = "Додано";
+$text['label-date-added']['uk'] = "Додано";
+$text['label-date-added']['ro'] = "Data adăugării";
+$text['label-date-added']['de-at'] = "Datum hinzugefügt";
+$text['label-date-added']['ar-eg'] = "تم اضافة التاريخ";
+$text['label-date-added']['he'] = "התאריך נוסף";

 $text['label-count']['en-us'] = "Count";
-$text['label-count']['ar-eg'] = "";
-$text['label-count']['de-at'] = "Zähler"; //copied from de-de
-$text['label-count']['de-ch'] = "Zähler"; //copied from de-de
-$text['label-count']['de-de'] = "Zähler";
 $text['label-count']['es-cl'] = "Conteo";
-$text['label-count']['es-mx'] = "Conteo"; //copied from es-cl
-$text['label-count']['fr-ca'] = "Nombre d'appels"; //copied from fr-fr
-$text['label-count']['fr-fr'] = "Nombre d'appels";
-$text['label-count']['he-il'] = "";
-$text['label-count']['it-it'] = "Conteggio";
-$text['label-count']['nl-nl'] = "";
-$text['label-count']['pl-pl'] = "Wyliczenie";
-$text['label-count']['pt-br'] = "Contagem"; //copied from pt-pt
 $text['label-count']['pt-pt'] = "Contagem";
-$text['label-count']['ro-ro'] = "";
-$text['label-count']['ru-ru'] = "Количество";
+$text['label-count']['fr-fr'] = "Nombre d'appels";
+$text['label-count']['nl-nl'] = "";
+$text['label-count']['pt-br'] = "Contagem";
+$text['label-count']['pl'] = "Wyliczenie";
 $text['label-count']['sv-se'] = "Räkna";
-$text['label-count']['uk-ua'] = "Кількість";
+$text['label-count']['uk'] = "Кількість";
+$text['label-count']['ro'] = "";
+$text['label-count']['de-at'] = "Zähler";
+$text['label-count']['ar-eg'] = "";
+$text['label-count']['he'] = "";

 $text['label-called-on']['en-us'] = "Called on";
-$text['label-called-on']['ar-eg'] = "تم الأتصال علي";
-$text['label-called-on']['de-at'] = "Anruf am"; //copied from de-de
-$text['label-called-on']['de-ch'] = "Anruf am"; //copied from de-de
-$text['label-called-on']['de-de'] = "Anruf am";
 $text['label-called-on']['es-cl'] = "Llamó en";
-$text['label-called-on']['es-mx'] = "Llamó en"; //copied from es-cl
-$text['label-called-on']['fr-ca'] = "Appelé sur"; //copied from fr-fr
-$text['label-called-on']['fr-fr'] = "Appelé sur";
-$text['label-called-on']['he-il'] = "";
-$text['label-called-on']['it-it'] = "Chiamato il";
-$text['label-called-on']['nl-nl'] = "";
-$text['label-called-on']['pl-pl'] = "Zadzwoniono na";
-$text['label-called-on']['pt-br'] = "Chamada em ";
 $text['label-called-on']['pt-pt'] = "Chamado em";
-$text['label-called-on']['ro-ro'] = "Sunat pe";
-$text['label-called-on']['ru-ru'] = "Направление";
+$text['label-called-on']['fr-fr'] = "Appelé sur";
+$text['label-called-on']['nl-nl'] = "";
+$text['label-called-on']['pt-br'] = "Chamada em ";
+$text['label-called-on']['pl'] = "Zadzwoniono na";
 $text['label-called-on']['sv-se'] = "Ringdes på";
-$text['label-called-on']['uk-ua'] = "Дзвінок здійснено";
+$text['label-called-on']['uk'] = "Дзвінок здійснено";
+$text['label-called-on']['ro'] = "Sunat pe";
+$text['label-called-on']['de-at'] = "Anruf am";
+$text['label-called-on']['ar-eg'] = "تم الأتصال علي";
+$text['label-called-on']['he'] = "";

 $text['label-busy']['en-us'] = "Busy";
-$text['label-busy']['ar-eg'] = "مشغول";
-$text['label-busy']['de-at'] = "Besetzt"; //copied from de-de
-$text['label-busy']['de-ch'] = "Besetzt"; //copied from de-de
-$text['label-busy']['de-de'] = "Besetzt";
 $text['label-busy']['es-cl'] = "Ocupado";
-$text['label-busy']['es-mx'] = "Ocupado"; //copied from es-cl
-$text['label-busy']['fr-ca'] = "Occupé"; //copied from fr-fr
-$text['label-busy']['fr-fr'] = "Occupé";
-$text['label-busy']['he-il'] = "תפוס";
-$text['label-busy']['it-it'] = "Occupato";
-$text['label-busy']['nl-nl'] = "";
-$text['label-busy']['pl-pl'] = "Zajęty";
-$text['label-busy']['pt-br'] = "Ocupado"; //copied from pt-pt
 $text['label-busy']['pt-pt'] = "Ocupado";
-$text['label-busy']['ro-ro'] = "Ocupat";
-$text['label-busy']['ru-ru'] = "Занято";
+$text['label-busy']['fr-fr'] = "Occupé";
+$text['label-busy']['nl-nl'] = "";
+$text['label-busy']['pt-br'] = "Ocupado";
+$text['label-busy']['pl'] = "Zajęty";
 $text['label-busy']['sv-se'] = "Upptagen";
-$text['label-busy']['uk-ua'] = "Зайнято";
+$text['label-busy']['uk'] = "Зайнято";
+$text['label-busy']['ro'] = "Ocupat";
+$text['label-busy']['de-at'] = "Besetzt";
+$text['label-busy']['ar-eg'] = "مشغول";
+$text['label-busy']['he'] = "תפוס";

 $text['label-hold']['en-us'] = "Hold";
-$text['label-hold']['ar-eg'] = "";
-$text['label-hold']['de-at'] = "Halten"; //copied from de-de
-$text['label-hold']['de-ch'] = "Halten"; //copied from de-de
-$text['label-hold']['de-de'] = "Halten";
 $text['label-hold']['es-cl'] = "";
-$text['label-hold']['es-mx'] = "";
-$text['label-hold']['fr-ca'] = "";
+$text['label-hold']['pt-pt'] = "";
 $text['label-hold']['fr-fr'] = "";
-$text['label-hold']['he-il'] = "";
-$text['label-hold']['it-it'] = "In attesa";
 $text['label-hold']['nl-nl'] = "";
-$text['label-hold']['pl-pl'] = "";
-$text['label-hold']['pt-br'] = "Espera"; //copied from pt-pt
-$text['label-hold']['pt-pt'] = "Espera";
-$text['label-hold']['ro-ro'] = "";
-$text['label-hold']['ru-ru'] = "Удержание";
-$text['label-hold']['sv-se'] = "Vänt";
-$text['label-hold']['uk-ua'] = "";
+$text['label-hold']['pt-br'] = "Espera";
+$text['label-hold']['pl'] = "";
+$text['label-hold']['sv-se'] = "";
+$text['label-hold']['uk'] = "";
+$text['label-hold']['ro'] = "";
+$text['label-hold']['de-at'] = "";
+$text['label-hold']['ar-eg'] = "";
+$text['label-hold']['he'] = "";

 $text['label-voicemail']['en-us'] = "Voicemail";
-$text['label-voicemail']['ar-eg'] = "";
-$text['label-voicemail']['de-at'] = "Mailbox"; //copied from de-de
-$text['label-voicemail']['de-ch'] = "Mailbox"; //copied from de-de
-$text['label-voicemail']['de-de'] = "Mailbox";
 $text['label-voicemail']['es-cl'] = "Correo de Voz";
-$text['label-voicemail']['es-mx'] = "Correo de Voz"; //copied from es-cl
-$text['label-voicemail']['fr-ca'] = "Messagerie Vocale"; //copied from fr-fr
-$text['label-voicemail']['fr-fr'] = "Messagerie Vocale";
-$text['label-voicemail']['he-il'] = "תא קולי";
-$text['label-voicemail']['it-it'] = "Voicemail";
-$text['label-voicemail']['nl-nl'] = "";
-$text['label-voicemail']['pl-pl'] = "Poczta głosowa";
-$text['label-voicemail']['pt-br'] = "Correio de voz";
 $text['label-voicemail']['pt-pt'] = "Correio de Voz";
-$text['label-voicemail']['ro-ro'] = "";
-$text['label-voicemail']['ru-ru'] = "Голосовая почта";
+$text['label-voicemail']['fr-fr'] = "Messagerie Vocale";
+$text['label-voicemail']['pt-br'] = "Correio de voz";
+$text['label-voicemail']['pl'] = "Poczta głosowa";
 $text['label-voicemail']['sv-se'] = "Röstbrevlåda";
-$text['label-voicemail']['uk-ua'] = "Голосова пошта";
+$text['label-voicemail']['uk'] = "Голосова пошта";
+$text['label-voicemail']['de-at'] = "Mailbox";
+$text['label-voicemail']['he'] = "תא קולי";

 $text['label-add-note']['en-us'] = "Block calls from a number. Either select a number from the list above or enter the number, name and enable below.";
-$text['label-add-note']['ar-eg'] = "";
-$text['label-add-note']['de-at'] = "Anrufe einer Rufnummer sperren. Wählen Sie eine Nummer von der Liste oder geben Sie eine Nummer und einen Name ein. Aktivieren Sie die Sperrliste unten."; //copied from de-de
-$text['label-add-note']['de-ch'] = "Anrufe einer Rufnummer sperren. Wählen Sie eine Nummer von der Liste oder geben Sie eine Nummer und einen Name ein. Aktivieren Sie die Sperrliste unten."; //copied from de-de
-$text['label-add-note']['de-de'] = "Anrufe einer Rufnummer sperren. Wählen Sie eine Nummer von der Liste oder geben Sie eine Nummer und einen Name ein. Aktivieren Sie die Sperrliste unten.";
 $text['label-add-note']['es-cl'] = "Bloquea llamadas desde un número. Puede elegir un número de la lista de arriba o ingresar el n&uacute, nombre y activarlo abajo.";
-$text['label-add-note']['es-mx'] = "Bloquea llamadas desde un número. Puede elegir un número de la lista de arriba o ingresar el n&uacute, nombre y activarlo abajo."; //copied from es-cl
-$text['label-add-note']['fr-ca'] = "Bloquer les appels à partir d'un numéro. Choisissez un numéro dans liste ou entrez un numéro, nom et activer le."; //copied from fr-fr
-$text['label-add-note']['fr-fr'] = "Bloquer les appels à partir d'un numéro. Choisissez un numéro dans liste ou entrez un numéro, nom et activer le.";
-$text['label-add-note']['he-il'] = "";
-$text['label-add-note']['it-it'] = "Blocca le chiamate da un numero. Seleziona un numero dalla lista sovrastante o inserisci il numero, il nome e l'abilitazione qui sotto.";
-$text['label-add-note']['nl-nl'] = "";
-$text['label-add-note']['pl-pl'] = "Blokowanie połączeń z danego numeru. Wybierz numer z powyższej listy j lub wpisz numer, nazwę i załącz poniżej.";
-$text['label-add-note']['pt-br'] = "Bloquear chamadas a partir de um número. Selecione um número a partir da lista indicada ou insira um número e um nome em seguida ative";
 $text['label-add-note']['pt-pt'] = "Bloquear chamadas a partir de um número. Seleccione um número a partir da lista indicada ou introduza um número, nome e active.";
-$text['label-add-note']['ro-ro'] = "";
-$text['label-add-note']['ru-ru'] = "Блокировка вызовов от номера. Выберите номер из списка выше либо введите его самостоятельно, имя и включите ниже.";
+$text['label-add-note']['fr-fr'] = "Bloquer les appels à partir d'un numéro. Choisissez un numéro dans liste ou entrez un numéro, nom et activer le.";
+$text['label-add-note']['nl-nl'] = "";
+$text['label-add-note']['pt-br'] = "Bloquear chamadas a partir de um número. Selecione um número a partir da lista indicada ou insira um número e um nome em seguida ative";
+$text['label-add-note']['pl'] = "Blokowanie połączeń z danego numeru. Wybierz numer z powyższej listy j lub wpisz numer, nazwę i załącz poniżej.";
 $text['label-add-note']['sv-se'] = "Blockera samtal från ett nummer. Välj antingen ett nummer från listan ovan eller fyll i nummer, namn och aktivera nedan.";
-$text['label-add-note']['uk-ua'] = "Блокувати дзвінки з номера. Або вибрати номер зі списку вище або введіть номер, ім'я і включити нижче.";
+$text['label-add-note']['uk'] = "Блокувати дзвінки з номера. Або вибрати номер зі списку вище або введіть номер, ім'я і включити нижче.";
+$text['label-add-note']['ro'] = "";
+$text['label-add-note']['de-at'] = "Blockiert Anrufe von einer Nummer. Wählen Sie eine Nummer von der Liste oder geben Sie eine Nummer und einen Name ein. Aktivieren Sie die Sperrliste unten.";
+$text['label-add-note']['ar-eg'] = "";
+$text['label-add-note']['he'] = "";

 $text['label-add-complete']['en-us'] = "Add Complete";
-$text['label-add-complete']['ar-eg'] = "تمت الأضافة";
-$text['label-add-complete']['de-at'] = "Erfolgreich hinzugefügt"; //copied from de-de
-$text['label-add-complete']['de-ch'] = "Erfolgreich hinzugefügt"; //copied from de-de
-$text['label-add-complete']['de-de'] = "Erfolgreich hinzugefügt";
 $text['label-add-complete']['es-cl'] = "Agregar Completo";
-$text['label-add-complete']['es-mx'] = "Agregar Completo"; //copied from es-cl
-$text['label-add-complete']['fr-ca'] = "Ajouté"; //copied from fr-fr
-$text['label-add-complete']['fr-fr'] = "Ajouté";
-$text['label-add-complete']['he-il'] = "הוספה הושלמה";
-$text['label-add-complete']['it-it'] = "Inserimento Completato";
-$text['label-add-complete']['nl-nl'] = "";
-$text['label-add-complete']['pl-pl'] = "Dodano poprawnie";
-$text['label-add-complete']['pt-br'] = "Criação efetuada ";
 $text['label-add-complete']['pt-pt'] = "Adição Efectuada";
-$text['label-add-complete']['ro-ro'] = "Adăugare completă";
-$text['label-add-complete']['ru-ru'] = "Добавление завершено";
+$text['label-add-complete']['fr-fr'] = "Ajouté";
+$text['label-add-complete']['nl-nl'] = "";
+$text['label-add-complete']['pt-br'] = "Criação efetuada ";
+$text['label-add-complete']['pl'] = "Dodano poprawnie";
 $text['label-add-complete']['sv-se'] = "Tillagd";
-$text['label-add-complete']['uk-ua'] = "Додано";
+$text['label-add-complete']['uk'] = "Додано";
+$text['label-add-complete']['ro'] = "Adăugare completă";
+$text['label-add-complete']['de-at'] = "Erfolgreich hinzugefügt";
+$text['label-add-complete']['ar-eg'] = "تمت الأضافة";
+$text['label-add-complete']['he'] = "הוספה הושלמה";

 $text['label-action']['en-us'] = "Action";
-$text['label-action']['ar-eg'] = "";
-$text['label-action']['de-at'] = "Aktion"; //copied from de-de
-$text['label-action']['de-ch'] = "Aktion"; //copied from de-de
-$text['label-action']['de-de'] = "Aktion";
 $text['label-action']['es-cl'] = "Acción";
-$text['label-action']['es-mx'] = "Acción"; //copied from es-cl
-$text['label-action']['fr-ca'] = "Action"; //copied from fr-fr
-$text['label-action']['fr-fr'] = "Action";
-$text['label-action']['he-il'] = "פעולה";
-$text['label-action']['it-it'] = "Azione";
-$text['label-action']['nl-nl'] = "";
-$text['label-action']['pl-pl'] = "Operacja";
-$text['label-action']['pt-br'] = "Ação";
 $text['label-action']['pt-pt'] = "Acção";
-$text['label-action']['ro-ro'] = "Acțiune";
-$text['label-action']['ru-ru'] = "Действие";
+$text['label-action']['fr-fr'] = "Action";
+$text['label-action']['nl-nl'] = "";
+$text['label-action']['pt-br'] = "Ação";
+$text['label-action']['pl'] = "Operacja";
 $text['label-action']['sv-se'] = "Åtgärd";
-$text['label-action']['uk-ua'] = "Дія";
+$text['label-action']['uk'] = "Дія";
+$text['label-action']['ro'] = "Acțiune";
+$text['label-action']['de-at'] = "Aktion";
+$text['label-action']['ar-eg'] = "";
+$text['label-action']['he'] = "פעולה";

 $text['description-number']['en-us'] = "Enter the exact number.";
-$text['description-number']['ar-eg'] = "";
-$text['description-number']['de-at'] = "Geben Sie die genaue Nummer an."; //copied from de-de
-$text['description-number']['de-ch'] = "Geben Sie die genaue Nummer an."; //copied from de-de
-$text['description-number']['de-de'] = "Geben Sie die genaue Nummer an.";
 $text['description-number']['es-cl'] = "Ingrese el nú exacto.";
-$text['description-number']['es-mx'] = "Ingrese el nú exacto."; //copied from es-cl
-$text['description-number']['fr-ca'] = "Entrer le numéro exact."; //copied from fr-fr
-$text['description-number']['fr-fr'] = "Entrer le numéro exact.";
-$text['description-number']['he-il'] = "הכנס את המספר המבוקש";
-$text['description-number']['it-it'] = "Inserisci il numero esatto.";
-$text['description-number']['nl-nl'] = "";
-$text['description-number']['pl-pl'] = "Wprowadź dokładny numer.";
-$text['description-number']['pt-br'] = "Insira o número exato.";
 $text['description-number']['pt-pt'] = "Introduza o número exacto.";
-$text['description-number']['ro-ro'] = "Introduceți numărul exact";
-$text['description-number']['ru-ru'] = "Введите точный номер.";
+$text['description-number']['fr-fr'] = "Entrer le numéro exact.";
+$text['description-number']['nl-nl'] = "";
+$text['description-number']['pt-br'] = "Insira o número exato.";
+$text['description-number']['pl'] = "Wprowadź dokładny numer.";
 $text['description-number']['sv-se'] = "Ange det exakta numret";
-$text['description-number']['uk-ua'] = "Введіть точний номер";
+$text['description-number']['uk'] = "Введіть точний номер";
+$text['description-number']['ro'] = "Introduceți numărul exact";
+$text['description-number']['de-at'] = "Geben Sie die genaue Nummer an.";
+$text['description-number']['ar-eg'] = "";
+$text['description-number']['he'] = "הכנס את המספר המבוקש";

 $text['description-name']['en-us'] = "Enter the name.";
-$text['description-name']['ar-eg'] = "أدخل الأسم";
-$text['description-name']['de-at'] = "Geben Sie den Namen an"; //copied from de-de
-$text['description-name']['de-ch'] = "Geben Sie den Namen an"; //copied from de-de
-$text['description-name']['de-de'] = "Geben Sie den Namen an";
 $text['description-name']['es-cl'] = "Introduzca el nombre.";
-$text['description-name']['es-mx'] = "Introduzca el nombre."; //copied from es-cl
-$text['description-name']['fr-ca'] = "Entrez le nom."; //copied from fr-fr
-$text['description-name']['fr-fr'] = "Entrez le nom.";
-$text['description-name']['he-il'] = "הכנס את השם";
-$text['description-name']['it-it'] = "Inserisci il nome.";
-$text['description-name']['nl-nl'] = "";
-$text['description-name']['pl-pl'] = "Wprowadź nazwę";
-$text['description-name']['pt-br'] = "Insira o nome.";
 $text['description-name']['pt-pt'] = "Digite o nome.";
-$text['description-name']['ro-ro'] = "Introduceți numele";
-$text['description-name']['ru-ru'] = "Введите имя.";
+$text['description-name']['fr-fr'] = "Entrez le nom.";
+$text['description-name']['nl-nl'] = "";
+$text['description-name']['pt-br'] = "Insira o nome.";
+$text['description-name']['pl'] = "Wprowadź nazwę";
 $text['description-name']['sv-se'] = "Skriv in namnet.";
-$text['description-name']['uk-ua'] = "Введіть назву меню";
+$text['description-name']['uk'] = "Введіть назву меню";
+$text['description-name']['ro'] = "Introduceți numele";
+$text['description-name']['de-at'] = "Geben Sie den Namen an";
+$text['description-name']['ar-eg'] = "أدخل الأسم";
+$text['description-name']['he'] = "הכנס את השם";

 $text['description-enable']['en-us'] = "Set to true to enable call blocking for this number.";
-$text['description-enable']['ar-eg'] = "";
-$text['description-enable']['de-at'] = "Setzen Sie auf An, um die Sperrung für diese Nummer zu aktivieren."; //copied from de-de
-$text['description-enable']['de-ch'] = "Setzen Sie auf An, um die Sperrung für diese Nummer zu aktivieren."; //copied from de-de
-$text['description-enable']['de-de'] = "Setzen Sie auf An, um die Sperrung für diese Nummer zu aktivieren.";
 $text['description-enable']['es-cl'] = "Seleccione verdadero para activar el bloqueo de llamadas desde este número.";
-$text['description-enable']['es-mx'] = "Seleccione verdadero para activar el bloqueo de llamadas desde este número."; //copied from es-cl
-$text['description-enable']['fr-ca'] = "Choisir Oui pour activer le bloquage d'appel."; //copied from fr-fr
-$text['description-enable']['fr-fr'] = "Choisir Oui pour activer le bloquage d'appel.";
-$text['description-enable']['he-il'] = "";
-$text['description-enable']['it-it'] = "Selezionare 'true' per abilitare il blocco chiamate da questo numero.";
-$text['description-enable']['nl-nl'] = "";
-$text['description-enable']['pl-pl'] = "Ustaw wartość na TAK, aby umożliwić blokowanie tego numeru ";
-$text['description-enable']['pt-br'] = "Escolha 'sim' para ativar o bloqueio  de chamadas para este número.";
 $text['description-enable']['pt-pt'] = "Escolha 'sim' para activar o bloqueio de chamadas para este número.";
-$text['description-enable']['ro-ro'] = "";
-$text['description-enable']['ru-ru'] = "Выберите 'Да', чтобы блокировать вызовы с данного номера.";
+$text['description-enable']['fr-fr'] = "Choisir Oui pour activer le bloquage d'appel.";
+$text['description-enable']['nl-nl'] = "";
+$text['description-enable']['pt-br'] = "Escolha 'sim' para ativar o bloqueio  de chamadas para este número.";
+$text['description-enable']['pl'] = "Ustaw wartość na TAK, aby umożliwić blokowanie tego numeru ";
 $text['description-enable']['sv-se'] = "Välj Sann för att blockera detta nummer.";
-$text['description-enable']['uk-ua'] = "Виберіть 'Так', щоб блокувати дзвінки з даного номера.";
+$text['description-enable']['uk'] = "Виберіть 'Так', щоб блокувати дзвінки з даного номера.";
+$text['description-enable']['ro'] = "";
+$text['description-enable']['de-at'] = "Setzen Sie auf An um den Blocker für diese Nummer zu aktivieren.";
+$text['description-enable']['ar-eg'] = "";
+$text['description-enable']['he'] = "";

 $text['description-call-block']['en-us'] = "A list of numbers from which to block calls.";
-$text['description-call-block']['ar-eg'] = "";
-$text['description-call-block']['de-at'] = "Eine Liste von Nummern die gesperrt werden sollen."; //copied from de-de
-$text['description-call-block']['de-ch'] = "Eine Liste von Nummern die gesperrt werden sollen."; //copied from de-de
-$text['description-call-block']['de-de'] = "Eine Liste von Nummern die gesperrt werden sollen.";
 $text['description-call-block']['es-cl'] = "Un listado de números desde los cuales se bloquean las llamadas";
-$text['description-call-block']['es-mx'] = "Un listado de números desde los cuales se bloquean las llamadas"; //copied from es-cl
-$text['description-call-block']['fr-ca'] = "Une liste de numéro dont on veut bloquer les appels"; //copied from fr-fr
-$text['description-call-block']['fr-fr'] = "Une liste de numéro dont on veut bloquer les appels";
-$text['description-call-block']['he-il'] = "";
-$text['description-call-block']['it-it'] = "Una lista di numeri per cui è possibile bloccare le chiamate.";
-$text['description-call-block']['nl-nl'] = "";
-$text['description-call-block']['pl-pl'] = "Lista numerów, z których rozmowy są blokowane.";
-$text['description-call-block']['pt-br'] = "Uma lista de números que deseja bloquear as chamadas";
 $text['description-call-block']['pt-pt'] = "Uma lista de números que deseje bloquear as chamadas";
-$text['description-call-block']['ro-ro'] = "";
-$text['description-call-block']['ru-ru'] = "Список номеров, с которых блокируются вызовы.";
+$text['description-call-block']['fr-fr'] = "Une liste de numéro dont on veut bloquer les appels";
+$text['description-call-block']['nl-nl'] = "";
+$text['description-call-block']['pt-br'] = "Uma lista de números que deseja bloquear as chamadas";
+$text['description-call-block']['pl'] = "Lista numerów, z których rozmowy są blokowane.";
 $text['description-call-block']['sv-se'] = "En lista med nummer för blockering av samtal.";
-$text['description-call-block']['uk-ua'] = "Список номерів, з яких блокуються дзвінки.";
+$text['description-call-block']['uk'] = "Список номерів, з яких блокуються дзвінки.";
+$text['description-call-block']['ro'] = "";
+$text['description-call-block']['de-at'] = "Eine Liste von Nummern die blockiert werden sollen.";
+$text['description-call-block']['ar-eg'] = "";
+$text['description-call-block']['he'] = "";

 $text['description-action']['en-us'] = "Set an action for calls from this number.";
-$text['description-action']['ar-eg'] = "";
-$text['description-action']['de-at'] = "Wählen Sie eine Aktion für Anrufe von dieser Nummer."; //copied from de-de
-$text['description-action']['de-ch'] = "Wählen Sie eine Aktion für Anrufe von dieser Nummer."; //copied from de-de
-$text['description-action']['de-de'] = "Wählen Sie eine Aktion für Anrufe von dieser Nummer.";
 $text['description-action']['es-cl'] = "Configurar una acción para llamadas desde este número.";
-$text['description-action']['es-mx'] = "Configurar una acción para llamadas desde este número."; //copied from es-cl
-$text['description-action']['fr-ca'] = "Choisir une action pour les appels venant de ce numéro."; //copied from fr-fr
-$text['description-action']['fr-fr'] = "Choisir une action pour les appels venant de ce numéro.";
-$text['description-action']['he-il'] = "";
-$text['description-action']['it-it'] = "Seleziona un'azione per le chiamate da questo numero.";
-$text['description-action']['nl-nl'] = "";
-$text['description-action']['pl-pl'] = "Ustaw co zrobić w przypadku polaczeń z tego numeru.";
-$text['description-action']['pt-br'] = "Escolha uma ação para chamadas reailzadas por este número.";
 $text['description-action']['pt-pt'] = "Escolha uma acção para chamadas com origem neste número.";
-$text['description-action']['ro-ro'] = "";
-$text['description-action']['ru-ru'] = "Установите действие для вызовов с данного номера.";
+$text['description-action']['fr-fr'] = "Choisir une action pour les appels venant de ce numéro.";
+$text['description-action']['nl-nl'] = "";
+$text['description-action']['pt-br'] = "Escolha uma ação para chamadas reailzadas por este número.";
+$text['description-action']['pl'] = "Ustaw co zrobić w przypadku polaczeń z tego numeru.";
 $text['description-action']['sv-se'] = "Välj en aktion för samtal från detta nummer.";
-$text['description-action']['uk-ua'] = "Встановіть дію для дзвінків з цього номера.";
+$text['description-action']['uk'] = "Встановіть дію для дзвінків з цього номера.";
+$text['description-action']['ro'] = "";
+$text['description-action']['de-at'] = "Setzen Sie eine Aktion für Anrufe von dieser Nummer.";
+$text['description-action']['ar-eg'] = "";
+$text['description-action']['he'] = "";

-?>
+?>
@@ -1,30 +1,22 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Call Block";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "حظر المكالمات";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Sperrlisten";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Sperrlisten";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Bloqueo de llamadas";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Liste Noire";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "חסימת מספר";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Blocco Chiamate";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Blokowanie rozmów";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Bloqueio de chamadas";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Bloqueio de Chamadas";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "Blocare apel";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Черный список";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Blockera Samtal";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Блокування дзвінків";
-	$apps[$x]['menu'][$y]['uuid'] = "29295c90-b1b9-440b-9c7E-c8363c6e8975";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/call_block/call_block.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Call Block";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Bloqueo de llamadas";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Liste Noire";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Bloqueio de Chamadas";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Bloqueio de chamadas";
+$apps[$x]['menu'][0]['title']['pl'] = "Blokowanie rozmów";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Blockera Samtal";
+$apps[$x]['menu'][0]['title']['uk'] = "Блокування дзвінків";
+$apps[$x]['menu'][0]['title']['ro'] = "Blocare apel";
+$apps[$x]['menu'][0]['title']['de-at'] = "Sperrlisten";
+$apps[$x]['menu'][0]['title']['ar-eg'] = "حظر المكالمات";
+$apps[$x]['menu'][0]['title']['he'] = "חסימת מספר";
+$apps[$x]['menu'][0]['uuid'] = "29295c90-b1b9-440b-9c7E-c8363c6e8975";
+$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/call_block/call_block.php";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['groups'][] = "admin";

 ?>
@@ -102,7 +102,7 @@ else {
 		$db->exec(check_sql($sql));
 		unset($sql);

-		messages::add($text['label-add-complete']);
+		$_SESSION["message"] = $text['label-add-complete'];

 	}

@@ -76,7 +76,7 @@ else {
 	}

 	//redirect the browser
-		messages::add($text['label-delete-complete']);
+		$_SESSION["message"] = $text['label-delete-complete'];
 		header("Location: call_block.php");
 		return;

@@ -151,7 +151,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);

-				messages::add($text['label-add-complete']);
+				$_SESSION["message"] = $text['label-add-complete'];
 				header("Location: call_block.php");
 				return;
 			} //if ($action == "add")
@@ -186,7 +186,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$db->exec(check_sql($sql));
 				unset($sql);

-				messages::add($text['label-update-complete']);
+				$_SESSION["message"] = $text['label-update-complete'];
 				header("Location: call_block.php");
 				return;
 			} //if ($action == "update")
@@ -5,57 +5,46 @@
 		$apps[$x]['uuid'] = "efc11f6b-ed73-9955-4d4d-3a1bed75a056";
 		$apps[$x]['category'] = "Switch";;
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Schedule to immediately make multiple calls to the extension, an IVR Menu, Conference Room, or any other number.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Methode um sofort mehrere parallele Anrufe an Nebenstellen, Automatische Zentralen, Conferenzräume oder andere Rufnummern zu leiten.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Methode um sofort mehrere parallele Anrufe an Nebenstellen, Automatische Zentralen, Conferenzräume oder andere Rufnummern zu leiten.";
 		$apps[$x]['description']['es-cl'] = "Realiza llamadas inmediatamente a extensiones, IVR, conferencias o cualquier otro número";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "Il fait d' massive appels vers des extensions, IVR, salles de conferences ou quelqu'autre nom.";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Programmation de campagnes d'appels vers des extensions, IVR, salles de conferences ou tout autre numéro.";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "Programação para imediatamente realizar várias chamadas para uma extensão, um menu IVR, Sala de Conferência ou qualquer outro número.";
+		$apps[$x]['description']['fr-ca'] = "Il fait d' massive appels vers des extensions, IVR, salles de conferences ou quelqu'autre nom.";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Programação para imediatamente fazer várias chamadas para uma extensão, um IVR, Sala de Conferência, ou qualquer outro número.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "Programação para imediatamente realizar várias chamadas para uma extensão, um menu IVR, Sala de Conferência ou qualquer outro número.";

 	//permission details
-		$y=0;
-		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_view";
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = "50153bbf-78c5-b49e-7bd9-4b3e4b1134e6";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_send";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][0]['name'] = "call_broadcast_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "50153bbf-78c5-b49e-7bd9-4b3e4b1134e6";
+		$apps[$x]['permissions'][0]['groups'][] = "admin";
+		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
+
+		$apps[$x]['permissions'][1]['name'] = "call_broadcast_add";
+		$apps[$x]['permissions'][1]['groups'][] = "admin";
+		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
+
+		$apps[$x]['permissions'][2]['name'] = "call_broadcast_edit";
+		$apps[$x]['permissions'][2]['groups'][] = "admin";
+		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
+
+		$apps[$x]['permissions'][3]['name'] = "call_broadcast_delete";
+		$apps[$x]['permissions'][3]['groups'][] = "admin";
+		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
+
+		$apps[$x]['permissions'][4]['name'] = "call_broadcast_send";
+		$apps[$x]['permissions'][4]['groups'][] = "admin";
+		$apps[$x]['permissions'][4]['groups'][] = "superadmin";

 	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_call_broadcasts";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_call_broadcasts";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_broadcast_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
@@ -1,624 +1,343 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC

 $text['title']['en-us'] = "Call Broadcasts";
-$text['title']['ar-eg'] = "";
-$text['title']['de-at'] = "Rundrufe"; //copied from de-de
-$text['title']['de-ch'] = "Rundrufe"; //copied from de-de
-$text['title']['de-de'] = "Rundrufe";
 $text['title']['es-cl'] = "Llamada Masiva (Broadcast)";
-$text['title']['es-mx'] = "Llamada Masiva (Broadcast)"; //copied from es-cl
-$text['title']['fr-ca'] = "Campagne d'appels"; //copied from fr-fr
-$text['title']['fr-fr'] = "Campagne d'appels";
-$text['title']['he-il'] = "הגדרת חשבון";
-$text['title']['it-it'] = "Chiamate Multiple";
-$text['title']['nl-nl'] = "";
-$text['title']['pl-pl'] = "Rozsyłanie rozmów";
-$text['title']['pt-br'] = "Configurações da Conta";
 $text['title']['pt-pt'] = "Chamadas de Broadcast";
-$text['title']['ro-ro'] = "";
-$text['title']['ru-ru'] = "Массовые вызовы";
+$text['title']['fr-fr'] = "Campagne d'appels";
+$text['title']['pt-br'] = "Configurações da Conta";
+$text['title']['pl'] = "Rozsyłanie rozmów";
 $text['title']['sv-se'] = "Samtalsdistributioner";
-$text['title']['uk-ua'] = "Трансляція дзвінків";
+$text['title']['uk'] = "Трансляція дзвінків";
+$text['title']['de-at'] = "Automatische Anrufe";
+$text['title']['he'] = "הגדרת חשבון";

 $text['option-true']['en-us'] = "True";
-$text['option-true']['ar-eg'] = "";
-$text['option-true']['de-at'] = "Ein"; //copied from de-de
-$text['option-true']['de-ch'] = "Ein"; //copied from de-de
-$text['option-true']['de-de'] = "Ein";
 $text['option-true']['es-cl'] = "Verdadero";
-$text['option-true']['es-mx'] = "Verdadero"; //copied from es-cl
-$text['option-true']['fr-ca'] = "Oui"; //copied from fr-fr
-$text['option-true']['fr-fr'] = "Oui";
-$text['option-true']['he-il'] = "חוקי";
-$text['option-true']['it-it'] = "";
-$text['option-true']['nl-nl'] = "";
-$text['option-true']['pl-pl'] = "Tak";
-$text['option-true']['pt-br'] = "Sim"; //copied from pt-pt
 $text['option-true']['pt-pt'] = "Sim";
-$text['option-true']['ro-ro'] = "";
-$text['option-true']['ru-ru'] = "Да";
+$text['option-true']['fr-fr'] = "Oui";
+$text['option-true']['pt-br'] = "Sim";
+$text['option-true']['pl'] = "Tak";
 $text['option-true']['sv-se'] = "Sann";
-$text['option-true']['uk-ua'] = "Так";
+$text['option-true']['uk'] = "Так";
+$text['option-true']['de-at'] = "Ein";
+$text['option-true']['he'] = "חוקי";

 $text['option-false']['en-us'] = "False";
-$text['option-false']['ar-eg'] = "";
-$text['option-false']['de-at'] = "Aus"; //copied from de-de
-$text['option-false']['de-ch'] = "Aus"; //copied from de-de
-$text['option-false']['de-de'] = "Aus";
 $text['option-false']['es-cl'] = "Falso";
-$text['option-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['option-false']['fr-ca'] = "Non"; //copied from fr-fr
-$text['option-false']['fr-fr'] = "Non";
-$text['option-false']['he-il'] = "לא חוקי";
-$text['option-false']['it-it'] = "";
-$text['option-false']['nl-nl'] = "";
-$text['option-false']['pl-pl'] = "Nie";
-$text['option-false']['pt-br'] = "Não"; //copied from pt-pt
 $text['option-false']['pt-pt'] = "Não";
-$text['option-false']['ro-ro'] = "";
-$text['option-false']['ru-ru'] = "Нет";
+$text['option-false']['fr-fr'] = "Non";
+$text['option-false']['pt-br'] = "Não";
+$text['option-false']['pl'] = "Nie";
 $text['option-false']['sv-se'] = "Falsk";
-$text['option-false']['uk-ua'] = "Ні";
+$text['option-false']['uk'] = "Ні";
+$text['option-false']['de-at'] = "Aus";
+$text['option-false']['he'] = "לא חוקי";

 $text['label-view-calls']['en-us'] = "View Calls";
-$text['label-view-calls']['ar-eg'] = "";
-$text['label-view-calls']['de-at'] = "Anrufe ansehen"; //copied from de-de
-$text['label-view-calls']['de-ch'] = "Anrufe ansehen"; //copied from de-de
-$text['label-view-calls']['de-de'] = "Anrufe ansehen";
 $text['label-view-calls']['es-cl'] = "Ver llamadas";
-$text['label-view-calls']['es-mx'] = "Ver llamadas"; //copied from es-cl
-$text['label-view-calls']['fr-ca'] = "Voir les appels"; //copied from fr-fr
-$text['label-view-calls']['fr-fr'] = "Voir les appels";
-$text['label-view-calls']['he-il'] = "";
-$text['label-view-calls']['it-it'] = "Visualizza Chiamate";
-$text['label-view-calls']['nl-nl'] = "";
-$text['label-view-calls']['pl-pl'] = "Podgląd rozmów";
-$text['label-view-calls']['pt-br'] = "Ver chamadas";
 $text['label-view-calls']['pt-pt'] = "Ver Chamadas";
-$text['label-view-calls']['ro-ro'] = "";
-$text['label-view-calls']['ru-ru'] = "Показать вызовы";
+$text['label-view-calls']['fr-fr'] = "Voir les appels";
+$text['label-view-calls']['pt-br'] = "Ver chamadas";
+$text['label-view-calls']['pl'] = "Podgląd rozmów";
 $text['label-view-calls']['sv-se'] = "Granska Samtal";
-$text['label-view-calls']['uk-ua'] = "Перегляд дзвінків";
+$text['label-view-calls']['uk'] = "Перегляд дзвінків";
+$text['label-view-calls']['de-at'] = "Anrufe ansehen";
+$text['label-view-calls']['he'] = "";

 $text['label-timeout']['en-us'] = "Timeout";
-$text['label-timeout']['ar-eg'] = "";
-$text['label-timeout']['de-at'] = "Zeitüberschreitung"; //copied from de-de
-$text['label-timeout']['de-ch'] = "Zeitüberschreitung"; //copied from de-de
-$text['label-timeout']['de-de'] = "Zeitüberschreitung";
 $text['label-timeout']['es-cl'] = "Tiempo Líimite";
-$text['label-timeout']['es-mx'] = "Tiempo Líimite"; //copied from es-cl
-$text['label-timeout']['fr-ca'] = "Timeout"; //copied from fr-fr
-$text['label-timeout']['fr-fr'] = "Timeout";
-$text['label-timeout']['he-il'] = "";
-$text['label-timeout']['it-it'] = "";
-$text['label-timeout']['nl-nl'] = "";
-$text['label-timeout']['pl-pl'] = "Przekroczenie czasu oczekiwania (timeout)";
-$text['label-timeout']['pt-br'] = "Tempo limite";
 $text['label-timeout']['pt-pt'] = "Timeout";
-$text['label-timeout']['ro-ro'] = "";
-$text['label-timeout']['ru-ru'] = "Тайм-аут";
+$text['label-timeout']['fr-fr'] = "Timeout";
+$text['label-timeout']['pt-br'] = "Tempo limite";
+$text['label-timeout']['pl'] = "Przekroczenie czasu oczekiwania (timeout)";
 $text['label-timeout']['sv-se'] = "Tidsgräns";
-$text['label-timeout']['uk-ua'] = "Таймаут";
+$text['label-timeout']['uk'] = "Таймаут";
+$text['label-timeout']['de-at'] = "Abwurfzeit";
+$text['label-timeout']['he'] = "";

 $text['label-phone']['en-us'] = "Phone Number List";
-$text['label-phone']['ar-eg'] = "";
-$text['label-phone']['de-at'] = "Liste der Telefonnummern"; //copied from de-de
-$text['label-phone']['de-ch'] = "Liste der Telefonnummern"; //copied from de-de
-$text['label-phone']['de-de'] = "Liste der Telefonnummern";
 $text['label-phone']['es-cl'] = "Lista de Números de Telefono";
-$text['label-phone']['es-mx'] = "Lista de Números de Telefono"; //copied from es-cl
-$text['label-phone']['fr-ca'] = "Liste de Numéros de téléphone"; //copied from fr-fr
-$text['label-phone']['fr-fr'] = "Liste de Numéros de téléphone";
-$text['label-phone']['he-il'] = "רשימת מספרי טלפון";
-$text['label-phone']['it-it'] = "Lista Numeri di Telefono";
-$text['label-phone']['nl-nl'] = "";
-$text['label-phone']['pl-pl'] = "Lista numerów telefonu";
-$text['label-phone']['pt-br'] = "Lista de números de telefone";
 $text['label-phone']['pt-pt'] = "Lista de Números de Telefone";
-$text['label-phone']['ro-ro'] = "";
-$text['label-phone']['ru-ru'] = "Список телефонних номеров";
+$text['label-phone']['fr-fr'] = "Liste de Numéros de téléphone";
+$text['label-phone']['pt-br'] = "Lista de números de telefone";
+$text['label-phone']['pl'] = "Lista numerów telefonu";
 $text['label-phone']['sv-se'] = "Lista Med Telefonnummer";
-$text['label-phone']['uk-ua'] = "Список телефонних номерів";
+$text['label-phone']['uk'] = "Список телефонних номерів";
+$text['label-phone']['de-at'] = "Liste der Telefonnummern";
+$text['label-phone']['he'] = "רשימת מספרי טלפון";

 $text['label-message']['en-us'] = "Message";
-$text['label-message']['ar-eg'] = "";
-$text['label-message']['de-at'] = "Nachricht"; //copied from de-de
-$text['label-message']['de-ch'] = "Nachricht"; //copied from de-de
-$text['label-message']['de-de'] = "Nachricht";
 $text['label-message']['es-cl'] = "Mensaje";
-$text['label-message']['es-mx'] = "Mensaje"; //copied from es-cl
-$text['label-message']['fr-ca'] = "Message"; //copied from fr-fr
-$text['label-message']['fr-fr'] = "Message";
-$text['label-message']['he-il'] = "הודעה";
-$text['label-message']['it-it'] = "Messaggio";
-$text['label-message']['nl-nl'] = "";
-$text['label-message']['pl-pl'] = "Wiadomość";
-$text['label-message']['pt-br'] = "Mensagem"; //copied from pt-pt
 $text['label-message']['pt-pt'] = "Mensagem";
-$text['label-message']['ro-ro'] = "";
-$text['label-message']['ru-ru'] = "Сообщение";
+$text['label-message']['fr-fr'] = "Message";
+$text['label-message']['pt-br'] = "Mensagem";
+$text['label-message']['pl'] = "Wiadomość";
 $text['label-message']['sv-se'] = "Meddelande";
-$text['label-message']['uk-ua'] = "Повідомлення";
+$text['label-message']['uk'] = "Повідомлення";
+$text['label-message']['de-at'] = "Nachricht";
+$text['label-message']['he'] = "הודעה";

 $text['label-has-been']['en-us'] = "has been started";
-$text['label-has-been']['ar-eg'] = "";
-$text['label-has-been']['de-at'] = "wurde gestartet"; //copied from de-de
-$text['label-has-been']['de-ch'] = "wurde gestartet"; //copied from de-de
-$text['label-has-been']['de-de'] = "wurde gestartet";
 $text['label-has-been']['es-cl'] = "iniciada";
-$text['label-has-been']['es-mx'] = "iniciada"; //copied from es-cl
-$text['label-has-been']['fr-ca'] = "a commencé"; //copied from fr-fr
-$text['label-has-been']['fr-fr'] = "a commencé";
-$text['label-has-been']['he-il'] = "";
-$text['label-has-been']['it-it'] = "è iniziato.";
-$text['label-has-been']['nl-nl'] = "";
-$text['label-has-been']['pl-pl'] = "rozpoczęto";
-$text['label-has-been']['pt-br'] = "foi inicializada"; //copied from pt-pt
 $text['label-has-been']['pt-pt'] = "foi inicializada";
-$text['label-has-been']['ro-ro'] = "";
-$text['label-has-been']['ru-ru'] = "было запущено";
+$text['label-has-been']['fr-fr'] = "a commencé";
+$text['label-has-been']['pt-br'] = "foi inicializada";
+$text['label-has-been']['pl'] = "rozpoczęto";
 $text['label-has-been']['sv-se'] = "har startat";
-$text['label-has-been']['uk-ua'] = "було запущено";
+$text['label-has-been']['uk'] = "було запущено";
+$text['label-has-been']['de-at'] = "bereits gestartet";
+$text['label-has-been']['he'] = "";

 $text['label-destination']['en-us'] = "Destination Number";
-$text['label-destination']['ar-eg'] = "";
-$text['label-destination']['de-at'] = "Zielnummer"; //copied from de-de
-$text['label-destination']['de-ch'] = "Zielnummer"; //copied from de-de
-$text['label-destination']['de-de'] = "Zielnummer";
 $text['label-destination']['es-cl'] = "Número de Destino";
-$text['label-destination']['es-mx'] = "Número de Destino"; //copied from es-cl
-$text['label-destination']['fr-ca'] = "Numéro de Destination"; //copied from fr-fr
-$text['label-destination']['fr-fr'] = "Numéro de Destination";
-$text['label-destination']['he-il'] = "יעד";
-$text['label-destination']['it-it'] = "Numero di Destinazione";
-$text['label-destination']['nl-nl'] = "";
-$text['label-destination']['pl-pl'] = "Destynacja";
-$text['label-destination']['pt-br'] = "Número de destino";
 $text['label-destination']['pt-pt'] = "Número de Destino";
-$text['label-destination']['ro-ro'] = "";
-$text['label-destination']['ru-ru'] = "Номер назначения";
+$text['label-destination']['fr-fr'] = "Numéro de Destination";
+$text['label-destination']['pt-br'] = "Número de destino";
+$text['label-destination']['pl'] = "Destynacja";
 $text['label-destination']['sv-se'] = "Destinationsnummer";
-$text['label-destination']['uk-ua'] = "Номер";
+$text['label-destination']['uk'] = "Номер";
+$text['label-destination']['de-at'] = "Zielnummer";
+$text['label-destination']['he'] = "יעד";

 $text['label-concurrent-limit']['en-us'] = "Concurrent Limit";
-$text['label-concurrent-limit']['ar-eg'] = "";
-$text['label-concurrent-limit']['de-at'] = "Gleichzeitige Anrufe"; //copied from de-de
-$text['label-concurrent-limit']['de-ch'] = "Gleichzeitige Anrufe"; //copied from de-de
-$text['label-concurrent-limit']['de-de'] = "Gleichzeitige Anrufe";
 $text['label-concurrent-limit']['es-cl'] = "Límite de concurrencia";
-$text['label-concurrent-limit']['es-mx'] = "Límite de concurrencia"; //copied from es-cl
-$text['label-concurrent-limit']['fr-ca'] = "Appels Simultanés"; //copied from fr-fr
-$text['label-concurrent-limit']['fr-fr'] = "Appels Simultanés";
-$text['label-concurrent-limit']['he-il'] = "";
-$text['label-concurrent-limit']['it-it'] = "Limite Chiamate Contemporanee";
-$text['label-concurrent-limit']['nl-nl'] = "";
-$text['label-concurrent-limit']['pl-pl'] = "Limit jednoczesnych rozmów";
-$text['label-concurrent-limit']['pt-br'] = "Limite de chamadas simultâneas";
 $text['label-concurrent-limit']['pt-pt'] = "Limite de chamadas concorrentes";
-$text['label-concurrent-limit']['ro-ro'] = "";
-$text['label-concurrent-limit']['ru-ru'] = "Ограничение параллельных вызовов";
+$text['label-concurrent-limit']['fr-fr'] = "Appels Simultanés";
+$text['label-concurrent-limit']['pt-br'] = "Limite de chamadas simultâneas";
+$text['label-concurrent-limit']['pl'] = "Limit jednoczesnych rozmów";
 $text['label-concurrent-limit']['sv-se'] = "Samtidig Gräns";
-$text['label-concurrent-limit']['uk-ua'] = "Обмеження одночасної кількості";
+$text['label-concurrent-limit']['uk'] = "Обмеження одночасної кількості";
+$text['label-concurrent-limit']['de-at'] = "Gleichzeitige Anrufe";
+$text['label-concurrent-limit']['he'] = "";

 $text['label-callerid-number']['en-us'] = "Caller ID Number";
-$text['label-callerid-number']['ar-eg'] = "";
-$text['label-callerid-number']['de-at'] = "Anruferkennung (Nummer)"; //copied from de-de
-$text['label-callerid-number']['de-ch'] = "Anruferkennung (Nummer)"; //copied from de-de
-$text['label-callerid-number']['de-de'] = "Anruferkennung (Nummer)";
 $text['label-callerid-number']['es-cl'] = "Número de Origen";
-$text['label-callerid-number']['es-mx'] = "Número de Origen"; //copied from es-cl
-$text['label-callerid-number']['fr-ca'] = "Numéro d'appelant"; //copied from fr-fr
-$text['label-callerid-number']['fr-fr'] = "Numéro d'appelant";
-$text['label-callerid-number']['he-il'] = "";
-$text['label-callerid-number']['it-it'] = "Numero Chiamante";
-$text['label-callerid-number']['nl-nl'] = "";
-$text['label-callerid-number']['pl-pl'] = "Prezentacja numeru dzwoniącego";
-$text['label-callerid-number']['pt-br'] = "Número do discador";
 $text['label-callerid-number']['pt-pt'] = "Número do Chamador";
-$text['label-callerid-number']['ro-ro'] = "";
-$text['label-callerid-number']['ru-ru'] = "Caller ID Номер";
+$text['label-callerid-number']['fr-fr'] = "Numéro d'appelant";
+$text['label-callerid-number']['pt-br'] = "Número do discador";
+$text['label-callerid-number']['pl'] = "Prezentacja numeru dzwoniącego";
 $text['label-callerid-number']['sv-se'] = "Caller ID Nummer";
-$text['label-callerid-number']['uk-ua'] = "Caller ID Номер";
+$text['label-callerid-number']['uk'] = "Caller ID Номер";
+$text['label-callerid-number']['de-at'] = "Anruferkennung (Nummer)";
+$text['label-callerid-number']['he'] = "";

 $text['label-caller-id-name']['en-us'] = "Caller ID Name";
-$text['label-caller-id-name']['ar-eg'] = "";
-$text['label-caller-id-name']['de-at'] = "Anruferkennung (Name)"; //copied from de-de
-$text['label-caller-id-name']['de-ch'] = "Anruferkennung (Name)"; //copied from de-de
-$text['label-caller-id-name']['de-de'] = "Anruferkennung (Name)";
 $text['label-caller-id-name']['es-cl'] = "Nombre de origen";
-$text['label-caller-id-name']['es-mx'] = "Nombre de origen"; //copied from es-cl
-$text['label-caller-id-name']['fr-ca'] = "Nom d'appelant"; //copied from fr-fr
-$text['label-caller-id-name']['fr-fr'] = "Nom d'appelant";
-$text['label-caller-id-name']['he-il'] = "";
-$text['label-caller-id-name']['it-it'] = "Nome Chiamante";
-$text['label-caller-id-name']['nl-nl'] = "";
-$text['label-caller-id-name']['pl-pl'] = "Prezentacja nazwy dzwoniącego";
-$text['label-caller-id-name']['pt-br'] = "Nome do discador";
 $text['label-caller-id-name']['pt-pt'] = "Nome do Chamador";
-$text['label-caller-id-name']['ro-ro'] = "";
-$text['label-caller-id-name']['ru-ru'] = "Caller ID Имя";
+$text['label-caller-id-name']['fr-fr'] = "Nom d'appelant";
+$text['label-caller-id-name']['pt-br'] = "Nome do discador";
+$text['label-caller-id-name']['pl'] = "Prezentacja nazwy dzwoniącego";
 $text['label-caller-id-name']['sv-se'] = "Caller ID Namn";
-$text['label-caller-id-name']['uk-ua'] = "Caller ID Ім’я";
+$text['label-caller-id-name']['uk'] = "Caller ID Ім’я";
+$text['label-caller-id-name']['de-at'] = "Anruferkennung (Name)";
+$text['label-caller-id-name']['he'] = "";

 $text['label-call-broadcasts']['en-us'] = "Call Broadcasts";
-$text['label-call-broadcasts']['ar-eg'] = "";
-$text['label-call-broadcasts']['de-at'] = "Rundrufe"; //copied from de-de
-$text['label-call-broadcasts']['de-ch'] = "Rundrufe"; //copied from de-de
-$text['label-call-broadcasts']['de-de'] = "Rundrufe";
 $text['label-call-broadcasts']['es-cl'] = "Llamadas Masivas (Broadcast)";
-$text['label-call-broadcasts']['es-mx'] = "Llamadas Masivas (Broadcast)"; //copied from es-cl
-$text['label-call-broadcasts']['fr-ca'] = "Diffusions d'appels"; //copied from fr-fr
-$text['label-call-broadcasts']['fr-fr'] = "Diffusions d'appels";
-$text['label-call-broadcasts']['he-il'] = "";
-$text['label-call-broadcasts']['it-it'] = "Chiamate Multiple";
-$text['label-call-broadcasts']['nl-nl'] = "";
-$text['label-call-broadcasts']['pl-pl'] = "Rozsyłanie rozmów";
-$text['label-call-broadcasts']['pt-br'] = "Chamadas broadcast";
 $text['label-call-broadcasts']['pt-pt'] = "Chamadas de Broadcast";
-$text['label-call-broadcasts']['ro-ro'] = "";
-$text['label-call-broadcasts']['ru-ru'] = "Массовые вызовы";
+$text['label-call-broadcasts']['fr-fr'] = "Diffusions d'appels";
+$text['label-call-broadcasts']['pt-br'] = "Chamadas broadcast";
+$text['label-call-broadcasts']['pl'] = "Rozsyłanie rozmów";
 $text['label-call-broadcasts']['sv-se'] = "Samtalsdistributioner";
-$text['label-call-broadcasts']['uk-ua'] = "Трансляція дзвінків";
+$text['label-call-broadcasts']['uk'] = "Трансляція дзвінків";
+$text['label-call-broadcasts']['de-at'] = "Automatische Anrufe";
+$text['label-call-broadcasts']['he'] = "";

 $text['label-call-broadcast']['en-us'] = "Call Broadcast";
-$text['label-call-broadcast']['ar-eg'] = "";
-$text['label-call-broadcast']['de-at'] = "Rundrufe"; //copied from de-de
-$text['label-call-broadcast']['de-ch'] = "Rundrufe"; //copied from de-de
-$text['label-call-broadcast']['de-de'] = "Rundrufe";
 $text['label-call-broadcast']['es-cl'] = "Llamada Masiva (Broadcast)";
-$text['label-call-broadcast']['es-mx'] = "Llamada Masiva (Broadcast)"; //copied from es-cl
-$text['label-call-broadcast']['fr-ca'] = "Diffusion d'appels"; //copied from fr-fr
-$text['label-call-broadcast']['fr-fr'] = "Diffusion d'appels";
-$text['label-call-broadcast']['he-il'] = "";
-$text['label-call-broadcast']['it-it'] = "Chiamata Multipla";
-$text['label-call-broadcast']['nl-nl'] = "";
-$text['label-call-broadcast']['pl-pl'] = "Rozsyłanie rozmów";
-$text['label-call-broadcast']['pt-br'] = "Chamada de broadcast";
 $text['label-call-broadcast']['pt-pt'] = "Chamada de Broadcast";
-$text['label-call-broadcast']['ro-ro'] = "";
-$text['label-call-broadcast']['ru-ru'] = "Массовый вызов";
+$text['label-call-broadcast']['fr-fr'] = "Diffusion d'appels";
+$text['label-call-broadcast']['pt-br'] = "Chamada de broadcast";
+$text['label-call-broadcast']['pl'] = "Rozsyłanie rozmów";
 $text['label-call-broadcast']['sv-se'] = "Samtalsdistribution";
-$text['label-call-broadcast']['uk-ua'] = "Трансляція дзвінка";
+$text['label-call-broadcast']['uk'] = "Трансляція дзвінка";
+$text['label-call-broadcast']['de-at'] = "Automatische Anrufe";
+$text['label-call-broadcast']['he'] = "";

 $text['label-avmd']['en-us'] = "Voicemail Detection";
-$text['label-avmd']['ar-eg'] = "";
-$text['label-avmd']['de-at'] = "Erkennung von Sprachnachrichten"; //copied from de-de
-$text['label-avmd']['de-ch'] = "Erkennung von Sprachnachrichten"; //copied from de-de
-$text['label-avmd']['de-de'] = "Erkennung von Sprachnachrichten";
 $text['label-avmd']['es-cl'] = "Detección de correo de voz";
-$text['label-avmd']['es-mx'] = "Detección de correo de voz"; //copied from es-cl
-$text['label-avmd']['fr-ca'] = "Détection de la messagerie vocale"; //copied from fr-fr
-$text['label-avmd']['fr-fr'] = "Détection de la messagerie vocale";
-$text['label-avmd']['he-il'] = "";
-$text['label-avmd']['it-it'] = "Rilevamento Segreteria";
-$text['label-avmd']['nl-nl'] = "";
-$text['label-avmd']['pl-pl'] = "Wykrywanie poczty głosowej";
-$text['label-avmd']['pt-br'] = "Detecção Voicemail";
 $text['label-avmd']['pt-pt'] = "Voicemail Detecção";
-$text['label-avmd']['ro-ro'] = "";
-$text['label-avmd']['ru-ru'] = "Определение голосовой почты";
+$text['label-avmd']['fr-fr'] = "Détection de la messagerie vocale";
+$text['label-avmd']['pt-br'] = "Detecção Voicemail";
+$text['label-avmd']['pl'] = "Wykrywanie poczty głosowej";
 $text['label-avmd']['sv-se'] = "Känn Av Röstbrevlåda";
-$text['label-avmd']['uk-ua'] = "Виявлення голосової пошти";
+$text['label-avmd']['uk'] = "Виявлення голосової пошти";
+$text['label-avmd']['de-at'] = "Mailboxerkennung";
+$text['label-avmd']['he'] = "";

 $text['label-accountcode']['en-us'] = "Accountcode";
-$text['label-accountcode']['ar-eg'] = "";
-$text['label-accountcode']['de-at'] = "Kontoschlüssel"; //copied from de-de
-$text['label-accountcode']['de-ch'] = "Kontoschlüssel"; //copied from de-de
-$text['label-accountcode']['de-de'] = "Kontoschlüssel";
 $text['label-accountcode']['es-cl'] = "Código de cuenta";
-$text['label-accountcode']['es-mx'] = "Código de cuenta"; //copied from es-cl
-$text['label-accountcode']['fr-ca'] = "Code de l'account"; //copied from fr-fr
-$text['label-accountcode']['fr-fr'] = "Code de l'account";
-$text['label-accountcode']['he-il'] = "קוד חשבון";
-$text['label-accountcode']['it-it'] = "";
-$text['label-accountcode']['nl-nl'] = "";
-$text['label-accountcode']['pl-pl'] = "Numer konta billingowego";
-$text['label-accountcode']['pt-br'] = "Código da conta";
 $text['label-accountcode']['pt-pt'] = "Accountcode";
-$text['label-accountcode']['ro-ro'] = "";
-$text['label-accountcode']['ru-ru'] = "Код Авторизации";
+$text['label-accountcode']['fr-fr'] = "Code de l'account";
+$text['label-accountcode']['pt-br'] = "Código da conta";
+$text['label-accountcode']['pl'] = "Numer konta billingowego";
 $text['label-accountcode']['sv-se'] = "Accountcode";
-$text['label-accountcode']['uk-ua'] = "Код облікового запису";
+$text['label-accountcode']['uk'] = "Код облікового запису";
+$text['label-accountcode']['de-at'] = "Account Code";
+$text['label-accountcode']['he'] = "קוד חשבון";

-$text['description-timeout']['en-us'] = "Specify the absolute timeout in seconds.";
-$text['description-timeout']['ar-eg'] = "";
-$text['description-timeout']['de-at'] = "Geben Sie die absolute Zeitüberschreitung in Sekunden an."; //copied from de-de
-$text['description-timeout']['de-ch'] = "Geben Sie die absolute Zeitüberschreitung in Sekunden an."; //copied from de-de
-$text['description-timeout']['de-de'] = "Geben Sie die absolute Zeitüberschreitung in Sekunden an.";
+$text['description-timeout']['en-us'] = "";
 $text['description-timeout']['es-cl'] = "";
-$text['description-timeout']['es-mx'] = "";
-$text['description-timeout']['fr-ca'] = "";
-$text['description-timeout']['fr-fr'] = "";
-$text['description-timeout']['he-il'] = "";
-$text['description-timeout']['it-it'] = "";
-$text['description-timeout']['nl-nl'] = "";
-$text['description-timeout']['pl-pl'] = "Ilość milisekund oczekiwania po odtworzeniu nagrania lub potwierdzenia makro.";
-$text['description-timeout']['pt-br'] = "Limite de tempo (em milissegundos) de espera após reproduzir gravações ou confirmar a macro."; //copied from pt-pt
 $text['description-timeout']['pt-pt'] = "Limite de tempo (em milissegundos) de espera após reproduzir gravações ou confirmar a macro.";
-$text['description-timeout']['ro-ro'] = "";
-$text['description-timeout']['ru-ru'] = "Время ожидания (в миллисекундах) после воспроизведения записи или подтверждения макроса.";
-$text['description-timeout']['sv-se'] = "Specificera den absoluta timeout:en i sekunder.";
-$text['description-timeout']['uk-ua'] = "";
+$text['description-timeout']['fr-fr'] = "";
+$text['description-timeout']['pt-br'] = "";
+$text['description-timeout']['pl'] = "Ilość milisekund oczekiwania po odtworzeniu nagrania lub potwierdzenia makro.";
+$text['description-timeout']['sv-se'] = "";
+$text['description-timeout']['uk'] = "";
+$text['description-timeout']['de-at'] = "Geben Sie das absolute Time-Out in Sekunden an.";
+$text['description-timeout']['he'] = "";

 $text['description-phone']['en-us'] = "Optional, set a list of phone numbers one per row in the following format: 123-123-1234|Last Name, First Name";
-$text['description-phone']['ar-eg'] = "";
-$text['description-phone']['de-at'] = "Optional: Ergänzen Sie eine Liste von Telefonnummern, eine Nummer pro Zeile im folgenden Format: 123-123-1234|Nachname, Vorname"; //copied from de-de
-$text['description-phone']['de-ch'] = "Optional: Ergänzen Sie eine Liste von Telefonnummern, eine Nummer pro Zeile im folgenden Format: 123-123-1234|Nachname, Vorname"; //copied from de-de
-$text['description-phone']['de-de'] = "Optional: Ergänzen Sie eine Liste von Telefonnummern, eine Nummer pro Zeile im folgenden Format: 123-123-1234|Nachname, Vorname";
 $text['description-phone']['es-cl'] = "Opcional, definir una lista de números de telefono, uno por línea en el siguiente formato:  123-123-1234 | Apellido, Nombre";
-$text['description-phone']['es-mx'] = "Opcional, definir una lista de números de telefono, uno por línea en el siguiente formato:  123-123-1234 | Apellido, Nombre"; //copied from es-cl
-$text['description-phone']['fr-ca'] = "Optionnel, Insérer une liste de numéros de téléphone, un par ligne, dans le format suivant ; 0123456789 | Nom, Prénom"; //copied from fr-fr
-$text['description-phone']['fr-fr'] = "Optionnel, Insérer une liste de numéros de téléphone, un par ligne, dans le format suivant ; 0123456789 | Nom, Prénom";
-$text['description-phone']['he-il'] = "";
-$text['description-phone']['it-it'] = "Opzionale, inserire una lista di numeri di telefono, uno per riga, nel formato 123-123-1234|Cognome, Nome";
-$text['description-phone']['nl-nl'] = "";
-$text['description-phone']['pl-pl'] = "Opcjonalne - ułóż listę numerów (jeden pod drugim) w formacie: 123-123-1234|Nazwisko, Imię";
-$text['description-phone']['pt-br'] = "Opcional, definir uma lista de números de telefone, um por linha, no seguinte formato: 210000000 | Apelido, Primeiro Nome.";
 $text['description-phone']['pt-pt'] = "Opcional, definir uma lista de números de telefone, um por linha, no seguinte formato: 210000000 | Apelido, Primeiro Nome";
-$text['description-phone']['ro-ro'] = "";
-$text['description-phone']['ru-ru'] = "Дополнительно, задайте список телефонных номеров, по одному в ряд, в формате: 123-123-1234 | Фамилия, Имя";
+$text['description-phone']['fr-fr'] = "Optionnel, Insérer une liste de numéros de téléphone, un par ligne, dans le format suivant ; 0123456789 | Nom, Prénom";
+$text['description-phone']['pt-br'] = "Opcional, definir uma lista de números de telefone, um por linha, no seguinte formato: 210000000 | Apelido, Primeiro Nome.";
+$text['description-phone']['pl'] = "Opcjonalne - ułóż listę numerów (jeden pod drugim) w formacie: 123-123-1234|Nazwisko, Imię";
 $text['description-phone']['sv-se'] = "Frivillig, fyll i en lista med nummer (ett per rad) i följande format: 123-123-1234|Efternamn, Förnamn";
-$text['description-phone']['uk-ua'] = "Додатково, задайте список телефонних номерів по одному на рядок в наступному форматі: 123-123-1234 | Прізвище, ім'я";
+$text['description-phone']['uk'] = "Додатково, задайте список телефонних номерів по одному на рядок в наступному форматі: 123-123-1234 | Прізвище, ім'я";
+$text['description-phone']['de-at'] = "Optional. Setzen Sie eine Liste von Telefonnummern, eine Nummer pro Zeile im folgenden Format: 123-123-1234|Nachname, Vorname";
+$text['description-phone']['he'] = "";

 $text['description-name']['en-us'] = "Enter the name here.";
-$text['description-name']['ar-eg'] = "";
-$text['description-name']['de-at'] = "Geben Sie den Namen an."; //copied from de-de
-$text['description-name']['de-ch'] = "Geben Sie den Namen an."; //copied from de-de
-$text['description-name']['de-de'] = "Geben Sie den Namen an.";
 $text['description-name']['es-cl'] = "Ingrese el nombre aquí.";
-$text['description-name']['es-mx'] = "Ingrese el nombre aquí."; //copied from es-cl
-$text['description-name']['fr-ca'] = "Insérer le Nom."; //copied from fr-fr
-$text['description-name']['fr-fr'] = "Insérer le Nom.";
-$text['description-name']['he-il'] = "הכנס את השם";
-$text['description-name']['it-it'] = "Inserire il nome qui.";
-$text['description-name']['nl-nl'] = "";
-$text['description-name']['pl-pl'] = "Wprowadź nazwę";
-$text['description-name']['pt-br'] = "Insira o nome do broadcast.";
 $text['description-name']['pt-pt'] = "Introduza o nome aqui.";
-$text['description-name']['ro-ro'] = "";
-$text['description-name']['ru-ru'] = "Введите имя";
+$text['description-name']['fr-fr'] = "Insérer le Nom.";
+$text['description-name']['pt-br'] = "Insira o nome do broadcast.";
+$text['description-name']['pl'] = "Wprowadź nazwę";
 $text['description-name']['sv-se'] = "Skriv in namnet här.";
-$text['description-name']['uk-ua'] = "Введіть назву";
+$text['description-name']['uk'] = "Введіть назву";
+$text['description-name']['de-at'] = "Geben Sie den Namen an.";
+$text['description-name']['he'] = "הכנס את השם";

 $text['description-info']['en-us'] = "Enter the description here.";
-$text['description-info']['ar-eg'] = "";
-$text['description-info']['de-at'] = "Geben Sie eine Beschreibung an."; //copied from de-de
-$text['description-info']['de-ch'] = "Geben Sie eine Beschreibung an."; //copied from de-de
-$text['description-info']['de-de'] = "Geben Sie eine Beschreibung an.";
 $text['description-info']['es-cl'] = "Ingrese descripción aquí.";
-$text['description-info']['es-mx'] = "Ingrese descripción aquí."; //copied from es-cl
-$text['description-info']['fr-ca'] = "";
-$text['description-info']['fr-fr'] = "";
-$text['description-info']['he-il'] = "הכנס תאור";
-$text['description-info']['it-it'] = "Inserire la descrizione qui.";
-$text['description-info']['nl-nl'] = "";
-$text['description-info']['pl-pl'] = "Wprowadź opis";
-$text['description-info']['pt-br'] = "Inisra uma descrição";
 $text['description-info']['pt-pt'] = "Insira a descrição aqui.";
-$text['description-info']['ro-ro'] = "";
-$text['description-info']['ru-ru'] = "Введите описание";
+$text['description-info']['fr-fr'] = "";
+$text['description-info']['pt-br'] = "Inisra uma descrição";
+$text['description-info']['pl'] = "Wprowadź opis";
 $text['description-info']['sv-se'] = "Ange beskrivning här.";
-$text['description-info']['uk-ua'] = "Введіть опис";
+$text['description-info']['uk'] = "Введіть опис";
+$text['description-info']['de-at'] = "Geben Sie eine Beschreibung an.";
+$text['description-info']['he'] = "הכנס תאור";

 $text['description-destination']['en-us'] = "Send the call to the extension an IVR Menu, Conference Room, or any other number.";
-$text['description-destination']['ar-eg'] = "";
-$text['description-destination']['de-at'] = "Der Anruf wird an eine Nebenstelle, eine Automatische Vermittlung, ein Konferenzraum oder jede andere Nummer weitergeleitet."; //copied from de-de
-$text['description-destination']['de-ch'] = "Der Anruf wird an eine Nebenstelle, eine Automatische Vermittlung, ein Konferenzraum oder jede andere Nummer weitergeleitet."; //copied from de-de
-$text['description-destination']['de-de'] = "Der Anruf wird an eine Nebenstelle, eine Automatische Vermittlung, ein Konferenzraum oder jede andere Nummer weitergeleitet.";
 $text['description-destination']['es-cl'] = "Enviar la llamada a extension a IVR, conferencias o cualquier otro número.";
-$text['description-destination']['es-mx'] = "Enviar la llamada a extension a IVR, conferencias o cualquier otro número."; //copied from es-cl
-$text['description-destination']['fr-ca'] = "Emettre l'appel vers un SVI, salle de conférence, ou tout autre numéro."; //copied from fr-fr
-$text['description-destination']['fr-fr'] = "Emettre l'appel vers un SVI, salle de conférence, ou tout autre numéro.";
-$text['description-destination']['he-il'] = "";
-$text['description-destination']['it-it'] = "Connetti la chiamata con un interno, un IVR, un'audioconferenza, o qualsiasi altro servizio.";
-$text['description-destination']['nl-nl'] = "";
-$text['description-destination']['pl-pl'] = "Wybierz numer docelowy.";
-$text['description-destination']['pt-br'] = "Enviar a chamada para a extensão de um menu de IVR, Sala de Conferência ou qualquer outro número. ";
 $text['description-destination']['pt-pt'] = "Enviar a chamada para a extensão de um menu de IVR, Sala de Conferência ou qualquer outro número.";
-$text['description-destination']['ro-ro'] = "";
-$text['description-destination']['ru-ru'] = "Отправить вызов на внутренний номер, IVR, конференцию или любой другой номер.";
+$text['description-destination']['fr-fr'] = "Emettre l'appel vers un SVI, salle de conférence, ou tout autre numéro.";
+$text['description-destination']['pt-br'] = "Enviar a chamada para a extensão de um menu de IVR, Sala de Conferência ou qualquer outro número. ";
+$text['description-destination']['pl'] = "Wybierz numer docelowy.";
 $text['description-destination']['sv-se'] = "Skicka samtalet till en anknytning, IVR Meny, Konferens Rum eller något annat nummer.";
-$text['description-destination']['uk-ua'] = "Відправити дзвінок на розширення, меню IVR, конференцію, або будь-який інший номер.";
+$text['description-destination']['uk'] = "Відправити дзвінок на розширення, меню IVR, конференцію, або будь-який інший номер.";
+$text['description-destination']['de-at'] = "Der Anruf wird auf diese Nebenstelle, eine Automatische Vermittlung, ein Konferenzraum oder jede andere Nummer weitergeleitet.";
+$text['description-destination']['he'] = "";

 $text['description-concurrent-limit']['en-us'] = "Limit the approximate number of concurrent calls. Leave this empty for no limit.";
-$text['description-concurrent-limit']['ar-eg'] = "";
-$text['description-concurrent-limit']['de-at'] = "Begrenzt die Anzahl gleichzeitiger Anrufe. Kein Limit wenn leer gelassen."; //copied from de-de
-$text['description-concurrent-limit']['de-ch'] = "Begrenzt die Anzahl gleichzeitiger Anrufe. Kein Limit wenn leer gelassen."; //copied from de-de
-$text['description-concurrent-limit']['de-de'] = "Begrenzt die Anzahl gleichzeitiger Anrufe. Kein Limit wenn leer gelassen.";
 $text['description-concurrent-limit']['es-cl'] = "Limitar el número de llamadas simultaneas. Deje en blanco para no establecer un límite.";
-$text['description-concurrent-limit']['es-mx'] = "Limitar el número de llamadas simultaneas. Deje en blanco para no establecer un límite."; //copied from es-cl
-$text['description-concurrent-limit']['fr-ca'] = "Limite le nombre d'appels concurrents. Laisser vide pour illimité."; //copied from fr-fr
-$text['description-concurrent-limit']['fr-fr'] = "Limite le nombre d'appels concurrents. Laisser vide pour illimité.";
-$text['description-concurrent-limit']['he-il'] = "";
-$text['description-concurrent-limit']['it-it'] = "Limita approssimativamente il numero di chiamate contemporanee. Lasciare vuoto per nessun limite.";
-$text['description-concurrent-limit']['nl-nl'] = "";
-$text['description-concurrent-limit']['pl-pl'] = "Ogranicz liczbę równoczesnych  połączeń. Aby nie było limitu zostaw to pole puste.";
-$text['description-concurrent-limit']['pt-br'] = "Limitar o número de chamadas simultâneas. Deixe este campo em branco para não ter limite.";
 $text['description-concurrent-limit']['pt-pt'] = "Limitar o número de chamadas concurrentes. Deixe este campo em branco para não ter limite.";
-$text['description-concurrent-limit']['ro-ro'] = "";
-$text['description-concurrent-limit']['ru-ru'] = "Ограничение примерного количества параллельных вызовов. Оставьте пустым для его отсутствия.";
+$text['description-concurrent-limit']['fr-fr'] = "Limite le nombre d'appels concurrents. Laisser vide pour illimité.";
+$text['description-concurrent-limit']['pt-br'] = "Limitar o número de chamadas simultâneas. Deixe este campo em branco para não ter limite.";
+$text['description-concurrent-limit']['pl'] = "Ogranicz liczbę równoczesnych  połączeń. Aby nie było limitu zostaw to pole puste.";
 $text['description-concurrent-limit']['sv-se'] = "Begränsa ungefärliga antalet samtidiga samtal. Lämna det här tomt för ingen gräns.";
-$text['description-concurrent-limit']['uk-ua'] = "Обмеження приблизної кількості одночасних дзвінків. Якщо пусто - без обмежень";
+$text['description-concurrent-limit']['uk'] = "Обмеження приблизної кількості одночасних дзвінків. Якщо пусто - без обмежень";
+$text['description-concurrent-limit']['de-at'] = "Limitiert die gleichzeitigen Anrufe. Kein Limit wenn leer gelassen.";
+$text['description-concurrent-limit']['he'] = "";

 $text['description-caller-id-number']['en-us'] = "Applicable if the provider that allow the Caller ID number to be sent. default: 0000000000";
-$text['description-caller-id-number']['ar-eg'] = "";
-$text['description-caller-id-number']['de-at'] = "Geben Sie die Anruferkennung (Nummer) hier ein."; //copied from de-de
-$text['description-caller-id-number']['de-ch'] = "Geben Sie die Anruferkennung (Nummer) hier ein."; //copied from de-de
-$text['description-caller-id-number']['de-de'] = "Geben Sie die Anruferkennung (Nummer) hier ein.";
-$text['description-caller-id-number']['es-cl'] = "";
-$text['description-caller-id-number']['es-mx'] = "";
-$text['description-caller-id-number']['fr-ca'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du numéro d'appelant. Par défaut: 0000000000"; //copied from fr-fr
-$text['description-caller-id-number']['fr-fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du numéro d'appelant. Par défaut: 0000000000";
-$text['description-caller-id-number']['he-il'] = "";
-$text['description-caller-id-number']['it-it'] = "Si usa se il provider permette la modifica del numero chiamante. Default: 0000000000";
-$text['description-caller-id-number']['nl-nl'] = "";
-$text['description-caller-id-number']['pl-pl'] = "Zastosowane w przypadku jeżeli operator zezwala na prezentację numeru. Standardowo prezentacja jest w formacie: 0000000000";
-$text['description-caller-id-number']['pt-br'] = "Aplicável se o provedor permitir o envio do número do originador das chamadas. Omissão: 0000000000.";
 $text['description-caller-id-number']['pt-pt'] = "Aplicável se o provedor permitir o envio do número do originador das chamadas. Omissão: 0000000000";
-$text['description-caller-id-number']['ro-ro'] = "";
-$text['description-caller-id-number']['ru-ru'] = "Используется, если провайдер поддерживает передачу CallerID(number). По умолчанию: 0000000000";
+$text['description-caller-id-number']['fr-fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du numéro d'appelant. Par défaut: 0000000000";
+$text['description-caller-id-number']['pt-br'] = "Aplicável se o provedor permitir o envio do número do originador das chamadas. Omissão: 0000000000.";
+$text['description-caller-id-number']['pl'] = "Zastosowane w przypadku jeżeli operator zezwala na prezentację numeru. Standardowo prezentacja jest w formacie: 0000000000";
 $text['description-caller-id-number']['sv-se'] = "Gäller om leverantör tillåter att Caller ID nummer skickas. Standard: 0000000000";
-$text['description-caller-id-number']['uk-ua'] = "Стосується, якщо постачальник, дозволяє надсилати номер абонента (Caller ID номер). За замовчуванням: 0000000000";
+$text['description-caller-id-number']['uk'] = "Стосується, якщо постачальник, дозволяє надсилати номер абонента (Caller ID номер). За замовчуванням: 0000000000";
+$text['description-caller-id-number']['de-at'] = "Geben Sie die Anruferkennung (Nummer) hier ein.";
+$text['description-caller-id-number']['he'] = "";

 $text['description-caller-id-name']['en-us'] = "Applicable if the provider allow the Caller ID Name to be set. default: anonymous";
-$text['description-caller-id-name']['ar-eg'] = "";
-$text['description-caller-id-name']['de-at'] = "Geben Sie die Anruferkennung (Name) hier ein, sofern der Provider dieses unterstützt. Default: anonym."; //copied from de-de
-$text['description-caller-id-name']['de-ch'] = "Geben Sie die Anruferkennung (Name) hier ein, sofern der Provider dieses unterstützt. Default: anonym."; //copied from de-de
-$text['description-caller-id-name']['de-de'] = "Geben Sie die Anruferkennung (Name) hier ein, sofern der Provider dieses unterstützt. Default: anonym.";
 $text['description-caller-id-name']['es-cl'] = "Applicable si el proveedor permite enviar el número de origen. Por defecto: 0000000000";
-$text['description-caller-id-name']['es-mx'] = "Applicable si el proveedor permite enviar el número de origen. Por defecto: 0000000000"; //copied from es-cl
-$text['description-caller-id-name']['fr-ca'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du nom d'appelant. Par défaut: anonymous"; //copied from fr-fr
-$text['description-caller-id-name']['fr-fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du nom d'appelant. Par défaut: anonymous";
-$text['description-caller-id-name']['he-il'] = "";
-$text['description-caller-id-name']['it-it'] = "Si usa se il provider permette la modifica del nome chiamante. Default: anonymous";
-$text['description-caller-id-name']['nl-nl'] = "";
-$text['description-caller-id-name']['pl-pl'] = "Zastosowane w przypadku jeżeli operator zezwala na prezentację nazwy. Standardowo prezentacja jest w formacie: 0000000000";
-$text['description-caller-id-name']['pt-br'] = "Aplicável se o provedor de telefônia liberar o nome de quem está discando. Por padrão: anonymous (anônimo).";
 $text['description-caller-id-name']['pt-pt'] = "Aplicável se o provedor permitir o envio do nome do originador das chamadas. Omissão: anonymous";
-$text['description-caller-id-name']['ro-ro'] = "";
-$text['description-caller-id-name']['ru-ru'] = "Используется, если провайдер поддерживает передачу CallerID(name). По умолчанию: anonymous";
+$text['description-caller-id-name']['fr-fr'] = "Applicable uniquement si le fournisseur d'accès authorise l'acheminement du nom d'appelant. Par défaut: anonymous";
+$text['description-caller-id-name']['pt-br'] = "Aplicável se o provedor de telefônia liberar o nome de quem está discando. Por padrão: anonymous (anônimo).";
+$text['description-caller-id-name']['pl'] = "Zastosowane w przypadku jeżeli operator zezwala na prezentację nazwy. Standardowo prezentacja jest w formacie: 0000000000";
 $text['description-caller-id-name']['sv-se'] = "Gäller om leverantör tillåter att Caller ID namn skickas. Standard: anonymous";
-$text['description-caller-id-name']['uk-ua'] = "Стосується, якщо постачальник, дозволяє надсилати ім’я абонента (Caller ID Ім’я). За замовчуванням: anonymous";
+$text['description-caller-id-name']['uk'] = "Стосується, якщо постачальник, дозволяє надсилати ім’я абонента (Caller ID Ім’я). За замовчуванням: anonymous";
+$text['description-caller-id-name']['de-at'] = "Geben Sie die Anruferkennung (Name) hier ein.";
+$text['description-caller-id-name']['he'] = "";

 $text['description-avmd']['en-us'] = "Select whether to enable or disable the detection of voicemail messaging and answering machine systems.";
-$text['description-avmd']['ar-eg'] = "";
-$text['description-avmd']['de-at'] = "Wählen Sie ob die Erkennung von Sprach-Mailboxen und automatischen Anrufbeantwortern Ein- oder Ausgeschaltet werden soll."; //copied from de-de
-$text['description-avmd']['de-ch'] = "Wählen Sie ob die Erkennung von Sprach-Mailboxen und automatischen Anrufbeantwortern Ein- oder Ausgeschaltet werden soll."; //copied from de-de
-$text['description-avmd']['de-de'] = "Wählen Sie ob die Erkennung von Sprach-Mailboxen und automatischen Anrufbeantwortern Ein- oder Ausgeschaltet werden soll.";
 $text['description-avmd']['es-cl'] = "Seleccione si desea activar o desactivar la detección de sistemas de contestador automático de mensajes de correo de voz y.";
-$text['description-avmd']['es-mx'] = "Seleccione si desea activar o desactivar la detección de sistemas de contestador automático de mensajes de correo de voz y."; //copied from es-cl
-$text['description-avmd']['fr-ca'] = "Indiquez si vous souhaitez activer ou désactiver la détection de la messagerie vocale et les systèmes de machines de répondeur."; //copied from fr-fr
-$text['description-avmd']['fr-fr'] = "Indiquez si vous souhaitez activer ou désactiver la détection de la messagerie vocale et les systèmes de machines de répondeur.";
-$text['description-avmd']['he-il'] = "";
-$text['description-avmd']['it-it'] = "Selezionare se si vuole abilitare o disabilitare il rilevamento delle segreterie telefoniche e dei messaggi registrati.";
-$text['description-avmd']['nl-nl'] = "";
-$text['description-avmd']['pl-pl'] = "Wybierz, czy chcesz włączyć lub wyłączyć wykrywanie wiadomości poczty głosowej lub innych systemów automatycznego odbierania rozmów.";
-$text['description-avmd']['pt-br'] = "Selecione se deseja ativar ou desativar a detecção de mensagens de correio de voz e sistemas de secretária eletrônica."; //copied from pt-pt
 $text['description-avmd']['pt-pt'] = "Selecione se deseja ativar ou desativar a detecção de mensagens de correio de voz e sistemas de secretária eletrônica.";
-$text['description-avmd']['ro-ro'] = "";
-$text['description-avmd']['ru-ru'] = "Выберите, стоит ли использовать систему определения голосовой почты или автоответчика.";
+$text['description-avmd']['fr-fr'] = "Indiquez si vous souhaitez activer ou désactiver la détection de la messagerie vocale et les systèmes de machines de répondeur.";
+$text['description-avmd']['pt-br'] = "Selecione se deseja ativar ou desativar a detecção de mensagens de correio de voz e sistemas de secretária eletrônica.";
+$text['description-avmd']['pl'] = "Wybierz, czy chcesz włączyć lub wyłączyć wykrywanie wiadomości poczty głosowej lub innych systemów automatycznego odbierania rozmów.";
 $text['description-avmd']['sv-se'] = "Välj om deteketering av röstbrevlåda skall användas.";
-$text['description-avmd']['uk-ua'] = "Виберіть, чи слід включити або відключити виявлення повідомлень голосової пошти і систему автовідповідача.";
+$text['description-avmd']['uk'] = "Виберіть, чи слід включити або відключити виявлення повідомлень голосової пошти і систему автовідповідача.";
+$text['description-avmd']['de-at'] = "Wählen Sie ob die Erkennung von Mailboxen und automatischen Anrufbeantwortern Ein- oder Ausgeschaltet werden soll.";
+$text['description-avmd']['he'] = "";

 $text['confirm-update']['en-us'] = "Update Complete";
-$text['confirm-update']['ar-eg'] = "";
-$text['confirm-update']['de-at'] = "Aktualisierung durchgeführt"; //copied from de-de
-$text['confirm-update']['de-ch'] = "Aktualisierung durchgeführt"; //copied from de-de
-$text['confirm-update']['de-de'] = "Aktualisierung durchgeführt";
 $text['confirm-update']['es-cl'] = "Actualización Completa";
-$text['confirm-update']['es-mx'] = "Actualización Completa"; //copied from es-cl
-$text['confirm-update']['fr-ca'] = "Mis à jour"; //copied from fr-fr
-$text['confirm-update']['fr-fr'] = "Mis à jour";
-$text['confirm-update']['he-il'] = "עידכון הושלם";
-$text['confirm-update']['it-it'] = "Aggiornamento Completato.";
-$text['confirm-update']['nl-nl'] = "";
-$text['confirm-update']['pl-pl'] = "Aktualizacja zakonczona";
-$text['confirm-update']['pt-br'] = "Atualização Efetuada";
 $text['confirm-update']['pt-pt'] = "Actualização Efectuada";
-$text['confirm-update']['ro-ro'] = "";
-$text['confirm-update']['ru-ru'] = "Обновление завершено";
+$text['confirm-update']['fr-fr'] = "Mis à jour";
+$text['confirm-update']['pt-br'] = "Atualização Efetuada";
+$text['confirm-update']['pl'] = "Aktualizacja zakonczona";
 $text['confirm-update']['sv-se'] = "Uppdatering Klar";
-$text['confirm-update']['uk-ua'] = "Оновлення завершено";
+$text['confirm-update']['uk'] = "Оновлення завершено";
+$text['confirm-update']['de-at'] = "Aktualisierung durchgeführt";
+$text['confirm-update']['he'] = "עידכון הושלם";

 $text['confirm-name']['en-us'] = "Please provide: Name";
-$text['confirm-name']['ar-eg'] = "";
-$text['confirm-name']['de-at'] = "Bitte geben Sie den Namen an"; //copied from de-de
-$text['confirm-name']['de-ch'] = "Bitte geben Sie den Namen an"; //copied from de-de
-$text['confirm-name']['de-de'] = "Bitte geben Sie den Namen an";
 $text['confirm-name']['es-cl'] = "Por favor agregue: Nombre";
-$text['confirm-name']['es-mx'] = "Por favor agregue: Nombre"; //copied from es-cl
-$text['confirm-name']['fr-ca'] = "Merci d'indiquer: Nom"; //copied from fr-fr
-$text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom";
-$text['confirm-name']['he-il'] = "";
-$text['confirm-name']['it-it'] = "Prego fornire: Nome";
-$text['confirm-name']['nl-nl'] = "";
-$text['confirm-name']['pl-pl'] = "Wprowadź: Nazwę";
-$text['confirm-name']['pt-br'] = "Por favor insira: Nome";
 $text['confirm-name']['pt-pt'] = "Por favor indique: Nome";
-$text['confirm-name']['ro-ro'] = "";
-$text['confirm-name']['ru-ru'] = "Пожалуйста, укажите: Имя";
+$text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom";
+$text['confirm-name']['pt-br'] = "Por favor insira: Nome";
+$text['confirm-name']['pl'] = "Wprowadź: Nazwę";
 $text['confirm-name']['sv-se'] = "Ange: Namn";
-$text['confirm-name']['uk-ua'] = "Введіть назву";
+$text['confirm-name']['uk'] = "Введіть назву";
+$text['confirm-name']['de-at'] = "Bitte geben Sie den Namen an";
+$text['confirm-name']['he'] = "";

 $text['confirm-delete-info']['en-us'] = "Do you really want to delete this?";
-$text['confirm-delete-info']['ar-eg'] = "";
-$text['confirm-delete-info']['de-at'] = "Wollen Sie das wirklich löschen?"; //copied from de-de
-$text['confirm-delete-info']['de-ch'] = "Wollen Sie das wirklich löschen?"; //copied from de-de
-$text['confirm-delete-info']['de-de'] = "Wollen Sie das wirklich löschen?";
 $text['confirm-delete-info']['es-cl'] = "¿Desea realmente eliminar esto?";
-$text['confirm-delete-info']['es-mx'] = "¿Desea realmente eliminar esto?"; //copied from es-cl
-$text['confirm-delete-info']['fr-ca'] = "Voulez-vous vraiment supprimer cela?"; //copied from fr-fr
-$text['confirm-delete-info']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
-$text['confirm-delete-info']['he-il'] = "";
-$text['confirm-delete-info']['it-it'] = "Vuoi veramente cancellarlo?";
-$text['confirm-delete-info']['nl-nl'] = "";
-$text['confirm-delete-info']['pl-pl'] = "Czy na pewno chcesz to usunąć?";
-$text['confirm-delete-info']['pt-br'] = "Deseja realmente remover isto?"; //copied from pt-pt
 $text['confirm-delete-info']['pt-pt'] = "Deseja realmente remover isto?";
-$text['confirm-delete-info']['ro-ro'] = "";
-$text['confirm-delete-info']['ru-ru'] = "Вы действительно хотите это удалить?";
+$text['confirm-delete-info']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+$text['confirm-delete-info']['pt-br'] = "Deseja realmente remover isto?";
+$text['confirm-delete-info']['pl'] = "Czy na pewno chcesz to usunąć?";
 $text['confirm-delete-info']['sv-se'] = "Vill du verkligen ta bort detta?";
-$text['confirm-delete-info']['uk-ua'] = "Ви дійсно бажаєте це видалити?";
+$text['confirm-delete-info']['uk'] = "Ви дійсно бажаєте це видалити?";
+$text['confirm-delete-info']['de-at'] = "Wollen Sie das wirklich löschen?";
+$text['confirm-delete-info']['he'] = "";

 $text['confirm-add']['en-us'] = "Add Complete";
-$text['confirm-add']['ar-eg'] = "";
-$text['confirm-add']['de-at'] = "Erfolgreich hinzugefügt"; //copied from de-de
-$text['confirm-add']['de-ch'] = "Erfolgreich hinzugefügt"; //copied from de-de
-$text['confirm-add']['de-de'] = "Erfolgreich hinzugefügt";
 $text['confirm-add']['es-cl'] = "Ingreso Completo";
-$text['confirm-add']['es-mx'] = "Ingreso Completo"; //copied from es-cl
-$text['confirm-add']['fr-ca'] = "Ajouté"; //copied from fr-fr
-$text['confirm-add']['fr-fr'] = "Ajouté";
-$text['confirm-add']['he-il'] = "הוספה הושלמה";
-$text['confirm-add']['it-it'] = "Inserimento Completato";
-$text['confirm-add']['nl-nl'] = "";
-$text['confirm-add']['pl-pl'] = "Dodano poprawnie";
-$text['confirm-add']['pt-br'] = "Criação efetuada";
 $text['confirm-add']['pt-pt'] = "Adição Efectuada";
-$text['confirm-add']['ro-ro'] = "";
-$text['confirm-add']['ru-ru'] = "Добавление завершено";
+$text['confirm-add']['fr-fr'] = "Ajouté";
+$text['confirm-add']['pt-br'] = "Criação efetuada";
+$text['confirm-add']['pl'] = "Dodano poprawnie";
 $text['confirm-add']['sv-se'] = "Tillagd";
-$text['confirm-add']['uk-ua'] = "Додано";
+$text['confirm-add']['uk'] = "Додано";
+$text['confirm-add']['de-at'] = "Erfolgreich hinzugefügt";
+$text['confirm-add']['he'] = "הוספה הושלמה";

 $text['button-stop']['en-us'] = "Stop Broadcast";
-$text['button-stop']['ar-eg'] = "";
-$text['button-stop']['de-at'] = "Rundruf beenden"; //copied from de-de
-$text['button-stop']['de-ch'] = "Rundruf beenden"; //copied from de-de
-$text['button-stop']['de-de'] = "Rundruf beenden";
 $text['button-stop']['es-cl'] = "Detener Broadcast";
-$text['button-stop']['es-mx'] = "Detener Broadcast"; //copied from es-cl
-$text['button-stop']['fr-ca'] = "Arrêter la diffusion"; //copied from fr-fr
-$text['button-stop']['fr-fr'] = "Arrêter la diffusion";
-$text['button-stop']['he-il'] = "";
-$text['button-stop']['it-it'] = "Interrompi Chiamate";
-$text['button-stop']['nl-nl'] = "";
-$text['button-stop']['pl-pl'] = "Zatrzymaj rozsylanie rozmów";
-$text['button-stop']['pt-br'] = "Pausar Broadcast";
 $text['button-stop']['pt-pt'] = "Parar Broadcast";
-$text['button-stop']['ro-ro'] = "";
-$text['button-stop']['ru-ru'] = "Остановить";
+$text['button-stop']['fr-fr'] = "Arrêter la diffusion";
+$text['button-stop']['pt-br'] = "Pausar Broadcast";
+$text['button-stop']['pl'] = "Zatrzymaj rozsylanie rozmów";
 $text['button-stop']['sv-se'] = "Stoppa Samtalsdistribution";
-$text['button-stop']['uk-ua'] = "Зупинити трансляцію";
+$text['button-stop']['uk'] = "Зупинити трансляцію";
+$text['button-stop']['de-at'] = "Stopp";
+$text['button-stop']['he'] = "";

 $text['button-send']['en-us'] = "Send Broadcast";
-$text['button-send']['ar-eg'] = "";
-$text['button-send']['de-at'] = "Rundruf senden"; //copied from de-de
-$text['button-send']['de-ch'] = "Rundruf senden"; //copied from de-de
-$text['button-send']['de-de'] = "Rundruf senden";
 $text['button-send']['es-cl'] = "Enviar Llamada Masiva";
-$text['button-send']['es-mx'] = "Enviar Llamada Masiva"; //copied from es-cl
-$text['button-send']['fr-ca'] = "Lancer les appels"; //copied from fr-fr
-$text['button-send']['fr-fr'] = "Lancer les appels";
-$text['button-send']['he-il'] = "נשלח";
-$text['button-send']['it-it'] = "Invia Chiamate";
-$text['button-send']['nl-nl'] = "";
-$text['button-send']['pl-pl'] = "Wysłane";
-$text['button-send']['pt-br'] = "Enviar Broadcast"; //copied from pt-pt
 $text['button-send']['pt-pt'] = "Enviar Broadcast";
-$text['button-send']['ro-ro'] = "";
-$text['button-send']['ru-ru'] = "Запустить";
+$text['button-send']['fr-fr'] = "Lancer les appels";
+$text['button-send']['pt-br'] = "Enviar Broadcast";
+$text['button-send']['pl'] = "Wysłane";
 $text['button-send']['sv-se'] = "Skicka Samtalsdistribution";
-$text['button-send']['uk-ua'] = "Транслювати";
+$text['button-send']['uk'] = "Транслювати";
+$text['button-send']['de-at'] = "Senden";
+$text['button-send']['he'] = "נשלח";

-?>
+?>
@@ -1,30 +1,19 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Call Broadcast";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Rundrufe";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Rundrufe";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Llamada Broadcast";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Campagne d'Appels";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Chiamate Multiple";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Rozsyłanie rozmów";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Chamada em broadcast";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Chamada em Broadcast";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Массовые вызовы";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Samtalsdistribution";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Трансляція дзвінка";
-	$apps[$x]['menu'][$y]['uuid'] = "50153bbf-78c5-b49e-7bd9-4b3e4b1134e6";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$apps[$x]['menu'][$y]['path'] = "/app/call_broadcast/call_broadcast.php";
+$apps[$x]['menu'][0]['title']['en-us'] = "Call Broadcast";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Llamada Broadcast";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Campagne d'Appels";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Chamada em Broadcast";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Chamada em broadcast";
+$apps[$x]['menu'][0]['title']['pl'] = "Rozsyłanie rozmów";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Samtalsdistribution";
+$apps[$x]['menu'][0]['title']['uk'] = "Трансляція дзвінка";
+$apps[$x]['menu'][0]['title']['de-at'] = "Automatische Anrufe";
+$apps[$x]['menu'][0]['uuid'] = "50153bbf-78c5-b49e-7bd9-4b3e4b1134e6";
+$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['groups'][] = "admin";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['path'] = "/app/call_broadcast/call_broadcast.php";

-?>
+?>
@@ -54,7 +54,7 @@ else {
 	}


-messages::add($text['confirm-delete']);
+$_SESSION["message"] = $text['confirm-delete'];
 header("Location: call_broadcast.php");
 return;

@@ -166,7 +166,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);

-			messages::add($text['confirm-add']);
+			$_SESSION["message"] = $text['confirm-add'];
 			header("Location: call_broadcast.php");
 			return;
 		} //if ($action == "add")
@@ -201,7 +201,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);

-			messages::add($text['confirm-update']);
+			$_SESSION["message"] = $text['confirm-update'];
 			header("Location: call_broadcast.php");
 			return;
 		} //if ($action == "update")
@@ -52,7 +52,7 @@ else {
 		if ($fp) {
 			$cmd = "sched_del ".$uuid;
 			$result = event_socket_request($fp, 'api '.$cmd);
-			messages::add(htmlentities($result));
+			$_SESSION['message'] = htmlentities($result);
 		}
 	}

@@ -5,39 +5,29 @@
 		$apps[$x]['uuid'] = "3f159f62-ca2d-41b8-b3f0-c5519cebbc5a";
 		$apps[$x]['category'] = "Switch";;
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Shows active calls, and agents in the call center queue.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Zeigt aktive Anrufe und Agenten in der Callcenter Warteschlange.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Zeigt aktive Anrufe und Agenten in der Callcenter Warteschlange.";
 		$apps[$x]['description']['es-cl'] = "Muestra las llamadas activas y los agentes en la cola del centro de llamadas.";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "Il montre les appels actives et des agents en queue du centre d'appels.";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Affiche les appels actifs et les agents en queue sur le centre d'appel.";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "Mostra as chamadas ativas, e os agentes na fila do Call Center.";
+		$apps[$x]['description']['fr-ca'] = "Il montre les appels actives et des agents en queue du centre d'appels.";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Mostra as chamadas ativas e agentes na fila do centro de chamadas.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "Mostra as chamadas ativas, e os agentes na fila do Call Center.";

 	//permission details
-		$y=0;
-		$apps[$x]['permissions'][$y]['name'] = "call_center_active_view";
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = "7fb0dd87-e984-9980-c512-2c76b887aeb2";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_center_active_options";
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = "7fb0dd87-e984-9980-c512-2c76b887aeb2";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][0]['name'] = "call_center_active_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "7fb0dd87-e984-9980-c512-2c76b887aeb2";
+		$apps[$x]['permissions'][0]['groups'][] = "admin";
+		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
+
+		$apps[$x]['permissions'][1]['name'] = "call_center_active_options";
+		$apps[$x]['permissions'][1]['menu']['uuid'] = "7fb0dd87-e984-9980-c512-2c76b887aeb2";
+		$apps[$x]['permissions'][1]['groups'][] = "admin";
+		$apps[$x]['permissions'][1]['groups'][] = "superadmin";

 ?>
@@ -1,30 +1,19 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Active Call Center";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Aktive Callcenter";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Aktive Callcenter";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Centro de Llamada Activo";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Centre d'Appels Active";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Centre d'Appel Actif";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Call Center Attivi";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Aktywność w Call Center ";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Call Center ativos";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Centro de Chamadas Activo";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Активные Колл-центры";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Aktivt Call Center";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "7fb0dd87-e984-9980-c512-2c76b887aeb2";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/call_center_active/call_center_queue.php";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Active Call Center";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Centro de Llamada Activo";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Centre d'Appel Actif";
+$apps[$x]['menu'][0]['title']['fr-ca'] = "Centre d'Appels Active";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Centro de Chamadas Activo";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Call Center ativos";
+$apps[$x]['menu'][0]['title']['pl'] = "Aktywność w Call Center ";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Aktivt Call Center";
+$apps[$x]['menu'][0]['title']['de-at'] = "Aktive Callcenter";
+$apps[$x]['menu'][0]['uuid'] = "7fb0dd87-e984-9980-c512-2c76b887aeb2";
+$apps[$x]['menu'][0]['parent_uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/call_center_active/call_center_queue.php";
+$apps[$x]['menu'][0]['groups'][] = "admin";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";

 ?>
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
 	FusionPBX
 	Version: MPL 1.1
@@ -17,112 +17,102 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2017
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	include "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_active_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+include "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_active_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

 //get the queue_name and set it as a variable
-	$queue_name = $_GET['queue_name'];
-	$name = $_GET['name'];
+	$queue_name = $_GET[queue_name];

 //get the header
 	require_once "resources/header.php";
 	$document['title'] = $text['title-call_center_queue_activity'];

-//add the ajax
-	?><script type="text/javascript">
-	function loadXmlHttp(url, id) {
-		var f = this;
+?><script type="text/javascript">
+function loadXmlHttp(url, id) {
+	var f = this;
+	f.xmlHttp = null;
+	/*@cc_on @*/ // used here and below, limits try/catch to those IE browsers that both benefit from and support it
+	/*@if(@_jscript_version >= 5) // prevents errors in old browsers that barf on try/catch & problems in IE if Active X disabled
+	try {f.ie = window.ActiveXObject}catch(e){f.ie = false;}
+	@end @*/
+	if (window.XMLHttpRequest&&!f.ie||/^http/.test(window.location.href))
+		f.xmlHttp = new XMLHttpRequest(); // Firefox, Opera 8.0+, Safari, others, IE 7+ when live - this is the standard method
+	else if (/(object)|(function)/.test(typeof createRequest))
+		f.xmlHttp = createRequest(); // ICEBrowser, perhaps others
+	else {
 		f.xmlHttp = null;
-		/*@cc_on @*/ // used here and below, limits try/catch to those IE browsers that both benefit from and support it
-		/*@if(@_jscript_version >= 5) // prevents errors in old browsers that barf on try/catch & problems in IE if Active X disabled
-		try {f.ie = window.ActiveXObject}catch(e){f.ie = false;}
+		 // Internet Explorer 5 to 6, includes IE 7+ when local //
+		/*@cc_on @*/
+		/*@if(@_jscript_version >= 5)
+		try{f.xmlHttp=new ActiveXObject("Msxml2.XMLHTTP");}
+		catch (e){try{f.xmlHttp=new ActiveXObject("Microsoft.XMLHTTP");}catch(e){f.xmlHttp=null;}}
 		@end @*/
-		if (window.XMLHttpRequest&&!f.ie||/^http/.test(window.location.href))
-			f.xmlHttp = new XMLHttpRequest(); // Firefox, Opera 8.0+, Safari, others, IE 7+ when live - this is the standard method
-		else if (/(object)|(function)/.test(typeof createRequest))
-			f.xmlHttp = createRequest(); // ICEBrowser, perhaps others
-		else {
-			f.xmlHttp = null;
-			 // Internet Explorer 5 to 6, includes IE 7+ when local //
-			/*@cc_on @*/
-			/*@if(@_jscript_version >= 5)
-			try{f.xmlHttp=new ActiveXObject("Msxml2.XMLHTTP");}
-			catch (e){try{f.xmlHttp=new ActiveXObject("Microsoft.XMLHTTP");}catch(e){f.xmlHttp=null;}}
-			@end @*/
-		}
-		if(f.xmlHttp != null) {
-			f.el = document.getElementById(id);
-			f.xmlHttp.open("GET",url,true);
-			f.xmlHttp.onreadystatechange = function(){f.stateChanged();};
-			f.xmlHttp.send(null);
-		}
 	}
+	if(f.xmlHttp != null){
+		f.el = document.getElementById(id);
+		f.xmlHttp.open("GET",url,true);
+		f.xmlHttp.onreadystatechange = function(){f.stateChanged();};
+		f.xmlHttp.send(null);
+	}
+}

-	loadXmlHttp.prototype.stateChanged=function () {
-	if (this.xmlHttp.readyState == 4 && (this.xmlHttp.status == 200 || !/^http/.test(window.location.href)))
-		//this.el.innerHTML = this.xmlHttp.responseText;
-		document.getElementById('ajax_response').innerHTML = this.xmlHttp.responseText;
-	}
+loadXmlHttp.prototype.stateChanged=function () {
+if (this.xmlHttp.readyState == 4 && (this.xmlHttp.status == 200 || !/^http/.test(window.location.href)))
+	//this.el.innerHTML = this.xmlHttp.responseText;
+	document.getElementById('ajax_response').innerHTML = this.xmlHttp.responseText;
+}

-	var requestTime = function() {
-		var url = 'call_center_active_inc.php?queue_name=<?php echo $queue_name; ?>&name=<?php echo urlencode($name); ?>';
-		new loadXmlHttp(url, 'ajax_response');
-		<?php
-		if (strlen($_SESSION["ajax_refresh_rate"]) == 0) { $_SESSION["ajax_refresh_rate"] = "1777"; }
-		echo "setInterval(function(){new loadXmlHttp(url, 'ajax_reponse');}, ".$_SESSION["ajax_refresh_rate"].");";
-		?>
-	}
+var requestTime = function() {
+	var url = 'call_center_active_inc.php?queue_name=<?php echo $queue_name; ?>';
+	new loadXmlHttp(url, 'ajax_response');
+	<?php
+	if (strlen($_SESSION["ajax_refresh_rate"]) == 0) { $_SESSION["ajax_refresh_rate"] = "1777"; }
+	echo "setInterval(function(){new loadXmlHttp(url, 'ajax_reponse');}, ".$_SESSION["ajax_refresh_rate"].");";
+	?>
+}

-	if (window.addEventListener) {
-		window.addEventListener('load', requestTime, false);
-	}
-	else if (window.attachEvent) {
-		window.attachEvent('onload', requestTime);
-	}
+if (window.addEventListener) {
+	window.addEventListener('load', requestTime, false);
+}
+else if (window.attachEvent) {
+	window.attachEvent('onload', requestTime);
+}

-	function send_cmd(url) {
-		if (window.XMLHttpRequest) { // code for IE7+, Firefox, Chrome, Opera, Safari
-			xmlhttp=new XMLHttpRequest();
-		}
-		else {// code for IE6, IE5
-			xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
-		}
-		xmlhttp.open("GET",url,false);
-		xmlhttp.send(null);
-		//document.getElementById('cmd_response').innerHTML=xmlhttp.responseText;
+function send_cmd(url) {
+	if (window.XMLHttpRequest) { // code for IE7+, Firefox, Chrome, Opera, Safari
+		xmlhttp=new XMLHttpRequest();
 	}
+	else {// code for IE6, IE5
+		xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	xmlhttp.open("GET",url,false);
+	xmlhttp.send(null);
+	//document.getElementById('cmd_response').innerHTML=xmlhttp.responseText;
+}

-	</script>
+</script>

 <?php
+echo "	<div id='ajax_response'></div>\n";
+echo "<br><br>";

-//show the response
-	echo "	<div id='ajax_response'></div>\n";
-	echo "<br><br>";
-
-//include the footer
-	require_once "resources/footer.php";
-
+require_once "resources/footer.php";
 ?>
@@ -17,39 +17,35 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2016
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	James Rose <james.o.rose@gmail.com>
 */
-
-//includes
-	include "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_active_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+include "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_active_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

 //get the queue_name and set it as a variable
-	$queue_name = $_GET['queue_name'];
+	$queue_name = $_GET[queue_name].'@'. $_SESSION['domains'][$domain_uuid]['domain_name'];

 //convert the string to a named array
 	function str_to_named_array($tmp_str, $tmp_delimiter) {
 		$tmp_array = explode ("\n", $tmp_str);
-		$result = array();
+		$result = '';
 		if (trim(strtoupper($tmp_array[0])) != "+OK") {
 			$tmp_field_name_array = explode ($tmp_delimiter, $tmp_array[0]);
 			$x = 0;
@@ -110,15 +106,13 @@

 			//prepare the result for array_multisort
 				$x = 0;
-				if (is_array($result)) {
-					foreach ($result as $row) {
-						$tier_result[$x]['level'] = $row['level'];
-						$tier_result[$x]['position'] = $row['position'];
-						$tier_result[$x]['agent'] = $row['agent'];
-						$tier_result[$x]['state'] = trim($row['state']);
-						$tier_result[$x]['queue'] = $row['queue'];
-						$x++;
-					}
+				if (isset($result)) foreach ($result as $row) {
+					$tier_result[$x]['level'] = $row['level'];
+					$tier_result[$x]['position'] = $row['position'];
+					$tier_result[$x]['agent'] = $row['agent'];
+					$tier_result[$x]['state'] = trim($row['state']);
+					$tier_result[$x]['queue'] = $row['queue'];
+					$x++;
 				}

 			//sort the array //SORT_ASC, SORT_DESC, SORT_REGULAR, SORT_NUMERIC, SORT_STRING
@@ -130,16 +124,6 @@
 				$event_socket_str = trim(event_socket_request($fp, 'api '.$switch_cmd));
 				$agent_result = str_to_named_array($event_socket_str, '|');

-			//get the agents from the database
-				if (!is_array($_SESSION['agents'])) {
-					$sql = "select * from v_call_center_agents ";
-					$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-					$sql .= "order by agent_name ASC ";
-					$prep_statement = $db->prepare(check_sql($sql));
-					$prep_statement->execute();
-					$_SESSION['agents'] = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-				}
-
 			//list the agents
 				echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 				echo "<tr>\n";
@@ -168,23 +152,15 @@

 					if (isset($agent_result)) foreach ($agent_result as $agent_row) {
 						if ($tier_row['agent'] == $agent_row['name']) {
-							$agent_uuid = $agent_row['name'];
-
-							//get the agent name
-							$agent_name = '';
-							if (is_array($_SESSION['agents'])) foreach ($_SESSION['agents'] as $agent) {
-								if ($agent['call_center_agent_uuid'] = $agent_uuid) {
-									$agent_name = $agent['agent_name'];
-								}
-							}
-
+							$name = $agent_row['name'];
+							$name = str_replace('@'.$_SESSION['domain_name'], '', $name);
 							//$system = $agent_row['system'];
-							$agent_uuid = $agent_row['uuid'];
+							$a_uuid = $agent_row['uuid'];
 							//$type = $agent_row['type'];
 							$contact = $agent_row['contact'];
-							$agent_extension = preg_replace("/user\//", "", $contact);
-							$agent_extension = preg_replace("/@.*/", "", $agent_extension);
-							$agent_extension = preg_replace("/{.*}/", "", $agent_extension);
+							$a_exten = preg_replace("/user\//", "", $contact);
+							$a_exten = preg_replace("/@.*/", "", $a_exten);
+							$a_exten = preg_replace("/{.*}/", "", $a_exten);
 							$status = $agent_row['status'];
 							$state = $agent_row['state'];
 							$max_no_answer = $agent_row['max_no_answer'];
@@ -217,8 +193,8 @@
 							$last_status_change_length = $last_status_change_length_hour.':'.$last_status_change_length_min.':'.$last_status_change_length_sec;

 							echo "<tr>\n";
-							echo "<td valign='top' class='".$row_style[$c]."'>".$agent_name."</td>\n";
-							echo "<td valign='top' class='".$row_style[$c]."'>".$agent_extension."</td>\n";
+							echo "<td valign='top' class='".$row_style[$c]."'>".$name."</td>\n";
+							echo "<td valign='top' class='".$row_style[$c]."'>".$a_exten."</td>\n";
 							echo "<td valign='top' class='".$row_style[$c]."'>".$status."</td>\n";
 							echo "<td valign='top' class='".$row_style[$c]."'>".$state."</td>\n";
 							echo "<td valign='top' class='".$row_style[$c]."'>".$last_status_change_length."</td>\n";
@@ -234,20 +210,20 @@

 								//need to check state to so only waiting gets call, and trying/answer gets eavesdrop
 								if ($tier_state == "Offering" || $tier_state == "Active Inbound") {
-									$orig_command="{origination_caller_id_name=eavesdrop,origination_caller_id_number=".$agent_extension."}user/".$_SESSION['user']['extension'][0]['user']."@".$_SESSION['domain_name']." %26eavesdrop(".$agent_uuid.")";
+									$orig_command="{origination_caller_id_name=eavesdrop,origination_caller_id_number=".$a_exten."}user/".$_SESSION['user']['extension'][0]['user']."@".$_SESSION['domain_name']." %26eavesdrop(".$a_uuid.")";

 									//debug
 									//echo $orig_command;
 									//echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=log+".$orig_command.")');}\">log_cmd</a>&nbsp;\n";
 									echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=originate+".$orig_command.")');}\">".$text['label-eavesdrop']."</a>&nbsp;\n";

-									$xfer_command = $agent_uuid." -bleg ".$_SESSION['user']['extension'][0]['user']." XML ".$_SESSION['domain_name'];
-									//$xfer_command = $agent_uuid." ".$_SESSION['user']['extension'][0]['user']." XML default";
+									$xfer_command = $a_uuid." -bleg ".$_SESSION['user']['extension'][0]['user']." XML ".$_SESSION['domain_name'];
+									//$xfer_command = $a_uuid." ".$_SESSION['user']['extension'][0]['user']." XML default";
 									$xfer_command = urlencode($xfer_command);
 									echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=uuid_transfer+".$xfer_command."');}\">".$text['label-transfer']."</a>&nbsp;\n";
 								}
 								else {
-									$orig_call="{origination_caller_id_name=c2c-".urlencode($name).",origination_caller_id_number=".$agent_extension."}user/".$_SESSION['user']['extension'][0]['user']."@".$_SESSION['domain_name']." %26bridge(user/".$agent_extension."@".$_SESSION['domain_name'].")";
+									$orig_call="{origination_caller_id_name=c2c-".urlencode($name).",origination_caller_id_number=".$a_exten."}user/".$_SESSION['user']['extension'][0]['user']."@".$_SESSION['domain_name']." %26bridge(user/".$a_exten."@".$_SESSION['domain_name'].")";
 									echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=originate+".$orig_call.")');}\">".$text['label-call']."</a>&nbsp;\n";
 								}
 								echo "</td>";
@@ -281,7 +257,7 @@

 				echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 				echo "  <tr>\n";
-				echo "	<td align='left'><b>".$text['label-queue'].": ".ucfirst($_GET['name'])."</b><br />\n";
+				echo "	<td align='left'><b>".$text['label-queue'].": ".ucfirst($_GET[queue_name])."</b><br />\n";
 				echo "		".$text['description-queue']."<br />\n";
 				echo "	</td>\n";
 				echo "	<td align='right' valign='top'>";
@@ -337,13 +313,13 @@
 				$joined_length_sec = sprintf("%02d", $joined_length_sec);
 				$joined_length = $joined_length_hour.':'.$joined_length_min.':'.$joined_length_sec;

-				//get the serving agent name
-				$serving_agent_name = '';
-				if (is_array($_SESSION['agents'])) foreach ($_SESSION['agents'] as $agent) {
-					if ($agent['call_center_agent_uuid'] = $serving_agent) {
-						$serving_agent_name = $agent['agent_name'];
-					}
-				}
+				//$system_seconds = time() - $system_epoch;
+				//$system_length_hour = floor($system_seconds/3600);
+				//$system_length_min = floor($system_seconds/60 - ($system_length_hour * 60));
+				//$system_length_sec = $system_seconds - (($system_length_hour * 3600) + ($system_length_min * 60));
+				//$system_length_min = sprintf("%02d", $system_length_min);
+				//$system_length_sec = sprintf("%02d", $system_length_sec);
+				//$system_length = $system_length_hour.':'.$system_length_min.':'.$system_length_sec;

 				echo "<tr>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>".$joined_length."</td>\n";
@@ -368,7 +344,7 @@
 					}
 					echo "</td>";
 				}
-				echo "<td valign='top' class='".$row_style[$c]."'>".$serving_agent_name."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$serving_agent."&nbsp;</td>\n";
 				echo "</tr>\n";
 				if ($c==0) { $c=1; } else { $c=0; }
 			}
@@ -380,4 +356,4 @@
 			echo "<br />\n";
 	}

-?>
+?>
@@ -17,25 +17,22 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_active_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_active_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -64,7 +61,6 @@
 	echo "</tr>\n";
 	echo "</tr></table>\n";

-	//get the call center queue count
 	$sql = "select * from v_call_center_queues ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
 	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
@@ -80,15 +76,14 @@
 	list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page);
 	$offset = $rows_per_page * $page;

-	//get the call center queues
 	$sql = "select * from v_call_center_queues ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
 	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
 	$sql .= " limit $rows_per_page offset $offset ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
-	$call_center_queues = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$num_rows = count($call_center_queues);
+	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	$result_count = count($result);
 	unset ($prep_statement, $sql);

 	$c = 0;
@@ -118,13 +113,15 @@
 	echo "</td>\n";
 	echo "</tr>\n";

-	if (is_array($call_center_queues)) {
-		foreach($call_center_queues as $row) {
-			$tr_link = "href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$row['call_center_queue_uuid']."&name=".urlencode($row['queue_name'])."'";
+	if ($result_count == 0) { //no results
+	}
+	else { //received results
+		foreach($result as $row) {
+			$tr_link = "href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$row[queue_name]."'";
 			echo "<tr ".$tr_link.">\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'><a href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$row['call_center_queue_uuid']."&name=".urlencode($row['queue_name'])."'>".$row['queue_name']."</a></td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['queue_extension']."</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['queue_strategy']."</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'><a href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$row[queue_name]."'>".$row[queue_name]."</a></td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_extension]."</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_strategy]."</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_moh_sound]."</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_record_template]."</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_time_base_score]."</td>\n";
@@ -136,9 +133,9 @@
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_discard_abandoned_after]."</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_abandoned_resume_allowed]."</td>\n";
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row[queue_tier_rule_wait_multiply_level]."</td>\n";
-			echo "	<td valign='top' class='row_stylebg'>".$row['queue_description']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='row_stylebg'>".$row[queue_description]."&nbsp;</td>\n";
 			echo "	<td class='list_control_icon'>\n";
-			echo "		<a href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$row['call_center_queue_uuid']."&name=".urlencode($row['queue_name'])."' alt='".$text['button-view']."'>$v_link_label_view</a>\n";
+			echo "		<a href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$row[queue_name]."' alt='".$text['button-view']."'>$v_link_label_view</a>\n";
 			//echo "		<a href='call_center_queue_delete.php?id=".$row[call_center_queue_uuid]."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
 			//echo "		<input type='button' class='btn' name='' alt='edit' onclick=\"window.location='call_center_queue_edit.php?id=".$row[call_center_queue_uuid]."'\" value='e'>\n";
 			//echo "		<input type='button' class='btn' name='' alt='delete' onclick=\"if (confirm('Are you sure you want to delete this?')) { window.location='call_center_queue_delete.php?id=".$row[call_center_queue_uuid]."' }\" value='x'>\n";
@@ -5,31 +5,22 @@
 		$apps[$x]['uuid'] = "95788e50-9500-079e-2807-fd530b0ea370";
 		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Queues for managing inbound calls and routing those calls to available agents.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Warteschlangen um eingehende Anrufe zu verwalten und diese an verfügbare Agenten weiterzuleiten.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Warteschlangen um eingehende Anrufe zu verwalten und diese an verfügbare Agenten weiterzuleiten.";
 		$apps[$x]['description']['es-cl'] = "Colas pra administar las llamadas entrantes y enviarlas a los agentes disponibles";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "Queues pour envoyer les appels entrants vers les agents disponibles.";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Files d'attente d'appels entrants distribu%uFFFDs aux agents disponibles.";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "As filas servem para gerenciar as chamadas que entram e encaminhar as mesmas para os agentes disponíveis.";
+		$apps[$x]['description']['fr-ca'] = "Queues pour envoyer les appels entrants vers les agents disponibles.";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "As filas servem para gerenciamento de chamadas de entrada e encaminhamento das mesmas para os agentes dispon%uFFFDveis.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "As filas servem para gerenciar as chamadas que entram e encaminhar as mesmas para os agentes disponíveis.";

 	//destination details
-		$y=0;
+		$y = 0;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "call_centers";
 		$apps[$x]['destinations'][$y]['name'] = "call_centers";
@@ -44,7 +35,7 @@
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name} \${description}";

 	//permission details
-		$y=0;
+		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "call_center_queue_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "6c072b29-5b6c-49fc-008e-95e24c77de99";
 		$apps[$x]['permissions'][$y]['groups'][] = "agent";
@@ -115,41 +106,11 @@
 		$apps[$x]['permissions'][$y]['name'] = "call_center_log_delete";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_center_wallboard";
-		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-
-	//default settings
-		$y = 0;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8ebeb864-f03e-406c-b82f-6eb47cb1bd39";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "limit";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "call_center_queues";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b32179ad-96a4-4d83-8677-1fd8fc5ef6df";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "call_center";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "agent_add_rows";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "533eac69-887f-47aa-bf27-0751797555f5";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "call_center";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "agent_edit_rows";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";

 	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_call_center_agents";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_call_center_agents";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_center_agent_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
@@ -174,15 +135,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_users";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "user_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
@@ -240,10 +192,9 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";

-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_call_center_queues";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 1; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_call_center_queues";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_center_queue_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
@@ -358,18 +309,13 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "queue_cc_exit_keys";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "queue_description";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";

-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_call_center_tiers";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 2; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_call_center_tiers";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_center_tier_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
@@ -394,25 +340,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_center_queue_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_call_center_queues";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "call_center_queue_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_center_agent_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_call_center_agents";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "call_center_agent_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
@@ -434,4 +361,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";

-?>
+?>
@@ -17,41 +17,11 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018
+	Portions created by the Initial Developer are Copyright (C) 2015
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */

-if ($domains_processed == 1) {
-
-	//list the missing call center queue and agent uuids
-		$sql = "select t.call_center_tier_uuid, t.call_center_queue_uuid, t.call_center_agent_uuid, t.queue_name, t.agent_name, d.domain_name, ";
-		$sql .= "(select call_center_queue_uuid from v_call_center_queues where replace(queue_name, ' ', '-') = t.queue_name and domain_uuid = t.domain_uuid) as queue_uuid, ";
-		$sql .= "(select call_center_agent_uuid from v_call_center_agents where agent_name = t.agent_name and domain_uuid = t.domain_uuid) as agent_uuid ";
-		$sql .= "from v_call_center_tiers as t, v_domains as d ";
-		$sql .= "where t.domain_uuid = d.domain_uuid ";
-		$sql .= "and (t.call_center_queue_uuid is null or t.call_center_agent_uuid is null) ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$tiers = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		foreach ($tiers as &$row) {
-			if ($row['call_center_queue_uuid'] == null && $row['queue_uuid'] != null) {
-				$sql = "update v_call_center_tiers set call_center_queue_uuid = '".$row['queue_uuid']."' ";
-				$sql .= "where call_center_tier_uuid = '".$row['call_center_tier_uuid']."' ";
-				$db->exec(check_sql($sql));
-				unset($sql);
-			}
-
-			if ($row['call_center_agent_uuid'] == null && $row['agent_uuid'] != null) {
-				$sql = "update v_call_center_tiers set call_center_agent_uuid = '".$row['agent_uuid']."' ";
-				$sql .= "where call_center_tier_uuid = '".$row['call_center_tier_uuid']."' ";
-				$db->exec(check_sql($sql));
-				unset($sql);
-			}
-		}
-
-}
-
-?>
+?>
@@ -1,57 +1,37 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Call Centers";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Callcenter";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Callcenter";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Centro de Llamadas";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Centre d' appels";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Centre d'appel";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Stato Agenti";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Call Center ";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Call Center";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Centro de Chamadas";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Колл-центр";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Call Center";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Кол-центр";
-	$apps[$x]['menu'][$y]['uuid'] = "6c072b29-5b6c-49fc-008e-95e24c77de99";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/call_centers/call_center_queues.php";
-	$apps[$x]['menu'][$y]['groups'][] = "agent";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$y++;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Agent Status";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Agenten Status";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Agenten Status";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Estado de Agente";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "État de l'agent";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Status agenta";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Estado do agente";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Estado do Agente";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Статус агента";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Agent Status";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Статус оператора";
-	$apps[$x]['menu'][$y]['uuid'] = "597c483a-51a9-f95a-8d54-ea7d87ada2b8";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/call_centers/call_center_agent_status.php";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Call Center";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Centro de Llamadas";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Centre d'appel";
+$apps[$x]['menu'][0]['title']['fr-ca'] = "Centre d' appels";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Centro de Chamadas";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Call Center";
+$apps[$x]['menu'][0]['title']['pl'] = "Call Center ";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Call Center";
+$apps[$x]['menu'][0]['title']['uk'] = "Кол-центр";
+$apps[$x]['menu'][0]['title']['de-at'] = "Callcenter";
+$apps[$x]['menu'][0]['uuid'] = "6c072b29-5b6c-49fc-008e-95e24c77de99";
+$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/call_centers/call_center_queues.php";
+$apps[$x]['menu'][0]['groups'][] = "agent";
+$apps[$x]['menu'][0]['groups'][] = "admin";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";

-?>
+$apps[$x]['menu'][1]['title']['en-us'] = "Agent Status";
+$apps[$x]['menu'][1]['title']['es-cl'] = "Estado de Agente";
+$apps[$x]['menu'][1]['title']['fr-fr'] = "État de l'agent";
+$apps[$x]['menu'][1]['title']['pt-pt'] = "Estado do Agente";
+$apps[$x]['menu'][1]['title']['pt-br'] = "Estado do agente";
+$apps[$x]['menu'][1]['title']['pl'] = "Status agenta";
+$apps[$x]['menu'][1]['title']['sv-se'] = "Agent Status";
+$apps[$x]['menu'][1]['title']['uk'] = "Статус оператора";
+$apps[$x]['menu'][1]['title']['de-at'] = "Agenten Status";
+$apps[$x]['menu'][1]['uuid'] = "597c483a-51a9-f95a-8d54-ea7d87ada2b8";
+$apps[$x]['menu'][1]['parent_uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
+$apps[$x]['menu'][1]['category'] = "internal";
+$apps[$x]['menu'][1]['path'] = "/app/call_centers/call_center_agent_status.php";
+$apps[$x]['menu'][1]['groups'][] = "admin";
+$apps[$x]['menu'][1]['groups'][] = "superadmin";
+
+?>
@@ -1,228 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2017
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_queue_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get($_SESSION['domain']['language']['code'], 'app/call_centers');
-
-//includes and title
-	require_once "resources/header.php";
-	$document['title'] = $text['title-call_center_queues'];
-	require_once "resources/paging.php";
-
-//get http variables and set as php variables
-	$order_by = $_GET["order_by"];
-	$order = $_GET["order"];
-
-//setup the event socket connection
-	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-
-//get the http post values and set them as php variables
-	if (count($_POST) > 0) {
-		foreach($_POST['agents'] as $row) {
-			if (strlen($row['agent_status']) > 0) {
-				//echo "<pre>\n";
-				//print_r($row);
-				//echo "</pre>\n";
-
-				//agent set status
-					if ($fp) {
-						//set the user_status
-							$sql  = "update v_users set ";
-							$sql .= "user_status = '".$row['agent_status']."' ";
-							$sql .= "where domain_uuid = '".$domain_uuid."' ";
-							$sql .= "and username = '".$row['agent_name']."' ";
-							//echo $sql."\n";
-							//$prep_statement = $db->prepare(check_sql($sql));
-							//$prep_statement->execute();
-
-						//set the agent status to available and assign the agent to the queue with the tier
-							if ($row['agent_status'] == 'Available') {
-								//set the call center status
-								//$cmd = "api callcenter_config agent set status ".$row['agent_name']."@".$_SESSION['domain_name']." '".$row['agent_status']."'";
-								//$response = event_socket_request($fp, $cmd);
-
-								//assign the agent to the queue
-								$cmd = "api callcenter_config tier add ".$row['queue_name']."@".$_SESSION['domain_name']." ".$row['agent_name']."@".$_SESSION['domain_name']." 1 1";
-								$response = event_socket_request($fp, $cmd);
-							}
-
-						//un-assign the agent from the queue
-							if ($row['agent_status'] == 'Logged Out') {
-								$cmd = "api callcenter_config tier del ".$row['queue_name']."@".$_SESSION['domain_name']." ".$row['agent_name']."@".$_SESSION['domain_name'];
-								$response = event_socket_request($fp, $cmd);
-							}
-							
-							//echo $cmd."\n";
-							usleep(200);
-					}
-			}
-		}
-	}
-
-//get the agent list from event socket
-	$switch_cmd = 'callcenter_config tier list';
-	$event_socket_str = trim(event_socket_request($fp, 'api '.$switch_cmd));
-	$call_center_tiers = csv_to_named_array($event_socket_str, '|');
-	//echo "<pre>\n";
-	//print_r($call_center_tiers);
-	//echo "</pre>\n";
-
-//get the call center queues from the database
-	$sql = "select * from v_call_center_queues ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "order by queue_name asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$call_center_queues = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
-
-//get the agents from the database
-	$sql = "select * from v_call_center_agents ";
-	$sql .= "where user_uuid = '".$_SESSION['user_uuid']."' ";
-	$sql .= "and domain_uuid = '$domain_uuid' ";
-	//$sql .= "ORDER BY agent_name ASC ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$agent = $prep_statement->fetch(PDO::FETCH_NAMED);
-	//echo "<pre>\n";
-	//print_r($agent);
-	//echo "</pre>\n";
-
-//update the queue status
-	$x = 0;
-	foreach ($call_center_queues as $queue) {
-		$call_center_queues[$x]['queue_status'] = 'Logged Out';
-		foreach ($call_center_tiers as $tier) {
-			if ($queue['queue_name'] .'@'. $_SESSION['domain_name'] == $tier['queue'] 
-				&& $agent['agent_name'] .'@'. $_SESSION['domain_name'] == $tier['agent']) {
-				$call_center_queues[$x]['queue_status'] = 'Available';
-			}
-		}
-		$x++;
-	}
-	//echo "<pre>\n";
-	//print_r($call_center_queues);
-	//echo "</pre>\n";
-
-//set the row styles
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
-
-//show the content
-	echo "<form method='post' name='frm' action=''>\n";
-	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
-	echo "<tr>\n";
-	echo "	<td width='50%' align='left' nowrap='nowrap'><b>".$text['header-call_center_queues']."</b></td>\n";
-	echo "	<td width='50%' align='right'>\n";
-	echo "		<h3>".$text['label-agent']."</h3> <b>".$agent['agent_name']."</b>\n";
-	echo "	</td>\n";
-	echo "</tr>\n";
-	//echo "<tr>\n";
-	//echo "	<td align='left' colspan='2'>\n";
-	//echo $text['description-call_center_queues']."<br /><br />\n";
-	//echo "	</td>\n";
-	//echo "</tr>\n";
-	echo "</table>\n";
-
-	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo "	<th>".$text['label-queue_name']."</th>\n";
-	echo "	<th>".$text['label-status']."</th>\n";
-	echo "	<th>".$text['label-options']."</th>\n";
-	echo "</tr>\n";
-
-	if (count($call_center_queues) > 0) {
-		$x = 0;
-		foreach($call_center_queues as $row) {
-			echo "<tr>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
-			echo "		".$row['queue_name']."\n";
-			echo "	</td>\n";
-
-			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
-			if ($row['queue_status'] == "Available") {
-				echo $text['option-available'];
-			}
-			if ($row['queue_status'] == "Logged Out") {
-				echo $text['option-logged_out'];
-			}
-			echo "	</td>\n";
-
-			echo "	<td valign='middle' class='".$row_style[$c]."' nowrap='nowrap'>";
-			echo "		<input type='hidden' name='agents[".$x."][queue_name]' id='agent_".$x."_name' value='".$row['queue_name']."'>\n";
-			echo "		<input type='hidden' name='agents[".$x."][agent_name]' id='agent_".$x."_name' value='".$agent['agent_name']."'>\n";
-			echo "		<input type='hidden' name='agents[".$x."][id]' id='agent_".$x."_name' value='".$agent['call_center_agent_uuid']."'>\n";
-			//echo "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_no_change' value='' checked='checked'>&nbsp;<label for='agent_".$x."_status_no_change'>".$text['option-no_change']."</label>&nbsp;\n";
-			echo "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_available' value='Available'>&nbsp;<label for='agent_".$x."_status_available'>".$text['option-available']."</label>&nbsp;\n";
-			echo "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_logged_out' value='Logged Out'>&nbsp;<label for='agent_".$x."_status_logged_out'>".$text['option-logged_out']."</label>&nbsp;\n";
-			//echo "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_on_break' value='On Break'>&nbsp;<label for='agent_".$x."_status_on_break'>".$text['option-on_break']."</label>&nbsp;\n";
-			//echo "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_dnd' value='Do Not Disturb'><label for='agent_".$x."_status_dnd'>&nbsp;".$text['option-do_not_disturb']."</label>\n";
-			echo "	</td>\n";
-
-			//echo "	<td valign='top' class='row_stylebg'>".$row[queue_description]."&nbsp;</td>\n";
-			echo "</tr>\n";
-			$x++;
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result, $row_count);
-	} //end if results
-
-	echo "<tr>\n";
-	echo "<td colspan='11' align='left'>\n";
-	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap></td>\n";
-	echo "		<td width='33.3%' align='right'>\n";
-	echo "			<br />\n";
-	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "		</td>\n";
-	echo "	</tr>\n";
- 	echo "	</table>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "</table>";
-	echo "<br><br>";
-	echo "</form>\n";
-
-?>
@@ -23,29 +23,24 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check the permissions
-	if (permission_exists('call_center_agent_delete')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_agent_delete')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

-//get the primary key
-	if (count($_GET)>0) {
-		$id = check_str($_GET["id"]);
-	}
+if (count($_GET)>0) {
+	$id = check_str($_GET["id"]);
+}

 //get the agent details
 	$sql = "select * from v_call_center_agents ";
@@ -69,23 +64,24 @@
 			$response = event_socket_request($fp, $cmd);
 		}

+
+
 //delete the agent from db
 	if (strlen($id)>0) {
 		//tiers table
-			$sql = "delete from v_call_center_tiers ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and agent_name = '$agent_name' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			unset($sql);
-
+		$sql = "delete from v_call_center_tiers ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and agent_name = '$agent_name' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
 		//agents table
-			$sql = "delete from v_call_center_agents ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and call_center_agent_uuid = '$id' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			unset($sql);
+		$sql = "delete from v_call_center_agents ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and call_center_agent_uuid = '$id' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
 	}

 //synchronize configuration
@@ -93,7 +89,7 @@
 	remove_config_from_cache('configuration:callcenter.conf');

 //redirect the browser
-	messages::add($text['message-delete']);
+	$_SESSION["message"] = $text['message-delete'];
 	header("Location: call_center_agents.php");
 	return;

@@ -17,27 +17,23 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2015
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_agent_add') || permission_exists('call_center_agent_edit')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_agent_add') || permission_exists('call_center_agent_edit')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -81,62 +77,55 @@
 	}

 //get http post variables and set them to php variables
-	if (is_array($_POST)) {
-		$call_center_agent_uuid = check_str($_POST["call_center_agent_uuid"]);
-		$user_uuid = check_str($_POST["user_uuid"]);
+	if (count($_POST) > 0) {
 		$agent_name = check_str($_POST["agent_name"]);
 		$agent_type = check_str($_POST["agent_type"]);
 		$agent_call_timeout = check_str($_POST["agent_call_timeout"]);
 		$agent_id = check_str($_POST["agent_id"]);
 		$agent_password = check_str($_POST["agent_password"]);
-		$agent_status = check_str($_POST["agent_status"]);
 		$agent_contact = check_str($_POST["agent_contact"]);
+		$agent_status = check_str($_POST["agent_status"]);
+		//$agent_logout = check_str($_POST["agent_logout"]);
 		$agent_no_answer_delay_time = check_str($_POST["agent_no_answer_delay_time"]);
 		$agent_max_no_answer = check_str($_POST["agent_max_no_answer"]);
 		$agent_wrap_up_time = check_str($_POST["agent_wrap_up_time"]);
 		$agent_reject_delay_time = check_str($_POST["agent_reject_delay_time"]);
 		$agent_busy_delay_time = check_str($_POST["agent_busy_delay_time"]);
-		//$agent_logout = check_str($_POST["agent_logout"]);
 	}

-//process the user data and save it to the database
-	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
+if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

-		//get the uuid from the POST
-			if ($action == "update") {
-				$call_center_agent_uuid = check_str($_POST["call_center_agent_uuid"]);
-			}
+	$msg = '';

-		//check for all required data
-			$msg = '';
-			//if (strlen($call_center_agent_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-call_center_agent_uuid']."<br>\n"; }
-			//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
-			if (strlen($user_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-user_uuid']."<br>\n"; }
-			if (strlen($agent_name) == 0) { $msg .= $text['message-required']." ".$text['label-agent_name']."<br>\n"; }
-			if (strlen($agent_type) == 0) { $msg .= $text['message-required']." ".$text['label-agent_type']."<br>\n"; }
-			if (strlen($agent_call_timeout) == 0) { $msg .= $text['message-required']." ".$text['label-agent_call_timeout']."<br>\n"; }
-			//if (strlen($agent_id) == 0) { $msg .= $text['message-required']." ".$text['label-agent_id']."<br>\n"; }
-			//if (strlen($agent_password) == 0) { $msg .= $text['message-required']." ".$text['label-agent_password']."<br>\n"; }
-			if (strlen($agent_status) == 0) { $msg .= $text['message-required']." ".$text['label-agent_status']."<br>\n"; }
-			if (strlen($agent_contact) == 0) { $msg .= $text['message-required']." ".$text['label-agent_contact']."<br>\n"; }
-			if (strlen($agent_no_answer_delay_time) == 0) { $msg .= $text['message-required']." ".$text['label-agent_no_answer_delay_time']."<br>\n"; }
-			if (strlen($agent_max_no_answer) == 0) { $msg .= $text['message-required']." ".$text['label-agent_max_no_answer']."<br>\n"; }
-			if (strlen($agent_wrap_up_time) == 0) { $msg .= $text['message-required']." ".$text['label-agent_wrap_up_time']."<br>\n"; }
-			if (strlen($agent_reject_delay_time) == 0) { $msg .= $text['message-required']." ".$text['label-agent_reject_delay_time']."<br>\n"; }
-			if (strlen($agent_busy_delay_time) == 0) { $msg .= $text['message-required']." ".$text['label-agent_busy_delay_time']."<br>\n"; }
-			//if (strlen($agent_logout) == 0) { $msg .= $text['message-required']." ".$text['label-agent_logout']."<br>\n"; }
-			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "resources/header.php";
-				require_once "resources/persist_form_var.php";
-				echo "<div align='center'>\n";
-				echo "<table><tr><td>\n";
-				echo $msg."<br />";
-				echo "</td></tr></table>\n";
-				persistformvar($_POST);
-				echo "</div>\n";
-				require_once "resources/footer.php";
-				return;
-			}
+	if ($action == "update") {
+		$call_center_agent_uuid = check_str($_POST["call_center_agent_uuid"]);
+	}
+
+	//check for all required data
+		//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']."domain_uuid<br>\n"; }
+		//if (strlen($agent_name) == 0) { $msg .= $text['message-required'].$text['label-agent_name']."<br>\n"; }
+		//if (strlen($agent_type) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
+		//if (strlen($agent_call_timeout) == 0) { $msg .= $text['message-required'].$text['label-call_timeout']."<br>\n"; }
+		//if (strlen($agent_contact) == 0) { $msg .= $text['message-required'].$text['label-contact']."<br>\n"; }
+		//if (strlen($agent_status) == 0) { $msg .= $text['message-required'].$text['label-status']."<br>\n"; }
+		//if (strlen($agent_logout) == 0) { $msg .= $text['message-required'].$text['label-agent_logout']."<br>\n"; }
+		//if (strlen($agent_no_answer_delay_time) == 0) { $msg .= $text['message-required'].$text['label-no_answer_delay_time']."<br>\n"; }
+		//if (strlen($agent_max_no_answer) == 0) { $msg .= $text['message-required'].$text['label-max_no_answer']."<br>\n"; }
+		//if (strlen($agent_wrap_up_time) == 0) { $msg .= $text['message-required'].$text['label-wrap_up_time']."<br>\n"; }
+		//if (strlen($agent_reject_delay_time) == 0) { $msg .= $text['message-required'].$text['label-reject_delay_time']."<br>\n"; }
+		//if (strlen($agent_busy_delay_time) == 0) { $msg .= $text['message-required'].$text['label-busy_delay_time']."<br>\n"; }
+		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+			require_once "resources/header.php";
+			require_once "resources/persist_form_var.php";
+			echo "<div align='center'>\n";
+			echo "<table><tr><td>\n";
+			echo $msg."<br />";
+			echo "</td></tr></table>\n";
+			persistformvar($_POST);
+			echo "</div>\n";
+			require_once "resources/footer.php";
+			return;
+		}

 	//get and then set the complete agent_contact with the call_timeout and when necessary confirm
 		//if you change this variable, also change resources/switch.php
@@ -169,6 +158,14 @@
 			}
 		}

+	//set the user_status
+		$sql  = "update v_users set ";
+		$sql .= "user_status = '".$agent_status."' ";
+		$sql .= "where domain_uuid = '".$domain_uuid."' ";
+		$sql .= "and username = '".$agent_name."' ";
+ 		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+
 	//add the agent
 		//setup the event socket connection
 			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
@@ -204,65 +201,96 @@
 					$response = event_socket_request($fp, $cmd);
 			}

-		//set the domain_uuid
-			$_POST["domain_uuid"] = $_SESSION["domain_uuid"];
-
-		//add the call_center_agent_uuid
-			if (strlen($_POST["call_center_agent_uuid"]) == 0) {
+	//add or update the database
+	if ($_POST["persistformvar"] != "true") {
+		if ($action == "add") {
+			//add the agent to the database
 				$call_center_agent_uuid = uuid();
-				$_POST["call_center_agent_uuid"] = $call_center_agent_uuid;
-			}
+				$sql = "insert into v_call_center_agents ";
+				$sql .= "(";
+				$sql .= "domain_uuid, ";
+				$sql .= "call_center_agent_uuid, ";
+				$sql .= "agent_name, ";
+				$sql .= "agent_type, ";
+				$sql .= "agent_call_timeout, ";
+				$sql .= "agent_id, ";
+				$sql .= "agent_password, ";
+				$sql .= "agent_contact, ";
+				$sql .= "agent_status, ";
+				//$sql .= "agent_logout, ";
+				$sql .= "agent_no_answer_delay_time, ";
+				$sql .= "agent_max_no_answer, ";
+				$sql .= "agent_wrap_up_time, ";
+				$sql .= "agent_reject_delay_time, ";
+				$sql .= "agent_busy_delay_time ";
+				$sql .= ")";
+				$sql .= "values ";
+				$sql .= "(";
+				$sql .= "'$domain_uuid', ";
+				$sql .= "'$call_center_agent_uuid', ";
+				$sql .= "'$agent_name', ";
+				$sql .= "'$agent_type', ";
+				$sql .= "'$agent_call_timeout', ";
+				$sql .= "'$agent_id', ";
+				$sql .= "'$agent_password', ";
+				$sql .= "'$agent_contact', ";
+				$sql .= "'$agent_status', ";
+				//$sql .= "'$agent_logout', ";
+				$sql .= "'$agent_no_answer_delay_time', ";
+				$sql .= "'$agent_max_no_answer', ";
+				$sql .= "'$agent_wrap_up_time', ";
+				$sql .= "'$agent_reject_delay_time', ";
+				$sql .= "'$agent_busy_delay_time' ";
+				$sql .= ")";
+				$db->exec(check_sql($sql));
+				unset($sql);

-		//get the users array
-			$sql = "SELECT * FROM v_users ";
-			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-			$sql .= "order by username asc ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			$users = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			unset($prep_statement, $sql);
+			//syncrhonize configuration
+				save_call_center_xml();
+				remove_config_from_cache('configuration:callcenter.conf');

-		//prepare the array
-			$array['call_center_agents'][] = $_POST;
-			$array['users'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
-			$array['users'][0]['user_uuid'] = $user_uuid;
-			$array['users'][0]['user_status'] = $agent_status;
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: call_center_agents.php");
+			return;
+		} //if ($action == "add")

-		//save to the data
-			$database = new database;
-			$database->app_name = 'call_center';
-			$database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370';
-			if (strlen($call_center_agent_uuid) > 0) {
-				$database->uuid($call_center_agent_uuid);
-			}
-			$database->save($array);
-			$message = $database->message;
+		if ($action == "update") {
+			$sql = "update v_call_center_agents set ";
+			$sql .= "agent_name = '$agent_name', ";
+			$sql .= "agent_type = '$agent_type', ";
+			$sql .= "agent_call_timeout = '$agent_call_timeout', ";
+			$sql .= "agent_id = '$agent_id', ";
+			$sql .= "agent_password = '$agent_password', ";
+			$sql .= "agent_contact = '$agent_contact', ";
+			$sql .= "agent_status = '$agent_status', ";
+			//$sql .= "agent_logout = '$agent_logout', ";
+			$sql .= "agent_no_answer_delay_time = '$agent_no_answer_delay_time', ";
+			$sql .= "agent_max_no_answer = '$agent_max_no_answer', ";
+			$sql .= "agent_wrap_up_time = '$agent_wrap_up_time', ";
+			$sql .= "agent_reject_delay_time = '$agent_reject_delay_time', ";
+			$sql .= "agent_busy_delay_time = '$agent_busy_delay_time' ";
+			$sql .= "where domain_uuid = '$domain_uuid'";
+			$sql .= "and call_center_agent_uuid = '$call_center_agent_uuid'";
+			$db->exec(check_sql($sql));
+			unset($sql);

-		//syncrhonize configuration
-			save_call_center_xml();
+			//syncrhonize configuration
+				save_call_center_xml();
+				remove_config_from_cache('configuration:callcenter.conf');

-		//clear the cache
-			remove_config_from_cache('configuration:callcenter.conf');
-
-		//redirect the user
-			if (isset($action)) {
-				if ($action == "add") {
-					messages::add($text['message-add']);
-				}
-				if ($action == "update") {
-					messages::add($text['message-update']);
-				}
-				header("Location: call_center_agents.php");
-				return;
-			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: call_center_agents.php");
+			return;
+		} //if ($action == "update")
+	} //if ($_POST["persistformvar"] != "true")
+} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)

 //initialize the destinations object
 	$destination = new destinations;

 //pre-populate the form
-	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
-		$call_center_agent_uuid = check_str($_GET["id"]);
+	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+		$call_center_agent_uuid = $_GET["id"];
 		$sql = "select * from v_call_center_agents ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and call_center_agent_uuid = '$call_center_agent_uuid' ";
@@ -270,21 +298,20 @@
 		$prep_statement->execute();
 		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 		foreach ($result as &$row) {
-			$call_center_agent_uuid = $row["call_center_agent_uuid"];
-			$user_uuid = $row["user_uuid"];
 			$agent_name = $row["agent_name"];
 			$agent_type = $row["agent_type"];
 			$agent_call_timeout = $row["agent_call_timeout"];
 			$agent_id = $row["agent_id"];
 			$agent_password = $row["agent_password"];
-			$agent_status = $row["agent_status"];
 			$agent_contact = $row["agent_contact"];
+			$agent_status = $row["agent_status"];
+			//$agent_logout = $row["agent_logout"];
 			$agent_no_answer_delay_time = $row["agent_no_answer_delay_time"];
 			$agent_max_no_answer = $row["agent_max_no_answer"];
 			$agent_wrap_up_time = $row["agent_wrap_up_time"];
 			$agent_reject_delay_time = $row["agent_reject_delay_time"];
 			$agent_busy_delay_time = $row["agent_busy_delay_time"];
-			//$agent_logout = $row["agent_logout"];
+			break; //limit to 1 row
 		}
 		unset ($prep_statement);
 	}
@@ -307,16 +334,6 @@
 		$document['title'] = $text['title-call_center_agent_edit'];
 	}

-//get the list of users for this domain
-	$sql = "SELECT * FROM v_users ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "and user_enabled = 'true' ";
-	$sql .= "order by username asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$users = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset($sql);
-
 //javascript to check for duplicates
 	?>
 	<script language="javascript">
@@ -368,22 +385,29 @@
 	echo "	".$text['label-agent_name']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='agent_name' maxlength='255' value=\"$agent_name\" />\n";
-	/*
+	//---- Begin Select List --------------------
+	$sql = "SELECT * FROM v_users ";
+	$sql .= "where domain_uuid = '$domain_uuid' ";
+	$sql .= "and user_enabled = 'true' ";
+	$sql .= "order by username asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+
 	echo "<select id=\"agent_name\" name=\"agent_name\" class='formfld'>\n";
 	echo "<option value=\"\"></option>\n";
-	if (is_array($users)) {
-		foreach($users as $field) {
-			if ($field[username] == $agent_name) {
-				echo "<option value='".$field[username]."' selected='selected'>".$field[username]."</option>\n";
-			}
-			else {
-				echo "<option value='".$field[username]."'>".$field[username]."</option>\n";
-			}
+	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	//$catcount = count($result);
+	foreach($result as $field) {
+		if ($field[username] == $agent_name) {
+			echo "<option value='".$field[username]."' selected='selected'>".$field[username]."</option>\n";
+		}
+		else {
+			echo "<option value='".$field[username]."'>".$field[username]."</option>\n";
 		}
 	}
 	echo "</select>";
-	*/
+	unset($sql, $result);
+	//---- End Select List --------------------
 	echo "<br />\n";
 	echo $text['description-agent_name']."\n";
 	echo "</td>\n";
@@ -411,26 +435,6 @@
 	echo "</td>\n";
 	echo "</tr>\n";

-	echo "	<tr>";
-	echo "		<td class='vncellreq' valign='top'>".$text['label-username']."</td>";
-	echo "		<td class='vtable' align='left'>";
-	echo "			<select name=\"user_uuid\" class='formfld' style='width: auto;'>\n";
-	echo "			<option value=\"\"></option>\n";
-	foreach($users as $field) {
-		if ($user_uuid == $field['user_uuid']) {
-			echo "			<option value='".$field['user_uuid']."' selected='selected'>".$field['username']."</option>\n";
-		}
-		else {
-			echo "			<option value='".$field['user_uuid']."' $selected>".$field['username']."</option>\n";
-		}
-	}
-	echo "			</select>";
-	unset($users);
-	echo "			<br>\n";
-	echo "			".$text['description-users']."\n";
-	echo "		</td>";
-	echo "	</tr>";
-
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-agent_id']."\n";
@@ -579,10 +583,10 @@
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
-	echo "<br /><br />";

-//include the footer
+//footer
 	require_once "resources/footer.php";

-?>
+?>
@@ -17,26 +17,22 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_agent_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_agent_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -47,89 +43,66 @@
 	$document['title'] = $text['title-call_center_agent_status'];
 	require_once "resources/paging.php";

-//get the agents from the database
-	$sql = "select * from v_call_center_tiers ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$tiers = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	if (count($tiers) == 0) {
-		$per_queue_login = true;
-	}
-	else {
-		$per_queue_login = false;
-	}
-	unset($prep_statement, $sql);
-
 //setup the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);

 //get the http post values and set them as php variables
 	if (count($_POST) > 0) {

-		//debug info
-		//echo "<pre>\n";
-		//print_r($_POST);
-		//echo "</pre>\n";
-
+		//include the dnd php class
+		include PROJECT_PATH."/app/calls/resources/classes/do_not_disturb.php";
 		foreach($_POST['agents'] as $row) {
 			if (strlen($row['agent_status']) > 0) {
 				//agent set status
 					if ($fp) {
 						//set the user_status
-							if (!isset($row['queue_name'])) {
-								$sql  = "update v_users set ";
-								$sql .= "user_status = '".$row['agent_status']."' ";
-								$sql .= "where domain_uuid = '".$domain_uuid."' ";
-								$sql .= "and user_uuid = '".$row['user_uuid']."' ";
-								$prep_statement = $db->prepare(check_sql($sql));
-								$prep_statement->execute();
-							}
-
+							$sql  = "update v_users set ";
+							$sql .= "user_status = '".$row['agent_status']."' ";
+							$sql .= "where domain_uuid = '".$domain_uuid."' ";
+							$sql .= "and username = '".$row['agent_name']."' ";
+							//echo $sql."\n";
+							$prep_statement = $db->prepare(check_sql($sql));
+							$prep_statement->execute();
 						//set the call center status
-							if (!isset($row['queue_name'])) {
-								if ($row['agent_status'] == "Do Not Disturb") {
-									//set the default dnd action
-										$dnd_action = "add";
-									//set the call center status to Logged Out
-										$cmd = "api callcenter_config agent set status ".$row['agent_uuid']." 'Logged Out'";
-								}
-								else {
-									$cmd = "api callcenter_config agent set status ".$row['agent_uuid']." '".$row['agent_status']."'";
-								}
-								$response = event_socket_request($fp, $cmd);
+							if ($row['agent_status'] == "Do Not Disturb") {
+								//set the default dnd action
+									$dnd_action = "add";
+								//set the call center status to Logged Out
+									$cmd = "api callcenter_config agent set status ".$row['agent_name']."@".$_SESSION['domains'][$domain_uuid]['domain_name']." 'Logged Out'";
 							}
+							else {
+								$cmd = "api callcenter_config agent set status ".$row['agent_name']."@".$_SESSION['domains'][$domain_uuid]['domain_name']." '".$row['agent_status']."'";
+							}
+							$response = event_socket_request($fp, $cmd);
 							//echo $cmd."\n";
-
-						//set the agent status to available and assign the agent to the queue with the tier
-							if (isset($row['queue_uuid']) && $row['agent_status'] == 'Available') {
-								//set the call center status
-								//$cmd = "api callcenter_config agent set status ".$row['agent_name']."@".$_SESSION['domain_name']." '".$row['agent_status']."'";
-								//$response = event_socket_request($fp, $cmd);
-
-								//assign the agent to the queue
-								$cmd = "api callcenter_config tier add ".$row['queue_uuid']." ".$row['agent_uuid']." 1 1";
-								//echo $cmd."<br />\n";
-								$response = event_socket_request($fp, $cmd);
-							}
-
-						//un-assign the agent from the queue
-							if (isset($row['queue_uuid']) && $row['agent_status'] == 'Logged Out') {
-								$cmd = "api callcenter_config tier del ".$row['queue_uuid']." ".$row['agent_uuid'];
-								//echo $cmd."<br />\n";
-								$response = event_socket_request($fp, $cmd);
-							}
 							usleep(200);
 					}

+				//loop through the list of assigned extensions
+					//foreach ($_SESSION['user']['extension'] as &$sub_row) {
+					//	//update dnd
+					//		$dnd = new do_not_disturb;
+					//		//$dnd->debug = false;
+					//		$dnd->domain_uuid = $domain_uuid;
+					//		$dnd->domain_name = $_SESSION['domain_name'];
+					//		$dnd->extension = $sub_row["user"];
+					//		if ($row['status'] == "Do Not Disturb") {
+					//			$dnd->enabled = "true";
+					//		}
+					//		else {
+					//			$dnd->enabled = "false";
+					//		}
+					//		$dnd->set();
+					//		unset($dnd);
+					//}
+					//unset ($prep_statement);
 			}
 		}
 	}

 //get the agents from the database
 	$sql = "select * from v_call_center_agents ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "order by agent_name ASC ";
+	$sql .= "where domain_uuid = '$domain_uuid' ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
 	$agents = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -137,32 +110,10 @@
 //get the agent list from event socket
 	$switch_cmd = 'callcenter_config agent list';
 	$event_socket_str = trim(event_socket_request($fp, 'api '.$switch_cmd));
-	$agent_list = csv_to_named_array($event_socket_str, '|');
-
-//get the agent list from event socket
-	$switch_cmd = 'callcenter_config tier list';
-	$event_socket_str = trim(event_socket_request($fp, 'api '.$switch_cmd));
-	$call_center_tiers = csv_to_named_array($event_socket_str, '|');
-
-//get the call center queues from the database
-	$sql = "select * from v_call_center_queues ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "order by queue_name asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$call_center_queues = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
-
-//add the status to the call_center_queues array
-	$x = 0;
-	foreach ($call_center_queues as $queue) {
-		//get the queue list from event socket
-		$switch_cmd = "callcenter_config queue list agents ".$queue['call_center_queue_uuid'];
-		$event_socket_str = trim(event_socket_request($fp, 'api '.$switch_cmd));
-		$queue_list = csv_to_named_array($event_socket_str, '|');
-		$call_center_queues[$x]['queue_list'] = $queue_list;
-		$x++;
-	}
+	$call_center_agents = csv_to_named_array($event_socket_str, '|');
+	//echo "<pre>\n";
+	//print_r($call_center_agents);
+	//echo "</pre>\n";

 //get the agent status from mod_callcenter and update the agent status in the agents array
 	$x = 0;
@@ -170,42 +121,43 @@
 		//add the domain name
 			$domain_name = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
 			$agents[$x]['domain_name'] = $domain_name;
-
-		//update the queue status
-			$i = 0;
-			foreach ($call_center_queues as $queue) {
-				$agents[$x]['queues'][$i]['agent_name'] = $row['agent_name'];
-				$agents[$x]['queues'][$i]['queue_name'] = $queue['queue_name'];
-				$agents[$x]['queues'][$i]['call_center_agent_uuid'] = $row['call_center_agent_uuid'];
-				$agents[$x]['queues'][$i]['call_center_queue_uuid'] = $queue['call_center_queue_uuid'];
-				$agents[$x]['queues'][$i]['queue_status'] = 'Logged Out';
-				foreach ($queue['queue_list'] as $queue_list) {
-					if ($row['call_center_agent_uuid'] == $queue_list['name']) {
-						$agents[$x]['queues'][$i]['queue_status'] = 'Available';
-					}
-				}
-				$i++;
-			}
-
 		//update the agent status
-			foreach ($agent_list as $r) {
-				if ($r['name'] == $row['call_center_agent_uuid']) {
+			foreach ($call_center_agents as $r) {
+				if ($r['name'] == $row[agent_name].'@'.$domain_name) {
 					$agents[$x]['agent_status'] = $r['status'];
 				}
 			}
 		//increment x
 			$x++;
-	}

-//debug info
+	}
 	//echo "<pre>\n";
 	//print_r($agents);
 	//echo "</pre>\n";

-//set the row style
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
+//set the status on the user_array by using the extension as the key
+	//foreach ($call_center_agents as $row) {
+	//	if (count($_SESSION['domains']) == 1) {
+	//		//get the extension status from the call center agent list
+	//		preg_match('/user\/(\d{2,7})/', $row['contact'], $matches);
+	//		$extension = $matches[1];
+	//		$user_array[$extension]['username'] = $tmp[0];
+	//		if ($user_array[$extension]['user_status'] != "Do Not Disturb") {
+	//			$user_array[$extension]['user_status'] = $row['status'];
+	//		}
+	//	} else {
+	//		$tmp = explode('@',$row["name"]);
+	//		if ($tmp[1] == $_SESSION['domain_name']) {
+	//			//get the extension status from the call center agent list
+	//			preg_match('/user\/(\d{2,7})/', $row['contact'], $matches);
+	//			$extension = $matches[1];
+	//			$user_array[$extension]['username'] = $tmp[0];
+	//			if ($user_array[$extension]['user_status'] != "Do Not Disturb") {
+	//				$user_array[$extension]['user_status'] = $row['status'];
+	//			}
+	//		}
+	//	}
+	//}

 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
@@ -223,85 +175,46 @@
 	echo "</tr>\n";
 	echo "</table>\n";

+	$c = 0;
+	$row_style["0"] = "row_style0";
+	$row_style["1"] = "row_style1";
+
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<table width='100%' border='0' cellpadding='2' cellspacing='2'>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "	<th>".$text['label-agent']."</th>\n";
-	echo "	<th>".$text['label-status']."</th>\n";
-	echo "	<th>".$text['label-options']."</th>\n";
-	echo "	<th>".$text['label-queues']."</th>\n";
+	echo "<th>".$text['label-agent']."</th>\n";
+	echo "<th>".$text['label-status']."</th>\n";
+	echo "<th>".$text['label-options']."</th>\n";
 	echo "</tr>\n";
 	$x = 0;
 	foreach($agents as $row) {
-		$html = "<tr>\n";
-		$html .= "		<td valign='top' class='".$row_style[$c]."'>".$row['agent_name']."&nbsp;</td>\n";
-
-		//$html .= "	<td valign='top' class='".$row_style[$c]."'>".$row['agent_name']."&nbsp;</td>\n";
-		$html .= "	<td valign='top' class='".$row_style[$c]."'>".$row['agent_status']."&nbsp;</td>\n";
-		$html .= "	<td valign='top' class='".$row_style[$c]."' nowrap='nowrap'>";
-		$html .= "		<input type='hidden' name='agents[".$x."][agent_name]' id='agent_".$x."_name' value='".$row['agent_name']."'>\n";
-		$html .= "		<input type='hidden' name='agents[".$x."][agent_uuid]' id='agent_".$x."_uuid' value='".$row['call_center_agent_uuid']."'>\n";
-		//$html .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_no_change' value='' checked='checked'>&nbsp;<label for='agent_".$x."_status_no_change'>".$text['option-no_change']."</label>&nbsp;\n";
-		$html .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_available' value='Available'>&nbsp;<label for='agent_".$x."_status_available'>".$text['option-available']."</label>&nbsp;\n";
-		$html .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_logged_out' value='Logged Out'>&nbsp;<label for='agent_".$x."_status_logged_out'>".$text['option-logged_out']."</label>&nbsp;\n";
-		$html .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_on_break' value='On Break'>&nbsp;<label for='agent_".$x."_status_on_break'>".$text['option-on_break']."</label>&nbsp;\n";
-		//$html .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_dnd' value='Do Not Disturb'><label for='agent_".$x."_status_dnd'>&nbsp;".$text['option-do_not_disturb']."</label>\n";
-		$html .= "	</td>\n";
-
-		$html .= "	<td valign='top' class='".$row_style[$c]."' nowrap='nowrap'>";
-		if (is_array($row['queues']) && $per_queue_login) {
-			$html .= "		<table width='100%' border='0' cellpadding='2' cellspacing='2'>\n";
-			$html .= "		<tr>\n";
-			$html .= "			<th>".$text['label-agent']."</th>\n";
-			$html .= "			<th width='100'>".$text['label-status']."</th>\n";
-			$html .= "			<th>".$text['label-options']."</th>\n";
-			$html .= "		</tr>\n";
-			foreach ($row['queues'] as $queue) {
-				$x++;
-				$html .= "	<tr>\n";
-				$html .= "		<td valign='top' class='".$row_style[$c]."'>\n";
-				$html .= "			".$queue['queue_name']."\n";
-				$html .= "		</td>\n";
-
-				$html .= "		<td valign='top' class='".$row_style[$c]."'>\n";
-				//.$row[queue_status]."&nbsp;
-				if ($queue['queue_status'] == "Available") {
-					$html .= "		".$text['option-available']."\n";
-				}
-				if ($queue['queue_status'] == "Logged Out") {
-					$html .= "		".$text['option-logged_out']."\n";
-				}
-				$html .= "		</td>\n";
-
-				$html .= "		<td valign='middle' class='".$row_style[$c]."' nowrap='nowrap'>";
-				//$html .= "			<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_no_change' value='' checked='checked'>&nbsp;<label for='agent_".$x."_status_no_change'>".$text['option-no_change']."</label>&nbsp;\n";
-				$html .= "			<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_available' value='Available'>&nbsp;<label for='agent_".$x."_status_available'>".$text['option-available']."</label>&nbsp;\n";
-				$html .= "			<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_logged_out' value='Logged Out'>&nbsp;<label for='agent_".$x."_status_logged_out'>".$text['option-logged_out']."</label>&nbsp;\n";
-				$html .= "			<input type='hidden' name='agents[".$x."][queue_name]' id='queue_".$x."_name' value='".$queue['queue_name']."'>\n";
-				$html .= "			<input type='hidden' name='agents[".$x."][agent_name]' id='agent_".$x."_name' value='".$row['agent_name']."'>\n";
-				$html .= "			<input type='hidden' name='agents[".$x."][user_uuid]' id='agent_".$x."_name' value='".$row['user_uuid']."'>\n";
-				$html .= "			<input type='hidden' name='agents[".$x."][queue_uuid]' id='queue_".$x."_uuid' value='".$queue['call_center_queue_uuid']."'>\n";
-				$html .= "			<input type='hidden' name='agents[".$x."][agent_uuid]' id='agent_".$x."_uuid' value='".$row['call_center_agent_uuid']."'>\n";
-				$html .= "		</td>\n";
-				$html .= "	</tr>\n";
-			}
-			$html .= "		</table>\n";
-		}
-		$html .= "	</td>\n";
-		$html .= "</tr>\n";
+		$str = '';
+		$str .= "<tr>\n";
+		$str .= "	<td valign='middle' class='".$row_style[$c]."'>".$row['agent_name']."&nbsp;</td>\n";
+		$str .= "	<td valign='middle' class='".$row_style[$c]."'>".$row['agent_status']."&nbsp;</td>\n";
+		$str .= "	<td valign='middle' class='".$row_style[$c]."'>";
+		$str .= "		<input type='hidden' name='agents[".$x."][agent_name]' id='agent_".$x."_name' value='".$row['agent_name']."'>\n";
+		$str .= "		<input type='hidden' name='agents[".$x."][id]' id='agent_".$x."_name' value='".$row['call_center_agent_uuid']."'>\n";
+		$str .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_no_change' value='' checked='checked'><label for='agent_".$x."_status_no_change'>".$text['option-no_change']."</label>\n";
+		$str .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_available' value='Available'><label for='agent_".$x."_status_available'>".$text['option-available']."</label>\n";
+		$str .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_logged_out' value='Logged Out'><label for='agent_".$x."_status_logged_out'>".$text['option-logged_out']."</label>\n";
+		$str .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_on_break' value='On Break'><label for='agent_".$x."_status_on_break'>".$text['option-on_break']."</label>\n";
+		//$str .= "		<input type='radio' name='agents[".$x."][agent_status]' id='agent_".$x."_status_dnd' value='Do Not Disturb'><label for='agent_".$x."_status_dnd'>".$text['option-do_not_disturb']."</label>\n";
+		$str .= "	</td>\n";
+		$str .= "</tr>\n";
 		if (count($_SESSION['domains']) > 1) {
 			if ($row['domain_name'] == $_SESSION['domain_name']) {
-				echo $html;
+				echo $str;
 				if ($c==0) { $c=1; } else { $c=0; }
 			}
 		}
 		else {
-			echo $html;
+			echo $str;
 			if ($c==0) { $c=1; } else { $c=0; }
 		}
 		$x++;
 	} //end foreach
-	unset($sql, $agents);
+	unset($sql, $result, $row_count);

 	echo "<tr>\n";
 	echo "<td colspan='11' align='left'>\n";
@@ -311,7 +224,7 @@
 	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
 	echo "		<td width='33.3%' align='right'>\n";
 	echo "			<br />\n";
-	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-update_status']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	</table>\n";
@@ -325,4 +238,4 @@
 //show the footer
 	require_once "resources/footer.php";

-?>
+?>
@@ -17,26 +17,22 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_queue_delete')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_queue_delete')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -64,7 +60,7 @@
 		//delete the tier from the database
 			$sql = "delete from v_call_center_tiers ";
 			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and (call_center_queue_uuid = '$id' or queue_name = '".$queue_name."@".$_SESSION['domain_name']."') ";
+			$sql .= "and queue_name = '$queue_name' ";
 			$db->query($sql);
 			unset($sql);

@@ -103,8 +99,7 @@
 	}

 //redirect the browser
-	messages::add($text['message-delete']);
+	$_SESSION["message"] = $text['message-delete'];
 	header("Location: call_center_queues.php");
 	return;
-
-?>
+?>
@@ -17,27 +17,23 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2015
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_edit')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_edit')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -55,8 +51,7 @@
 //get total call center queues count from the database, check limit, if defined
 	if ($action == 'add') {
 		if ($_SESSION['limit']['call_center_queues']['numeric'] != '') {
-			$sql = "select count(*) as num_rows from v_call_center_queues ";
-			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+			$sql = "select count(*) as num_rows from v_call_center_queues where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$prep_statement = $db->prepare($sql);
 			if ($prep_statement) {
 				$prep_statement->execute();
@@ -65,7 +60,8 @@
 			}
 			unset($prep_statement, $row);
 			if ($total_call_center_queues >= $_SESSION['limit']['call_center_queues']['numeric']) {
-				messages::add($text['message-maximum_queues'].' '.$_SESSION['limit']['call_center_queues']['numeric'], 'negative');
+				$_SESSION['message_mood'] = 'negative';
+				$_SESSION['message'] = $text['message-maximum_queues'].' '.$_SESSION['limit']['call_center_queues']['numeric'];
 				header('Location: call_center_queues.php');
 				return;
 			}
@@ -73,10 +69,9 @@
 	}

 //get http post variables and set them to php variables
-	if (is_array($_POST)) {
+	if (count($_POST) > 0) {
 		//get the post variables a run a security chack on them
 			//$domain_uuid = check_str($_POST["domain_uuid"]);
-			$dialplan_uuid = check_str($_POST["dialplan_uuid"]);
 			$queue_name = check_str($_POST["queue_name"]);
 			$queue_extension = check_str($_POST["queue_extension"]);
 			$queue_strategy = check_str($_POST["queue_strategy"]);
@@ -96,9 +91,11 @@
 			$queue_cid_prefix = check_str($_POST["queue_cid_prefix"]);
 			$queue_announce_sound = check_str($_POST["queue_announce_sound"]);
 			$queue_announce_frequency = check_str($_POST["queue_announce_frequency"]);
-			$queue_cc_exit_keys = check_str($_POST["queue_cc_exit_keys"]);
 			$queue_description = check_str($_POST["queue_description"]);

+		//replace the space in the queue name with a dash
+			$queue_name = str_replace(" ", "-", $queue_name);
+
 		//remove invalid characters
 			$queue_cid_prefix = str_replace(":", "-", $queue_cid_prefix);
 			$queue_cid_prefix = str_replace("\"", "", $queue_cid_prefix);
@@ -108,209 +105,252 @@
 	}

 //delete the tier (agent from the queue)
-	if ($_REQUEST["a"] == "delete" && strlen($_REQUEST["id"]) > 0 && permission_exists("call_center_tier_delete")) {
+	if ($_REQUEST["delete_type"] == "tier" && strlen($_REQUEST["delete_uuid"]) > 0 && permission_exists("call_center_tier_delete")) {
 		//set the variables
 			$call_center_queue_uuid = check_str($_REQUEST["id"]);
-			$call_center_tier_uuid = check_str($_REQUEST["call_center_tier_uuid"]);
+			$tier_uuid = check_str($_REQUEST["delete_uuid"]);
 		//get the agent details
-			$sql = "select agent_name, queue_name, call_center_agent_uuid, call_center_queue_uuid ";
-			$sql .= "from v_call_center_tiers ";
-			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-			$sql .= "and call_center_tier_uuid = '".$call_center_tier_uuid."' ";
+			$sql = "
+				select
+					agent_name,
+					queue_name
+				from
+					v_call_center_tiers
+				where
+					domain_uuid = '".$_SESSION['domain_uuid']."' and
+					call_center_tier_uuid = '".$tier_uuid."'
+					";
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
-			$tiers = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			if (is_array($tiers)) {
-				foreach ($tiers as &$row) {
-					$call_center_agent_uuid = $row["call_center_agent_uuid"];
-					$call_center_queue_uuid = $row["call_center_queue_uuid"];
-				}
+			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+			foreach ($result as &$row) {
+				$agent_name = $row["agent_name"];
+				$queue_name = $row["queue_name"];
+				break; //limit to 1 row
 			}
 			unset ($prep_statement);
 		//delete the agent from freeswitch
+			//get the domain using the $_SESSION['domain_uuid']
+			$tmp_domain = $_SESSION['domains'][$_SESSION['domain_uuid']]['domain_name'];
 			//setup the event socket connection
 			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 			//delete the agent over event socket
 			if ($fp) {
 				//callcenter_config tier del [queue_name] [agent_name]
-				$cmd = "api callcenter_config tier del ".$call_center_queue_uuid." ".$call_center_agent_uuid;
+				$cmd = "api callcenter_config tier del ".$queue_name."@".$tmp_domain." ".$agent_name."@".$_SESSION['domains'][$_SESSION['domain_uuid']]['domain_name'];
 				$response = event_socket_request($fp, $cmd);
 			}
 		//delete the tier from the database
-			if (strlen($call_center_tier_uuid) > 0) {
-				$sql = "delete from v_call_center_tiers where domain_uuid = '".$_SESSION['domain_uuid']."' and call_center_tier_uuid = '".$call_center_tier_uuid."'";
+			if (strlen($tier_uuid)>0) {
+				$sql = "delete from v_call_center_tiers where domain_uuid = '".$_SESSION['domain_uuid']."' and call_center_tier_uuid = '".$tier_uuid."'";
 				$prep_statement = $db->prepare(check_sql($sql));
 				$prep_statement->execute();
 				unset($sql);
 			}
 	}

-//process the user data and save it to the database
-	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
+if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

-		//get the uuid from the POST
-			if ($action == "update") {
-				$call_center_queue_uuid = check_str($_POST["call_center_queue_uuid"]);
-			}
-	
-		//check for all required data
-			$msg = '';
-			//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']."domain_uuid<br>\n"; }
-			if (strlen($queue_name) == 0) { $msg .= $text['message-required'].$text['label-queue_name']."<br>\n"; }
-			if (strlen($queue_extension) == 0) { $msg .= $text['message-required'].$text['label-extension']."<br>\n"; }
-			if (strlen($queue_strategy) == 0) { $msg .= $text['message-required'].$text['label-strategy']."<br>\n"; }
-			//if (strlen($queue_moh_sound) == 0) { $msg .= $text['message-required'].$text['label-music_on_hold']."<br>\n"; }
-			//if (strlen($queue_record_template) == 0) { $msg .= $text['message-required'].$text['label-record_template']."<br>\n"; }
-			//if (strlen($queue_time_base_score) == 0) { $msg .= $text['message-required'].$text['label-time_base_score']."<br>\n"; }
-			//if (strlen($queue_max_wait_time) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time']."<br>\n"; }
-			//if (strlen($queue_max_wait_time_with_no_agent) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time_with_no_agent']."<br>\n"; }
-			//if (strlen($queue_max_wait_time_with_no_agent_time_reached) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time_with_no_agent_time_reached']."<br>\n"; }
-			//if (strlen($queue_tier_rules_apply) == 0) { $msg .= $text['message-required'].$text['label-tier_rules_apply']."<br>\n"; }
-			//if (strlen($queue_tier_rule_wait_second) == 0) { $msg .= $text['message-required'].$text['label-tier_rule_wait_second']."<br>\n"; }
-			//if (strlen($queue_tier_rule_wait_multiply_level) == 0) { $msg .= $text['message-required'].$text['label-tier_rule_wait_multiply_level']."<br>\n"; }
-			//if (strlen($queue_tier_rule_no_agent_no_wait) == 0) { $msg .= $text['message-required'].$text['label-tier_rule_no_agent_no_wait']."<br>\n"; }
-			//if (strlen($queue_timeout_action) == 0) { $msg .= $text['message-required'].$text['label-timeout_action']."<br>\n"; }
-			//if (strlen($queue_discard_abandoned_after) == 0) { $msg .= $text['message-required'].$text['label-discard_abandoned_after']."<br>\n"; }
-			//if (strlen($queue_abandoned_resume_allowed) == 0) { $msg .= $text['message-required'].$text['label-abandoned_resume_allowed']."<br>\n"; }
-			//if (strlen($queue_cid_prefix) == 0) { $msg .= $text['message-required'].$text['label-caller_id_name_prefix']."<br>\n"; }
-			//if (strlen($queue_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
-			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "resources/header.php";
-				require_once "resources/persist_form_var.php";
-				echo "<div align='center'>\n";
-				echo "<table><tr><td>\n";
-				echo $msg."<br />";
-				echo "</td></tr></table>\n";
-				persistformvar($_POST);
-				echo "</div>\n";
-				require_once "resources/footer.php";
-				return;
-			}
+	$msg = '';
+	if ($action == "update") {
+		$call_center_queue_uuid = check_str($_POST["call_center_queue_uuid"]);
+	}

-		//set the domain_uuid
-			$_POST["domain_uuid"] = $_SESSION["domain_uuid"];
+	//check for all required data
+		//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']."domain_uuid<br>\n"; }
+		if (strlen($queue_name) == 0) { $msg .= $text['message-required'].$text['label-queue_name']."<br>\n"; }
+		if (strlen($queue_extension) == 0) { $msg .= $text['message-required'].$text['label-extension']."<br>\n"; }
+		if (strlen($queue_strategy) == 0) { $msg .= $text['message-required'].$text['label-strategy']."<br>\n"; }
+		//if (strlen($queue_moh_sound) == 0) { $msg .= $text['message-required'].$text['label-music_on_hold']."<br>\n"; }
+		//if (strlen($queue_record_template) == 0) { $msg .= $text['message-required'].$text['label-record_template']."<br>\n"; }
+		//if (strlen($queue_time_base_score) == 0) { $msg .= $text['message-required'].$text['label-time_base_score']."<br>\n"; }
+		//if (strlen($queue_max_wait_time) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time']."<br>\n"; }
+		//if (strlen($queue_max_wait_time_with_no_agent) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time_with_no_agent']."<br>\n"; }
+		//if (strlen($queue_max_wait_time_with_no_agent_time_reached) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time_with_no_agent_time_reached']."<br>\n"; }
+		//if (strlen($queue_tier_rules_apply) == 0) { $msg .= $text['message-required'].$text['label-tier_rules_apply']."<br>\n"; }
+		//if (strlen($queue_tier_rule_wait_second) == 0) { $msg .= $text['message-required'].$text['label-tier_rule_wait_second']."<br>\n"; }
+		//if (strlen($queue_tier_rule_wait_multiply_level) == 0) { $msg .= $text['message-required'].$text['label-tier_rule_wait_multiply_level']."<br>\n"; }
+		//if (strlen($queue_tier_rule_no_agent_no_wait) == 0) { $msg .= $text['message-required'].$text['label-tier_rule_no_agent_no_wait']."<br>\n"; }
+		//if (strlen($queue_timeout_action) == 0) { $msg .= $text['message-required'].$text['label-timeout_action']."<br>\n"; }
+		//if (strlen($queue_discard_abandoned_after) == 0) { $msg .= $text['message-required'].$text['label-discard_abandoned_after']."<br>\n"; }
+		//if (strlen($queue_abandoned_resume_allowed) == 0) { $msg .= $text['message-required'].$text['label-abandoned_resume_allowed']."<br>\n"; }
+		//if (strlen($queue_cid_prefix) == 0) { $msg .= $text['message-required'].$text['label-caller_id_name_prefix']."<br>\n"; }
+		//if (strlen($queue_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
+		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+			require_once "resources/header.php";
+			require_once "resources/persist_form_var.php";
+			echo "<div align='center'>\n";
+			echo "<table><tr><td>\n";
+			echo $msg."<br />";
+			echo "</td></tr></table>\n";
+			persistformvar($_POST);
+			echo "</div>\n";
+			require_once "resources/footer.php";
+			return;
+		}

-		//add the call_center_queue_uuid
-			if (strlen($_POST["call_center_queue_uuid"]) == 0) {
+	//add or update the database
+	if ($_POST["persistformvar"] != "true") {
+		if ($action == "add") {
+			//add the call center queue
 				$call_center_queue_uuid = uuid();
-				$_POST["call_center_queue_uuid"] = $call_center_queue_uuid;
-			}
-
-		//add the dialplan_uuid
-			if (strlen($_POST["dialplan_uuid"]) == 0) {
-				$dialplan_uuid = uuid();
-				$_POST["dialplan_uuid"] = $dialplan_uuid;
-			}
-
-		//update the call centier tiers array
-			$x = 0;
-			foreach ($_POST["call_center_tiers"] as $row) {
-				//add the domain_uuid
-					if (strlen($row["domain_uuid"]) == 0) {
-						$_POST["call_center_tiers"][$x]["domain_uuid"] = $_SESSION['domain_uuid'];
-					}
-				//unset ring_group_destination_uuid if the field has no value
-					if (strlen($row["call_center_agent_uuid"]) == 0) {
-						unset($_POST["call_center_tiers"][$x]);
-					}
-				//increment the row
-					$x++;
-			}
-
-		//get the application and data
-			$action_array = explode(":",$queue_timeout_action);
-			$queue_timeout_application = $action_array[0];
-			$queue_timeout_data = substr($queue_timeout_action, strlen($action_array[0])+1, strlen($queue_timeout_application));
-
-		//build the xml dialplan
-			$dialplan_xml = "<extension name=\"".$queue_name."\" continue=\"\" uuid=\"".$dialplan_uuid."\">\n";
-			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^([^#]+#)(.*)\$\" break=\"never\">\n";
-			$dialplan_xml .= "		<action application=\"set\" data=\"caller_id_name=\$2\"/>\n";
-			$dialplan_xml .= "	</condition>\n";
-			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$queue_extension."$\">\n";
-			$dialplan_xml .= "		<action application=\"answer\" data=\"\"/>\n";
-			$dialplan_xml .= "		<action application=\"set\" data=\"hangup_after_bridge=true\"/>\n";
-			if (strlen($queue_cid_prefix) > 0) {
-				$dialplan_xml .= "		<action application=\"set\" data=\"effective_caller_id_name=".$queue_cid_prefix."#\${caller_id_name}\"/>\n";
-			}
-			if (strlen($queue_cc_exit_keys) > 0) {
-				$dialplan_xml .= "		<action application=\"set\" data=\"cc_exit_keys=".$queue_cc_exit_keys."\"/>\n";
-			}
-			$dialplan_xml .= "		<action application=\"callcenter\" data=\"".$call_center_queue_uuid."\"/>\n";
-			$dialplan_xml .= "		<action application=\"".$queue_timeout_application."\" data=\"".$queue_timeout_data."\"/>\n";
-			$dialplan_xml .= "	</condition>\n";
-			$dialplan_xml .= "</extension>\n";
-
-		//build the dialplan array
-			$dialplan["domain_uuid"] = $_SESSION['domain_uuid'];
-			$dialplan["dialplan_uuid"] = $dialplan_uuid;
-			$dialplan["dialplan_name"] = $queue_name;
-			$dialplan["dialplan_number"] = $queue_extension;
-			$dialplan["dialplan_context"] = $_SESSION['context'];
-			$dialplan["dialplan_continue"] = "false";
-			$dialplan["dialplan_xml"] = $dialplan_xml;
-			$dialplan["dialplan_order"] = "230";
-			$dialplan["dialplan_enabled"] = "true";
-			$dialplan["dialplan_description"] = $queue_description;
-			$dialplan["app_uuid"] = "95788e50-9500-079e-2807-fd530b0ea370";
-
-		//prepare the array
-			$array['call_center_queues'][] = $_POST;
-			$array['dialplans'][] = $dialplan;
-
-		//add the dialplan permission
-			$p = new permissions;
-			$p->add("dialplan_add", "temp");
-			$p->add("dialplan_edit", "temp");
-
-		//save to the data
-			$database = new database;
-			$database->app_name = 'call_centers';
-			$database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370';
-			$database->save($array);
-			$message = $database->message;
-
-		//remove the temporary permission
-			$p->delete("dialplan_add", "temp");
-			$p->delete("dialplan_edit", "temp");
-
-		//debug info
-			//echo "<pre>". print_r($message, true) ."</pre>"; exit;
-
-		//save the xml
-			save_dialplan_xml();
-
-		//apply settings reminder
-			$_SESSION["reload_xml"] = true;
-
-		//clear the cache
-			$cache = new cache;
-			$cache->delete("dialplan:".$_SESSION["context"]);
-
-		//redirect the user
-			if (isset($action)) {
-				if ($action == "add") {
-					messages::add($text['message-add']);
+				$sql = "insert into v_call_center_queues ";
+				$sql .= "(";
+				$sql .= "domain_uuid, ";
+				$sql .= "call_center_queue_uuid, ";
+				$sql .= "queue_name, ";
+				$sql .= "queue_extension, ";
+				$sql .= "queue_strategy, ";
+				$sql .= "queue_moh_sound, ";
+				$sql .= "queue_record_template, ";
+				$sql .= "queue_time_base_score, ";
+				$sql .= "queue_max_wait_time, ";
+				$sql .= "queue_max_wait_time_with_no_agent, ";
+				$sql .= "queue_max_wait_time_with_no_agent_time_reached, ";
+				$sql .= "queue_tier_rules_apply, ";
+				$sql .= "queue_tier_rule_wait_second, ";
+				$sql .= "queue_tier_rule_wait_multiply_level, ";
+				$sql .= "queue_tier_rule_no_agent_no_wait, ";
+				$sql .= "queue_timeout_action, ";
+				$sql .= "queue_discard_abandoned_after, ";
+				$sql .= "queue_abandoned_resume_allowed, ";
+				$sql .= "queue_cid_prefix, ";
+				if (strlen($queue_announce_sound) > 0) {
+					$sql .= "queue_announce_sound, ";
 				}
-				if ($action == "update") {
-					messages::add($text['message-update']);
+				if (strlen($queue_announce_frequency) > 0) {
+					$sql .= "queue_announce_frequency, ";
 				}
-			}
+				$sql .= "queue_description ";
+				$sql .= ")";
+				$sql .= "values ";
+				$sql .= "(";
+				$sql .= "'".$_SESSION['domain_uuid']."', ";
+				$sql .= "'$call_center_queue_uuid', ";
+				$sql .= "'$queue_name', ";
+				$sql .= "'$queue_extension', ";
+				$sql .= "'$queue_strategy', ";
+				$sql .= "'$queue_moh_sound', ";
+				$sql .= "'$queue_record_template', ";
+				$sql .= "'$queue_time_base_score', ";
+				$sql .= "'$queue_max_wait_time', ";
+				$sql .= "'$queue_max_wait_time_with_no_agent', ";
+				$sql .= "'$queue_max_wait_time_with_no_agent_time_reached', ";
+				$sql .= "'$queue_tier_rules_apply', ";
+				$sql .= "'$queue_tier_rule_wait_second', ";
+				$sql .= "'$queue_tier_rule_wait_multiply_level', ";
+				$sql .= "'$queue_tier_rule_no_agent_no_wait', ";
+				$sql .= "'$queue_timeout_action', ";
+				$sql .= "'$queue_discard_abandoned_after', ";
+				$sql .= "'$queue_abandoned_resume_allowed', ";
+				$sql .= "'$queue_cid_prefix', ";
+				if (strlen($queue_announce_sound) > 0) {
+					$sql .= "'$queue_announce_sound', ";
+				}
+				if (strlen($queue_announce_frequency) > 0) {
+					$sql .= "'$queue_announce_frequency', ";
+				}
+				$sql .= "'$queue_description' ";
+				$sql .= ")";
+				$db->exec(check_sql($sql));
+				unset($sql);

-		//synchronize the configuration
-			save_call_center_xml();
-			remove_config_from_cache('configuration:callcenter.conf');
+			//synchronize the configuration
+				save_call_center_xml();
+				remove_config_from_cache('configuration:callcenter.conf');

-		//add agent/tier to queue
-			$agent_name = check_str($_POST["agent_name"]);
-			$tier_level = check_str($_POST["tier_level"]);
-			$tier_position = check_str($_POST["tier_position"]);
+			//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_result = event_socket_request($fp, 'api '.$switch_cmd);
+				}

-			if ($agent_name != '') {
+			//set the message
+				$_SESSION["message"] = $text['message-add'];
+		} //if ($action == "add")
+
+		if ($action == "update") {
+			//update the call center queue
+				$sql = "update v_call_center_queues set ";
+				$sql .= "queue_name = '$queue_name', ";
+				$sql .= "queue_extension = '$queue_extension', ";
+				$sql .= "queue_strategy = '$queue_strategy', ";
+				$sql .= "queue_moh_sound = '$queue_moh_sound', ";
+				$sql .= "queue_record_template = '$queue_record_template', ";
+				$sql .= "queue_time_base_score = '$queue_time_base_score', ";
+				$sql .= "queue_max_wait_time = '$queue_max_wait_time', ";
+				$sql .= "queue_max_wait_time_with_no_agent = '$queue_max_wait_time_with_no_agent', ";
+				$sql .= "queue_max_wait_time_with_no_agent_time_reached = '$queue_max_wait_time_with_no_agent_time_reached', ";
+				$sql .= "queue_tier_rules_apply = '$queue_tier_rules_apply', ";
+				$sql .= "queue_tier_rule_wait_second = '$queue_tier_rule_wait_second', ";
+				$sql .= "queue_tier_rule_wait_multiply_level = '$queue_tier_rule_wait_multiply_level', ";
+				$sql .= "queue_tier_rule_no_agent_no_wait = '$queue_tier_rule_no_agent_no_wait', ";
+				$sql .= "queue_timeout_action = '$queue_timeout_action', ";
+				$sql .= "queue_discard_abandoned_after = '$queue_discard_abandoned_after', ";
+				$sql .= "queue_abandoned_resume_allowed = '$queue_abandoned_resume_allowed', ";
+				$sql .= "queue_cid_prefix = '$queue_cid_prefix', ";
+				$sql .= "queue_announce_sound = '$queue_announce_sound', ";
+				if (strlen($queue_announce_frequency) > 0) {
+					$sql .= "queue_announce_frequency = '$queue_announce_frequency', ";
+				}
+				$sql .= "queue_description = '$queue_description' ";
+				$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+				$sql .= "and call_center_queue_uuid = '$call_center_queue_uuid'";
+				$db->exec(check_sql($sql));
+				unset($sql);
+
+			//get the dialplan_uuid
+				$sql = "select * from v_call_center_queues ";
+				$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+				$sql .= "and call_center_queue_uuid = '$call_center_queue_uuid' ";
+				$prep_statement = $db->prepare(check_sql($sql));
+				$prep_statement->execute();
+				$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+				foreach ($result as &$row) {
+					$dialplan_uuid = $row["dialplan_uuid"];
+				}
+				unset ($prep_statement);
+
+			//synchronize the configuration
+				save_call_center_xml();
+				remove_config_from_cache('configuration:callcenter.conf');
+
+			//clear the cache
+				$cache = new cache;
+				$cache->delete("dialplan:".$_SESSION["context"]);
+
+			//set the update message
+				$_SESSION["message"] = $text['message-update'];
+		} //if ($action == "update")
+
+	//dialplan add or update
+		$c = new call_center;
+		$c->db = $db;
+		$c->domain_uuid = $_SESSION['domain_uuid'];
+		$c->call_center_queue_uuid = $call_center_queue_uuid;
+		$c->dialplan_uuid = $dialplan_uuid;
+		$c->queue_name = $queue_name;
+		$c->queue_name = $queue_name;
+		$c->queue_cid_prefix = $queue_cid_prefix;
+		$c->queue_timeout_action = $queue_timeout_action;
+		$c->queue_description = $queue_description;
+		$c->destination_number = $queue_extension;
+		$a = $c->dialplan();
+
+	//add agent/tier to queue
+		$agent_name = check_str($_POST["agent_name"]);
+		$tier_level = check_str($_POST["tier_level"]);
+		$tier_position = check_str($_POST["tier_position"]);
+
+		if ($agent_name != '') {
+			//add the agent
 				//setup the event socket connection
 					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 				//add the agent using event socket
 					if ($fp) {
+						//get the domain using the $domain_uuid
+						$tmp_domain = $_SESSION['domains'][$domain_uuid]['domain_name'];
 						/* syntax:
 							callcenter_config tier add [queue_name] [agent_name] [level] [position]
 							callcenter_config tier set state [queue_name] [agent_name] [state]
@@ -318,111 +358,94 @@
 							callcenter_config tier set position [queue_name] [agent_name] [position]
 						*/
 						//add the agent
-						$cmd = "api callcenter_config tier add ".$call_center_queue_uuid." ".$call_center_agent_uuid." ".$tier_level." ".$tier_position;
+						$cmd = "api callcenter_config tier add ".$queue_name."@".$tmp_domain." ".$agent_name."@".$tmp_domain." ".$tier_level." ".$tier_position;
 						$response = event_socket_request($fp, $cmd);
 						usleep(200);
 						//agent set level
-						$cmd = "api callcenter_config tier set level ".$call_center_queue_uuid." ".$call_center_agent_uuid." ".$tier_level;
+						$cmd = "api callcenter_config tier set level ".$queue_name."@".$tmp_domain." ".$agent_name."@".$tmp_domain." ".$tier_level;
 						$response = event_socket_request($fp, $cmd);
 						usleep(200);
 						//agent set position
-						$cmd = "api callcenter_config tier set position ".$call_center_queue_uuid." ".$call_center_agent_uuid." ".$tier_position;
+						$cmd = "api callcenter_config tier set position ".$queue_name."@".$tmp_domain." ".$agent_name."@".$tmp_domain." ".$tier_position;
 						$response = event_socket_request($fp, $cmd);
 						usleep(200);
 					}
-			}

-		//syncrhonize configuration
-			save_call_center_xml();
+			//add tier to database
+				$call_center_tier_uuid = uuid();
+				$sql = "insert into v_call_center_tiers ";
+				$sql .= "(";
+				$sql .= "domain_uuid, ";
+				$sql .= "call_center_tier_uuid, ";
+				$sql .= "agent_name, ";
+				$sql .= "queue_name, ";
+				$sql .= "tier_level, ";
+				$sql .= "tier_position ";
+				$sql .= ")";
+				$sql .= "values ";
+				$sql .= "(";
+				$sql .= "'".$_SESSION['domain_uuid']."', ";
+				$sql .= "'$call_center_tier_uuid', ";
+				$sql .= "'$agent_name', ";
+				$sql .= "'$queue_name', ";
+				$sql .= "'$tier_level', ";
+				$sql .= "'$tier_position' ";
+				$sql .= ")";
+				$db->exec(check_sql($sql));
+				unset($sql);

-		//remove the cache
-			remove_config_from_cache('configuration:callcenter.conf');
+			//syncrhonize configuration
+				save_call_center_xml();
+				remove_config_from_cache('configuration:callcenter.conf');
+		}

-		//redirect the user
-			header("Location: call_center_queue_edit.php?id=".$call_center_queue_uuid);
-			return;
+		//redirect
+		header("Location: call_center_queue_edit.php?id=".$call_center_queue_uuid);
+		return;

-	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
+	} //if ($_POST["persistformvar"] != "true")
+} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)

 //initialize the destinations object
 	$destination = new destinations;

 //pre-populate the form
-	if (is_array($_GET) && is_uuid($_GET["id"]) && $_POST["persistformvar"] != "true") {
+	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$call_center_queue_uuid = $_GET["id"];
 		$sql = "select * from v_call_center_queues ";
 		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 		$sql .= "and call_center_queue_uuid = '$call_center_queue_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
-		$call_center_queues = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		if (is_array($call_center_queues)) {
-			foreach ($call_center_queues as &$row) {
-				$queue_name = $row["queue_name"];
-				$dialplan_uuid = $row["dialplan_uuid"];
-				$database_queue_name = $row["queue_name"];
-				$queue_extension = $row["queue_extension"];
-				$queue_strategy = $row["queue_strategy"];
-				$queue_moh_sound = $row["queue_moh_sound"];
-				$queue_record_template = $row["queue_record_template"];
-				$queue_time_base_score = $row["queue_time_base_score"];
-				$queue_max_wait_time = $row["queue_max_wait_time"];
-				$queue_max_wait_time_with_no_agent = $row["queue_max_wait_time_with_no_agent"];
-				$queue_max_wait_time_with_no_agent_time_reached = $row["queue_max_wait_time_with_no_agent_time_reached"];
-				$queue_timeout_action = $row["queue_timeout_action"];
-				$queue_tier_rules_apply = $row["queue_tier_rules_apply"];
-				$queue_tier_rule_wait_second = $row["queue_tier_rule_wait_second"];
-				$queue_tier_rule_wait_multiply_level = $row["queue_tier_rule_wait_multiply_level"];
-				$queue_tier_rule_no_agent_no_wait = $row["queue_tier_rule_no_agent_no_wait"];
-				$queue_discard_abandoned_after = $row["queue_discard_abandoned_after"];
-				$queue_abandoned_resume_allowed = $row["queue_abandoned_resume_allowed"];
-				$queue_cid_prefix = $row["queue_cid_prefix"];
-				$queue_announce_sound = $row["queue_announce_sound"];
-				$queue_announce_frequency = $row["queue_announce_frequency"];
-				$queue_cc_exit_keys = $row["queue_cc_exit_keys"];
-				$queue_description = $row["queue_description"];
-			}
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach ($result as &$row) {
+			$queue_name = $row["queue_name"];
+			$database_queue_name = $row["queue_name"];
+			$queue_extension = $row["queue_extension"];
+			$queue_strategy = $row["queue_strategy"];
+			$queue_moh_sound = $row["queue_moh_sound"];
+			$queue_record_template = $row["queue_record_template"];
+			$queue_time_base_score = $row["queue_time_base_score"];
+			$queue_max_wait_time = $row["queue_max_wait_time"];
+			$queue_max_wait_time_with_no_agent = $row["queue_max_wait_time_with_no_agent"];
+			$queue_max_wait_time_with_no_agent_time_reached = $row["queue_max_wait_time_with_no_agent_time_reached"];
+			$queue_timeout_action = $row["queue_timeout_action"];
+			$queue_tier_rules_apply = $row["queue_tier_rules_apply"];
+			$queue_tier_rule_wait_second = $row["queue_tier_rule_wait_second"];
+			$queue_tier_rule_wait_multiply_level = $row["queue_tier_rule_wait_multiply_level"];
+			$queue_tier_rule_no_agent_no_wait = $row["queue_tier_rule_no_agent_no_wait"];
+			$queue_discard_abandoned_after = $row["queue_discard_abandoned_after"];
+			$queue_abandoned_resume_allowed = $row["queue_abandoned_resume_allowed"];
+			$queue_cid_prefix = $row["queue_cid_prefix"];
+			$queue_announce_sound = $row["queue_announce_sound"];
+			$queue_announce_frequency = $row["queue_announce_frequency"];
+			$queue_description = $row["queue_description"];
 		}
 		unset ($prep_statement);
 	}

-//get the tiers
-	$sql = "select t.call_center_tier_uuid, t.call_center_agent_uuid, t.call_center_queue_uuid, t.tier_level, t.tier_position, a.agent_name ";
-	$sql .= "from v_call_center_tiers as t, v_call_center_agents as a ";
-	$sql .= "where t.call_center_queue_uuid = '".$call_center_queue_uuid."' ";
-	$sql .= "and t.call_center_agent_uuid = a.call_center_agent_uuid ";
-	$sql .= "and t.domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "order by tier_level asc, tier_position asc, agent_name asc";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$tiers = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-
-//add an empty row to the tiers array
-	if (count($tiers) == 0) {
-		$rows = $_SESSION['call_center']['agent_add_rows']['numeric'];
-		$id = 0;
-	}
-	if (count($tiers) > 0) {
-		$rows = $_SESSION['call_center']['agent_edit_rows']['numeric'];
-		$id = count($tiers)+1;
-	}
-	for ($x = 0; $x < $rows; $x++) {
-		$tiers[$id]['call_center_tier_uuid'] = uuid();
-		$tiers[$id]['call_center_agent_uuid'] = '';
-		$tiers[$id]['call_center_queue_uuid'] = $call_center_queue_uuid;
-		$tiers[$id]['tier_level'] = '';
-		$tiers[$id]['tier_position'] = '';
-		$tiers[$id]['agent_name'] = '';
-		$id++;
-	}
-
-//get the agents
-	$sql = "select call_center_agent_uuid, agent_name from v_call_center_agents ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "order by agent_name asc";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$agents = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+//replace the dash in the queue name with a space
+	$queue_name = str_replace("-", " ", $queue_name);

 //set default values
 	if (strlen($queue_strategy) == 0) { $queue_strategy = "longest-idle-agent"; }
@@ -461,13 +484,10 @@
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='call_center_queues.php'\" value='".$text['button-back']."'>\n";
 	if ($action == "update") {
 		echo "	&nbsp;&nbsp;&nbsp;";
-		if (permission_exists('call_center_wallboard')) {
-			echo "  <input type='button' class='btn' value='".$text['button-wallboard']."' onclick=\"document.location.href='call_center_wallboard.php?queue_name=".$database_queue_name."';\" />\n";
-		}
-		echo "  <input type='button' class='btn' value='".$text['button-stop']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+unload+".$call_center_queue_uuid."';\" />\n";
-		echo "  <input type='button' class='btn' value='".$text['button-start']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+load+".$call_center_queue_uuid."';\" />\n";
-		echo "  <input type='button' class='btn' value='".$text['button-restart']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+reload+".$call_center_queue_uuid."';\" />\n";
-		echo "  <input type='button' class='btn' value='".$text['button-view']."' onclick=\"document.location.href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$call_center_queue_uuid."';\" />\n";
+		echo "  <input type='button' class='btn' value='".$text['button-stop']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+unload+".$database_queue_name."@".$_SESSION['domain_name']."';\" />\n";
+		echo "  <input type='button' class='btn' value='".$text['button-start']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+load+".$database_queue_name."@".$_SESSION['domain_name']."';\" />\n";
+		echo "  <input type='button' class='btn' value='".$text['button-restart']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+reload+".$database_queue_name."@".$_SESSION['domain_name']."';\" />\n";
+		echo "  <input type='button' class='btn' value='".$text['button-view']."' onclick=\"document.location.href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".$database_queue_name."';\" />\n";
 		echo "	&nbsp;&nbsp;&nbsp;";
 	}
 	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>\n";
@@ -568,67 +588,88 @@

 	if (permission_exists('call_center_tier_view')) {
 		echo "<tr>";
-		echo "	<td class='vncell' valign='top'>".$text['label-agents']."</td>";
+		echo "	<td class='vncell' valign='top'>".$text['label-tiers']."</td>";
 		echo "	<td class='vtable' align='left'>";
-		echo "			<table border='0' cellpadding='0' cellspacing='0'>\n";
+		echo "		<table width='45%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "			<tr>\n";
 		echo "				<td class='vtable'>".$text['label-agent_name']."</td>\n";
 		echo "				<td class='vtable' style='text-align: center;'>".$text['label-tier_level']."</td>\n";
 		echo "				<td class='vtable' style='text-align: center;'>".$text['label-tier_position']."</td>\n";
 		echo "				<td></td>\n";
 		echo "			</tr>\n";
-		if ($call_center_queue_uuid != null) {
-			if (is_array($tiers)) {
-				$x = 0;
-				foreach($tiers as $field) {
-					echo "	<tr>\n";
-					echo "		<td class=''>";
-					echo "				<input type=\"hidden\" name=\"call_center_tiers[$x][call_center_queue_uuid]\" value=\"".$field['call_center_queue_uuid']."\">\n";
-					echo "				<input type=\"hidden\" name=\"call_center_tiers[$x][call_center_tier_uuid]\" value=\"".$field['call_center_tier_uuid']."\">\n";
-					echo "				<select name=\"call_center_tiers[$x][call_center_agent_uuid]\" class=\"formfld\">\n";
-					echo "					<option value=\"\"></option>\n";
-					foreach($agents as $row) {
-						$selected = '';
-						if ($row['call_center_agent_uuid'] == $field['call_center_agent_uuid']) {
-							$selected = "selected=\"selected\"";
-						}
-						echo "				<option value=\"".$row['call_center_agent_uuid']."\" $selected>".$row['agent_name']."</option>\n";
-					}
-					echo "				</select>";
-					echo "		</td>\n";
-					echo "		<td class='' style='text-align: center;'>";
-					echo "				 <select name=\"call_center_tiers[$x][tier_level]\" class=\"formfld\">\n";
-					$i=0;
-					while($i<=9) {
-						$selected = ($i == $field['tier_level']) ? "selected" : null;
-						echo "				<option value=\"$i\" ".$selected.">$i</option>\n";
-						$i++;
-					}
-					echo "				</select>\n";
-					echo "		</td>\n";

-					echo "		<td class='' style='text-align: center;'>\n";
-					echo "				<select name=\"call_center_tiers[$x][tier_position]\" class=\"formfld\">\n";
-					$i=0;
-					while($i<=9) {
-						$selected = ($i == $field['tier_position']) ? "selected" : null;
-						echo "				<option value=\"$i\" ".$selected.">$i</option>\n";
-						$i++;
-					}
-					echo "				</select>\n";
-					echo "		</td>\n";
-					echo "		<td class=''>";
-					if (permission_exists('call_center_tier_delete')) {
-						echo "			<a href=\"call_center_queue_edit.php?id=".$call_center_queue_uuid."&call_center_tier_uuid=".$field['call_center_tier_uuid']."&a=delete\" alt=\"".$text['button-delete']."\" onclick=\"return confirm('".$text['confirm-delete']."');\">$v_link_label_delete</a>";
-					}
-					echo "		</td>\n";
-					echo "	</tr>\n";
-					$assigned_agents[] = $field['agent_name'];
-					$x++;
+		if ($call_center_queue_uuid != '') {
+			//replace the space in the queue name with a dash
+			$db_queue_name = str_replace(" ", "-", $queue_name);
+
+			$sql = "select * from v_call_center_tiers ";
+			$sql .= "where queue_name = '".$db_queue_name."' ";
+			$sql .= "and domain_uuid = '".$_SESSION['domain_uuid']."' ";
+			$sql .= "order by tier_level asc, tier_position asc, agent_name asc";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+			foreach($result as $field) {
+				echo "	<tr>\n";
+				echo "		<td class='vtable'>".$field['agent_name']."</td>\n";
+				echo "		<td class='vtable' style='text-align: center;'>".$field['tier_level']."&nbsp;</td>\n";
+				echo "		<td class='vtable' style='text-align: center;'>".$field['tier_position']."&nbsp;</td>\n";
+				echo "		<td class='list_control_icons'>";
+				if (permission_exists('call_center_tier_edit')) {
+					echo		"<a href='call_center_tier_edit.php?id=".$field['call_center_tier_uuid']."' alt='".$text['button-edit']."'>".$v_link_label_edit."</a>";
 				}
-				unset ($prep_statement, $sql, $tiers);
+				if (permission_exists('call_center_tier_delete')) {
+					echo 		"<a href='#' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('delete_type').value = 'tier'; document.getElementById('delete_uuid').value = '".$field['call_center_tier_uuid']."'; document.forms.frm.submit(); }\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
+				}
+				echo "		</td>\n";
+				echo "	</tr>\n";
+				$assigned_agents[] = $field['agent_name'];
+			}
+			unset ($prep_statement, $sql, $result);
+		}
+
+		if (permission_exists('call_center_tier_add')) {
+			//get agents
+			$sql = "select agent_name from v_call_center_agents where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+			foreach($assigned_agents as $assigned_agent) {
+				$sql .= "and agent_name <> '".$assigned_agent."' ";
+			}
+			$sql .= "order by agent_name asc";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+			if (sizeof($result) > 0) {
+				echo "		<tr>\n";
+				echo "			<td class='vtable'>\n";
+				echo "<select id='agent_name' name='agent_name' class='formfld'>\n";
+				echo "					<option value=''></option>\n";
+				foreach($result as $field) {
+					echo "				<option value='".$field['agent_name']."'>".$field['agent_name']."</option>\n";
+				}
+				unset($sql,$prep_statement);
+				echo "				</select>";
+				echo "			</td>\n";
+				echo "			<td class='vtable' style='text-align: center;'>\n";
+				echo "				<select class='formfld' name='tier_level'>\n";
+				for ($t = 0; $t <= 9; $t++) {
+					echo "				<option value='".$t."'>".$t."</option>\n";
+				}
+				echo "				</select>\n";
+				echo "			</td>\n";
+				echo "			<td class='vtable' style='text-align: center;'>\n";
+				echo "				<select class='formfld' name='tier_position'>\n";
+				for ($t = 1; $t <= 9; $t++) {
+					echo "				<option value='".$t."'>".$t."</option>\n";
+				}
+				echo "				</select>\n";
+				echo "			</td>\n";
+				echo "			<td>";
+				echo "				<input type=\"submit\" class='btn' value=\"".$text['button-add']."\">\n";
+				echo "			</td>\n";
+				echo "		</tr>\n";
 			}
 		}
+
 		echo "		</table>\n";
 		echo "		<br>\n";
 		echo "		".$text['description-tiers']."\n";
@@ -656,7 +697,8 @@
 	echo "	".$text['label-record_template']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	$record_template = $_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.\${record_ext}";
+	$record_ext=($_SESSION['record_ext']=='mp3'?'mp3':'wav');
+	$record_template = $_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/\${strftime(%Y)}/\${strftime(%b)}/\${strftime(%d)}/\${uuid}.".$record_ext;
 	echo "	<select class='formfld' name='queue_record_template'>\n";
 	if (strlen($queue_record_template) > 0) {
 		echo "	<option value='$record_template' selected='selected' >".$text['option-true']."</option>\n";
@@ -895,17 +937,6 @@
 	echo "</td>\n";
 	echo "</tr>\n";

-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "  ".$text['label-exit_keys']."\n";
-   	echo "</td>\n";
-   	echo "<td class='vtable' align='left'>\n";
-   	echo "  <input class='formfld' type='text' name='queue_cc_exit_keys' value='$queue_cc_exit_keys'>\n";
-   	echo "<br />\n";
-   	echo $text['description-exit_keys']."\n";
-   	echo "</td>\n";
-   	echo "</tr>\n";
-
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-description']."\n";
@@ -916,12 +947,13 @@
 	echo $text['description-description']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if ($action == "update") {
 		echo "		<input type='hidden' name='call_center_queue_uuid' value='".$call_center_queue_uuid."'>\n";
-		echo "		<input type='hidden' name='dialplan_uuid' value='".$dialplan_uuid."'>\n";
+		echo "		<input type='hidden' name='id' id='id' value='".$call_center_queue_uuid."'>";
+		echo "		<input type='hidden' name='delete_type' id='delete_type' value=''>";
+		echo "		<input type='hidden' name='delete_uuid' id='delete_uuid' value=''>";
 	}
 	echo "			<br />";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
@@ -931,7 +963,6 @@
 	echo "<br><br>";
 	echo "</form>";

-//include the footer
-	require_once "resources/footer.php";
+require_once "resources/footer.php";

-?>
+?>
@@ -125,7 +125,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 		unset($prep_statement);

-		messages::add($text['message-update']);
+		$_SESSION["message"] = $text['message-update'];
 		header("Location: call_center_queue_edit.php?id=".$queue_uuid);
 		return;

@@ -17,7 +17,7 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2015 - 2016
+	Copyright (C) 2015
 	All Rights Reserved.

 	Contributor(s):
@@ -41,7 +41,6 @@
 			public $queue_name;
 			public $queue_description;
 			public $destination_number;
-			public $queue_cc_exit_keys;

 			/**
 			 * Called when the object is created
@@ -144,17 +143,6 @@
 						$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $y * 10;
 						$y++;
 					}
-				
-                                       if (strlen($this->queue_cc_exit_keys) > 0) {
-                                               $dialplan["dialplan_details"][$y]["domain_uuid"] = $this->domain_uuid;
-                                               $dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
-                                               $dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "set";
-                                               $dialplan["dialplan_details"][$y]["dialplan_detail_data"] = "cc_exit_keys=".$this->queue_cc_exit_keys;
-                                               $dialplan["dialplan_details"][$y]["dialplan_detail_group"] = "2";
-                                               $dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $y * 10;
-                                               $y++;
-                                       }
-
 					$dialplan["dialplan_details"][$y]["domain_uuid"] = $this->domain_uuid;
 					$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
 					$dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "callcenter";
@@ -185,16 +173,12 @@
 					$p->add("dialplan_detail_add", 'temp');
 					$p->add("dialplan_edit", 'temp');
 					$p->add("dialplan_detail_edit", 'temp');
-				
-				//prepare the array
-					$array["dialplans"][0] = $dialplan;

 				//save the dialplan
-					$database = new database;
-					$database->app_name = 'dialplans';
-					$database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
-					$database->save($array);
-					$dialplan_response = $database->message;
+					$orm = new orm;
+					$orm->name('dialplans');
+					$orm->save($dialplan);
+					$dialplan_response = $orm->message;
 					$this->dialplan_uuid = $dialplan_response['uuid'];

 				//if new dialplan uuid then update the call center queue
@@ -234,8 +218,7 @@ $c->queue_cid_prefix = "";
 $c->queue_timeout_action = "";
 $c->queue_description = "";
 $c->destination_number = "";
-$c->queue_cc_exit_keys = "";
 $c->dialplan();
 */

-?>
+?>
@@ -5,31 +5,22 @@
 		$apps[$x]['uuid'] = "b1b70f85-6b42-429b-8c5a-60c8b02b7d14";
 		$apps[$x]['category'] = "";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
-		$apps[$x]['description']['en-us'] = "Direct calls between two destinations by calling a feature code.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Anrufe zwischen zwei Ziele anhand eines Funktions-Codes steuern.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Anrufe zwischen zwei Ziele anhand eines Funktions-Codes steuern.";
+		$apps[$x]['description']['en-us'] = "";
 		$apps[$x]['description']['es-cl'] = "";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "";

 	//destination details
-		$y=0;
+		$y = 0;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "call_flows";
 		$apps[$x]['destinations'][$y]['name'] = "call_flows";
@@ -43,7 +34,7 @@
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name}";

 	//permission details
-		$y=0;
+		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "call_flow_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "b0939384-7055-44e8-8b4c-9f72293e1878";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -61,14 +52,11 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_flow_context";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";

 	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_call_flows";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_call_flows";
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -87,72 +75,87 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_dialplans";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "dialplan_uuid";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the name.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o nome.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_extension";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the extension number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the extension number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o ramal.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_feature_code";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the feature code.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the feature code.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o código de recurso.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_context";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the context.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the context.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o contexto.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_status";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the status.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Select the status.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Selecione o estado.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_pin_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the PIN number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the PIN number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o número PIN.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_label";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the label.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the label.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com uma etiqueta.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_sound";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the sound.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Select the sound.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Selecione o som.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_app";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the application.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the application.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com a aplicação.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_data";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the application data.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the application data.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com os dados da aplicação.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_flow_alternate_label";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_flow_anti_label";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the alternate label.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the alternate label.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com uma etiqueta alternativa.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_alternate_sound";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the alternate sound.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Select the alternate sound.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Selecione um som alternativo.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_flow_alternate_app";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_flow_anti_app";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the alternate application.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the alternate application.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com uma aplicação alternativa.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_flow_alternate_data";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "call_flow_anti_data";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the alernate application data.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the alernate application data.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com os dados da aplicação alternativa.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_flow_description";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "Enter the description.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com a descrição.";

 ?>
@@ -1,664 +1,333 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC

 $text['title-call_flows']['en-us'] = "Call Flows";
-$text['title-call_flows']['ar-eg'] = "";
-$text['title-call_flows']['de-at'] = "Anruf Steuerung"; //copied from de-de
-$text['title-call_flows']['de-ch'] = "Anruf Steuerung"; //copied from de-de
-$text['title-call_flows']['de-de'] = "Anruf Steuerung";
 $text['title-call_flows']['es-cl'] = "Flujo de Llamada";
-$text['title-call_flows']['es-mx'] = "Flujo de Llamada"; //copied from es-cl
-$text['title-call_flows']['fr-ca'] = "Flux d'appel"; //copied from fr-fr
-$text['title-call_flows']['fr-fr'] = "Flux d'appel";
-$text['title-call_flows']['he-il'] = "";
-$text['title-call_flows']['it-it'] = "Deviatori di Chiamata";
-$text['title-call_flows']['nl-nl'] = "";
-$text['title-call_flows']['pl-pl'] = "Przepływ rozmów";
-$text['title-call_flows']['pt-br'] = "Fluxo de chamadas";
 $text['title-call_flows']['pt-pt'] = "Fluxo de Chamadas";
-$text['title-call_flows']['ro-ro'] = "";
-$text['title-call_flows']['ru-ru'] = "Переключатели вызовов";
+$text['title-call_flows']['fr-fr'] = "Flux d'appel";
+$text['title-call_flows']['pt-br'] = "Fluxo de chamadas";
+$text['title-call_flows']['pl'] = "Przepływ rozmów";
 $text['title-call_flows']['sv-se'] = "Samtalsflöden";
-$text['title-call_flows']['uk-ua'] = "Потоки дзвінків";
+$text['title-call_flows']['uk'] = "Потоки дзвінків";
+$text['title-call_flows']['de-at'] = "Anruf Steuerung";

-$text['title-call_flow']['en-us'] = "Call Flow";
-$text['title-call_flow']['ar-eg'] = "";
-$text['title-call_flow']['de-at'] = "Anruf Steuerung"; //copied from de-de
-$text['title-call_flow']['de-ch'] = "Anruf Steuerung"; //copied from de-de
-$text['title-call_flow']['de-de'] = "Anruf Steuerung";
-$text['title-call_flow']['es-cl'] = "Flujo de Llamada";
-$text['title-call_flow']['es-mx'] = "Flujo de Llamada"; //copied from es-cl
-$text['title-call_flow']['fr-ca'] = "Editer le flux"; //copied from fr-fr
-$text['title-call_flow']['fr-fr'] = "Editer le flux";
-$text['title-call_flow']['he-il'] = "";
-$text['title-call_flow']['it-it'] = "";
-$text['title-call_flow']['nl-nl'] = "";
-$text['title-call_flow']['pl-pl'] = "Przepływ rozmów";
-$text['title-call_flow']['pt-br'] = "Fluxo de chamada";
-$text['title-call_flow']['pt-pt'] = "Fluxo de Chamada";
-$text['title-call_flow']['ro-ro'] = "";
-$text['title-call_flow']['ru-ru'] = "Переключатель вызовов";
-$text['title-call_flow']['sv-se'] = "Samtalsflöde";
-$text['title-call_flow']['uk-ua'] = "Потік дзвінків";
+$text['title-call_flow-edit']['en-us'] = "Call Flow";
+$text['title-call_flow-edit']['es-cl'] = "Flujo de Llamada";
+$text['title-call_flow-edit']['pt-pt'] = "Fluxo de Chamada";
+$text['title-call_flow-edit']['fr-fr'] = "Editer le flux";
+$text['title-call_flow-edit']['pt-br'] = "Fluxo de chamada";
+$text['title-call_flow-edit']['pl'] = "Przepływ rozmów";
+$text['title-call_flow-edit']['sv-se'] = "Samtalsflöde";
+$text['title-call_flow-edit']['uk'] = "Потік дзвінків";
+$text['title-call_flow-edit']['de-at'] = "Anruf Steuerung";

-$text['label-call_flow_name']['en-us'] = "Name";
-$text['label-call_flow_name']['ar-eg'] = "";
-$text['label-call_flow_name']['de-at'] = "Name"; //copied from de-de
-$text['label-call_flow_name']['de-ch'] = "Name"; //copied from de-de
-$text['label-call_flow_name']['de-de'] = "Name";
-$text['label-call_flow_name']['es-cl'] = "Nombre";
-$text['label-call_flow_name']['es-mx'] = "Nombre"; //copied from es-cl
-$text['label-call_flow_name']['fr-ca'] = "Nom"; //copied from fr-fr
-$text['label-call_flow_name']['fr-fr'] = "Nom";
-$text['label-call_flow_name']['he-il'] = "";
-$text['label-call_flow_name']['it-it'] = "";
-$text['label-call_flow_name']['nl-nl'] = "";
-$text['label-call_flow_name']['pl-pl'] = "Nazwa";
-$text['label-call_flow_name']['pt-br'] = "Nome"; //copied from pt-pt
-$text['label-call_flow_name']['pt-pt'] = "Nome";
-$text['label-call_flow_name']['ro-ro'] = "";
-$text['label-call_flow_name']['ru-ru'] = "Имя";
-$text['label-call_flow_name']['sv-se'] = "Namn";
-$text['label-call_flow_name']['uk-ua'] = "Назва";
+$text['title-call_flow-add']['en-us'] = "Call Flow Add";
+$text['title-call_flow-add']['es-cl'] = "Agregar Flujo de Llamada";
+$text['title-call_flow-add']['pt-pt'] = "Adicionar Fluxo de Chamada";
+$text['title-call_flow-add']['fr-fr'] = "Ajouter un flux";
+$text['title-call_flow-add']['pt-br'] = "Adicionar fluxo de chamada";
+$text['title-call_flow-add']['pl'] = "Dodaj przepływ rozmów";
+$text['title-call_flow-add']['sv-se'] = "Lägg Till Samtalsflöde";
+$text['title-call_flow-add']['uk'] = "Виклик Flow Додати";
+$text['title-call_flow-add']['de-at'] = "Anruf Steuerung hinzufügen";

-$text['label-call_flow_status']['en-us'] = "Status";
-$text['label-call_flow_status']['ar-eg'] = "";
-$text['label-call_flow_status']['de-at'] = "Aktiviert"; //copied from de-de
-$text['label-call_flow_status']['de-ch'] = "Aktiviert"; //copied from de-de
-$text['label-call_flow_status']['de-de'] = "Aktiviert";
-$text['label-call_flow_status']['es-cl'] = "Estado";
-$text['label-call_flow_status']['es-mx'] = "Estado"; //copied from es-cl
-$text['label-call_flow_status']['fr-ca'] = "Etat"; //copied from fr-fr
-$text['label-call_flow_status']['fr-fr'] = "Etat";
-$text['label-call_flow_status']['he-il'] = "";
-$text['label-call_flow_status']['it-it'] = "";
-$text['label-call_flow_status']['nl-nl'] = "";
-$text['label-call_flow_status']['pl-pl'] = "Status";
-$text['label-call_flow_status']['pt-br'] = "Estado"; //copied from pt-pt
-$text['label-call_flow_status']['pt-pt'] = "Estado";
-$text['label-call_flow_status']['ro-ro'] = "";
-$text['label-call_flow_status']['ru-ru'] = "Статус";
-$text['label-call_flow_status']['sv-se'] = "Status";
-$text['label-call_flow_status']['uk-ua'] = "Статус";
+$text['label-status']['en-us'] = "Status";
+$text['label-status']['es-cl'] = "Estado";
+$text['label-status']['pt-pt'] = "Estado";
+$text['label-status']['fr-fr'] = "Etat";
+$text['label-status']['pt-br'] = "Estado";
+$text['label-status']['pl'] = "Status";
+$text['label-status']['sv-se'] = "Status";
+$text['label-status']['uk'] = "Статус";
+$text['label-status']['de-at'] = "Status";

-$text['label-call_flow_pin_number']['en-us'] = "PIN Number";
-$text['label-call_flow_pin_number']['ar-eg'] = "";
-$text['label-call_flow_pin_number']['de-at'] = "PIN Nummer"; //copied from de-de
-$text['label-call_flow_pin_number']['de-ch'] = "PIN Nummer"; //copied from de-de
-$text['label-call_flow_pin_number']['de-de'] = "PIN Nummer";
-$text['label-call_flow_pin_number']['es-cl'] = "Número PIN";
-$text['label-call_flow_pin_number']['es-mx'] = "Número PIN"; //copied from es-cl
-$text['label-call_flow_pin_number']['fr-ca'] = "Code PIN"; //copied from fr-fr
-$text['label-call_flow_pin_number']['fr-fr'] = "Code PIN";
-$text['label-call_flow_pin_number']['he-il'] = "";
-$text['label-call_flow_pin_number']['it-it'] = "";
-$text['label-call_flow_pin_number']['nl-nl'] = "";
-$text['label-call_flow_pin_number']['pl-pl'] = "Numer PIN";
-$text['label-call_flow_pin_number']['pt-br'] = "Código PIN"; //copied from pt-pt
-$text['label-call_flow_pin_number']['pt-pt'] = "Código PIN";
-$text['label-call_flow_pin_number']['ro-ro'] = "";
-$text['label-call_flow_pin_number']['ru-ru'] = "PIN код";
-$text['label-call_flow_pin_number']['sv-se'] = "PIN Kod";
-$text['label-call_flow_pin_number']['uk-ua'] = "PIN-код";
+$text['label-pin_number']['en-us'] = "PIN Number";
+$text['label-pin_number']['es-cl'] = "Número PIN";
+$text['label-pin_number']['pt-pt'] = "Código PIN";
+$text['label-pin_number']['fr-fr'] = "Code PIN";
+$text['label-pin_number']['pt-br'] = "Código PIN";
+$text['label-pin_number']['pl'] = "Numer PIN";
+$text['label-pin_number']['sv-se'] = "PIN Kod";
+$text['label-pin_number']['uk'] = "PIN-код";
+$text['label-pin_number']['de-at'] = "PIN Nummer";

-$text['label-call_flow_feature_code']['en-us'] = "Feature Code";
-$text['label-call_flow_feature_code']['ar-eg'] = "";
-$text['label-call_flow_feature_code']['de-at'] = "Funktions-Code"; //copied from de-de
-$text['label-call_flow_feature_code']['de-ch'] = "Funktions-Code"; //copied from de-de
-$text['label-call_flow_feature_code']['de-de'] = "Funktions-Code";
-$text['label-call_flow_feature_code']['es-cl'] = "Código distintivo";
-$text['label-call_flow_feature_code']['es-mx'] = "Código distintivo"; //copied from es-cl
-$text['label-call_flow_feature_code']['fr-ca'] = "Code Fonction"; //copied from fr-fr
-$text['label-call_flow_feature_code']['fr-fr'] = "Code Fonction";
-$text['label-call_flow_feature_code']['he-il'] = "";
-$text['label-call_flow_feature_code']['it-it'] = "";
-$text['label-call_flow_feature_code']['nl-nl'] = "";
-$text['label-call_flow_feature_code']['pl-pl'] = "";
-$text['label-call_flow_feature_code']['pt-br'] = "Código de função";
-$text['label-call_flow_feature_code']['pt-pt'] = "Código de Função";
-$text['label-call_flow_feature_code']['ro-ro'] = "";
-$text['label-call_flow_feature_code']['ru-ru'] = "Код функции";
-$text['label-call_flow_feature_code']['sv-se'] = "Funktionskod";
-$text['label-call_flow_feature_code']['uk-ua'] = "";
+$text['label-feature_code']['en-us'] = "Feature Code";
+$text['label-feature_code']['es-cl'] = "Código distintivo";
+$text['label-feature_code']['pt-pt'] = "Código de Função";
+$text['label-feature_code']['fr-fr'] = "Code Fonction";
+$text['label-feature_code']['pt-br'] = "Código de função";
+$text['label-feature_code']['pl'] = "";
+$text['label-feature_code']['sv-se'] = "Funktionskod";
+$text['label-feature_code']['uk'] = "";
+$text['label-feature_code']['de-at'] = "Stern-Code";

-$text['label-call_flow_extension']['en-us'] = "Extension";
-$text['label-call_flow_extension']['ar-eg'] = "";
-$text['label-call_flow_extension']['de-at'] = "Nebenstelle"; //copied from de-de
-$text['label-call_flow_extension']['de-ch'] = "Nebenstelle"; //copied from de-de
-$text['label-call_flow_extension']['de-de'] = "Nebenstelle";
-$text['label-call_flow_extension']['es-cl'] = "Extensión";
-$text['label-call_flow_extension']['es-mx'] = "Extensión"; //copied from es-cl
-$text['label-call_flow_extension']['fr-ca'] = "Extension"; //copied from fr-fr
-$text['label-call_flow_extension']['fr-fr'] = "Extension";
-$text['label-call_flow_extension']['he-il'] = "";
-$text['label-call_flow_extension']['it-it'] = "";
-$text['label-call_flow_extension']['nl-nl'] = "";
-$text['label-call_flow_extension']['pl-pl'] = "Numer wewnętrzny";
-$text['label-call_flow_extension']['pt-br'] = "Ramal";
-$text['label-call_flow_extension']['pt-pt'] = "Extensão";
-$text['label-call_flow_extension']['ro-ro'] = "";
-$text['label-call_flow_extension']['ru-ru'] = "Внутренний номер";
-$text['label-call_flow_extension']['sv-se'] = "Anknytning";
-$text['label-call_flow_extension']['uk-ua'] = "Розширення (Extention)";
+$text['label-extension']['en-us'] = "Extension";
+$text['label-extension']['es-cl'] = "Extensión";
+$text['label-extension']['pt-pt'] = "Extensão";
+$text['label-extension']['fr-fr'] = "Extension";
+$text['label-extension']['pt-br'] = "Ramal";
+$text['label-extension']['pl'] = "Numer wewnętrzny";
+$text['label-extension']['sv-se'] = "Anknytning";
+$text['label-extension']['uk'] = "Розширення (Extention)";
+$text['label-extension']['de-at'] = "Nebenstelle";

-$text['label-call_flow_label']['en-us'] = "Destination Label";
-$text['label-call_flow_label']['ar-eg'] = "";
-$text['label-call_flow_label']['de-at'] = "Ziel Kennzeichnung"; //copied from de-de
-$text['label-call_flow_label']['de-ch'] = "Ziel Kennzeichnung"; //copied from de-de
-$text['label-call_flow_label']['de-de'] = "Ziel Kennzeichnung";
-$text['label-call_flow_label']['es-cl'] = "Etiqueta de Destino";
-$text['label-call_flow_label']['es-mx'] = "Etiqueta de Destino"; //copied from es-cl
-$text['label-call_flow_label']['fr-ca'] = "Label de la destination"; //copied from fr-fr
-$text['label-call_flow_label']['fr-fr'] = "Label de la destination";
-$text['label-call_flow_label']['he-il'] = "";
-$text['label-call_flow_label']['it-it'] = "";
-$text['label-call_flow_label']['nl-nl'] = "";
-$text['label-call_flow_label']['pl-pl'] = "Etykieta destynacji";
-$text['label-call_flow_label']['pt-br'] = "Etiqueta de destino";
-$text['label-call_flow_label']['pt-pt'] = "Destino";
-$text['label-call_flow_label']['ro-ro'] = "";
-$text['label-call_flow_label']['ru-ru'] = "Название направления";
-$text['label-call_flow_label']['sv-se'] = "Destination Etikett";
-$text['label-call_flow_label']['uk-ua'] = "призначення етикетки";
+$text['label-destination_label']['en-us'] = "Destination Label";
+$text['label-destination_label']['es-cl'] = "Etiqueta de Destino";
+$text['label-destination_label']['pt-pt'] = "Destino";
+$text['label-destination_label']['fr-fr'] = "Label de la destination";
+$text['label-destination_label']['pt-br'] = "Etiqueta de destino";
+$text['label-destination_label']['pl'] = "Etykieta destynacji";
+$text['label-destination_label']['sv-se'] = "Destination Etikett";
+$text['label-destination_label']['uk'] = "призначення етикетки";
+$text['label-destination_label']['de-at'] = "Ziel Kennzeichnung";

-$text['label-call_flow_destination']['en-us'] = "Destination";
-$text['label-call_flow_destination']['ar-eg'] = "";
-$text['label-call_flow_destination']['de-at'] = "Ziel"; //copied from de-de
-$text['label-call_flow_destination']['de-ch'] = "Ziel"; //copied from de-de
-$text['label-call_flow_destination']['de-de'] = "Ziel";
-$text['label-call_flow_destination']['es-cl'] = "Destino";
-$text['label-call_flow_destination']['es-mx'] = "Destino"; //copied from es-cl
-$text['label-call_flow_destination']['fr-ca'] = "Destination"; //copied from fr-fr
-$text['label-call_flow_destination']['fr-fr'] = "Destination";
-$text['label-call_flow_destination']['he-il'] = "";
-$text['label-call_flow_destination']['it-it'] = "";
-$text['label-call_flow_destination']['nl-nl'] = "";
-$text['label-call_flow_destination']['pl-pl'] = "Destynacja";
-$text['label-call_flow_destination']['pt-br'] = "Número de destino";
-$text['label-call_flow_destination']['pt-pt'] = "Destino";
-$text['label-call_flow_destination']['ro-ro'] = "";
-$text['label-call_flow_destination']['ru-ru'] = "Направление";
-$text['label-call_flow_destination']['sv-se'] = "Destination";
-$text['label-call_flow_destination']['uk-ua'] = "Номер";
+$text['label-destination']['en-us'] = "Destination";
+$text['label-destination']['es-cl'] = "Destino";
+$text['label-destination']['pt-pt'] = "Destino";
+$text['label-destination']['fr-fr'] = "Destination";
+$text['label-destination']['pt-br'] = "Número de destino";
+$text['label-destination']['pl'] = "Destynacja";
+$text['label-destination']['sv-se'] = "Destination";
+$text['label-destination']['uk'] = "Номер";
+$text['label-destination']['de-at'] = "Ziel";

-$text['label-call_flow_context']['en-us'] = "Context";
-$text['label-call_flow_context']['ar-eg'] = "";
-$text['label-call_flow_context']['de-at'] = "Kontext"; //copied from de-de
-$text['label-call_flow_context']['de-ch'] = "Kontext"; //copied from de-de
-$text['label-call_flow_context']['de-de'] = "Kontext";
-$text['label-call_flow_context']['es-cl'] = "Contexto";
-$text['label-call_flow_context']['es-mx'] = "Contexto"; //copied from es-cl
-$text['label-call_flow_context']['fr-ca'] = "Contexte"; //copied from fr-fr
-$text['label-call_flow_context']['fr-fr'] = "Contexte";
-$text['label-call_flow_context']['he-il'] = "";
-$text['label-call_flow_context']['it-it'] = "";
-$text['label-call_flow_context']['nl-nl'] = "";
-$text['label-call_flow_context']['pl-pl'] = "Kontekst";
-$text['label-call_flow_context']['pt-br'] = "Contexto"; //copied from pt-pt
-$text['label-call_flow_context']['pt-pt'] = "Contexto";
-$text['label-call_flow_context']['ro-ro'] = "";
-$text['label-call_flow_context']['ru-ru'] = "Контекст";
-$text['label-call_flow_context']['sv-se'] = "Context";
-$text['label-call_flow_context']['uk-ua'] = "Контекст";
+$text['label-context']['en-us'] = "Context";
+$text['label-context']['es-cl'] = "Contexto";
+$text['label-context']['pt-pt'] = "Contexto";
+$text['label-context']['fr-fr'] = "Contexte";
+$text['label-context']['pt-br'] = "Contexto";
+$text['label-context']['pl'] = "Kontekst";
+$text['label-context']['sv-se'] = "Context";
+$text['label-context']['uk'] = "Контекст";
+$text['label-context']['de-at'] = "Kontext";

-$text['label-call_flow_alternate_label']['en-us'] = "Alternate Label";
-$text['label-call_flow_alternate_label']['ar-eg'] = "";
-$text['label-call_flow_alternate_label']['de-at'] = "Alternative Bezeichnung"; //copied from de-de
-$text['label-call_flow_alternate_label']['de-ch'] = "Alternative Bezeichnung"; //copied from de-de
-$text['label-call_flow_alternate_label']['de-de'] = "Alternative Bezeichnung";
-$text['label-call_flow_alternate_label']['es-cl'] = "Etiqueta alternativa";
-$text['label-call_flow_alternate_label']['es-mx'] = "Etiqueta alternativa"; //copied from es-cl
-$text['label-call_flow_alternate_label']['fr-ca'] = "Label alternatif"; //copied from fr-fr
-$text['label-call_flow_alternate_label']['fr-fr'] = "Label alternatif";
-$text['label-call_flow_alternate_label']['he-il'] = "";
-$text['label-call_flow_alternate_label']['it-it'] = "";
-$text['label-call_flow_alternate_label']['nl-nl'] = "";
-$text['label-call_flow_alternate_label']['pl-pl'] = "Alternatywna etykieta";
-$text['label-call_flow_alternate_label']['pt-br'] = "Etqueta alternativa";
-$text['label-call_flow_alternate_label']['pt-pt'] = "Etiqueta Alternativa";
-$text['label-call_flow_alternate_label']['ro-ro'] = "";
-$text['label-call_flow_alternate_label']['ru-ru'] = "Название альтернативного направления";
-$text['label-call_flow_alternate_label']['sv-se'] = "Alternativ Etikett";
-$text['label-call_flow_alternate_label']['uk-ua'] = "альтернативні етикетки";
+$text['label-alternate_label']['en-us'] = "Alternate Label";
+$text['label-alternate_label']['es-cl'] = "Etiqueta alternativa";
+$text['label-alternate_label']['pt-pt'] = "Etiqueta Alternativa";
+$text['label-alternate_label']['fr-fr'] = "Label alternatif";
+$text['label-alternate_label']['pt-br'] = "Etqueta alternativa";
+$text['label-alternate_label']['pl'] = "Alternatywna etykieta";
+$text['label-alternate_label']['sv-se'] = "Alternativ Etikett";
+$text['label-alternate_label']['uk'] = "альтернативні етикетки";
+$text['label-alternate_label']['de-at'] = "Alternatives Ziel Beschreibung";

-$text['label-call_flow_alternate_destination']['en-us'] = "Alternate Destination";
-$text['label-call_flow_alternate_destination']['ar-eg'] = "";
-$text['label-call_flow_alternate_destination']['de-at'] = "Alternatives Ziel"; //copied from de-de
-$text['label-call_flow_alternate_destination']['de-ch'] = "Alternatives Ziel"; //copied from de-de
-$text['label-call_flow_alternate_destination']['de-de'] = "Alternatives Ziel";
-$text['label-call_flow_alternate_destination']['es-cl'] = "Destino Alternativo";
-$text['label-call_flow_alternate_destination']['es-mx'] = "Destino Alternativo"; //copied from es-cl
-$text['label-call_flow_alternate_destination']['fr-ca'] = "Destination alternative"; //copied from fr-fr
-$text['label-call_flow_alternate_destination']['fr-fr'] = "Destination alternative";
-$text['label-call_flow_alternate_destination']['he-il'] = "";
-$text['label-call_flow_alternate_destination']['it-it'] = "";
-$text['label-call_flow_alternate_destination']['nl-nl'] = "";
-$text['label-call_flow_alternate_destination']['pl-pl'] = "Alternatywna destynacja";
-$text['label-call_flow_alternate_destination']['pt-br'] = "Destino alternativo";
-$text['label-call_flow_alternate_destination']['pt-pt'] = "Destino Alternativo";
-$text['label-call_flow_alternate_destination']['ro-ro'] = "";
-$text['label-call_flow_alternate_destination']['ru-ru'] = "Альтернативное направление";
-$text['label-call_flow_alternate_destination']['sv-se'] = "Alternativ Destination";
-$text['label-call_flow_alternate_destination']['uk-ua'] = "альтернативні варіанти призначення";
+$text['label-alternate_destination']['en-us'] = "Alternate Destination";
+$text['label-alternate_destination']['es-cl'] = "Destino Alternativo";
+$text['label-alternate_destination']['pt-pt'] = "Destino Alternativo";
+$text['label-alternate_destination']['fr-fr'] = "Destination alternative";
+$text['label-alternate_destination']['pt-br'] = "Destino alternativo";
+$text['label-alternate_destination']['pl'] = "Alternatywna destynacja";
+$text['label-alternate_destination']['sv-se'] = "Alternativ Destination";
+$text['label-alternate_destination']['uk'] = "альтернативні варіанти призначення";
+$text['label-alternate_destination']['de-at'] = "Alternatives Ziel";

-$text['label-call_flow_sound']['en-us'] = "Sound";
-$text['label-call_flow_sound']['ar-eg'] = "";
-$text['label-call_flow_sound']['de-at'] = "Rufton"; //copied from de-de
-$text['label-call_flow_sound']['de-ch'] = "Rufton"; //copied from de-de
-$text['label-call_flow_sound']['de-de'] = "Rufton";
-$text['label-call_flow_sound']['es-cl'] = "Sonar";
-$text['label-call_flow_sound']['es-mx'] = "Sonar"; //copied from es-cl
-$text['label-call_flow_sound']['fr-ca'] = "Sonner"; //copied from fr-fr
-$text['label-call_flow_sound']['fr-fr'] = "Sonner";
-$text['label-call_flow_sound']['he-il'] = "";
-$text['label-call_flow_sound']['it-it'] = "";
-$text['label-call_flow_sound']['nl-nl'] = "";
-$text['label-call_flow_sound']['pl-pl'] = "Dźwięk";
-$text['label-call_flow_sound']['pt-br'] = "Som"; //copied from pt-pt
-$text['label-call_flow_sound']['pt-pt'] = "Som";
-$text['label-call_flow_sound']['ro-ro'] = "";
-$text['label-call_flow_sound']['ru-ru'] = "Звук";
-$text['label-call_flow_sound']['sv-se'] = "Ljud";
-$text['label-call_flow_sound']['uk-ua'] = "звук";
+$text['label-sound']['en-us'] = "Sound";
+$text['label-sound']['es-cl'] = "Sonar";
+$text['label-sound']['pt-pt'] = "Som";
+$text['label-sound']['fr-fr'] = "Sonner";
+$text['label-sound']['pt-br'] = "Som";
+$text['label-sound']['pl'] = "Dźwięk";
+$text['label-sound']['sv-se'] = "Ljud";
+$text['label-sound']['uk'] = "звук";
+$text['label-sound']['de-at'] = "Klingen";

-$text['label-call_flow_alternate_sound']['en-us'] = "Alternate Sound";
-$text['label-call_flow_alternate_sound']['ar-eg'] = "";
-$text['label-call_flow_alternate_sound']['de-at'] = "Alternativer Rufton"; //copied from de-de
-$text['label-call_flow_alternate_sound']['de-ch'] = "Alternativer Rufton"; //copied from de-de
-$text['label-call_flow_alternate_sound']['de-de'] = "Alternativer Rufton";
-$text['label-call_flow_alternate_sound']['es-cl'] = "sonido alternativo";
-$text['label-call_flow_alternate_sound']['es-mx'] = "sonido alternativo"; //copied from es-cl
-$text['label-call_flow_alternate_sound']['fr-ca'] = "son suppléant"; //copied from fr-fr
-$text['label-call_flow_alternate_sound']['fr-fr'] = "son suppléant";
-$text['label-call_flow_alternate_sound']['he-il'] = "";
-$text['label-call_flow_alternate_sound']['it-it'] = "";
-$text['label-call_flow_alternate_sound']['nl-nl'] = "";
-$text['label-call_flow_alternate_sound']['pl-pl'] = "Alternatywny dźwięk";
-$text['label-call_flow_alternate_sound']['pt-br'] = "Som alternativo";
-$text['label-call_flow_alternate_sound']['pt-pt'] = "som alternativo";
-$text['label-call_flow_alternate_sound']['ro-ro'] = "";
-$text['label-call_flow_alternate_sound']['ru-ru'] = "Альтернативный звук";
-$text['label-call_flow_alternate_sound']['sv-se'] = "alternativt ljud";
-$text['label-call_flow_alternate_sound']['uk-ua'] = "альтернативний звук";
-
-$text['label-call_flow_description']['en-us'] = "Description";
-$text['label-call_flow_description']['ar-eg'] = "";
-$text['label-call_flow_description']['de-at'] = "Beschreibung"; //copied from de-de
-$text['label-call_flow_description']['de-ch'] = "Beschreibung"; //copied from de-de
-$text['label-call_flow_description']['de-de'] = "Beschreibung";
-$text['label-call_flow_description']['es-cl'] = "Descripción";
-$text['label-call_flow_description']['es-mx'] = "Descripción"; //copied from es-cl
-$text['label-call_flow_description']['fr-ca'] = "Description"; //copied from fr-fr
-$text['label-call_flow_description']['fr-fr'] = "Description";
-$text['label-call_flow_description']['he-il'] = "";
-$text['label-call_flow_description']['it-it'] = "";
-$text['label-call_flow_description']['nl-nl'] = "";
-$text['label-call_flow_description']['pl-pl'] = "Opis";
-$text['label-call_flow_description']['pt-br'] = "Descrição";
-$text['label-call_flow_description']['pt-pt'] = "Descripção";
-$text['label-call_flow_description']['ro-ro'] = "";
-$text['label-call_flow_description']['ru-ru'] = "Описание";
-$text['label-call_flow_description']['sv-se'] = "Beskrivning";
-$text['label-call_flow_description']['uk-ua'] = "Опис";
+$text['label-alternate_sound']['en-us'] = "Alternate Sound";
+$text['label-alternate_sound']['es-cl'] = "sonido alternativo";
+$text['label-alternate_sound']['pt-pt'] = "som alternativo";
+$text['label-alternate_sound']['fr-fr'] = "son suppléant";
+$text['label-alternate_sound']['pt-br'] = "Som alternativo";
+$text['label-alternate_sound']['pl'] = "Alternatywny dźwięk";
+$text['label-alternate_sound']['sv-se'] = "alternativt ljud";
+$text['label-alternate_sound']['uk'] = "альтернативний звук";
+$text['label-alternate_sound']['de-at'] = "wechseln Klingen";

 $text['header-call_flows']['en-us'] = "Call Flows";
-$text['header-call_flows']['ar-eg'] = "";
-$text['header-call_flows']['de-at'] = "Anruf Steuerung"; //copied from de-de
-$text['header-call_flows']['de-ch'] = "Anruf Steuerung"; //copied from de-de
-$text['header-call_flows']['de-de'] = "Anruf Steuerung";
 $text['header-call_flows']['es-cl'] = "flujo de Llamada";
-$text['header-call_flows']['es-mx'] = "flujo de Llamada"; //copied from es-cl
-$text['header-call_flows']['fr-ca'] = "Flux d'appel"; //copied from fr-fr
-$text['header-call_flows']['fr-fr'] = "Flux d'appel";
-$text['header-call_flows']['he-il'] = "";
-$text['header-call_flows']['it-it'] = "Deviatori di Chiamata";
-$text['header-call_flows']['nl-nl'] = "";
-$text['header-call_flows']['pl-pl'] = "Przepływ rozmów";
-$text['header-call_flows']['pt-br'] = "Fluxo de chamadas";
 $text['header-call_flows']['pt-pt'] = "Fluxo de Chamadas";
-$text['header-call_flows']['ro-ro'] = "";
-$text['header-call_flows']['ru-ru'] = "Переключатель вызовов";
+$text['header-call_flows']['fr-fr'] = "Flux d'appel";
+$text['header-call_flows']['pt-br'] = "Fluxo de chamadas";
+$text['header-call_flows']['pl'] = "Przepływ rozmów";
 $text['header-call_flows']['sv-se'] = "Samtalsflöden";
-$text['header-call_flows']['uk-ua'] = "Потоки дзвінків";
+$text['header-call_flows']['uk'] = "Потоки дзвінків";
+$text['header-call_flows']['de-at'] = "Anruf Steuerung";

-$text['header-call_flow']['en-us'] = "Call Flow";
-$text['header-call_flow']['ar-eg'] = "";
-$text['header-call_flow']['de-at'] = "Anruf Steuerung"; //copied from de-de
-$text['header-call_flow']['de-ch'] = "Anruf Steuerung"; //copied from de-de
-$text['header-call_flow']['de-de'] = "Anruf Steuerung";
-$text['header-call_flow']['es-cl'] = "Flujo de Llamada";
-$text['header-call_flow']['es-mx'] = "Flujo de Llamada"; //copied from es-cl
-$text['header-call_flow']['fr-ca'] = "Editer le flux"; //copied from fr-fr
-$text['header-call_flow']['fr-fr'] = "Editer le flux";
-$text['header-call_flow']['he-il'] = "";
-$text['header-call_flow']['it-it'] = "";
-$text['header-call_flow']['nl-nl'] = "";
-$text['header-call_flow']['pl-pl'] = "Przepływ rozmów";
-$text['header-call_flow']['pt-br'] = "Fluxo de chamada";
-$text['header-call_flow']['pt-pt'] = "Fluxo de Chamada";
-$text['header-call_flow']['ro-ro'] = "";
-$text['header-call_flow']['ru-ru'] = "Переключатель вызовов";
-$text['header-call_flow']['sv-se'] = "Samtalsflöde";
-$text['header-call_flow']['uk-ua'] = "Потік дзвінка";
+$text['header-call_flow-edit']['en-us'] = "Call Flow";
+$text['header-call_flow-edit']['es-cl'] = "Flujo de Llamada";
+$text['header-call_flow-edit']['pt-pt'] = "Fluxo de Chamada";
+$text['header-call_flow-edit']['fr-fr'] = "Editer le flux";
+$text['header-call_flow-edit']['pt-br'] = "Fluxo de chamada";
+$text['header-call_flow-edit']['pl'] = "Przepływ rozmów";
+$text['header-call_flow-edit']['sv-se'] = "Samtalsflöde";
+$text['header-call_flow-edit']['uk'] = "Потік дзвінка";
+$text['header-call_flow-edit']['de-at'] = "Anruf Steuerung";

-$text['description-call_flow_status']['en-us'] = "Select the status.";
-$text['description-call_flow_status']['ar-eg'] = "";
-$text['description-call_flow_status']['de-at'] = "Status festlegen."; //copied from de-de
-$text['description-call_flow_status']['de-ch'] = "Status festlegen."; //copied from de-de
-$text['description-call_flow_status']['de-de'] = "Status festlegen.";
-$text['description-call_flow_status']['es-cl'] = "Seleccione el estado.";
-$text['description-call_flow_status']['es-mx'] = "Seleccione el estado."; //copied from es-cl
-$text['description-call_flow_status']['fr-ca'] = "Choisir le statut."; //copied from fr-fr
-$text['description-call_flow_status']['fr-fr'] = "Choisir le statut.";
-$text['description-call_flow_status']['he-il'] = "";
-$text['description-call_flow_status']['it-it'] = "";
-$text['description-call_flow_status']['nl-nl'] = "";
-$text['description-call_flow_status']['pl-pl'] = "Wybierz status użytkownika";
-$text['description-call_flow_status']['pt-br'] = "Escolha o estado.";
-$text['description-call_flow_status']['pt-pt'] = "Seleccione o estado.";
-$text['description-call_flow_status']['ro-ro'] = "";
-$text['description-call_flow_status']['ru-ru'] = "Виберите состояние.";
-$text['description-call_flow_status']['sv-se'] = "Välj Status";
-$text['description-call_flow_status']['uk-ua'] = "Виберіть статус користувача";
+$text['header-call_flow-add']['en-us'] = "Call Flow Add";
+$text['header-call_flow-add']['es-cl'] = "Agregar Flujo de Llamada";
+$text['header-call_flow-add']['pt-pt'] = "Adicionar Fluxo de Chamada";
+$text['header-call_flow-add']['fr-fr'] = "Ajouter un flux";
+$text['header-call_flow-add']['pt-br'] = "Adicionar fluxo de chamada";
+$text['header-call_flow-add']['pl'] = "Dodaj przepływ rozmów";
+$text['header-call_flow-add']['sv-se'] = "Lägg Till Samtalsflöde";
+$text['header-call_flow-add']['uk'] = "Потоки дзвінків";
+$text['header-call_flow-add']['de-at'] = "Anruf Steuerung hinzufügen";

-$text['description-call_flow_pin_number']['en-us'] = "Enter the pin number.";
-$text['description-call_flow_pin_number']['ar-eg'] = "";
-$text['description-call_flow_pin_number']['de-at'] = "Geben Sie eine PIN ein."; //copied from de-de
-$text['description-call_flow_pin_number']['de-ch'] = "Geben Sie eine PIN ein."; //copied from de-de
-$text['description-call_flow_pin_number']['de-de'] = "Geben Sie eine PIN ein.";
-$text['description-call_flow_pin_number']['es-cl'] = "Ingrese el número PIN.";
-$text['description-call_flow_pin_number']['es-mx'] = "Ingrese el número PIN."; //copied from es-cl
-$text['description-call_flow_pin_number']['fr-ca'] = "Choisir le code PIN."; //copied from fr-fr
-$text['description-call_flow_pin_number']['fr-fr'] = "Choisir le code PIN.";
-$text['description-call_flow_pin_number']['he-il'] = "";
-$text['description-call_flow_pin_number']['it-it'] = "";
-$text['description-call_flow_pin_number']['nl-nl'] = "";
-$text['description-call_flow_pin_number']['pl-pl'] = "Wprowadź numer PIN";
-$text['description-call_flow_pin_number']['pt-br'] = "Insira o código PIN.";
-$text['description-call_flow_pin_number']['pt-pt'] = "Introduza o código PIN";
-$text['description-call_flow_pin_number']['ro-ro'] = "";
-$text['description-call_flow_pin_number']['ru-ru'] = "Введите пин-код.";
-$text['description-call_flow_pin_number']['sv-se'] = "Ange PIN Kod.";
-$text['description-call_flow_pin_number']['uk-ua'] = "Введіть пін - код.";
+$text['description-status']['en-us'] = "Select the status.";
+$text['description-status']['es-cl'] = "Seleccione el estado.";
+$text['description-status']['pt-pt'] = "Seleccione o estado.";
+$text['description-status']['fr-fr'] = "Choisir le statut.";
+$text['description-status']['pt-br'] = "Escolha o estado.";
+$text['description-status']['pl'] = "Wybierz status użytkownika";
+$text['description-status']['sv-se'] = "Välj Status";
+$text['description-status']['uk'] = "Виберіть статус користувача";
+$text['description-status']['de-at'] = "Benutzerstatus auswählen";

-$text['description-call_flow_name']['en-us'] = "Enter the name.";
-$text['description-call_flow_name']['ar-eg'] = "";
-$text['description-call_flow_name']['de-at'] = "Geben Sie den Namen an"; //copied from de-de
-$text['description-call_flow_name']['de-ch'] = "Geben Sie den Namen an"; //copied from de-de
-$text['description-call_flow_name']['de-de'] = "Geben Sie den Namen an";
-$text['description-call_flow_name']['es-cl'] = "Ingrese el nombre.";
-$text['description-call_flow_name']['es-mx'] = "Ingrese el nombre."; //copied from es-cl
-$text['description-call_flow_name']['fr-ca'] = "Choisr le nom."; //copied from fr-fr
-$text['description-call_flow_name']['fr-fr'] = "Choisr le nom.";
-$text['description-call_flow_name']['he-il'] = "";
-$text['description-call_flow_name']['it-it'] = "";
-$text['description-call_flow_name']['nl-nl'] = "";
-$text['description-call_flow_name']['pl-pl'] = "Wprowadź nazwę";
-$text['description-call_flow_name']['pt-br'] = "Insira o nome.";
-$text['description-call_flow_name']['pt-pt'] = "Introduza o nome.";
-$text['description-call_flow_name']['ro-ro'] = "";
-$text['description-call_flow_name']['ru-ru'] = "Введите имя.";
-$text['description-call_flow_name']['sv-se'] = "Ange Namn.";
-$text['description-call_flow_name']['uk-ua'] = "Введіть назву меню";
+$text['description-pin_number']['en-us'] = "Enter the pin number.";
+$text['description-pin_number']['es-cl'] = "Ingrese el número PIN.";
+$text['description-pin_number']['pt-pt'] = "Introduza o código PIN";
+$text['description-pin_number']['fr-fr'] = "Choisir le code PIN.";
+$text['description-pin_number']['pt-br'] = "Insira o código PIN.";
+$text['description-pin_number']['pl'] = "Wprowadź numer PIN";
+$text['description-pin_number']['sv-se'] = "Ange PIN Kod.";
+$text['description-pin_number']['uk'] = "Введіть пін - код.";
+$text['description-pin_number']['de-at'] = "Geben Sie einen PIN ein.";

-$text['description-call_flow_feature_code']['en-us'] = "Enter the feature code.";
-$text['description-call_flow_feature_code']['ar-eg'] = "";
-$text['description-call_flow_feature_code']['de-at'] = "Geben Sie den Funktions-Code an."; //copied from de-de
-$text['description-call_flow_feature_code']['de-ch'] = "Geben Sie den Funktions-Code an."; //copied from de-de
-$text['description-call_flow_feature_code']['de-de'] = "Geben Sie den Funktions-Code an.";
-$text['description-call_flow_feature_code']['es-cl'] = "Ingrese el código distintivo.";
-$text['description-call_flow_feature_code']['es-mx'] = "Ingrese el código distintivo."; //copied from es-cl
-$text['description-call_flow_feature_code']['fr-ca'] = "Choisir le code la fonction"; //copied from fr-fr
-$text['description-call_flow_feature_code']['fr-fr'] = "Choisir le code la fonction";
-$text['description-call_flow_feature_code']['he-il'] = "";
-$text['description-call_flow_feature_code']['it-it'] = "";
-$text['description-call_flow_feature_code']['nl-nl'] = "";
-$text['description-call_flow_feature_code']['pl-pl'] = "Dodaj specjalny kod";
-$text['description-call_flow_feature_code']['pt-br'] = "Insira o código de função.";
-$text['description-call_flow_feature_code']['pt-pt'] = "Introduza o código de função.";
-$text['description-call_flow_feature_code']['ro-ro'] = "";
-$text['description-call_flow_feature_code']['ru-ru'] = "Введите код функции.";
-$text['description-call_flow_feature_code']['sv-se'] = "Ange Funktionskoden.";
-$text['description-call_flow_feature_code']['uk-ua'] = "Введіть код об'єкта.";
+$text['description-name']['en-us'] = "Enter the name.";
+$text['description-name']['es-cl'] = "Ingrese el nombre.";
+$text['description-name']['pt-pt'] = "Introduza o nome.";
+$text['description-name']['fr-fr'] = "Choisr le nom.";
+$text['description-name']['pt-br'] = "Insira o nome.";
+$text['description-name']['pl'] = "Wprowadź nazwę";
+$text['description-name']['sv-se'] = "Ange Namn.";
+$text['description-name']['uk'] = "Введіть назву меню";
+$text['description-name']['de-at'] = "Geben Sie den Namen des Menüs an";

-$text['description-call_flow_extension']['en-us'] = "Enter the extension number.";
-$text['description-call_flow_extension']['ar-eg'] = "";
-$text['description-call_flow_extension']['de-at'] = "Weisen Sie die Nebenstelle aus."; //copied from de-de
-$text['description-call_flow_extension']['de-ch'] = "Weisen Sie die Nebenstelle aus."; //copied from de-de
-$text['description-call_flow_extension']['de-de'] = "Weisen Sie die Nebenstelle aus.";
-$text['description-call_flow_extension']['es-cl'] = "Ingrese el número de extensión.";
-$text['description-call_flow_extension']['es-mx'] = "Ingrese el número de extensión."; //copied from es-cl
-$text['description-call_flow_extension']['fr-ca'] = "Choisir le numéro d'extension."; //copied from fr-fr
-$text['description-call_flow_extension']['fr-fr'] = "Choisir le numéro d'extension.";
-$text['description-call_flow_extension']['he-il'] = "";
-$text['description-call_flow_extension']['it-it'] = "";
-$text['description-call_flow_extension']['nl-nl'] = "";
-$text['description-call_flow_extension']['pl-pl'] = "Wprowadź alfanumeryczny numer wewnętrzny. Domyślna konfiguracja pozwala na 2-7 cyfrowe  numery wewnętrzne";
-$text['description-call_flow_extension']['pt-br'] = "Atribua o número de ramal.";
-$text['description-call_flow_extension']['pt-pt'] = "Introduza o número da extensão.";
-$text['description-call_flow_extension']['ro-ro'] = "";
-$text['description-call_flow_extension']['ru-ru'] = "Введите внутренний номер.";
-$text['description-call_flow_extension']['sv-se'] = "Ange anknytningsnumret.";
-$text['description-call_flow_extension']['uk-ua'] = "Введіть номер розширення.";
+$text['description-feature_code']['en-us'] = "Enter the feature code.";
+$text['description-feature_code']['es-cl'] = "Ingrese el código distintivo.";
+$text['description-feature_code']['pt-pt'] = "Introduza o código de função.";
+$text['description-feature_code']['fr-fr'] = "Choisir le code la fonction";
+$text['description-feature_code']['pt-br'] = "Insira o código de função.";
+$text['description-feature_code']['pl'] = "Dodaj specjalny kod";
+$text['description-feature_code']['sv-se'] = "Ange Funktionskoden.";
+$text['description-feature_code']['uk'] = "Введіть код об'єкта.";
+$text['description-feature_code']['de-at'] = "Geben Sie den Stern-Code an.";

-$text['description-call_flow_destination_label']['en-us'] = "Enter the destination label.";
-$text['description-call_flow_destination_label']['ar-eg'] = "";
-$text['description-call_flow_destination_label']['de-at'] = "Geben Sie eine Beschreibung für das Ziel an."; //copied from de-de
-$text['description-call_flow_destination_label']['de-ch'] = "Geben Sie eine Beschreibung für das Ziel an."; //copied from de-de
-$text['description-call_flow_destination_label']['de-de'] = "Geben Sie eine Beschreibung für das Ziel an.";
-$text['description-call_flow_destination_label']['es-cl'] = "Ingrese la etiqueta de destino.";
-$text['description-call_flow_destination_label']['es-mx'] = "Ingrese la etiqueta de destino."; //copied from es-cl
-$text['description-call_flow_destination_label']['fr-ca'] = "Choisir le label de la destination."; //copied from fr-fr
-$text['description-call_flow_destination_label']['fr-fr'] = "Choisir le label de la destination.";
-$text['description-call_flow_destination_label']['he-il'] = "";
-$text['description-call_flow_destination_label']['it-it'] = "";
-$text['description-call_flow_destination_label']['nl-nl'] = "";
-$text['description-call_flow_destination_label']['pl-pl'] = "Wprowadź opis destynacji";
-$text['description-call_flow_destination_label']['pt-br'] = "Insira o destino.";
-$text['description-call_flow_destination_label']['pt-pt'] = "Introduza o destino.";
-$text['description-call_flow_destination_label']['ro-ro'] = "";
-$text['description-call_flow_destination_label']['ru-ru'] = "Введите название направления.";
-$text['description-call_flow_destination_label']['sv-se'] = "Ange Destinations Etiketten.";
-$text['description-call_flow_destination_label']['uk-ua'] = "Введіть мітку призначення.";
+$text['description-extension']['en-us'] = "Enter the extension number.";
+$text['description-extension']['es-cl'] = "Ingrese el número de extensión.";
+$text['description-extension']['pt-pt'] = "Introduza o número da extensão.";
+$text['description-extension']['fr-fr'] = "Choisir le numéro d'extension.";
+$text['description-extension']['pt-br'] = "Atribua o número de ramal.";
+$text['description-extension']['pl'] = "Wprowadź alfanumeryczny numer wewnętrzny. Domyślna konfiguracja pozwala na 2-7 cyfrowe  numery wewnętrzne";
+$text['description-extension']['sv-se'] = "Ange anknytningsnumret.";
+$text['description-extension']['uk'] = "Введіть номер розширення.";
+$text['description-extension']['de-at'] = "Weisen Sie die Nebenstellen und Linien einem Gerät zu.";

-$text['description-call_flow_destination']['en-us'] = "Select the destination.";
-$text['description-call_flow_destination']['ar-eg'] = "";
-$text['description-call_flow_destination']['de-at'] = "Wählen Sie das Ziel."; //copied from de-de
-$text['description-call_flow_destination']['de-ch'] = "Wählen Sie das Ziel."; //copied from de-de
-$text['description-call_flow_destination']['de-de'] = "Wählen Sie das Ziel.";
-$text['description-call_flow_destination']['es-cl'] = "Seleccione el destino.";
-$text['description-call_flow_destination']['es-mx'] = "Seleccione el destino."; //copied from es-cl
-$text['description-call_flow_destination']['fr-ca'] = "Choisir la destination."; //copied from fr-fr
-$text['description-call_flow_destination']['fr-fr'] = "Choisir la destination.";
-$text['description-call_flow_destination']['he-il'] = "";
-$text['description-call_flow_destination']['it-it'] = "";
-$text['description-call_flow_destination']['nl-nl'] = "";
-$text['description-call_flow_destination']['pl-pl'] = "Wybierz numer docelowy.";
-$text['description-call_flow_destination']['pt-br'] = "Selecionar o destino da chamada.";
-$text['description-call_flow_destination']['pt-pt'] = "Seleccione o destino.";
-$text['description-call_flow_destination']['ro-ro'] = "";
-$text['description-call_flow_destination']['ru-ru'] = "Выберите назначение.";
-$text['description-call_flow_destination']['sv-se'] = "Välj destinationen.";
-$text['description-call_flow_destination']['uk-ua'] = "Відправити дзвінок на розширення, меню IVR, конференцію, або будь-який інший номер.";
+$text['description-destination_label']['en-us'] = "Enter the destination label.";
+$text['description-destination_label']['es-cl'] = "Ingrese la etiqueta de destino.";
+$text['description-destination_label']['pt-pt'] = "Introduza o destino.";
+$text['description-destination_label']['fr-fr'] = "Choisir le label de la destination.";
+$text['description-destination_label']['pt-br'] = "Insira o destino.";
+$text['description-destination_label']['pl'] = "Wprowadź opis destynacji";
+$text['description-destination_label']['sv-se'] = "Ange Destinations Etiketten.";
+$text['description-destination_label']['uk'] = "Введіть мітку призначення.";
+$text['description-destination_label']['de-at'] = "Geben Sie eine Beschreibung für das Ziel an.";

-$text['description-call_flow_context']['en-us'] = "Enter the context.";
-$text['description-call_flow_context']['ar-eg'] = "";
-$text['description-call_flow_context']['de-at'] = "Geben Sie den Kontext hier an."; //copied from de-de
-$text['description-call_flow_context']['de-ch'] = "Geben Sie den Kontext hier an."; //copied from de-de
-$text['description-call_flow_context']['de-de'] = "Geben Sie den Kontext hier an.";
-$text['description-call_flow_context']['es-cl'] = "Ingrese el contexto.";
-$text['description-call_flow_context']['es-mx'] = "Ingrese el contexto."; //copied from es-cl
-$text['description-call_flow_context']['fr-ca'] = "Choisir le contexte."; //copied from fr-fr
-$text['description-call_flow_context']['fr-fr'] = "Choisir le contexte.";
-$text['description-call_flow_context']['he-il'] = "";
-$text['description-call_flow_context']['it-it'] = "";
-$text['description-call_flow_context']['nl-nl'] = "";
-$text['description-call_flow_context']['pl-pl'] = "Wprowadź kontekst";
-$text['description-call_flow_context']['pt-br'] = "Insira o contexto.";
-$text['description-call_flow_context']['pt-pt'] = "Introduza o contexto";
-$text['description-call_flow_context']['ro-ro'] = "";
-$text['description-call_flow_context']['ru-ru'] = "Введите контекст.";
-$text['description-call_flow_context']['sv-se'] = "Ange Context.";
-$text['description-call_flow_context']['uk-ua'] = "Введіть контекст.";
+$text['description-destination']['en-us'] = "Select the destination.";
+$text['description-destination']['es-cl'] = "Seleccione el destino.";
+$text['description-destination']['pt-pt'] = "Seleccione o destino.";
+$text['description-destination']['fr-fr'] = "Choisir la destination.";
+$text['description-destination']['pt-br'] = "Selecionar o destino da chamada.";
+$text['description-destination']['pl'] = "Wybierz numer docelowy.";
+$text['description-destination']['sv-se'] = "Välj destinationen.";
+$text['description-destination']['uk'] = "Відправити дзвінок на розширення, меню IVR, конференцію, або будь-який інший номер.";
+$text['description-destination']['de-at'] = "Wählen Sie das Ziel.";
+
+$text['description-context']['en-us'] = "Enter the context.";
+$text['description-context']['es-cl'] = "Ingrese el contexto.";
+$text['description-context']['pt-pt'] = "Introduza o contexto";
+$text['description-context']['fr-fr'] = "Choisir le contexte.";
+$text['description-context']['pt-br'] = "Insira o contexto.";
+$text['description-context']['pl'] = "Wprowadź kontekst";
+$text['description-context']['sv-se'] = "Ange Context.";
+$text['description-context']['uk'] = "Введіть контекст.";
+$text['description-context']['de-at'] = "Geben Sie den Kontext hier an.";

 $text['description-call_flows']['en-us'] = "Direct calls between two destinations by calling a feature code.";
-$text['description-call_flows']['ar-eg'] = "";
-$text['description-call_flows']['de-at'] = "Leiten Sie Anrufe zwischen zwei Zielen um indem Sie einen Funktions-Code wählen."; //copied from de-de
-$text['description-call_flows']['de-ch'] = "Leiten Sie Anrufe zwischen zwei Zielen um indem Sie einen Funktions-Code wählen."; //copied from de-de
-$text['description-call_flows']['de-de'] = "Leiten Sie Anrufe zwischen zwei Zielen um indem Sie einen Funktions-Code wählen.";
 $text['description-call_flows']['es-cl'] = "Llamadas directas entre dos destinatarios llamando a un código distintivo.";
-$text['description-call_flows']['es-mx'] = "Llamadas directas entre dos destinatarios llamando a un código distintivo."; //copied from es-cl
-$text['description-call_flows']['fr-ca'] = "Appels directs entre deux destinations en appelant une fonction."; //copied from fr-fr
-$text['description-call_flows']['fr-fr'] = "Appels directs entre deux destinations en appelant une fonction.";
-$text['description-call_flows']['he-il'] = "";
-$text['description-call_flows']['it-it'] = "Devia le chiamate tra due destinazioni chiamando un codice di attivazione.";
-$text['description-call_flows']['nl-nl'] = "";
-$text['description-call_flows']['pl-pl'] = "Kieruj rozmowy bezpośrednio pomiędzy dwoma destynacjami poprzez prowadzenie specjalnego kodu.";
-$text['description-call_flows']['pt-br'] = "Chamadas diretas para dois dispositivos utilizando o código de função.";
 $text['description-call_flows']['pt-pt'] = "Chamadas directas entre dois destinos recorrendo a um código de função.";
-$text['description-call_flows']['ro-ro'] = "";
-$text['description-call_flows']['ru-ru'] = "Переключите вызовы между двумя направлениями с помощью кода дополнительного вида обслуживания.";
+$text['description-call_flows']['fr-fr'] = "Appels directs entre deux destinations en appelant une fonction.";
+$text['description-call_flows']['pt-br'] = "Chamadas diretas para dois dispositivos utilizando o código de função.";
+$text['description-call_flows']['pl'] = "Kieruj rozmowy bezpośrednio pomiędzy dwoma destynacjami poprzez prowadzenie specjalnego kodu.";
 $text['description-call_flows']['sv-se'] = "Samtal mellan två destinationer genom att ringa en funktionskod.";
-$text['description-call_flows']['uk-ua'] = "Прямі виклики між двома пунктами шляхом виклику коду функції.";
+$text['description-call_flows']['uk'] = "Прямі виклики між двома пунктами шляхом виклику коду функції.";
+$text['description-call_flows']['de-at'] = "Leiten Sie Anrufe zwischen zwei Zielen um indem Sie einen Stern-Code wählen.";

-$text['description-call_flow_alternate_label']['en-us'] = "Enter the alternate destination label.";
-$text['description-call_flow_alternate_label']['ar-eg'] = "";
-$text['description-call_flow_alternate_label']['de-at'] = "Geben Sie eine Beschreibung für das alternative Ziel ein."; //copied from de-de
-$text['description-call_flow_alternate_label']['de-ch'] = "Geben Sie eine Beschreibung für das alternative Ziel ein."; //copied from de-de
-$text['description-call_flow_alternate_label']['de-de'] = "Geben Sie eine Beschreibung für das alternative Ziel ein.";
-$text['description-call_flow_alternate_label']['es-cl'] = "Ingrese la etiqueta de destino alternativo.";
-$text['description-call_flow_alternate_label']['es-mx'] = "Ingrese la etiqueta de destino alternativo."; //copied from es-cl
-$text['description-call_flow_alternate_label']['fr-ca'] = "Choisir le label de la destination alternative."; //copied from fr-fr
-$text['description-call_flow_alternate_label']['fr-fr'] = "Choisir le label de la destination alternative.";
-$text['description-call_flow_alternate_label']['he-il'] = "";
-$text['description-call_flow_alternate_label']['it-it'] = "";
-$text['description-call_flow_alternate_label']['nl-nl'] = "";
-$text['description-call_flow_alternate_label']['pl-pl'] = "Wprowadź alternatywny opis destynacji";
-$text['description-call_flow_alternate_label']['pt-br'] = "Insira um destino alternativo.";
-$text['description-call_flow_alternate_label']['pt-pt'] = "Introduza um destino alternativo.";
-$text['description-call_flow_alternate_label']['ro-ro'] = "";
-$text['description-call_flow_alternate_label']['ru-ru'] = "Введите название альтернативного направления.";
-$text['description-call_flow_alternate_label']['sv-se'] = "Ange den alternativa destinations etiketten.";
-$text['description-call_flow_alternate_label']['uk-ua'] = "Введіть альтернативний ярлик призначення.";
+$text['description-alternate_label']['en-us'] = "Enter the alternate destination label.";
+$text['description-alternate_label']['es-cl'] = "Ingrese la etiqueta de destino alternativo.";
+$text['description-alternate_label']['pt-pt'] = "Introduza um destino alternativo.";
+$text['description-alternate_label']['fr-fr'] = "Choisir le label de la destination alternative.";
+$text['description-alternate_label']['pt-br'] = "Insira um destino alternativo.";
+$text['description-alternate_label']['pl'] = "Wprowadź alternatywny opis destynacji";
+$text['description-alternate_label']['sv-se'] = "Ange den alternativa destinations etiketten.";
+$text['description-alternate_label']['uk'] = "Введіть альтернативний ярлик призначення.";
+$text['description-alternate_label']['de-at'] = "Geben Sie eine Beschreibung für das alternative Ziel ein.";

-$text['description-call_flow_alternate_destination']['en-us'] = "Select the alternate destination.";
-$text['description-call_flow_alternate_destination']['ar-eg'] = "";
-$text['description-call_flow_alternate_destination']['de-at'] = "Wählen Sie ein alternatives Ziel."; //copied from de-de
-$text['description-call_flow_alternate_destination']['de-ch'] = "Wählen Sie ein alternatives Ziel."; //copied from de-de
-$text['description-call_flow_alternate_destination']['de-de'] = "Wählen Sie ein alternatives Ziel.";
-$text['description-call_flow_alternate_destination']['es-cl'] = "Seleccione el destino alternativo.";
-$text['description-call_flow_alternate_destination']['es-mx'] = "Seleccione el destino alternativo."; //copied from es-cl
-$text['description-call_flow_alternate_destination']['fr-ca'] = "Choisir la destination alternative."; //copied from fr-fr
-$text['description-call_flow_alternate_destination']['fr-fr'] = "Choisir la destination alternative.";
-$text['description-call_flow_alternate_destination']['he-il'] = "";
-$text['description-call_flow_alternate_destination']['it-it'] = "";
-$text['description-call_flow_alternate_destination']['nl-nl'] = "";
-$text['description-call_flow_alternate_destination']['pl-pl'] = "Wybierz alternatywną destynację";
-$text['description-call_flow_alternate_destination']['pt-br'] = "Selecione um destino alternativo.";
-$text['description-call_flow_alternate_destination']['pt-pt'] = "Seleccione um destino alternativo.";
-$text['description-call_flow_alternate_destination']['ro-ro'] = "";
-$text['description-call_flow_alternate_destination']['ru-ru'] = "Выберите альтернативное направление.";
-$text['description-call_flow_alternate_destination']['sv-se'] = "Välj den alternativa destinationen.";
-$text['description-call_flow_alternate_destination']['uk-ua'] = "Виберіть інше розташування.";
+$text['description-alternate_destination']['en-us'] = "Select the alternate destination.";
+$text['description-alternate_destination']['es-cl'] = "Seleccione el destino alternativo.";
+$text['description-alternate_destination']['pt-pt'] = "Seleccione um destino alternativo.";
+$text['description-alternate_destination']['fr-fr'] = "Choisir la destination alternative.";
+$text['description-alternate_destination']['pt-br'] = "Selecione um destino alternativo.";
+$text['description-alternate_destination']['pl'] = "Wybierz alternatywną destynację";
+$text['description-alternate_destination']['sv-se'] = "Välj den alternativa destinationen.";
+$text['description-alternate_destination']['uk'] = "Виберіть інше розташування.";
+$text['description-alternate_destination']['de-at'] = "Wählen Sie ein alternatives Ziel.";

-$text['description-call_flow_sound']['en-us'] = "Select the sound to play when the status is set to the destinations.";
-$text['description-call_flow_sound']['ar-eg'] = "";
-$text['description-call_flow_sound']['de-at'] = "Wählen Sie den zu spielenden Rufton aus, wenn das primäre Ziel ausgewählt ist."; //copied from de-de
-$text['description-call_flow_sound']['de-ch'] = "Wählen Sie den zu spielenden Rufton aus, wenn das primäre Ziel ausgewählt ist."; //copied from de-de
-$text['description-call_flow_sound']['de-de'] = "Wählen Sie den zu spielenden Rufton aus, wenn das primäre Ziel ausgewählt ist.";
-$text['description-call_flow_sound']['es-cl'] = "Seleccione el sonido a reproducir cuando el estado se establece en el destino.";
-$text['description-call_flow_sound']['es-mx'] = "Seleccione el sonido a reproducir cuando el estado se establece en el destino."; //copied from es-cl
-$text['description-call_flow_sound']['fr-ca'] = "Sélectionnez le son à jouer lorsque l'état est réglé sur la destination."; //copied from fr-fr
-$text['description-call_flow_sound']['fr-fr'] = "Sélectionnez le son à jouer lorsque l'état est réglé sur la destination.";
-$text['description-call_flow_sound']['he-il'] = "";
-$text['description-call_flow_sound']['it-it'] = "";
-$text['description-call_flow_sound']['nl-nl'] = "";
-$text['description-call_flow_sound']['pl-pl'] = "Wybierz dźwięk do odtworzenia, gdy status jest ustawiony do miejsca przeznaczenia.";
-$text['description-call_flow_sound']['pt-br'] = "Selecione o som para tocar quando o status é definido para o destino.";
-$text['description-call_flow_sound']['pt-pt'] = "Selecione o som para tocar quando o status é definido como o destino.";
-$text['description-call_flow_sound']['ro-ro'] = "";
-$text['description-call_flow_sound']['ru-ru'] = "Выберите звук для воспроизведения, когда состояние устанавливается в пункты назначения.";
-$text['description-call_flow_sound']['sv-se'] = "Välj ljud att spela när status är inställd på destinationen.";
-$text['description-call_flow_sound']['uk-ua'] = "Виберіть звук для відтворення , коли статус встановлений в пункти призначення.";
+$text['description-sound']['en-us'] = "Select the sound to play when the status is set to the destinations.";
+$text['description-sound']['es-cl'] = "Seleccione el sonido a reproducir cuando el estado se establece en el destino.";
+$text['description-sound']['pt-pt'] = "Selecione o som para tocar quando o status é definido como o destino.";
+$text['description-sound']['fr-fr'] = "Sélectionnez le son à jouer lorsque l'état est réglé sur la destination.";
+$text['description-sound']['pt-br'] = "Selecione o som para tocar quando o status é definido para o destino.";
+$text['description-sound']['pl'] = "Wybierz dźwięk do odtworzenia, gdy status jest ustawiony do miejsca przeznaczenia.";
+$text['description-sound']['sv-se'] = "Välj ljud att spela när status är inställd på destinationen.";
+$text['description-sound']['uk'] = "Виберіть звук для відтворення , коли статус встановлений в пункти призначення.";
+$text['description-sound']['de-at'] = "Wählen Sie den Ton zu spielen, wenn der Status auf das Ziel festgelegt ist.";

-$text['description-call_flow_alternate_sound']['en-us'] = "Select the sound to play when status is set to the alternate destination.";
-$text['description-call_flow_alternate_sound']['ar-eg'] = "";
-$text['description-call_flow_alternate_sound']['de-at'] = "Wählen Sie den zu spielenden Rufton aus, wenn das alternative Ziel ausgewählt ist."; //copied from de-de
-$text['description-call_flow_alternate_sound']['de-ch'] = "Wählen Sie den zu spielenden Rufton aus, wenn das alternative Ziel ausgewählt ist."; //copied from de-de
-$text['description-call_flow_alternate_sound']['de-de'] = "Wählen Sie den zu spielenden Rufton aus, wenn das alternative Ziel ausgewählt ist.";
-$text['description-call_flow_alternate_sound']['es-cl'] = "Seleccione el sonido a reproducir cuando el estado se establece en el destino alternativo.";
-$text['description-call_flow_alternate_sound']['es-mx'] = "Seleccione el sonido a reproducir cuando el estado se establece en el destino alternativo."; //copied from es-cl
-$text['description-call_flow_alternate_sound']['fr-ca'] = "Sélectionnez le son à jouer lorsque l'état est réglé sur la destination alternative."; //copied from fr-fr
-$text['description-call_flow_alternate_sound']['fr-fr'] = "Sélectionnez le son à jouer lorsque l'état est réglé sur la destination alternative.";
-$text['description-call_flow_alternate_sound']['he-il'] = "";
-$text['description-call_flow_alternate_sound']['it-it'] = "";
-$text['description-call_flow_alternate_sound']['nl-nl'] = "";
-$text['description-call_flow_alternate_sound']['pl-pl'] = "Wybierz dźwięk do odtworzenia, gdy status jest ustawiony na alternatywnego przeznaczenia.";
-$text['description-call_flow_alternate_sound']['pt-br'] = "Selecione o som para tocar quando o status é definido para o destino alternativo.";
-$text['description-call_flow_alternate_sound']['pt-pt'] = "Selecione o som para tocar quando o status é definido como o destino alternativo.";
-$text['description-call_flow_alternate_sound']['ro-ro'] = "";
-$text['description-call_flow_alternate_sound']['ru-ru'] = "Выберите звук, который воспроизводится когда статус устанавливается в альтернативное направление.";
-$text['description-call_flow_alternate_sound']['sv-se'] = "Välj ljud att spela när status är inställd på den alternativa destinationen.";
-$text['description-call_flow_alternate_sound']['uk-ua'] = "Виберіть звук для відтворення , коли встановлено стан альтернативного призначення.";
+$text['description-alternate_sound']['en-us'] = "Select the sound to play when status is set to the alternate destination.";
+$text['description-alternate_sound']['es-cl'] = "Seleccione el sonido a reproducir cuando el estado se establece en el destino alternativo.";
+$text['description-alternate_sound']['pt-pt'] = "Selecione o som para tocar quando o status é definido como o destino alternativo.";
+$text['description-alternate_sound']['fr-fr'] = "Sélectionnez le son à jouer lorsque l'état est réglé sur la destination alternative.";
+$text['description-alternate_sound']['pt-br'] = "Selecione o som para tocar quando o status é definido para o destino alternativo.";
+$text['description-alternate_sound']['pl'] = "Wybierz dźwięk do odtworzenia, gdy status jest ustawiony na alternatywnego przeznaczenia.";
+$text['description-alternate_sound']['sv-se'] = "Välj ljud att spela när status är inställd på den alternativa destinationen.";
+$text['description-alternate_sound']['uk'] = "Виберіть звук для відтворення , коли встановлено стан альтернативного призначення.";
+$text['description-alternate_sound']['de-at'] = "Wählen Sie den Ton zu spielen, wenn der Status auf den alternativen Ziel gesetzt.";

 $text['recordings']['en-us'] = "Recordings";
-$text['recordings']['ar-eg'] = "";
-$text['recordings']['de-at'] = "Aufnahmen"; //copied from de-de
-$text['recordings']['de-ch'] = "Aufnahmen"; //copied from de-de
-$text['recordings']['de-de'] = "Aufnahmen";
 $text['recordings']['es-cl'] = "grabaciones";
-$text['recordings']['es-mx'] = "grabaciones"; //copied from es-cl
-$text['recordings']['fr-ca'] = "Recordings"; //copied from fr-fr
-$text['recordings']['fr-fr'] = "Recordings";
-$text['recordings']['he-il'] = "";
-$text['recordings']['it-it'] = "Registrazioni";
-$text['recordings']['nl-nl'] = "";
-$text['recordings']['pl-pl'] = "nagrania";
-$text['recordings']['pt-br'] = "Gravações";
 $text['recordings']['pt-pt'] = "gravações";
-$text['recordings']['ro-ro'] = "";
-$text['recordings']['ru-ru'] = "Записи";
+$text['recordings']['fr-fr'] = "Recordings";
+$text['recordings']['pt-br'] = "Gravações";
+$text['recordings']['pl'] = "nagrania";
 $text['recordings']['sv-se'] = "inspelningar";
-$text['recordings']['uk-ua'] = "записи";
+$text['recordings']['uk'] = "записи";
+$text['recordings']['de-at'] = "Aufnahmen";

 $text['miscellaneous']['en-us'] = "Miscellaneous";
-$text['miscellaneous']['ar-eg'] = "";
-$text['miscellaneous']['de-at'] = "Sonstiges"; //copied from de-de
-$text['miscellaneous']['de-ch'] = "Sonstiges"; //copied from de-de
-$text['miscellaneous']['de-de'] = "Sonstiges";
 $text['miscellaneous']['es-cl'] = "Diverso";
-$text['miscellaneous']['es-mx'] = "Diverso"; //copied from es-cl
-$text['miscellaneous']['fr-ca'] = "Divers"; //copied from fr-fr
-$text['miscellaneous']['fr-fr'] = "Divers";
-$text['miscellaneous']['he-il'] = "";
-$text['miscellaneous']['it-it'] = "Varie";
-$text['miscellaneous']['nl-nl'] = "";
-$text['miscellaneous']['pl-pl'] = "Różne";
-$text['miscellaneous']['pt-br'] = "Diversos";
 $text['miscellaneous']['pt-pt'] = "Variado";
-$text['miscellaneous']['ro-ro'] = "";
-$text['miscellaneous']['ru-ru'] = "Разное";
+$text['miscellaneous']['fr-fr'] = "Divers";
+$text['miscellaneous']['pt-br'] = "Diversos";
+$text['miscellaneous']['pl'] = "Różne";
 $text['miscellaneous']['sv-se'] = "Diverse";
-$text['miscellaneous']['uk-ua'] = "Різне";
+$text['miscellaneous']['uk'] = "Різне";
+$text['miscellaneous']['de-at'] = "Sonstiges";

 $text['sounds']['en-us'] = "Sounds";
-$text['sounds']['ar-eg'] = "";
-$text['sounds']['de-at'] = "Ruftöne"; //copied from de-de
-$text['sounds']['de-ch'] = "Ruftöne"; //copied from de-de
-$text['sounds']['de-de'] = "Ruftöne";
 $text['sounds']['es-cl'] = "Sonidos";
-$text['sounds']['es-mx'] = "Sonidos"; //copied from es-cl
-$text['sounds']['fr-ca'] = "des sons"; //copied from fr-fr
-$text['sounds']['fr-fr'] = "des sons";
-$text['sounds']['he-il'] = "";
-$text['sounds']['it-it'] = "Audio";
-$text['sounds']['nl-nl'] = "";
-$text['sounds']['pl-pl'] = "Dźwięki";
-$text['sounds']['pt-br'] = "Sons"; //copied from pt-pt
 $text['sounds']['pt-pt'] = "Sons";
-$text['sounds']['ro-ro'] = "";
-$text['sounds']['ru-ru'] = "Звуки";
+$text['sounds']['fr-fr'] = "des sons";
+$text['sounds']['pt-br'] = "Sons";
+$text['sounds']['pl'] = "Dźwięki";
 $text['sounds']['sv-se'] = "Ljud";
-$text['sounds']['uk-ua'] = "звуки";
+$text['sounds']['uk'] = "звуки";
+$text['sounds']['de-at'] = "Geräusche";

 ?>
@@ -1,30 +1,19 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Call Flows";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Anruf Steuerung";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Anruf Steuerung";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Flujo de Llamada";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Circulation d'Appel";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "cinématiques d'Appel";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Deviatori di Chiamata";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Przepływ rozmów";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Fluxo de chamadas";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Переключатель вызовов";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Samtalsflöden";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Потоки дзвінків";
-	$apps[$x]['menu'][$y]['uuid'] = "b0939384-7055-44e8-8b4c-9f72293e1878";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/call_flows/call_flows.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Call Flows";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Fluxo de chamadas";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Flujo de Llamada";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "cinématiques d'Appel";
+$apps[$x]['menu'][0]['title']['fr-ca'] = "Circulation d'Appel";
+$apps[$x]['menu'][0]['title']['pl'] = "Przepływ rozmów";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Samtalsflöden";
+$apps[$x]['menu'][0]['title']['uk'] = "Потоки дзвінків";
+$apps[$x]['menu'][0]['title']['de-at'] = "Anruf Steuerung";
+$apps[$x]['menu'][0]['uuid'] = "b0939384-7055-44e8-8b4c-9f72293e1878";
+$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/call_flows/call_flows.php";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['groups'][] = "admin";

 ?>
@@ -91,7 +91,7 @@ if (strlen($id)>0) {
 }


-messages::add($text['message-delete']);
+$_SESSION["message"] = $text['message-delete'];
 header("Location: call_flows.php");
 return;

@@ -17,7 +17,7 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2016
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
@@ -28,9 +28,9 @@
 //includes
 	require_once "root.php";
 	require_once "resources/require.php";
+	require_once "resources/check_auth.php";

 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('call_flow_add') || permission_exists('call_flow_edit')) {
 		//access granted
 	}
@@ -53,14 +53,12 @@
 	}

 //get http post variables and set them to php variables
-	if (is_array($_POST)) {
-
+	if (count($_POST) > 0) {
 		//set the variables from the http values
-			$call_flow_uuid = check_str($_POST["call_flow_uuid"]);
-			$dialplan_uuid = check_str($_POST["dialplan_uuid"]);
 			$call_flow_name = check_str($_POST["call_flow_name"]);
 			$call_flow_extension = check_str($_POST["call_flow_extension"]);
 			$call_flow_feature_code = check_str($_POST["call_flow_feature_code"]);
+			$call_flow_context = check_str($_POST["call_flow_context"]);
 			$call_flow_status = check_str($_POST["call_flow_status"]);
 			$call_flow_pin_number = check_str($_POST["call_flow_pin_number"]);
 			$call_flow_label = check_str($_POST["call_flow_label"]);
@@ -69,8 +67,8 @@
 			$call_flow_alternate_label = check_str($_POST["call_flow_alternate_label"]);
 			$call_flow_alternate_sound = check_str($_POST["call_flow_alternate_sound"]);
 			$call_flow_alternate_destination = check_str($_POST["call_flow_alternate_destination"]);
-			$call_flow_context = check_str($_POST["call_flow_context"]);
 			$call_flow_description = check_str($_POST["call_flow_description"]);
+			$dialplan_uuid = check_str($_POST["dialplan_uuid"]);

 		//seperate the action and the param
 			$destination_array = explode(":", $call_flow_destination);
@@ -81,208 +79,324 @@
 			$alternate_destination_array = explode(":", $call_flow_alternate_destination);
 			$call_flow_alternate_app = array_shift($alternate_destination_array);
 			$call_flow_alternate_data = join(':', $alternate_destination_array);
-	}

-//process the user data and save it to the database
-	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
-
-		//get the uuid from the POST
-			if ($action == "update") {
-				$call_flow_uuid = check_str($_POST["call_flow_uuid"]);
-			}
-
-		//check for all required data
-			$msg = '';
-			//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
-			//if (strlen($call_flow_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_uuid']."<br>\n"; }
-			//if (strlen($dialplan_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-dialplan_uuid']."<br>\n"; }
-			//if (strlen($call_flow_name) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_name']."<br>\n"; }
-			if (strlen($call_flow_extension) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_extension']."<br>\n"; }
-			if (strlen($call_flow_feature_code) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_feature_code']."<br>\n"; }
-			//if (strlen($call_flow_context) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_context']."<br>\n"; }
-			//if (strlen($call_flow_status) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_status']."<br>\n"; }
-			//if (strlen($call_flow_pin_number) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_pin_number']."<br>\n"; }
-			//if (strlen($call_flow_label) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_label']."<br>\n"; }
-			//if (strlen($call_flow_sound) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_sound']."<br>\n"; }
-			if (strlen($call_flow_app) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_app']."<br>\n"; }
-			if (strlen($call_flow_data) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_data']."<br>\n"; }
-			//if (strlen($call_flow_alternate_label) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_alternate_label']."<br>\n"; }
-			//if (strlen($call_flow_alternate_sound) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_alternate_sound']."<br>\n"; }
-			//if (strlen($call_flow_alternate_app) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_alternate_app']."<br>\n"; }
-			//if (strlen($call_flow_alternate_data) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_alternate_data']."<br>\n"; }
-			//if (strlen($call_flow_description) == 0) { $msg .= $text['message-required']." ".$text['label-call_flow_description']."<br>\n"; }
-			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "resources/header.php";
-				require_once "resources/persist_form_var.php";
-				echo "<div align='center'>\n";
-				echo "<table><tr><td>\n";
-				echo $msg."<br />";
-				echo "</td></tr></table>\n";
-				persistformvar($_POST);
-				echo "</div>\n";
-				require_once "resources/footer.php";
-				return;
-			}
-
-		//add the call_flow_uuid
-			if (strlen($call_flow_uuid) == 0) {
-				$call_flow_uuid = uuid();
-			}
-
-		//add the dialplan_uuid
-			if (strlen($dialplan_uuid) == 0) {
-				$dialplan_uuid = uuid();
-			}
-
-		//set the default context
-			if (permission_exists("call_flow_context")) {
-				//allow a user assigned to super admin to change the call_flow_context
-			}
-			else {
-				//if the call_flow_context was not set then set the default value
+		//set the context for users that are not in the superadmin group
+			if (!if_group("superadmin")) {
 				$call_flow_context = $_SESSION['domain_name'];
 			}

-		//escape special characters
-			$destination_extension = $call_flow_extension;
-			$destination_extension = str_replace("*", "\*", $destination_extension);
-			$destination_extension = str_replace("+", "\+", $destination_extension);
+	}

-			$destination_feature = $call_flow_feature_code;
-			// Allows dial feature code as `flow+<feature_code>`
-			if (substr($destination_feature, 0, 5) != 'flow+') {
-				$destination_feature = '(?:flow+)?' . $destination_feature;
+if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
+
+	$msg = '';
+	if ($action == "update") {
+		$call_flow_uuid = check_str($_POST["call_flow_uuid"]);
+	}
+
+	//check for all required data
+		if (strlen($call_flow_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
+		if (strlen($call_flow_extension) == 0) { $msg .= $text['message-required'].$text['label-extension']."<br>\n"; }
+		//if (strlen($call_flow_feature_code) == 0) { $msg .= $text['message-required'].$text['label-feature_code']."<br>\n"; }
+		if (strlen($call_flow_context) == 0) { $msg .= $text['message-required'].$text['label-context']."<br>\n"; }
+		//if (strlen($call_flow_status) == 0) { $msg .= $text['message-required'].$text['label-status']."<br>\n"; }
+		//if (strlen($call_flow_pin_number) == 0) { $msg .= $text['message-required'].$text['label-pin_number']."<br>\n"; }
+		//if (strlen($call_flow_status) == 0) { $msg .= $text['message-required'].$text['label-status']."<br>\n"; }
+		//if (strlen($call_flow_label) == 0) { $msg .= $text['message-required'].$text['label-destination_label']."<br>\n"; }
+		//if (strlen($call_flow_app) == 0) { $msg .= $text['message-required'].$text['label-destination']."<br>\n"; }
+		//if (strlen($call_flow_data) == 0) { $msg .= $text['message-required'].$text['label-destination']."<br>\n"; }
+		//if (strlen($call_flow_alternate_label) == 0) { $msg .= $text['message-required'].$text['label-alternate_label']."<br>\n"; }
+		//if (strlen($call_flow_alternate_app) == 0) { $msg .= $text['message-required'].$text['label-alternate_destination']."<br>\n"; }
+		//if (strlen($call_flow_alternate_data) == 0) { $msg .= $text['message-required'].$text['label-alternate_destination']."<br>\n"; }
+		//if (strlen($call_flow_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
+		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+			require_once "resources/header.php";
+			require_once "resources/persist_form_var.php";
+			echo "<div align='center'>\n";
+			echo "<table><tr><td>\n";
+			echo $msg."<br />";
+			echo "</td></tr></table>\n";
+			persistformvar($_POST);
+			echo "</div>\n";
+			require_once "resources/footer.php";
+			return;
+		}
+
+	//add or update the database
+		if ($_POST["persistformvar"] != "true") {
+			if ($action == "add" && permission_exists('call_flow_add')) {
+				//prepare the uuids
+					$call_flow_uuid = uuid();
+					$dialplan_uuid = uuid();
+				//add the call flow
+					$sql = "insert into v_call_flows ";
+					$sql .= "(";
+					$sql .= "domain_uuid, ";
+					$sql .= "call_flow_uuid, ";
+					$sql .= "dialplan_uuid, ";
+					$sql .= "call_flow_name, ";
+					$sql .= "call_flow_extension, ";
+					$sql .= "call_flow_feature_code, ";
+					$sql .= "call_flow_context, ";
+					$sql .= "call_flow_status, ";
+					$sql .= "call_flow_pin_number, ";
+					$sql .= "call_flow_label, ";
+					$sql .= "call_flow_sound, ";
+					$sql .= "call_flow_app, ";
+					$sql .= "call_flow_data, ";
+					$sql .= "call_flow_alternate_label, ";
+					$sql .= "call_flow_alternate_sound, ";
+					$sql .= "call_flow_alternate_app, ";
+					$sql .= "call_flow_alternate_data, ";
+					$sql .= "call_flow_description ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'$domain_uuid', ";
+					$sql .= "'".$call_flow_uuid."', ";
+					$sql .= "'".$dialplan_uuid."', ";
+					$sql .= "'$call_flow_name', ";
+					$sql .= "'$call_flow_extension', ";
+					$sql .= "'$call_flow_feature_code', ";
+					$sql .= "'$call_flow_context', ";
+					$sql .= "'$call_flow_status', ";
+					$sql .= "'$call_flow_pin_number', ";
+					$sql .= "'$call_flow_label', ";
+					$sql .= "'$call_flow_sound', ";
+					$sql .= "'$call_flow_app', ";
+					$sql .= "'$call_flow_data', ";
+					$sql .= "'$call_flow_alternate_label', ";
+					$sql .= "'$call_flow_alternate_sound', ";
+					$sql .= "'$call_flow_alternate_app', ";
+					$sql .= "'$call_flow_alternate_data', ";
+					$sql .= "'$call_flow_description' ";
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+			} //if ($action == "add")
+
+			if ($action == "update" && permission_exists('call_flow_edit')) {
+				//prepare the uuids
+					if (strlen($dialplan_uuid) == 0) {
+						$dialplan_uuid = uuid();
+					}
+				//add the call flow
+					$sql = "update v_call_flows set ";
+					$sql .= "dialplan_uuid = '$dialplan_uuid', ";
+					$sql .= "call_flow_name = '$call_flow_name', ";
+					$sql .= "call_flow_extension = '$call_flow_extension', ";
+					$sql .= "call_flow_feature_code = '$call_flow_feature_code', ";
+					$sql .= "call_flow_context = '$call_flow_context', ";
+					$sql .= "call_flow_status = '$call_flow_status', ";
+					$sql .= "call_flow_pin_number = '$call_flow_pin_number', ";
+					$sql .= "call_flow_label = '$call_flow_label', ";
+					$sql .= "call_flow_sound = '$call_flow_sound', ";
+					$sql .= "call_flow_app = '$call_flow_app', ";
+					$sql .= "call_flow_data = '$call_flow_data', ";
+					$sql .= "call_flow_alternate_label = '$call_flow_alternate_label', ";
+					$sql .= "call_flow_alternate_sound = '$call_flow_alternate_sound', ";
+					$sql .= "call_flow_alternate_app = '$call_flow_alternate_app', ";
+					$sql .= "call_flow_alternate_data = '$call_flow_alternate_data', ";
+					$sql .= "call_flow_description = '$call_flow_description' ";
+					$sql .= "where domain_uuid = '$domain_uuid' ";
+					$sql .= "and call_flow_uuid = '$call_flow_uuid'";
+					$db->exec(check_sql($sql));
+					unset($sql);
+			} //if ($action == "update")
+
+			if ($action == "add" || $action == "update") {
+
+				//delete the dialplan
+					$sql = "delete from v_dialplans ";
+					$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+					$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
+					$db->query(check_sql($sql));
+
+				//delete the dialplan details
+					$sql = "delete from v_dialplan_details ";
+					$sql .= "where domain_uuid = '$domain_uuid' ";
+					$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
+					$db->query($sql);
+					unset($sql);
+
+				//add the dialplan entry
+					$dialplan_name = $call_flow_name;
+					$dialplan_order ='333';
+					$dialplan_context = $call_flow_context;
+					$dialplan_enabled = 'true';
+					$dialplan_description = $call_flow_description;
+					$app_uuid = 'b1b70f85-6b42-429b-8c5a-60c8b02b7d14';
+					dialplan_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_name, $dialplan_order, $dialplan_context, $dialplan_enabled, $dialplan_description, $app_uuid);
+
+					//<condition destination_number="300" break="on-true"/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'condition'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'destination_number';
+					$dialplan->dialplan_detail_data = '^'.str_replace('+', '\+', str_replace('*', '\*', $call_flow_feature_code)).'$';
+					$dialplan->dialplan_detail_break = 'on-true';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '1';
+					$dialplan->dialplan_detail_order = '000';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+					//<action application="set" data="call_flow_uuid="/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'action'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'set';
+					$dialplan->dialplan_detail_data = 'call_flow_uuid='.$call_flow_uuid;
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '1';
+					$dialplan->dialplan_detail_order = '010';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+					//<action application="set" data="feature_code=true"/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'action'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'set';
+					$dialplan->dialplan_detail_data = 'feature_code=true';
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '1';
+					$dialplan->dialplan_detail_order = '020';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+					//<action application="lua" data="call_flow.lua"/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'action'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'lua';
+					$dialplan->dialplan_detail_data = 'call_flow.lua';
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '1';
+					$dialplan->dialplan_detail_order = '030';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+				//dialplan group 2
+					//<condition destination_number="301"/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'condition'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'destination_number';
+					$dialplan->dialplan_detail_data = '^'.str_replace('+', '\+', str_replace('*', '\*', $call_flow_extension)).'$';
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '2';
+					$dialplan->dialplan_detail_order = '000';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+					//<action application="set" data="call_flow_uuid="/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'action'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'set';
+					$dialplan->dialplan_detail_data = 'call_flow_uuid='.$call_flow_uuid;
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '2';
+					$dialplan->dialplan_detail_order = '010';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+					//<action application="set" data="ringback=${us-ring}"/>
+					//$dialplan = new dialplan;
+					//$dialplan->domain_uuid = $domain_uuid;
+					//$dialplan->dialplan_uuid = $dialplan_uuid;
+					//$dialplan->dialplan_detail_tag = 'action'; //condition, action, antiaction
+					//$dialplan->dialplan_detail_type = 'set';
+					//$dialplan->dialplan_detail_data = 'ringback=${us-ring}';
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					//$dialplan->dialplan_detail_group = '2';
+					//$dialplan->dialplan_detail_order = '020';
+					//$dialplan->dialplan_detail_add();
+					//unset($dialplan);
+
+					//<action application="lua" data="call_flow.lua"/>
+					$dialplan = new dialplan;
+					$dialplan->domain_uuid = $domain_uuid;
+					$dialplan->dialplan_uuid = $dialplan_uuid;
+					$dialplan->dialplan_detail_tag = 'action'; //condition, action, antiaction
+					$dialplan->dialplan_detail_type = 'lua';
+					//$dialplan->dialplan_detail_data = $call_flow_extension . ' LUA call_flow.lua';
+					$dialplan->dialplan_detail_data = 'call_flow.lua';
+					//$dialplan->dialplan_detail_break = '';
+					//$dialplan->dialplan_detail_inline = '';
+					$dialplan->dialplan_detail_group = '2';
+					$dialplan->dialplan_detail_order = '030';
+					$dialplan->dialplan_detail_add();
+					unset($dialplan);
+
+				//save the xml
+					save_dialplan_xml();
+
+				//apply settings reminder
+					$_SESSION["reload_xml"] = true;
+
+				//clear the cache
+					$cache = new cache;
+					$cache->delete("dialplan:".$call_flow_context);
+
+				//set the message
+					if ($action == "add") {
+						$_SESSION["message"] = $text['message-add'];
+					}
+					if ($action == "update") {
+						$_SESSION["message"] = $text['message-update'];
+					}
+
+				//redirect the browser
+					header("Location: call_flows.php");
+					return;
 			}
-			$destination_feature = str_replace("*", "\*", $destination_feature);
-			$destination_feature = str_replace("+", "\+", $destination_feature);
-
-		//build the xml dialplan
-			$dialplan_xml = "<extension name=\"".$call_flow_name."\" continue=\"\" uuid=\"".$dialplan_uuid."\">\n";
-			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$destination_feature."$\" break=\"on-true\">\n";
-			$dialplan_xml .= "		<action application=\"set\" data=\"feature_code=true\"/>\n";
-			$dialplan_xml .= "		<action application=\"set\" data=\"call_flow_uuid=".$call_flow_uuid."\"/>\n";
-			$dialplan_xml .= "		<action application=\"lua\" data=\"call_flow.lua\"/>\n";
-			$dialplan_xml .= "	</condition>\n";
-			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$destination_extension."$\">\n";
-			$dialplan_xml .= "		<action application=\"set\" data=\"call_flow_uuid=".$call_flow_uuid."\"/>\n";
-			$dialplan_xml .= "		<action application=\"lua\" data=\"call_flow.lua\"/>\n";
-			$dialplan_xml .= "	</condition>\n";
-			$dialplan_xml .= "</extension>\n";
-
-		//set the row id
-			$i = 0;
-
-		//build the dialplan array
-			$array["dialplans"][$i]["domain_uuid"] = $_SESSION['domain_uuid'];
-			$array["dialplans"][$i]["dialplan_uuid"] = $dialplan_uuid;
-			$array["dialplans"][$i]["dialplan_name"] = $call_flow_name;
-			$array["dialplans"][$i]["dialplan_number"] = $call_flow_extension;
-			$array["dialplans"][$i]["dialplan_context"] = $call_flow_context;
-			$array["dialplans"][$i]["dialplan_continue"] = "false";
-			$array["dialplans"][$i]["dialplan_xml"] = $dialplan_xml;
-			$array["dialplans"][$i]["dialplan_order"] = "333";
-			$array["dialplans"][$i]["dialplan_enabled"] = "true";
-			$array["dialplans"][$i]["dialplan_description"] = $call_flow_description;
-			$array["dialplans"][$i]["app_uuid"] = "b1b70f85-6b42-429b-8c5a-60c8b02b7d14";
-
-			$array["call_flows"][$i]["call_flow_uuid"] =  $call_flow_uuid;
-			$array["call_flows"][$i]["domain_uuid"] = $_SESSION['domain_uuid'];
-			$array["call_flows"][$i]["dialplan_uuid"] = $dialplan_uuid;
-			$array["call_flows"][$i]["call_flow_name"] = $call_flow_name;
-			$array["call_flows"][$i]["call_flow_extension"] = $call_flow_extension;
-			$array["call_flows"][$i]["call_flow_feature_code"] = $call_flow_feature_code;
-			$array["call_flows"][$i]["call_flow_status"] = $call_flow_status;
-			$array["call_flows"][$i]["call_flow_pin_number"] = $call_flow_pin_number;
-			$array["call_flows"][$i]["call_flow_label"] = $call_flow_label;
-			$array["call_flows"][$i]["call_flow_sound"] = $call_flow_sound;
-			$array["call_flows"][$i]["call_flow_alternate_label"] = $call_flow_alternate_label;
-			$array["call_flows"][$i]["call_flow_alternate_sound"] = $call_flow_alternate_sound;
-			$array["call_flows"][$i]["call_flow_app"] = $call_flow_app;
-			$array["call_flows"][$i]["call_flow_data"] = $call_flow_data;
-			$array["call_flows"][$i]["call_flow_alternate_app"] = $call_flow_alternate_app;
-			$array["call_flows"][$i]["call_flow_alternate_data"] = $call_flow_alternate_data;
-			$array["call_flows"][$i]["call_flow_context"] = $call_flow_context;
-			$array["call_flows"][$i]["call_flow_description"] = $call_flow_description;
-
-		//add the dialplan permission
-			$p = new permissions;
-			$p->add("dialplan_add", "temp");
-			$p->add("dialplan_edit", "temp");
-
-		//save to the data
-			$database = new database;
-			$database->app_name = 'call_flows';
-			$database->app_uuid = 'b1b70f85-6b42-429b-8c5a-60c8b02b7d14';
-			if (strlen($call_flow_uuid) > 0) {
-				$database->uuid($call_flow_uuid);
-			}
-			$database->save($array);
-			$message = $database->message;
-
-		//remove the temporary permission
-			$p->delete("dialplan_add", "temp");
-			$p->delete("dialplan_edit", "temp");
-
-		//debug info
-			//echo "<pre>";
-			//print_r($message);
-			//echo "</pre>";
-			//exit;
-
-		//save the xml
-			save_dialplan_xml();
-
-		//apply settings reminder
-			$_SESSION["reload_xml"] = true;
-
-		//clear the cache
-			$cache = new cache;
-			$cache->delete("dialplan:".$call_flow_context);
-
-		//redirect the user
-			if (isset($action)) {
-				if ($action == "add") {
-					messages::add($text['message-add']);
-				}
-				if ($action == "update") {
-					messages::add($text['message-update']);
-				}
-				header("Location: call_flows.php");
-				return;
-			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
+		} //if ($_POST["persistformvar"] != "true")
+} //(count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0)

 //initialize the destinations object
 	$destination = new destinations;

 //pre-populate the form
-	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
+	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
 		$call_flow_uuid = check_str($_GET["id"]);
 		$sql = "select * from v_call_flows ";
-		$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and call_flow_uuid = '$call_flow_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$result = $prep_statement->fetchAll();
 		foreach ($result as &$row) {
 			//set the php variables
-				$call_flow_uuid = $row["call_flow_uuid"];
-				$dialplan_uuid = $row["dialplan_uuid"];
 				$call_flow_name = $row["call_flow_name"];
 				$call_flow_extension = $row["call_flow_extension"];
 				$call_flow_feature_code = $row["call_flow_feature_code"];
 				$call_flow_context = $row["call_flow_context"];
 				$call_flow_status = $row["call_flow_status"];
-				$call_flow_pin_number = $row["call_flow_pin_number"];
 				$call_flow_label = $row["call_flow_label"];
 				$call_flow_sound = $row["call_flow_sound"];
 				$call_flow_app = $row["call_flow_app"];
+				$call_flow_pin_number = $row["call_flow_pin_number"];
 				$call_flow_data = $row["call_flow_data"];
 				$call_flow_alternate_label = $row["call_flow_alternate_label"];
 				$call_flow_alternate_sound = $row["call_flow_alternate_sound"];
 				$call_flow_alternate_app = $row["call_flow_alternate_app"];
 				$call_flow_alternate_data = $row["call_flow_alternate_data"];
 				$call_flow_description = $row["call_flow_description"];
+				$dialplan_uuid = $row["dialplan_uuid"];

 			//if superadmin show both the app and data
 				if (if_group("superadmin")) {
@@ -303,9 +417,18 @@
 		unset ($prep_statement);
 	}

-//set the context for users that are not in the superadmin group
-	if (strlen($call_flow_context) == 0) {
-		$call_flow_context = $_SESSION['domain_name'];
+	//set the context for users that are not in the superadmin group
+		if (strlen($call_flow_context) == 0) {
+			$call_flow_context = $_SESSION['domain_name'];
+		}
+
+//show the header
+	require_once "resources/header.php";
+	if ($action == "update") {
+		$document['title'] = $text['title-call_flow-edit'];
+	}
+	if ($action == "add") {
+		$document['title'] = $text['title-call_flow-add'];
 	}

 //get the recordings
@@ -317,7 +440,6 @@
 	$recordings = $prep_statement->fetchAll(PDO::FETCH_ASSOC);

 	if (if_group("superadmin")) {
-		require_once "resources/header.php";
 		echo "<script>\n";
 		echo "var Objs;\n";
 		echo "\n";
@@ -454,56 +576,71 @@
 		echo "</tr>\n";
 	}

-//show the header
-	require_once "resources/header.php";
-
 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
-	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<form method='post' name='frm' action=''>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-call_flow']."</b><br><br></td>\n";
-	echo "<td width='70%' align='right' valign='top'>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap'><b>";
+	if ($action == "update") {
+		echo $text['header-call_flow-edit'];
+	}
+	if ($action == "add") {
+		echo $text['header-call_flow-add'];
+	}
+	echo "</b></td>\n";
+	echo "<td width='70%' align='right'>";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='call_flows.php'\" value='".$text['button-back']."'>";
-	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>";
+	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_name']."\n";
+	echo "	".$text['label-name']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='call_flow_name' maxlength='255' value=\"$call_flow_name\">\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_name']."\n";
+	echo $text['description-name']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_extension']."\n";
+	echo "	".$text['label-extension']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='call_flow_extension' maxlength='255' value=\"$call_flow_extension\">\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_extension']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_feature_code']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_flow_feature_code' maxlength='255' value=\"$call_flow_feature_code\">\n";
-	echo "<br />\n";
-	echo $text['description-call_flow_feature_code']."\n";
+	echo $text['description-extension']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_status']."\n";
+	echo "	".$text['label-feature_code']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='call_flow_feature_code' maxlength='255' value=\"$call_flow_feature_code\">\n";
+	echo "<br />\n";
+	echo $text['description-feature_code']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-context']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='call_flow_context' maxlength='255' value=\"$call_flow_context\">\n";
+	echo "<br />\n";
+	echo $text['description-context']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-status']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='call_flow_status'>\n";
@@ -542,50 +679,37 @@
 	}
 	echo "	</select>\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_status']."\n";
+	echo $text['description-status']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_pin_number']."\n";
+	echo "	".$text['label-pin_number']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='call_flow_pin_number' maxlength='255' value=\"$call_flow_pin_number\">\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_pin_number']."\n";
+	echo $text['description-pin_number']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_label']."\n";
+	echo "	".$text['label-destination_label']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='call_flow_label' maxlength='255' value=\"$call_flow_label\">\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_label']."\n";
+	echo $text['description-destination_label']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

-	sound_select_list($call_flow_sound, 'call_flow_sound', 'call_flow_sound', true);
-	
-	/*
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_sound']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_flow_sound' maxlength='255' value=\"$call_flow_sound\">\n";
-	echo "<br />\n";
-	echo $text['description-call_flow_sound']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-	*/
+	sound_select_list($call_flow_sound, 'call_flow_sound', 'sound', true);

 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_destination']."\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
+	echo "	".$text['label-destination']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	$select_value = '';
@@ -597,39 +721,26 @@
 	echo $destination->select('dialplan', 'call_flow_destination', $select_value);
 	unset($select_value);
 	echo "<br />\n";
-	echo $text['description-call_flow_destination']."\n";
+	echo $text['description-destination']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_alternate_label']."\n";
+	echo "	".$text['label-alternate_label']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='call_flow_alternate_label' maxlength='255' value=\"$call_flow_alternate_label\">\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_alternate_label']."\n";
+	echo $text['description-alternate_label']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

-	sound_select_list($call_flow_alternate_sound, 'call_flow_alternate_sound', 'call_flow_alternate_sound', true);
-
-	/*
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_alternate_sound']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_flow_alternate_sound' maxlength='255' value=\"$call_flow_alternate_sound\">\n";
-	echo "<br />\n";
-	echo $text['description-call_flow_alternate_sound']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-	*/
+	sound_select_list($call_flow_alternate_sound, 'call_flow_alternate_sound', 'alternate_sound', true);

 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_alternate_destination']."\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
+	echo "	".$text['label-alternate_destination']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	$select_value = '';
@@ -639,47 +750,35 @@
 	echo $destination->select('dialplan', 'call_flow_alternate_destination', $select_value);
 	unset($select_value);
 	echo "<br />\n";
-	echo $text['description-call_flow_alternate_destination']."\n";
+	echo $text['description-alternate_destination']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

-	if (permission_exists('call_flow_context')) {
-		echo "<tr>\n";
-		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-call_flow_context']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='call_flow_context' maxlength='255' value=\"$call_flow_context\">\n";
-		echo "<br />\n";
-		echo $text['description-call_flow_context']."\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-	}
-
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_flow_description']."\n";
+	echo "	".$text['label-description']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='call_flow_description' maxlength='255' value=\"$call_flow_description\">\n";
 	echo "<br />\n";
-	echo $text['description-call_flow_description']."\n";
+	echo $text['description-description']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='call_flow_uuid' value='$call_flow_uuid'>\n";
-		echo "				<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "		<input type='hidden' name='call_flow_uuid' value='$call_flow_uuid'>\n";
+		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
-	echo "<br /><br />";

 //include the footer
 	require_once "resources/footer.php";
-
 ?>
@@ -17,115 +17,41 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2016
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permissions
-	require_once "resources/check_auth.php";
-	if (permission_exists('call_flow_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_flow_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

-//set the page title
+require_once "resources/header.php";
 	$document['title'] = $text['title-call_flows'];

+require_once "resources/paging.php";
+
 //get variables used to control the order
-	$order_by = check_str($_GET["order_by"]);
-	$order = check_str($_GET["order"]);
-
-//add the search term
-	$search = strtolower(check_str($_GET["search"]));
-	if (strlen($search) > 0) {
-		$sql_search = "and (";
-		$sql_search .= "lower(call_flow_name) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_extension) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_feature_code) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_context) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_status) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_pin_number) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_label) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_sound) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_app) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_data) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_alternate_label) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_alternate_sound) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_alternate_app) like '%".$search."%' ";
-		//$sql_search .= "or lower(call_flow_alternate_data) like '%".$search."%' ";
-		$sql_search .= "or lower(call_flow_description) like '%".$search."%' ";
-		$sql_search .= ") ";
-	}
-
-//additional includes
-	require_once "resources/header.php";
-	require_once "resources/paging.php";
-
-//prepare to page the results
-	$sql = "select count(call_flow_uuid) as num_rows from v_call_flows ";
-	$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
-	$sql .= $sql_search;
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$prep_statement = $db->prepare($sql);
-	if ($prep_statement) {
-		$prep_statement->execute();
-		$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-		if ($row['num_rows'] > 0) {
-			$num_rows = $row['num_rows'];
-		}
-		else {
-			$num_rows = '0';
-		}
-	}
-
-//prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "";
-	$page = $_GET['page'];
-	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	$offset = $rows_per_page * $page;
-
-//get the list
-	$sql = "select * from v_call_flows ";
-	$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
-	$sql .= $sql_search;
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$sql .= "limit $rows_per_page offset $offset ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$call_flows = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
-
-//alternate the row style
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];

 //show the content
-	echo "<table width='100%' border='0'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0 border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-call_flows']."</b></td>\n";
-	echo "		<form method='get' action=''>\n";
-	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
-	echo "				<input type='text' class='txt' style='width: 150px' name='search' id='search' value='".$search."'>\n";
-	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
-	echo "			</td>\n";
-	echo "		</form>\n";
+	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['header-call_flows']."</b></td>\n";
+	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' colspan='2'>\n";
@@ -134,41 +60,64 @@
 	echo "	</tr>\n";
 	echo "</table>\n";

+	//prepare to page the results
+		$sql = "select count(*) as num_rows from v_call_flows ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		$prep_statement = $db->prepare($sql);
+		if ($prep_statement) {
+		$prep_statement->execute();
+			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+			if ($row['num_rows'] > 0) {
+				$num_rows = $row['num_rows'];
+			}
+			else {
+				$num_rows = '0';
+			}
+		}
+
+	//prepare to page the results
+		$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
+		$param = "";
+		$page = $_GET['page'];
+		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
+		$offset = $rows_per_page * $page;
+
+	//get the list
+		$sql = "select * from v_call_flows ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		$sql .= "limit $rows_per_page offset $offset ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll();
+		$result_count = count($result);
+		unset ($prep_statement, $sql);
+
+	$c = 0;
+	$row_style["0"] = "row_style0";
+	$row_style["1"] = "row_style1";
+
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo th_order_by('call_flow_status', $text['label-call_flow_status'], $order_by, $order);
-	//echo th_order_by('call_flow_name', $text['label-call_flow_name'], $order_by, $order);
-	echo th_order_by('call_flow_extension', $text['label-call_flow_extension'], $order_by, $order);
-	echo th_order_by('call_flow_feature_code', $text['label-call_flow_feature_code'], $order_by, $order);
-	//echo th_order_by('call_flow_context', $text['label-call_flow_context'], $order_by, $order);
-	//echo th_order_by('call_flow_pin_number', $text['label-call_flow_pin_number'], $order_by, $order);
-	//echo th_order_by('call_flow_label', $text['label-call_flow_label'], $order_by, $order);
-	//echo th_order_by('call_flow_sound', $text['label-call_flow_sound'], $order_by, $order);
-	//echo th_order_by('call_flow_app', $text['label-call_flow_app'], $order_by, $order);
-	//echo th_order_by('call_flow_data', $text['label-call_flow_data'], $order_by, $order);
-	//echo th_order_by('call_flow_alternate_label', $text['label-call_flow_alternate_label'], $order_by, $order);
-	//echo th_order_by('call_flow_alternate_sound', $text['label-call_flow_alternate_sound'], $order_by, $order);
-	//echo th_order_by('call_flow_alternate_app', $text['label-call_flow_alternate_app'], $order_by, $order);
-	//echo th_order_by('call_flow_alternate_data', $text['label-call_flow_alternate_data'], $order_by, $order);
-	if (permission_exists('call_flow_context')) {
-		echo th_order_by('call_flow_context', $text['label-call_flow_context'], $order_by, $order);
-	}
-	echo th_order_by('call_flow_description', $text['label-call_flow_description'], $order_by, $order);
+	echo th_order_by('call_flow_status', $text['label-status'], $order_by, $order);
+	//echo th_order_by('call_flow_name', $text['label-name'], $order_by, $order);
+	echo th_order_by('call_flow_extension', $text['label-extension'], $order_by, $order);
+	echo th_order_by('call_flow_feature_code', $text['label-feature_code'], $order_by, $order);
+	//echo "<th>".$text['label-destination']."</th>\n";
+	//echo "<th>".$text['label-alternate_destination']."</th>\n";
+	echo th_order_by('call_flow_description', $text['label-description'], $order_by, $order);
 	echo "<td class='list_control_icons'>";
 	if (permission_exists('call_flow_add')) {
 		echo "<a href='call_flow_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
-	else {
-		echo "&nbsp;\n";
-	}
 	echo "</td>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";

-	if (is_array($call_flows)) {
-		foreach($call_flows as $row) {
-			if (permission_exists('call_flow_edit')) {
-				$tr_link = "href='call_flow_edit.php?id=".$row['call_flow_uuid']."'";
-			}
+	if ($result_count > 0) {
+		foreach($result as $row) {
+			$tr_link = (permission_exists('call_flow_edit')) ? "href='call_flow_edit.php?id=".$row['call_flow_uuid']."'" : null;
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>";
 			if ($row['call_flow_status'] != "false") {
@@ -182,19 +131,9 @@
 			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_name']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_extension']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_feature_code']."&nbsp;</td>\n";
-			if (permission_exists('call_flow_context')) {
-				echo "	<td valign='top' class='row_stylebg'>".$row['call_flow_context']."&nbsp;</td>\n";
-			}
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_pin_number']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_label']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_sound']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_app']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_data']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_alternate_label']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_alternate_sound']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_alternate_app']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_alternate_data']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='row_stylebg'>".$row['call_flow_description']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_app']." ".$row['call_flow_data']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_flow_alternate_app']." ".$row['call_flow_alternate_data']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='row_stylebg' width='30%'>".$row['call_flow_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons'>";
 			if (permission_exists('call_flow_edit')) {
 				echo "<a href='call_flow_edit.php?id=".$row['call_flow_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
@@ -206,31 +145,28 @@
 			echo "</tr>\n";
 			if ($c==0) { $c=1; } else { $c=0; }
 		} //end foreach
-		unset($sql, $call_flows, $row_count);
+		unset($sql, $result, $row_count);
 	} //end if results

 	echo "<tr>\n";
-	echo "<td colspan='19' align='left'>\n";
+	echo "<td colspan='10' align='left'>\n";
 	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
+	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
+	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
 	echo "		<td class='list_control_icons'>";
 	if (permission_exists('call_flow_add')) {
 		echo 		"<a href='call_flow_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
-	else {
-		echo 		"&nbsp;";
-	}
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	</table>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+
 	echo "</table>";
 	echo "<br /><br />";

 //include the footer
 	require_once "resources/footer.php";
-
 ?>
@@ -1,87 +0,0 @@
-<?php
-
-	//application details
-		$apps[$x]['name'] = 'Call Recordings';
-		$apps[$x]['uuid'] = '56165644-598d-4ed8-be01-d960bcb8ffed';
-		$apps[$x]['category'] = '';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = '';
-
-	//permission details
-		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'call_recording_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_recording_add';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_recording_edit';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_recording_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_recording_play';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'call_recording_download';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-
-	//Call Recordings
-		$y = 2;
-		$apps[$x]['db'][$y]['table']['name'] = 'v_call_recordings';
-		$apps[$x]['db'][$y]['table']['parent'] = '';
-		$z = 0;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_path';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_length';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_date';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamp';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_direction';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_recording_base64';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-
-?>
@@ -1,344 +0,0 @@
-<?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC
-
-$text['title-call_recordings']['en-us'] = "Call Recordings";
-$text['title-call_recordings']['ar-eg'] = "";
-$text['title-call_recordings']['de-at'] = "";
-$text['title-call_recordings']['de-ch'] = "";
-$text['title-call_recordings']['de-de'] = "";
-$text['title-call_recordings']['es-cl'] = "";
-$text['title-call_recordings']['es-mx'] = "";
-$text['title-call_recordings']['fr-ca'] = "";
-$text['title-call_recordings']['fr-fr'] = "";
-$text['title-call_recordings']['he-il'] = "";
-$text['title-call_recordings']['it-it'] = "";
-$text['title-call_recordings']['nl-nl'] = "";
-$text['title-call_recordings']['pl-pl'] = "";
-$text['title-call_recordings']['pt-br'] = "";
-$text['title-call_recordings']['pt-pt'] = "";
-$text['title-call_recordings']['ro-ro'] = "";
-$text['title-call_recordings']['ru-ru'] = "Записи разговоров";
-$text['title-call_recordings']['sv-se'] = "";
-$text['title-call_recordings']['uk-ua'] = "";
-
-$text['title-call_recording']['en-us'] = "Call Recording";
-$text['title-call_recording']['ar-eg'] = "";
-$text['title-call_recording']['de-at'] = "";
-$text['title-call_recording']['de-ch'] = "";
-$text['title-call_recording']['de-de'] = "";
-$text['title-call_recording']['es-cl'] = "";
-$text['title-call_recording']['es-mx'] = "";
-$text['title-call_recording']['fr-ca'] = "";
-$text['title-call_recording']['fr-fr'] = "";
-$text['title-call_recording']['he-il'] = "";
-$text['title-call_recording']['it-it'] = "";
-$text['title-call_recording']['nl-nl'] = "";
-$text['title-call_recording']['pl-pl'] = "";
-$text['title-call_recording']['pt-br'] = "";
-$text['title-call_recording']['pt-pt'] = "";
-$text['title-call_recording']['ro-ro'] = "";
-$text['title-call_recording']['ru-ru'] = "Запись разговора";
-$text['title-call_recording']['sv-se'] = "";
-$text['title-call_recording']['uk-ua'] = "";
-
-$text['title_description-call_recording']['en-us'] = "Shows the call recordings with name, length, date and time, and call direction.";
-$text['title_description-call_recording']['ar-eg'] = "";
-$text['title_description-call_recording']['de-at'] = "";
-$text['title_description-call_recording']['de-ch'] = "";
-$text['title_description-call_recording']['de-de'] = "";
-$text['title_description-call_recording']['es-cl'] = "";
-$text['title_description-call_recording']['es-mx'] = "";
-$text['title_description-call_recording']['fr-ca'] = "";
-$text['title_description-call_recording']['fr-fr'] = "";
-$text['title_description-call_recording']['he-il'] = "";
-$text['title_description-call_recording']['it-it'] = "";
-$text['title_description-call_recording']['nl-nl'] = "";
-$text['title_description-call_recording']['pl-pl'] = "";
-$text['title_description-call_recording']['pt-br'] = "";
-$text['title_description-call_recording']['pt-pt'] = "";
-$text['title_description-call_recording']['ro-ro'] = "";
-$text['title_description-call_recording']['ru-ru'] = "Показывает доступные записи разговоров с именем, датой, временем и направлением вызова.";
-$text['title_description-call_recording']['sv-se'] = "";
-$text['title_description-call_recording']['uk-ua'] = "";
-
-$text['label-call_recording_name']['en-us'] = "Name";
-$text['label-call_recording_name']['ar-eg'] = "";
-$text['label-call_recording_name']['de-at'] = "";
-$text['label-call_recording_name']['de-ch'] = "";
-$text['label-call_recording_name']['de-de'] = "";
-$text['label-call_recording_name']['es-cl'] = "";
-$text['label-call_recording_name']['es-mx'] = "";
-$text['label-call_recording_name']['fr-ca'] = "";
-$text['label-call_recording_name']['fr-fr'] = "";
-$text['label-call_recording_name']['he-il'] = "";
-$text['label-call_recording_name']['it-it'] = "";
-$text['label-call_recording_name']['nl-nl'] = "";
-$text['label-call_recording_name']['pl-pl'] = "";
-$text['label-call_recording_name']['pt-br'] = "";
-$text['label-call_recording_name']['pt-pt'] = "";
-$text['label-call_recording_name']['ro-ro'] = "";
-$text['label-call_recording_name']['ru-ru'] = "Имя";
-$text['label-call_recording_name']['sv-se'] = "";
-$text['label-call_recording_name']['uk-ua'] = "";
-
-$text['description-call_recording_name']['en-us'] = "";
-$text['description-call_recording_name']['ar-eg'] = "";
-$text['description-call_recording_name']['de-at'] = "";
-$text['description-call_recording_name']['de-ch'] = "";
-$text['description-call_recording_name']['de-de'] = "";
-$text['description-call_recording_name']['es-cl'] = "";
-$text['description-call_recording_name']['es-mx'] = "";
-$text['description-call_recording_name']['fr-ca'] = "";
-$text['description-call_recording_name']['fr-fr'] = "";
-$text['description-call_recording_name']['he-il'] = "";
-$text['description-call_recording_name']['it-it'] = "";
-$text['description-call_recording_name']['nl-nl'] = "";
-$text['description-call_recording_name']['pl-pl'] = "";
-$text['description-call_recording_name']['pt-br'] = "";
-$text['description-call_recording_name']['pt-pt'] = "";
-$text['description-call_recording_name']['ro-ro'] = "";
-$text['description-call_recording_name']['ru-ru'] = "";
-$text['description-call_recording_name']['sv-se'] = "";
-$text['description-call_recording_name']['uk-ua'] = "";
-
-$text['label-call_recording_path']['en-us'] = "Path";
-$text['label-call_recording_path']['ar-eg'] = "";
-$text['label-call_recording_path']['de-at'] = "";
-$text['label-call_recording_path']['de-ch'] = "";
-$text['label-call_recording_path']['de-de'] = "";
-$text['label-call_recording_path']['es-cl'] = "";
-$text['label-call_recording_path']['es-mx'] = "";
-$text['label-call_recording_path']['fr-ca'] = "";
-$text['label-call_recording_path']['fr-fr'] = "";
-$text['label-call_recording_path']['he-il'] = "";
-$text['label-call_recording_path']['it-it'] = "";
-$text['label-call_recording_path']['nl-nl'] = "";
-$text['label-call_recording_path']['pl-pl'] = "";
-$text['label-call_recording_path']['pt-br'] = "";
-$text['label-call_recording_path']['pt-pt'] = "";
-$text['label-call_recording_path']['ro-ro'] = "";
-$text['label-call_recording_path']['ru-ru'] = "Путь";
-$text['label-call_recording_path']['sv-se'] = "";
-$text['label-call_recording_path']['uk-ua'] = "";
-
-$text['description-call_recording_path']['en-us'] = "";
-$text['description-call_recording_path']['ar-eg'] = "";
-$text['description-call_recording_path']['de-at'] = "";
-$text['description-call_recording_path']['de-ch'] = "";
-$text['description-call_recording_path']['de-de'] = "";
-$text['description-call_recording_path']['es-cl'] = "";
-$text['description-call_recording_path']['es-mx'] = "";
-$text['description-call_recording_path']['fr-ca'] = "";
-$text['description-call_recording_path']['fr-fr'] = "";
-$text['description-call_recording_path']['he-il'] = "";
-$text['description-call_recording_path']['it-it'] = "";
-$text['description-call_recording_path']['nl-nl'] = "";
-$text['description-call_recording_path']['pl-pl'] = "";
-$text['description-call_recording_path']['pt-br'] = "";
-$text['description-call_recording_path']['pt-pt'] = "";
-$text['description-call_recording_path']['ro-ro'] = "";
-$text['description-call_recording_path']['ru-ru'] = "";
-$text['description-call_recording_path']['sv-se'] = "";
-$text['description-call_recording_path']['uk-ua'] = "";
-
-$text['label-call_recording_length']['en-us'] = "Length";
-$text['label-call_recording_length']['ar-eg'] = "";
-$text['label-call_recording_length']['de-at'] = "";
-$text['label-call_recording_length']['de-ch'] = "";
-$text['label-call_recording_length']['de-de'] = "";
-$text['label-call_recording_length']['es-cl'] = "";
-$text['label-call_recording_length']['es-mx'] = "";
-$text['label-call_recording_length']['fr-ca'] = "";
-$text['label-call_recording_length']['fr-fr'] = "";
-$text['label-call_recording_length']['he-il'] = "";
-$text['label-call_recording_length']['it-it'] = "";
-$text['label-call_recording_length']['nl-nl'] = "";
-$text['label-call_recording_length']['pl-pl'] = "";
-$text['label-call_recording_length']['pt-br'] = "";
-$text['label-call_recording_length']['pt-pt'] = "";
-$text['label-call_recording_length']['ro-ro'] = "";
-$text['label-call_recording_length']['ru-ru'] = "Длительность";
-$text['label-call_recording_length']['sv-se'] = "";
-$text['label-call_recording_length']['uk-ua'] = "";
-
-$text['description-call_recording_length']['en-us'] = "";
-$text['description-call_recording_length']['ar-eg'] = "";
-$text['description-call_recording_length']['de-at'] = "";
-$text['description-call_recording_length']['de-ch'] = "";
-$text['description-call_recording_length']['de-de'] = "";
-$text['description-call_recording_length']['es-cl'] = "";
-$text['description-call_recording_length']['es-mx'] = "";
-$text['description-call_recording_length']['fr-ca'] = "";
-$text['description-call_recording_length']['fr-fr'] = "";
-$text['description-call_recording_length']['he-il'] = "";
-$text['description-call_recording_length']['it-it'] = "";
-$text['description-call_recording_length']['nl-nl'] = "";
-$text['description-call_recording_length']['pl-pl'] = "";
-$text['description-call_recording_length']['pt-br'] = "";
-$text['description-call_recording_length']['pt-pt'] = "";
-$text['description-call_recording_length']['ro-ro'] = "";
-$text['description-call_recording_length']['ru-ru'] = "";
-$text['description-call_recording_length']['sv-se'] = "";
-$text['description-call_recording_length']['uk-ua'] = "";
-
-$text['label-call_recording_date']['en-us'] = "Date";
-$text['label-call_recording_date']['ar-eg'] = "";
-$text['label-call_recording_date']['de-at'] = "";
-$text['label-call_recording_date']['de-ch'] = "";
-$text['label-call_recording_date']['de-de'] = "";
-$text['label-call_recording_date']['es-cl'] = "";
-$text['label-call_recording_date']['es-mx'] = "";
-$text['label-call_recording_date']['fr-ca'] = "";
-$text['label-call_recording_date']['fr-fr'] = "";
-$text['label-call_recording_date']['he-il'] = "";
-$text['label-call_recording_date']['it-it'] = "";
-$text['label-call_recording_date']['nl-nl'] = "";
-$text['label-call_recording_date']['pl-pl'] = "";
-$text['label-call_recording_date']['pt-br'] = "";
-$text['label-call_recording_date']['pt-pt'] = "";
-$text['label-call_recording_date']['ro-ro'] = "";
-$text['label-call_recording_date']['ru-ru'] = "Дата";
-$text['label-call_recording_date']['sv-se'] = "";
-$text['label-call_recording_date']['uk-ua'] = "";
-
-$text['description-call_recording_date']['en-us'] = "";
-$text['description-call_recording_date']['ar-eg'] = "";
-$text['description-call_recording_date']['de-at'] = "";
-$text['description-call_recording_date']['de-ch'] = "";
-$text['description-call_recording_date']['de-de'] = "";
-$text['description-call_recording_date']['es-cl'] = "";
-$text['description-call_recording_date']['es-mx'] = "";
-$text['description-call_recording_date']['fr-ca'] = "";
-$text['description-call_recording_date']['fr-fr'] = "";
-$text['description-call_recording_date']['he-il'] = "";
-$text['description-call_recording_date']['it-it'] = "";
-$text['description-call_recording_date']['nl-nl'] = "";
-$text['description-call_recording_date']['pl-pl'] = "";
-$text['description-call_recording_date']['pt-br'] = "";
-$text['description-call_recording_date']['pt-pt'] = "";
-$text['description-call_recording_date']['ro-ro'] = "";
-$text['description-call_recording_date']['ru-ru'] = "";
-$text['description-call_recording_date']['sv-se'] = "";
-$text['description-call_recording_date']['uk-ua'] = "";
-
-$text['label-call_direction']['en-us'] = "Direction";
-$text['label-call_direction']['ar-eg'] = "";
-$text['label-call_direction']['de-at'] = "";
-$text['label-call_direction']['de-ch'] = "";
-$text['label-call_direction']['de-de'] = "";
-$text['label-call_direction']['es-cl'] = "";
-$text['label-call_direction']['es-mx'] = "";
-$text['label-call_direction']['fr-ca'] = "";
-$text['label-call_direction']['fr-fr'] = "";
-$text['label-call_direction']['he-il'] = "";
-$text['label-call_direction']['it-it'] = "";
-$text['label-call_direction']['nl-nl'] = "";
-$text['label-call_direction']['pl-pl'] = "";
-$text['label-call_direction']['pt-br'] = "";
-$text['label-call_direction']['pt-pt'] = "";
-$text['label-call_direction']['ro-ro'] = "";
-$text['label-call_direction']['ru-ru'] = "Направление";
-$text['label-call_direction']['sv-se'] = "";
-$text['label-call_direction']['uk-ua'] = "";
-
-$text['description-call_direction']['en-us'] = "";
-$text['description-call_direction']['ar-eg'] = "";
-$text['description-call_direction']['de-at'] = "";
-$text['description-call_direction']['de-ch'] = "";
-$text['description-call_direction']['de-de'] = "";
-$text['description-call_direction']['es-cl'] = "";
-$text['description-call_direction']['es-mx'] = "";
-$text['description-call_direction']['fr-ca'] = "";
-$text['description-call_direction']['fr-fr'] = "";
-$text['description-call_direction']['he-il'] = "";
-$text['description-call_direction']['it-it'] = "";
-$text['description-call_direction']['nl-nl'] = "";
-$text['description-call_direction']['pl-pl'] = "";
-$text['description-call_direction']['pt-br'] = "";
-$text['description-call_direction']['pt-pt'] = "";
-$text['description-call_direction']['ro-ro'] = "";
-$text['description-call_direction']['ru-ru'] = "";
-$text['description-call_direction']['sv-se'] = "";
-$text['description-call_direction']['uk-ua'] = "";
-
-$text['label-call_recording_description']['en-us'] = "Description";
-$text['label-call_recording_description']['ar-eg'] = "";
-$text['label-call_recording_description']['de-at'] = "";
-$text['label-call_recording_description']['de-ch'] = "";
-$text['label-call_recording_description']['de-de'] = "";
-$text['label-call_recording_description']['es-cl'] = "";
-$text['label-call_recording_description']['es-mx'] = "";
-$text['label-call_recording_description']['fr-ca'] = "";
-$text['label-call_recording_description']['fr-fr'] = "";
-$text['label-call_recording_description']['he-il'] = "";
-$text['label-call_recording_description']['it-it'] = "";
-$text['label-call_recording_description']['nl-nl'] = "";
-$text['label-call_recording_description']['pl-pl'] = "";
-$text['label-call_recording_description']['pt-br'] = "";
-$text['label-call_recording_description']['pt-pt'] = "";
-$text['label-call_recording_description']['ro-ro'] = "";
-$text['label-call_recording_description']['ru-ru'] = "Описание";
-$text['label-call_recording_description']['sv-se'] = "";
-$text['label-call_recording_description']['uk-ua'] = "";
-
-$text['description-call_recording_description']['en-us'] = "";
-$text['description-call_recording_description']['ar-eg'] = "";
-$text['description-call_recording_description']['de-at'] = "";
-$text['description-call_recording_description']['de-ch'] = "";
-$text['description-call_recording_description']['de-de'] = "";
-$text['description-call_recording_description']['es-cl'] = "";
-$text['description-call_recording_description']['es-mx'] = "";
-$text['description-call_recording_description']['fr-ca'] = "";
-$text['description-call_recording_description']['fr-fr'] = "";
-$text['description-call_recording_description']['he-il'] = "";
-$text['description-call_recording_description']['it-it'] = "";
-$text['description-call_recording_description']['nl-nl'] = "";
-$text['description-call_recording_description']['pl-pl'] = "";
-$text['description-call_recording_description']['pt-br'] = "";
-$text['description-call_recording_description']['pt-pt'] = "";
-$text['description-call_recording_description']['ro-ro'] = "";
-$text['description-call_recording_description']['ru-ru'] = "";
-$text['description-call_recording_description']['sv-se'] = "";
-$text['description-call_recording_description']['uk-ua'] = "";
-
-$text['label-call_recording_base64']['en-us'] = "Base64";
-$text['label-call_recording_base64']['ar-eg'] = "";
-$text['label-call_recording_base64']['de-at'] = "";
-$text['label-call_recording_base64']['de-ch'] = "";
-$text['label-call_recording_base64']['de-de'] = "";
-$text['label-call_recording_base64']['es-cl'] = "";
-$text['label-call_recording_base64']['es-mx'] = "";
-$text['label-call_recording_base64']['fr-ca'] = "";
-$text['label-call_recording_base64']['fr-fr'] = "";
-$text['label-call_recording_base64']['he-il'] = "";
-$text['label-call_recording_base64']['it-it'] = "";
-$text['label-call_recording_base64']['nl-nl'] = "";
-$text['label-call_recording_base64']['pl-pl'] = "";
-$text['label-call_recording_base64']['pt-br'] = "";
-$text['label-call_recording_base64']['pt-pt'] = "";
-$text['label-call_recording_base64']['ro-ro'] = "";
-$text['label-call_recording_base64']['ru-ru'] = "";
-$text['label-call_recording_base64']['sv-se'] = "";
-$text['label-call_recording_base64']['uk-ua'] = "";
-
-$text['description-call_recording_base64']['en-us'] = "";
-$text['description-call_recording_base64']['ar-eg'] = "";
-$text['description-call_recording_base64']['de-at'] = "";
-$text['description-call_recording_base64']['de-ch'] = "";
-$text['description-call_recording_base64']['de-de'] = "";
-$text['description-call_recording_base64']['es-cl'] = "";
-$text['description-call_recording_base64']['es-mx'] = "";
-$text['description-call_recording_base64']['fr-ca'] = "";
-$text['description-call_recording_base64']['fr-fr'] = "";
-$text['description-call_recording_base64']['he-il'] = "";
-$text['description-call_recording_base64']['it-it'] = "";
-$text['description-call_recording_base64']['nl-nl'] = "";
-$text['description-call_recording_base64']['pl-pl'] = "";
-$text['description-call_recording_base64']['pt-br'] = "";
-$text['description-call_recording_base64']['pt-pt'] = "";
-$text['description-call_recording_base64']['ro-ro'] = "";
-$text['description-call_recording_base64']['ru-ru'] = "";
-$text['description-call_recording_base64']['sv-se'] = "";
-$text['description-call_recording_base64']['uk-ua'] = "";
-
-?>
@@ -1,19 +0,0 @@
-<?php
-
-$apps[$x]['menu'][0]['title']['en-us'] = 'Call Recordings';
-$apps[$x]['menu'][0]['title']['es-cl'] = '';
-$apps[$x]['menu'][0]['title']['fr-fr'] = '';
-$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-$apps[$x]['menu'][0]['title']['pl'] = '';
-$apps[$x]['menu'][0]['title']['sv-se'] = '';
-$apps[$x]['menu'][0]['title']['uk'] = '';
-$apps[$x]['menu'][0]['title']['de-at'] = '';
-$apps[$x]['menu'][0]['uuid'] = 'd5b7bd0e-5e56-4d87-b2d5-7d7b2f7307ef';
-$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-$apps[$x]['menu'][0]['category'] = 'internal';
-$apps[$x]['menu'][0]['path'] = '/app/call_recordings/call_recordings.php';
-$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-//$apps[$x]['menu'][0]['groups'][] = 'admin';
-//$apps[$x]['menu'][0]['groups'][] = 'user';
-
-?>
@@ -1,264 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2017
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permissions
-	require_once "resources/check_auth.php";
-	if (permission_exists('call_recording_add') || permission_exists('call_recording_edit')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//action add or update
-	if (isset($_REQUEST["id"])) {
-		$action = "update";
-		$call_recording_uuid = check_str($_REQUEST["id"]);
-	}
-	else {
-		$action = "add";
-	}
-
-//get http post variables and set them to php variables
-	if (is_array($_POST)) {
-		$call_recording_name = check_str($_POST["call_recording_name"]);
-		$call_recording_path = check_str($_POST["call_recording_path"]);
-		$call_recording_length = check_str($_POST["call_recording_length"]);
-		$call_recording_date = check_str($_POST["call_recording_date"]);
-		$call_direction = check_str($_POST["call_direction"]);
-		$call_recording_description = check_str($_POST["call_recording_description"]);
-		$call_recording_base64 = check_str($_POST["call_recording_base64"]);
-	}
-
-//process the user data and save it to the database
-	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
-
-		//get the uuid from the POST
-			if ($action == "update") {
-				$call_recording_uuid = check_str($_POST["call_recording_uuid"]);
-			}
-
-		//check for all required data
-			$msg = '';
-			if (strlen($call_recording_name) == 0) { $msg .= $text['message-required']." ".$text['label-call_recording_name']."<br>\n"; }
-			//if (strlen($call_recording_path) == 0) { $msg .= $text['message-required']." ".$text['label-call_recording_path']."<br>\n"; }
-			if (strlen($call_recording_length) == 0) { $msg .= $text['message-required']." ".$text['label-call_recording_length']."<br>\n"; }
-			if (strlen($call_recording_date) == 0) { $msg .= $text['message-required']." ".$text['label-call_recording_date']."<br>\n"; }
-			if (strlen($call_direction) == 0) { $msg .= $text['message-required']." ".$text['label-call_direction']."<br>\n"; }
-			//if (strlen($call_recording_description) == 0) { $msg .= $text['message-required']." ".$text['label-call_recording_description']."<br>\n"; }
-			//if (strlen($call_recording_base64) == 0) { $msg .= $text['message-required']." ".$text['label-call_recording_base64']."<br>\n"; }
-			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-				require_once "resources/header.php";
-				require_once "resources/persist_form_var.php";
-				echo "<div align='center'>\n";
-				echo "<table><tr><td>\n";
-				echo $msg."<br />";
-				echo "</td></tr></table>\n";
-				persistformvar($_POST);
-				echo "</div>\n";
-				require_once "resources/footer.php";
-				return;
-			}
-
-		//set the domain_uuid
-				$_POST["domain_uuid"] = $_SESSION["domain_uuid"];
-
-		//add the call_recording_uuid
-			if (strlen($_POST["call_recording_uuid"]) == 0) {
-				$call_recording_uuid = uuid();
-				$_POST["call_recording_uuid"] = $call_recording_uuid;
-			}
-
-		//prepare the array
-			$array['call_recordings'][0] = $_POST;
-
-		//save to the data
-			$database = new database;
-			$database->app_name = 'call_recordings';
-			$database->app_uuid = null;
-			if (strlen($call_recording_uuid) > 0) {
-				$database->uuid($call_recording_uuid);
-			}
-			$database->save($array);
-			$message = $database->message;
-
-		//debug info
-			//echo "<pre>";
-			//print_r($message);
-			//echo "</pre>";
-			//exit;
-
-		//redirect the user
-			if (isset($action)) {
-				if ($action == "add") {
-					$_SESSION["message"] = $text['message-add'];
-				}
-				if ($action == "update") {
-					$_SESSION["message"] = $text['message-update'];
-				}
-				header('Location: call_recording_edit.php?id='.$call_recording_uuid);
-				return;
-			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
-
-//pre-populate the form
-	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
-		$call_recording_uuid = check_str($_GET["id"]);
-		$sql = "select * from v_call_recordings ";
-		$sql .= "where call_recording_uuid = '$call_recording_uuid' ";
-		//$sql .= "and domain_uuid = '$domain_uuid' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		foreach ($result as &$row) {
-			$call_recording_name = $row["call_recording_name"];
-			$call_recording_path = $row["call_recording_path"];
-			$call_recording_length = $row["call_recording_length"];
-			$call_recording_date = $row["call_recording_date"];
-			$call_direction = $row["call_direction"];
-			$call_recording_description = $row["call_recording_description"];
-			$call_recording_base64 = $row["call_recording_base64"];
-		}
-		unset ($prep_statement);
-	}
-
-//show the header
-	require_once "resources/header.php";
-
-//add the calendar
-	echo "<script language='JavaScript' type='text/javascript'>\n";
-	echo "	$(document).ready(function() {\n";
-	echo "		apply_datetimepicker();\n";
-	echo "	});\n";
-	echo "	function apply_datetimepicker() {\n";
-	echo "		$('.datetimepicker').datetimepicker({ format: 'YYYY-MM-DD HH:mm', showTodayButton: true, showClear: true, showClose: true });\n";
-	echo "		$('.datepicker').datetimepicker({ format: 'YYYY-MM-DD', showClear: true, showClose: true });\n";
-	echo "	}\n";
-	echo "</script>\n";
-
-//show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
-	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
-
-	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-call_recording']."</b><br><br></td>\n";
-	echo "<td width='70%' align='right' valign='top'>\n";
-	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='call_recordings.php'\" value='".$text['button-back']."'>";
-	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_recording_name']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_recording_name' maxlength='255' value=\"$call_recording_name\">\n";
-	echo "<br />\n";
-	echo $text['description-call_recording_name']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_recording_path']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_recording_path' maxlength='255' value=\"$call_recording_path\">\n";
-	echo "<br />\n";
-	echo $text['description-call_recording_path']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_recording_length']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "  <input class='formfld' type='text' name='call_recording_length' maxlength='255' value='$call_recording_length'>\n";
-	echo "<br />\n";
-	echo $text['description-call_recording_length']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_recording_date']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "			<input class='formfld datetimepicker' type='text' name='call_recording_date' maxlength='16' value=\"$call_recording_date\">\n";
-	echo "<br />\n";
-	echo $text['description-call_recording_date']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_direction']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_direction' maxlength='255' value=\"$call_direction\">\n";
-	echo "<br />\n";
-	echo $text['description-call_direction']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_recording_description']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='call_recording_description' maxlength='255' value=\"$call_recording_description\">\n";
-	echo "<br />\n";
-	echo $text['description-call_recording_description']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "	<tr>\n";
-	echo "		<td colspan='2' align='right'>\n";
-	if ($action == "update") {
-		echo "				<input type='hidden' name='call_recording_uuid' value='$call_recording_uuid'>\n";
-	}
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "		</td>\n";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</form>";
-	echo "<br /><br />";
-
-//include the footer
-	require_once "resources/footer.php";
-
-?>
@@ -1,301 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2017
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permissions
-	require_once "resources/check_auth.php";
-	if (permission_exists('call_recording_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//get the action
-	if (strlen($_REQUEST["search"]) == 0 && is_array($_POST["call_recordings"])) {
-		$call_recordings = $_POST["call_recordings"];
-		foreach($call_recordings as $row) {
-			if ($row['action'] === 'download') {
-				$action = 'download';
-				break;
-			}
-			if ($row['action'] === 'delete') {
-				$action = 'delete';
-				break;
-			}
-		}
-	}
-
-//download recordings
-	if (permission_exists('call_recording_download_add')) {
-		if ($action == "download") {
-			//download
-				$obj = new call_recording_downloads;
-				$obj->save($call_recordings);
-			//direct the user to the downloads
-				header("Location: ".PROJECT_PATH."/app/call_recording_downloads/call_recording_downloads.php");
-		}
-	}
-
-//delete the recordings
-	if (permission_exists('call_recording_delete')) {
-		if ($action === "delete") {
-			//set the array
-				$call_recordings = $_POST["call_recordings"];
-			//download
-				$obj = new call_recordings;
-				$obj->delete($call_recordings);
-			//delete message
-				messages::add($text['message-delete']);
-		}
-	}
-
-//additional includes
-	require_once "resources/header.php";
-	require_once "resources/paging.php";
-
-//get variables used to control the order
-	$order_by = check_str($_REQUEST["order_by"]);
-	$order = check_str($_REQUEST["order"]);
-
-//set the defaults
-	if (strlen($order_by) == 0) { 
-		$order_by = 'call_recording_date';
-		$order = 'desc';
-	}
-
-//add the search term
-	$search = strtolower(check_str($_REQUEST["search"]));
-	if (strlen($search) > 0) {
-		$sql_search = "and (";
-		$sql_search .= "lower(call_recording_name) like '%".$search."%' ";
-		$sql_search .= "or lower(call_recording_path) like '%".$search."%' ";
-		$sql_search .= "or lower(call_direction) like '%".$search."%' ";
-		$sql_search .= "or lower(call_recording_description) like '%".$search."%' ";
-		$sql_search .= ") ";
-	}
-
-//prepare to page the results
-	$sql = "select count(call_recording_uuid) as num_rows from v_call_recordings ";
-	$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
-	$sql .= $sql_search;
-	$prep_statement = $db->prepare($sql);
-	if ($prep_statement) {
-		$prep_statement->execute();
-		$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-		if ($row['num_rows'] > 0) {
-			$num_rows = $row['num_rows'];
-		}
-		else {
-			$num_rows = '0';
-		}
-	}
-
-//prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "";
-	$page = $_REQUEST['page'];
-	if (strlen($page) == 0) { $page = 0; $_REQUEST['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	$offset = $rows_per_page * $page;
-
-//get the list
-	$sql = "select * from v_call_recordings ";
-	$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
-	$sql .= $sql_search;
-	$sql .= "order by $order_by $order ";
-	$sql .= "limit $rows_per_page offset $offset ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
-
-//alternate the row style
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
-
-//define the checkbox_toggle function
-	echo "<script type=\"text/javascript\">\n";
-	echo "	function checkbox_toggle(item) {\n";
-	echo "		var inputs = document.getElementsByTagName(\"input\");\n";
-	echo "		for (var i = 0, max = inputs.length; i < max; i++) {\n";
-	echo "			if (inputs[i].type === 'checkbox') {\n";
-	echo "				if (document.getElementById('checkbox_all').checked == true) {\n";
-	echo "				inputs[i].checked = true;\n";
-	echo "			}\n";
-	echo "				else {\n";
-	echo "					inputs[i].checked = false;\n";
-	echo "				}\n";
-	echo "			}\n";
-	echo "		}\n";
-	echo "	}\n";
-	echo "</script>\n";
-
-//show the content
-	echo "<form method='post' action=''>\n";
-	echo "<table width='100%' border='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-call_recordings']." (".$num_rows.")</b></td>\n";
-	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
-	if (permission_exists('call_recording_download_add')) {
-		echo "				<button type='submit' class='btn btn-default' id='downloads' name=\"call_recordings[$x][action]\" alt='".$text['button-download']."' onclick=\"document.getElementById('downloads').value='download'\" value=''>".$text['button-downloads']."</span></button>\n";
-		echo "				&nbsp; &nbsp; &nbsp; ";
-	}
-	echo "				<input type='text' class='txt' style='width: 150px' name='search' id='search' value='".$search."'>\n";
-	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
-	echo "			</td>\n";
-	echo "	</tr>\n";
-	echo "	<tr>\n";
-	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$text['title_description-call_recording']."<br /><br />\n";
-	echo "		</td>\n";
-	echo "	</tr>\n";
-	echo "</table>\n";
-
-	//echo "<style>\n";
-	//echo "audio {\n";
-	//echo "    background-color: #ffffff;\n";
-	//echo "    background-color: rgba(0,0,0,0);\n";
-	//echo "    -webkit-border-radius:7px 7px 7px 7px ;\n";
-	//echo "    border-radius:7px 7px 7px 7px ;\n";
-	//echo "}\n";
-	//echo "</style>\n";
-	echo "\n";
-
-	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo "	<th style='width:30px;'>\n";
-	echo "		<input type='checkbox' name='checkbox_all' id='checkbox_all' value='' onclick=\"checkbox_toggle();\">\n";
-	echo "	</th>\n";
-	echo th_order_by('call_recording_name', $text['label-call_recording_name'], $order_by, $order);
-	echo "<th>".$text['label-recording']."</th>\n";
-	//echo th_order_by('call_recording_path', $text['label-play'], $order_by, $order);
-	echo th_order_by('call_recording_length', $text['label-call_recording_length'], $order_by, $order);
-	echo th_order_by('call_recording_date', $text['label-call_recording_date'], $order_by, $order);
-	echo th_order_by('call_direction', $text['label-call_direction'], $order_by, $order);
-	echo th_order_by('call_recording_description', $text['label-call_recording_description'], $order_by, $order);
-	//echo th_order_by('call_recording_base64', $text['label-call_recording_base64'], $order_by, $order);
-	echo "	<td class='list_control_icons'>";
-	if (permission_exists('call_recording_add')) {
-		echo "		<a href='call_recording_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
-	}
-	else {
-		echo "&nbsp;\n";
-	}
-	echo "	</td>\n";
-	echo "<tr>\n";
-
-	if (is_array($result)) {
-		$x = 0;
-		foreach($result as $row) {
-			//if (permission_exists('call_recording_play') && $recording_file_path != '') {
-			//	echo "<tr id='recording_progress_bar_".$row['call_recording_uuid']."' style='display: none3;'><td class='".$row_style[$c]." playback_progress_bar_background' style='padding: 0; border: none;' colspan='".((if_group("admin") || if_group("superadmin") || if_group("cdr")) ? ($col_count - 1) : $col_count)."'><span class='playback_progress_bar' id='recording_progress_".$row['call_recording_uuid']."'></span></td></tr>\n";
-			//}
-			if (permission_exists('call_recording_edit')) {
-				$tr_link = "href='call_recording_edit.php?id=".$row['call_recording_uuid']."'";
-			}
-			echo "<tr ".$tr_link.">\n";
-			echo "	<td valign='top' class='".$row_style[$c]." tr_link_void' style='align: center; padding: 3px 3px 0px 8px;'>\n";
-			echo "		<input type='checkbox' name=\"call_recordings[$x][checked]\" id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('chk_all_".$x."').checked = false; }\">\n";
-			echo "		<input type='hidden' name=\"call_recordings[$x][call_recording_uuid]\" value='".$row['call_recording_uuid']."' />\n";
-			echo "	</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_recording_name']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void' valign='top' align='center' nowrap='nowrap'>\n";
-			//echo "		<audio controls=\"download\" preload=\"metadata\" style=\"width:200px;\">\n";
-			//echo "			<source src=\"download.php?id=".$row['call_recording_uuid']."\" type=\"audio/wav\">\n";
-			//echo "		</audio>\n";
-			//echo "		<a href=\"download.php?id=".$row['call_recording_uuid']."&t=bin\">".$text['label-download']." ".$v_link_label_download."</a>\n";
-			if (file_exists($row['call_recording_path'].'/'.$row['call_recording_name'])) {	
-				if (permission_exists('call_recording_play')) {
-					echo 	"<audio id='recording_audio_".$row['call_recording_uuid']."' style='display: none;' preload='none' ontimeupdate=\"update_progress('".$row['call_recording_uuid']."')\" onended=\"recording_reset('".$row['call_recording_uuid']."');\" src=\"download.php?id=".$row['call_recording_uuid']."\" type='".$recording_type."'></audio>";
-					echo 	"<span id='recording_button_".$row['call_recording_uuid']."' onclick=\"recording_play('".$row['call_recording_uuid']."')\" title='".$text['label-play']." / ".$text['label-pause']."'>".$v_link_label_play."</span>";
-				}
-				if (permission_exists('call_recording_download')) {
-					echo 	"<a href=\"download.php?id=".$row['call_recording_uuid']."&t=bin\" title='".$text['label-download']."'>".$v_link_label_download."</a>";
-				}
-			}
-			echo "	</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."' style=\"\">\n";
-			//echo "		<a href=\"download.php?id=".$row['call_recording_uuid']."&t=bin\">".$text['label-download']." ".$v_link_label_download."</a>\n";
-			//echo "	</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_recording_length']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_recording_date']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_direction']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='row_stylebg'>".$row['call_recording_description']."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['call_recording_base64']."&nbsp;</td>\n";
-			echo "	<td class='list_control_icons'>";
-			if (permission_exists('xml_cdr_details')) {
-				echo "		<a href='/app/xml_cdr/xml_cdr_details.php?uuid=".$row['call_recording_uuid']."' title='".$text['button-view']."'>$v_link_label_view</a>";
-			}
-			if (permission_exists('call_recording_edit')) {
-				echo "<button type='button' class='btn btn-default list_control_icon' name='' alt='".$text['button-edit']."' onclick=\"window.location='call_recording_edit.php?id=".$row['call_recording_uuid']."'\" value='edit'><span class='glyphicon glyphicon-pencil'></span></input>\n";
-			}
-			if (permission_exists('call_recording_delete')) {
-				echo "<button type='submit' class='btn btn-default list_control_icon' name=\"call_recordings[$x][action]\" alt='".$text['button-delete']."' value='delete'><span class='glyphicon glyphicon-remove'></span></button>\n";
-			}
-			echo "	</td>\n";
-			echo "</tr>\n";
-			$x++;
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result, $row_count);
-	} //end if results
-
-	echo "<tr>\n";
-	echo "<td colspan='9' align='left'>\n";
-	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
-	echo "		<td class='list_control_icons'>";
-	if (permission_exists('call_recording_add')) {
-		echo 		"<a href='call_recording_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
-	}
-	else {
-		echo 		"&nbsp;";
-	}
-	echo "		</td>\n";
-	echo "	</tr>\n";
- 	echo "	</table>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-	echo "</table>";
-	echo "</form>\n";
-	echo "<br /><br />";
-
-//include the footer
-	require_once "resources/footer.php";
-
-?>
@@ -1,45 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2016-2017
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permisions
-	require_once "resources/check_auth.php";
-	if (permission_exists('call_recording_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//download
-	$obj = new call_recordings;
-	$obj->download();
-
-?>
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * call_recordings class
- *
- * @method null download
- */
-if (!class_exists('call_recordings')) {
-	class call_recordings {
-
-		public $db;
-
-		/**
-		 * Called when the object is created
-		 */
-		public function __construct() {
-			//connect to the database if not connected
-			if (!$this->db) {
-				require_once "resources/classes/database.php";
-				$database = new database;
-				$database->connect();
-				$this->db = $database->db;
-			}
-		}
-
-		/**
-		 * Called when there are no references to a particular object
-		 * unset the variables used in the class
-		 */
-		public function __destruct() {
-			foreach ($this as $key => $value) {
-				unset($this->$key);
-			}
-		}
-
-		/**
-		 * download the recordings
-		 */
-		public function download() {
-			if (permission_exists('call_recording_play') || permission_exists('call_recording_download')) {
-
-				//cache limiter
-					session_cache_limiter('public');
-
-				//get call recording from database
-					$call_recording_uuid = check_str($_GET['id']);
-					if ($call_recording_uuid != '') {
-						$sql = "select call_recording_name, call_recording_path, call_recording_base64 from v_call_recordings ";
-						$sql .= "where call_recording_uuid = '".$call_recording_uuid."' ";
-						//$sql .= "and domain_uuid = '".$domain_uuid."' \n";
-						$prep_statement = $this->db->prepare($sql);
-						$prep_statement->execute();
-						$call_recordings = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
-						if (is_array($call_recordings)) {
-							foreach($call_recordings as &$row) {
-								$call_recording_name = $row['call_recording_name'];
-								$call_recording_path = $row['call_recording_path'];
-								if ($_SESSION['call_recordings']['storage_type']['text'] == 'base64' && $row['call_recording_base64'] != '') {
-									file_put_contents($path.'/'.$call_recording_name, base64_decode($row['call_recording_base64']));
-								}
-								break;
-							}
-						}
-						unset ($sql, $prep_statement, $call_recordings);
-					}
-
-				//set the path for the directory
-					$default_path = $_SESSION['switch']['call_recordings']['dir']."/".$_SESSION['domain_name'];
-
-				//build full path
-					$full_recording_path = $call_recording_path . '/' . $call_recording_name;
-
-				//download the file
-					if (file_exists($full_recording_path)) {
-						//content-range
-						//if (isset($_SERVER['HTTP_RANGE']))  {
-						//	range_download($full_recording_path);
-						//}
-						ob_clean();
-						$fd = fopen($full_recording_path, "rb");
-						if ($_GET['t'] == "bin") {
-							header("Content-Type: application/force-download");
-							header("Content-Type: application/octet-stream");
-							header("Content-Type: application/download");
-							header("Content-Description: File Transfer");
-						}
-						else {
-							$file_ext = substr($call_recording_name, -3);
-							if ($file_ext == "wav") {
-								header("Content-Type: audio/x-wav");
-							}
-							if ($file_ext == "mp3") {
-								header("Content-Type: audio/mpeg");
-							}
-						}
-						header('Content-Disposition: attachment; filename="'.$call_recording_name.'"');
-						header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-						header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-						// header("Content-Length: " . filesize($full_recording_path));
-						ob_clean();
-						fpassthru($fd);
-					}
-
-				//if base64, remove temp recording file
-					if ($_SESSION['call_recordings']['storage_type']['text'] == 'base64' && $row['call_recording_base64'] != '') {
-						@unlink($full_recording_path);
-					}
-			}
-		} //end download method
-
-		/**
-		 * download the recordings
-		 */
-		public function delete($id) {
-			if (permission_exists('call_recording_delete')) {
-
-				//cache limiter
-					session_cache_limiter('public');
-
-				//delete single call recording
-					if (isset($id) && is_uuid($id)) {
-						$sql = "delete from v_call_recordings ";
-						$sql .= "where call_recording_uuid = '".$id."'; ";
-						$this->db->query($sql);
-						unset($sql);
-					}
-
-				//delete multiple call recordings
-					if (is_array($id)) {
-						//set the array
-							$call_recordings = $id;
-						//debug info
-							//echo "<pre>\n";
-							//print_r($call_recordings);
-							//echo "</pre>\n";
-						//get the action
-							foreach($call_recordings as $row) {
-								if ($row['action'] == 'delete') {
-									$action = 'delete';
-									break;
-								}
-							}
-						//delete the checked rows
-							if ($action == 'delete') {
-								foreach($call_recordings as $row) {
-									if ($row['checked'] == 'true') {
-										//get the information to delete
-											$sql = "select call_recording_name, call_recording_path from v_call_recordings ";
-											$sql .= "where call_recording_uuid = '".$row['call_recording_uuid']."' ";
-											//$sql .= "and domain_uuid = '".$domain_uuid."' \n";
-											$prep_statement = $this->db->prepare(check_sql($sql));
-											$prep_statement->execute();
-											$array = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
-											if (is_array($array)) {
-												foreach($array as &$field) {
-													//delete the file on the file system
-														if (file_exists($field['call_recording_path'].'/'.$field['call_recording_name'])) {
-															unlink($field['call_recording_path'].'/'.$field['call_recording_name']);
-														}
-													//delete call recordings in the database
-														$sql = "delete from v_call_recordings ";
-														$sql .= "where call_recording_uuid = '".$row['call_recording_uuid']."'; ";
-														//echo $sql."\n";
-														$this->db->query($sql);
-														unset($sql);
-												}
-											}
-											unset ($sql, $prep_statement, $id, $array);
-									}
-								}
-								unset($call_recordings);
-							}
-					}
-			}
-		} //end the delete function
-
-	}  //end the class
-}
-
-/*
-$obj = new call_recordings;
-$obj->download('all');
-*/
-
-?>
@@ -5,31 +5,21 @@
 		$apps[$x]['uuid'] = "19806921-e8ed-dcff-b325-dd3e5da4959d";
 		$apps[$x]['category'] = "Switch";;
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Call Forward, Follow Me and Do Not Disturb.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Anrufweiterleitung, Follow Me und Nicht-Stören.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Anrufweiterleitung, Follow Me und Nicht-Stören.";
 		$apps[$x]['description']['es-cl'] = "Reenvio de llamada, Sígueme y No Molestar.";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Renvoi d'appel, Follow Me et ne pas deranger.";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "Desvio de chamadas, Siga-me e Não perturbe (DND).";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Desvio de Chamadas, Seguir-me e Não Perturbar.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "Desvio de chamadas, Siga-me e Não perturbe (DND).";

 	//permission details
-		$y=0;
 		$apps[$x]['permissions'][$y]['name'] = "follow_me";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -44,30 +34,5 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_forward_caller_id";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";

-	//default settings
-		$y=0;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4fedc226-caca-4ebf-b4eb-31de93e5bed3";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "follow_me";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "max_destinations";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_order'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the maximum number of Follow Me Destinations.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ce105d64-2d1b-4d19-ae34-ccb818cc9c6e";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "follow_me";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "timeout";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "30";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_order'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the default Follow Me Timeout value.";
-
-?>
+?>
@@ -1,32 +1,21 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Call Routing";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Call Routing";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "Call Routing";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Call Routing";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "enrutamiento de llamadas";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "routage des appels";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "routage des appels";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Istradamento Chiamate";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "roteamento de chamadas";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Roteamento de chamadas";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Маршрутизация вызовов";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "";
-
-	$apps[$x]['menu'][$y]['uuid'] = "4e4df00b-aafb-45a8-82c1-cdabc921889c";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/calls/calls.php";
-	$apps[$x]['menu'][$y]['groups'][] = "user";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
+	$apps[$x]['menu'][0]['title']['en-us'] = "Call Routing";
+	$apps[$x]['menu'][0]['title']['es-mx'] = "enrutamiento de llamadas";
+	$apps[$x]['menu'][0]['title']['de-de'] = "Call Routing";
+	$apps[$x]['menu'][0]['title']['de-ch'] = "Call Routing";
+	$apps[$x]['menu'][0]['title']['de-at'] = "Call Routing";
+	$apps[$x]['menu'][0]['title']['fr-fr'] = "routage des appels";
+	$apps[$x]['menu'][0]['title']['fr-ca'] = "routage des appels";
+	$apps[$x]['menu'][0]['title']['fr-ch'] = "routage des appels";
+	$apps[$x]['menu'][0]['title']['pt-pt'] = "Roteamento de chamadas";
+	$apps[$x]['menu'][0]['title']['pt-br'] = "roteamento de chamadas";
+	$apps[$x]['menu'][0]['uuid'] = "4e4df00b-aafb-45a8-82c1-cdabc921889c";
+	$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+	$apps[$x]['menu'][0]['category'] = "internal";
+	$apps[$x]['menu'][0]['path'] = "/app/calls/calls.php";
+	$apps[$x]['menu'][0]['groups'][] = "user";
+	$apps[$x]['menu'][0]['groups'][] = "admin";
+	$apps[$x]['menu'][0]['groups'][] = "superadmin";

 ?>
@@ -17,7 +17,7 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2017
+	Portions created by the Initial Developer are Copyright (C) 2008-2016
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
@@ -38,8 +38,9 @@
 		exit;
 	}

-//get the domain_uuid from the session
-	$domain_uuid = $_SESSION['domain_uuid'];
+//get the https values and set as variables
+	$order_by = check_str($_GET["order_by"]);
+	$order = check_str($_GET["order"]);

 //handle search term
 	$search = check_str($_GET["search"]);
@@ -162,9 +163,9 @@
 			$tr_url = PROJECT_PATH."/app/calls/call_edit.php?id=".$row['extension_uuid']."&return_url=".urlencode($_SERVER['REQUEST_URI']);
 			$tr_link = (permission_exists('call_forward') || permission_exists('follow_me') || permission_exists('do_not_disturb')) ? "href='".$tr_url."'" : null;
 			echo "<tr ".$tr_link.">\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'><a ".$tr_link.">".escape($row['extension'])."</a></td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'><a ".$tr_link.">".$row['extension']."</a></td>\n";
 			if (permission_exists('call_forward')) {
-				echo "<td valign='top' class='".$row_style[$c]."'>".(($row['forward_all_enabled'] == 'true') ? escape(format_phone($row['forward_all_destination'])) : '&nbsp;')."</td>";
+				echo "<td valign='top' class='".$row_style[$c]."'>".(($row['forward_all_enabled'] == 'true') ? format_phone($row['forward_all_destination']) : '&nbsp;')."</td>";
 			}
 			if (permission_exists('follow_me')) {
 				if ($row['follow_me_uuid'] != '') {
@@ -194,7 +195,7 @@
 				echo "<td valign='top' class='".$row_style[$c]."'>".(($row['do_not_disturb'] == 'true') ? $text['label-enabled'] : '&nbsp;')."</td>";
 			}
 			if (!$is_included) {
-				echo "<td valign='top' class='row_stylebg hidden-xs'>".escape($row['description'])."&nbsp;</td>\n";
+				echo "<td valign='top' class='row_stylebg hidden-xs'>".$row['description']."&nbsp;</td>\n";
 			}
 			echo "	<td class='list_control_icon'><a href='".$tr_url."' alt='".$text['button-edit']."'>".$v_link_label_edit."</a></td>\n";
 			echo "</tr>\n";
@@ -66,6 +66,83 @@ include "root.php";
 				}
 				unset ($prep_statement);

+			//set the dial string
+				if ($this->forward_all_enabled == "true") {
+					$dial_string = "{presence_id=".$this->forward_all_destination."@".$_SESSION['domain_name'];
+					$dial_string .= ",instant_ringback=true";
+					$dial_string .= ",domain_uuid=".$_SESSION['domain_uuid'];
+					$dial_string .= ",sip_invite_domain=".$_SESSION['domain_name'];
+					$dial_string .= ",domain_name=".$_SESSION['domain_name'];
+					$dial_string .= ",domain=".$_SESSION['domain_name'];
+					$dial_string .= ",extension_uuid=".$this->extension_uuid;
+					$dial_string .= ",toll_allow='".$this->toll_allow."'";
+					$dial_string .=",sip_h_Diversion=<sip:".$this->extension."@".$_SESSION['domain_name'].">;reason=unconditional";
+					if (strlen($this->accountcode) > 0) {
+						$dial_string .= ",sip_h_X-accountcode=".$this->accountcode;
+						$dial_string .= ",accountcode=".$this->accountcode;
+					}
+
+					if (strlen($this->forward_caller_id_uuid) > 0){
+						$sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name from v_destinations where domain_uuid = '$this->domain_uuid' and destination_type = 'inbound' and destination_uuid = '$this->forward_caller_id_uuid'";
+						$prep_statement_caller = $db->prepare($sql_caller);
+						if ($prep_statement_caller) {
+							$prep_statement_caller->execute();
+							$row_caller = $prep_statement_caller->fetch(PDO::FETCH_ASSOC);
+
+							$caller_id_number = $row_caller['destination_caller_id_number'];
+							if(strlen($caller_id_number) == 0){
+								$caller_id_number = $row_caller['destination_number'];
+							}
+							$caller_id_name = $row_caller['destination_caller_id_name'];
+							if(strlen($caller_id_name) == 0){
+								$caller_id_name = $row_caller['destination_description'];
+							}
+
+							if (strlen($caller_id_name) > 0) {
+								$dial_string_caller_id_name = $caller_id_name;
+								$dial_string .= ",origination_caller_id_name=$dial_string_caller_id_name";
+							}
+							if (strlen($caller_id_number) > 0) {
+								$dial_string_caller_id_number = $caller_id_number;
+								$dial_string .= ",origination_caller_id_number=$dial_string_caller_id_number";
+								$dial_string .= ",outbound_caller_id_number=$dial_string_caller_id_number";
+							}
+						}
+					}
+					else{
+						if ($_SESSION['cdr']['call_forward_fix']['boolean'] == "true"){
+							$dial_string .= ",outbound_caller_id_name=".$this->outbound_caller_id_name;
+							$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
+							$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
+							$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+						}
+					}
+
+					$dial_string .= "}";
+					if (extension_exists($this->forward_all_destination)) {
+						$dial_string .= "user/".$this->forward_all_destination."@".$_SESSION['domain_name'];
+					}
+					else {
+						if ($_SESSION['domain']['bridge']['text'] == "outbound" || $_SESSION['domain']['bridge']['text'] == "bridge") {
+							$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $this->forward_all_destination);
+							$dial_string .= $bridge[0];
+						}
+						elseif ($_SESSION['domain']['bridge']['text'] == "lcr") {
+							$dial_string .= "lcr/".$_SESSION['lcr']['profile']['text']."/".$_SESSION['domain_name']."/".$this->forward_all_destination;
+						}
+						elseif ($_SESSION['domain']['bridge']['text'] === "loopback") {
+							$dial_string .= "loopback/".$this->forward_all_destination;
+						}
+						else {
+							$dial_string .= "loopback/".$this->forward_all_destination;
+						}
+					}
+					$this->dial_string = $dial_string;
+				}
+				else {
+					$this->dial_string = '';
+				}
+
 			//update the extension
 				$sql = "update v_extensions set ";
 				if (strlen($this->forward_all_destination) == 0) {
@@ -90,7 +167,7 @@ include "root.php";
 				$db->exec(check_sql($sql));
 				unset($sql);

-			//delete extension from the cache
+			//delete extension from memcache
 				$cache = new cache;
 				$cache->delete("directory:".$this->extension."@".$this->domain_name);
 				if(strlen($this->number_alias) > 0){
@@ -1,82 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2017
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	KonradSC <konrd@yahoo.com>
-*/
-include "root.php";
-
-//define the feature_event_notify class
-	class feature_event_notify {
-
-		public $debug;
-		public $domain_name;
-		public $extension;
-		public $forward_all_destination;
-		public $forward_all_enabled;
-		public $forward_busy_destination;
-		public $forward_busy_enabled;
-		public $forward_no_answer_destination;
-		public $forward_no_answer_enabled;
-		public $do_not_disturb;
-		public $ring_count;
-
-	//feature_event method		
-		public function send_notify() {
-
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				if ($fp) {
-					//get the sip profile name
-						$command = "sofia_contact */".$this->extension."@".$this->domain_name;
-						$contact_string = event_socket_request($fp, "api ".$command);
-						if (substr($contact_string, 0, 5) == "sofia") {
-							$contact_array = explode("/", $contact_string);
-							$sip_profile_name = $contact_array[1];
-						}
-						else {
-							$sip_profile_name = 'internal';
-						}
-					//send the event
-						$event = "sendevent SWITCH_EVENT_PHONE_FEATURE\n";
-						$event .= "profile: ".$sip_profile_name."\n";
-						$event .= "user: ".$this->extension."\n";
-						$event .= "host: ".$this->domain_name."\n";
-						$event .= "device: \n";
-						$event .= "Feature-Event: init\n";
-						$event .= "forward_immediate_enabled: ".$this->forward_all_enabled."\n";
-						$event .= "forward_immediate: ".$this->forward_all_destination."\n";
-						$event .= "forward_busy_enabled: ".$this->forward_busy_enabled."\n";
-						$event .= "forward_busy: ".$this->forward_busy_destination."\n";
-						$event .= "forward_no_answer_enabled: ".$this->forward_no_answer_enabled."\n";
-						$event .= "forward_no_answer: ".$this->forward_no_answer_destination."\n";
-						$event .= "doNotDisturbOn: ".$this->do_not_disturb."\n";
-						$event .= "ringCount: ".$this->ring_count."\n";
-						event_socket_request($fp, $event);
-	
-					fclose($fp);	
-				}
-		} //function
-	
-	} //class
-
-?>
@@ -43,7 +43,6 @@ include "root.php";
 		public $outbound_caller_id_name;
 		public $outbound_caller_id_number;
 		private $extension;
-		private $number_alias;
 		private $toll_allow;

 		public $destination_data_1;
@@ -249,7 +248,6 @@ include "root.php";
 					$this->extension = $row["extension"];
 					$this->accountcode = $row["accountcode"];
 					$this->toll_allow = $row["toll_allow"];
-					$this->number_alias = $row["number_alias"];
 					$this->outbound_caller_id_name = $row["outbound_caller_id_name"];
 					$this->outbound_caller_id_number = $row["outbound_caller_id_number"];
 				}
@@ -268,179 +266,153 @@ include "root.php";
 				}
 				unset ($prep_statement);

-			//set the extension dial string
-				$sql = "select * from v_follow_me_destinations ";
-				$sql .= "where follow_me_uuid = '".$this->follow_me_uuid."' ";
-				$sql .= "order by follow_me_order asc ";
-				$prep_statement_2 = $db->prepare(check_sql($sql));
-				$prep_statement_2->execute();
-				$result = $prep_statement_2->fetchAll(PDO::FETCH_NAMED);
-				$dial_string = "{";
-				if ($this->follow_me_ignore_busy != 'true') {
-					$dial_string .= "fail_on_single_reject=USER_BUSY,";
+			//add follow me
+				if (strlen($follow_me_uuid) == 0) {
+					$this->add();
 				}
-				$dial_string .= "instant_ringback=true,";
-				$dial_string .= "ignore_early_media=true";
-				$dial_string .= ",domain_uuid=".$_SESSION['domain_uuid'];
-				$dial_string .= ",sip_invite_domain=".$_SESSION['domain_name'];
-				$dial_string .= ",domain_name=".$_SESSION['domain_name'];
-				$dial_string .= ",domain=".$_SESSION['domain_name'];
-				$dial_string .= ",extension_uuid=".$this->extension_uuid;
-				$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua";

-				$dial_string_caller_id_name = "\${effective_caller_id_name}";
-				$dial_string_caller_id_number = "\${effective_caller_id_number}";
+				//set the extension dial string
+					$sql = "select * from v_follow_me_destinations ";
+					$sql .= "where follow_me_uuid = '".$this->follow_me_uuid."' ";
+					$sql .= "order by follow_me_order asc ";
+					$prep_statement_2 = $db->prepare(check_sql($sql));
+					$prep_statement_2->execute();
+					$result = $prep_statement_2->fetchAll(PDO::FETCH_NAMED);
+					$dial_string = "{";
+					if ($this->follow_me_ignore_busy != 'true') {
+						$dial_string .= "fail_on_single_reject=USER_BUSY,";
+					}
+					$dial_string .= "instant_ringback=true,";
+					$dial_string .= "ignore_early_media=true";
+					$dial_string .= ",domain_uuid=".$_SESSION['domain_uuid'];
+					$dial_string .= ",sip_invite_domain=".$_SESSION['domain_name'];
+					$dial_string .= ",domain_name=".$_SESSION['domain_name'];
+					$dial_string .= ",domain=".$_SESSION['domain_name'];
+					$dial_string .= ",extension_uuid=".$this->extension_uuid;
+					$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua";

-				if (strlen($this->follow_me_caller_id_uuid) > 0) {
-					$sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name ";
-					$sql_caller .= "from v_destinations ";
-					$sql_caller .= "where domain_uuid = '$this->domain_uuid' ";
-					$sql_caller .= "and destination_type = 'inbound' ";
-					$sql_caller .= "and destination_uuid = '$this->follow_me_caller_id_uuid'";
-					$prep_statement_caller = $db->prepare($sql_caller);
-					if ($prep_statement_caller) {
-						$prep_statement_caller->execute();
-						$row_caller = $prep_statement_caller->fetch(PDO::FETCH_ASSOC);
-						$caller_id_number = $row_caller['destination_caller_id_number'];
-						if(strlen($caller_id_number) == 0){
-							$caller_id_number = $row_caller['destination_number'];
-						}
-						$caller_id_name = $row_caller['destination_caller_id_name'];
-						if(strlen($caller_id_name) == 0){
-							$caller_id_name = $row_caller['destination_description'];
+					$dial_string_caller_id_name = "\${effective_caller_id_name}";
+					$dial_string_caller_id_number = "\${effective_caller_id_number}";
+
+					if (strlen($this->follow_me_caller_id_uuid) > 0){
+						$sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name from v_destinations where domain_uuid = '$this->domain_uuid' and destination_type = 'inbound' and destination_uuid = '$this->follow_me_caller_id_uuid'";
+						$prep_statement_caller = $db->prepare($sql_caller);
+						if ($prep_statement_caller) {
+							$prep_statement_caller->execute();
+							$row_caller = $prep_statement_caller->fetch(PDO::FETCH_ASSOC);
+
+							$caller_id_number = $row_caller['destination_caller_id_number'];
+							if(strlen($caller_id_number) == 0){
+								$caller_id_number = $row_caller['destination_number'];
+							}
+							$caller_id_name = $row_caller['destination_caller_id_name'];
+							if(strlen($caller_id_name) == 0){
+								$caller_id_name = $row_caller['destination_description'];
+							}
+
+							if (strlen($caller_id_name) > 0) {
+								$dial_string_caller_id_name = $caller_id_name;
+							}
+							if (strlen($caller_id_number) > 0) {
+								$dial_string_caller_id_number = $caller_id_number;
+							}
 						}
 					}
-				}

-				//accountcode
-				if (strlen($this->accountcode) == 0) {
-					$dial_string .= ",sip_h_X-accountcode=\${accountcode}";
-				}
-				else {
-					$dial_string .= ",sip_h_X-accountcode=".$this->accountcode;
-					$dial_string .= ",accountcode=".$this->accountcode;
-				}
-
-				//toll allow
-				if ($this->toll_allow != '') {
-					$dial_string .= ",toll_allow='".$this->toll_allow."'";
-				}
-
-				$dial_string .= "}";
-				$x = 0;
-				if (is_array($result)) foreach ($result as &$row) {
-					if ($x > 0) {
-						$dial_string .= ",";
-					}
-					if (($presence_id = extension_presence_id($row["follow_me_destination"])) !== false) {
-						//set the dial string
-						// using here `sofia_contact` instead of `user/` allows add registered device
-						// so you can make follow me for extension `100` like `100` and avoid recursion
-						// but it ignores DND/CallForwad settings
-						if (strlen($_SESSION['domain']['dial_string']['text']) == 0) {
-							$dial_string .= "[";
-							$dial_string .= "presence_id=".$presence_id."@".$_SESSION['domain_name'].',';
-							if ($row["follow_me_prompt"] == "1") {
-								$dial_string .= "group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";
-							}
-							$dial_string .= "leg_delay_start=".$row["follow_me_delay"].",";
-							$dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]";
-							$dial_string .= "\${sofia_contact(".$row["follow_me_destination"]."@".$_SESSION['domain_name'].")}";
-						}
-						else {
-							//get the session dial string
-							$dial_string_template = $_SESSION['domain']['dial_string']['text'];
-
-							//replace the variables with the values
-							$dial_string_template = str_replace("sip_invite_domain=\${domain_name},", "", $dial_string_template);
-							$dial_string_template = str_replace("presence_id=\${dialed_user}@\${dialed_domain}", "", $dial_string_template);
-							$dial_string_template = str_replace("\${dialed_user}", $row["follow_me_destination"], $dial_string_template);
-							$dial_string_template = str_replace("\${dialed_domain}", $_SESSION['domain_name'], $dial_string_template);
-							$dial_string_template = str_replace("\${call_timeout}", $row["follow_me_timeout"], $dial_string_template);
-							$dial_string_template = str_replace("\${leg_timeout}", $row["follow_me_timeout"], $dial_string_template);
-
-							//seperate the variables from the bridge statement
-							preg_match_all('/{((?:[^{}]|(?R))*)}/', $dial_string_template, $matches, PREG_PATTERN_ORDER);
-							$dial_string_variables = $matches[1][0];
-							$dial_string_bridge = $matches[1][1];
-
-							//add to the dial string
-							$dial_string .= "[";
-							$dial_string .= $dial_string_variables;
-
-							//group confirm
-							if ($row["follow_me_prompt"] == "1") {
-								$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true";
-							}
-							$dial_string .= "]";
-							$dial_string .= "\${".$dial_string_bridge."}";
-						}
+					if (strlen($this->cid_name_prefix) > 0) {
+						$dial_string .= ",origination_caller_id_name=".$this->cid_name_prefix."$dial_string_caller_id_name";
 					}
 					else {
-						$presence_id = extension_presence_id($this->extension, $this->number_alias);
-						$dial_string .= "[presence_id=".$presence_id."@".$_SESSION['domain_name'];
-
-						//set the caller id
-						if ($_SESSION['cdr']['follow_me_fix']['boolean'] == "true") {
-							if (strlen($this->outbound_caller_id_name) > 0) {
-								$dial_string .= ",origination_caller_id_name=".$this->cid_name_prefix.$this->outbound_caller_id_name;
-								$dial_string .= ",effective_caller_id_name=".$this->cid_name_prefix.$this->outbound_caller_id_name;
-							}
-							if (strlen($this->outbound_caller_id_number) > 0) {
-								$dial_string .= ",origination_caller_id_number=".$this->cid_number_prefix.$this->outbound_caller_id_number;
-								$dial_string .= ",effective_caller_id_number=".$this->cid_number_prefix.$this->outbound_caller_id_number;
-							}
-						}
-						else {
-							if (strlen($caller_id_number) > 0) {
-								//set the caller id if it is set
-								if (strlen($caller_id_name) > 0) { 
-									$dial_string .= ",origination_caller_id_name=".$this->cid_name_prefix.$caller_id_name; 
-									$dial_string .= ",effective_caller_id_name=".$this->cid_name_prefix.$caller_id_name;
-								}
-								$dial_string .= ",origination_caller_id_number=".$this->cid_number_prefix.$caller_id_number;
-								$dial_string .= ",effective_caller_id_number=".$this->cid_number_prefix.$caller_id_number;
-							}
-							else {
-								//set the outbound caller id number if the caller id number is a user
-							        $dial_string .=',origination_caller_id_number=${cond(${from_user_exists} == true ? ${outbound_caller_id_number} : ${origination_caller_id_number})}';
-								$dial_string .=',effective_caller_id_number=${cond(${from_user_exists} == true ? ${outbound_caller_id_number} : ${effective_caller_id_number})}';
-								$dial_string .=',origination_caller_id_name=${cond(${from_user_exists} == true ? ${outbound_caller_id_name} : ${origination_caller_id_name})}';
-								$dial_string .=',effective_caller_id_name=${cond(${from_user_exists} == true ? ${outbound_caller_id_name} : ${effective_caller_id_name})}';
-							}
-						}
-
-						if ($row["follow_me_prompt"] == "1") {
-							$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";
-						}
-						$dial_string .= ",leg_delay_start=".$row["follow_me_delay"];
-						$dial_string .= ",leg_timeout=".$row["follow_me_timeout"]."]";
-						if (is_numeric($row["follow_me_destination"])) {
-							if ($_SESSION['domain']['bridge']['text'] == "outbound" || $_SESSION['domain']['bridge']['text'] == "bridge") {
-								$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]);
-								$dial_string .= $bridge[0];
-							}
-							elseif ($_SESSION['domain']['bridge']['text'] == "loopback") {
-								$dial_string .= "loopback/".$row["follow_me_destination"]."/".$_SESSION['domain_name'];
-							}
-							elseif ($_SESSION['domain']['bridge']['text'] == "lcr") {
-								$dial_string .= "lcr/".$_SESSION['lcr']['profile']['text']."/".$_SESSION['domain_name']."/".$row["follow_me_destination"];
-							}
-							else {
-								$dial_string .= "loopback/".$row["follow_me_destination"]."/".$_SESSION['domain_name'];
-							}
-						}
-						else {
-							$dial_string .= $row["follow_me_destination"];
-						}
+						$dial_string .= ",origination_caller_id_name=$dial_string_caller_id_name";
 					}
-					$x++;
-				}
-				$dial_string = str_replace(",]", "]", $dial_string);
-				$this->dial_string = $dial_string;
+
+					if (strlen($this->cid_number_prefix) > 0) {
+						//$dial_string .= ",origination_caller_id_number=".$this->cid_number_prefix."";
+					$dial_string .= ",origination_caller_id_number=".$this->cid_number_prefix."$dial_string_caller_id_number";
+					}
+					else {
+						$dial_string .= ",origination_caller_id_number=$dial_string_caller_id_number";
+					}
+
+					if (strlen($this->accountcode) > 0) {
+						$dial_string .= ",sip_h_X-accountcode=".$this->accountcode;
+						$dial_string .= ",accountcode=".$this->accountcode;
+					}
+					$dial_string .= ",toll_allow='".$this->toll_allow."'";
+					$dial_string .= "}";
+					$x = 0;
+					if (is_array($result)) foreach ($result as &$row) {
+						if ($x > 0) {
+							$dial_string .= ",";
+						}
+						if (extension_exists($row["follow_me_destination"])) {
+							//set the dial string
+							if (strlen($_SESSION['domain']['dial_string']['text']) == 0) {
+								$dial_string .= "[";
+								$dial_string .= "outbound_caller_id_number=$dial_string_caller_id_number,";
+								$dial_string .= "presence_id=".$row["follow_me_destination"]."@".$_SESSION['domain_name'].",";
+								if ($row["follow_me_prompt"] == "1") {
+									$dial_string .= "group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";
+								}
+								$dial_string .= "leg_delay_start=".$row["follow_me_delay"].",";
+								$dial_string .= "leg_timeout=".$row["follow_me_timeout"]."]";
+								$dial_string .= "\${sofia_contact(".$row["follow_me_destination"]."@".$_SESSION['domain_name'].")}";
+							}
+							else {
+								$replace_value = $row["follow_me_destination"];
+								if ($row["follow_me_prompt"] == "1") {
+									$replace_value .= "[group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true]";
+								}
+								$local_dial_string = $_SESSION['domain']['dial_string']['text'];
+								$local_dial_string = str_replace("\${dialed_user}", $replace_value, $local_dial_string);
+								$local_dial_string = str_replace("\${dialed_domain}", $_SESSION['domain_name'], $local_dial_string);
+								$local_dial_string = str_replace("\${call_timeout}", $row["follow_me_timeout"], $local_dial_string);
+								$local_dial_string = str_replace("\${leg_timeout}", $row["follow_me_timeout"], $local_dial_string);
+								$dial_string .= $local_dial_string;
+							}
+						}
+						else {
+							$dial_string .= "[";
+							if ($_SESSION['cdr']['follow_me_fix']['boolean'] == "true"){
+								$dial_string .= "outbound_caller_id_name=".$this->outbound_caller_id_name;
+								$dial_string .= ",outbound_caller_id_number=".$this->outbound_caller_id_number;
+								$dial_string .= ",origination_caller_id_name=".$this->outbound_caller_id_name;
+								$dial_string .= ",origination_caller_id_number=".$this->outbound_caller_id_number;
+							}
+							else{
+								$dial_string .= "outbound_caller_id_number=$dial_string_caller_id_number";
+							}
+							$dial_string .= ",presence_id=".$this->extension."@".$_SESSION['domain_name'];
+							if ($row["follow_me_prompt"] == "1") {
+								$dial_string .= ",group_confirm_key=exec,group_confirm_file=lua confirm.lua,confirm=true,";
+							}
+							$dial_string .= ",leg_delay_start=".$row["follow_me_delay"];
+							$dial_string .= ",leg_timeout=".$row["follow_me_timeout"]."]";
+							if (is_numeric($row["follow_me_destination"])) {
+								if ($_SESSION['domain']['bridge']['text'] == "outbound" || $_SESSION['domain']['bridge']['text'] == "bridge") {
+									$bridge = outbound_route_to_bridge ($_SESSION['domain_uuid'], $row["follow_me_destination"]);
+									$dial_string .= $bridge[0];
+								}
+								elseif ($_SESSION['domain']['bridge']['text'] == "loopback") {
+									$dial_string .= "loopback/".$row["follow_me_destination"]."/".$_SESSION['domain_name'];
+								}
+								elseif ($_SESSION['domain']['bridge']['text'] == "lcr") {
+									$dial_string .= "lcr/".$_SESSION['lcr']['profile']['text']."/".$_SESSION['domain_name']."/".$row["follow_me_destination"];
+								}
+								else {
+									$dial_string .= "loopback/".$row["follow_me_destination"]."/".$_SESSION['domain_name'];
+								}
+							}
+							else {
+								$dial_string .= $row["follow_me_destination"];
+							}
+						}
+						$x++;
+					}
+					$this->dial_string = $dial_string;

 				$sql  = "update v_follow_me set ";
-				$sql .= "dial_string = '".check_str($this->dial_string)."' ";
+				$sql .= "dial_string = '".$this->dial_string."' ";
 				$sql .= "where domain_uuid = '".$this->domain_uuid."' ";
 				$sql .= "and follow_me_uuid = '".$this->follow_me_uuid."' ";
 				if ($this->debug) {
@@ -5,49 +5,39 @@
 		$apps[$x]['uuid'] = "ec8530a9-903a-469d-3717-281f798b9ef6";
 		$apps[$x]['category'] = "Switch";;
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Active channels on the system.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Aktive Kanäle auf dem System.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Aktive Kanäle auf dem System.";
 		$apps[$x]['description']['es-cl'] = "Canales activos en el sistema.";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Channels actifs sur le système";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "Canais ativos no sistema.";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Canais ativos no sistema.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "Активные каналы в системе";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "Canais ativos no sistema.";

 	//permission details
-		$y=0;
 		$apps[$x]['permissions'][0]['name'] = "call_active_view";
 		$apps[$x]['permissions'][0]['menu']['uuid'] = "eba3d07f-dd5c-6b7b-6880-493b44113ade";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][0]['groups'][] = "admin";
-		//$y++;
+
 		//$apps[$x]['permissions'][1]['name'] = "call_active_transfer";
 		//$apps[$x]['permissions'][1]['groups'][] = "superadmin";
-		$y++;
+
 		$apps[$x]['permissions'][2]['name'] = "call_active_hangup";
 		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][2]['groups'][] = "admin";
-		//$y++;
+
 		//$apps[$x]['permissions'][3]['name'] = "call_active_park";
 		//$apps[$x]['permissions'][3]['groups'][] = "superadmin";
-		//$y++;
+
 		//$apps[$x]['permissions'][4]['name'] = "call_active_rec";
 		//$apps[$x]['permissions'][4]['groups'][] = "superadmin";
-		$y++;
+
 		$apps[$x]['permissions'][5]['name'] = "call_active_all";
 		$apps[$x]['permissions'][5]['groups'][] = "superadmin";

@@ -1,684 +1,373 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC

 $text['title-2']['en-us'] = "Active Extensions";
-$text['title-2']['ar-eg'] = "";
-$text['title-2']['de-at'] = "Aktive Nebenstellen"; //copied from de-de
-$text['title-2']['de-ch'] = "Aktive Nebenstellen"; //copied from de-de
-$text['title-2']['de-de'] = "Aktive Nebenstellen";
 $text['title-2']['es-cl'] = "Extensiones Activas";
-$text['title-2']['es-mx'] = "Extensiones Activas"; //copied from es-cl
-$text['title-2']['fr-ca'] = "Extensions Actives"; //copied from fr-fr
 $text['title-2']['fr-fr'] = "Extensions Actives";
-$text['title-2']['he-il'] = "שלוחה פעילה";
-$text['title-2']['it-it'] = "Interni Attivi";
-$text['title-2']['nl-nl'] = "";
-$text['title-2']['pl-pl'] = "Aktywne numery wewnętrzne";
-$text['title-2']['pt-br'] = "Ramais ativos";
 $text['title-2']['pt-pt'] = "Extensões Ativas";
-$text['title-2']['ro-ro'] = "";
-$text['title-2']['ru-ru'] = "Активные внутренние номера";
+$text['title-2']['pt-br'] = "Ramais ativos";
+$text['title-2']['pl'] = "Aktywne numery wewnętrzne";
 $text['title-2']['sv-se'] = "Aktiva anknytningar";
-$text['title-2']['uk-ua'] = "Активні розширення";
+$text['title-2']['uk'] = "Активні розширення";
+$text['title-2']['de-at'] = "Aktive Nebenstellen";
+$text['title-2']['he'] = "שלוחה פעילה";

 $text['title']['en-us'] = "Active Calls";
-$text['title']['ar-eg'] = "";
-$text['title']['de-at'] = "Aktive Gespräche"; //copied from de-de
-$text['title']['de-ch'] = "Aktive Gespräche"; //copied from de-de
-$text['title']['de-de'] = "Aktive Gespräche";
 $text['title']['es-cl'] = "Llamadas Activas";
-$text['title']['es-mx'] = "Llamadas Activas"; //copied from es-cl
-$text['title']['fr-ca'] = "Communications Actives"; //copied from fr-fr
 $text['title']['fr-fr'] = "Communications Actives";
-$text['title']['he-il'] = "הגדרת חשבון";
-$text['title']['it-it'] = "Chiamate Attive";
-$text['title']['nl-nl'] = "";
-$text['title']['pl-pl'] = "Aktywne Rozmowy";
-$text['title']['pt-br'] = "Configurações da Conta";
 $text['title']['pt-pt'] = "Chamadas Ativas";
-$text['title']['ro-ro'] = "";
-$text['title']['ru-ru'] = "Активные вызовы";
+$text['title']['pt-br'] = "Configurações da Conta";
+$text['title']['pl'] = "Aktywne Rozmowy";
 $text['title']['sv-se'] = "Aktiva Samtal";
-$text['title']['uk-ua'] = "Активні дзвінки";
+$text['title']['uk'] = "Активні дзвінки";
+$text['title']['de-at'] = "Aktive Gespräche";
+$text['title']['he'] = "הגדרת חשבון";

 $text['label-time']['en-us'] = "Time";
-$text['label-time']['ar-eg'] = "";
-$text['label-time']['de-at'] = "Zeit"; //copied from de-de
-$text['label-time']['de-ch'] = "Zeit"; //copied from de-de
-$text['label-time']['de-de'] = "Zeit";
 $text['label-time']['es-cl'] = "Tiempo";
-$text['label-time']['es-mx'] = "Tiempo"; //copied from es-cl
-$text['label-time']['fr-ca'] = "Temps"; //copied from fr-fr
 $text['label-time']['fr-fr'] = "Temps";
-$text['label-time']['he-il'] = "אזור זמן";
-$text['label-time']['it-it'] = "Tempo";
-$text['label-time']['nl-nl'] = "";
-$text['label-time']['pl-pl'] = "Strefa czasowa";
-$text['label-time']['pt-br'] = "Fuso Horário";
 $text['label-time']['pt-pt'] = "Tempo";
-$text['label-time']['ro-ro'] = "";
-$text['label-time']['ru-ru'] = "Время";
+$text['label-time']['pt-br'] = "Fuso Horário";
+$text['label-time']['pl'] = "Strefa czasowa";
 $text['label-time']['sv-se'] = "Tid";
-$text['label-time']['uk-ua'] = "Час";
+$text['label-time']['uk'] = "Час";
+$text['label-time']['de-at'] = "Zeit";
+$text['label-time']['he'] = "אזור זמן";

 $text['label-stop']['en-us'] = "stop record";
-$text['label-stop']['ar-eg'] = "";
-$text['label-stop']['de-at'] = "Stoppe Aufnahme"; //copied from de-de
-$text['label-stop']['de-ch'] = "Stoppe Aufnahme"; //copied from de-de
-$text['label-stop']['de-de'] = "Stoppe Aufnahme";
 $text['label-stop']['es-cl'] = "terminar grabación";
-$text['label-stop']['es-mx'] = "terminar grabación"; //copied from es-cl
-$text['label-stop']['fr-ca'] = "arrêter l'enregistrement"; //copied from fr-fr
 $text['label-stop']['fr-fr'] = "arrêter l'enregistrement";
-$text['label-stop']['he-il'] = "הפסק הקלטה";
-$text['label-stop']['it-it'] = "stop registra";
-$text['label-stop']['nl-nl'] = "";
-$text['label-stop']['pl-pl'] = "zatrzymaj nagrywanie";
-$text['label-stop']['pt-br'] = "Parar";
 $text['label-stop']['pt-pt'] = "parar de gravar";
-$text['label-stop']['ro-ro'] = "";
-$text['label-stop']['ru-ru'] = "остановить запись";
+$text['label-stop']['pt-br'] = "Parar";
+$text['label-stop']['pl'] = "zatrzymaj nagrywanie";
 $text['label-stop']['sv-se'] = "Stoppa inspelning";
-$text['label-stop']['uk-ua'] = "Зупинити запис";
+$text['label-stop']['uk'] = "Зупинити запис";
+$text['label-stop']['de-at'] = "Stoppe Aufnahme";
+$text['label-stop']['he'] = "הפסק הקלטה";

 $text['label-status']['en-us'] = "Status";
-$text['label-status']['ar-eg'] = "";
-$text['label-status']['de-at'] = "Status"; //copied from de-de
-$text['label-status']['de-ch'] = "Status"; //copied from de-de
-$text['label-status']['de-de'] = "Status";
 $text['label-status']['es-cl'] = "Estado";
-$text['label-status']['es-mx'] = "Estado"; //copied from es-cl
-$text['label-status']['fr-ca'] = "Etat"; //copied from fr-fr
 $text['label-status']['fr-fr'] = "Etat";
-$text['label-status']['he-il'] = "סטטוס";
-$text['label-status']['it-it'] = "Stato";
-$text['label-status']['nl-nl'] = "";
-$text['label-status']['pl-pl'] = "Status";
-$text['label-status']['pt-br'] = "Estado"; //copied from pt-pt
 $text['label-status']['pt-pt'] = "Estado";
-$text['label-status']['ro-ro'] = "";
-$text['label-status']['ru-ru'] = "Статус";
+$text['label-status']['pt-br'] = "Estado";
+$text['label-status']['pl'] = "Status";
 $text['label-status']['sv-se'] = "Status";
-$text['label-status']['uk-ua'] = "Статус";
+$text['label-status']['uk'] = "Статус";
+$text['label-status']['de-at'] = "Status";
+$text['label-status']['he'] = "סטטוס";

 $text['label-start']['en-us'] = "start record";
-$text['label-start']['ar-eg'] = "";
-$text['label-start']['de-at'] = "Starte Aufnahme"; //copied from de-de
-$text['label-start']['de-ch'] = "Starte Aufnahme"; //copied from de-de
-$text['label-start']['de-de'] = "Starte Aufnahme";
 $text['label-start']['es-cl'] = "iniciar grabación";
-$text['label-start']['es-mx'] = "iniciar grabación"; //copied from es-cl
-$text['label-start']['fr-ca'] = "commencer l'enregistrement"; //copied from fr-fr
 $text['label-start']['fr-fr'] = "commencer l'enregistrement";
-$text['label-start']['he-il'] = "התחל הקלטה";
-$text['label-start']['it-it'] = "registra";
-$text['label-start']['nl-nl'] = "";
-$text['label-start']['pl-pl'] = "rozpocznij nagrywanie";
-$text['label-start']['pt-br'] = "Iniciar";
 $text['label-start']['pt-pt'] = "iniciar a gravação";
-$text['label-start']['ro-ro'] = "";
-$text['label-start']['ru-ru'] = "начать запись";
+$text['label-start']['pt-br'] = "Iniciar";
+$text['label-start']['pl'] = "rozpocznij nagrywanie";
 $text['label-start']['sv-se'] = "Starta inspelning";
-$text['label-start']['uk-ua'] = "Запустити запис";
+$text['label-start']['uk'] = "Запустити запис";
+$text['label-start']['de-at'] = "Starte Aufnahme";
+$text['label-start']['he'] = "התחל הקלטה";

 $text['label-secure']['en-us'] = "Secure";
-$text['label-secure']['ar-eg'] = "";
-$text['label-secure']['de-at'] = "Sicher"; //copied from de-de
-$text['label-secure']['de-ch'] = "Sicher"; //copied from de-de
-$text['label-secure']['de-de'] = "Sicher";
 $text['label-secure']['es-cl'] = "Seguro";
-$text['label-secure']['es-mx'] = "Seguro"; //copied from es-cl
-$text['label-secure']['fr-ca'] = "Securisé"; //copied from fr-fr
 $text['label-secure']['fr-fr'] = "Securisé";
-$text['label-secure']['he-il'] = "מאובטח";
-$text['label-secure']['it-it'] = "Sicura";
-$text['label-secure']['nl-nl'] = "";
-$text['label-secure']['pl-pl'] = "Bezpieczny";
-$text['label-secure']['pt-br'] = "Seguro"; //copied from pt-pt
 $text['label-secure']['pt-pt'] = "Seguro";
-$text['label-secure']['ro-ro'] = "";
-$text['label-secure']['ru-ru'] = "Безопасный";
+$text['label-secure']['pt-br'] = "Seguro";
+$text['label-secure']['pl'] = "Bezpieczny";
 $text['label-secure']['sv-se'] = "Skydda";
-$text['label-secure']['uk-ua'] = "Захищено";
+$text['label-secure']['uk'] = "Захищено";
+$text['label-secure']['de-at'] = "Sicher";
+$text['label-secure']['he'] = "מאובטח";

 $text['label-refresh_pause']['en-us'] = "Pause Refresh";
-$text['label-refresh_pause']['ar-eg'] = "";
-$text['label-refresh_pause']['de-at'] = "Seite neu laden deaktivieren"; //copied from de-de
-$text['label-refresh_pause']['de-ch'] = "Seite neu laden deaktivieren"; //copied from de-de
-$text['label-refresh_pause']['de-de'] = "Seite neu laden deaktivieren";
 $text['label-refresh_pause']['es-cl'] = "Actualizar Pausa";
-$text['label-refresh_pause']['es-mx'] = "Actualizar Pausa"; //copied from es-cl
-$text['label-refresh_pause']['fr-ca'] = "Pause Actualiser"; //copied from fr-fr
-$text['label-refresh_pause']['fr-fr'] = "Pause Actualiser";
-$text['label-refresh_pause']['he-il'] = "עצור רענון";
-$text['label-refresh_pause']['it-it'] = "Pausa";
-$text['label-refresh_pause']['nl-nl'] = "";
-$text['label-refresh_pause']['pl-pl'] = "Pauzuj odÅ›wieÅ¼anie";
-$text['label-refresh_pause']['pt-br'] = "Pausar atualizaÃ§Ã£o";
 $text['label-refresh_pause']['pt-pt'] = "Pausa Atualizar";
-$text['label-refresh_pause']['ro-ro'] = "";
-$text['label-refresh_pause']['ru-ru'] = "Приостановить обновление";
-$text['label-refresh_pause']['sv-se'] = "Paus Uppdatera";
-$text['label-refresh_pause']['uk-ua'] = "пауза Оновити";
+$text['label-refresh_pause']['fr-fr'] = "Pause Actualiser";
+$text['label-refresh_pause']['pt-br'] = "Pausar atualizaÃ§Ã£o";
+$text['label-refresh_pause']['pl'] = "Pauzuj odÅ›wieÅ¼anie";
+$text['label-refresh_pause']['uk'] = "пауза Оновити";
+$text['label-refresh_pause']['de-at'] = "Seite neu laden deaktivieren";
+$text['label-refresh_pause']['he'] = "עצור רענון";

 $text['label-refresh_enable']['en-us'] = "Enable Refresh";
-$text['label-refresh_enable']['ar-eg'] = "";
-$text['label-refresh_enable']['de-at'] = "Seite neu laden aktivieren"; //copied from de-de
-$text['label-refresh_enable']['de-ch'] = "Seite neu laden aktivieren"; //copied from de-de
-$text['label-refresh_enable']['de-de'] = "Seite neu laden aktivieren";
 $text['label-refresh_enable']['es-cl'] = "Activar Actualizar";
-$text['label-refresh_enable']['es-mx'] = "Activar Actualizar"; //copied from es-cl
-$text['label-refresh_enable']['fr-ca'] = "Activer Actualiser"; //copied from fr-fr
-$text['label-refresh_enable']['fr-fr'] = "Activer Actualiser";
-$text['label-refresh_enable']['he-il'] = "אפשר רענון";
-$text['label-refresh_enable']['it-it'] = "Riprendi";
-$text['label-refresh_enable']['nl-nl'] = "";
-$text['label-refresh_enable']['pl-pl'] = "WÅ‚Ä…cz odÅ›wieÅ¼anie";
-$text['label-refresh_enable']['pt-br'] = "Habilitar atualizaÃ§Ã£o";
 $text['label-refresh_enable']['pt-pt'] = "Habilitar Atualização";
-$text['label-refresh_enable']['ro-ro'] = "";
-$text['label-refresh_enable']['ru-ru'] = "Включить обновление";
-$text['label-refresh_enable']['sv-se'] = "Aktivera Uppdatering";
-$text['label-refresh_enable']['uk-ua'] = "включити Оновити";
+$text['label-refresh_enable']['fr-fr'] = "Activer Actualiser";
+$text['label-refresh_enable']['pt-br'] = "Habilitar atualizaÃ§Ã£o";
+$text['label-refresh_enable']['pl'] = "WÅ‚Ä…cz odÅ›wieÅ¼anie";
+$text['label-refresh_enable']['uk'] = "включити Оновити";
+$text['label-refresh_enable']['de-at'] = "Seite neu laden aktivieren";
+$text['label-refresh_enable']['he'] = "אפשר רענון";

 $text['label-profile']['en-us'] = "Profile";
-$text['label-profile']['ar-eg'] = "";
-$text['label-profile']['de-at'] = "Profil"; //copied from de-de
-$text['label-profile']['de-ch'] = "Profil"; //copied from de-de
-$text['label-profile']['de-de'] = "Profil";
 $text['label-profile']['es-cl'] = "Perfil";
-$text['label-profile']['es-mx'] = "Perfil"; //copied from es-cl
-$text['label-profile']['fr-ca'] = "Profile"; //copied from fr-fr
 $text['label-profile']['fr-fr'] = "Profile";
-$text['label-profile']['he-il'] = "פרופיל";
-$text['label-profile']['it-it'] = "Profilo";
-$text['label-profile']['nl-nl'] = "";
-$text['label-profile']['pl-pl'] = "Profil";
-$text['label-profile']['pt-br'] = "Perfil"; //copied from pt-pt
 $text['label-profile']['pt-pt'] = "Perfil";
-$text['label-profile']['ro-ro'] = "";
-$text['label-profile']['ru-ru'] = "Профиль";
+$text['label-profile']['pt-br'] = "Perfil";
+$text['label-profile']['pl'] = "Profil";
 $text['label-profile']['sv-se'] = "Profil";
-$text['label-profile']['uk-ua'] = "Профіль";
+$text['label-profile']['uk'] = "Профіль";
+$text['label-profile']['de-at'] = "Profil";
+$text['label-profile']['he'] = "פרופיל";

 $text['label-park-extension']['en-us'] = "Park";
-$text['label-park-extension']['ar-eg'] = "";
-$text['label-park-extension']['de-at'] = "Parken"; //copied from de-de
-$text['label-park-extension']['de-ch'] = "Parken"; //copied from de-de
-$text['label-park-extension']['de-de'] = "Parken";
 $text['label-park-extension']['es-cl'] = "Parquear Extensión";
-$text['label-park-extension']['es-mx'] = "Parquear Extensión"; //copied from es-cl
-$text['label-park-extension']['fr-ca'] = "parquer"; //copied from fr-fr
 $text['label-park-extension']['fr-fr'] = "parquer";
-$text['label-park-extension']['he-il'] = "חניה";
-$text['label-park-extension']['it-it'] = "Parcheggia";
-$text['label-park-extension']['nl-nl'] = "";
-$text['label-park-extension']['pl-pl'] = "Parkowanie";
-$text['label-park-extension']['pt-br'] = "Extensão estacionamento";
 $text['label-park-extension']['pt-pt'] = "Parquear Extensão";
-$text['label-park-extension']['ro-ro'] = "";
-$text['label-park-extension']['ru-ru'] = "Парковка";
+$text['label-park-extension']['pt-br'] = "Extensão estacionamento";
+$text['label-park-extension']['pl'] = "Parkowanie";
 $text['label-park-extension']['sv-se'] = "Parkera";
-$text['label-park-extension']['uk-ua'] = "Паркувати";
+$text['label-park-extension']['uk'] = "Паркувати";
+$text['label-park-extension']['de-at'] = "Parken";
+$text['label-park-extension']['he'] = "חניה";

 $text['label-park']['en-us'] = "park";
-$text['label-park']['ar-eg'] = "";
-$text['label-park']['de-at'] = "parken"; //copied from de-de
-$text['label-park']['de-ch'] = "parken"; //copied from de-de
-$text['label-park']['de-de'] = "parken";
 $text['label-park']['es-cl'] = "parquear";
-$text['label-park']['es-mx'] = "parquear"; //copied from es-cl
-$text['label-park']['fr-ca'] = "parquer"; //copied from fr-fr
 $text['label-park']['fr-fr'] = "parquer";
-$text['label-park']['he-il'] = "חניה";
-$text['label-park']['it-it'] = "parcheggia";
-$text['label-park']['nl-nl'] = "";
-$text['label-park']['pl-pl'] = "parkowanie";
-$text['label-park']['pt-br'] = "Estacionamento";
 $text['label-park']['pt-pt'] = "parquear";
-$text['label-park']['ro-ro'] = "";
-$text['label-park']['ru-ru'] = "парковка";
-$text['label-park']['sv-se'] = "parkera";
-$text['label-park']['uk-ua'] = "паркувати";
+$text['label-park']['pt-br'] = "Estacionamento";
+$text['label-park']['pl'] = "parkowanie";
+$text['label-park']['sv-se'] = "Parkera";
+$text['label-park']['uk'] = "паркувати";
+$text['label-park']['de-at'] = "Parken";
+$text['label-park']['he'] = "חניה";

 $text['label-opt']['en-us'] = "Options";
-$text['label-opt']['ar-eg'] = "";
-$text['label-opt']['de-at'] = "Optionen"; //copied from de-de
-$text['label-opt']['de-ch'] = "Optionen"; //copied from de-de
-$text['label-opt']['de-de'] = "Optionen";
 $text['label-opt']['es-cl'] = "Opciones";
-$text['label-opt']['es-mx'] = "Opciones"; //copied from es-cl
-$text['label-opt']['fr-ca'] = "Options"; //copied from fr-fr
 $text['label-opt']['fr-fr'] = "Options";
-$text['label-opt']['he-il'] = "אפשרויות";
-$text['label-opt']['it-it'] = "Opzioni";
-$text['label-opt']['nl-nl'] = "";
-$text['label-opt']['pl-pl'] = "Opcje";
-$text['label-opt']['pt-br'] = "Opções"; //copied from pt-pt
 $text['label-opt']['pt-pt'] = "Opções";
-$text['label-opt']['ro-ro'] = "";
-$text['label-opt']['ru-ru'] = "Опции";
+$text['label-opt']['pt-br'] = "Opções";
+$text['label-opt']['pl'] = "Opcje";
 $text['label-opt']['sv-se'] = "Alternativ";
-$text['label-opt']['uk-ua'] = "Опції";
+$text['label-opt']['uk'] = "Опції";
+$text['label-opt']['de-at'] = "Optionen";
+$text['label-opt']['he'] = "אפשרויות";

 $text['label-number']['en-us'] = "Number";
-$text['label-number']['ar-eg'] = "";
-$text['label-number']['de-at'] = "Nummer"; //copied from de-de
-$text['label-number']['de-ch'] = "Nummer"; //copied from de-de
-$text['label-number']['de-de'] = "Nummer";
 $text['label-number']['es-cl'] = "Número";
-$text['label-number']['es-mx'] = "Número"; //copied from es-cl
-$text['label-number']['fr-ca'] = "Numéro"; //copied from fr-fr
 $text['label-number']['fr-fr'] = "Numéro";
-$text['label-number']['he-il'] = "מספר";
-$text['label-number']['it-it'] = "Numero";
-$text['label-number']['nl-nl'] = "";
-$text['label-number']['pl-pl'] = "Numer";
-$text['label-number']['pt-br'] = "Número";
 $text['label-number']['pt-pt'] = "Numero";
-$text['label-number']['ro-ro'] = "";
-$text['label-number']['ru-ru'] = "Номер";
+$text['label-number']['pt-br'] = "Número";
+$text['label-number']['pl'] = "Numer";
 $text['label-number']['sv-se'] = "Nummer";
-$text['label-number']['uk-ua'] = "Номер";
+$text['label-number']['uk'] = "Номер";
+$text['label-number']['de-at'] = "Nummer";
+$text['label-number']['he'] = "מספר";

 $text['label-message']['en-us'] = "Message";
-$text['label-message']['ar-eg'] = "";
-$text['label-message']['de-at'] = "Nachricht"; //copied from de-de
-$text['label-message']['de-ch'] = "Nachricht"; //copied from de-de
-$text['label-message']['de-de'] = "Nachricht";
 $text['label-message']['es-cl'] = "Mensaje";
-$text['label-message']['es-mx'] = "Mensaje"; //copied from es-cl
-$text['label-message']['fr-ca'] = "Message"; //copied from fr-fr
 $text['label-message']['fr-fr'] = "Message";
-$text['label-message']['he-il'] = "הודעה";
-$text['label-message']['it-it'] = "Messaggio";
-$text['label-message']['nl-nl'] = "";
-$text['label-message']['pl-pl'] = "Wiadomość";
-$text['label-message']['pt-br'] = "Mensagem"; //copied from pt-pt
 $text['label-message']['pt-pt'] = "Mensagem";
-$text['label-message']['ro-ro'] = "";
-$text['label-message']['ru-ru'] = "Сообщение";
+$text['label-message']['pt-br'] = "Mensagem";
+$text['label-message']['pl'] = "Wiadomość";
 $text['label-message']['sv-se'] = "Meddelande";
-$text['label-message']['uk-ua'] = "Повідомлення";
+$text['label-message']['uk'] = "Повідомлення";
+$text['label-message']['de-at'] = "Nachricht";
+$text['label-message']['he'] = "הודעה";

 $text['label-hangup']['en-us'] = "Hangup";
-$text['label-hangup']['ar-eg'] = "";
-$text['label-hangup']['de-at'] = "Auflegen"; //copied from de-de
-$text['label-hangup']['de-ch'] = "Auflegen"; //copied from de-de
-$text['label-hangup']['de-de'] = "Auflegen";
 $text['label-hangup']['es-cl'] = "Terminar";
-$text['label-hangup']['es-mx'] = "Terminar"; //copied from es-cl
-$text['label-hangup']['fr-ca'] = "Raccrocher"; //copied from fr-fr
 $text['label-hangup']['fr-fr'] = "Raccrocher";
-$text['label-hangup']['he-il'] = "ניתוק";
-$text['label-hangup']['it-it'] = "Chiudi";
-$text['label-hangup']['nl-nl'] = "";
-$text['label-hangup']['pl-pl'] = "Zakończ rozmowę";
-$text['label-hangup']['pt-br'] = "Desligar";
 $text['label-hangup']['pt-pt'] = "Terminar";
-$text['label-hangup']['ro-ro'] = "";
-$text['label-hangup']['ru-ru'] = "Завершить";
+$text['label-hangup']['pt-br'] = "Desligar";
+$text['label-hangup']['pl'] = "Zakończ rozmowę";
 $text['label-hangup']['sv-se'] = "Avsluta";
-$text['label-hangup']['uk-ua'] = "Розірвати";
+$text['label-hangup']['uk'] = "Розірвати";
+$text['label-hangup']['de-at'] = "Auflegen";
+$text['label-hangup']['he'] = "ניתוק";

 $text['label-ext']['en-us'] = "Ext";
-$text['label-ext']['ar-eg'] = "";
-$text['label-ext']['de-at'] = "Nst"; //copied from de-de
-$text['label-ext']['de-ch'] = "Nst"; //copied from de-de
-$text['label-ext']['de-de'] = "Nst";
 $text['label-ext']['es-cl'] = "Extensión";
-$text['label-ext']['es-mx'] = "Extensión"; //copied from es-cl
-$text['label-ext']['fr-ca'] = "extension"; //copied from fr-fr
 $text['label-ext']['fr-fr'] = "extension";
-$text['label-ext']['he-il'] = "שלוחה";
-$text['label-ext']['it-it'] = "Int.";
-$text['label-ext']['nl-nl'] = "";
-$text['label-ext']['pl-pl'] = "Numer wewnętrzny";
-$text['label-ext']['pt-br'] = "Extensão"; //copied from pt-pt
 $text['label-ext']['pt-pt'] = "Extensão";
-$text['label-ext']['ro-ro'] = "";
-$text['label-ext']['ru-ru'] = "Вн.";
+$text['label-ext']['pt-br'] = "Extensão";
+$text['label-ext']['pl'] = "Numer wewnętrzny";
 $text['label-ext']['sv-se'] = "Ank";
-$text['label-ext']['uk-ua'] = "Ext ";
+$text['label-ext']['uk'] = "Ext ";
+$text['label-ext']['de-at'] = "Nst";
+$text['label-ext']['he'] = "שלוחה";

 $text['label-domain']['en-us'] = "Domain";
-$text['label-domain']['ar-eg'] = "";
-$text['label-domain']['de-at'] = "Domäne"; //copied from de-de
-$text['label-domain']['de-ch'] = "Domäne"; //copied from de-de
-$text['label-domain']['de-de'] = "Domäne";
 $text['label-domain']['es-cl'] = "Dominio";
-$text['label-domain']['es-mx'] = "Dominio"; //copied from es-cl
-$text['label-domain']['fr-ca'] = "Domaine"; //copied from fr-fr
-$text['label-domain']['fr-fr'] = "Domaine";
-$text['label-domain']['he-il'] = "תחום";
-$text['label-domain']['it-it'] = "Dominio";
-$text['label-domain']['nl-nl'] = "";
-$text['label-domain']['pl-pl'] = "Domena";
-$text['label-domain']['pt-br'] = "Dominio";
 $text['label-domain']['pt-pt'] = "Domínio";
-$text['label-domain']['ro-ro'] = "";
-$text['label-domain']['ru-ru'] = "Домен";
-$text['label-domain']['sv-se'] = "Domän";
-$text['label-domain']['uk-ua'] = "Домен";
+$text['label-domain']['fr-fr'] = "Domaine";
+$text['label-domain']['pt-br'] = "Dominio";
+$text['label-domain']['pl'] = "Domena";
+$text['label-domain']['uk'] = "Домен";
+$text['label-domain']['de-at'] = "Domain";
+$text['label-domain']['he'] = "תחום";

 $text['label-destination']['en-us'] = "Dest";
-$text['label-destination']['ar-eg'] = "";
-$text['label-destination']['de-at'] = "Ziel"; //copied from de-de
-$text['label-destination']['de-ch'] = "Ziel"; //copied from de-de
-$text['label-destination']['de-de'] = "Ziel";
 $text['label-destination']['es-cl'] = "Destino";
-$text['label-destination']['es-mx'] = "Destino"; //copied from es-cl
-$text['label-destination']['fr-ca'] = "Dest"; //copied from fr-fr
 $text['label-destination']['fr-fr'] = "Dest";
-$text['label-destination']['he-il'] = "יעד";
-$text['label-destination']['it-it'] = "Dest";
-$text['label-destination']['nl-nl'] = "";
-$text['label-destination']['pl-pl'] = "Destynacja";
-$text['label-destination']['pt-br'] = "Número de destino";
 $text['label-destination']['pt-pt'] = "Destino";
-$text['label-destination']['ro-ro'] = "";
-$text['label-destination']['ru-ru'] = "Назн.";
+$text['label-destination']['pt-br'] = "Número de destino";
+$text['label-destination']['pl'] = "Destynacja";
 $text['label-destination']['sv-se'] = "Dest";
-$text['label-destination']['uk-ua'] = "Номер";
+$text['label-destination']['uk'] = "Номер";
+$text['label-destination']['de-at'] = "Ziel";
+$text['label-destination']['he'] = "יעד";

 $text['label-created']['en-us'] = "Created";
-$text['label-created']['ar-eg'] = "";
-$text['label-created']['de-at'] = "Erstellt"; //copied from de-de
-$text['label-created']['de-ch'] = "Erstellt"; //copied from de-de
-$text['label-created']['de-de'] = "Erstellt";
 $text['label-created']['es-cl'] = "Creado";
-$text['label-created']['es-mx'] = "Creado"; //copied from es-cl
-$text['label-created']['fr-ca'] = "Créé"; //copied from fr-fr
 $text['label-created']['fr-fr'] = "Créé";
-$text['label-created']['he-il'] = "נוצר";
-$text['label-created']['it-it'] = "Creata";
-$text['label-created']['nl-nl'] = "";
-$text['label-created']['pl-pl'] = "Utworzno";
-$text['label-created']['pt-br'] = "Criado"; //copied from pt-pt
 $text['label-created']['pt-pt'] = "Criado";
-$text['label-created']['ro-ro'] = "";
-$text['label-created']['ru-ru'] = "Создан";
+$text['label-created']['pt-br'] = "Criado";
+$text['label-created']['pl'] = "Utworzno";
 $text['label-created']['sv-se'] = "Skapad";
-$text['label-created']['uk-ua'] = "Створено";
+$text['label-created']['uk'] = "Створено";
+$text['label-created']['de-at'] = "Geöffnet";
+$text['label-created']['he'] = "נוצר";

 $text['label-codec']['en-us'] = "Read / Write Codec";
-$text['label-codec']['ar-eg'] = "";
-$text['label-codec']['de-at'] = "Lese / Schreib Codec"; //copied from de-de
-$text['label-codec']['de-ch'] = "Lese / Schreib Codec"; //copied from de-de
-$text['label-codec']['de-de'] = "Lese / Schreib Codec";
 $text['label-codec']['es-cl'] = "Codec de Lectura / Escritura ";
-$text['label-codec']['es-mx'] = "Codec de Lectura / Escritura "; //copied from es-cl
-$text['label-codec']['fr-ca'] = "décode/encode"; //copied from fr-fr
 $text['label-codec']['fr-fr'] = "décode/encode";
-$text['label-codec']['he-il'] = "קריאה / כתיבה codec";
-$text['label-codec']['it-it'] = "Codec Lett./Scrit.";
-$text['label-codec']['nl-nl'] = "";
-$text['label-codec']['pl-pl'] = "Kodek read/write";
-$text['label-codec']['pt-br'] = "Codec da leitura / escrita";
 $text['label-codec']['pt-pt'] = "Codec de Leitura / Escrita ";
-$text['label-codec']['ro-ro'] = "";
-$text['label-codec']['ru-ru'] = "Кодек Чтение / Запись";
+$text['label-codec']['pt-br'] = "Codec da leitura / escrita";
+$text['label-codec']['pl'] = "Kodek read/write";
 $text['label-codec']['sv-se'] = "Läs/Skriv Codec";
-$text['label-codec']['uk-ua'] = "Кодеки читання/запису";
+$text['label-codec']['uk'] = "Кодеки читання/запису";
+$text['label-codec']['de-at'] = "Lese / Schreib Codec";
+$text['label-codec']['he'] = "קריאה / כתיבה codec";

 $text['label-cid-number']['en-us'] = "CID Number";
-$text['label-cid-number']['ar-eg'] = "";
-$text['label-cid-number']['de-at'] = "Anrufer Nummer"; //copied from de-de
-$text['label-cid-number']['de-ch'] = "Anrufer Nummer"; //copied from de-de
-$text['label-cid-number']['de-de'] = "Anrufer Nummer";
 $text['label-cid-number']['es-cl'] = "Número CID";
-$text['label-cid-number']['es-mx'] = "Número CID"; //copied from es-cl
-$text['label-cid-number']['fr-ca'] = "Numéro Appelant"; //copied from fr-fr
 $text['label-cid-number']['fr-fr'] = "Numéro Appelant";
-$text['label-cid-number']['he-il'] = "זהוי מספר";
-$text['label-cid-number']['it-it'] = "Numero CID";
-$text['label-cid-number']['nl-nl'] = "";
-$text['label-cid-number']['pl-pl'] = "Prezentacja numeru dzwoniącego";
-$text['label-cid-number']['pt-br'] = "Número CID"; //copied from pt-pt
 $text['label-cid-number']['pt-pt'] = "Número CID";
-$text['label-cid-number']['ro-ro'] = "";
-$text['label-cid-number']['ru-ru'] = "CID Номер";
+$text['label-cid-number']['pt-br'] = "Número CID";
+$text['label-cid-number']['pl'] = "Prezentacja numeru dzwoniącego";
 $text['label-cid-number']['sv-se'] = "CID, nummerspresentation";
-$text['label-cid-number']['uk-ua'] = "CID Номер";
+$text['label-cid-number']['uk'] = "CID Номер";
+$text['label-cid-number']['de-at'] = "Anrufer Nummer";
+$text['label-cid-number']['he'] = "זהוי מספר";

 $text['label-cid-name']['en-us'] = "CID Name";
-$text['label-cid-name']['ar-eg'] = "";
-$text['label-cid-name']['de-at'] = "Anrufer Name"; //copied from de-de
-$text['label-cid-name']['de-ch'] = "Anrufer Name"; //copied from de-de
-$text['label-cid-name']['de-de'] = "Anrufer Name";
 $text['label-cid-name']['es-cl'] = "Nombre CID";
-$text['label-cid-name']['es-mx'] = "Nombre CID"; //copied from es-cl
-$text['label-cid-name']['fr-ca'] = "Nom Appelant"; //copied from fr-fr
 $text['label-cid-name']['fr-fr'] = "Nom Appelant";
-$text['label-cid-name']['he-il'] = "זהוי שם";
-$text['label-cid-name']['it-it'] = "Nome CID";
-$text['label-cid-name']['nl-nl'] = "";
-$text['label-cid-name']['pl-pl'] = "Prezentacja nazwy dzwoniącego";
-$text['label-cid-name']['pt-br'] = "Nome CID"; //copied from pt-pt
 $text['label-cid-name']['pt-pt'] = "Nome CID";
-$text['label-cid-name']['ro-ro'] = "";
-$text['label-cid-name']['ru-ru'] = "CID Имя";
+$text['label-cid-name']['pt-br'] = "Nome CID";
+$text['label-cid-name']['pl'] = "Prezentacja nazwy dzwoniącego";
 $text['label-cid-name']['sv-se'] = "CID namnpresentation";
-$text['label-cid-name']['uk-ua'] = "CID Ім’я";
+$text['label-cid-name']['uk'] = "CID Ім’я";
+$text['label-cid-name']['de-at'] = "Anrufer Name";
+$text['label-cid-name']['he'] = "זהוי שם";

 $text['label-app']['en-us'] = "Application";
-$text['label-app']['ar-eg'] = "";
-$text['label-app']['de-at'] = "Anwendung"; //copied from de-de
-$text['label-app']['de-ch'] = "Anwendung"; //copied from de-de
-$text['label-app']['de-de'] = "Anwendung";
 $text['label-app']['es-cl'] = "Aplicación";
-$text['label-app']['es-mx'] = "Aplicación"; //copied from es-cl
-$text['label-app']['fr-ca'] = "Application"; //copied from fr-fr
 $text['label-app']['fr-fr'] = "Application";
-$text['label-app']['he-il'] = "אפליקציה";
-$text['label-app']['it-it'] = "Applicazione";
-$text['label-app']['nl-nl'] = "";
-$text['label-app']['pl-pl'] = "Aplikacja";
-$text['label-app']['pt-br'] = "Aplicação"; //copied from pt-pt
 $text['label-app']['pt-pt'] = "Aplicação";
-$text['label-app']['ro-ro'] = "";
-$text['label-app']['ru-ru'] = "Приложение";
+$text['label-app']['pt-br'] = "Aplicação";
+$text['label-app']['pl'] = "Aplikacja";
 $text['label-app']['sv-se'] = "Ansökan";
-$text['label-app']['uk-ua'] = "Додаток";
+$text['label-app']['uk'] = "Додаток";
+$text['label-app']['de-at'] = "Anwendung";
+$text['label-app']['he'] = "אפליקציה";

 $text['description-2']['en-us'] = "Use this to view all extensions and monitor and interact with active calls.";
-$text['description-2']['ar-eg'] = "";
-$text['description-2']['de-at'] = "Benutzen Sie die Funktionen um alle Nebenstellen anzuzeigen, zu überwachen und aktive Gespräche zu steuern."; //copied from de-de
-$text['description-2']['de-ch'] = "Benutzen Sie die Funktionen um alle Nebenstellen anzuzeigen, zu überwachen und aktive Gespräche zu steuern."; //copied from de-de
-$text['description-2']['de-de'] = "Benutzen Sie die Funktionen um alle Nebenstellen anzuzeigen, zu überwachen und aktive Gespräche zu steuern.";
 $text['description-2']['es-cl'] = "Utilice este menú para ver todas las extensiones, monitorear e interactuar con las llamadas activas.";
-$text['description-2']['es-mx'] = "Utilice este menú para ver todas las extensiones, monitorear e interactuar con las llamadas activas."; //copied from es-cl
-$text['description-2']['fr-ca'] = "Voir toutes les extensions, superviser et interagir avec les Communications Actives."; //copied from fr-fr
 $text['description-2']['fr-fr'] = "Voir toutes les extensions, superviser et interagir avec les Communications Actives.";
-$text['description-2']['he-il'] = "";
-$text['description-2']['it-it'] = "Usa questo servizio per vedere lo stato degli interni, monitorare e interagire con le chiamate.";
-$text['description-2']['nl-nl'] = "";
-$text['description-2']['pl-pl'] = "Użyj tej opcji, aby zobaczyć wszystkie numery wewnętrzne i monitorować interakcję z aktywnymi rozmowami.";
-$text['description-2']['pt-br'] = "A informação contem a origem, destino, duração e outros detalhes úteis da chamada.";
 $text['description-2']['pt-pt'] = "Utilize este menu para ver todas as extensões, monitorizar e interagir com as chamadas activas.";
-$text['description-2']['ro-ro'] = "";
-$text['description-2']['ru-ru'] = "Используйте для просмотра всех внутренних номеров и мониторинга и взаимодействия с активными вызовами.";
+$text['description-2']['pt-br'] = "A informação contem a origem, destino, duração e outros detalhes úteis da chamada.";
+$text['description-2']['pl'] = "Użyj tej opcji, aby zobaczyć wszystkie numery wewnętrzne i monitorować interakcję z aktywnymi rozmowami.";
 $text['description-2']['sv-se'] = "Använd detta för att se alla anknytningar och monitorera och hantera aktiva samtal.";
-$text['description-2']['uk-ua'] = "Використовуйте це, щоб переглянути всі розширення, контролювати і взаємодіяти з активними викликами.";
+$text['description-2']['uk'] = "Використовуйте це, щоб переглянути всі розширення, контролювати і взаємодіяти з активними викликами.";
+$text['description-2']['de-at'] = "Benutzen Sie die Funktionen um alle Nebenstellen anzuzeigen, zu überwachen und aktive Gespräche zu steuern.";
+$text['description-2']['he'] = "";

 $text['description']['en-us'] = "Use this to monitor and interact with the active calls.";
-$text['description']['ar-eg'] = "";
-$text['description']['de-at'] = "Benutzen Sie die Funktionen um aktive Gespräche zu steuern."; //copied from de-de
-$text['description']['de-ch'] = "Benutzen Sie die Funktionen um aktive Gespräche zu steuern."; //copied from de-de
-$text['description']['de-de'] = "Benutzen Sie die Funktionen um aktive Gespräche zu steuern.";
 $text['description']['es-cl'] = "Utilice este menú para monitorear e interactuar con las llamadas activas.";
-$text['description']['es-mx'] = "Utilice este menú para monitorear e interactuar con las llamadas activas."; //copied from es-cl
-$text['description']['fr-ca'] = "Superviser et interagir avec les Communications Actives."; //copied from fr-fr
 $text['description']['fr-fr'] = "Superviser et interagir avec les Communications Actives.";
-$text['description']['he-il'] = "ערוך את פרטי החשבון";
-$text['description']['it-it'] = "Usa questo servizio per monitorare e interagire con le chiamate attive.";
-$text['description']['nl-nl'] = "";
-$text['description']['pl-pl'] = "Użyć tej opcji do monitorowania i interakcji z aktywnymi rozmowami.";
-$text['description']['pt-br'] = "Editar informações da conta.";
 $text['description']['pt-pt'] = "Utilize este menu para monitorizar e interagir com as chamadas activas.";
-$text['description']['ro-ro'] = "";
-$text['description']['ru-ru'] = "Используйте для отслеживания и взаимодействия с активными вызовами.";
+$text['description']['pt-br'] = "Editar informações da conta.";
+$text['description']['pl'] = "Użyć tej opcji do monitorowania i interakcji z aktywnymi rozmowami.";
 $text['description']['sv-se'] = "Använd detta för att monitorera och hantera aktiva samtal.";
-$text['description']['uk-ua'] = "Використовуйте це, щоб контролювати і взаємодіяти з активними викликами.";
+$text['description']['uk'] = "Використовуйте це, щоб контролювати і взаємодіяти з активними викликами.";
+$text['description']['de-at'] = "Benutzen Sie die Funktionen um aktive Gespräche zu steuern.";
+$text['description']['he'] = "ערוך את פרטי החשבון";

 $text['confirm-socket']['en-us'] = "Connection to Event Socket failed.";
-$text['confirm-socket']['ar-eg'] = "";
-$text['confirm-socket']['de-at'] = "Verbindung zum Event-Socket fehlgeschlagen."; //copied from de-de
-$text['confirm-socket']['de-ch'] = "Verbindung zum Event-Socket fehlgeschlagen."; //copied from de-de
-$text['confirm-socket']['de-de'] = "Verbindung zum Event-Socket fehlgeschlagen.";
 $text['confirm-socket']['es-cl'] = "Conexión con socket fallida.";
-$text['confirm-socket']['es-mx'] = "Conexión con socket fallida."; //copied from es-cl
-$text['confirm-socket']['fr-ca'] = "la Connexion au Event Socket a échoué."; //copied from fr-fr
 $text['confirm-socket']['fr-fr'] = "la Connexion au Event Socket a échoué.";
-$text['confirm-socket']['he-il'] = "";
-$text['confirm-socket']['it-it'] = "Connessione alla Event Socket fallita.";
-$text['confirm-socket']['nl-nl'] = "";
-$text['confirm-socket']['pl-pl'] = "Polaczenie do  Event Socket nie powiodło się";
-$text['confirm-socket']['pt-br'] = "A conexão ao evento socket falhou";
 $text['confirm-socket']['pt-pt'] = "A conexão ao Event Socket falhou.";
-$text['confirm-socket']['ro-ro'] = "";
-$text['confirm-socket']['ru-ru'] = "Не удалось подключиться к сокету событий.";
+$text['confirm-socket']['pt-br'] = "A conexão ao evento socket falhou";
+$text['confirm-socket']['pl'] = "Polaczenie do  Event Socket nie powiodło się";
 $text['confirm-socket']['sv-se'] = "Anslutning till 'Event Socket' misslyckades";
-$text['confirm-socket']['uk-ua'] = "Помилка підключення до сокета подій";
+$text['confirm-socket']['uk'] = "Помилка підключення до сокета подій";
+$text['confirm-socket']['de-at'] = "Verbindung zum Event Socket fehlgeschlagen.";
+$text['confirm-socket']['he'] = "";

 $text['confirm-hangup']['en-us'] = "Do you really want to hangup this call?";
-$text['confirm-hangup']['ar-eg'] = "";
-$text['confirm-hangup']['de-at'] = "Wollen Sie dieses Gespräch wirklich beenden?"; //copied from de-de
-$text['confirm-hangup']['de-ch'] = "Wollen Sie dieses Gespräch wirklich beenden?"; //copied from de-de
-$text['confirm-hangup']['de-de'] = "Wollen Sie dieses Gespräch wirklich beenden?";
 $text['confirm-hangup']['es-cl'] = "¿Realmente desea terminar esta llamada?";
-$text['confirm-hangup']['es-mx'] = "¿Realmente desea terminar esta llamada?"; //copied from es-cl
-$text['confirm-hangup']['fr-ca'] = "Voulez-vous vraiment raccrocher cette communication?"; //copied from fr-fr
 $text['confirm-hangup']['fr-fr'] = "Voulez-vous vraiment raccrocher cette communication?";
-$text['confirm-hangup']['he-il'] = "";
-$text['confirm-hangup']['it-it'] = "Vuoi veramente chiudere questa chiamata?";
-$text['confirm-hangup']['nl-nl'] = "";
-$text['confirm-hangup']['pl-pl'] = "Czy na pewno chcesz się rozłączyć tę rozmowę?";
-$text['confirm-hangup']['pt-br'] = "Deseja realmente finalizar essa chamada?";
 $text['confirm-hangup']['pt-pt'] = "Deseja realmente terminar esta chamada?";
-$text['confirm-hangup']['ro-ro'] = "";
-$text['confirm-hangup']['ru-ru'] = "Вы действительно хотите завершить вызов?";
+$text['confirm-hangup']['pt-br'] = "Deseja realmente finalizar essa chamada?";
+$text['confirm-hangup']['pl'] = "Czy na pewno chcesz się rozłączyć tę rozmowę?";
 $text['confirm-hangup']['sv-se'] = "Vill du verkligen avsluta detta samtal";
-$text['confirm-hangup']['uk-ua'] = "Ви дійсно бажаєте розірвати дзвінок?";
+$text['confirm-hangup']['uk'] = "Ви дійсно бажаєте розірвати дзвінок?";
+$text['confirm-hangup']['de-at'] = "Wollen Sie dieses Gespräch wirklich beenden?";
+$text['confirm-hangup']['he'] = "";

 $text['check-onbreak-status']['en-us'] = "On Break";
-$text['check-onbreak-status']['ar-eg'] = "";
-$text['check-onbreak-status']['de-at'] = "Auf Pause"; //copied from de-de
-$text['check-onbreak-status']['de-ch'] = "Auf Pause"; //copied from de-de
-$text['check-onbreak-status']['de-de'] = "Auf Pause";
 $text['check-onbreak-status']['es-cl'] = "En Pausa";
-$text['check-onbreak-status']['es-mx'] = "En Pausa"; //copied from es-cl
-$text['check-onbreak-status']['fr-ca'] = "En Pause"; //copied from fr-fr
 $text['check-onbreak-status']['fr-fr'] = "En Pause";
-$text['check-onbreak-status']['he-il'] = "בהפסקה";
-$text['check-onbreak-status']['it-it'] = "In Pausa";
-$text['check-onbreak-status']['nl-nl'] = "";
-$text['check-onbreak-status']['pl-pl'] = "Na przerwie";
-$text['check-onbreak-status']['pt-br'] = "Em Pausa"; //copied from pt-pt
 $text['check-onbreak-status']['pt-pt'] = "Em Pausa";
-$text['check-onbreak-status']['ro-ro'] = "";
-$text['check-onbreak-status']['ru-ru'] = "Перерыв";
+$text['check-onbreak-status']['pt-br'] = "Em Pausa";
+$text['check-onbreak-status']['pl'] = "Na przerwie";
 $text['check-onbreak-status']['sv-se'] = "På Rast";
-$text['check-onbreak-status']['uk-ua'] = "На перерві";
+$text['check-onbreak-status']['uk'] = "На перерві";
+$text['check-onbreak-status']['de-at'] = "Auf Pause";
+$text['check-onbreak-status']['he'] = "בהפסקה";

 $text['check-loggedout-status']['en-us'] = "Logged Out";
-$text['check-loggedout-status']['ar-eg'] = "";
-$text['check-loggedout-status']['de-at'] = "Abgemeldet"; //copied from de-de
-$text['check-loggedout-status']['de-ch'] = "Abgemeldet"; //copied from de-de
-$text['check-loggedout-status']['de-de'] = "Abgemeldet";
 $text['check-loggedout-status']['es-cl'] = "Desconectado";
-$text['check-loggedout-status']['es-mx'] = "Desconectado"; //copied from es-cl
-$text['check-loggedout-status']['fr-ca'] = "Délogué"; //copied from fr-fr
 $text['check-loggedout-status']['fr-fr'] = "Délogué";
-$text['check-loggedout-status']['he-il'] = "התנתק";
-$text['check-loggedout-status']['it-it'] = "Sloggato";
-$text['check-loggedout-status']['nl-nl'] = "";
-$text['check-loggedout-status']['pl-pl'] = "Wylogowany";
-$text['check-loggedout-status']['pt-br'] = "Desligado"; //copied from pt-pt
 $text['check-loggedout-status']['pt-pt'] = "Desligado";
-$text['check-loggedout-status']['ro-ro'] = "";
-$text['check-loggedout-status']['ru-ru'] = "Не в сети";
+$text['check-loggedout-status']['pt-br'] = "Desligado";
+$text['check-loggedout-status']['pl'] = "Wylogowany";
 $text['check-loggedout-status']['sv-se'] = "Utloggad";
-$text['check-loggedout-status']['uk-ua'] = "Вийшов";
+$text['check-loggedout-status']['uk'] = "Вийшов";
+$text['check-loggedout-status']['de-at'] = "Abgemeldet";
+$text['check-loggedout-status']['he'] = "התנתק";

 $text['check-do-not-disturb-status']['en-us'] = "Do Not Disturb";
-$text['check-do-not-disturb-status']['ar-eg'] = "";
-$text['check-do-not-disturb-status']['de-at'] = "Bitte nicht Stören"; //copied from de-de
-$text['check-do-not-disturb-status']['de-ch'] = "Bitte nicht Stören"; //copied from de-de
-$text['check-do-not-disturb-status']['de-de'] = "Bitte nicht Stören";
 $text['check-do-not-disturb-status']['es-cl'] = "No molestar";
-$text['check-do-not-disturb-status']['es-mx'] = "No molestar"; //copied from es-cl
-$text['check-do-not-disturb-status']['fr-ca'] = "Ne Pas Déranger"; //copied from fr-fr
 $text['check-do-not-disturb-status']['fr-fr'] = "Ne Pas Déranger";
-$text['check-do-not-disturb-status']['he-il'] = "לא להפריע";
-$text['check-do-not-disturb-status']['it-it'] = "Non Disturbare";
-$text['check-do-not-disturb-status']['nl-nl'] = "";
-$text['check-do-not-disturb-status']['pl-pl'] = "Nie przeszkadzaj (DND)";
-$text['check-do-not-disturb-status']['pt-br'] = "Não Pertube";
 $text['check-do-not-disturb-status']['pt-pt'] = "Não Perturbar";
-$text['check-do-not-disturb-status']['ro-ro'] = "";
-$text['check-do-not-disturb-status']['ru-ru'] = "Не беспокоить (DND)";
+$text['check-do-not-disturb-status']['pt-br'] = "Não Pertube";
+$text['check-do-not-disturb-status']['pl'] = "Nie przeszkadzaj (DND)";
 $text['check-do-not-disturb-status']['sv-se'] = "Stör Ej";
-$text['check-do-not-disturb-status']['uk-ua'] = "Не турбувати";
+$text['check-do-not-disturb-status']['uk'] = "Не турбувати";
+$text['check-do-not-disturb-status']['de-at'] = "Bitte nicht Stören";
+$text['check-do-not-disturb-status']['he'] = "לא להפריע";

 $text['check-available-status']['en-us'] = "Available";
-$text['check-available-status']['ar-eg'] = "";
-$text['check-available-status']['de-at'] = "Erreichbar"; //copied from de-de
-$text['check-available-status']['de-ch'] = "Erreichbar"; //copied from de-de
-$text['check-available-status']['de-de'] = "Erreichbar";
 $text['check-available-status']['es-cl'] = "Disponible";
-$text['check-available-status']['es-mx'] = "Disponible"; //copied from es-cl
-$text['check-available-status']['fr-ca'] = "Disponible"; //copied from fr-fr
 $text['check-available-status']['fr-fr'] = "Disponible";
-$text['check-available-status']['he-il'] = "זמין";
-$text['check-available-status']['it-it'] = "Disponibile";
-$text['check-available-status']['nl-nl'] = "";
-$text['check-available-status']['pl-pl'] = "Dostępny";
-$text['check-available-status']['pt-br'] = "Disponível"; //copied from pt-pt
 $text['check-available-status']['pt-pt'] = "Disponível";
-$text['check-available-status']['ro-ro'] = "";
-$text['check-available-status']['ru-ru'] = "Доступен";
+$text['check-available-status']['pt-br'] = "Disponível";
+$text['check-available-status']['pl'] = "Dostępny";
 $text['check-available-status']['sv-se'] = "Anträffbar";
-$text['check-available-status']['uk-ua'] = "Доступний";
+$text['check-available-status']['uk'] = "Доступний";
+$text['check-available-status']['de-at'] = "Erreichbar";
+$text['check-available-status']['he'] = "זמין";

 $text['check-available-on-demand-status']['en-us'] = "Available (On Demand)";
-$text['check-available-on-demand-status']['ar-eg'] = "";
-$text['check-available-on-demand-status']['de-at'] = "Erreichbar (Auf Anfrage)"; //copied from de-de
-$text['check-available-on-demand-status']['de-ch'] = "Erreichbar (Auf Anfrage)"; //copied from de-de
-$text['check-available-on-demand-status']['de-de'] = "Erreichbar (Auf Anfrage)";
 $text['check-available-on-demand-status']['es-cl'] = "Disponible (On Demand)";
-$text['check-available-on-demand-status']['es-mx'] = "Disponible (On Demand)"; //copied from es-cl
-$text['check-available-on-demand-status']['fr-ca'] = "Disponible (Sur Demande)"; //copied from fr-fr
 $text['check-available-on-demand-status']['fr-fr'] = "Disponible (Sur Demande)";
-$text['check-available-on-demand-status']['he-il'] = "";
-$text['check-available-on-demand-status']['it-it'] = "Disponibile (Su Richiesta)";
-$text['check-available-on-demand-status']['nl-nl'] = "";
-$text['check-available-on-demand-status']['pl-pl'] = "Dostępny (na żądanie)";
-$text['check-available-on-demand-status']['pt-br'] = "Disponível (A pedido)"; //copied from pt-pt
 $text['check-available-on-demand-status']['pt-pt'] = "Disponível (A pedido)";
-$text['check-available-on-demand-status']['ro-ro'] = "";
-$text['check-available-on-demand-status']['ru-ru'] = "Доступен (по требованию)";
-$text['check-available-on-demand-status']['sv-se'] = "Anträffbar (På Begäran)";
-$text['check-available-on-demand-status']['uk-ua'] = "Доступний (на вимогу)";
+$text['check-available-on-demand-status']['pt-br'] = "Disponível (A pedido)";
+$text['check-available-on-demand-status']['pl'] = "Dostępny (na żądanie)";
+$text['check-available-on-demand-status']['sv-se'] = "Anträffbar (På Begäran) ";
+$text['check-available-on-demand-status']['uk'] = "Доступний (на вимогу)";
+$text['check-available-on-demand-status']['de-at'] = "Erreichbar (Auf Anfrage)";
+$text['check-available-on-demand-status']['he'] = "";

 $text['button-show_all']['en-us'] = "Show All";
-$text['button-show_all']['ar-eg'] = "";
-$text['button-show_all']['de-at'] = "Alle anzeigen"; //copied from de-de
-$text['button-show_all']['de-ch'] = "Alle anzeigen"; //copied from de-de
-$text['button-show_all']['de-de'] = "Alle anzeigen";
 $text['button-show_all']['es-cl'] = "Mostrar Todos";
-$text['button-show_all']['es-mx'] = "Mostrar Todos"; //copied from es-cl
-$text['button-show_all']['fr-ca'] = "Montrer Tout"; //copied from fr-fr
-$text['button-show_all']['fr-fr'] = "Montrer Tout";
-$text['button-show_all']['he-il'] = "";
-$text['button-show_all']['it-it'] = "Mostra Tutto";
-$text['button-show_all']['nl-nl'] = "";
-$text['button-show_all']['pl-pl'] = "Pokaż Wszystkie";
-$text['button-show_all']['pt-br'] = "Mostrar Todos"; //copied from pt-pt
 $text['button-show_all']['pt-pt'] = "Mostrar Todos";
-$text['button-show_all']['ro-ro'] = "";
-$text['button-show_all']['ru-ru'] = "Показать все";
-$text['button-show_all']['sv-se'] = "Visa Allt";
-$text['button-show_all']['uk-ua'] = "Показати всі";
+$text['button-show_all']['fr-fr'] = "Montrer Tout";
+$text['button-show_all']['pt-br'] = "Mostrar Todos";
+$text['button-show_all']['pl'] = "Pokaż Wszystkie";
+$text['button-show_all']['uk'] = "Показати всі";
+$text['button-show_all']['de-at'] = "Alle anzeigen";
+$text['button-show_all']['he'] = "";

-?>
+?>
@@ -1,30 +1,20 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Active Calls";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Aktive Gespräche";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Aktive Gespräche";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Llamadas Activas";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Appels en cours";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "שיחות פעילות";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Chiamate Attive";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Aktywne połączenia";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Chamadas ativas";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Chamadas Activas";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Активные вызовы";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Aktiva samtal";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Активні дзвінки";
-	$apps[$x]['menu'][$y]['uuid'] = "eba3d07f-dd5c-6b7b-6880-493b44113ade";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/calls_active/calls_active.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
+$apps[$x]['menu'][0]['title']['en-us'] = "Active Calls";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Llamadas Activas";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Appels en cours";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Chamadas Activas";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Chamadas ativas";
+$apps[$x]['menu'][0]['title']['pl'] = "Aktywne połączenia";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Aktiva samtal";
+$apps[$x]['menu'][0]['title']['uk'] = "Активні дзвінки";
+$apps[$x]['menu'][0]['title']['de-at'] = "Aktive Gespräche";
+$apps[$x]['menu'][0]['title']['he'] = "שיחות פעילות";
+$apps[$x]['menu'][0]['uuid'] = "eba3d07f-dd5c-6b7b-6880-493b44113ade";
+$apps[$x]['menu'][0]['parent_uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/calls_active/calls_active.php";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['groups'][] = "admin";

 ?>
@@ -23,20 +23,16 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	include "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('call_active_view')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+include "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('call_active_view')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -55,49 +51,6 @@
 //create the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);

-//send the event socket command and get the array
-	if ($fp) {
-		$json = trim(event_socket_request($fp, 'api '.$switch_cmd));
-		$results = json_decode($json, "true");
-	}
-
-//build a new array with domain_name
-	$rows = array();
-	if (isset($results["rows"])) {
-		foreach ($results["rows"] as &$row) {
-			//get the domain
-				if (strlen($row['context']) > 0 and $row['context'] != "public") {
-					if (substr_count($row['context'], '@') > 0) {
-						$context_array = explode('@', $row['context']);
-						$row['domain_name'] = $context_array[1];
-					}
-					else {
-						$row['domain_name'] = $row['context'];
-					}
-				}
-				else if (substr_count($row['presence_id'], '@') > 0) {
-					$presence_id_array = explode('@', $row['presence_id']);
-					$row['domain_name'] = $presence_id_array[1].' '.__line__.' '.$row['presence_id'];
-				}
-			//add the row to the array
-				if (($show == 'all' && permission_exists('call_active_all'))) {
-					$rows[] = $row;
-				}
-				else {
-					if ($row['domain_name'] == $_SESSION['domain_name']) {
-						$rows[] = $row;
-					}
-				}
-		}
-		unset($results);
-	}
-
-
-//set the alternating color for each row
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
-
 //if the connnection is available then run it and return the results
 	if (!$fp) {
 		$msg = "<div align='center'>".$text['confirm-socket']."<br /></div>";
@@ -113,6 +66,11 @@
 		echo "</div>\n";
 	}
 	else {
+		//send the event socket command
+			$json = trim(event_socket_request($fp, 'api '.$switch_cmd));
+		//set the array
+			$results = json_decode($json, "true");
+
 		//define js function call var
 			$onhover_pause_refresh = " onmouseover='refresh_stop();' onmouseout='refresh_start();'";

@@ -135,11 +93,30 @@
 			echo "	</tr>";
 			echo "</table>";

+			$rows = array();
+			if (isset($results["rows"])) foreach ($results["rows"] as &$row) {
+				//determine show all
+					if (!($show == 'all' && permission_exists('call_active_all'))) {
+						$foreign_call = true;
+						foreach ($row as $key => $value) {
+							if (substr_count($value, $_SESSION['domain_name']) > 0) { $foreign_call = false; }
+						}
+						if ($foreign_call) { continue; }
+					}
+				// append call
+					$rows[] = $row;
+			}
+
 			echo "<b>".$text['title']." (" . count($rows) . ")"."</b>";
 			echo "<br><br>\n";
 			echo $text['description']."\n";
 			echo "<br><br>\n";

+		//set the alternating color for each row
+			$c = 0;
+			$row_style["0"] = "row_style0";
+			$row_style["1"] = "row_style1";
+
 		//show the results
 			echo "<div id='cmd_reponse'></div>\n";

@@ -179,6 +156,23 @@
 					$tmp_number = $temp_array[0];
 					$tmp_number = str_replace("sip:", "", $tmp_number);

+				//get the domain
+					if ($show == 'all') {
+						if (substr_count($presence_id, '@') > 0) {
+							$presence_id_array = explode('@', $presence_id);
+							$domain_name = $presence_id_array[1];
+						}
+						else if ($context != '') {
+							if (substr_count($context, '@') > 0) {
+								$context_array = explode('@', $context);
+								$domain_name = $context_array[1];
+							}
+							else {
+								$domain_name = $context;
+							}
+						}
+					}
+
 				//remove the '+' because it breaks the call recording
 					$cid_num = str_replace("+", "", $cid_num);

@@ -194,29 +188,44 @@
 						$application_data = substr($application_data, 0, 512) . ' <b>...</b>';
 					}

-				//send the html
-					echo "<tr>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$sip_profile."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$created."&nbsp;</td>\n";
-					if ($show == 'all') {
-						echo "<td valign='top' class='".$row_style[$c]."'>".$domain_name."&nbsp;</td>\n";
-					}
-					echo "<td valign='top' class='".$row_style[$c]."'>".$tmp_number."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$cid_name."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$cid_num."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$dest."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".((strlen($application) > 0) ? $application.":".$application_data : null)."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$read_codec.":".$read_rate." / ".$write_codec.":".$write_rate."&nbsp;</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$secure."&nbsp;</td>\n";
-					echo "<td class='list_control_icons' style='width: 25px; text-align: left;'><a href='javascript:void(0);' alt='".$text['label-hangup']."' onclick=\"hangup(escape('".$uuid."'));\">".$v_link_label_delete."</a></td>\n";
-					echo "</tr>\n";
-				
-				//alternate the row style
-					$c = ($c) ? 0 : 1;
+				echo "<tr>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$sip_profile."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$created."&nbsp;</td>\n";
+				if ($show == 'all') {
+					echo "<td valign='top' class='".$row_style[$c]."'>".$domain_name."&nbsp;</td>\n";
+				}
+				echo "<td valign='top' class='".$row_style[$c]."'>".$tmp_number."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$cid_name."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$cid_num."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$dest."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".((strlen($application) > 0) ? $application.":".$application_data : null)."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$read_codec.":".$read_rate." / ".$write_codec.":".$write_rate."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$secure."&nbsp;</td>\n";
+				echo "<td class='list_control_icons' style='width: 25px; text-align: left;'><a href='javascript:void(0);' alt='".$text['label-hangup']."' onclick=\"hangup(escape('".$uuid."'));\">".$v_link_label_delete."</a></td>\n";
+				echo "</tr>\n";
+				$c = ($c) ? 0 : 1;
 			}
 			echo "</td>\n";
 			echo "</tr>\n";
 			echo "</table>\n";
 	}

-?>
+/*
+// deprecated features for this page
+
+	//park
+		echo "	<a href='javascript:void(0);' onclick=\"send_cmd('calls_exec.php?cmd='+get_park_cmd(escape('$uuid'), '".$tmp_domain."'));\">".$text['label-park']."</a>&nbsp;\n";
+	//record start/stop
+		$tmp_dir = $_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/".date("Y")."/".date("M")."/".date("d");
+		event_socket_mkdir($tmp_dir);
+		$tmp_file = $tmp_dir."/".$uuid.".wav";
+		if (file_exists($tmp_file)) {
+			//stop
+			echo "	<a href='javascript:void(0);' style='color: #444444;' onclick=\"send_cmd('calls_exec.php?cmd='+get_record_cmd(escape('$uuid'), 'active_calls_', escape('$cid_num'))+'&uuid='+escape('$uuid')+'&action=record&action2=stop&prefix=active_calls_&name='+escape('$cid_num'));\">".$text['label-stop']."</a>&nbsp;\n";
+		}
+		else {
+			//start
+			echo "	<a href='javascript:void(0);' style='color: #444444;' onclick=\"send_cmd('calls_exec.php?cmd='+get_record_cmd(escape('$uuid'), 'active_calls_', escape('$cid_num'))+'&uuid='+escape('$uuid')+'&action=record&action2=start&prefix=active_calls_');\">".$text['label-start']."</a>&nbsp;\n";
+		}
+*/
+?>
@@ -5,40 +5,30 @@
 		$apps[$x]['uuid'] = "eb221c9b-cb13-5542-9140-dff924816dc4";
 		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Originate calls with a URL.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Anrufe über eine URL erzeugen.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Anrufe über eine URL erzeugen.";
 		$apps[$x]['description']['es-cl'] = "Genera llamadas con un URL.";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "Appeller avec d'URL";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Appeler à partir d'une URL";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "Gera chamadas a partir de um URL";
+		$apps[$x]['description']['fr-ca'] = "Appeller avec d'URL";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Originar chamadas com um URL.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "Создание исходящих вызовов с помощью вызова URL";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "Gera chamadas a partir de um URL";

 	//permission details
-		$y=0;
-		$apps[$x]['permissions'][$y]['name'] = "click_to_call_view";
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = "f862556f-9ddd-2697-fdf4-bed08ec63aa5";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "click_to_call_call";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][0]['name'] = "click_to_call_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "f862556f-9ddd-2697-fdf4-bed08ec63aa5";
+		$apps[$x]['permissions'][0]['groups'][] = "user";
+		$apps[$x]['permissions'][0]['groups'][] = "admin";
+		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
+
+		$apps[$x]['permissions'][1]['name'] = "click_to_call_call";
+		$apps[$x]['permissions'][1]['groups'][] = "user";
+		$apps[$x]['permissions'][1]['groups'][] = "admin";
+		$apps[$x]['permissions'][1]['groups'][] = "superadmin";

 ?>
@@ -1,644 +1,209 @@
 <?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC
+/*
+	FusionPBX
+	Version: MPL 1.1

-$text['label-click2call']['en-us'] = "Click to Call";
-$text['label-click2call']['ar-eg'] = "";
-$text['label-click2call']['de-at'] = "Click to Call"; //copied from de-de
-$text['label-click2call']['de-ch'] = "Click to Call"; //copied from de-de
-$text['label-click2call']['de-de'] = "Click to Call";
-$text['label-click2call']['es-cl'] = "Pulse para Llamar";
-$text['label-click2call']['es-mx'] = "Pulse para Llamar"; //copied from es-cl
-$text['label-click2call']['fr-ca'] = "Click to Call"; //copied from fr-fr
-$text['label-click2call']['fr-fr'] = "Click to Call";
-$text['label-click2call']['he-il'] = "";
-$text['label-click2call']['it-it'] = "Clicca per Chiamare";
-$text['label-click2call']['nl-nl'] = "";
-$text['label-click2call']['pl-pl'] = "";
-$text['label-click2call']['pt-br'] = "Clique para chamar"; //copied from pt-pt
-$text['label-click2call']['pt-pt'] = "Clique para chamar";
-$text['label-click2call']['ro-ro'] = "";
-$text['label-click2call']['ru-ru'] = "Вызов по клику";
-$text['label-click2call']['sv-se'] = "Klicka för att ringa";
-$text['label-click2call']['uk-ua'] = "";
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/

-$text['desc-click2call']['en-us'] = "Provide the following information to make a call from the source number to the destination number.";
-$text['desc-click2call']['ar-eg'] = "";
-$text['desc-click2call']['de-at'] = "Geben Sie folgende Informationen an um einen Anruf von der Quellrufnummer zur Zielrufniummer her zu stellen"; //copied from de-de
-$text['desc-click2call']['de-ch'] = "Geben Sie folgende Informationen an um einen Anruf von der Quellrufnummer zur Zielrufniummer her zu stellen"; //copied from de-de
-$text['desc-click2call']['de-de'] = "Geben Sie folgende Informationen an um einen Anruf von der Quellrufnummer zur Zielrufniummer her zu stellen";
-$text['desc-click2call']['es-cl'] = "Ingrese la siguiente información para realizar una llamada desde un número de origen a un número de destino.";
-$text['desc-click2call']['es-mx'] = "Ingrese la siguiente información para realizar una llamada desde un número de origen a un número de destino."; //copied from es-cl
-$text['desc-click2call']['fr-ca'] = "Fournissez les informations suivantes afin de lancer un appel d'un numéro vers un autre."; //copied from fr-fr
-$text['desc-click2call']['fr-fr'] = "Fournissez les informations suivantes afin de lancer un appel d'un numéro vers un autre.";
-$text['desc-click2call']['he-il'] = "";
-$text['desc-click2call']['it-it'] = "Inserisci le seguenti informazioni per eseguire una chiamata dal numero sorgente al numero destinatario.";
-$text['desc-click2call']['nl-nl'] = "";
-$text['desc-click2call']['pl-pl'] = "";
-$text['desc-click2call']['pt-br'] = "Forneça as seguintes informações para realizar uma chamada do telefone originário para o telefone de destino.";
-$text['desc-click2call']['pt-pt'] = "Forneça a informação seguinte para realizar uma chamada com uma determinada origem para um determinado destino.";
-$text['desc-click2call']['ro-ro'] = "";
-$text['desc-click2call']['ru-ru'] = "Предоставьте следующую информацию, чтобы сделать вызов от исходного номера до номера адресата.";
-$text['desc-click2call']['sv-se'] = "Ange följande information för att ringa från källnumret till destinationsnumret.";
-$text['desc-click2call']['uk-ua'] = "";
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.

-$text['label-src-caller-id-nam']['en-us'] = "Source Caller ID Name";
-$text['label-src-caller-id-nam']['ar-eg'] = "";
-$text['label-src-caller-id-nam']['de-at'] = "Quell Anruferkennung (Namen)"; //copied from de-de
-$text['label-src-caller-id-nam']['de-ch'] = "Quell Anruferkennung (Namen)"; //copied from de-de
-$text['label-src-caller-id-nam']['de-de'] = "Quell Anruferkennung (Namen)";
-$text['label-src-caller-id-nam']['es-cl'] = "Nombre de Caller ID de origen";
-$text['label-src-caller-id-nam']['es-mx'] = "Nombre de Caller ID de origen"; //copied from es-cl
-$text['label-src-caller-id-nam']['fr-ca'] = "Nom de l'appelant"; //copied from fr-fr
-$text['label-src-caller-id-nam']['fr-fr'] = "Nom de l'appelant";
-$text['label-src-caller-id-nam']['he-il'] = "";
-$text['label-src-caller-id-nam']['it-it'] = "Nome Chiamante";
-$text['label-src-caller-id-nam']['nl-nl'] = "";
-$text['label-src-caller-id-nam']['pl-pl'] = "";
-$text['label-src-caller-id-nam']['pt-br'] = "Nome de origem";
-$text['label-src-caller-id-nam']['pt-pt'] = "Nome do Chamador";
-$text['label-src-caller-id-nam']['ro-ro'] = "";
-$text['label-src-caller-id-nam']['ru-ru'] = "Исходящее Caller ID Имя";
-$text['label-src-caller-id-nam']['sv-se'] = "Caller ID Namn på källa";
-$text['label-src-caller-id-nam']['uk-ua'] = "";
+	The Original Code is FusionPBX

-$text['desc-src-caller-id-nam']['en-us'] = "Enter the Caller ID name to send to your phone.";
-$text['desc-src-caller-id-nam']['ar-eg'] = "";
-$text['desc-src-caller-id-nam']['de-at'] = "Geben Sie die Anruferkennung (Namen) ein, die an Ihr Telefon übermittelt werden soll."; //copied from de-de
-$text['desc-src-caller-id-nam']['de-ch'] = "Geben Sie die Anruferkennung (Namen) ein, die an Ihr Telefon übermittelt werden soll."; //copied from de-de
-$text['desc-src-caller-id-nam']['de-de'] = "Geben Sie die Anruferkennung (Namen) ein, die an Ihr Telefon übermittelt werden soll.";
-$text['desc-src-caller-id-nam']['es-cl'] = "Ingrese el nombre del Caller ID para enviar a su teléfono.";
-$text['desc-src-caller-id-nam']['es-mx'] = "Ingrese el nombre del Caller ID para enviar a su teléfono."; //copied from es-cl
-$text['desc-src-caller-id-nam']['fr-ca'] = "Choisir le nom d'appelant à émettre à votre téléphone."; //copied from fr-fr
-$text['desc-src-caller-id-nam']['fr-fr'] = "Choisir le nom d'appelant à émettre à votre téléphone.";
-$text['desc-src-caller-id-nam']['he-il'] = "";
-$text['desc-src-caller-id-nam']['it-it'] = "Inserisci il nome del chiamante per inviare al tuo telefono.";
-$text['desc-src-caller-id-nam']['nl-nl'] = "";
-$text['desc-src-caller-id-nam']['pl-pl'] = "";
-$text['desc-src-caller-id-nam']['pt-br'] = "Entre com o ID do número de origem para ser enviado para seu telefone.";
-$text['desc-src-caller-id-nam']['pt-pt'] = "Introduza o nome do chamador para ser enviado para o seu telefone.";
-$text['desc-src-caller-id-nam']['ro-ro'] = "";
-$text['desc-src-caller-id-nam']['ru-ru'] = "Введите имя вызывающего абонента для отправки на свой телефон.";
-$text['desc-src-caller-id-nam']['sv-se'] = "Ange Caller ID Namn som skall skickas till din telefon.";
-$text['desc-src-caller-id-nam']['uk-ua'] = "";
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.

-$text['label-src-caller-id-num']['en-us'] = "Source Caller ID Number";
-$text['label-src-caller-id-num']['ar-eg'] = "";
-$text['label-src-caller-id-num']['de-at'] = "Quell Anruferkennung (Nummer)"; //copied from de-de
-$text['label-src-caller-id-num']['de-ch'] = "Quell Anruferkennung (Nummer)"; //copied from de-de
-$text['label-src-caller-id-num']['de-de'] = "Quell Anruferkennung (Nummer)";
-$text['label-src-caller-id-num']['es-cl'] = "Número de Caller ID de origen";
-$text['label-src-caller-id-num']['es-mx'] = "Número de Caller ID de origen"; //copied from es-cl
-$text['label-src-caller-id-num']['fr-ca'] = "Numéro de l'appelant"; //copied from fr-fr
-$text['label-src-caller-id-num']['fr-fr'] = "Numéro de l'appelant";
-$text['label-src-caller-id-num']['he-il'] = "";
-$text['label-src-caller-id-num']['it-it'] = "Numero Sorgente";
-$text['label-src-caller-id-num']['nl-nl'] = "";
-$text['label-src-caller-id-num']['pl-pl'] = "";
-$text['label-src-caller-id-num']['pt-br'] = "Número de origem";
-$text['label-src-caller-id-num']['pt-pt'] = "Número do Chamador";
-$text['label-src-caller-id-num']['ro-ro'] = "";
-$text['label-src-caller-id-num']['ru-ru'] = "Исходящий Caller ID Номер";
-$text['label-src-caller-id-num']['sv-se'] = "Källa Caller ID Nummer";
-$text['label-src-caller-id-num']['uk-ua'] = "";
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+	James Rose <james.o.rose@gmail.com>
+	Philippe Rioual <bhouba@gmail.com>
+*/

-$text['desc-src-caller-id-num']['en-us'] = "Enter the Caller ID number to send to your phone (you probably want this to be the same as the destination number).";
-$text['desc-src-caller-id-num']['ar-eg'] = "";
-$text['desc-src-caller-id-num']['de-at'] = " Geben Sie die Anruferkennung (Nummer) ein, die an Ihr Telefon übermittelt werden soll.(In der Regel ist diese identisch mit der Zielrufnummer)."; //copied from de-de
-$text['desc-src-caller-id-num']['de-ch'] = " Geben Sie die Anruferkennung (Nummer) ein, die an Ihr Telefon übermittelt werden soll.(In der Regel ist diese identisch mit der Zielrufnummer)."; //copied from de-de
-$text['desc-src-caller-id-num']['de-de'] = " Geben Sie die Anruferkennung (Nummer) ein, die an Ihr Telefon übermittelt werden soll.(In der Regel ist diese identisch mit der Zielrufnummer).";
-$text['desc-src-caller-id-num']['es-cl'] = "Ingrese el número del Caller ID para enviar a su teléfono (probablemente desee que sea el mismo que el número de destino).";
-$text['desc-src-caller-id-num']['es-mx'] = "Ingrese el número del Caller ID para enviar a su teléfono (probablemente desee que sea el mismo que el número de destino)."; //copied from es-cl
-$text['desc-src-caller-id-num']['fr-ca'] = "Choisir le numéro d'appelant à émettre à votre téléphone (Il est en général le même que le numéro de destination)."; //copied from fr-fr
-$text['desc-src-caller-id-num']['fr-fr'] = "Choisir le numéro d'appelant à émettre à votre téléphone (Il est en général le même que le numéro de destination).";
-$text['desc-src-caller-id-num']['he-il'] = "";
-$text['desc-src-caller-id-num']['it-it'] = "Inserisci il numero Sorgente per inviare al tuo telefono (probabilmente è lo stesso del numero destintario).";
-$text['desc-src-caller-id-num']['nl-nl'] = "";
-$text['desc-src-caller-id-num']['pl-pl'] = "";
-$text['desc-src-caller-id-num']['pt-br'] = "Entre com o ID do número de origem para ser enviado para seu telefone (Orientamos colocar este número sendo o mesmo número que 'número de destino'";
-$text['desc-src-caller-id-num']['pt-pt'] = "Introduza o identificador de chamada para enviar para o seu telefone (geralmente é o mesmo que o número de destino).";
-$text['desc-src-caller-id-num']['ro-ro'] = "";
-$text['desc-src-caller-id-num']['ru-ru'] = "Введите номер вызывающего абонента для отправки на свой телефон (возможно, вы хотите чтобы он был то же, что и номер назначения).";
-$text['desc-src-caller-id-num']['sv-se'] = "Ange nummeret för nummerpresentation som ska skickas till din telefon (du vill noga att det här är detsamma som destinationsnumret).";
-$text['desc-src-caller-id-num']['uk-ua'] = "";
+	$text['label-click2call']['en-us'] = "Click to Call";
+	$text['label-click2call']['es-cl'] = "Pulse para Llamar";
+	$text['label-click2call']['pt-pt'] = "Clique para chamar";
+	$text['label-click2call']['pt-br'] = "Clique para chamar";
+	$text['label-click2call']['fr-fr'] = "Click to Call";

-$text['label-dest-caller-id-nam']['en-us'] = "Destination Caller ID Name";
-$text['label-dest-caller-id-nam']['ar-eg'] = "";
-$text['label-dest-caller-id-nam']['de-at'] = "Ziel Anruferkennung (Name)"; //copied from de-de
-$text['label-dest-caller-id-nam']['de-ch'] = "Ziel Anruferkennung (Name)"; //copied from de-de
-$text['label-dest-caller-id-nam']['de-de'] = "Ziel Anruferkennung (Name)";
-$text['label-dest-caller-id-nam']['es-cl'] = "Nombre de Caller ID de destino";
-$text['label-dest-caller-id-nam']['es-mx'] = "Nombre de Caller ID de destino"; //copied from es-cl
-$text['label-dest-caller-id-nam']['fr-ca'] = "Nom de l'appelant"; //copied from fr-fr
-$text['label-dest-caller-id-nam']['fr-fr'] = "Nom de l'appelant";
-$text['label-dest-caller-id-nam']['he-il'] = "";
-$text['label-dest-caller-id-nam']['it-it'] = "Nome Destinatario";
-$text['label-dest-caller-id-nam']['nl-nl'] = "";
-$text['label-dest-caller-id-nam']['pl-pl'] = "";
-$text['label-dest-caller-id-nam']['pt-br'] = "Identificação do destino";
-$text['label-dest-caller-id-nam']['pt-pt'] = "Nome do Chamador";
-$text['label-dest-caller-id-nam']['ro-ro'] = "";
-$text['label-dest-caller-id-nam']['ru-ru'] = "Удаленное Caller ID Имя";
-$text['label-dest-caller-id-nam']['sv-se'] = "Destination Caller ID Nummer";
-$text['label-dest-caller-id-nam']['uk-ua'] = "";
+	$text['desc-click2call']['en-us'] = "Provide the following information to make a call from the source number to the destination number.";
+	$text['desc-click2call']['es-cl'] = "Ingrese la siguiente información para realizar una llamada desde un número de origen a un número de destino.";
+	$text['desc-click2call']['pt-pt'] = "Forneça a informação seguinte para realizar uma chamada com uma determinada origem para um determinado destino.";
+	$text['desc-click2call']['pt-br'] = "Forneça as seguintes informações para realizar uma chamada do telefone originário para o telefone de destino.";
+	$text['desc-click2call']['fr-fr'] = "Fournissez les informations suivantes afin de lancer un appel d'un numéro vers un autre.";

-$text['desc-dest-caller-id-nam']['en-us'] = "Enter the Caller ID name to send to the destination number.";
-$text['desc-dest-caller-id-nam']['ar-eg'] = "";
-$text['desc-dest-caller-id-nam']['de-at'] = "Geben Sie die Anruferkennung (Name) ein, die an das Ziel übermittelt werden soll."; //copied from de-de
-$text['desc-dest-caller-id-nam']['de-ch'] = "Geben Sie die Anruferkennung (Name) ein, die an das Ziel übermittelt werden soll."; //copied from de-de
-$text['desc-dest-caller-id-nam']['de-de'] = "Geben Sie die Anruferkennung (Name) ein, die an das Ziel übermittelt werden soll.";
-$text['desc-dest-caller-id-nam']['es-cl'] = "Ingrese el nombre de Caller ID para enviar al número de destino.";
-$text['desc-dest-caller-id-nam']['es-mx'] = "Ingrese el nombre de Caller ID para enviar al número de destino."; //copied from es-cl
-$text['desc-dest-caller-id-nam']['fr-ca'] = "Choisir le nom d'appelant à émettre à la destination"; //copied from fr-fr
-$text['desc-dest-caller-id-nam']['fr-fr'] = "Choisir le nom d'appelant à émettre à la destination";
-$text['desc-dest-caller-id-nam']['he-il'] = "";
-$text['desc-dest-caller-id-nam']['it-it'] = "Inserisci il nome del chiamante per inviare la chiamata al numero destinatario.";
-$text['desc-dest-caller-id-nam']['nl-nl'] = "";
-$text['desc-dest-caller-id-nam']['pl-pl'] = "";
-$text['desc-dest-caller-id-nam']['pt-br'] = "Entre com a identificação a ser enviada para o número de destino.";
-$text['desc-dest-caller-id-nam']['pt-pt'] = "Introduza o identificador do chamador a ser enviado para o destinatário.";
-$text['desc-dest-caller-id-nam']['ro-ro'] = "";
-$text['desc-dest-caller-id-nam']['ru-ru'] = "Введите имя вызывающего абонента для отправки на номер назначения.";
-$text['desc-dest-caller-id-nam']['sv-se'] = "Ange Caller ID Namn som skall skickas till destinationen.";
-$text['desc-dest-caller-id-nam']['uk-ua'] = "";
+	$text['label-src-caller-id-nam']['en-us'] = "Source Caller ID Name";
+	$text['label-src-caller-id-nam']['es-cl'] = "Nombre de Caller ID de origen";
+	$text['label-src-caller-id-nam']['pt-pt'] = "Nome do Chamador";
+	$text['label-src-caller-id-nam']['pt-br'] = "Nome de origem";
+	$text['label-src-caller-id-nam']['fr-fr'] = "Nom de l'appelant";

-$text['label-dest-caller-id-num']['en-us'] = "Destination Caller ID Number";
-$text['label-dest-caller-id-num']['ar-eg'] = "";
-$text['label-dest-caller-id-num']['de-at'] = "Ziel Anruferkennung (Nummer)"; //copied from de-de
-$text['label-dest-caller-id-num']['de-ch'] = "Ziel Anruferkennung (Nummer)"; //copied from de-de
-$text['label-dest-caller-id-num']['de-de'] = "Ziel Anruferkennung (Nummer)";
-$text['label-dest-caller-id-num']['es-cl'] = "Número de Caller ID de destino";
-$text['label-dest-caller-id-num']['es-mx'] = "Número de Caller ID de destino"; //copied from es-cl
-$text['label-dest-caller-id-num']['fr-ca'] = "Numéro de l'appelant"; //copied from fr-fr
-$text['label-dest-caller-id-num']['fr-fr'] = "Numéro de l'appelant";
-$text['label-dest-caller-id-num']['he-il'] = "";
-$text['label-dest-caller-id-num']['it-it'] = "Numero Destinatario";
-$text['label-dest-caller-id-num']['nl-nl'] = "";
-$text['label-dest-caller-id-num']['pl-pl'] = "";
-$text['label-dest-caller-id-num']['pt-br'] = "Número de destino";
-$text['label-dest-caller-id-num']['pt-pt'] = "Número a apresentar no destino";
-$text['label-dest-caller-id-num']['ro-ro'] = "";
-$text['label-dest-caller-id-num']['ru-ru'] = "Удаленный Caller ID Номер";
-$text['label-dest-caller-id-num']['sv-se'] = "Destination Caller ID Nummer";
-$text['label-dest-caller-id-num']['uk-ua'] = "";
+	$text['desc-src-caller-id-nam']['en-us'] = "Enter the Caller ID name to send to your phone.";
+	$text['desc-src-caller-id-nam']['es-cl'] = "Ingrese el nombre del Caller ID para enviar a su teléfono.";
+	$text['desc-src-caller-id-nam']['pt-pt'] = "Introduza o nome do chamador para ser enviado para o seu telefone.";
+	$text['desc-src-caller-id-nam']['pt-br'] = "Entre com o ID do número de origem para ser enviado para seu telefone.";
+	$text['desc-src-caller-id-nam']['fr-fr'] = "Choisir le nom d'appelant à émettre à votre téléphone.";

-$text['desc-dest-caller-id-num']['en-us'] = "Enter the Caller ID number to send to the destination number (you probably want this to be your phone number).";
-$text['desc-dest-caller-id-num']['ar-eg'] = "";
-$text['desc-dest-caller-id-num']['de-at'] = "Geben Sie die Anruferkennung (Nummer) ein, die an das Ziel übermittelt werden soll (Normalerweise Ihre Rufnummer)."; //copied from de-de
-$text['desc-dest-caller-id-num']['de-ch'] = "Geben Sie die Anruferkennung (Nummer) ein, die an das Ziel übermittelt werden soll (Normalerweise Ihre Rufnummer)."; //copied from de-de
-$text['desc-dest-caller-id-num']['de-de'] = "Geben Sie die Anruferkennung (Nummer) ein, die an das Ziel übermittelt werden soll (Normalerweise Ihre Rufnummer).";
-$text['desc-dest-caller-id-num']['es-cl'] = "Ingrese número de Caller ID para enviar al número de destino (probablemente desee que sea su número de teléfono).";
-$text['desc-dest-caller-id-num']['es-mx'] = "Ingrese número de Caller ID para enviar al número de destino (probablemente desee que sea su número de teléfono)."; //copied from es-cl
-$text['desc-dest-caller-id-num']['fr-ca'] = "Choisir le numéro d'appelant à émettre au téléphone destination (Il est en général le même que votre numéro.)"; //copied from fr-fr
-$text['desc-dest-caller-id-num']['fr-fr'] = "Choisir le numéro d'appelant à émettre au téléphone destination (Il est en général le même que votre numéro.)";
-$text['desc-dest-caller-id-num']['he-il'] = "";
-$text['desc-dest-caller-id-num']['it-it'] = "";
-$text['desc-dest-caller-id-num']['nl-nl'] = "";
-$text['desc-dest-caller-id-num']['pl-pl'] = "";
-$text['desc-dest-caller-id-num']['pt-br'] = "Entre com o número de identificação a ser mandado para o número de destino (geralmente é o mesmo que o número de telefone).";
-$text['desc-dest-caller-id-num']['pt-pt'] = "Introduza o número identificador de chamada a ser enviado ao telefone de destino (geralmente é o mesmo que o seu número de telefone).";
-$text['desc-dest-caller-id-num']['ro-ro'] = "";
-$text['desc-dest-caller-id-num']['ru-ru'] = "Введите номер вызывающего абонента для отправки на номер адресата (возможно, вы хотите, чтобы это был ваш номер телефона).";
-$text['desc-dest-caller-id-num']['sv-se'] = "Ange Caller ID nummret för att skicka till destinationen (du vill säkert att detta ska vara ditt telefonnummer).";
-$text['desc-dest-caller-id-num']['uk-ua'] = "";
+	$text['label-src-caller-id-num']['en-us'] = "Source Caller ID Number";
+	$text['label-src-caller-id-num']['es-cl'] = "Número de Caller ID de origen";
+	$text['label-src-caller-id-num']['pt-pt'] = "Número do Chamador";
+	$text['label-src-caller-id-num']['pt-br'] = "Número de origem";
+	$text['label-src-caller-id-num']['fr-fr'] = "Numéro de l'appelant";

-$text['label-src-num']['en-us'] = "Source Number";
-$text['label-src-num']['ar-eg'] = "";
-$text['label-src-num']['de-at'] = "Quell Rufnummer"; //copied from de-de
-$text['label-src-num']['de-ch'] = "Quell Rufnummer"; //copied from de-de
-$text['label-src-num']['de-de'] = "Quell Rufnummer";
-$text['label-src-num']['es-cl'] = "Número de origen";
-$text['label-src-num']['es-mx'] = "Número de origen"; //copied from es-cl
-$text['label-src-num']['fr-ca'] = "Numéro Source"; //copied from fr-fr
-$text['label-src-num']['fr-fr'] = "Numéro Source";
-$text['label-src-num']['he-il'] = "";
-$text['label-src-num']['it-it'] = "Numero Sorgente";
-$text['label-src-num']['nl-nl'] = "";
-$text['label-src-num']['pl-pl'] = "";
-$text['label-src-num']['pt-br'] = "Número de origem"; //copied from pt-pt
-$text['label-src-num']['pt-pt'] = "Número de origem";
-$text['label-src-num']['ro-ro'] = "";
-$text['label-src-num']['ru-ru'] = "Исходящий номер";
-$text['label-src-num']['sv-se'] = "Nummer på källa";
-$text['label-src-num']['uk-ua'] = "";
+	$text['desc-src-caller-id-num']['en-us'] = "Enter the Caller ID number to send to your phone (you probably want this to be the same as the destination number).";
+	$text['desc-src-caller-id-num']['es-cl'] = "Ingrese el número del Caller ID para enviar a su teléfono (probablemente desee que sea el mismo que el número de destino).";
+	$text['desc-src-caller-id-num']['pt-pt'] = "Introduza o identificador de chamada para enviar para o seu telefone (geralmente é o mesmo que o número de destino).";
+	$text['desc-src-caller-id-num']['pt-br'] = "Entre com o ID do número de origem para ser enviado para seu telefone (Orientamos colocar este número sendo o mesmo número que 'número de destino'";
+	$text['desc-src-caller-id-num']['fr-fr'] = "Choisir le numéro d'appelant à émettre à votre téléphone (Il est en général le même que le numéro de destination).";

-$text['desc-src-num']['en-us'] = "Enter your phone number. This can be an extension on the system, or another number (eg: mobile phone).";
-$text['desc-src-num']['ar-eg'] = "";
-$text['desc-src-num']['de-at'] = "Geben Sie Ihre Rufnummer ein.Diese kann eine Nebenstelle auf dem System sein, oder eine andere Rufnummer (z.B. Ihre Mobilfunknummer)."; //copied from de-de
-$text['desc-src-num']['de-ch'] = "Geben Sie Ihre Rufnummer ein.Diese kann eine Nebenstelle auf dem System sein, oder eine andere Rufnummer (z.B. Ihre Mobilfunknummer)."; //copied from de-de
-$text['desc-src-num']['de-de'] = "Geben Sie Ihre Rufnummer ein.Diese kann eine Nebenstelle auf dem System sein, oder eine andere Rufnummer (z.B. Ihre Mobilfunknummer).";
-$text['desc-src-num']['es-cl'] = "Ingrese su número de teléfono. Este puede ser una extesión en el sistema, u otro número (ej. teléfono movil).";
-$text['desc-src-num']['es-mx'] = "Ingrese su número de teléfono. Este puede ser una extesión en el sistema, u otro número (ej. teléfono movil)."; //copied from es-cl
-$text['desc-src-num']['fr-ca'] = "Choisir votre numéro de téléphone. Il peut être une extension du système, ou tout autre numéro (eg: un mobile)."; //copied from fr-fr
-$text['desc-src-num']['fr-fr'] = "Choisir votre numéro de téléphone. Il peut être une extension du système, ou tout autre numéro (eg: un mobile).";
-$text['desc-src-num']['he-il'] = "";
-$text['desc-src-num']['it-it'] = "Inserisci il tuo numero di telefono. Può essere un interno del centralino o un altro numero (es. numero di cellulare).";
-$text['desc-src-num']['nl-nl'] = "";
-$text['desc-src-num']['pl-pl'] = "";
-$text['desc-src-num']['pt-br'] = "Entre com seu númerop de telefone. Pode ser um ramal ou outro número (ex: número de celular).";
-$text['desc-src-num']['pt-pt'] = "Introduza o seu número de telefone. Poderá ser uma extensão do sistema ou outro número (ex: número de telemóvel).";
-$text['desc-src-num']['ro-ro'] = "";
-$text['desc-src-num']['ru-ru'] = "Введите свой номер телефона. Это может быть внутренний номер или другой номер (например, мобильный).";
-$text['desc-src-num']['sv-se'] = "Skriv in ditt telefonnummer. Detta kan vara en anknytning i systemet, eller ett annat nummer (t ex: mobiltelefon).";
-$text['desc-src-num']['uk-ua'] = "";
+	$text['label-dest-caller-id-nam']['en-us'] = "Destination Caller ID Name";
+	$text['label-dest-caller-id-nam']['es-cl'] = "Nombre de Caller ID de destino";
+	$text['label-dest-caller-id-nam']['pt-pt'] = "Nome do Chamador";
+	$text['label-dest-caller-id-nam']['pt-br'] = "Identificação do destino";
+	$text['label-dest-caller-id-nam']['fr-fr'] = "Nom de l'appelant";

-$text['label-dest-num']['en-us'] = "Destination Number";
-$text['label-dest-num']['ar-eg'] = "";
-$text['label-dest-num']['de-at'] = "Ziel Rufnummer"; //copied from de-de
-$text['label-dest-num']['de-ch'] = "Ziel Rufnummer"; //copied from de-de
-$text['label-dest-num']['de-de'] = "Ziel Rufnummer";
-$text['label-dest-num']['es-cl'] = "Número de destino";
-$text['label-dest-num']['es-mx'] = "Número de destino"; //copied from es-cl
-$text['label-dest-num']['fr-ca'] = "Numéro Destination"; //copied from fr-fr
-$text['label-dest-num']['fr-fr'] = "Numéro Destination";
-$text['label-dest-num']['he-il'] = "";
-$text['label-dest-num']['it-it'] = "Numero Destinazione";
-$text['label-dest-num']['nl-nl'] = "";
-$text['label-dest-num']['pl-pl'] = "";
-$text['label-dest-num']['pt-br'] = "Número do Destino"; //copied from pt-pt
-$text['label-dest-num']['pt-pt'] = "Número do Destino";
-$text['label-dest-num']['ro-ro'] = "";
-$text['label-dest-num']['ru-ru'] = "Номер назначения";
-$text['label-dest-num']['sv-se'] = "Destination Nummer";
-$text['label-dest-num']['uk-ua'] = "";
+	$text['desc-dest-caller-id-nam']['en-us'] = "Enter the Caller ID name to send to the destination number.";
+	$text['desc-dest-caller-id-nam']['es-cl'] = "Ingrese el nombre de Caller ID para enviar al número de destino.";
+	$text['desc-dest-caller-id-nam']['pt-pt'] = "Introduza o identificador do chamador a ser enviado para o destinatário.";
+	$text['desc-dest-caller-id-nam']['pt-br'] = "Entre com a identificação a ser enviada para o número de destino.";
+	$text['desc-dest-caller-id-nam']['fr-fr'] = "Choisir le nom d'appelant à émettre à la destination";

-$text['desc-dest-num']['en-us'] = "Enter the number to call. This can be an extension on the system, another number, or a sip uri.  Sip URI's are of the form 5551234567@voip.example.com:5080 (5080 for freeswitch, or 5060 for other systems).";
-$text['desc-dest-num']['ar-eg'] = "";
-$text['desc-dest-num']['de-at'] = "Geben Sie die Zielnummer ein. Diese kann eine Nebenstelle auf dem System sein, eine andere Rufnummer, oder eine SIP URI. Sip URI's sind wie folgt einzugeben: 5551234567@voip.example.com:5080 (5080 für freeswitch, oder 5060 für andere Systeme)."; //copied from de-de
-$text['desc-dest-num']['de-ch'] = "Geben Sie die Zielnummer ein. Diese kann eine Nebenstelle auf dem System sein, eine andere Rufnummer, oder eine SIP URI. Sip URI's sind wie folgt einzugeben: 5551234567@voip.example.com:5080 (5080 für freeswitch, oder 5060 für andere Systeme)."; //copied from de-de
-$text['desc-dest-num']['de-de'] = "Geben Sie die Zielnummer ein. Diese kann eine Nebenstelle auf dem System sein, eine andere Rufnummer, oder eine SIP URI. Sip URI's sind wie folgt einzugeben: 5551234567@voip.example.com:5080 (5080 für freeswitch, oder 5060 für andere Systeme).";
-$text['desc-dest-num']['es-cl'] = "Ingrese el número a llamar. Este puede ser una extensión en el sistema, otro número o un uri sip. Uri's sip son de la forma 5551234567@voip.example.com:5080 (5080 para freeswitch, o 5060 para otros sistemas).";
-$text['desc-dest-num']['es-mx'] = "Ingrese el número a llamar. Este puede ser una extensión en el sistema, otro número o un uri sip. Uri's sip son de la forma 5551234567@voip.example.com:5080 (5080 para freeswitch, o 5060 para otros sistemas)."; //copied from es-cl
-$text['desc-dest-num']['fr-ca'] = "Choisir un numéro à appeler. Il peut être une extension du système, un autre numéro, une URI SIP. les URI SIP sont de la forme : 5551234567@voip.example.com:5080 (5080 pour freeswitch, ou 5060 pour d'autre système)."; //copied from fr-fr
-$text['desc-dest-num']['fr-fr'] = "Choisir un numéro à appeler. Il peut être une extension du système, un autre numéro, une URI SIP. les URI SIP sont de la forme : 5551234567@voip.example.com:5080 (5080 pour freeswitch, ou 5060 pour d'autre système).";
-$text['desc-dest-num']['he-il'] = "";
-$text['desc-dest-num']['it-it'] = "Inserisci il numero da chiamare. Può essere un interno del centralino, un altro numero o un uri sip.  Gli uri SIP sono nella forma 5551234567@voip.example.com:5080 (5080 per freeswitch, or 5060 per altri sistemi).";
-$text['desc-dest-num']['nl-nl'] = "";
-$text['desc-dest-num']['pl-pl'] = "";
-$text['desc-dest-num']['pt-br'] = "Entre com o número a ser ligado. Pode ser um ramal, outro número, ou SIP URI. Exemplo de SIP URI: 12345678@voip.example.com:5080, sendo 5080 para o freeswitch ou 5060 para outros sistemas."; //copied from pt-pt
-$text['desc-dest-num']['pt-pt'] = "Entre com o número a ser ligado. Pode ser um ramal, outro número, ou SIP URI. Exemplo de SIP URI: 12345678@voip.example.com:5080, sendo 5080 para o freeswitch ou 5060 para outros sistemas.";
-$text['desc-dest-num']['ro-ro'] = "";
-$text['desc-dest-num']['ru-ru'] = "Введите номер для вызова. Это может быть внутренний номер, другой номер или sip uri. SIP URI имеют вид 5551234567@voip.example.com:5080 (5080 для freeswitch или 5060 для других систем).";
-$text['desc-dest-num']['sv-se'] = "Ange numret som ska ringas. Detta kan vara en anknytning i systemet, ett annat nummer eller en sip uri. SIP URIs är av formatet 5551234567@voip.example.com: 5080 (5080 för freeswitch eller 5060 för andra system).";
-$text['desc-dest-num']['uk-ua'] = "";
+	$text['label-dest-caller-id-num']['en-us'] = "Destination Caller ID Number";
+	$text['label-dest-caller-id-num']['es-cl'] = "Número de Caller ID de destino";
+	$text['label-dest-caller-id-num']['pt-pt'] = "Número a apresentar no destino";
+	$text['label-dest-caller-id-num']['pt-br'] = "Número de destino";
+	$text['label-dest-caller-id-num']['fr-fr'] = "Numéro de l'appelant";

-$text['label-auto-answer']['en-us'] = "Auto Answer";
-$text['label-auto-answer']['ar-eg'] = "";
-$text['label-auto-answer']['de-at'] = "Automatische Rufannahme"; //copied from de-de
-$text['label-auto-answer']['de-ch'] = "Automatische Rufannahme"; //copied from de-de
-$text['label-auto-answer']['de-de'] = "Automatische Rufannahme";
-$text['label-auto-answer']['es-cl'] = "respuesta automática";
-$text['label-auto-answer']['es-mx'] = "respuesta automática"; //copied from es-cl
-$text['label-auto-answer']['fr-ca'] = "Réponse Auto"; //copied from fr-fr
-$text['label-auto-answer']['fr-fr'] = "Réponse Auto";
-$text['label-auto-answer']['he-il'] = "";
-$text['label-auto-answer']['it-it'] = "Risposta Automatica";
-$text['label-auto-answer']['nl-nl'] = "";
-$text['label-auto-answer']['pl-pl'] = "";
-$text['label-auto-answer']['pt-br'] = "Resposta Automática"; //copied from pt-pt
-$text['label-auto-answer']['pt-pt'] = "Resposta Automática";
-$text['label-auto-answer']['ro-ro'] = "";
-$text['label-auto-answer']['ru-ru'] = "Автоответ";
-$text['label-auto-answer']['sv-se'] = "Auto Svar";
-$text['label-auto-answer']['uk-ua'] = "";
+	$text['desc-dest-caller-id-num']['en-us'] = "Enter the Caller ID number to send to the destination number (you probably want this to be your phone number).";
+	$text['desc-dest-caller-id-num']['es-cl'] = "Ingrese número de Caller ID para enviar al número de destino (probablemente desee que sea su número de teléfono).";
+	$text['desc-dest-caller-id-num']['pt-pt'] = "Introduza o número identificador de chamada a ser enviado ao telefone de destino (geralmente é o mesmo que o seu número de telefone).";
+	$text['desc-dest-caller-id-num']['pt-br'] = "Entre com o número de identificação a ser mandado para o número de destino (geralmente é o mesmo que o número de telefone).";
+	$text['desc-dest-caller-id-num']['fr-fr'] = "Choisir le numéro d'appelant à émettre au téléphone destination (Il est en général le même que votre numéro.)";

-$text['desc-auto-answer']['en-us'] = "Select whether to enable auto answer.";
-$text['desc-auto-answer']['ar-eg'] = "";
-$text['desc-auto-answer']['de-at'] = "Wählen Sie, ob die automatische Rufannahme aktiviert werden soll."; //copied from de-de
-$text['desc-auto-answer']['de-ch'] = "Wählen Sie, ob die automatische Rufannahme aktiviert werden soll."; //copied from de-de
-$text['desc-auto-answer']['de-de'] = "Wählen Sie, ob die automatische Rufannahme aktiviert werden soll.";
-$text['desc-auto-answer']['es-cl'] = "Indique si desea activar la respuesta automática.";
-$text['desc-auto-answer']['es-mx'] = "Indique si desea activar la respuesta automática."; //copied from es-cl
-$text['desc-auto-answer']['fr-ca'] = "Activer ou non la réponse automatique."; //copied from fr-fr
-$text['desc-auto-answer']['fr-fr'] = "Activer ou non la réponse automatique.";
-$text['desc-auto-answer']['he-il'] = "";
-$text['desc-auto-answer']['it-it'] = "Seleziona per abilitare la risposta automatica.";
-$text['desc-auto-answer']['nl-nl'] = "";
-$text['desc-auto-answer']['pl-pl'] = "";
-$text['desc-auto-answer']['pt-br'] = "Ativar ou desativar a resposta automática.";
-$text['desc-auto-answer']['pt-pt'] = "Activar ou Desactivar a resposta automática.";
-$text['desc-auto-answer']['ro-ro'] = "";
-$text['desc-auto-answer']['ru-ru'] = "Выберите для включения автоответа.";
-$text['desc-auto-answer']['sv-se'] = "Välj för att aktivera auto svara.";
-$text['desc-auto-answer']['uk-ua'] = "";
+	$text['label-src-num']['en-us'] = "Source Number";
+	$text['label-src-num']['es-cl'] = "Número de origen";
+	$text['label-src-num']['pt-pt'] = "Número de origem";
+	$text['label-src-num']['pt-br'] = "Número de origem";
+	$text['label-src-num']['fr-fr'] = "Numéro Source";

-$text['label-record']['en-us'] = "Record";
-$text['label-record']['ar-eg'] = "";
-$text['label-record']['de-at'] = "Aufzeichnen"; //copied from de-de
-$text['label-record']['de-ch'] = "Aufzeichnen"; //copied from de-de
-$text['label-record']['de-de'] = "Aufzeichnen";
-$text['label-record']['es-cl'] = "Grabar";
-$text['label-record']['es-mx'] = "Grabar"; //copied from es-cl
-$text['label-record']['fr-ca'] = "Enregistrer"; //copied from fr-fr
-$text['label-record']['fr-fr'] = "Enregistrer";
-$text['label-record']['he-il'] = "";
-$text['label-record']['it-it'] = "Registra";
-$text['label-record']['nl-nl'] = "";
-$text['label-record']['pl-pl'] = "";
-$text['label-record']['pt-br'] = "Gravar"; //copied from pt-pt
-$text['label-record']['pt-pt'] = "Gravar";
-$text['label-record']['ro-ro'] = "";
-$text['label-record']['ru-ru'] = "Запись";
-$text['label-record']['sv-se'] = "Spela In";
-$text['label-record']['uk-ua'] = "";
+	$text['desc-src-num']['en-us'] = "Enter your phone number. This can be an extension on the system, or another number (eg: mobile phone).";
+	$text['desc-src-num']['es-cl'] = "Ingrese su número de teléfono. Este puede ser una extesión en el sistema, u otro número (ej. teléfono movil).";
+	$text['desc-src-num']['pt-pt'] = "Introduza o seu número de telefone. Poderá ser uma extensão do sistema ou outro número (ex: número de telemóvel).";
+	$text['desc-src-num']['pt-br'] = "Entre com seu númerop de telefone. Pode ser um ramal ou outro número (ex: número de celular).";
+	$text['desc-src-num']['fr-fr'] = "Choisir votre numéro de téléphone. Il peut être une extension du système, ou tout autre numéro (eg: un mobile).";

-$text['label-true']['en-us'] = "true";
-$text['label-true']['ar-eg'] = "";
-$text['label-true']['de-at'] = "ein"; //copied from de-de
-$text['label-true']['de-ch'] = "ein"; //copied from de-de
-$text['label-true']['de-de'] = "ein";
-$text['label-true']['es-cl'] = "verdadero";
-$text['label-true']['es-mx'] = "verdadero"; //copied from es-cl
-$text['label-true']['fr-ca'] = "oui"; //copied from fr-fr
-$text['label-true']['fr-fr'] = "oui";
-$text['label-true']['he-il'] = "";
-$text['label-true']['it-it'] = "vero";
-$text['label-true']['nl-nl'] = "";
-$text['label-true']['pl-pl'] = "";
-$text['label-true']['pt-br'] = "sim"; //copied from pt-pt
-$text['label-true']['pt-pt'] = "sim";
-$text['label-true']['ro-ro'] = "";
-$text['label-true']['ru-ru'] = "да";
-$text['label-true']['sv-se'] = "sann";
-$text['label-true']['uk-ua'] = "";
+	$text['label-dest-num']['en-us'] = "Destination Number";
+	$text['label-dest-num']['es-cl'] = "Número de destino";
+	$text['label-dest-num']['pt-pt'] = "Número do Destino";
+	$text['label-dest-num']['pt-br'] = "Número do Destino";
+	$text['label-dest-num']['fr-fr'] = "Numéro Destination";

-$text['label-false']['en-us'] = "false";
-$text['label-false']['ar-eg'] = "";
-$text['label-false']['de-at'] = "aus"; //copied from de-de
-$text['label-false']['de-ch'] = "aus"; //copied from de-de
-$text['label-false']['de-de'] = "aus";
-$text['label-false']['es-cl'] = "falso";
-$text['label-false']['es-mx'] = "falso"; //copied from es-cl
-$text['label-false']['fr-ca'] = "non"; //copied from fr-fr
-$text['label-false']['fr-fr'] = "non";
-$text['label-false']['he-il'] = "";
-$text['label-false']['it-it'] = "falso";
-$text['label-false']['nl-nl'] = "";
-$text['label-false']['pl-pl'] = "";
-$text['label-false']['pt-br'] = "não"; //copied from pt-pt
-$text['label-false']['pt-pt'] = "não";
-$text['label-false']['ro-ro'] = "";
-$text['label-false']['ru-ru'] = "нет";
-$text['label-false']['sv-se'] = "falsk";
-$text['label-false']['uk-ua'] = "";
+	$text['desc-dest-num']['en-us'] = "Enter the number to call. This can be an extension on the system, another number, or a sip uri.  Sip URI's are of the form 5551234567@voip.example.com:5080 (5080 for freeswitch, or 5060 for other systems).";
+	$text['desc-dest-num']['es-cl'] = "Ingrese el número a llamar. Este puede ser una extensión en el sistema, otro número o un uri sip. Uri's sip son de la forma 5551234567@voip.example.com:5080 (5080 para freeswitch, o 5060 para otros sistemas).";
+	$text['desc-dest-num']['pt-pt'] = "Introduza o número para chamar. Poderá ser uma extensão do sistema, outro número, ou um SIP URI.  Os SIP URI's respeitam a seguinte nomenclatura: +351210000000@voip.example.com";
+	$text['desc-dest-num']['pt-pt'] = "Entre com o número a ser ligado. Pode ser um ramal, outro número, ou SIP URI. Exemplo de SIP URI: 12345678@voip.example.com:5080, sendo 5080 para o freeswitch ou 5060 para outros sistemas.";
+	$text['desc-dest-num']['fr-fr'] = "Choisir un numéro à appeler. Il peut être une extension du système, un autre numéro, une URI SIP. les URI SIP sont de la forme : 5551234567@voip.example.com:5080 (5080 pour freeswitch, ou 5060 pour d'autre système).";

-$text['desc-record']['en-us'] = "Select whether to record the call.";
-$text['desc-record']['ar-eg'] = "";
-$text['desc-record']['de-at'] = "Wählen Sie, ob der Anruf aufgezeichnet werden soll."; //copied from de-de
-$text['desc-record']['de-ch'] = "Wählen Sie, ob der Anruf aufgezeichnet werden soll."; //copied from de-de
-$text['desc-record']['de-de'] = "Wählen Sie, ob der Anruf aufgezeichnet werden soll.";
-$text['desc-record']['es-cl'] = "Indique si desea grabar la llamada.";
-$text['desc-record']['es-mx'] = "Indique si desea grabar la llamada."; //copied from es-cl
-$text['desc-record']['fr-ca'] = "Choisir si vous voulez enregistrer l'appel."; //copied from fr-fr
-$text['desc-record']['fr-fr'] = "Choisir si vous voulez enregistrer l'appel.";
-$text['desc-record']['he-il'] = "";
-$text['desc-record']['it-it'] = "Seleziona per registrare la telefonata.";
-$text['desc-record']['nl-nl'] = "";
-$text['desc-record']['pl-pl'] = "";
-$text['desc-record']['pt-br'] = "Escolha se quer gravar chamada."; //copied from pt-pt
-$text['desc-record']['pt-pt'] = "Escolha se quer gravar chamada.";
-$text['desc-record']['ro-ro'] = "";
-$text['desc-record']['ru-ru'] = "Выберите для включения записи.";
-$text['desc-record']['sv-se'] = "Välj om samtalet skall spelas in.";
-$text['desc-record']['uk-ua'] = "";
+	$text['label-auto-answer']['en-us'] = "Auto Answer";
+	$text['label-auto-answer']['es-cl'] = "respuesta automática";
+	$text['label-auto-answer']['pt-pt'] = "Resposta Automática";
+	$text['label-auto-answer']['pt-br'] = "Resposta Automática";
+	$text['label-auto-answer']['fr-fr'] = "Réponse Auto";

-$text['label-ringback']['en-us'] = "Ring Back";
-$text['label-ringback']['ar-eg'] = "";
-$text['label-ringback']['de-at'] = "Rufton"; //copied from de-de
-$text['label-ringback']['de-ch'] = "Rufton"; //copied from de-de
-$text['label-ringback']['de-de'] = "Rufton";
-$text['label-ringback']['es-cl'] = "Regresar tono";
-$text['label-ringback']['es-mx'] = "Regresar tono"; //copied from es-cl
-$text['label-ringback']['fr-ca'] = "Retour de sonnerie"; //copied from fr-fr
-$text['label-ringback']['fr-fr'] = "Retour de sonnerie";
-$text['label-ringback']['he-il'] = "";
-$text['label-ringback']['it-it'] = "Tono";
-$text['label-ringback']['nl-nl'] = "";
-$text['label-ringback']['pl-pl'] = "";
-$text['label-ringback']['pt-br'] = "Tocar de volta (Ring Back)";
-$text['label-ringback']['pt-pt'] = "Ring Back";
-$text['label-ringback']['ro-ro'] = "";
-$text['label-ringback']['ru-ru'] = "Контроль посылки вызова (КПВ)";
-$text['label-ringback']['sv-se'] = "Tillbakaringning";
-$text['label-ringback']['uk-ua'] = "";
+	$text['desc-auto-answer']['en-us'] = "Select whether to enable auto answer.";
+	$text['desc-auto-answer']['es-cl'] = "Indique si desea activar la respuesta automática.";
+	$text['desc-auto-answer']['pt-pt'] = "Activar ou Desactivar a resposta automática.";
+	$text['desc-auto-answer']['pt-br'] = "Ativar ou desativar a resposta automática.";
+	$text['desc-auto-answer']['fr-fr'] = "Activer ou non la réponse automatique.";

-$text['desc-ringback']['en-us'] = "Defines what you will hear while destination is being called. The choices are music (music on hold) ring (ring tone).";
-$text['desc-ringback']['ar-eg'] = "";
-$text['desc-ringback']['de-at'] = "Geben Sie an, was Sie hören möchten, während die Verbindung aufgebaut wird. Zur Auswahl stehen musik (Wartemusik) oder Rufton"; //copied from de-de
-$text['desc-ringback']['de-ch'] = "Geben Sie an, was Sie hören möchten, während die Verbindung aufgebaut wird. Zur Auswahl stehen musik (Wartemusik) oder Rufton"; //copied from de-de
-$text['desc-ringback']['de-de'] = "Geben Sie an, was Sie hören möchten, während die Verbindung aufgebaut wird. Zur Auswahl stehen musik (Wartemusik) oder Rufton";
-$text['desc-ringback']['es-cl'] = "Defina qué desea escuchar mientras se llama al destinatario. Las opciones son música (música en espera) o tono de marcado";
-$text['desc-ringback']['es-mx'] = "Defina qué desea escuchar mientras se llama al destinatario. Las opciones son música (música en espera) o tono de marcado"; //copied from es-cl
-$text['desc-ringback']['fr-ca'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique de garde) sonnerie."; //copied from fr-fr
-$text['desc-ringback']['fr-fr'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique de garde) sonnerie.";
-$text['desc-ringback']['he-il'] = "";
-$text['desc-ringback']['it-it'] = "Definisce cosa sentirai mentre il destinatario è chiamato. Le scelte sono musica (music on hold) o tono (ring tone).";
-$text['desc-ringback']['nl-nl'] = "";
-$text['desc-ringback']['pl-pl'] = "";
-$text['desc-ringback']['pt-br'] = "Definir o que deseja escutar enquanto o destino não atende. As escolhas são música (música em espera) ring (tom de chamada).";
-$text['desc-ringback']['pt-pt'] = "Definir o que deseja ouvir enquanto o destino não atende. As escolhas são música (música em espera) ring (tom de chamada).";
-$text['desc-ringback']['ro-ro'] = "";
-$text['desc-ringback']['ru-ru'] = "Определяет что вы услышите во время вызова номера назначения. Вы можете выбрать music (музыка на удержании) или ring (звонок).";
-$text['desc-ringback']['sv-se'] = "Definierar vad du kommer att höra när destinationen rings upp. Valet är musik (musik i vänteläge) ring (ringsignal).";
-$text['desc-ringback']['uk-ua'] = "";
+	$text['label-record']['en-us'] = "Record";
+	$text['label-record']['es-cl'] = "Grabar";
+	$text['label-record']['pt-pt'] = "Gravar";
+	$text['label-record']['pt-br'] = "Gravar";
+	$text['label-record']['fr-fr'] = "Enregistrer";

-$text['opt-usring']['en-us'] = "us-ring";
-$text['opt-usring']['ar-eg'] = "";
-$text['opt-usring']['de-at'] = "us-ring"; //copied from de-de
-$text['opt-usring']['de-ch'] = "us-ring"; //copied from de-de
-$text['opt-usring']['de-de'] = "us-ring";
-$text['opt-usring']['es-cl'] = "us-ring";
-$text['opt-usring']['es-mx'] = "us-ring"; //copied from es-cl
-$text['opt-usring']['fr-ca'] = "us-ring"; //copied from fr-fr
-$text['opt-usring']['fr-fr'] = "us-ring";
-$text['opt-usring']['he-il'] = "";
-$text['opt-usring']['it-it'] = "us-ring";
-$text['opt-usring']['nl-nl'] = "";
-$text['opt-usring']['pl-pl'] = "";
-$text['opt-usring']['pt-br'] = "us-ring"; //copied from pt-pt
-$text['opt-usring']['pt-pt'] = "us-ring";
-$text['opt-usring']['ro-ro'] = "";
-$text['opt-usring']['ru-ru'] = "us-ring";
-$text['opt-usring']['sv-se'] = "us-ring";
-$text['opt-usring']['uk-ua'] = "";
+	$text['label-true']['en-us'] = "true";
+	$text['label-true']['es-cl'] = "verdadero";
+	$text['label-true']['pt-pt'] = "sim";
+	$text['label-true']['pt-br'] = "sim";
+	$text['label-true']['fr-fr'] = "oui";

-$text['opt-frring']['en-us'] = "fr-ring";
-$text['opt-frring']['ar-eg'] = "";
-$text['opt-frring']['de-at'] = "fr-ring"; //copied from de-de
-$text['opt-frring']['de-ch'] = "fr-ring"; //copied from de-de
-$text['opt-frring']['de-de'] = "fr-ring";
-$text['opt-frring']['es-cl'] = "fr-ring";
-$text['opt-frring']['es-mx'] = "fr-ring"; //copied from es-cl
-$text['opt-frring']['fr-ca'] = "fr-ring"; //copied from fr-fr
-$text['opt-frring']['fr-fr'] = "fr-ring";
-$text['opt-frring']['he-il'] = "";
-$text['opt-frring']['it-it'] = "fr-ring";
-$text['opt-frring']['nl-nl'] = "";
-$text['opt-frring']['pl-pl'] = "";
-$text['opt-frring']['pt-br'] = "fr-ring"; //copied from pt-pt
-$text['opt-frring']['pt-pt'] = "fr-ring";
-$text['opt-frring']['ro-ro'] = "";
-$text['opt-frring']['ru-ru'] = "fr-ring";
-$text['opt-frring']['sv-se'] = "fr-ring";
-$text['opt-frring']['uk-ua'] = "";
+	$text['label-false']['en-us'] = "false";
+	$text['label-false']['es-cl'] = "falso";
+	$text['label-false']['pt-pt'] = "não";
+	$text['label-false']['pt-pt'] = "não";
+	$text['label-false']['fr-fr'] = "non";

-$text['opt-ptring']['en-us'] = "pt-ring";
-$text['opt-ptring']['ar-eg'] = "";
-$text['opt-ptring']['de-at'] = "pt-ring"; //copied from de-de
-$text['opt-ptring']['de-ch'] = "pt-ring"; //copied from de-de
-$text['opt-ptring']['de-de'] = "pt-ring";
-$text['opt-ptring']['es-cl'] = "pt-ring";
-$text['opt-ptring']['es-mx'] = "pt-ring"; //copied from es-cl
-$text['opt-ptring']['fr-ca'] = "pt-ring"; //copied from fr-fr
-$text['opt-ptring']['fr-fr'] = "pt-ring";
-$text['opt-ptring']['he-il'] = "";
-$text['opt-ptring']['it-it'] = "pt-ring";
-$text['opt-ptring']['nl-nl'] = "";
-$text['opt-ptring']['pl-pl'] = "";
-$text['opt-ptring']['pt-br'] = "pt-ring"; //copied from pt-pt
-$text['opt-ptring']['pt-pt'] = "pt-ring";
-$text['opt-ptring']['ro-ro'] = "";
-$text['opt-ptring']['ru-ru'] = "pt-ring";
-$text['opt-ptring']['sv-se'] = "pt-ring";
-$text['opt-ptring']['uk-ua'] = "";
+	$text['desc-record']['en-us'] = "Select whether to record the call.";
+	$text['desc-record']['es-cl'] = "Indique si desea grabar la llamada.";
+	$text['desc-record']['pt-pt'] = "Escolha se quer gravar chamada.";
+	$text['desc-record']['pt-br'] = "Escolha se quer gravar chamada.";
+	$text['desc-record']['fr-fr'] = "Choisir si vous voulez enregistrer l'appel.";

-$text['opt-ukring']['en-us'] = "uk-ring";
-$text['opt-ukring']['ar-eg'] = "";
-$text['opt-ukring']['de-at'] = "uk-ring"; //copied from de-de
-$text['opt-ukring']['de-ch'] = "uk-ring"; //copied from de-de
-$text['opt-ukring']['de-de'] = "uk-ring";
-$text['opt-ukring']['es-cl'] = "uk-ring";
-$text['opt-ukring']['es-mx'] = "uk-ring"; //copied from es-cl
-$text['opt-ukring']['fr-ca'] = "uk-ring"; //copied from fr-fr
-$text['opt-ukring']['fr-fr'] = "uk-ring";
-$text['opt-ukring']['he-il'] = "";
-$text['opt-ukring']['it-it'] = "uk-ring";
-$text['opt-ukring']['nl-nl'] = "";
-$text['opt-ukring']['pl-pl'] = "";
-$text['opt-ukring']['pt-br'] = "uk-ring"; //copied from pt-pt
-$text['opt-ukring']['pt-pt'] = "uk-ring";
-$text['opt-ukring']['ro-ro'] = "";
-$text['opt-ukring']['ru-ru'] = "uk-ring";
-$text['opt-ukring']['sv-se'] = "uk-ring";
-$text['opt-ukring']['uk-ua'] = "";
+	$text['label-ringback']['en-us'] = "Ring Back";
+	$text['label-ringback']['es-cl'] = "Regresar tono";
+	$text['label-ringback']['pt-pt'] = "Ring Back";
+	$text['label-ringback']['pt-br'] = "Tocar de volta (Ring Back)";
+	$text['label-ringback']['fr-fr'] = "Retour de sonnerie";

-$text['opt-rsring']['en-us'] = "rs-ring";
-$text['opt-rsring']['ar-eg'] = "";
-$text['opt-rsring']['de-at'] = "rs-ring"; //copied from de-de
-$text['opt-rsring']['de-ch'] = "rs-ring"; //copied from de-de
-$text['opt-rsring']['de-de'] = "rs-ring";
-$text['opt-rsring']['es-cl'] = "rs-ring";
-$text['opt-rsring']['es-mx'] = "rs-ring"; //copied from es-cl
-$text['opt-rsring']['fr-ca'] = "rs-ring"; //copied from fr-fr
-$text['opt-rsring']['fr-fr'] = "rs-ring";
-$text['opt-rsring']['he-il'] = "";
-$text['opt-rsring']['it-it'] = "rs-ring";
-$text['opt-rsring']['nl-nl'] = "";
-$text['opt-rsring']['pl-pl'] = "";
-$text['opt-rsring']['pt-br'] = "rs-ring"; //copied from pt-pt
-$text['opt-rsring']['pt-pt'] = "rs-ring";
-$text['opt-rsring']['ro-ro'] = "";
-$text['opt-rsring']['ru-ru'] = "rs-ring";
-$text['opt-rsring']['sv-se'] = "rs-ring";
-$text['opt-rsring']['uk-ua'] = "";
+	$text['desc-ringback']['en-us'] = "Defines what you will hear while destination is being called. The choices are music (music on hold) ring (ring tone).";
+	$text['desc-ringback']['es-cl'] = "Defina qué desea escuchar mientras se llama al destinatario. Las opciones son música (música en espera) o tono de marcado";
+	$text['desc-ringback']['pt-pt'] = "Definir o que deseja ouvir enquanto o destino não atende. As escolhas são música (música em espera) ring (tom de chamada).";
+	$text['desc-ringback']['pt-br'] = "Definir o que deseja escutar enquanto o destino não atende. As escolhas são música (música em espera) ring (tom de chamada).";
+	$text['desc-ringback']['fr-fr'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique de garde) sonnerie.";

-$text['opt-ruring']['en-us'] = "ru-ring";
-$text['opt-ruring']['ar-eg'] = "";
-$text['opt-ruring']['de-at'] = "ru-ring"; //copied from de-de
-$text['opt-ruring']['de-ch'] = "ru-ring"; //copied from de-de
-$text['opt-ruring']['de-de'] = "ru-ring";
-$text['opt-ruring']['es-cl'] = "ru-ring";
-$text['opt-ruring']['es-mx'] = "ru-ring"; //copied from es-cl
-$text['opt-ruring']['fr-ca'] = "ru-ring"; //copied from fr-fr
-$text['opt-ruring']['fr-fr'] = "ru-ring";
-$text['opt-ruring']['he-il'] = "";
-$text['opt-ruring']['it-it'] = "ru-ring";
-$text['opt-ruring']['nl-nl'] = "";
-$text['opt-ruring']['pl-pl'] = "";
-$text['opt-ruring']['pt-br'] = "ru-ring"; //copied from pt-pt
-$text['opt-ruring']['pt-pt'] = "ru-ring";
-$text['opt-ruring']['ro-ro'] = "";
-$text['opt-ruring']['ru-ru'] = "ru-ring";
-$text['opt-ruring']['sv-se'] = "ru-ring";
-$text['opt-ruring']['uk-ua'] = "";
+	$text['opt-usring']['en-us'] = "us-ring";
+	$text['opt-usring']['es-cl'] = "us-ring";
+	$text['opt-usring']['pt-pt'] = "us-ring";
+	$text['opt-usring']['pt-br'] = "us-ring";
+	$text['opt-usring']['fr-fr'] = "us-ring";

-$text['opt-itring']['en-us'] = "it-ring";
-$text['opt-itring']['ar-eg'] = "";
-$text['opt-itring']['de-at'] = "it-ring"; //copied from de-de
-$text['opt-itring']['de-ch'] = "it-ring"; //copied from de-de
-$text['opt-itring']['de-de'] = "it-ring";
-$text['opt-itring']['es-cl'] = "it-ring";
-$text['opt-itring']['es-mx'] = "it-ring"; //copied from es-cl
-$text['opt-itring']['fr-ca'] = "it-ring"; //copied from fr-fr
-$text['opt-itring']['fr-fr'] = "it-ring";
-$text['opt-itring']['he-il'] = "";
-$text['opt-itring']['it-it'] = "it-ring";
-$text['opt-itring']['nl-nl'] = "";
-$text['opt-itring']['pl-pl'] = "";
-$text['opt-itring']['pt-br'] = "it-ring"; //copied from pt-pt
-$text['opt-itring']['pt-pt'] = "it-ring";
-$text['opt-itring']['ro-ro'] = "";
-$text['opt-itring']['ru-ru'] = "it-ring";
-$text['opt-itring']['sv-se'] = "it-ring";
-$text['opt-itring']['uk-ua'] = "";
+	$text['opt-frring']['en-us'] = "fr-ring";
+	$text['opt-frring']['es-cl'] = "fr-ring";
+	$text['opt-frring']['pt-pt'] = "fr-ring";
+	$text['opt-frring']['pt-br'] = "fr-ring";
+	$text['opt-frring']['fr-fr'] = "fr-ring";

-$text['opt-dering']['en-us'] = "de-ring";
-$text['opt-dering']['ar-eg'] = "";
-$text['opt-dering']['de-at'] = "de-ring"; //copied from de-de
-$text['opt-dering']['de-ch'] = "de-ring"; //copied from de-de
-$text['opt-dering']['de-de'] = "de-ring";
-$text['opt-dering']['es-cl'] = "de-ring";
-$text['opt-dering']['es-mx'] = "de-ring"; //copied from es-cl
-$text['opt-dering']['fr-ca'] = "de-ring"; //copied from fr-fr
-$text['opt-dering']['fr-fr'] = "de-ring";
-$text['opt-dering']['he-il'] = "";
-$text['opt-dering']['it-it'] = "de-ring";
-$text['opt-dering']['nl-nl'] = "";
-$text['opt-dering']['pl-pl'] = "";
-$text['opt-dering']['pt-br'] = "de-ring"; //copied from pt-pt
-$text['opt-dering']['pt-pt'] = "de-ring";
-$text['opt-dering']['ro-ro'] = "";
-$text['opt-dering']['ru-ru'] = "de-ring";
-$text['opt-dering']['sv-se'] = "de-ring";
-$text['opt-dering']['uk-ua'] = "";
+	$text['opt-ptring']['en-us'] = "pt-ring";
+	$text['opt-ptring']['es-cl'] = "pt-ring";
+	$text['opt-ptring']['pt-pt'] = "pt-ring";
+	$text['opt-ptring']['pt-br'] = "pt-ring";
+	$text['opt-ptring']['fr-fr'] = "pt-ring";

-$text['opt-moh']['en-us'] = "music";
-$text['opt-moh']['ar-eg'] = "";
-$text['opt-moh']['de-at'] = "Musik"; //copied from de-de
-$text['opt-moh']['de-ch'] = "Musik"; //copied from de-de
-$text['opt-moh']['de-de'] = "Musik";
-$text['opt-moh']['es-cl'] = "musica";
-$text['opt-moh']['es-mx'] = "musica"; //copied from es-cl
-$text['opt-moh']['fr-ca'] = "musique"; //copied from fr-fr
-$text['opt-moh']['fr-fr'] = "musique";
-$text['opt-moh']['he-il'] = "";
-$text['opt-moh']['it-it'] = "musica";
-$text['opt-moh']['nl-nl'] = "";
-$text['opt-moh']['pl-pl'] = "";
-$text['opt-moh']['pt-br'] = "música"; //copied from pt-pt
-$text['opt-moh']['pt-pt'] = "música";
-$text['opt-moh']['ro-ro'] = "";
-$text['opt-moh']['ru-ru'] = "music";
-$text['opt-moh']['sv-se'] = "musik";
-$text['opt-moh']['uk-ua'] = "";
+	$text['opt-ukring']['en-us'] = "uk-ring";
+	$text['opt-ukring']['es-cl'] = "uk-ring";
+	$text['opt-ukring']['pt-pt'] = "uk-ring";
+	$text['opt-ukring']['pt-br'] = "uk-ring";
+	$text['opt-ukring']['fr-fr'] = "uk-ring";

-$text['button-call']['en-us'] = "Call";
-$text['button-call']['ar-eg'] = "";
-$text['button-call']['de-at'] = "Anrufen"; //copied from de-de
-$text['button-call']['de-ch'] = "Anrufen"; //copied from de-de
-$text['button-call']['de-de'] = "Anrufen";
-$text['button-call']['es-cl'] = "Llamar";
-$text['button-call']['es-mx'] = "Llamar"; //copied from es-cl
-$text['button-call']['fr-ca'] = "appel"; //copied from fr-fr
-$text['button-call']['fr-fr'] = "appel";
-$text['button-call']['he-il'] = "";
-$text['button-call']['it-it'] = "Chiama";
-$text['button-call']['nl-nl'] = "";
-$text['button-call']['pl-pl'] = "";
-$text['button-call']['pt-br'] = "Chamada"; //copied from pt-pt
-$text['button-call']['pt-pt'] = "Chamada";
-$text['button-call']['ro-ro'] = "";
-$text['button-call']['ru-ru'] = "Call";
-$text['button-call']['sv-se'] = "Ring";
-$text['button-call']['uk-ua'] = "";
+	$text['opt-rsring']['en-us'] = "rs-ring";
+	$text['opt-rsring']['es-cl'] = "rs-ring";
+	$text['opt-rsring']['pt-pt'] = "rs-ring";
+	$text['opt-rsring']['pt-br'] = "rs-ring";
+	$text['opt-rsring']['fr-fr'] = "rs-ring";
+
+	$text['opt-itring']['en-us'] = "it-ring";
+	$text['opt-itring']['es-cl'] = "it-ring";
+	$text['opt-itring']['pt-pt'] = "it-ring";
+	$text['opt-itring']['pt-br'] = "it-ring";
+	$text['opt-itring']['fr-fr'] = "it-ring";
+
+	$text['opt-moh']['en-us'] = "music";
+	$text['opt-moh']['es-cl'] = "musica";
+	$text['opt-moh']['pt-pt'] = "música";
+	$text['opt-moh']['pt-br'] = "música";
+	$text['opt-moh']['fr-fr'] = "musique";
+
+	$text['button-call']['en-us'] = "Call";
+	$text['button-call']['es-cl'] = "Llamar";
+	$text['button-call']['pt-pt'] = "Chamada";
+	$text['button-call']['pt-br'] = "Chamada";
+	$text['button-call']['fr-fr'] = "appel";

 ?>
@@ -1,28 +1,18 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Click to Call";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Click to Call";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Click to Call";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Pulse para Llamar";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Cliquez pour Appeller";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Clicca e Chiama";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Clicar para Chamadas";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Вызов по клику";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = "f862556f-9ddd-2697-fdf4-bed08ec63aa5";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/click_to_call/click_to_call.php";
+	$apps[$x]['menu'][0]['title']['en-us'] = "Click to Call";
+	$apps[$x]['menu'][0]['title']['es-cl'] = "Pulse para Llamar";
+	$apps[$x]['menu'][0]['title']['de-de'] = "";
+	$apps[$x]['menu'][0]['title']['de-ch'] = "";
+	$apps[$x]['menu'][0]['title']['de-at'] = "";
+	$apps[$x]['menu'][0]['title']['fr-fr'] = "Cliquez pour Appeller";
+	$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][0]['title']['fr-ch'] = "";
+	$apps[$x]['menu'][0]['title']['pt-pt'] = "Clicar para Chamadas";
+	$apps[$x]['menu'][0]['title']['pt-br'] = "";
+	$apps[$x]['menu'][0]['uuid'] = "f862556f-9ddd-2697-fdf4-bed08ec63aa5";
+	$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+	$apps[$x]['menu'][0]['category'] = "internal";
+	$apps[$x]['menu'][0]['path'] = "/app/click_to_call/click_to_call.php";

 ?>
@@ -81,7 +81,6 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 			case "pt-ring": $ringback_value = "\'%(1000,5000,400.0,0.0)\'"; break;
 			case "rs-ring": $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; break;
 			case "it-ring": $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; break;
-			case "de-ring": $ringback_value = "\'%(1000,4000,425.0,0.0)\'"; break;
 			case "us-ring":
 			default:
 				$ringback = 'us-ring';
@@ -345,12 +344,6 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 	else {
 		echo "    <option value='rs-ring'>".$text['opt-rsring']."</option>\n";
 	}
-	if ($ringback == "ru-ring") {
-		echo "    <option value='ru-ring' selected='selected'>".$text['opt-ruring']."</option>\n";
-	}
-	else {
-		echo "    <option value='ru-ring'>".$text['opt-ruring']."</option>\n";
-	}
 	if ($ringback == "it-ring") {
 		echo "    <option value='it-ring' selected='selected'>".$text['opt-itring']."</option>\n";
 	}
@@ -5,31 +5,22 @@
 		$apps[$x]['uuid'] = "8d083f5a-f726-42a8-9ffa-8d28f848f10e";
 		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Conferences Centers allows one or more audio and video conference rooms.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Konferenzzentralen stellen ein oder mehrere Audio- und Videokonferenzräume bereit.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Konferenzzentralen stellen ein oder mehrere Audio- und Videokonferenzräume bereit.";
 		$apps[$x]['description']['es-cl'] = "El Centro de Conferencia permite una o más salas de conferencia para audio y video.";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Centre de Conférences permet une ou plus conferences audio ou vidéo.";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "O centro de conferências permite gerir uma ou mais salas de conferência de audio e vídeo.";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "O centro de conferências permite gerir uma ou mais salas de conferência, audio e vídeo.";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
+		$apps[$x]['description']['pt-br'] = "O centro de conferências permite gerir uma ou mais salas de conferência de audio e vídeo.";

 	//destination details
-		$y=0;
+		$y = 0;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "conference_centers";
 		$apps[$x]['destinations'][$y]['name'] = "conference_centers";
@@ -43,7 +34,7 @@
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name} \${description}";

 	//permission details
-		$y=0;
+		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "conference_center_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -176,10 +167,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";

 	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_conference_centers";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_conference_centers";
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -206,31 +196,36 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_center_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the conference center name.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o nome do centro de conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_center_extension";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the conference center extension number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o ramal do centro de conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_center_pin_length";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the pin length.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Informe o tamanho do código PIN.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_center_greeting";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the conference greeting.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com as boas-vindas da conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_center_description";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the center description.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com a descrição do centro de conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_center_enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enable or disable the conference center.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Habilite ou desabilite o centro de conferência.";

-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_conference_rooms";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 1; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_conference_rooms";
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -253,6 +248,7 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_conference_centers";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "conference_center_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Conference UUID";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Identificador universal único do centro de conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "meeting_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
@@ -262,68 +258,84 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_meetings";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "meeting_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Meeting UUID";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Identificador universal único do encontro/reunião.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_room_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the conference room name.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Entre com o nome da sala de conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "profile";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the conference profile.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Selecione o perfil da conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "record";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "recording";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select whether to record the conference.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Selecione se deseja gravar a conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "max_members";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Limit number of people in the conference.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Número máximo de pessoas na conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "start_datetime";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Open the conference room at the start time.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Abra a sala de conferência na hora de início.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "stop_datetime";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Close the conference room at the stop time.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Fecha a sala de conferência na hora do término.";
+		$z++;
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "wait_mod";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Wait for the moderator to join before starting the conference.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Esperar pelo moderador se juntar antes de começar a conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "announce";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Introduce participants as they enter the conference.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Anunciar os participantes a medida que entram na conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "sounds";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Play sound when someone enters or exists the conference.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Tocar um som quando alguém entrar ou sair da conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "mute";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Mute participants on entering the conference.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Silenciar participantes ao entrar na conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "created";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Date when the conference was created.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Data de quando a conferência foi criada.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "created_by";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "The user that created the conference session.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Usuário que criou está conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select to enable or disable the session.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Habilitar ou desabilitar a sessão de conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "description";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Description.for the conference session.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Descrição para a sessão de conferência.";
+		$z++;

-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_conference_sessions";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
+		$y = 2; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_conference_sessions";
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -346,27 +358,32 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_meetings";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "meeting_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "meeting_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "meeting_uuid (identificador de reunião)";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "profile";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the conference profile.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Selecione o perfil da conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "recording";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Conference Recording";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Gravações da conferência.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "start_epoch";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "start_epoch";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Início do período.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "end_epoch";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "end_epoch";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Fim do período.";
+		$z++;

-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_conference_session_details";
-		$apps[$x]['db'][$y]['table']['parent'] = "v_conference_sessions";
-		$z=0;
+		$y = 3; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = "v_conference_session_details";
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -397,39 +414,49 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_meetings";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "meeting_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "meeting_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "meeting_uuid";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "username";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Extension number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Ramal.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "caller_id_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "caller_id_name";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Nome da pessoa que liga";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "caller_id_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "caller_id_number";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Nome da pessoa que liga";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Call UUID";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Identificador único da chamada.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "moderator";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Moderator";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Moderador";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "network_addr";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "network address";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Endereço de rede";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "start_epoch";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "start_epoch";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Início do período";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "end_epoch";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "end_epoch";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = "Fim do período";
+		$z++;

 ?>
@@ -1,31 +1,20 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = "Conference Centers";
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = "Konferenz Zentrale";
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = "Konferenz Zentrale";
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "Cent. de Conferencias";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Centre de Conférences";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Centro Conferenze";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Centrum Konferencyjne";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = "Centro de Conferência";
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Conferencias";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = "Конференц-центр";
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "Konferenscenter";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "Конференц-центр";
-	$apps[$x]['menu'][$y]['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
-	$apps[$x]['menu'][$y]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-	$apps[$x]['menu'][$y]['category'] = "internal";
-	$apps[$x]['menu'][$y]['path'] = "/app/conference_centers/conference_centers.php";
-	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
-	$apps[$x]['menu'][$y]['groups'][] = "admin";
-	$apps[$x]['menu'][$y]['groups'][] = "user";
+$apps[$x]['menu'][0]['title']['en-us'] = "Conference Center";
+$apps[$x]['menu'][0]['title']['es-cl'] = "Cent. de Conferencias";
+$apps[$x]['menu'][0]['title']['fr-fr'] = "Centre de Conférences";
+$apps[$x]['menu'][0]['title']['pt-pt'] = "Conferencias";
+$apps[$x]['menu'][0]['title']['pt-br'] = "Centro de Conferência";
+$apps[$x]['menu'][0]['title']['pl'] = "Centrum Konferencyjne";
+$apps[$x]['menu'][0]['title']['sv-se'] = "Konferenscenter";
+$apps[$x]['menu'][0]['title']['uk'] = "Конференц-центр";
+$apps[$x]['menu'][0]['title']['de-at'] = "Konferenz Zentrale";
+$apps[$x]['menu'][0]['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
+$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
+$apps[$x]['menu'][0]['category'] = "internal";
+$apps[$x]['menu'][0]['path'] = "/app/conference_centers/conference_centers.php";
+$apps[$x]['menu'][0]['groups'][] = "superadmin";
+$apps[$x]['menu'][0]['groups'][] = "admin";
+$apps[$x]['menu'][0]['groups'][] = "user";

-?>
+?>
@@ -90,7 +90,7 @@ else {
 	}

 //redirect the browser
-	messages::add($text['message-delete']);
+	$_SESSION["message"] = $text['message-delete'];
 	header("Location: conference_centers.php");
 	return;

@@ -27,9 +27,9 @@
 //includes
 	require_once "root.php";
 	require_once "resources/require.php";
+	require_once "resources/check_auth.php";

 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('conference_center_add') || permission_exists('conference_center_edit')) {
 		//access granted
 	}
@@ -52,27 +52,30 @@
 	}

 //get http post variables and set them to php variables
-	if (is_array($_POST)) {
-		$conference_center_uuid = check_str($_POST["conference_center_uuid"]);
+	if (count($_POST) > 0) {
 		$dialplan_uuid = check_str($_POST["dialplan_uuid"]);
 		$conference_center_name = check_str($_POST["conference_center_name"]);
 		$conference_center_extension = check_str($_POST["conference_center_extension"]);
 		$conference_center_greeting = check_str($_POST["conference_center_greeting"]);
 		$conference_center_pin_length = check_str($_POST["conference_center_pin_length"]);
-		$conference_center_enabled = check_str($_POST["conference_center_enabled"]);
 		$conference_center_description = check_str($_POST["conference_center_description"]);
+		$conference_center_enabled = check_str($_POST["conference_center_enabled"]);
+
+		//sanitize the conference name
+		$conference_center_name = preg_replace("/[^A-Za-z0-9\- ]/", "", $conference_center_name);
+		$conference_center_name = str_replace(" ", "-", $conference_center_name);
 	}

-//process the user data and save it to the database
-	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
+//process user data
+	if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {

-		//get the uuid from the POST
+		//get the id
 			if ($action == "update") {
 				$conference_center_uuid = check_str($_POST["conference_center_uuid"]);
 			}

 		//check for all required data
-			$msg = '';
+					$msg = '';
 			//if (strlen($dialplan_uuid) == 0) { $msg .= "Please provide: Dialplan UUID<br>\n"; }
 			if (strlen($conference_center_name) == 0) { $msg .= "Please provide: Name<br>\n"; }
 			if (strlen($conference_center_extension) == 0) { $msg .= "Please provide: Extension<br>\n"; }
@@ -93,118 +96,163 @@
 				return;
 			}

-		//set the domain_uuid
-			$_POST["domain_uuid"] = $_SESSION["domain_uuid"];
-
-		//add the conference_center_uuid
-			if (!isset($_POST["conference_center_uuid"])) {
-				$conference_center_uuid = uuid();
-				$_POST["conference_center_uuid"] = $conference_center_uuid;
-			}
-
-		//add the dialplan_uuid
-			if (!isset($_POST["dialplan_uuid"])) {
-				$dialplan_uuid = uuid();
-				$_POST["dialplan_uuid"] = $dialplan_uuid;
-			}
-
-		//build the xml dialplan
-			$dialplan_xml = "<extension name=\"".$conference_center_name."\" continue=\"\" uuid=\"".$dialplan_uuid."\">\n";
-			if ($conference_center_pin_length > 1 && $conference_center_pin_length < 4) {
-				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^(".$conference_center_extension.")(\d{".$conference_center_pin_length."})$\" break=\"on-true\">\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"destination_number=$1\"/>\n";
-				$dialplan_xml .= "		<action application=\"set\" data=\"pin_number=$2\"/>\n";
-				$dialplan_xml .= "		<action application=\"lua\" data=\"app.lua conference_center\"/>\n";
-				$dialplan_xml .= "	</condition>\n";
-			}
-			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$conference_center_extension."$\">\n";
-			$dialplan_xml .= "		<action application=\"lua\" data=\"app.lua conference_center\"/>\n";
-			$dialplan_xml .= "	</condition>\n";
-			$dialplan_xml .= "</extension>\n";
-
-		//build the dialplan array
-			$dialplan["domain_uuid"] = $_SESSION['domain_uuid'];
-			$dialplan["dialplan_uuid"] = $dialplan_uuid;
-			$dialplan["dialplan_name"] = $conference_center_name;
-			$dialplan["dialplan_number"] = $conference_center_extension;
-			$dialplan["dialplan_context"] = $_SESSION['context'];
-			$dialplan["dialplan_continue"] = "false";
-			$dialplan["dialplan_xml"] = $dialplan_xml;
-			$dialplan["dialplan_order"] = "333";
-			$dialplan["dialplan_enabled"] = $conference_center_enabled;
-			$dialplan["dialplan_description"] = $conference_center_description;
-			$dialplan["app_uuid"] = "b81412e8-7253-91f4-e48e-42fc2c9a38d9";
-
-		//prepare the array
-			$array['conference_centers'][] = $_POST;
-			$array['dialplans'][] = $dialplan;
-
-		//add the dialplan permission
-			$p = new permissions;
-			$p->add("dialplan_add", "temp");
-			$p->add("dialplan_edit", "temp");
-
-		//save to the data
-			$database = new database;
-			$database->app_name = "conference_centers";
-			$database->app_uuid = "b81412e8-7253-91f4-e48e-42fc2c9a38d9";
-			if (strlen($conference_center_uuid) > 0) {
-				$database->uuid($conference_center_uuid);
-			}
-			$database->save($array);
-			$message = $database->message;
-
-		//remove the temporary permission
-			$p->delete("dialplan_add", "temp");
-			$p->delete("dialplan_edit", "temp");
-
-		//debug information
-			//echo "<pre>\n";
-			//print_r($message);
-			//echo "</pre>\n";
-			//exit;
-
-		//syncrhonize configuration
-			save_dialplan_xml();
-
-		//apply settings reminder
-			$_SESSION["reload_xml"] = true;
-
-		//clear the cache
-			$cache = new cache;
-			$cache->delete("dialplan:".$_SESSION["context"]);
-
-		//redirect the user
-			if (isset($action)) {
+		//add or update the database
+			if ($_POST["persistformvar"] != "true") {
 				if ($action == "add") {
-					messages::add($text['message-add']);
-				}
+					//prepare the uuids
+						$conference_center_uuid = uuid();
+						$dialplan_uuid = uuid();
+					//add the conference
+						$sql = "insert into v_conference_centers ";
+						$sql .= "(";
+						$sql .= "domain_uuid, ";
+						$sql .= "conference_center_uuid, ";
+						$sql .= "dialplan_uuid, ";
+						$sql .= "conference_center_name, ";
+						$sql .= "conference_center_extension, ";
+						$sql .= "conference_center_pin_length, ";
+						$sql .= "conference_center_greeting, ";
+						$sql .= "conference_center_description, ";
+						$sql .= "conference_center_enabled ";
+						$sql .= ")";
+						$sql .= "values ";
+						$sql .= "(";
+						$sql .= "'$domain_uuid', ";
+						$sql .= "'$conference_center_uuid', ";
+						$sql .= "'$dialplan_uuid', ";
+						$sql .= "'$conference_center_name', ";
+						$sql .= "'$conference_center_extension', ";
+						$sql .= "'$conference_center_pin_length', ";
+						$sql .= "'$conference_center_greeting', ";
+						$sql .= "'$conference_center_description', ";
+						$sql .= "'$conference_center_enabled' ";
+						$sql .= ")";
+						$db->exec(check_sql($sql));
+						unset($sql);
+
+					//create the dialplan entry
+						$dialplan_name = $conference_center_name;
+						$dialplan_order ='333';
+						$dialplan_context = $_SESSION['context'];
+						$dialplan_enabled = 'true';
+						$dialplan_description = $conference_center_description;
+						$app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9';
+						dialplan_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_name, $dialplan_order, $dialplan_context, $dialplan_enabled, $dialplan_description, $app_uuid);
+
+						//<condition destination_number="500" />
+						$dialplan_detail_tag = 'condition'; //condition, action, antiaction
+						$dialplan_detail_type = 'destination_number';
+						$dialplan_detail_data = '^'.$conference_center_extension.'$';
+						$dialplan_detail_order = '010';
+						$dialplan_detail_group = '2';
+						dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
+
+						//<action application="lua" />
+						$dialplan_detail_tag = 'action'; //condition, action, antiaction
+						$dialplan_detail_type = 'lua';
+						$dialplan_detail_data = 'app.lua conference_center';
+						$dialplan_detail_order = '020';
+						$dialplan_detail_group = '2';
+						dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
+
+					//save the xml
+						save_dialplan_xml();
+
+					$_SESSION["message"] = $text['message-add'];
+					header("Location: conference_centers.php");
+					return;
+				} //if ($action == "add")
+
 				if ($action == "update") {
-					messages::add($text['message-update']);
-				}
-				header("Location: conference_centers.php");
-				return;
-			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
+					//update the conference center extension
+						$sql = "update v_conference_centers set ";
+						$sql .= "conference_center_name = '$conference_center_name', ";
+						$sql .= "conference_center_extension = '$conference_center_extension', ";
+						$sql .= "conference_center_pin_length = '$conference_center_pin_length', ";
+						$sql .= "conference_center_greeting = '$conference_center_greeting', ";
+						$sql .= "conference_center_description = '$conference_center_description', ";
+						$sql .= "conference_center_enabled = '$conference_center_enabled' ";
+						$sql .= "where domain_uuid = '$domain_uuid' ";
+						$sql .= "and conference_center_uuid = '$conference_center_uuid'";
+						$db->exec(check_sql($sql));
+						unset($sql);
+
+					//udpate the conference center dialplan
+						$sql = "update v_dialplans set ";
+						$sql .= "dialplan_name = '$conference_center_name', ";
+						if (strlen($dialplan_order) > 0) {
+							$sql .= "dialplan_order = '333', ";
+						}
+						$sql .= "dialplan_context = '".$_SESSION['context']."', ";
+						$sql .= "dialplan_enabled = 'true', ";
+						$sql .= "dialplan_description = '$conference_center_description' ";
+						$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+						$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
+						$db->query($sql);
+						unset($sql);
+
+					//update dialplan detail condition
+						$sql = "update v_dialplan_details set ";
+						$sql .= "dialplan_detail_data = '^".$conference_center_extension."$' ";
+						$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+						$sql .= "and dialplan_detail_tag = 'condition' ";
+						$sql .= "and dialplan_detail_type = 'destination_number' ";
+						$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
+						$db->query($sql);
+						unset($sql);
+
+					//update dialplan detail action
+						$dialplan_detail_type = 'lua';
+						$dialplan_detail_data = 'app.lua conference_center';
+						$sql = "update v_dialplan_details set ";
+						$sql .= "dialplan_detail_type = '".$dialplan_detail_type."', ";
+						$sql .= "dialplan_detail_data = '".$dialplan_detail_data."' ";
+						$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+						$sql .= "and dialplan_detail_tag = 'action' ";
+						$sql .= "and dialplan_detail_type = 'lua' ";
+						$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
+						$db->query($sql);
+
+					//syncrhonize configuration
+						save_dialplan_xml();
+
+					//apply settings reminder
+						$_SESSION["reload_xml"] = true;
+
+					//clear the cache
+						$cache = new cache;
+						$cache->delete("dialplan:".$_SESSION["context"]);
+
+					//redirect the browser
+						$_SESSION["message"] = $text['message-update'];
+						header("Location: conference_centers.php");
+						return;
+				} //if ($action == "update")
+			} //if ($_POST["persistformvar"] != "true")
+	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
+
+//function to show the list of sound files
+	// moved to functions.php

 //pre-populate the form
-	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
-		$conference_center_uuid = check_str($_GET["id"]);
+	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+		$conference_center_uuid = $_GET["id"];
 		$sql = "select * from v_conference_centers ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and conference_center_uuid = '$conference_center_uuid' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$result = $prep_statement->fetchAll();
 		foreach ($result as &$row) {
-			$conference_center_uuid = $row["conference_center_uuid"];
 			$dialplan_uuid = $row["dialplan_uuid"];
 			$conference_center_name = $row["conference_center_name"];
-			$conference_center_extension = $row["conference_center_extension"];
 			$conference_center_greeting = $row["conference_center_greeting"];
+			$conference_center_extension = $row["conference_center_extension"];
 			$conference_center_pin_length = $row["conference_center_pin_length"];
-			$conference_center_enabled = $row["conference_center_enabled"];
+			$conference_center_order = $row["conference_center_order"];
 			$conference_center_description = $row["conference_center_description"];
+			$conference_center_enabled = $row["conference_center_enabled"];
+			$conference_center_name = str_replace("-", " ", $conference_center_name);
 		}
 		unset ($prep_statement);
 	}
@@ -223,62 +271,60 @@

 //get the phrases
 	$sql = "select * from v_phrases ";
-	$sql .= "where (domain_uuid = '".$_SESSION["domain_uuid"]."' or domain_uuid is null) ";
+	$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
 	$phrases = $prep_statement->fetchAll(PDO::FETCH_NAMED);

-//get the streams
-	$sql = "select * from v_streams ";
-	$sql .= "where (domain_uuid = '".$_SESSION["domain_uuid"]."' or domain_uuid is null) ";
-	$sql .= "and stream_enabled = 'true' ";
-	$sql .= "order by stream_name asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$streams = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-
 //show the header
 	require_once "resources/header.php";

 //show the content
-	echo "<form name='frm' id='frm' method='post' action=''>\n";
-	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<form method='post' name='frm' action=''>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference_center']."</b><br><br></td>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference_center']."</b></td>\n";
 	echo "<td width='70%' align='right' valign='top'>\n";
-	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='conference_centers.php'\" value='".$text['button-back']."'>";
-	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>";
+	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='conference_centers.php'\" value='".$text['button-back']."'>\n";
+	if (permission_exists('conference_active_advanced_view')) {
+		echo "	<input type='button' class='btn' name='' alt='".$text['button-view']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php'\" value='".$text['button-view']."'>\n";
+	}
+	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+	echo "</table>\n";
+	echo "<br />";
+	echo $text['description-conference_center']."\n";
+	echo "<br /><br />\n";

+	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-conference_center_name']."\n";
+	echo "	".$text['label-name']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='conference_center_name' maxlength='255' value=\"$conference_center_name\">\n";
-	echo "<br />\n";
-	echo $text['description-conference_center_name']."\n";
+	echo "	<br />\n";
+	echo "	".$text['description-name']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-conference_center_extension']."\n";
+	echo "	".$text['label-extension']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='conference_center_extension' maxlength='255' value=\"$conference_center_extension\">\n";
-	echo "<br />\n";
-	echo $text['description-conference_center_extension']."\n";
+	echo "	<br />\n";
+	echo " ".$text['description-extension']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-conference_center_greeting']."\n";
+	echo "	".$text['label-greeting']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	//echo "	<input class='formfld' type='text' name='conference_center_greeting' maxlength='255' value=\"$conference_center_greeting\">\n";
 	if (permission_exists('conference_center_add') || permission_exists('conference_center_edit')) {
 		echo "<script>\n";
 		echo "var Objs;\n";
@@ -310,12 +356,14 @@
 		echo "</script>\n";
 		echo "\n";
 	}
+
 	echo "	<select name='conference_center_greeting' class='formfld' ".((permission_exists('conference_center_add') || permission_exists('conference_center_edit')) ? "onchange='changeToInput(this);'" : null).">\n";
 	echo "		<option></option>\n";
+
 	//recordings
 		$tmp_selected = false;
 		if (is_array($recordings)) {
-			echo "<optgroup label='".$text['label-recordings']."'>\n";
+			echo "<optgroup label='Recordings'>\n";
 			foreach ($recordings as &$row) {
 				$recording_name = $row["recording_name"];
 				$recording_filename = $row["recording_filename"];
@@ -331,7 +379,7 @@
 		}
 	//phrases
 		if (count($phrases) > 0) {
-			echo "<optgroup label='".$text['label-phrases']."'>\n";
+			echo "<optgroup label='Phrases'>\n";
 			foreach ($phrases as &$row) {
 				$selected = ($conference_center_greeting == "phrase:".$row["phrase_uuid"]) ? true : false;
 				echo "	<option value='phrase:".$row["phrase_uuid"]."' ".(($selected) ? "selected='selected'" : null).">".$row["phrase_name"]."</option>\n";
@@ -344,7 +392,7 @@
 		$file = new file;
 		$sound_files = $file->sounds();
 		if (is_array($sound_files)) {
-			echo "<optgroup label='".$text['label-sounds']."'>\n";
+			echo "<optgroup label='Sounds'>\n";
 			foreach ($sound_files as $key => $value) {
 				if (strlen($value) > 0) {
 					if (substr($conference_center_greeting, 0, 71) == "\$\${sounds_dir}/\${default_language}/\${default_dialect}/\${default_voice}/") {
@@ -377,29 +425,28 @@
 			}
 		}
 	echo "	</select>\n";
-	echo "	<br />\n";
-	echo "	".$text['description-conference_center_greeting']."\n";
+	echo "<br />\n";
+	echo $text['description-greeting']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-conference_center_pin_length']."\n";
+	echo "	".$text['label-pin-length']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "  <input class='formfld' type='text' name='conference_center_pin_length' maxlength='255' value='$conference_center_pin_length'>\n";
-	echo "<br />\n";
-	echo $text['description-conference_center_pin_length']."\n";
+	echo "	<input class='formfld' type='text' name='conference_center_pin_length' maxlength='255' value=\"$conference_center_pin_length\">\n";
+	echo "	<br />\n";
+	echo "	".$text['description-pin-length']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-conference_center_enabled']."\n";
+	echo "	".$text['label-enabled']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='conference_center_enabled'>\n";
-	echo "	<option value=''></option>\n";
 	if ($conference_center_enabled == "true") {
 		echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
@@ -413,35 +460,36 @@
 		echo "	<option value='false'>".$text['label-false']."</option>\n";
 	}
 	echo "	</select>\n";
-	echo "<br />\n";
-	echo $text['description-conference_center_enabled']."\n";
+	echo "	<br />\n";
+	echo "	".$text['description-enabled']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";

 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-conference_center_description']."\n";
+	echo "	".$text['label-description']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='conference_center_description' maxlength='255' value=\"$conference_center_description\">\n";
-	echo "<br />\n";
-	echo $text['description-conference_center_description']."\n";
+	echo "	<br />\n";
+	echo "	".$text['description-description']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if ($action == "update") {
-		echo "			<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
-		echo "			<input type='hidden' name='conference_center_uuid' value='$conference_center_uuid'>\n";
+		echo "		<input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
+		echo "		<input type='hidden' name='conference_center_uuid' value='$conference_center_uuid'>\n";
 	}
-	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
-	echo "<br /><br />";

 //include the footer
 	require_once "resources/footer.php";
-
 ?>
@@ -17,149 +17,162 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permissions
-	require_once "resources/check_auth.php";
-	if (permission_exists('conference_center_view')) {
-		//access granted
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('conference_center_view')) {
+	//access granted
+}
+else {
+	if (permission_exists('conference_room_view')) {
+		//redirect to the conference rooms
+		header( 'Location: conference_rooms.php') ;
 	}
 	else {
 		echo "access denied";
 		exit;
 	}
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

-//get variables used to control the order
-	$order_by = check_str($_GET["order_by"]);
-	$order = check_str($_GET["order"]);
-
-//add the search term
-	$search = strtolower(check_str($_GET["search"]));
-	if (strlen($search) > 0) {
-		$sql_search = "and (";
-		$sql_search .= "lower(conference_center_name) like '%".$search."%' ";
-		$sql_search .= "or lower(conference_center_extension) like '%".$search."%' ";
-		$sql_search .= "or lower(conference_center_greeting) like '%".$search."%' ";
-		$sql_search .= "or lower(conference_center_description) like '%".$search."%' ";
-		$sql_search .= ") ";
-	}
-
 //additional includes
 	require_once "resources/header.php";
 	require_once "resources/paging.php";

-//prepare to page the results
-	$sql = "select count(conference_center_uuid) as num_rows from v_conference_centers ";
-	$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
-	$sql .= $sql_search;
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$prep_statement = $db->prepare($sql);
-	if ($prep_statement) {
-		$prep_statement->execute();
-		$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-		if ($row['num_rows'] > 0) {
-			$num_rows = $row['num_rows'];
+//get variables used to control the order
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
+
+//show the content
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
+	echo "	<tr>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-conference_centers']."</b></td>\n";
+	echo "<td width='70%' align='right' valign='top'>\n";
+	if (permission_exists('conference_active_advanced_view')) {
+		echo "	<input type='button' class='btn' name='' alt='".$text['button-view']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php'\" value='".$text['button-view']."'>\n";
+	}
+	echo "	<input type='button' class='btn' name='' alt='".$text['button-rooms']."' onclick=\"window.location='conference_rooms.php'\" value='".$text['button-rooms']."'>\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+	echo "</table>\n";
+	echo "<br />\n";
+	echo $text['description-conference_centers']."\n";
+	echo "<br /><br />\n";
+
+	//prepare to page the results
+		if (permission_exists('conference_center_add') || permission_exists('conference_center_edit')) {
+			//show all extensions
+			$sql = "select count(*) as num_rows from v_conference_centers ";
+			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 		}
 		else {
-			$num_rows = '0';
+			//show only assigned extensions
+			$sql = "select count(*) as num_rows from v_conference_centers as c, v_conference_center_users as u ";
+			$sql .= "where c.conference_center_uuid = u.conference_center_uuid ";
+			$sql .= "and c.domain_uuid = '".$_SESSION['domain_uuid']."' ";
+			$sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' ";
+		}
+		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		$prep_statement = $db->prepare($sql);
+		if ($prep_statement) {
+			$prep_statement->execute();
+			$row = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
+			if ($row['num_rows'] > 0) {
+				$num_rows = $row['num_rows'];
+			}
+			else {
+				$num_rows = '0';
+			}
 		}
-	}

-//prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "";
-	$page = $_GET['page'];
-	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	$offset = $rows_per_page * $page;
+	//prepare to page the results
+		$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
+		$param = "";
+		$page = $_GET['page'];
+		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
+		$offset = $rows_per_page * $page;

-//get the list
-	$sql = "select * from v_conference_centers ";
-	$sql .= "where domain_uuid = '".$_SESSION["domain_uuid"]."' ";
-	$sql .= $sql_search;
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$sql .= "limit $rows_per_page offset $offset ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
+	//get the list
+		if (permission_exists('conference_center_add') || permission_exists('conference_center_edit')) {
+			//show all extensions
+			$sql = "select * from v_conference_centers ";
+			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		}
+		else {
+			//show only assigned extensions
+			$sql = "select * from v_conference_centers as c, v_conference_center_users as u ";
+			$sql .= "where c.conference_center_uuid = u.conference_center_uuid ";
+			$sql .= "and c.domain_uuid = '".$_SESSION['domain_uuid']."' ";
+			$sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' ";
+		}
+		if (strlen($order_by) == 0) {
+			$sql .= "order by conference_center_name asc ";
+		}
+		else {
+			$sql .= "order by $order_by $order ";
+		}
+		$sql .= "limit $rows_per_page offset $offset ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll();
+		$result_count = count($result);
+		unset ($prep_statement, $sql);

-//alternate the row style
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";

-//show the content
-	echo "<table width='100%' border='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-conference_centers']."</b></td>\n";
-	echo "		<form method='get' action=''>\n";
-	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
-	echo "				<input type='text' class='txt' style='width: 150px' name='search' id='search' value='".$search."'>\n";
-	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
-	if (permission_exists('conference_active_advanced_view')) {
-		echo "				<input type='button' class='btn' name='' alt='".$text['button-view']."' onclick=\"window.location='".PROJECT_PATH."/app/conferences_active/conferences_active.php'\" value='".$text['button-view']."'>\n";
-	}
-	echo "				<input type='button' class='btn' name='' alt='".$text['button-rooms']."' onclick=\"window.location='conference_rooms.php'\" value='".$text['button-rooms']."'>\n";
-	echo "			</td>\n";
-	echo "		</form>\n";
-	echo "	</tr>\n";
-	echo "	<tr>\n";
-	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$text['title_description-conference_centers']."<br /><br />\n";
-	echo "		</td>\n";
-	echo "	</tr>\n";
-	echo "</table>\n";
-
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo th_order_by('conference_center_name', $text['label-conference_center_name'], $order_by, $order);
-	echo th_order_by('conference_center_extension', $text['label-conference_center_extension'], $order_by, $order);
-	echo th_order_by('conference_center_greeting', $text['label-conference_center_greeting'], $order_by, $order);
-	echo th_order_by('conference_center_pin_length', $text['label-conference_center_pin_length'], $order_by, $order);
-	echo th_order_by('conference_center_enabled', $text['label-conference_center_enabled'], $order_by, $order);
-	echo th_order_by('conference_center_description', $text['label-conference_center_description'], $order_by, $order);
+	echo th_order_by('conference_center_name', $text['label-name'], $order_by, $order);
+	echo th_order_by('conference_center_extension', $text['label-extension'], $order_by, $order);
+	//echo th_order_by('conference_center_order', 'Order', $order_by, $order);
+	echo th_order_by('conference_center_enabled', $text['label-enabled'], $order_by, $order);
+	echo th_order_by('conference_center_description', $text['label-description'], $order_by, $order);
 	echo "<td class='list_control_icons'>";
 	if (permission_exists('conference_center_add')) {
-		echo "<a href='conference_center_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
+		echo "<a href='conference_center_edit.php' alt='add'>$v_link_label_add</a>";
 	}
 	else {
-		echo "&nbsp;\n";
+		echo "	&nbsp;\n";
 	}
 	echo "</td>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";

-	if (is_array($result)) {
+	if ($result_count > 0) {
 		foreach($result as $row) {
-			if (permission_exists('conference_center_edit')) {
-				$tr_link = "href='conference_center_edit.php?id=".$row['conference_center_uuid']."'";
-			}
+			$conference_center_name = $row['conference_center_name'];
+			$conference_center_name = str_replace("-", " ", $conference_center_name);
+			$tr_link = (permission_exists('conference_center_edit')) ? "href='conference_center_edit.php?id=".$row['conference_center_uuid']."'" : null;
 			echo "<tr ".$tr_link.">\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_center_name']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>";
+			if (permission_exists('conference_center_edit')) {
+				echo "<a href='conference_center_edit.php?id=".$row['conference_center_uuid']."'>".$conference_center_name."</a>";
+			}
+			else {
+				echo $conference_center_name;
+			}
+			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_center_extension']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_center_greeting']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_center_pin_length']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_center_enabled']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='row_stylebg'>".$row['conference_center_description']."&nbsp;</td>\n";
+			//echo "	<td valign='top' class='".$row_style[$c]."'>".$row['conference_center_order']."&nbsp;</td>\n";
+			echo "	<td valign='top' class='".$row_style[$c]."'>".$text['label-'.$row['conference_center_enabled']]."&nbsp;</td>\n";
+			echo "	<td valign='top' class='row_stylebg' width='35%'>".$row['conference_center_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons'>";
 			if (permission_exists('conference_center_edit')) {
-				echo "<a href='conference_center_edit.php?id=".$row['conference_center_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
+				echo "<a href='conference_center_edit.php?id=".$row['conference_center_uuid']."' alt='".$text['label-edit']."'>$v_link_label_edit</a>";
 			}
 			if (permission_exists('conference_center_delete')) {
-				echo "<a href='conference_center_delete.php?id=".$row['conference_center_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
+				echo "<a href='conference_center_delete.php?id=".$row['conference_center_uuid']."' alt='".$text['label-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 			}
 			echo "	</td>\n";
 			echo "</tr>\n";
@@ -172,24 +185,21 @@
 	echo "<td colspan='10' align='left'>\n";
 	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap='nowrap'>$paging_controls</td>\n";
+	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
+	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
 	echo "		<td class='list_control_icons'>";
 	if (permission_exists('conference_center_add')) {
-		echo 		"<a href='conference_center_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
-	}
-	else {
-		echo 		"&nbsp;";
+		echo 		"<a href='conference_center_edit.php' alt='add'>$v_link_label_add</a>";
 	}
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	</table>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+
 	echo "</table>";
 	echo "<br /><br />";

 //include the footer
 	require_once "resources/footer.php";
-
-?>
+?>
@@ -17,82 +17,76 @@

 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
 	the Initial Developer. All Rights Reserved.

 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('conference_room_delete')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('conference_room_delete')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();

 //get the id
-	if (count($_GET) > 0) {
+	if (count($_GET)>0) {
 		$id = check_str($_GET["id"]);
 	}

-//delete the data
-	if (strlen($id) > 0) {
-		//get the meeting_uuid
-			if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
-				$conference_room_uuid = check_str($_GET["id"]);
-				$sql = "select * from v_conference_rooms ";
-				$sql .= "where domain_uuid = '$domain_uuid' ";
-				$sql .= "and conference_room_uuid = '$conference_room_uuid' ";
-				$prep_statement = $db->prepare(check_sql($sql));
-				$prep_statement->execute();
-				$result = $prep_statement->fetchAll();
-				foreach ($result as &$row) {
-					$meeting_uuid = $row["meeting_uuid"];
-				}
-				unset ($prep_statement);
+if (strlen($id)>0) {
+	//get the meeting_uuid
+		if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+			$conference_room_uuid = check_str($_GET["id"]);
+			$sql = "select * from v_conference_rooms ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and conference_room_uuid = '$conference_room_uuid' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			$result = $prep_statement->fetchAll();
+			foreach ($result as &$row) {
+				$meeting_uuid = $row["meeting_uuid"];
 			}
-			//echo "meeting_uuid: ".$meeting_uuid."<br />\n";
+			unset ($prep_statement);
+		}

-		//delete the conference session
-			$sql = "delete from v_conference_rooms ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and conference_room_uuid = '$id'; ";
-			//echo $sql."<br />\n";
-			$db->exec(check_sql($sql));
-			unset($sql);
+	//delete the conference session
+		$sql = "delete from v_conference_rooms ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and conference_room_uuid = '$id' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);

-		//delete the meeting users
-			$sql = "delete from v_meeting_users ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and meeting_uuid = '$meeting_uuid'; ";
-			//echo $sql."<br />\n";
-			$db->exec(check_sql($sql));
-			unset($sql);
+	//delete the meeting users
+		$sql = "delete from v_meeting_users ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and meeting_uuid = '$meeting_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);

-		//delete the meetings
-			$sql = "delete from v_meetings ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and meeting_uuid = '$meeting_uuid'; ";
-			//echo $sql."<br />\n";
-			$db->exec(check_sql($sql));
-			unset($sql);
-	}
+	//delete the meetings
+		$sql = "delete from v_meetings ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and meeting_uuid = '$meeting_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+}

-//redirect the user
-	messages::add($text['message-delete']);
-	header("Location: conference_rooms.php");
-	return;

-?>
+$_SESSION["message"] = $text['message-delete'];
+header("Location: conference_rooms.php");
+return;
+
+?>
@@ -24,20 +24,16 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 	Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
 */
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-	require_once "resources/check_auth.php";
-
-//check permissions
-	if (permission_exists('conference_room_add') || permission_exists('conference_room_edit')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
+require_once "root.php";
+require_once "resources/require.php";
+require_once "resources/check_auth.php";
+if (permission_exists('conference_room_add') || permission_exists('conference_room_edit')) {
+	//access granted
+}
+else {
+	echo "access denied";
+	exit;
+}

 //add multi-lingual support
 	$language = new text;
@@ -90,19 +86,6 @@
 		$conference_center_uuid = $conference_centers[0]["conference_center_uuid"];
 	}

-//get the conference profiles
-	$sql = "select * ";
-	$sql .= "from v_conference_profiles ";
-	$sql .= "where profile_enabled = 'true' ";
-	$sql .= "and profile_name <> 'sla' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$conference_profiles = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
-
-//set the default
-	if ($profile === "") { $profile = "default"; }
-
 //define fucntion get_meeting_pin - used to find a unique pin number
 	function get_meeting_pin($length, $meeting_uuid) {
 		global $db;
@@ -130,7 +113,7 @@
 			$default_language = 'en';
 			$default_dialect = 'us';
 			$default_voice = 'callie';
-			$switch_cmd = "conference ".$meeting_uuid."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
+			$switch_cmd = "conference ".$meeting_uuid."-".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
 		//connect to event socket
 			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 			if ($fp) {
@@ -171,7 +154,7 @@
 				unset($sql);
 		}

-		messages::add($text['message-delete']);
+		$_SESSION["message"] = $text['message-delete'];
 		header("Location: conference_room_edit.php?id=".$conference_room_uuid);
 		return;
 	}
@@ -360,7 +343,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 						unset($sql);
 					}

-				messages::add($text['message-add']);
+				$_SESSION["message"] = $text['message-add'];
 			} //if ($action == "add")

 			if ($action == "update" && permission_exists('conference_room_edit')) {
@@ -426,7 +409,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$db->exec(check_sql($sql));
 					unset($sql);

-				messages::add($text['message-update']);
+				$_SESSION["message"] = $text['message-update'];
 			} //if ($action == "update")

 			//assign the user to the meeting
@@ -450,7 +433,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$db->exec(check_sql($sql));
 					unset($sql);

-					messages::add($text['message-add']);
+					$_SESSION["message"] = $text['message-add'];
 				}

 			header("Location: conference_room_edit.php?id=".$conference_room_uuid);
@@ -649,16 +632,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<tr>\n";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>".$text['label-profile']."</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<select class='formfld' name='profile'>\n";
-		foreach ($conference_profiles as $row) {
-			if ($profile === $row['profile_name']) {
-					echo "	<option value='". $row['profile_name'] ."' selected='selected'>". $row['profile_name'] ."</option>\n";
-			}
-			else {
-					echo "	<option value='". $row['profile_name'] ."'>". $row['profile_name'] ."</option>\n";
-			}
-		}
-		echo "	</select>\n";
+		echo "	<input class='formfld' type='text' name='profile' maxlength='255' value='$profile'>\n";
 		echo "	<br />\n";
 		echo "	".$text['description-profile']."\n";
 		echo "</td>\n";
@@ -75,7 +75,7 @@ else {
 					$default_language = 'en';
 					$default_dialect = 'us';
 					$default_voice = 'callie';
-					$switch_cmd = "conference ".$meeting_uuid."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
+					$switch_cmd = "conference ".$meeting_uuid."-".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
 				//connect to event socket
 					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 					if ($fp) {
@@ -135,7 +135,7 @@ else {
 			//show the conferences that have a matching domain
 				$tmp_domain = substr($conference_name, -strlen($_SESSION['domain_name']));
 				if ($tmp_domain == $_SESSION['domain_name']) {
-					$meeting_uuid = substr($conference_name, 0, strlen($conference_name) - strlen('@'.$_SESSION['domain_name']));
+					$meeting_uuid = substr($conference_name, 0, strlen($conference_name) - strlen('-'.$_SESSION['domain_name']));
 					$conference[$meeting_uuid]["conference_name"] = $conference_name;
 					$conference[$meeting_uuid]["session_uuid"] = $session_uuid;
 					$conference[$meeting_uuid]["member_count"] = $member_count;
@@ -1,126 +1,114 @@
-<?php
-
-	//application details
-		$apps[$x]['name'] = "Conference Controls";
-		$apps[$x]['uuid'] = "e1ad84a2-79e1-450c-a5b1-7507a043e048";
-		$apps[$x]['category'] = "";
-		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
-		$apps[$x]['license'] = "Mozilla Public License 1.1";
-		$apps[$x]['url'] = "http://www.fusionpbx.com";
-		$apps[$x]['description']['en-us'] = "Call controls enable ability to assign digits to actions. They can be used to mute, unmute, or other actions during the conference call.";
-		$apps[$x]['description']['ar-eg'] = "";
-		$apps[$x]['description']['de-at'] = "Anrufsteuerung anhand von zugeordneten Ziffern. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen.";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-de'] = "Anrufsteuerung anhand von zugeordneten Ziffern. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen.";
-		$apps[$x]['description']['es-cl'] = "";
-		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "";
-		$apps[$x]['description']['he-il'] = "";
-		$apps[$x]['description']['it-it'] = "";
-		$apps[$x]['description']['nl-nl'] = "";
-		$apps[$x]['description']['pl-pl'] = "";
-		$apps[$x]['description']['pt-br'] = "";
-		$apps[$x]['description']['pt-pt'] = "";
-		$apps[$x]['description']['ro-ro'] = "";
-		$apps[$x]['description']['ru-ru'] = "";
-		$apps[$x]['description']['sv-se'] = "";
-		$apps[$x]['description']['uk-ua'] = "";
-
-	//permission details
-		$y=0;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "user";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_detail_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "user";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_detail_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_detail_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "conference_control_detail_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
-
-	//schema details
-		$y=0;
-		$apps[$x]['db'][$y]['table']['name'] = "v_conference_controls";
-		$apps[$x]['db'][$y]['table']['parent'] = "";
-		$z=0;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_control_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_name";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the conference control name.";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_enabled";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Set the stats of the control.";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_description";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
-
-		$y++;
-		$apps[$x]['db'][$y]['table']['name'] = "v_conference_control_details";
-		$apps[$x]['db'][$y]['table']['parent'] = "v_conference_controls";
-		$z=0;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_control_detail_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_control_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_conference_control";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "conference_control_uuid";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_digits";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the digits.";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_action";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the action.";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_data";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the data.";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "control_enabled";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Set the status of the control.";
-
+<?php
+
+	//application details
+		$apps[$x]['name'] = 'Conference Controls';
+		$apps[$x]['uuid'] = 'e1ad84a2-79e1-450c-a5b1-7507a043e048';
+		$apps[$x]['category'] = '';
+		$apps[$x]['subcategory'] = '';
+		$apps[$x]['version'] = '';
+		$apps[$x]['license'] = 'Mozilla Public License 1.1';
+		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['description']['en-us'] = '';
+
+	//permission details
+		$y = 0;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_detail_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_detail_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_detail_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'conference_control_detail_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+
+	//schema details
+		$y = 0; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = 'v_conference_controls';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_control_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_name';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the conference control name.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Entre com o nome para o controle de conferência.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_enabled';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Set the stats of the control.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Estabelece o estado do controle.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Entre com a descrição.';
+
+		$y = 1; //table array index
+		$z = 0; //field array index
+		$apps[$x]['db'][$y]['table'] = 'v_conference_control_details';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_control_detail_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_control_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_conference_control';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'conference_control_uuid';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_digits';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the digits.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Entre com os digitos.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_action';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the action.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Entre com a ação.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_data';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the data.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Entre com os dados.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'control_enabled';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Set the status of the control.';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['pt-br'] = 'Estababelece o estado do controle.';
+		$z++;
 ?>
@@ -1,131 +1,131 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2016
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-	if ($domains_processed == 1) {
-
-		//add the conference controls list to the database
-		$sql = "select count(*) as num_rows from v_conference_controls; ";
-		$prep_statement = $db->prepare($sql);
-		if ($prep_statement) {
-			$prep_statement->execute();
-			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-			if ($row['num_rows'] == 0) {
-
-				//set the directory
-					$xml_dir = $_SESSION["switch"]["conf"]["dir"].'/autoload_configs';
-					$xml_file = $xml_dir."/conference.conf";
-					$xml_file_alt = $_SERVER["DOCUMENT_ROOT"].'/'.PROJECT_PATH.'/resources/templates/conf/autoload_configs/conference.conf';
-
-				//rename the file
-					if (file_exists($xml_dir.'/conference.conf.xml.noload')) {
-						rename($xml_dir.'/conference.conf.xml.noload', $xml_dir.'/conference.conf');
-					}
-
-				//load the xml and save it into an array
-					if (file_exists($xml_file)) {
-						$xml_string = file_get_contents($xml_file);
-					}
-					elseif (file_exists($xml_file_alt)) {
-						$xml_string = file_get_contents($xml_file_alt);
-					}
-					$xml_object = simplexml_load_string($xml_string);
-					$json = json_encode($xml_object);
-					$conf_array = json_decode($json, true);
-
-				//process the array
-					foreach ($conf_array['caller-controls']['group'] as $row) {
-
-						//get the data from the array
-							$control_name = $row['@attributes']['name'];
-							//echo $profile_name."<br />\n";
-
-						//insert the data into the database
-							$conference_control_uuid = uuid();
-							$sql = "insert into v_conference_controls ";
-							$sql .= "(";
-							//$sql .= "domain_uuid, ";
-							$sql .= "conference_control_uuid, ";
-							$sql .= "control_name, ";
-							$sql .= "control_enabled ";
-							$sql .= ") ";
-							$sql .= "values ";
-							$sql .= "( ";
-							//$sql .= "'".$domain_uuid."', ";
-							$sql .= "'".$conference_control_uuid."', ";
-							$sql .= "'".check_str($control_name)."', ";
-							$sql .= "'true' ";
-							$sql .= ");";
-							//echo $sql."\n";
-							$db->exec(check_sql($sql));
-							unset($sql);
-
-						//insert the profile params
-							foreach ($row['control'] as $p) {
-
-								//get the name
-									//print_r($p);
-									$control_action = $p['@attributes']['action'];
-									$control_digits = $p['@attributes']['digits'];
-									$control_data = $p['@attributes']['data'];
-									$control_enabled = 'true';
-
-								//add the coference profile params
-									$conference_control_detail_uuid = uuid();
-									$sql = "insert into v_conference_control_details ";
-									$sql .= "(";
-									$sql .= "conference_control_uuid, ";
-									$sql .= "conference_control_detail_uuid, ";
-									$sql .= "control_digits, ";
-									$sql .= "control_action, ";
-									if (strlen($control_data) > 0) {
-										$sql .= "control_data, ";
-									}
-									$sql .= "control_enabled ";
-									$sql .= ") ";
-									$sql .= "values ";
-									$sql .= "( ";
-									$sql .= "'".$conference_control_uuid."', ";
-									$sql .= "'".$conference_control_detail_uuid."', ";
-									$sql .= "'".$control_digits."', ";
-									$sql .= "'".$control_action."', ";
-									if (strlen($control_data) > 0) {
-										$sql .= "'".$control_data."', ";
-									}
-									$sql .= "'".$control_enabled."' ";
-									$sql .= ");";
-									//echo $sql."\n";
-									$db->exec(check_sql($sql));
-									unset($sql);
-							}
-
-					}
-
-			} //if num_rows
-		} //if prep_statement
-
-	}
-
-?>
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2016
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+	if ($domains_processed == 1) {
+
+		//add the conference controls list to the database
+		$sql = "select count(*) as num_rows from v_conference_controls; ";
+		$prep_statement = $db->prepare($sql);
+		if ($prep_statement) {
+			$prep_statement->execute();
+			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+			if ($row['num_rows'] == 0) {
+
+				//set the directory
+					$xml_dir = $_SESSION["switch"]["conf"]["dir"].'/autoload_configs';
+					$xml_file = $xml_dir."/conference.conf";
+					$xml_file_alt = $_SERVER["DOCUMENT_ROOT"].'/'.PROJECT_PATH.'/resources/templates/conf/autoload_configs/conference.conf';
+
+				//rename the file
+					if (file_exists($xml_dir.'/conference.conf.xml.noload')) {
+						rename($xml_dir.'/conference.conf.xml.noload', $xml_dir.'/conference.conf');
+					}
+
+				//load the xml and save it into an array
+					if (file_exists($xml_file)) {
+						$xml_string = file_get_contents($xml_file);
+					}
+					elseif (file_exists($xml_file_alt)) {
+						$xml_string = file_get_contents(xml_file_alt);
+					}
+					$xml_object = simplexml_load_string($xml_string);
+					$json = json_encode($xml_object);
+					$conf_array = json_decode($json, true);
+
+				//process the array
+					foreach ($conf_array['caller-controls']['group'] as $row) {
+
+						//get the data from the array
+							$control_name = $row['@attributes']['name'];
+							//echo $profile_name."<br />\n";
+
+						//insert the data into the database
+							$conference_control_uuid = uuid();
+							$sql = "insert into v_conference_controls ";
+							$sql .= "(";
+							//$sql .= "domain_uuid, ";
+							$sql .= "conference_control_uuid, ";
+							$sql .= "control_name, ";
+							$sql .= "control_enabled ";
+							$sql .= ") ";
+							$sql .= "values ";
+							$sql .= "( ";
+							//$sql .= "'".$domain_uuid."', ";
+							$sql .= "'".$conference_control_uuid."', ";
+							$sql .= "'".check_str($control_name)."', ";
+							$sql .= "'true' ";
+							$sql .= ");";
+							//echo $sql."\n";
+							$db->exec(check_sql($sql));
+							unset($sql);
+
+						//insert the profile params
+							foreach ($row['control'] as $p) {
+
+								//get the name
+									//print_r($p);
+									$control_action = $p['@attributes']['action'];
+									$control_digits = $p['@attributes']['digits'];
+									$control_data = $p['@attributes']['data'];
+									$control_enabled = 'true';
+
+								//add the coference profile params
+									$conference_control_detail_uuid = uuid();
+									$sql = "insert into v_conference_control_details ";
+									$sql .= "(";
+									$sql .= "conference_control_uuid, ";
+									$sql .= "conference_control_detail_uuid, ";
+									$sql .= "control_digits, ";
+									$sql .= "control_action, ";
+									if (strlen($control_data) > 0) {
+										$sql .= "control_data, ";
+									}
+									$sql .= "control_enabled ";
+									$sql .= ") ";
+									$sql .= "values ";
+									$sql .= "( ";
+									$sql .= "'".$conference_control_uuid."', ";
+									$sql .= "'".$conference_control_detail_uuid."', ";
+									$sql .= "'".$control_digits."', ";
+									$sql .= "'".$control_action."', ";
+									if (strlen($control_data) > 0) {
+										$sql .= "'".$control_data."', ";
+									}
+									$sql .= "'".$control_enabled."' ";
+									$sql .= ");";
+									//echo $sql."\n";
+									$db->exec(check_sql($sql));
+									unset($sql);
+							}
+
+					}
+
+			} //if num_rows
+		} //if prep_statement
+
+	}
+
+?>
@@ -1,624 +1,202 @@
-<?php
-#This file was last reorganized on 19th of September 2017 08:54:24 AM UTC
-
-$text['title-conference_controls']['en-us'] = "Conference Controls";
-$text['title-conference_controls']['ar-eg'] = "";
-$text['title-conference_controls']['de-at'] = "Konferenzsteuerung"; //copied from de-de
-$text['title-conference_controls']['de-ch'] = "Konferenzsteuerung"; //copied from de-de
-$text['title-conference_controls']['de-de'] = "Konferenzsteuerung";
-$text['title-conference_controls']['es-cl'] = "";
-$text['title-conference_controls']['es-mx'] = "";
-$text['title-conference_controls']['fr-ca'] = "";
-$text['title-conference_controls']['fr-fr'] = "";
-$text['title-conference_controls']['he-il'] = "";
-$text['title-conference_controls']['it-it'] = "Controlli Conferenza";
-$text['title-conference_controls']['nl-nl'] = "";
-$text['title-conference_controls']['pl-pl'] = "";
-$text['title-conference_controls']['pt-br'] = "Controles de conferência"; //copied from pt-pt
-$text['title-conference_controls']['pt-pt'] = "Controles de conferência";
-$text['title-conference_controls']['ro-ro'] = "";
-$text['title-conference_controls']['ru-ru'] = "";
-$text['title-conference_controls']['sv-se'] = "Konferens Kontroller";
-$text['title-conference_controls']['uk-ua'] = "";
-
-$text['title-conference_control']['en-us'] = "Conference Control";
-$text['title-conference_control']['ar-eg'] = "";
-$text['title-conference_control']['de-at'] = "Konferenzsteuerung"; //copied from de-de
-$text['title-conference_control']['de-ch'] = "Konferenzsteuerung"; //copied from de-de
-$text['title-conference_control']['de-de'] = "Konferenzsteuerung";
-$text['title-conference_control']['es-cl'] = "";
-$text['title-conference_control']['es-mx'] = "";
-$text['title-conference_control']['fr-ca'] = "";
-$text['title-conference_control']['fr-fr'] = "";
-$text['title-conference_control']['he-il'] = "";
-$text['title-conference_control']['it-it'] = "Controllo Conferenza";
-$text['title-conference_control']['nl-nl'] = "";
-$text['title-conference_control']['pl-pl'] = "";
-$text['title-conference_control']['pt-br'] = "Controle de conferência"; //copied from pt-pt
-$text['title-conference_control']['pt-pt'] = "Controle de conferência";
-$text['title-conference_control']['ro-ro'] = "";
-$text['title-conference_control']['ru-ru'] = "";
-$text['title-conference_control']['sv-se'] = "Konferens Kontroll";
-$text['title-conference_control']['uk-ua'] = "";
-
-$text['title_description-conference_control']['en-us'] = "Call controls enable ability to assign digits to actions. They can be used to mute, unmute, or other actions during the conference call.";
-$text['title_description-conference_control']['ar-eg'] = "";
-$text['title_description-conference_control']['de-at'] = "Funktionen zur Anrufsteuerung können Ziffern zugeordnet werden. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen."; //copied from de-de
-$text['title_description-conference_control']['de-ch'] = "Funktionen zur Anrufsteuerung können Ziffern zugeordnet werden. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen."; //copied from de-de
-$text['title_description-conference_control']['de-de'] = "Funktionen zur Anrufsteuerung können Ziffern zugeordnet werden. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen.";
-$text['title_description-conference_control']['es-cl'] = "";
-$text['title_description-conference_control']['es-mx'] = "";
-$text['title_description-conference_control']['fr-ca'] = "";
-$text['title_description-conference_control']['fr-fr'] = "";
-$text['title_description-conference_control']['he-il'] = "";
-$text['title_description-conference_control']['it-it'] = "I controlli in chiamata abilitano la possibilità di assegnare azioni ai tasti. Possono essere usati per silenziare, desilenziare, o fare altro durante le conferenze.";
-$text['title_description-conference_control']['nl-nl'] = "";
-$text['title_description-conference_control']['pl-pl'] = "";
-$text['title_description-conference_control']['pt-br'] = "Controle de chamadas habilita atribuir ações aos números. Podem ser usadas para silenciar, ou outras ações durante a conferência."; //copied from pt-pt
-$text['title_description-conference_control']['pt-pt'] = "Controle de chamadas habilita atribuir ações aos números. Podem ser usadas para silenciar, ou outras ações durante a conferência.";
-$text['title_description-conference_control']['ro-ro'] = "";
-$text['title_description-conference_control']['ru-ru'] = "";
-$text['title_description-conference_control']['sv-se'] = "Samtalskontroller möjliggör tilldelning av siffror till handlingar. De kan användas för att stänga av, avaktivera eller andra åtgärder under konferenssamtalet.";
-$text['title_description-conference_control']['uk-ua'] = "";
-
-$text['label-control_name']['en-us'] = "Name";
-$text['label-control_name']['ar-eg'] = "";
-$text['label-control_name']['de-at'] = "Name"; //copied from de-de
-$text['label-control_name']['de-ch'] = "Name"; //copied from de-de
-$text['label-control_name']['de-de'] = "Name";
-$text['label-control_name']['es-cl'] = "";
-$text['label-control_name']['es-mx'] = "";
-$text['label-control_name']['fr-ca'] = "";
-$text['label-control_name']['fr-fr'] = "";
-$text['label-control_name']['he-il'] = "";
-$text['label-control_name']['it-it'] = "Nome";
-$text['label-control_name']['nl-nl'] = "";
-$text['label-control_name']['pl-pl'] = "";
-$text['label-control_name']['pt-br'] = "Nome"; //copied from pt-pt
-$text['label-control_name']['pt-pt'] = "Nome";
-$text['label-control_name']['ro-ro'] = "";
-$text['label-control_name']['ru-ru'] = "";
-$text['label-control_name']['sv-se'] = "Namn";
-$text['label-control_name']['uk-ua'] = "";
-
-$text['description-control_name']['en-us'] = "Enter the conference control name.";
-$text['description-control_name']['ar-eg'] = "";
-$text['description-control_name']['de-at'] = "Geben Sie den Namen des Steuerelements ein."; //copied from de-de
-$text['description-control_name']['de-ch'] = "Geben Sie den Namen des Steuerelements ein."; //copied from de-de
-$text['description-control_name']['de-de'] = "Geben Sie den Namen des Steuerelements ein.";
-$text['description-control_name']['es-cl'] = "";
-$text['description-control_name']['es-mx'] = "";
-$text['description-control_name']['fr-ca'] = "";
-$text['description-control_name']['fr-fr'] = "";
-$text['description-control_name']['he-il'] = "";
-$text['description-control_name']['it-it'] = "Inserire il nome del set di controllo della conferenza.";
-$text['description-control_name']['nl-nl'] = "";
-$text['description-control_name']['pl-pl'] = "";
-$text['description-control_name']['pt-br'] = "Entre com o nome do controle de conferência."; //copied from pt-pt
-$text['description-control_name']['pt-pt'] = "Entre com o nome do controle de conferência.";
-$text['description-control_name']['ro-ro'] = "";
-$text['description-control_name']['ru-ru'] = "";
-$text['description-control_name']['sv-se'] = "Ange konferens kontroll namnet.";
-$text['description-control_name']['uk-ua'] = "";
-
-$text['label-control_enabled']['en-us'] = "Enabled";
-$text['label-control_enabled']['ar-eg'] = "";
-$text['label-control_enabled']['de-at'] = "Aktiviert"; //copied from de-de
-$text['label-control_enabled']['de-ch'] = "Aktiviert"; //copied from de-de
-$text['label-control_enabled']['de-de'] = "Aktiviert";
-$text['label-control_enabled']['es-cl'] = "";
-$text['label-control_enabled']['es-mx'] = "";
-$text['label-control_enabled']['fr-ca'] = "";
-$text['label-control_enabled']['fr-fr'] = "";
-$text['label-control_enabled']['he-il'] = "";
-$text['label-control_enabled']['it-it'] = "Abilitato";
-$text['label-control_enabled']['nl-nl'] = "";
-$text['label-control_enabled']['pl-pl'] = "";
-$text['label-control_enabled']['pt-br'] = "Habilitado"; //copied from pt-pt
-$text['label-control_enabled']['pt-pt'] = "Habilitado";
-$text['label-control_enabled']['ro-ro'] = "";
-$text['label-control_enabled']['ru-ru'] = "";
-$text['label-control_enabled']['sv-se'] = "Aktiverad";
-$text['label-control_enabled']['uk-ua'] = "";
-
-$text['description-control_enabled']['en-us'] = "Set the status of the control.";
-$text['description-control_enabled']['ar-eg'] = "";
-$text['description-control_enabled']['de-at'] = "Setzen Sie den Status des Steuerelements"; //copied from de-de
-$text['description-control_enabled']['de-ch'] = "Setzen Sie den Status des Steuerelements"; //copied from de-de
-$text['description-control_enabled']['de-de'] = "Setzen Sie den Status des Steuerelements";
-$text['description-control_enabled']['es-cl'] = "";
-$text['description-control_enabled']['es-mx'] = "";
-$text['description-control_enabled']['fr-ca'] = "";
-$text['description-control_enabled']['fr-fr'] = "";
-$text['description-control_enabled']['he-il'] = "";
-$text['description-control_enabled']['it-it'] = "Imposta lo stato del controllo.";
-$text['description-control_enabled']['nl-nl'] = "";
-$text['description-control_enabled']['pl-pl'] = "";
-$text['description-control_enabled']['pt-br'] = "Atribua o estado do controle."; //copied from pt-pt
-$text['description-control_enabled']['pt-pt'] = "Atribua o estado do controle.";
-$text['description-control_enabled']['ro-ro'] = "";
-$text['description-control_enabled']['ru-ru'] = "";
-$text['description-control_enabled']['sv-se'] = "Ange statusen för kontrollen.";
-$text['description-control_enabled']['uk-ua'] = "";
-
-$text['label-control_description']['en-us'] = "Description";
-$text['label-control_description']['ar-eg'] = "";
-$text['label-control_description']['de-at'] = "Beschreibung"; //copied from de-de
-$text['label-control_description']['de-ch'] = "Beschreibung"; //copied from de-de
-$text['label-control_description']['de-de'] = "Beschreibung";
-$text['label-control_description']['es-cl'] = "";
-$text['label-control_description']['es-mx'] = "";
-$text['label-control_description']['fr-ca'] = "";
-$text['label-control_description']['fr-fr'] = "";
-$text['label-control_description']['he-il'] = "";
-$text['label-control_description']['it-it'] = "Descrizione";
-$text['label-control_description']['nl-nl'] = "";
-$text['label-control_description']['pl-pl'] = "";
-$text['label-control_description']['pt-br'] = "Descrição"; //copied from pt-pt
-$text['label-control_description']['pt-pt'] = "Descrição";
-$text['label-control_description']['ro-ro'] = "";
-$text['label-control_description']['ru-ru'] = "";
-$text['label-control_description']['sv-se'] = "Beskrivning";
-$text['label-control_description']['uk-ua'] = "";
-
-$text['description-control_description']['en-us'] = "Enter the description.";
-$text['description-control_description']['ar-eg'] = "";
-$text['description-control_description']['de-at'] = "Geben Sie eine Beschreibung ein."; //copied from de-de
-$text['description-control_description']['de-ch'] = "Geben Sie eine Beschreibung ein."; //copied from de-de
-$text['description-control_description']['de-de'] = "Geben Sie eine Beschreibung ein.";
-$text['description-control_description']['es-cl'] = "";
-$text['description-control_description']['es-mx'] = "";
-$text['description-control_description']['fr-ca'] = "";
-$text['description-control_description']['fr-fr'] = "";
-$text['description-control_description']['he-il'] = "";
-$text['description-control_description']['it-it'] = "Inserire la descrizione.";
-$text['description-control_description']['nl-nl'] = "";
-$text['description-control_description']['pl-pl'] = "";
-$text['description-control_description']['pt-br'] = "Entre com a descrição."; //copied from pt-pt
-$text['description-control_description']['pt-pt'] = "Entre com a descrição.";
-$text['description-control_description']['ro-ro'] = "";
-$text['description-control_description']['ru-ru'] = "";
-$text['description-control_description']['sv-se'] = "Ange beskrivningen.";
-$text['description-control_description']['uk-ua'] = "";
-
-$text['label-true']['en-us'] = "true";
-$text['label-true']['ar-eg'] = "";
-$text['label-true']['de-at'] = "ein"; //copied from de-de
-$text['label-true']['de-ch'] = "ein"; //copied from de-de
-$text['label-true']['de-de'] = "ein";
-$text['label-true']['es-cl'] = "";
-$text['label-true']['es-mx'] = "";
-$text['label-true']['fr-ca'] = "";
-$text['label-true']['fr-fr'] = "";
-$text['label-true']['he-il'] = "";
-$text['label-true']['it-it'] = "Vero";
-$text['label-true']['nl-nl'] = "";
-$text['label-true']['pl-pl'] = "";
-$text['label-true']['pt-br'] = "Sim"; //copied from pt-pt
-$text['label-true']['pt-pt'] = "Sim";
-$text['label-true']['ro-ro'] = "";
-$text['label-true']['ru-ru'] = "";
-$text['label-true']['sv-se'] = "sann";
-$text['label-true']['uk-ua'] = "";
-
-$text['label-false']['en-us'] = "false";
-$text['label-false']['ar-eg'] = "";
-$text['label-false']['de-at'] = "aus"; //copied from de-de
-$text['label-false']['de-ch'] = "aus"; //copied from de-de
-$text['label-false']['de-de'] = "aus";
-$text['label-false']['es-cl'] = "falso";
-$text['label-false']['es-mx'] = "falso"; //copied from es-cl
-$text['label-false']['fr-ca'] = "falso"; //copied from fr-fr
-$text['label-false']['fr-fr'] = "falso";
-$text['label-false']['he-il'] = "";
-$text['label-false']['it-it'] = "Falso";
-$text['label-false']['nl-nl'] = "";
-$text['label-false']['pl-pl'] = "";
-$text['label-false']['pt-br'] = "Não";
-$text['label-false']['pt-pt'] = "falso";
-$text['label-false']['ro-ro'] = "";
-$text['label-false']['ru-ru'] = "";
-$text['label-false']['sv-se'] = "falsk";
-$text['label-false']['uk-ua'] = "";
-
-$text['button-add']['en-us'] = "Add";
-$text['button-add']['ar-eg'] = "";
-$text['button-add']['de-at'] = "Hinzufügen"; //copied from de-de
-$text['button-add']['de-ch'] = "Hinzufügen"; //copied from de-de
-$text['button-add']['de-de'] = "Hinzufügen";
-$text['button-add']['es-cl'] = "";
-$text['button-add']['es-mx'] = "";
-$text['button-add']['fr-ca'] = "";
-$text['button-add']['fr-fr'] = "";
-$text['button-add']['he-il'] = "";
-$text['button-add']['it-it'] = "Inserisci";
-$text['button-add']['nl-nl'] = "";
-$text['button-add']['pl-pl'] = "";
-$text['button-add']['pt-br'] = "Adicionar"; //copied from pt-pt
-$text['button-add']['pt-pt'] = "Adicionar";
-$text['button-add']['ro-ro'] = "";
-$text['button-add']['ru-ru'] = "";
-$text['button-add']['sv-se'] = "Lägg Till";
-$text['button-add']['uk-ua'] = "";
-
-$text['button-edit']['en-us'] = "Edit";
-$text['button-edit']['ar-eg'] = "";
-$text['button-edit']['de-at'] = "Bearbeiten"; //copied from de-de
-$text['button-edit']['de-ch'] = "Bearbeiten"; //copied from de-de
-$text['button-edit']['de-de'] = "Bearbeiten";
-$text['button-edit']['es-cl'] = "";
-$text['button-edit']['es-mx'] = "";
-$text['button-edit']['fr-ca'] = "";
-$text['button-edit']['fr-fr'] = "";
-$text['button-edit']['he-il'] = "";
-$text['button-edit']['it-it'] = "Modifica";
-$text['button-edit']['nl-nl'] = "";
-$text['button-edit']['pl-pl'] = "";
-$text['button-edit']['pt-br'] = "Editar"; //copied from pt-pt
-$text['button-edit']['pt-pt'] = "Editar";
-$text['button-edit']['ro-ro'] = "";
-$text['button-edit']['ru-ru'] = "";
-$text['button-edit']['sv-se'] = "Ändra";
-$text['button-edit']['uk-ua'] = "";
-
-$text['button-delete']['en-us'] = "Delete";
-$text['button-delete']['ar-eg'] = "";
-$text['button-delete']['de-at'] = "Löschen"; //copied from de-de
-$text['button-delete']['de-ch'] = "Löschen"; //copied from de-de
-$text['button-delete']['de-de'] = "Löschen";
-$text['button-delete']['es-cl'] = "";
-$text['button-delete']['es-mx'] = "";
-$text['button-delete']['fr-ca'] = "";
-$text['button-delete']['fr-fr'] = "";
-$text['button-delete']['he-il'] = "";
-$text['button-delete']['it-it'] = "Cancella";
-$text['button-delete']['nl-nl'] = "";
-$text['button-delete']['pl-pl'] = "";
-$text['button-delete']['pt-br'] = "Deletar"; //copied from pt-pt
-$text['button-delete']['pt-pt'] = "Deletar";
-$text['button-delete']['ro-ro'] = "";
-$text['button-delete']['ru-ru'] = "";
-$text['button-delete']['sv-se'] = "Ta Bort";
-$text['button-delete']['uk-ua'] = "";
-
-$text['button-save']['en-us'] = "Save";
-$text['button-save']['ar-eg'] = "";
-$text['button-save']['de-at'] = "Speichern"; //copied from de-de
-$text['button-save']['de-ch'] = "Speichern"; //copied from de-de
-$text['button-save']['de-de'] = "Speichern";
-$text['button-save']['es-cl'] = "";
-$text['button-save']['es-mx'] = "";
-$text['button-save']['fr-ca'] = "";
-$text['button-save']['fr-fr'] = "";
-$text['button-save']['he-il'] = "";
-$text['button-save']['it-it'] = "Salva";
-$text['button-save']['nl-nl'] = "";
-$text['button-save']['pl-pl'] = "";
-$text['button-save']['pt-br'] = "Salvar";
-$text['button-save']['pt-pt'] = "Guardar";
-$text['button-save']['ro-ro'] = "";
-$text['button-save']['ru-ru'] = "";
-$text['button-save']['sv-se'] = "Spara";
-$text['button-save']['uk-ua'] = "";
-
-$text['button-view']['en-us'] = "View";
-$text['button-view']['ar-eg'] = "";
-$text['button-view']['de-at'] = "Anzeigen"; //copied from de-de
-$text['button-view']['de-ch'] = "Anzeigen"; //copied from de-de
-$text['button-view']['de-de'] = "Anzeigen";
-$text['button-view']['es-cl'] = "";
-$text['button-view']['es-mx'] = "";
-$text['button-view']['fr-ca'] = "";
-$text['button-view']['fr-fr'] = "";
-$text['button-view']['he-il'] = "";
-$text['button-view']['it-it'] = "Mostra";
-$text['button-view']['nl-nl'] = "";
-$text['button-view']['pl-pl'] = "";
-$text['button-view']['pt-br'] = "Visualizar"; //copied from pt-pt
-$text['button-view']['pt-pt'] = "Visualizar";
-$text['button-view']['ro-ro'] = "";
-$text['button-view']['ru-ru'] = "";
-$text['button-view']['sv-se'] = "Läs";
-$text['button-view']['uk-ua'] = "";
-
-$text['button-back']['en-us'] = "Back";
-$text['button-back']['ar-eg'] = "";
-$text['button-back']['de-at'] = "Zurück"; //copied from de-de
-$text['button-back']['de-ch'] = "Zurück"; //copied from de-de
-$text['button-back']['de-de'] = "Zurück";
-$text['button-back']['es-cl'] = "";
-$text['button-back']['es-mx'] = "";
-$text['button-back']['fr-ca'] = "";
-$text['button-back']['fr-fr'] = "";
-$text['button-back']['he-il'] = "";
-$text['button-back']['it-it'] = "Indietro";
-$text['button-back']['nl-nl'] = "";
-$text['button-back']['pl-pl'] = "";
-$text['button-back']['pt-br'] = "Voltar"; //copied from pt-pt
-$text['button-back']['pt-pt'] = "Voltar";
-$text['button-back']['ro-ro'] = "";
-$text['button-back']['ru-ru'] = "";
-$text['button-back']['sv-se'] = "Tillbaka";
-$text['button-back']['uk-ua'] = "";
-
-$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
-$text['confirm-delete']['ar-eg'] = "";
-$text['confirm-delete']['de-at'] = "Wollen Sie das wirklich löschen?"; //copied from de-de
-$text['confirm-delete']['de-ch'] = "Wollen Sie das wirklich löschen?"; //copied from de-de
-$text['confirm-delete']['de-de'] = "Wollen Sie das wirklich löschen?";
-$text['confirm-delete']['es-cl'] = "";
-$text['confirm-delete']['es-mx'] = "";
-$text['confirm-delete']['fr-ca'] = "";
-$text['confirm-delete']['fr-fr'] = "";
-$text['confirm-delete']['he-il'] = "";
-$text['confirm-delete']['it-it'] = "Vuoi veramente cancellarlo?";
-$text['confirm-delete']['nl-nl'] = "";
-$text['confirm-delete']['pl-pl'] = "";
-$text['confirm-delete']['pt-br'] = "Você realmente deseja excluir?"; //copied from pt-pt
-$text['confirm-delete']['pt-pt'] = "Você realmente deseja excluir?";
-$text['confirm-delete']['ro-ro'] = "";
-$text['confirm-delete']['ru-ru'] = "";
-$text['confirm-delete']['sv-se'] = "Vill du verkligen t abort detta?";
-$text['confirm-delete']['uk-ua'] = "";
-
-$text['message-add']['en-us'] = "Add Completed";
-$text['message-add']['ar-eg'] = "";
-$text['message-add']['de-at'] = "Erfolgreich hinzugefügt"; //copied from de-de
-$text['message-add']['de-ch'] = "Erfolgreich hinzugefügt"; //copied from de-de
-$text['message-add']['de-de'] = "Erfolgreich hinzugefügt";
-$text['message-add']['es-cl'] = "";
-$text['message-add']['es-mx'] = "";
-$text['message-add']['fr-ca'] = "";
-$text['message-add']['fr-fr'] = "";
-$text['message-add']['he-il'] = "";
-$text['message-add']['it-it'] = "Inserimento Completato";
-$text['message-add']['nl-nl'] = "";
-$text['message-add']['pl-pl'] = "";
-$text['message-add']['pt-br'] = "Adicionar concluído"; //copied from pt-pt
-$text['message-add']['pt-pt'] = "Adicionar concluído";
-$text['message-add']['ro-ro'] = "";
-$text['message-add']['ru-ru'] = "";
-$text['message-add']['sv-se'] = "Tillagd";
-$text['message-add']['uk-ua'] = "";
-
-$text['message-update']['en-us'] = "Update Completed";
-$text['message-update']['ar-eg'] = "";
-$text['message-update']['de-at'] = "Aktualisierung abgeschlossen"; //copied from de-de
-$text['message-update']['de-ch'] = "Aktualisierung abgeschlossen"; //copied from de-de
-$text['message-update']['de-de'] = "Aktualisierung abgeschlossen";
-$text['message-update']['es-cl'] = "";
-$text['message-update']['es-mx'] = "";
-$text['message-update']['fr-ca'] = "";
-$text['message-update']['fr-fr'] = "";
-$text['message-update']['he-il'] = "";
-$text['message-update']['it-it'] = "Aggiornamento Completato";
-$text['message-update']['nl-nl'] = "";
-$text['message-update']['pl-pl'] = "";
-$text['message-update']['pt-br'] = "Atualização concluída"; //copied from pt-pt
-$text['message-update']['pt-pt'] = "Atualização concluída";
-$text['message-update']['ro-ro'] = "";
-$text['message-update']['ru-ru'] = "";
-$text['message-update']['sv-se'] = "Ändring Utförd";
-$text['message-update']['uk-ua'] = "";
-
-$text['message-delete']['en-us'] = "Delete Completed";
-$text['message-delete']['ar-eg'] = "";
-$text['message-delete']['de-at'] = "Erfolgreich gelöscht"; //copied from de-de
-$text['message-delete']['de-ch'] = "Erfolgreich gelöscht"; //copied from de-de
-$text['message-delete']['de-de'] = "Erfolgreich gelöscht";
-$text['message-delete']['es-cl'] = "";
-$text['message-delete']['es-mx'] = "";
-$text['message-delete']['fr-ca'] = "";
-$text['message-delete']['fr-fr'] = "";
-$text['message-delete']['he-il'] = "";
-$text['message-delete']['it-it'] = "Cancellazione Completata";
-$text['message-delete']['nl-nl'] = "";
-$text['message-delete']['pl-pl'] = "";
-$text['message-delete']['pt-br'] = "Exclusão concluída"; //copied from pt-pt
-$text['message-delete']['pt-pt'] = "Exclusão concluída";
-$text['message-delete']['ro-ro'] = "";
-$text['message-delete']['ru-ru'] = "";
-$text['message-delete']['sv-se'] = "Borttagen";
-$text['message-delete']['uk-ua'] = "";
-
-$text['message-required']['en-us'] = "Please provide: ";
-$text['message-required']['ar-eg'] = "";
-$text['message-required']['de-at'] = "Bitte geben Sie folgendes an:"; //copied from de-de
-$text['message-required']['de-ch'] = "Bitte geben Sie folgendes an:"; //copied from de-de
-$text['message-required']['de-de'] = "Bitte geben Sie folgendes an:";
-$text['message-required']['es-cl'] = "";
-$text['message-required']['es-mx'] = "";
-$text['message-required']['fr-ca'] = "";
-$text['message-required']['fr-fr'] = "";
-$text['message-required']['he-il'] = "";
-$text['message-required']['it-it'] = "Prego fornire: ";
-$text['message-required']['nl-nl'] = "";
-$text['message-required']['pl-pl'] = "";
-$text['message-required']['pt-br'] = "Por favor, informe: "; //copied from pt-pt
-$text['message-required']['pt-pt'] = "Por favor, informe: ";
-$text['message-required']['ro-ro'] = "";
-$text['message-required']['ru-ru'] = "";
-$text['message-required']['sv-se'] = "Var god ange: ";
-$text['message-required']['uk-ua'] = "";
-
-$text['title-conference_control_details']['en-us'] = "Controls";
-$text['title-conference_control_details']['ar-eg'] = "";
-$text['title-conference_control_details']['de-at'] = "Steuerelemente"; //copied from de-de
-$text['title-conference_control_details']['de-ch'] = "Steuerelemente"; //copied from de-de
-$text['title-conference_control_details']['de-de'] = "Steuerelemente";
-$text['title-conference_control_details']['es-cl'] = "";
-$text['title-conference_control_details']['es-mx'] = "";
-$text['title-conference_control_details']['fr-ca'] = "";
-$text['title-conference_control_details']['fr-fr'] = "";
-$text['title-conference_control_details']['he-il'] = "";
-$text['title-conference_control_details']['it-it'] = "Controlli";
-$text['title-conference_control_details']['nl-nl'] = "";
-$text['title-conference_control_details']['pl-pl'] = "";
-$text['title-conference_control_details']['pt-br'] = "Controles"; //copied from pt-pt
-$text['title-conference_control_details']['pt-pt'] = "Controles";
-$text['title-conference_control_details']['ro-ro'] = "";
-$text['title-conference_control_details']['ru-ru'] = "";
-$text['title-conference_control_details']['sv-se'] = "Kontroller";
-$text['title-conference_control_details']['uk-ua'] = "";
-
-$text['title-conference_control_detail']['en-us'] = "Control";
-$text['title-conference_control_detail']['ar-eg'] = "";
-$text['title-conference_control_detail']['de-at'] = "Steuern"; //copied from de-de
-$text['title-conference_control_detail']['de-ch'] = "Steuern"; //copied from de-de
-$text['title-conference_control_detail']['de-de'] = "Steuern";
-$text['title-conference_control_detail']['es-cl'] = "";
-$text['title-conference_control_detail']['es-mx'] = "";
-$text['title-conference_control_detail']['fr-ca'] = "";
-$text['title-conference_control_detail']['fr-fr'] = "";
-$text['title-conference_control_detail']['he-il'] = "";
-$text['title-conference_control_detail']['it-it'] = "Controllo";
-$text['title-conference_control_detail']['nl-nl'] = "";
-$text['title-conference_control_detail']['pl-pl'] = "";
-$text['title-conference_control_detail']['pt-br'] = "Controle"; //copied from pt-pt
-$text['title-conference_control_detail']['pt-pt'] = "Controle";
-$text['title-conference_control_detail']['ro-ro'] = "";
-$text['title-conference_control_detail']['ru-ru'] = "";
-$text['title-conference_control_detail']['sv-se'] = "Kontrol";
-$text['title-conference_control_detail']['uk-ua'] = "";
-
-$text['title_description-conference_control_detail']['en-us'] = "Call controls enable ability to assign digits to actions. They can be used to mute, unmute, or other actions during the conference call.";
-$text['title_description-conference_control_detail']['ar-eg'] = "";
-$text['title_description-conference_control_detail']['de-at'] = "Anrufsteuerung anhand von zugeordneten Ziffern. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen."; //copied from de-de
-$text['title_description-conference_control_detail']['de-ch'] = "Anrufsteuerung anhand von zugeordneten Ziffern. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen."; //copied from de-de
-$text['title_description-conference_control_detail']['de-de'] = "Anrufsteuerung anhand von zugeordneten Ziffern. Diese können verschiedene Aktionen wie Stummschaltung, usw. während einer Konferenz auslösen.";
-$text['title_description-conference_control_detail']['es-cl'] = "";
-$text['title_description-conference_control_detail']['es-mx'] = "";
-$text['title_description-conference_control_detail']['fr-ca'] = "";
-$text['title_description-conference_control_detail']['fr-fr'] = "";
-$text['title_description-conference_control_detail']['he-il'] = "";
-$text['title_description-conference_control_detail']['it-it'] = "";
-$text['title_description-conference_control_detail']['nl-nl'] = "";
-$text['title_description-conference_control_detail']['pl-pl'] = "";
-$text['title_description-conference_control_detail']['pt-br'] = "";
-$text['title_description-conference_control_detail']['pt-pt'] = "";
-$text['title_description-conference_control_detail']['ro-ro'] = "";
-$text['title_description-conference_control_detail']['ru-ru'] = "";
-$text['title_description-conference_control_detail']['sv-se'] = "";
-$text['title_description-conference_control_detail']['uk-ua'] = "";
-
-$text['label-control_digits']['en-us'] = "Digits";
-$text['label-control_digits']['ar-eg'] = "";
-$text['label-control_digits']['de-at'] = "Ziffern"; //copied from de-de
-$text['label-control_digits']['de-ch'] = "Ziffern"; //copied from de-de
-$text['label-control_digits']['de-de'] = "Ziffern";
-$text['label-control_digits']['es-cl'] = "";
-$text['label-control_digits']['es-mx'] = "";
-$text['label-control_digits']['fr-ca'] = "";
-$text['label-control_digits']['fr-fr'] = "";
-$text['label-control_digits']['he-il'] = "";
-$text['label-control_digits']['it-it'] = "Tasti";
-$text['label-control_digits']['nl-nl'] = "";
-$text['label-control_digits']['pl-pl'] = "";
-$text['label-control_digits']['pt-br'] = "Digitos"; //copied from pt-pt
-$text['label-control_digits']['pt-pt'] = "Digitos";
-$text['label-control_digits']['ro-ro'] = "";
-$text['label-control_digits']['ru-ru'] = "";
-$text['label-control_digits']['sv-se'] = "Siffror";
-$text['label-control_digits']['uk-ua'] = "";
-
-$text['description-control_digits']['en-us'] = "Enter the digits.";
-$text['description-control_digits']['ar-eg'] = "";
-$text['description-control_digits']['de-at'] = "Geben Sie die Ziffern ein."; //copied from de-de
-$text['description-control_digits']['de-ch'] = "Geben Sie die Ziffern ein."; //copied from de-de
-$text['description-control_digits']['de-de'] = "Geben Sie die Ziffern ein.";
-$text['description-control_digits']['es-cl'] = "";
-$text['description-control_digits']['es-mx'] = "";
-$text['description-control_digits']['fr-ca'] = "";
-$text['description-control_digits']['fr-fr'] = "";
-$text['description-control_digits']['he-il'] = "";
-$text['description-control_digits']['it-it'] = "Inserire i tasti.";
-$text['description-control_digits']['nl-nl'] = "";
-$text['description-control_digits']['pl-pl'] = "";
-$text['description-control_digits']['pt-br'] = "Entre com os digitos"; //copied from pt-pt
-$text['description-control_digits']['pt-pt'] = "Entre com os digitos";
-$text['description-control_digits']['ro-ro'] = "";
-$text['description-control_digits']['ru-ru'] = "";
-$text['description-control_digits']['sv-se'] = "Ange siffrorna.";
-$text['description-control_digits']['uk-ua'] = "";
-
-$text['label-control_action']['en-us'] = "Action";
-$text['label-control_action']['ar-eg'] = "";
-$text['label-control_action']['de-at'] = "Aktion"; //copied from de-de
-$text['label-control_action']['de-ch'] = "Aktion"; //copied from de-de
-$text['label-control_action']['de-de'] = "Aktion";
-$text['label-control_action']['es-cl'] = "";
-$text['label-control_action']['es-mx'] = "";
-$text['label-control_action']['fr-ca'] = "";
-$text['label-control_action']['fr-fr'] = "";
-$text['label-control_action']['he-il'] = "";
-$text['label-control_action']['it-it'] = "Azione";
-$text['label-control_action']['nl-nl'] = "";
-$text['label-control_action']['pl-pl'] = "";
-$text['label-control_action']['pt-br'] = "Ação"; //copied from pt-pt
-$text['label-control_action']['pt-pt'] = "Ação";
-$text['label-control_action']['ro-ro'] = "";
-$text['label-control_action']['ru-ru'] = "";
-$text['label-control_action']['sv-se'] = "Handling";
-$text['label-control_action']['uk-ua'] = "";
-
-$text['description-control_action']['en-us'] = "Enter the action.";
-$text['description-control_action']['ar-eg'] = "";
-$text['description-control_action']['de-at'] = "Geben Sie die Aktion an."; //copied from de-de
-$text['description-control_action']['de-ch'] = "Geben Sie die Aktion an."; //copied from de-de
-$text['description-control_action']['de-de'] = "Geben Sie die Aktion an.";
-$text['description-control_action']['es-cl'] = "";
-$text['description-control_action']['es-mx'] = "";
-$text['description-control_action']['fr-ca'] = "";
-$text['description-control_action']['fr-fr'] = "";
-$text['description-control_action']['he-il'] = "";
-$text['description-control_action']['it-it'] = "Impostare azione.";
-$text['description-control_action']['nl-nl'] = "";
-$text['description-control_action']['pl-pl'] = "";
-$text['description-control_action']['pt-br'] = "Informe uma ação."; //copied from pt-pt
-$text['description-control_action']['pt-pt'] = "Informe uma ação.";
-$text['description-control_action']['ro-ro'] = "";
-$text['description-control_action']['ru-ru'] = "";
-$text['description-control_action']['sv-se'] = "Ange handlingen.";
-$text['description-control_action']['uk-ua'] = "";
-
-$text['label-control_data']['en-us'] = "Data";
-$text['label-control_data']['ar-eg'] = "";
-$text['label-control_data']['de-at'] = "Daten"; //copied from de-de
-$text['label-control_data']['de-ch'] = "Daten"; //copied from de-de
-$text['label-control_data']['de-de'] = "Daten";
-$text['label-control_data']['es-cl'] = "";
-$text['label-control_data']['es-mx'] = "";
-$text['label-control_data']['fr-ca'] = "";
-$text['label-control_data']['fr-fr'] = "";
-$text['label-control_data']['he-il'] = "";
-$text['label-control_data']['it-it'] = "Dati";
-$text['label-control_data']['nl-nl'] = "";
-$text['label-control_data']['pl-pl'] = "";
-$text['label-control_data']['pt-br'] = "Dados"; //copied from pt-pt
-$text['label-control_data']['pt-pt'] = "Dados";
-$text['label-control_data']['ro-ro'] = "";
-$text['label-control_data']['ru-ru'] = "";
-$text['label-control_data']['sv-se'] = "Data";
-$text['label-control_data']['uk-ua'] = "";
-
-$text['description-control_data']['en-us'] = "Enter the data.";
-$text['description-control_data']['ar-eg'] = "";
-$text['description-control_data']['de-at'] = "Geben Sie die Daten ein."; //copied from de-de
-$text['description-control_data']['de-ch'] = "Geben Sie die Daten ein."; //copied from de-de
-$text['description-control_data']['de-de'] = "Geben Sie die Daten ein.";
-$text['description-control_data']['es-cl'] = "";
-$text['description-control_data']['es-mx'] = "";
-$text['description-control_data']['fr-ca'] = "";
-$text['description-control_data']['fr-fr'] = "";
-$text['description-control_data']['he-il'] = "";
-$text['description-control_data']['it-it'] = "Inserire il dato.";
-$text['description-control_data']['nl-nl'] = "";
-$text['description-control_data']['pl-pl'] = "";
-$text['description-control_data']['pt-br'] = "Informe os dados."; //copied from pt-pt
-$text['description-control_data']['pt-pt'] = "Informe os dados.";
-$text['description-control_data']['ro-ro'] = "";
-$text['description-control_data']['ru-ru'] = "";
-$text['description-control_data']['sv-se'] = "Ange data.";
-$text['description-control_data']['uk-ua'] = "";
-
-?>
+<?php
+
+	//Conference Controls
+		$text['title-conference_controls']['en-us'] = 'Conference Controls';
+		$text['title-conference_controls']['es-cl'] = '';
+		$text['title-conference_controls']['pt-pt'] = '';
+		$text['title-conference_controls']['pt-br'] = 'Controles de conferência';
+		$text['title-conference_controls']['fr-fr'] = '';
+
+		$text['title-conference_control']['en-us'] = 'Conference Control';
+		$text['title-conference_control']['es-cl'] = '';
+		$text['title-conference_control']['pt-pt'] = '';
+		$text['title-conference_control']['pt-br'] = 'Controle de conferência';
+		$text['title-conference_control']['fr-fr'] = '';
+
+		$text['title_description-conference_control']['en-us'] = 'Call controls enable ability to assign digits to actions. They can be used to mute, unmute, or other actions during the conference call.';
+		$text['title_description-conference_control']['es-cl'] = '';
+		$text['title_description-conference_control']['pt-pt'] = '';
+		$text['title_description-conference_control']['pt-br'] = 'Controle de chamadas habilita atribuir ações aos números. Podem ser usadas para silenciar, ou outras ações durante a conferência.';
+		$text['title_description-conference_control']['fr-fr'] = '';
+
+		$text['label-control_name']['en-us'] = 'Name';
+		$text['label-control_name']['es-cl'] = '';
+		$text['label-control_name']['pt-pt'] = '';
+		$text['label-control_name']['pt-br'] = 'Nome';
+		$text['label-control_name']['fr-fr'] = '';
+
+		$text['description-control_name']['en-us'] = 'Enter the conference control name.';
+		$text['description-control_name']['es-cl'] = '';
+		$text['description-control_name']['pt-pt'] = '';
+		$text['description-control_name']['pt-br'] = 'Entre com o nome do controle de conferência.';
+		$text['description-control_name']['fr-fr'] = '';
+
+		$text['label-control_enabled']['en-us'] = 'Enabled';
+		$text['label-control_enabled']['es-cl'] = '';
+		$text['label-control_enabled']['pt-pt'] = '';
+		$text['label-control_enabled']['pt-br'] = 'Habilitado';
+		$text['label-control_enabled']['fr-fr'] = '';
+
+		$text['description-control_enabled']['en-us'] = 'Set the stats of the control.';
+		$text['description-control_enabled']['es-cl'] = '';
+		$text['description-control_enabled']['pt-pt'] = '';
+		$text['description-control_enabled']['pt-br'] = 'Atribua o estado do controle.';
+		$text['description-control_enabled']['fr-fr'] = '';
+
+		$text['label-control_description']['en-us'] = 'Description';
+		$text['label-control_description']['es-cl'] = '';
+		$text['label-control_description']['pt-pt'] = '';
+		$text['label-control_description']['pt-br'] = 'Descrição';
+		$text['label-control_description']['fr-fr'] = '';
+
+		$text['description-control_description']['en-us'] = 'Enter the description.';
+		$text['description-control_description']['es-cl'] = '';
+		$text['description-control_description']['pt-pt'] = '';
+		$text['description-control_description']['pt-br'] = 'Entre com a descrição.';
+		$text['description-control_description']['fr-fr'] = '';
+
+		$text['label-true']['en-us'] = 'true';
+		$text['label-true']['es-cl'] = '';
+		$text['label-true']['pt-pt'] = '';
+		$text['label-true']['pt-br'] = 'Sim';
+		$text['label-true']['fr-fr'] = '';
+
+		$text['label-false']['en-us'] = 'false';
+		$text['label-false']['es-cl'] = 'falso';
+		$text['label-false']['pt-pt'] = 'falso';
+		$text['label-false']['pt-br'] = 'Não';
+		$text['label-false']['fr-fr'] = 'falso';
+
+		$text['button-add']['en-us'] = 'Add';
+		$text['button-add']['es-cl'] = '';
+		$text['button-add']['pt-pt'] = '';
+		$text['button-add']['pt-br'] = 'Adicionar';
+		$text['button-add']['fr-fr'] = '';
+
+		$text['button-edit']['en-us'] = 'Edit';
+		$text['button-edit']['es-cl'] = '';
+		$text['button-edit']['pt-pt'] = '';
+		$text['button-edit']['pt-br'] = 'Editar';
+		$text['button-edit']['fr-fr'] = '';
+
+		$text['button-delete']['en-us'] = 'Delete';
+		$text['button-delete']['es-cl'] = '';
+		$text['button-delete']['pt-pt'] = '';
+		$text['button-delete']['pt-br'] = 'Deletar';
+		$text['button-delete']['fr-fr'] = '';
+
+		$text['button-save']['en-us'] = 'Save';
+		$text['button-save']['es-cl'] = '';
+		$text['button-save']['pt-pt'] = 'Guardar';
+		$text['button-save']['pt-br'] = 'Salvar';
+		$text['button-save']['fr-fr'] = '';
+
+		$text['button-view']['en-us'] = 'View';
+		$text['button-view']['es-cl'] = '';
+		$text['button-view']['pt-pt'] = '';
+		$text['button-view']['pt-br'] = 'Visualizar';
+		$text['button-view']['fr-fr'] = '';
+
+		$text['button-back']['en-us'] = 'Back';
+		$text['button-back']['es-cl'] = '';
+		$text['button-back']['pt-pt'] = 'Voltar';
+		$text['button-back']['pt-br'] = 'Voltar';
+		$text['button-back']['fr-fr'] = '';
+
+		$text['confirm-delete']['en-us'] = 'Do you really want to delete this?';
+		$text['confirm-delete']['es-cl'] = '';
+		$text['confirm-delete']['pt-pt'] = '';
+		$text['confirm-delete']['pt-br'] = 'Você realmente deseja excluir?';
+		$text['confirm-delete']['fr-fr'] = '';
+
+		$text['message-add']['en-us'] = 'Add Completed';
+		$text['message-add']['es-cl'] = '';
+		$text['message-add']['pt-pt'] = '';
+		$text['message-add']['pt-br'] = 'Adicionar concluído';
+		$text['message-add']['fr-fr'] = '';
+
+		$text['message-update']['en-us'] = 'Update Completed';
+		$text['message-update']['es-cl'] = '';
+		$text['message-update']['pt-pt'] = '';
+		$text['message-update']['pt-br'] = 'Atualização concluída';
+		$text['message-update']['fr-fr'] = '';
+
+		$text['message-delete']['en-us'] = 'Delete Completed';
+		$text['message-delete']['es-cl'] = '';
+		$text['message-delete']['pt-pt'] = '';
+		$text['message-delete']['pt-br'] = 'Exclusão concluída';
+		$text['message-delete']['fr-fr'] = '';
+
+		$text['message-required']['en-us'] = 'Please provide: ';
+		$text['message-required']['es-cl'] = '';
+		$text['message-required']['pt-pt'] = '';
+		$text['message-required']['pt-br'] = 'Por favor, informe: ';
+		$text['message-required']['fr-fr'] = '';
+
+	//Controls
+		$text['title-conference_control_details']['en-us'] = 'Controls';
+		$text['title-conference_control_details']['es-cl'] = '';
+		$text['title-conference_control_details']['pt-pt'] = '';
+		$text['title-conference_control_details']['pt-br'] = 'Controles';
+		$text['title-conference_control_details']['fr-fr'] = '';
+
+		$text['title-conference_control_detail']['en-us'] = 'Control';
+		$text['title-conference_control_detail']['es-cl'] = '';
+		$text['title-conference_control_detail']['pt-pt'] = '';
+		$text['title-conference_control_detail']['pt-br'] = 'Controle';
+		$text['title-conference_control_detail']['fr-fr'] = '';
+
+		$text['title_description-conference_control_detail']['en-us'] = '';
+		$text['title_description-conference_control_detail']['es-cl'] = '';
+		$text['title_description-conference_control_detail']['pt-pt'] = '';
+		$text['title_description-conference_control_detail']['fr-fr'] = '';
+
+		$text['label-control_digits']['en-us'] = 'Digits';
+		$text['label-control_digits']['es-cl'] = '';
+		$text['label-control_digits']['pt-pt'] = '';
+		$text['label-control_digits']['pt-br'] = 'Digitos';
+		$text['label-control_digits']['fr-fr'] = '';
+
+		$text['description-control_digits']['en-us'] = 'Enter the digits.';
+		$text['description-control_digits']['es-cl'] = '';
+		$text['description-control_digits']['pt-pt'] = '';
+		$text['description-control_digits']['pt-br'] = 'Entre com os digitos';
+		$text['description-control_digits']['fr-fr'] = '';
+
+		$text['label-control_action']['en-us'] = 'Action';
+		$text['label-control_action']['es-cl'] = '';
+		$text['label-control_action']['pt-pt'] = '';
+		$text['label-control_action']['pt-br'] = 'Ação';
+		$text['label-control_action']['fr-fr'] = '';
+
+		$text['description-control_action']['en-us'] = 'Enter the action.';
+		$text['description-control_action']['es-cl'] = '';
+		$text['description-control_action']['pt-pt'] = '';
+		$text['description-control_action']['pt-br'] = 'Informe uma ação.';
+		$text['description-control_action']['fr-fr'] = '';
+
+		$text['label-control_data']['en-us'] = 'Data';
+		$text['label-control_data']['es-cl'] = '';
+		$text['label-control_data']['pt-pt'] = '';
+		$text['label-control_data']['pt-br'] = 'Dados';
+		$text['label-control_data']['fr-fr'] = '';
+
+		$text['description-control_data']['en-us'] = 'Enter the data.';
+		$text['description-control_data']['es-cl'] = '';
+		$text['description-control_data']['pt-pt'] = '';
+		$text['description-control_data']['pt-br'] = 'Informe os dados.';
+		$text['description-control_data']['fr-fr'] = '';
+
+		$text['label-control_enabled']['en-us'] = 'Enabled';
+		$text['label-control_enabled']['es-cl'] = '';
+		$text['label-control_enabled']['pt-pt'] = '';
+		$text['label-control_enabled']['pt-br'] = 'Habilitado';
+		$text['label-control_enabled']['fr-fr'] = '';
+
+		$text['description-control_enabled']['en-us'] = 'Set the status of the control.';
+		$text['description-control_enabled']['es-cl'] = '';
+		$text['description-control_enabled']['pt-pt'] = '';
+		$text['description-control_enabled']['pt-br'] = 'Atribua o estado do controle.';
+		$text['description-control_enabled']['fr-fr'] = '';
+
+?>
@@ -1,31 +1,20 @@
 <?php

-	$y=0;
-	$apps[$x]['menu'][$y]['title']['en-us'] = 'Conference Controls';
-	$apps[$x]['menu'][$y]['title']['ar-eg'] = "";
-	$apps[$x]['menu'][$y]['title']['de-at'] = 'Konferenzsteuerung';
-	$apps[$x]['menu'][$y]['title']['de-ch'] = "";
-	$apps[$x]['menu'][$y]['title']['de-de'] = 'Konferenzsteuerung';
-	$apps[$x]['menu'][$y]['title']['es-cl'] = "";
-	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "";
-	$apps[$x]['menu'][$y]['title']['he-il'] = "";
-	$apps[$x]['menu'][$y]['title']['it-it'] = "Controlli Conferenza";
-	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "";
-	$apps[$x]['menu'][$y]['title']['pt-br'] = 'Controles de conferência';
-	$apps[$x]['menu'][$y]['title']['pt-pt'] = "";
-	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
-	$apps[$x]['menu'][$y]['title']['ru-ru'] = 'Конференции Управление';
-	$apps[$x]['menu'][$y]['title']['sv-se'] = "";
-	$apps[$x]['menu'][$y]['title']['uk-ua'] = "";
-	$apps[$x]['menu'][$y]['uuid'] = '9896d4b5-507f-4d0e-8db7-caa7f4655202';
-	$apps[$x]['menu'][$y]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-	$apps[$x]['menu'][$y]['category'] = 'internal';
-	$apps[$x]['menu'][$y]['path'] = '/app/conference_controls/conference_controls.php';
-	$apps[$x]['menu'][$y]['groups'][] = 'superadmin';
-	//$apps[$x]['menu'][$y]['groups'][] = 'admin';
-	//$apps[$x]['menu'][$y]['groups'][] = 'user';
+$apps[$x]['menu'][0]['title']['en-us'] = 'Conference Controls';
+$apps[$x]['menu'][0]['title']['es-cl'] = '';
+$apps[$x]['menu'][0]['title']['pt-br'] = 'Controles de conferência';
+$apps[$x]['menu'][0]['title']['fr-fr'] = '';
+$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+$apps[$x]['menu'][0]['title']['pl'] = '';
+$apps[$x]['menu'][0]['title']['sv-se'] = '';
+$apps[$x]['menu'][0]['title']['uk'] = '';
+$apps[$x]['menu'][0]['title']['de-at'] = '';
+$apps[$x]['menu'][0]['uuid'] = '9896d4b5-507f-4d0e-8db7-caa7f4655202';
+$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
+$apps[$x]['menu'][0]['category'] = 'internal';
+$apps[$x]['menu'][0]['path'] = '/app/conference_controls/conference_controls.php';
+$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+//$apps[$x]['menu'][0]['groups'][] = 'admin';
+//$apps[$x]['menu'][0]['groups'][] = 'user';

 ?>
@@ -1,49 +1,49 @@
-<?php
-
-//includes
-	require_once "root.php";
-	require_once "resources/require.php";
-
-//check permissions
-	require_once "resources/check_auth.php";
-	if (permission_exists('conference_control_delete')) {
-		//access granted
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//get the id
-	if (count($_GET) > 0) {
-		$id = check_str($_GET["id"]);
-	}
-
-//delete the data
-	if (strlen($id) > 0) {
-		//delete conference_control_detail
-			$sql = "delete from v_conference_control_details ";
-			$sql .= "where conference_control_uuid = '$id' ";
-			//$sql .= "and domain_uuid = '$domain_uuid' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			unset($sql);
-
-		//delete conference_control
-			$sql = "delete from v_conference_controls ";
-			$sql .= "where conference_control_uuid = '$id' ";
-			//$sql .= "and domain_uuid = '$domain_uuid' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			unset($sql);
-	}
-
-//redirect the user
-	messages::add($text['message-delete']);
-	header('Location: conference_controls.php');
-
+<?php
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+
+//check permissions
+	require_once "resources/check_auth.php";
+	if (permission_exists('conference_control_delete')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//get the id
+	if (count($_GET) > 0) {
+		$id = check_str($_GET["id"]);
+	}
+
+//delete the data
+	if (strlen($id) > 0) {
+		//delete conference_control_detail
+			$sql = "delete from v_conference_control_details ";
+			$sql .= "where conference_control_uuid = '$id' ";
+			//$sql .= "and domain_uuid = '$domain_uuid' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			unset($sql);
+
+		//delete conference_control
+			$sql = "delete from v_conference_controls ";
+			$sql .= "where conference_control_uuid = '$id' ";
+			//$sql .= "and domain_uuid = '$domain_uuid' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			unset($sql);
+	}
+
+//redirect the user
+	$_SESSION['message'] = $text['message-delete'];
+	header('Location: conference_controls.php');
+
 ?>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
FusionPBX	26c4168cab	Update authentication.php	2016-09-11 12:52:15 -06:00
FusionPBX	cd34ed0527	Update database.php	2016-09-11 12:45:39 -06:00
FusionPBX	69e258e8ae	Update check_auth.php Set the domain_uuid session variables.	2016-09-11 12:28:12 -06:00
FusionPBX	928dd3ecfa	Update authentication.php Make the database the default authentication plugin if the default setting -> authentication is not set.	2016-09-11 09:52:29 -06:00
FusionPBX	b61e746b1e	Fix a spelling mistake in ldap.php.	2016-09-11 09:09:16 -06:00