diff --git a/app/backup/index.php b/app/backup/index.php
index 1df13834a9..fb31d009c2 100644
--- a/app/backup/index.php
+++ b/app/backup/index.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //download the backup
 	if ($_GET['a'] == "download" && permission_exists('backup_download')) {
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index b36c3c4a44..a489412e2e 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -39,10 +39,8 @@ require_once "resources/require.php";
 	}
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/call_block/call_block_cdr_add.php b/app/call_block/call_block_cdr_add.php
index d4067dfe09..4f46cd6af5 100644
--- a/app/call_block/call_block_cdr_add.php
+++ b/app/call_block/call_block_cdr_add.php
@@ -38,10 +38,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add from cdr
 	if (isset($_REQUEST["cdr_id"])) {
diff --git a/app/call_block/call_block_delete.php b/app/call_block/call_block_delete.php
index 8eee612c93..a52b56e142 100644
--- a/app/call_block/call_block_delete.php
+++ b/app/call_block/call_block_delete.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the variable
 	if (count($_GET)>0) {
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 0aec8763c1..6c80688e8a 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -39,10 +39,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //define the call_block_get_extensions function
 	function call_block_get_extensions($select_extension) {
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index 0cfb6652f1..ceffb50b1b 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //add the includes
 	require_once "resources/header.php";
diff --git a/app/call_broadcast/call_broadcast_delete.php b/app/call_broadcast/call_broadcast_delete.php
index 914574a686..0f362f42e1 100644
--- a/app/call_broadcast/call_broadcast_delete.php
+++ b/app/call_broadcast/call_broadcast_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET)>0) {
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index e1987b7c3c..029ab834c4 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action with add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php
index 9269dfb26f..4b7df2a84f 100644
--- a/app/call_broadcast/call_broadcast_send.php
+++ b/app/call_broadcast/call_broadcast_send.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the max execution time to 1 hour
 	ini_set(max_execution_time,3600);
diff --git a/app/call_broadcast/call_broadcast_stop.php b/app/call_broadcast/call_broadcast_stop.php
index 5945497a55..ab8a4dafbb 100644
--- a/app/call_broadcast/call_broadcast_stop.php
+++ b/app/call_broadcast/call_broadcast_stop.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the html values and set them as variables
 	if (count($_GET)>0) {
diff --git a/app/call_center/call_center_agent_delete.php b/app/call_center/call_center_agent_delete.php
index 7e6f0f7180..19714e3d81 100644
--- a/app/call_center/call_center_agent_delete.php
+++ b/app/call_center/call_center_agent_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
diff --git a/app/call_center/call_center_agent_edit.php b/app/call_center/call_center_agent_edit.php
index 1414a6b1ad..a70813916f 100644
--- a/app/call_center/call_center_agent_edit.php
+++ b/app/call_center/call_center_agent_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/call_center/call_center_agent_status.php b/app/call_center/call_center_agent_status.php
index bfe61caee3..f966be5c95 100644
--- a/app/call_center/call_center_agent_status.php
+++ b/app/call_center/call_center_agent_status.php
@@ -35,15 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-call_center_agent_status'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-call_center_agent_status'];
+	require_once "resources/paging.php";
 
 //setup the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php
index 2c1aa6cb70..ba2db21135 100644
--- a/app/call_center/call_center_agents.php
+++ b/app/call_center/call_center_agents.php
@@ -35,15 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-call_center_agents'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-call_center_agents'];
+	require_once "resources/paging.php";
 
 //get http values and set them to php variables
 	$order_by = $_GET["order_by"];
diff --git a/app/call_center/call_center_queue_delete.php b/app/call_center/call_center_queue_delete.php
index 41039759d4..529e8e13a6 100644
--- a/app/call_center/call_center_queue_delete.php
+++ b/app/call_center/call_center_queue_delete.php
@@ -35,14 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-if (count($_GET) > 0) {
-	$id = check_str($_GET["id"]);
-}
+//get the id
+	if (count($_GET) > 0) {
+		$id = check_str($_GET["id"]);
+	}
 
 if (strlen($id) > 0) {
 
diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php
index 110bb3c532..fdb489376d 100644
--- a/app/call_center/call_center_queue_edit.php
+++ b/app/call_center/call_center_queue_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/call_center/call_center_queues.php b/app/call_center/call_center_queues.php
index 3308405f8f..243399f828 100644
--- a/app/call_center/call_center_queues.php
+++ b/app/call_center/call_center_queues.php
@@ -35,15 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-call_center_queues'];
-
-require_once "resources/paging.php";
+//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"];
diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php
index 4ab43e3492..248979dfe3 100644
--- a/app/call_center/call_center_tier_edit.php
+++ b/app/call_center/call_center_tier_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set tier uuid
 	$call_center_tier_uuid = check_str($_REQUEST["id"]);
diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php
index 3771ca5781..cf4904454f 100644
--- a/app/call_center_active/call_center_active_inc.php
+++ b/app/call_center_active/call_center_active_inc.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the queue_name and set it as a variable
 	$queue_name = $_GET[queue_name].'@'. $_SESSION['domains'][$domain_uuid]['domain_name'];
diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php
index 8deb4f3ab8..106cc0e555 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -35,18 +35,17 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-active_call_center'];
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-active_call_center'];
+	require_once "resources/paging.php";
 
-require_once "resources/paging.php";
-
-$order_by = $_GET["order_by"];
-$order = $_GET["order"];
+//get the variables
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
 
 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index 4e2d7f77fc..44bac7ca3a 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -26,7 +26,6 @@
 require_once "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
-require_once "app_languages.php";
 if (permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb')) {
 	//access granted
 }
@@ -36,9 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //define the destination_select function
 	function destination_select($select_name, $select_value, $select_default) {
diff --git a/app/calls/calls.php b/app/calls/calls.php
index f8777e1b84..87b9cb2e20 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -39,11 +39,8 @@ else {
 	$order = check_str($_GET["order"]);
 
 //add multi-lingual support
-	unset($text);
-	require_once "app/calls/app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //begin the content
 	require_once "resources/header.php";
diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php
index 16876036f0..69e4d661e1 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -34,16 +34,13 @@ else {
 	echo "access denied";
 	exit;
 }
-
 //add multi-lingual support
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $conference_name = trim($_REQUEST["c"]);
 $tmp_conference_name = str_replace("_", " ", $conference_name);
 
-
 require_once "resources/header.php";
 $document['title'] = $text['title'];
 
diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php
index 1c7cdc76d5..fb260e1322 100644
--- a/app/calls_active/calls_active_inc.php
+++ b/app/calls_active/calls_active_inc.php
@@ -36,9 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the command
 	$switch_cmd = 'show channels as json';
diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php
index df94e3d487..f0cea66651 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -42,12 +42,11 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
+//include the header
+	require_once "resources/header.php";
 
 if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])) {
 	//get the http variables and set them as variables
diff --git a/app/conference_centers/conference_center_delete.php b/app/conference_centers/conference_center_delete.php
index 000a41e072..e3a41620a4 100644
--- a/app/conference_centers/conference_center_delete.php
+++ b/app/conference_centers/conference_center_delete.php
@@ -35,63 +35,63 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	$language = new text;
+	$text = $language->get();
+
+//get the id
+	if (count($_GET)>0) {
+		$id = check_str($_GET["id"]);
 	}
 
-if (count($_GET)>0) {
-	$id = check_str($_GET["id"]);
-}
+//delete the records
+	if (strlen($id) > 0) {
 
-if (strlen($id)>0) {
+		//get the dialplan uuid
+			$sql = "select * from v_conference_centers ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and conference_center_uuid = '$id' ";
+			$prep_statement = $db->prepare($sql);
+			$prep_statement->execute();
+			while($row = $prep_statement->fetch(PDO::FETCH_ASSOC)) {
+				$dialplan_uuid = $row['dialplan_uuid'];
+			}
 
-	//get the dialplan uuid
-		$sql = "select * from v_conference_centers ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and conference_center_uuid = '$id' ";
-		$prep_statement = $db->prepare($sql);
-		$prep_statement->execute();
-		while($row = $prep_statement->fetch(PDO::FETCH_ASSOC)) {
-			$dialplan_uuid = $row['dialplan_uuid'];
-		}
+		//delete the conference center
+			$sql = "delete from v_conference_centers ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and conference_center_uuid = '$id' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			unset($sql);
 
-	//delete the conference center
-		$sql = "delete from v_conference_centers ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and conference_center_uuid = '$id' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		unset($sql);
+		//delete the dialplan entry
+			$sql = "delete from v_dialplans ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
+			$db->query($sql);
+			unset($sql);
 
-	//delete the dialplan entry
-		$sql = "delete from v_dialplans ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
-		$db->query($sql);
-		unset($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);
 
-	//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);
+		//clear the cache
+			$cache = new cache;
+			$cache->delete("dialplan:".$_SESSION["context"]);
 
-	//clear the cache
-		$cache = new cache;
-		$cache->delete("dialplan:".$_SESSION["context"]);
+		//syncrhonize configuration
+			save_dialplan_xml();
 
-	//syncrhonize configuration
-		save_dialplan_xml();
+		//apply settings reminder
+			$_SESSION["reload_xml"] = true;
+	}
 
-	//apply settings reminder
-		$_SESSION["reload_xml"] = true;
-}
-
-
-$_SESSION["message"] = $text['message-delete'];
-header("Location: conference_centers.php");
-return;
+//redirect the browser
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: conference_centers.php");
+	return;
 
 ?>
\ No newline at end of file
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 3eee468708..352878f959 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index 9d4e564fc1..c4e77e3b80 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -41,10 +41,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/conference_centers/conference_room_delete.php b/app/conference_centers/conference_room_delete.php
index fb7b724316..af2a62ba17 100644
--- a/app/conference_centers/conference_room_delete.php
+++ b/app/conference_centers/conference_room_delete.php
@@ -35,14 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-if (count($_GET)>0) {
-	$id = check_str($_GET["id"]);
-}
+//get the id
+	if (count($_GET)>0) {
+		$id = check_str($_GET["id"]);
+	}
 
 if (strlen($id)>0) {
 	//get the meeting_uuid
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index ee84b42110..a98721c007 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 211c376532..1efa3d84fc 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php
index 1e0bf636b6..136810e291 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index b61d2ec66e..d16ff58f2b 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php
index 52227583b5..2e2b8cf770 100644
--- a/app/conferences/conference_delete.php
+++ b/app/conferences/conference_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 19c3dd698d..693cec3a56 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php
index 868dd23b47..ad1f20a2f5 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -35,13 +35,12 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
-	}
-    
-require_once "resources/header.php";
-require_once "resources/paging.php";
+	$language = new text;
+	$text = $language->get();
+
+//includes
+	require_once "resources/header.php";
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php
index 67d5fa2a75..003033eda0 100644
--- a/app/conferences_active/conference_interactive.php
+++ b/app/conferences_active/conference_interactive.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get and prepare the conference name
 	$conference_name = check_str(trim($_REQUEST["c"]));
diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php
index 13fdd2b948..d61b0dad3b 100644
--- a/app/conferences_active/conference_interactive_inc.php
+++ b/app/conferences_active/conference_interactive_inc.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http get or post and set it as php variables
 	$conference_uuid = check_str($_REQUEST["c"]);
diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php
index efe9e86557..f9c89b0042 100644
--- a/app/conferences_active/conferences_active.php
+++ b/app/conferences_active/conferences_active.php
@@ -36,11 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
-
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 ?><script type="text/javascript">
diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php
index e22f69eb1e..3e9d026ce4 100644
--- a/app/conferences_active/conferences_active_inc.php
+++ b/app/conferences_active/conferences_active_inc.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $tmp_conference_name = str_replace("_", " ", $conference_name);
 
diff --git a/app/contacts/contact_address_delete.php b/app/contacts/contact_address_delete.php
index 5e9cbf7b47..8a7425ffb1 100644
--- a/app/contacts/contact_address_delete.php
+++ b/app/contacts/contact_address_delete.php
@@ -35,27 +35,28 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	$language = new text;
+	$text = $language->get();
+
+//get the http values and set as variables
+	if (count($_GET) > 0) {
+		$id = check_str($_GET["id"]);
+		$contact_uuid = check_str($_GET["contact_uuid"]);
 	}
 
-if (count($_GET)>0) {
-	$id = check_str($_GET["id"]);
-	$contact_uuid = check_str($_GET["contact_uuid"]);
-}
+//delete the record
+	if (strlen($id) > 0) {
+		$sql = "delete from v_contact_addresses ";
+		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		$sql .= "and contact_address_uuid = '$id' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+	}
 
-if (strlen($id)>0) {
-	$sql = "delete from v_contact_addresses ";
-	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "and contact_address_uuid = '$id' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	unset($sql);
-}
-
-$_SESSION["message"] = $text['message-delete'];
-header("Location: contact_edit.php?id=".$contact_uuid);
-return;
+//redirect the browser
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: contact_edit.php?id=".$contact_uuid);
+	return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php
index f0ceef5101..08bae68384 100644
--- a/app/contacts/contact_address_edit.php
+++ b/app/contacts/contact_address_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/contacts/contact_auth.php b/app/contacts/contact_auth.php
index 0d7e357d30..e07d2bf177 100644
--- a/app/contacts/contact_auth.php
+++ b/app/contacts/contact_auth.php
@@ -40,10 +40,8 @@ exit;
 */
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 
 $_SESSION['contact_auth']['source'] = ($_SESSION['contact_auth']['source'] == '') ? $_REQUEST['source'] : $_SESSION['contact_auth']['source'];
diff --git a/app/contacts/contact_delete.php b/app/contacts/contact_delete.php
index 4f201132cf..fccac8d0eb 100644
--- a/app/contacts/contact_delete.php
+++ b/app/contacts/contact_delete.php
@@ -37,10 +37,8 @@ else {
 // check if included in another file
 if (!$included) {
 	//add multi-lingual support
-		require_once "app_languages.php";
-		foreach($text as $key => $value) {
-			$text[$key] = $value[$_SESSION['domain']['language']['code']];
-		}
+	$language = new text;
+	$text = $language->get();
 
 	if (count($_GET)>0) {
 		$contact_uuid = check_str($_GET["id"]);
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 5a3aa720e4..774013f759 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //handle removal of contact group
 	if ($_GET['a'] == 'delete') {
diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index 0dd85f757e..156dca7be4 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //built in str_getcsv requires PHP 5.3 or higher, this function can be used to reproduct the functionality but requirs PHP 5.1.0 or higher
 	if(!function_exists('str_getcsv')) {
diff --git a/app/contacts/contact_import_google.php b/app/contacts/contact_import_google.php
index 994a9d53d4..6a5f9ce7ab 100644
--- a/app/contacts/contact_import_google.php
+++ b/app/contacts/contact_import_google.php
@@ -38,10 +38,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //handle import
 if ($_POST['a'] == 'import') {
diff --git a/app/contacts/contact_note_delete.php b/app/contacts/contact_note_delete.php
index 7cff3588dd..ad2c756b44 100644
--- a/app/contacts/contact_note_delete.php
+++ b/app/contacts/contact_note_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php
index 10643d654e..902195bd37 100644
--- a/app/contacts/contact_note_edit.php
+++ b/app/contacts/contact_note_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/contacts/contact_phone_delete.php b/app/contacts/contact_phone_delete.php
index d083ab3014..8d5d5d68f9 100644
--- a/app/contacts/contact_phone_delete.php
+++ b/app/contacts/contact_phone_delete.php
@@ -35,27 +35,28 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
+	$language = new text;
+	$text = $language->get();
+
+//get the http values and set as variables
+	if (count($_GET) > 0) {
+		$id = check_str($_GET["id"]);
+		$contact_uuid = check_str($_GET["contact_uuid"]);
 	}
 
-if (count($_GET)>0) {
-	$id = check_str($_GET["id"]);
-	$contact_uuid = check_str($_GET["contact_uuid"]);
-}
+//delete the record
+	if (strlen($id) > 0) {
+		$sql = "delete from v_contact_phones ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and contact_phone_uuid = '$id' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+	}
 
-if (strlen($id)>0) {
-	$sql = "delete from v_contact_phones ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and contact_phone_uuid = '$id' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	unset($sql);
-}
-
-$_SESSION["message"] = $text['message-delete'];
-header("Location: contact_edit.php?id=".$contact_uuid);
-return;
+//redirect the browser
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: contact_edit.php?id=".$contact_uuid);
+	return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php
index 137091cdde..0e3415c8fb 100644
--- a/app/contacts/contact_phone_edit.php
+++ b/app/contacts/contact_phone_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/contacts/contact_setting_delete.php b/app/contacts/contact_setting_delete.php
index d7bd8398cb..b30148bfb1 100644
--- a/app/contacts/contact_setting_delete.php
+++ b/app/contacts/contact_setting_delete.php
@@ -29,10 +29,8 @@ require_once "resources/require.php";
 require_once "resources/check_auth.php";
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the variables
 	if (count($_GET) > 0) {
diff --git a/app/contacts/contact_setting_edit.php b/app/contacts/contact_setting_edit.php
index 3439b4a3f4..7a6cf253f0 100644
--- a/app/contacts/contact_setting_edit.php
+++ b/app/contacts/contact_setting_edit.php
@@ -27,14 +27,10 @@
 require_once "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
+
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text['button-save'] as $key => $value) {
-		$languages[$key] = '';
-	}
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/contacts/contact_url_delete.php b/app/contacts/contact_url_delete.php
index 99f9abe669..81db89d557 100644
--- a/app/contacts/contact_url_delete.php
+++ b/app/contacts/contact_url_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php
index 4910e57c6a..e63b57b5fd 100644
--- a/app/contacts/contact_url_edit.php
+++ b/app/contacts/contact_url_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index b589312597..c93aa9fad3 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -35,15 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-contacts'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-contacts'];
+	require_once "resources/paging.php";
 
 //get the search criteria
 	$search_all = strtolower(check_str($_GET["search_all"]));
diff --git a/app/contacts/contacts_vcard.php b/app/contacts/contacts_vcard.php
index 465b015f90..5ca0a21cb9 100644
--- a/app/contacts/contacts_vcard.php
+++ b/app/contacts/contacts_vcard.php
@@ -37,12 +37,8 @@ else {
 if (count($_GET)>0) {
 
 	//add multi-lingual support
-		if ($_GET['type'] == 'download' || $_GET['type'] == 'html') {
-			require_once "app_languages.php";
-			foreach($text as $key => $value) {
-				$text[$key] = $value[$_SESSION['domain']['language']['code']];
-			}
-		}
+		$language = new text;
+		$text = $language->get();
 
 	//create the vcard object
 		require_once "resources/classes/vcard.php";
diff --git a/app/content/rss.php b/app/content/rss.php
index d7887a97f4..9f4a8ef801 100644
--- a/app/content/rss.php
+++ b/app/content/rss.php
@@ -38,10 +38,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //include module specific information
 if (strlen($mod_config_path)==0) {
diff --git a/app/content/rssadd.php b/app/content/rssadd.php
index 56ca39fb76..8d6cd308c3 100644
--- a/app/content/rssadd.php
+++ b/app/content/rssadd.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 
diff --git a/app/content/rssdelete.php b/app/content/rssdelete.php
index 099b1e1351..d06ba85ab3 100644
--- a/app/content/rssdelete.php
+++ b/app/content/rssdelete.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$rss_uuid = check_str($_GET["rss_uuid"]);
diff --git a/app/content/rsslist.php b/app/content/rsslist.php
index fafa601019..24eef26ed7 100644
--- a/app/content/rsslist.php
+++ b/app/content/rsslist.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"\" href=\"rss.php\" />\n";
diff --git a/app/content/rssmovedown.php b/app/content/rssmovedown.php
index 00400d5838..b2b650f03f 100644
--- a/app/content/rssmovedown.php
+++ b/app/content/rssmovedown.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //move down more than one level at a time
 //update v_rss set rss_order = (rss_order+1) where rss_order > 2 or rss_order = 2
diff --git a/app/content/rssmoveup.php b/app/content/rssmoveup.php
index 5f947be70c..3eb5bd798b 100644
--- a/app/content/rssmoveup.php
+++ b/app/content/rssmoveup.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //move down more than one level at a time
 //update v_rss set rss_order = (rss_order+1) where rss_order > 2 or rss_order = 2
diff --git a/app/content/rsssubadd.php b/app/content/rsssubadd.php
index 9a2e6ea4ae..34bdb3b6b4 100644
--- a/app/content/rsssubadd.php
+++ b/app/content/rsssubadd.php
@@ -37,11 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
-
+	$language = new text;
+	$text = $language->get();
 
 $rss_uuid = $_GET["rss_uuid"];
 
diff --git a/app/content/rsssubcategoryadd.php b/app/content/rsssubcategoryadd.php
index 644cd88d82..cd8b7b8727 100644
--- a/app/content/rsssubcategoryadd.php
+++ b/app/content/rsssubcategoryadd.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$rss_sub_category_uuid = uuid();
diff --git a/app/content/rsssubcategorylist.php b/app/content/rsssubcategorylist.php
index 0575355038..8f80034826 100644
--- a/app/content/rsssubcategorylist.php
+++ b/app/content/rsssubcategorylist.php
@@ -37,18 +37,14 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 
 $order_by = $_GET["order_by"];
 $order = $_GET["order"];    
 
-
-
 echo "<div align='center'>";
 echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
 
diff --git a/app/content/rsssubcategoryupdate.php b/app/content/rsssubcategoryupdate.php
index ba39b59f11..1481357896 100644
--- a/app/content/rsssubcategoryupdate.php
+++ b/app/content/rsssubcategoryupdate.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$rss_sub_category_uuid = check_str($_POST["rss_sub_category_uuid"]);
diff --git a/app/content/rsssubdelete.php b/app/content/rsssubdelete.php
index 57a42a5687..f9eafc7176 100644
--- a/app/content/rsssubdelete.php
+++ b/app/content/rsssubdelete.php
@@ -37,11 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
-
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$rss_uuid = check_str($_GET["rss_uuid"]);
diff --git a/app/content/rsssublist.php b/app/content/rsssublist.php
index 96aac778a2..07ea27282a 100644
--- a/app/content/rsssublist.php
+++ b/app/content/rsssublist.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $rss_uuid = $_GET["rss_uuid"];
 $order_by = $_GET["order_by"];
diff --git a/app/content/rsssubsearch.php b/app/content/rsssubsearch.php
index 470a16cdb4..df13e7237e 100644
--- a/app/content/rsssubsearch.php
+++ b/app/content/rsssubsearch.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$rss_sub_uuid = check_str($_POST["rss_sub_uuid"]);
diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php
index 7add979640..513c9e6ccb 100644
--- a/app/content/rsssubupdate.php
+++ b/app/content/rsssubupdate.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $rss_uuid = $_GET["rss_uuid"];
 
diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php
index 8d743e2c93..08fc0df3e0 100644
--- a/app/content/rssupdate.php
+++ b/app/content/rssupdate.php
@@ -37,11 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
-
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$rss_uuid = check_str($_POST["rss_uuid"]);
diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php
index 48262ecd59..9a3d5733aa 100644
--- a/app/destinations/destination_delete.php
+++ b/app/destinations/destination_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the ID
 	if (count($_GET) > 0) {
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index bf42b2914f..20719d03a6 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -41,10 +41,8 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/billing/app_config.
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 3e698acf17..f1da6090d7 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -40,17 +40,14 @@ else {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "resources/header.php";
-$document['title'] = $text['title-destinations'];
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-destinations'];
+	require_once "resources/paging.php";
 
-require_once "resources/paging.php";
-
-//get the http values and set them as variables
-	$search = check_str($_GET["search"]);
-	if (isset($_GET["order_by"])) {
-		$order_by = check_str($_GET["order_by"]);
-		$order = check_str($_GET["order"]);
-	}
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
 
 //show the content
 	echo "<div align='center'>";
diff --git a/app/devices/device_copy.php b/app/devices/device_copy.php
index 0c512c5246..78f54aad6b 100644
--- a/app/devices/device_copy.php
+++ b/app/devices/device_copy.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the http get/post variable(s) to a php variable
 	if (isset($_REQUEST["id"]) && isset($_REQUEST["mac"])) {
diff --git a/app/devices/device_delete.php b/app/devices/device_delete.php
index 1810ff6811..87f19b8bdd 100644
--- a/app/devices/device_delete.php
+++ b/app/devices/device_delete.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET) > 0) {
diff --git a/app/devices/device_key_delete.php b/app/devices/device_key_delete.php
index 579cd4790e..24103841b2 100644
--- a/app/devices/device_key_delete.php
+++ b/app/devices/device_key_delete.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET)>0) {
diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php
index 756650f4f4..486dd6a43f 100644
--- a/app/devices/device_key_edit.php
+++ b/app/devices/device_key_edit.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/devices/device_line_delete.php b/app/devices/device_line_delete.php
index c16c8b7207..f078dc3197 100644
--- a/app/devices/device_line_delete.php
+++ b/app/devices/device_line_delete.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET)>0) {
diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php
index 4c477399cf..7296515132 100644
--- a/app/devices/device_line_edit.php
+++ b/app/devices/device_line_edit.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/devices/device_setting_delete.php b/app/devices/device_setting_delete.php
index 0d1cff7bca..fea610c748 100644
--- a/app/devices/device_setting_delete.php
+++ b/app/devices/device_setting_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);
diff --git a/app/devices/device_setting_edit.php b/app/devices/device_setting_edit.php
index 36ed2e57aa..e0de134477 100644
--- a/app/devices/device_setting_edit.php
+++ b/app/devices/device_setting_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/devices/devices.php b/app/devices/devices.php
index eaa58e76f6..7713a88897 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -34,10 +34,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http values and set them as variables
 	$search = check_str($_GET["search"]);
diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php
index c72afc9a3c..502eb425bb 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/dialplan/dialplan_advanced.php b/app/dialplan/dialplan_advanced.php
index 73caa4edd6..5630bc8c3e 100644
--- a/app/dialplan/dialplan_advanced.php
+++ b/app/dialplan/dialplan_advanced.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 $document['title'] = $text['title-default_dialplan'];
diff --git a/app/dialplan/dialplan_copy.php b/app/dialplan/dialplan_copy.php
index bea59a84dc..8cfe715c8d 100644
--- a/app/dialplan/dialplan_copy.php
+++ b/app/dialplan/dialplan_copy.php
@@ -41,12 +41,10 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-	//logger
+//logger
 	$log = new Logging();
 
 //set the http get/post variable(s) to a php variable
diff --git a/app/dialplan/dialplan_delete.php b/app/dialplan/dialplan_delete.php
index 4bfb0e9fbf..096a35d4c0 100644
--- a/app/dialplan/dialplan_delete.php
+++ b/app/dialplan/dialplan_delete.php
@@ -39,10 +39,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the dialplan uuid
 	$dialplan_uuids = $_REQUEST["id"];
diff --git a/app/dialplan/dialplan_detail_delete.php b/app/dialplan/dialplan_detail_delete.php
index 83472fef85..d873fdbc44 100644
--- a/app/dialplan/dialplan_detail_delete.php
+++ b/app/dialplan/dialplan_detail_delete.php
@@ -39,10 +39,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the variables
 	if (count($_GET) > 0) {
diff --git a/app/dialplan/dialplan_detail_edit.php b/app/dialplan/dialplan_detail_edit.php
index df26f4e9e6..18a2aebc17 100644
--- a/app/dialplan/dialplan_detail_edit.php
+++ b/app/dialplan/dialplan_detail_edit.php
@@ -44,10 +44,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action as an add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index 842f793396..bbee90e728 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -47,10 +47,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action as an add or an update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php
index 6d6cc2c6a7..1aa2510254 100644
--- a/app/dialplan/dialplans.php
+++ b/app/dialplan/dialplans.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //handle enable toggle
 	$dialplan_uuid = check_str($_REQUEST['id']);
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 1bd22c29de..5a303381ea 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -37,16 +37,13 @@ else {
 }
 
 //add multi-lingual support
-require_once "app_languages.php";
-foreach($text as $key => $value) {
-	$text[$key] = $value[$_SESSION['domain']['language']['code']];
-}
-
-require_once "resources/header.php";
-$document['title'] = $text['title-dialplan-inbound-add'];
-
-require_once "resources/paging.php";
+	$language = new text;
+	$text = $language->get();
 
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-dialplan-inbound-add'];
+	require_once "resources/paging.php";
 
 //get the http get values and set them as php variables
 	$order_by = $_GET["order_by"];
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 78f27df431..cbb61b2af2 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //show the header
 	require_once "resources/header.php";
diff --git a/app/edit/clipadd.php b/app/edit/clipadd.php
index 9824d2a03d..53cd0dc236 100644
--- a/app/edit/clipadd.php
+++ b/app/edit/clipadd.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$clip_name = check_str($_POST["clip_name"]);
diff --git a/app/edit/clipdelete.php b/app/edit/clipdelete.php
index 942c5b0573..fea8378161 100644
--- a/app/edit/clipdelete.php
+++ b/app/edit/clipdelete.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the uuid from http values
 	$clip_uuid = check_str($_GET["id"]);
diff --git a/app/edit/cliplist.php b/app/edit/cliplist.php
index 6ff36ed6a6..97c64d5ce7 100644
--- a/app/edit/cliplist.php
+++ b/app/edit/cliplist.php
@@ -36,11 +36,10 @@ else {
 	exit;
 }
 //require_once "edit/header.php";
+
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 
 echo "<html>";
diff --git a/app/edit/clipoptions.php b/app/edit/clipoptions.php
index a152af6e4d..0867c89de6 100644
--- a/app/edit/clipoptions.php
+++ b/app/edit/clipoptions.php
@@ -34,11 +34,10 @@ else {
 	echo "access denied";
 	exit;
 }
+
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "header.php";
 
diff --git a/app/edit/clipoptionslist.php b/app/edit/clipoptionslist.php
index d11f489b14..c1566a5a8e 100644
--- a/app/edit/clipoptionslist.php
+++ b/app/edit/clipoptionslist.php
@@ -34,11 +34,10 @@ else {
 	echo "access denied";
 	exit;
 }
+
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 echo "<html>";
 echo "<head>";
diff --git a/app/edit/clipupdate.php b/app/edit/clipupdate.php
index d602a73c79..e75a1b6b37 100644
--- a/app/edit/clipupdate.php
+++ b/app/edit/clipupdate.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$clip_uuid = check_str($_POST["id"]);
diff --git a/app/edit/filedelete.php b/app/edit/filedelete.php
index dec8fd8db6..bcfcfff7b5 100644
--- a/app/edit/filedelete.php
+++ b/app/edit/filedelete.php
@@ -34,11 +34,11 @@ else {
 	echo "access denied";
 	exit;
 }
+
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
+
 $folder = $_GET["folder"];
 $folder = str_replace ("\\", "/", $folder);
 if (substr($folder, -1) != "/") { $folder = $folder.'/'; }
diff --git a/app/edit/filenew.php b/app/edit/filenew.php
index 62b11c9995..6039a45000 100644
--- a/app/edit/filenew.php
+++ b/app/edit/filenew.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $folder = $_GET["folder"];
 $folder = str_replace ("\\", "/", $folder);
diff --git a/app/edit/fileoptionslist.php b/app/edit/fileoptionslist.php
index 5d3c533b01..19374b0e9b 100644
--- a/app/edit/fileoptionslist.php
+++ b/app/edit/fileoptionslist.php
@@ -36,12 +36,11 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "header.php";
+//include
+	require_once "header.php";
 
 function isfile($filename) {
 	if (@filesize($filename) > 0) { return true; } else { return false; }
diff --git a/app/edit/filerename.php b/app/edit/filerename.php
index 91d1dd5d75..693fc7578b 100644
--- a/app/edit/filerename.php
+++ b/app/edit/filerename.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $folder = $_GET["folder"];
 //$folder = str_replace ("\\", "/", $folder);
diff --git a/app/edit/filesave.php b/app/edit/filesave.php
index 84c503c1cd..a13101623d 100644
--- a/app/edit/filesave.php
+++ b/app/edit/filesave.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $filename = $_POST["file"]; //filename with the path
 $filename = str_replace ("\\", "/", $filename);
diff --git a/app/edit/foldernew.php b/app/edit/foldernew.php
index 14b3911890..0718d135b1 100644
--- a/app/edit/foldernew.php
+++ b/app/edit/foldernew.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $folder = $_GET["folder"];
 $folder = str_replace ("\\", "/", $folder);
diff --git a/app/edit/header.php b/app/edit/header.php
index f084a19ad8..0c078bd73b 100644
--- a/app/edit/header.php
+++ b/app/edit/header.php
@@ -26,11 +26,8 @@
 */
 
 //add multi-lingual support
-	unset($text);
-	require "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 echo "<html>";
 echo "<head>";
diff --git a/app/edit/index.php b/app/edit/index.php
index b85d40a705..34cc1f488d 100644
--- a/app/edit/index.php
+++ b/app/edit/index.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the directory
 	$_SESSION["app"]["edit"]["dir"] = $_GET["dir"];
diff --git a/app/edit/list.php b/app/edit/list.php
index a0e3f1be44..3670501ec1 100644
--- a/app/edit/list.php
+++ b/app/edit/list.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "admin/edit/header.php";
 echo "<div align='left'>";
diff --git a/app/exec/exec.php b/app/exec/exec.php
index 6ea79ff403..934b5d7a02 100644
--- a/app/exec/exec.php
+++ b/app/exec/exec.php
@@ -36,11 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
-
+	$language = new text;
+	$text = $language->get();
 
 //get the html values and set them as variables
 	if (count($_POST)>0) {
diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php
index 8d19c9a003..0168bf9cb8 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the http get/post variable(s) to a php variable
 	if (isset($_REQUEST["id"]) && isset($_REQUEST["ext"])) {
diff --git a/app/extensions/extension_delete.php b/app/extensions/extension_delete.php
index 48ed3155f0..70fa4f3a78 100644
--- a/app/extensions/extension_delete.php
+++ b/app/extensions/extension_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //check for the id
 	if (count($_GET) > 0) {
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index fc5014cb11..96ddf31b77 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -43,10 +43,8 @@ else {
 	}
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action as an add or an update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 0d78a755c1..5a7cc98ed5 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -45,12 +45,9 @@ $document['title'] = $text['title-extensions'];
 
 require_once "resources/paging.php";
 
-//get the http values and set them as variables
-	$search = check_str($_GET["search"]);
-	if (isset($_GET["order_by"])) {
-		$order_by = check_str($_GET["order_by"]);
-		$order = check_str($_GET["order"]);
-	}
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
 
 //show the content
 	echo "<div align='center'>";
diff --git a/app/fax/fax.php b/app/fax/fax.php
index 63a4e44722..32248b1faf 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -37,10 +37,8 @@ require_once "resources/header.php";
 require_once "resources/paging.php";
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http get values and set them as php variables
 	$order_by = check_str($_GET["order_by"]);
diff --git a/app/fax/fax_box.php b/app/fax/fax_box.php
index f19aac4138..9cca0cd678 100644
--- a/app/fax/fax_box.php
+++ b/app/fax/fax_box.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the fax_extension and save it as a variable
 	if (strlen($_REQUEST["fax_extension"]) > 0) {
diff --git a/app/fax/fax_box_remote.php b/app/fax/fax_box_remote.php
index 6063eafa11..95a6dd5c78 100644
--- a/app/fax/fax_box_remote.php
+++ b/app/fax/fax_box_remote.php
@@ -38,10 +38,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get fax server uuid, set connection parameters
 	if (strlen($_GET['id']) > 0) {
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index 720628c841..cf809d9509 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the http get/post variable(s) to a php variable
 	if (isset($_REQUEST["id"])) {
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index d306e6c04e..a9d3d73674 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http get value and set it as a php variable
 	if (count($_GET)>0) {
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 066ac0707d..a24394f2f4 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the fax_extension and save it as a variable
 	if (strlen($_REQUEST["fax_extension"]) > 0) {
diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php
index 4ebb1896e2..0f9ce3b772 100644
--- a/app/fax/fax_emails.php
+++ b/app/fax/fax_emails.php
@@ -142,9 +142,8 @@ if (sizeof($result) != 0) {
 				if ($sender_authorized) {
 
 					//add multi-lingual support
-					foreach($text_original as $key => $value) {
-						$text[$key] = $value[$_SESSION['domain']['language']['code']];
-					}
+					$language = new text;
+					$text = $language->get();
 
 					//sent sender address (used in api call)
 					$mailto_address_user = $metadata[0]['from'];
diff --git a/app/fax/fax_log_delete.php b/app/fax/fax_log_delete.php
index 5dcbe4343d..5922ce2b54 100755
--- a/app/fax/fax_log_delete.php
+++ b/app/fax/fax_log_delete.php
@@ -11,10 +11,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET) > 0) {
diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php
index 13217df654..6a06a8fa5e 100755
--- a/app/fax/fax_logs.php
+++ b/app/fax/fax_logs.php
@@ -9,11 +9,10 @@ else {
 	echo "access denied";
 	exit;
 }
+
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index b508963867..6a413d0eab 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -41,10 +41,8 @@ if (!$included) {
 	}
 
 	//add multi-lingual support
-		require_once "app_languages.php";
-		foreach($text as $key => $value) {
-			$text[$key] = $value[$_SESSION['domain']['language']['code']];
-		}
+		$language = new text;
+		$text = $language->get();
 
 	//get the fax_extension and save it as a variable
 		if (strlen($_REQUEST["fax_extension"]) > 0) {
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 9f61dcbb6f..e6c3bca0f2 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -36,15 +36,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-queue_add'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-queue_add'];
+	require_once "resources/paging.php";
 
 //get http values and set them as variables
 	if (count($_POST)>0) {
diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php
index d10ccc4b6a..9693dcf42e 100644
--- a/app/fifo_list/fifo_interactive.php
+++ b/app/fifo_list/fifo_interactive.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the fifo_name from http and set it to a php variable
 	$fifo_name = trim($_REQUEST["c"]);
diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php
index 27f8ddbb63..114140ea6d 100644
--- a/app/fifo_list/fifo_interactive_inc.php
+++ b/app/fifo_list/fifo_interactive_inc.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set variables
 	$fifo_name = trim($_REQUEST["c"]);
diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php
index 78c1b0e398..368f73aef7 100644
--- a/app/fifo_list/fifo_list.php
+++ b/app/fifo_list/fifo_list.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 $document['title'] = $text['title-active_queues'];
diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php
index ca93d81b16..e67da1962d 100644
--- a/app/fifo_list/fifo_list_inc.php
+++ b/app/fifo_list/fifo_list_inc.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //echo PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/config.php";
 //exit;
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index 35b3e2125d..23e7e0ceb6 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the http get/post variable(s) to a php variable
 	if (isset($_REQUEST["id"])) {
diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index cc18279ccf..03e83b0763 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (strlen($_GET["id"])>0) {
 	//set the variable
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 721ce90163..f844008fe2 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index 210cad58aa..6a37d3209c 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
diff --git a/app/hot_desking/extension_delete.php b/app/hot_desking/extension_delete.php
index 909ea86144..834e95f2c1 100644
--- a/app/hot_desking/extension_delete.php
+++ b/app/hot_desking/extension_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET) > 0) {
diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php
index d800ab2550..56f0787bdb 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action as an add or an update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/hot_desking/index.php b/app/hot_desking/index.php
index 8325f8983c..ab2529ad5b 100644
--- a/app/hot_desking/index.php
+++ b/app/hot_desking/index.php
@@ -35,15 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-hot_desking'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-hot_desking'];
+	require_once "resources/paging.php";
 
 //get the http values and set them as variables
 	if (isset($_GET["order_by"])) {
diff --git a/app/ivr_menu/ivr_menu_copy.php b/app/ivr_menu/ivr_menu_copy.php
index 52c6640561..95ba4e7157 100644
--- a/app/ivr_menu/ivr_menu_copy.php
+++ b/app/ivr_menu/ivr_menu_copy.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the http get/post variable(s) to a php variable
 	if (isset($_REQUEST["id"])) {
diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php
index 8160131971..196535894a 100644
--- a/app/ivr_menu/ivr_menu_delete.php
+++ b/app/ivr_menu/ivr_menu_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET) > 0) {
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index fa540c24ad..53784036bd 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //function to show the list of sound files
 	// moved to functions.php
diff --git a/app/ivr_menu/ivr_menu_option_delete.php b/app/ivr_menu/ivr_menu_option_delete.php
index 319cd9d9dd..b3d217909f 100644
--- a/app/ivr_menu/ivr_menu_option_delete.php
+++ b/app/ivr_menu/ivr_menu_option_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the http values as variables
 	if (count($_GET)>0) {
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index 17e171347c..4c2dc99e28 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php
index 44c35817d6..a385c0b933 100644
--- a/app/ivr_menu/ivr_menus.php
+++ b/app/ivr_menu/ivr_menus.php
@@ -35,15 +35,12 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //additional includes
 	require_once "resources/header.php";
 	$document['title'] = $text['title-ivr_menus'];
-
 	require_once "resources/paging.php";
 
 //get the http values and set them as variables
diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php
index d5fc4c8a09..416c0394e9 100644
--- a/app/log_viewer/log_viewer.php
+++ b/app/log_viewer/log_viewer.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //define variables
 	$c = 0;
diff --git a/app/modules/module_delete.php b/app/modules/module_delete.php
index 7fdec2c0df..d33efc3099 100644
--- a/app/modules/module_delete.php
+++ b/app/modules/module_delete.php
@@ -35,14 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-if (count($_GET)>0) {
-	$id = $_GET["id"];
-}
+//get the id
+	if (count($_GET)>0) {
+		$id = $_GET["id"];
+	}
 
 if (strlen($id)>0) {
 	$sql = "delete from v_modules ";
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index 0a2f250f15..344dfcbbd1 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //determin the action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/modules/modules.php b/app/modules/modules.php
index 62b01cb57d..72f0339686 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -35,18 +35,17 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-require_once "resources/header.php";
-$document['title'] = $text['title-modules'];
+//get includes and the title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-modules'];
+	require_once "resources/paging.php";
 
-require_once "resources/paging.php";
-
-$order_by = $_GET["order_by"];
-$order = $_GET["order"];
+//get the http values ans set as variables
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
 
 $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 if (strlen($_GET["a"]) > 0) {
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index 67d016a825..79ae0f65f0 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //include paging
 	require_once "resources/paging.php";
diff --git a/app/operator_panel/index.php b/app/operator_panel/index.php
index b1395702e3..278b1853c0 100644
--- a/app/operator_panel/index.php
+++ b/app/operator_panel/index.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	include "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set user status
 	if (isset($_REQUEST['status']) && $_REQUEST['status'] != '') {
diff --git a/app/operator_panel/index_inc.php b/app/operator_panel/index_inc.php
index 614c2fa403..bf2a8e9635 100644
--- a/app/operator_panel/index_inc.php
+++ b/app/operator_panel/index_inc.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	include "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 $activity = get_call_activity();
 
diff --git a/app/recordings/recording_delete.php b/app/recordings/recording_delete.php
index 8383f7b51e..7fb7eced19 100644
--- a/app/recordings/recording_delete.php
+++ b/app/recordings/recording_delete.php
@@ -35,14 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-if (count($_GET)>0) {
-    $id = $_GET["id"];
-}
+//get the id
+	if (count($_GET) > 0) {
+		$id = $_GET["id"];
+	}
 
 if (strlen($id)>0) {
 	//get filename
diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php
index 4c4d2f1664..1e94c646f5 100644
--- a/app/recordings/recording_edit.php
+++ b/app/recordings/recording_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action as an add or an update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 3ac4b12f8b..73fa9e282f 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -29,10 +29,8 @@ require_once "resources/require.php";
 require_once "resources/check_auth.php";
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the max php execution time
 	ini_set(max_execution_time,7200);
diff --git a/app/registrations/cmd.php b/app/registrations/cmd.php
index 2ebed0614e..f3f4c0a4f9 100644
--- a/app/registrations/cmd.php
+++ b/app/registrations/cmd.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the variables
 	$cmd = check_str($_GET['cmd']);
diff --git a/app/registrations/status_registrations.php b/app/registrations/status_registrations.php
index 697a615133..6e92dc68ef 100644
--- a/app/registrations/status_registrations.php
+++ b/app/registrations/status_registrations.php
@@ -38,10 +38,8 @@ require_once "resources/check_auth.php";
 	}
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //show the header
 	require_once "resources/header.php";
diff --git a/app/registrations/status_registrations_inc.php b/app/registrations/status_registrations_inc.php
index e7c3963527..8dc6fb50ce 100644
--- a/app/registrations/status_registrations_inc.php
+++ b/app/registrations/status_registrations_inc.php
@@ -38,12 +38,8 @@ require_once "resources/check_auth.php";
 	}
 
 //add multi-lingual support
-	if (!is_array($text)) {
-		require_once "app_languages.php";
-		foreach($text as $key => $value) {
-			$text[$key] = $value[$_SESSION['domain']['language']['code']];
-		}
-	}
+	$language = new text;
+	$text = $language->get();
 
 //request profile
 	$sip_profile_name = trim($_REQUEST["profile"]);
diff --git a/app/ring_groups/ring_group_delete.php b/app/ring_groups/ring_group_delete.php
index b69b193c3c..7dac828091 100644
--- a/app/ring_groups/ring_group_delete.php
+++ b/app/ring_groups/ring_group_delete.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http value and set it as a php variable
 	if (count($_GET)>0) {
diff --git a/app/ring_groups/ring_group_destination_delete.php b/app/ring_groups/ring_group_destination_delete.php
index 5a2ca0f6fb..76cc72d6e1 100644
--- a/app/ring_groups/ring_group_destination_delete.php
+++ b/app/ring_groups/ring_group_destination_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the id
 	if (count($_GET)>0) {
diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php
index ae41613be0..99af32851a 100644
--- a/app/ring_groups/ring_group_destination_edit.php
+++ b/app/ring_groups/ring_group_destination_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index c41b38aeec..d338e417c6 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -37,10 +37,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //delete the user from v_ring_group_users
 	if ($_GET["a"] == "delete" && strlen($_REQUEST["user_uuid"]) > 0 && permission_exists("ring_group_edit")) {
diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php
index 2c6f3df888..37d2654df0 100644
--- a/app/ring_groups/ring_group_forward.php
+++ b/app/ring_groups/ring_group_forward.php
@@ -36,11 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	unset($text);
-	require_once "app/ring_groups/app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 require_once "resources/paging.php";
diff --git a/app/ring_groups/ring_group_forward_edit.php b/app/ring_groups/ring_group_forward_edit.php
index 321e346c83..ec4feeb9cf 100644
--- a/app/ring_groups/ring_group_forward_edit.php
+++ b/app/ring_groups/ring_group_forward_edit.php
@@ -37,10 +37,8 @@ require_once "resources/check_auth.php";
 	}
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //show the header
 	require_once "resources/header.php";
diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php
index ddfff5f079..b6d62c2e7d 100644
--- a/app/ring_groups/ring_groups.php
+++ b/app/ring_groups/ring_groups.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 require_once "resources/paging.php";
diff --git a/app/schemas/schema_data_delete.php b/app/schemas/schema_data_delete.php
index dc986f658c..4e1e112491 100644
--- a/app/schemas/schema_data_delete.php
+++ b/app/schemas/schema_data_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_GET)>0) {
 
diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php
index 81b4447e1d..12822a5a3b 100644
--- a/app/schemas/schema_data_edit.php
+++ b/app/schemas/schema_data_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set http get variables to php variables
 	$search_all = strtolower(check_str($_GET["search_all"]));
diff --git a/app/schemas/schema_data_view.php b/app/schemas/schema_data_view.php
index cdcd46df4e..f69123245b 100644
--- a/app/schemas/schema_data_view.php
+++ b/app/schemas/schema_data_view.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (strlen($_GET["id"]) > 0) {
 	$schema_uuid = check_str($_GET["id"]);
diff --git a/app/schemas/schema_delete.php b/app/schemas/schema_delete.php
index 669133b297..10e66da9f6 100644
--- a/app/schemas/schema_delete.php
+++ b/app/schemas/schema_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http get variable
 	if (count($_GET)>0) {
diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php
index 7dbb2a265d..c026a6de69 100644
--- a/app/schemas/schema_edit.php
+++ b/app/schemas/schema_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/schemas/schema_field_delete.php b/app/schemas/schema_field_delete.php
index 76e3d18d55..c6d15e8c7b 100644
--- a/app/schemas/schema_field_delete.php
+++ b/app/schemas/schema_field_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http values
 	if (count($_GET) > 0) {
diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php
index 31da098a68..c723ec6213 100644
--- a/app/schemas/schema_field_edit.php
+++ b/app/schemas/schema_field_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //set the action as an add or update
 if (isset($_REQUEST["id"])) {
diff --git a/app/schemas/schema_import.php b/app/schemas/schema_import.php
index 31f2918e74..bf5922b344 100644
--- a/app/schemas/schema_import.php
+++ b/app/schemas/schema_import.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 if (count($_POST)>0) {
 	$schema_uuid = trim($_REQUEST["id"]);
diff --git a/app/schemas/schema_name_value_delete.php b/app/schemas/schema_name_value_delete.php
index 02da862959..206d1701c4 100644
--- a/app/schemas/schema_name_value_delete.php
+++ b/app/schemas/schema_name_value_delete.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //get the http values
 	if (count($_GET) > 0) {
diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php
index 0aad6bd4e6..efb8e04489 100644
--- a/app/schemas/schema_name_value_edit.php
+++ b/app/schemas/schema_name_value_edit.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/schemas/schemas.php b/app/schemas/schemas.php
index d45e5efcda..6e601f189e 100644
--- a/app/schemas/schemas.php
+++ b/app/schemas/schemas.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 $document['title'] = $text['title-schemas'];
diff --git a/app/services/service_delete.php b/app/services/service_delete.php
index 88129b23e8..7493d30125 100644
--- a/app/services/service_delete.php
+++ b/app/services/service_delete.php
@@ -35,14 +35,13 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
-if (count($_GET)>0) {
-	$id = check_str($_GET["id"]);
-}
+//get the id
+	if (count($_GET)>0) {
+		$id = check_str($_GET["id"]);
+	}
 
 //delete the data
 	if (strlen($id)>0) {
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index c61d64efcf..a0739fe9f6 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -36,10 +36,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 //action add or update
 	if (isset($_REQUEST["id"])) {
diff --git a/app/services/services.php b/app/services/services.php
index 429d322ab3..fa844c027f 100644
--- a/app/services/services.php
+++ b/app/services/services.php
@@ -35,10 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	require_once "app_languages.php";
-	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];
-	}
+	$language = new text;
+	$text = $language->get();
 
 require_once "resources/header.php";
 require_once "resources/paging.php";