From d5731c917244eb6d840506fcce1cd4e3e84b02c1 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sun, 18 Jan 2015 09:22:07 +0000 Subject: [PATCH] Use the new multi-lingual code on fusionpbx/core sub directories. --- core/apps/apps_delete.php | 15 ++++---- core/apps/apps_edit.php | 6 +-- core/databases/database_delete.php | 37 ++++++++++--------- core/databases/database_edit.php | 6 +-- core/databases/databases.php | 14 +++---- .../default_settings/default_setting_edit.php | 9 +---- core/default_settings/default_settings.php | 6 +-- core/domain_settings/domain_delete.php | 13 +++---- core/domain_settings/domain_edit.php | 6 +-- .../domain_settings/domain_setting_delete.php | 34 ++++++++--------- core/domain_settings/domain_setting_edit.php | 9 +---- core/domain_settings/domain_settings.php | 6 +-- core/domain_settings/domains.php | 6 +-- core/menu/menu.php | 14 +++---- core/menu/menu_delete.php | 6 +-- core/menu/menu_edit.php | 6 +-- core/menu/menu_item_delete.php | 6 +-- core/menu/menu_item_edit.php | 6 +-- core/menu/menu_item_move_down.php | 6 +-- core/menu/menu_item_move_up.php | 6 +-- core/menu/menu_restore_all_default.php | 6 +-- core/menu/menu_restore_default.php | 8 +--- core/notifications/notification_edit.php | 8 ++-- core/upgrade/index.php | 8 +--- core/upgrade/upgrade.php | 6 +-- core/upgrade/upgrade_schema.php | 7 +--- core/user_settings/user_dashboard.php | 8 ++-- core/user_settings/user_edit.php | 9 +---- core/users/group_permissions.php | 6 +-- core/users/groupadd.php | 6 +-- core/users/groupmembers.php | 6 +-- core/users/groups.php | 6 +-- core/users/index.php | 6 +-- core/users/permissions_copy.php | 6 +-- core/users/permissions_default.php | 6 +-- core/users/signup.php | 23 ++++++------ core/users/userdelete.php | 6 +-- core/users/usersupdate.php | 9 +---- 38 files changed, 136 insertions(+), 221 deletions(-) diff --git a/core/apps/apps_delete.php b/core/apps/apps_delete.php index 627465d684..19417c4837 100644 --- a/core/apps/apps_delete.php +++ b/core/apps/apps_delete.php @@ -35,16 +35,15 @@ 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"]); -} - -if (strlen($id)>0) { +if (strlen($id) > 0) { if (count($_GET)>0 && $_POST["persistformvar"] != "true") { $app_uuid = $_GET["id"]; diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php index 8079507d17..80d9826b88 100644 --- a/core/apps/apps_edit.php +++ b/core/apps/apps_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/core/databases/database_delete.php b/core/databases/database_delete.php index 7b0c1d9ae0..a451f3ae8f 100644 --- a/core/databases/database_delete.php +++ b/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(); + +//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) { + $sql = ""; + $sql .= "delete from v_databases "; + $sql .= "where database_uuid = '$id' "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + unset($sql); + } -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; ?> \ No newline at end of file diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php index d4d6ed082e..57fcc738f6 100644 --- a/core/databases/database_edit.php +++ b/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"])) { diff --git a/core/databases/databases.php b/core/databases/databases.php index 17a8da7d80..3fe5dadb73 100644 --- a/core/databases/databases.php +++ b/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"]; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 6c357ebfb8..fa33094f5c 100644 --- a/core/default_settings/default_setting_edit.php +++ b/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"])) { diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index 5e0dc6e2d2..cf9bc7d052 100644 --- a/core/default_settings/default_settings.php +++ b/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) { diff --git a/core/domain_settings/domain_delete.php b/core/domain_settings/domain_delete.php index 4b875e9f50..e65af3bb40 100644 --- a/core/domain_settings/domain_delete.php +++ b/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 diff --git a/core/domain_settings/domain_edit.php b/core/domain_settings/domain_edit.php index c819bb2adc..ec6d903bd1 100644 --- a/core/domain_settings/domain_edit.php +++ b/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"])) { diff --git a/core/domain_settings/domain_setting_delete.php b/core/domain_settings/domain_setting_delete.php index 591ce10387..306ec8f829 100644 --- a/core/domain_settings/domain_setting_delete.php +++ b/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(); + +//get the variables + if (count($_GET)>0) { + $id = check_str($_GET["id"]); + $domain_uuid = check_str($_GET["domain_uuid"]); } -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']; diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 5dbc97cead..fbc88eac95 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/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"])) { diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index a52e125d29..561dcf4d67 100644 --- a/core/domain_settings/domain_settings.php +++ b/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) { diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index 8995255a75..0816fac096 100644 --- a/core/domain_settings/domains.php +++ b/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") { diff --git a/core/menu/menu.php b/core/menu/menu.php index 6cf9ec83b7..0f8c40c1dc 100644 --- a/core/menu/menu.php +++ b/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"]; diff --git a/core/menu/menu_delete.php b/core/menu/menu_delete.php index da1632bfc5..d4e1c0d7e7 100644 --- a/core/menu/menu_delete.php +++ b/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"]); diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 295948bef1..2eccdbc61d 100644 --- a/core/menu/menu_edit.php +++ b/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"])) { diff --git a/core/menu/menu_item_delete.php b/core/menu/menu_item_delete.php index 2986b22eed..7fa1cd0b85 100644 --- a/core/menu/menu_item_delete.php +++ b/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 diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index a846fe87bd..c6575060c2 100644 --- a/core/menu/menu_item_edit.php +++ b/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"]); diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php index ab8d78545e..c248b6ca24 100644 --- a/core/menu/menu_item_move_down.php +++ b/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 diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php index f2a5a9ee3e..b845680af4 100644 --- a/core/menu/menu_item_move_up.php +++ b/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 diff --git a/core/menu/menu_restore_all_default.php b/core/menu/menu_restore_all_default.php index cc252c840b..0a67398e1d 100644 --- a/core/menu/menu_restore_all_default.php +++ b/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"]); diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index fcd7342810..745678f862 100644 --- a/core/menu/menu_restore_default.php +++ b/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) { diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php index 0c0605599f..ba434bdc92 100644 --- a/core/notifications/notification_edit.php +++ b/core/notifications/notification_edit.php @@ -35,11 +35,9 @@ else { exit; } -// add multi-lingual support - require_once "app_languages.php"; - foreach($text as $key => $value) { - $text[$key] = $value[$_SESSION['domain']['language']['code']]; - } +//add multi-lingual support + $language = new text; + $text = $language->get(); // retrieve software uuid $sql = "select software_uuid, software_url, software_version from v_software"; diff --git a/core/upgrade/index.php b/core/upgrade/index.php index c1232d87d4..d918140196 100644 --- a/core/upgrade/index.php +++ b/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) { diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php index 697b288c71..c0fad4c81d 100644 --- a/core/upgrade/upgrade.php +++ b/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') { diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php index bec4e76946..37bc34d518 100644 --- a/core/upgrade/upgrade_schema.php +++ b/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"; diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index 2a5729109d..469dd3cba9 100644 --- a/core/user_settings/user_dashboard.php +++ b/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']; diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php index d5a2626745..1d925354ea 100644 --- a/core/user_settings/user_edit.php +++ b/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"]; diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php index a63510d84e..7bff00a48b 100644 --- a/core/users/group_permissions.php +++ b/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']; diff --git a/core/users/groupadd.php b/core/users/groupadd.php index f49500e98d..6378595ab8 100644 --- a/core/users/groupadd.php +++ b/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"]); diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php index 572be43868..5f0821457c 100644 --- a/core/users/groupmembers.php +++ b/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"]; diff --git a/core/users/groups.php b/core/users/groups.php index 7707d59fd2..51b6f308c7 100644 --- a/core/users/groups.php +++ b/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"; diff --git a/core/users/index.php b/core/users/index.php index b74fc26051..7450d17cb7 100644 --- a/core/users/index.php +++ b/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"; diff --git a/core/users/permissions_copy.php b/core/users/permissions_copy.php index 3f5e91a8e9..c9402ad29b 100644 --- a/core/users/permissions_copy.php +++ b/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"; diff --git a/core/users/permissions_default.php b/core/users/permissions_default.php index 4c69e21588..5ede2d191e 100644 --- a/core/users/permissions_default.php +++ b/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"; diff --git a/core/users/signup.php b/core/users/signup.php index 6be3dba9c7..7e34dbbb10 100644 --- a/core/users/signup.php +++ b/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); diff --git a/core/users/userdelete.php b/core/users/userdelete.php index 246c007824..ff7e48c3a4 100644 --- a/core/users/userdelete.php +++ b/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"]); diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php index 9053472c0c..f99f676afe 100644 --- a/core/users/usersupdate.php +++ b/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) {