Эх сурвалжийг харах

Use the new multi-lingual code on fusionpbx/core sub directories.

Mark Crane 10 жил өмнө
parent
commit
3631209a9e
35 өөрчлөгдсөн 124 нэмэгдсэн , 204 устгасан
  1. 19 18
      core/databases/database_delete.php
  2. 2 4
      core/databases/database_edit.php
  3. 6 8
      core/databases/databases.php
  4. 2 7
      core/default_settings/default_setting_edit.php
  5. 2 4
      core/default_settings/default_settings.php
  6. 6 7
      core/domain_settings/domain_delete.php
  7. 2 4
      core/domain_settings/domain_edit.php
  8. 17 17
      core/domain_settings/domain_setting_delete.php
  9. 2 7
      core/domain_settings/domain_setting_edit.php
  10. 2 4
      core/domain_settings/domain_settings.php
  11. 2 4
      core/domain_settings/domains.php
  12. 6 8
      core/menu/menu.php
  13. 2 4
      core/menu/menu_delete.php
  14. 2 4
      core/menu/menu_edit.php
  15. 2 4
      core/menu/menu_item_delete.php
  16. 2 4
      core/menu/menu_item_edit.php
  17. 2 4
      core/menu/menu_item_move_down.php
  18. 2 4
      core/menu/menu_item_move_up.php
  19. 2 4
      core/menu/menu_restore_all_default.php
  20. 2 6
      core/menu/menu_restore_default.php
  21. 2 6
      core/upgrade/index.php
  22. 2 4
      core/upgrade/upgrade.php
  23. 2 5
      core/upgrade/upgrade_schema.php
  24. 3 5
      core/user_settings/user_dashboard.php
  25. 2 7
      core/user_settings/user_edit.php
  26. 2 4
      core/users/group_permissions.php
  27. 2 4
      core/users/groupadd.php
  28. 2 4
      core/users/groupmembers.php
  29. 2 4
      core/users/groups.php
  30. 2 4
      core/users/index.php
  31. 2 4
      core/users/permissions_copy.php
  32. 2 4
      core/users/permissions_default.php
  33. 11 12
      core/users/signup.php
  34. 2 4
      core/users/userdelete.php
  35. 2 7
      core/users/usersupdate.php

+ 19 - 18
core/databases/database_delete.php

@@ -35,26 +35,27 @@ 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) {
-	$sql = "";
-	$sql .= "delete from v_databases ";
-	$sql .= "where database_uuid = '$id' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	unset($sql);
-}
+//delete the records
+	if (strlen($id) > 0) {
+		$sql = "";
+		$sql .= "delete from v_databases ";
+		$sql .= "where database_uuid = '$id' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		unset($sql);
+	}
 
-$_SESSION["message"] = $text['message-delete'];
-header("Location: databases.php");
-return;
+//redirect the browser
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: databases.php");
+	return;
 
 ?>

+ 2 - 4
core/databases/database_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"])) {

+ 6 - 8
core/databases/databases.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-databases'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-databases'];
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];

+ 2 - 7
core/default_settings/default_setting_edit.php

@@ -35,13 +35,8 @@ else {
 }
 
 //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"])) {

+ 2 - 4
core/default_settings/default_settings.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 posted values, if any
 if (sizeof($_REQUEST) > 0) {

+ 6 - 7
core/domain_settings/domain_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 domain using the id

+ 2 - 4
core/domain_settings/domain_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"])) {

+ 17 - 17
core/domain_settings/domain_setting_delete.php

@@ -35,25 +35,25 @@ 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"]);
-	$domain_uuid = check_str($_GET["domain_uuid"]);
-}
+//get the variables
+	if (count($_GET)>0) {
+		$id = check_str($_GET["id"]);
+		$domain_uuid = check_str($_GET["domain_uuid"]);
+	}
 
-if (strlen($id)>0) {
-	//delete domain_setting
-		$sql = "delete from v_domain_settings ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and domain_setting_uuid = '$id' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		unset($sql);
-}
+//delete the record
+	if (strlen($id) > 0) {
+		//delete domain_setting
+			$sql = "delete from v_domain_settings ";
+			$sql .= "where domain_uuid = '$domain_uuid' ";
+			$sql .= "and domain_setting_uuid = '$id' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			unset($sql);
+	}
 
 //redirect the user
 	$_SESSION["message"] = $text['message-delete'];

+ 2 - 7
core/domain_settings/domain_setting_edit.php

@@ -35,13 +35,8 @@ else {
 }
 
 //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"])) {

+ 2 - 4
core/domain_settings/domain_settings.php

@@ -60,10 +60,8 @@ if (sizeof($_REQUEST) > 1) {
 	//delete domain settings
 		if ($action == 'delete' && permission_exists('domain_setting_delete')) {
 			//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 (sizeof($domain_setting_uuids) > 0) {
 				foreach ($domain_setting_uuids as $domain_setting_uuid) {

+ 2 - 4
core/domain_settings/domains.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();
 
 //change the domain
 	if (strlen(check_str($_GET["domain_uuid"])) > 0 && check_str($_GET["domain_change"]) == "true") {

+ 6 - 8
core/menu/menu.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-menus'];
-
-require_once "resources/paging.php";
+//includes and title
+	require_once "resources/header.php";
+	$document['title'] = $text['title-menus'];
+	require_once "resources/paging.php";
 
 //get variables used to control the order
 	$order_by = $_GET["order_by"];

+ 2 - 4
core/menu/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();
 
 if (count($_GET)>0) {
 	$id = check_str($_GET["id"]);

+ 2 - 4
core/menu/menu_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"])) {

+ 2 - 4
core/menu/menu_item_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) {
 	//clear the menu session so it will rebuild with the update

+ 2 - 4
core/menu/menu_item_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();
 
 //get the menu_uuid
 	$menu_uuid = check_str($_REQUEST["id"]);

+ 2 - 4
core/menu/menu_item_move_down.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();
 
 //move down more than one level at a time
 //update v_menu_items set menu_item_order = (menu_item_order+1) where menu_item_order > 2 or menu_item_order = 2

+ 2 - 4
core/menu/menu_item_move_up.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();
 
 //move down more than one level at a time
 //update v_menu_items set menu_order = (menu_order+1) where menu_order > 2 or menu_order = 2

+ 2 - 4
core/menu/menu_restore_all_default.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 value and set as a php variable
 	$menu_uuid = check_str($_REQUEST["menu_uuid"]);

+ 2 - 6
core/menu/menu_restore_default.php

@@ -39,12 +39,8 @@
 	}
 
 //add multi-lingual support
-	if (!$included) {
-		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 as a php variable
 	if (!$included) {

+ 2 - 6
core/upgrade/index.php

@@ -42,13 +42,9 @@ if (
 	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();
 
 if (sizeof($_POST) > 0) {
 

+ 2 - 4
core/upgrade/upgrade.php

@@ -49,10 +49,8 @@
 	}
 
 //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 title
 	if ($format == 'text') {

+ 2 - 5
core/upgrade/upgrade_schema.php

@@ -38,11 +38,8 @@
 		$format = 'text'; //html, text
 
 		//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();
 	}
 	else if (!$included) {
 		include "root.php";

+ 3 - 5
core/user_settings/user_dashboard.php

@@ -60,12 +60,10 @@
 	}
 
 //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();
 
-// load header
+//load header
 	require_once "resources/header.php";
 	$document['title'] = $text['title-user_dashboard'];
 

+ 2 - 7
core/user_settings/user_edit.php

@@ -36,13 +36,8 @@ else {
 }
 
 //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();
 
 //set the username from v_users
 	$username = $_SESSION["username"];

+ 2 - 4
core/users/group_permissions.php

@@ -37,10 +37,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();
 
 //include the header
 	$document['title'] = $text['title-group_permissions'];

+ 2 - 4
core/users/groupadd.php

@@ -37,10 +37,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();
 
 //get the http values and set them as variables
 	$path = check_str($_GET["path"]);

+ 2 - 4
core/users/groupmembers.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();
 
 //get the http value and set as a variable
 	$group_name = $_GET["group_name"];

+ 2 - 4
core/users/groups.php

@@ -37,10 +37,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();
 
 //show the header
 	require_once "resources/header.php";

+ 2 - 4
core/users/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();
 
 //include the header
 	require_once "resources/header.php";

+ 2 - 4
core/users/permissions_copy.php

@@ -37,10 +37,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();
 
 //include paging
 	require_once "resources/paging.php";

+ 2 - 4
core/users/permissions_default.php

@@ -39,10 +39,8 @@
 	}
 
 //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();
 
 //permission restore default
 	require_once "core/users/resources/classes/permission.php";

+ 11 - 12
core/users/signup.php

@@ -37,19 +37,18 @@ 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();
 
-$username = check_str($_POST["username"]);
-$password = check_str($_POST["password"]);
-$confirmpassword = check_str($_POST["confirmpassword"]);
-$group_uuid_name = check_str($_POST["group_uuid_name"]);
-$user_email = check_str($_POST["user_email"]);
-$contact_organization = check_str($_POST["contact_organization"]);
-$contact_name_given = check_str($_POST["contact_name_given"]);
-$contact_name_family = check_str($_POST["contact_name_family"]);
+//get the values from http and set as variables
+	$username = check_str($_POST["username"]);
+	$password = check_str($_POST["password"]);
+	$confirmpassword = check_str($_POST["confirmpassword"]);
+	$group_uuid_name = check_str($_POST["group_uuid_name"]);
+	$user_email = check_str($_POST["user_email"]);
+	$contact_organization = check_str($_POST["contact_organization"]);
+	$contact_name_given = check_str($_POST["contact_name_given"]);
+	$contact_name_family = check_str($_POST["contact_name_family"]);
 
 if ($group_uuid_name != '') {
 	$group_data = explode('|', $group_uuid_name);

+ 2 - 4
core/users/userdelete.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
 	$user_uuid = check_str($_GET["id"]);

+ 2 - 7
core/users/usersupdate.php

@@ -39,13 +39,8 @@ else {
 }
 
 //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();
 
 //get data from the db
 	if (strlen($_REQUEST["id"]) > 0) {