nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-02-22 02:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the user settings

Browse Source 
- When language is changed, update the menu and translations immediately
- When time zone is changed, update it immediately
- Flush the settings apcu cache if enabled
This commit is contained in:
FusionPBX
2025-10-10 12:01:51 -06:00
committed by GitHub
parent ec852b10f8
commit 435ef38c88
16 changed files with 124 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
resources/classes/text.php
View File

@@ -5,7 +5,17 @@
*
*/
class text {
/**
* Contains the list of supported languages
* @var array
*/
public $languages;
/**
* Legacy older list of supported languages
* @var array
*/
public $legacy_map = array(
'he' => 'he-il',
'pl' => 'pl-pl',
@@ -22,13 +32,55 @@ class text {
'pt' => 'pt-pt',
);
/**
* Set in the constructor. Must be a database object and cannot be null.
* @var database Database Object
*/
private $database;
/**
* Settings object set in the constructor. Must be a settings object and cannot be null.
* @var settings Settings Object
*/
private $settings;
/**
* User UUID set in the constructor. This can be passed in through the $settings_array associative array or set in the session global array
* @var string
*/
private $user_uuid;
/**
* Domain UUID set in the constructor. This can be passed in through the $settings_array associative array or set in the session global array
* @var string
*/
private $domain_uuid;
/**
* Called when the object is created
*/
public function __construct() {
public function __construct($setting_array = []) {
//define the text array
$text = array();
//set the domain and user uuids
$this->domain_uuid = $setting_array['domain_uuid'] ?? $_SESSION['domain_uuid'] ?? '';
$this->user_uuid = $setting_array['user_uuid'] ?? $_SESSION['user_uuid'] ?? '';
//open a database connection
if (empty($setting_array['database'])) {
$this->database = database::new();
} else {
$this->database = $setting_array['database'];
}
//load the settings
if (empty($setting_array['settings'])) {
$this->settings = new settings(['database' => $this->database, 'domain_uuid' => $this->domain_uuid, 'user_uuid' => $this->user_uuid]);
} else {
$this->settings = $setting_array['settings'];
}
//get the global app_languages.php so we can get the list of languages
if (file_exists($_SERVER["PROJECT_ROOT"]."/resources/app_languages.php")) {
include $_SERVER["PROJECT_ROOT"]."/resources/app_languages.php";
@@ -81,11 +133,8 @@ class text {
//}
//check the session language
if (isset($_SESSION['domain']) and $language_code == null) {
$language_code = $_SESSION['domain']['language']['code'];
}
elseif ($language_code == null) {
$language_code = 'en-us';
if ($language_code == null) {
$language_code = $this->settings->get('domain', 'language', 'en-us');
}
//check the language code
@@ -338,7 +387,7 @@ class text {
include $file . "/app_config.php";
$x++;
}
//check every tag
foreach($apps as $app) {
$language_totals['app_descriptions']['total']++;
@@ -355,7 +404,7 @@ class text {
}
}
}
return $language_totals;
}