nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimized app_config file inclusion

Browse Source 
- Update language handling
- Added support for $language variable
- Updated description and version lines with new language handling
This commit is contained in:
markjcrane
2025-11-13 09:32:00 -07:00
parent 987c6f7cb8
commit 15089b4eea
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/upgrade/index.php
View File

@@ -50,17 +50,35 @@
//set a default message_timeout
$message_timeout = 4*1000;
//get the language
$language = $settings->get('domain', 'language', 'en-us');
//find optional apps with repos
$updateable_repos = git_find_repos($_SERVER["PROJECT_ROOT"]."/app");
if (!empty($updateable_repos) && is_array($updateable_repos) && @sizeof($updateable_repos) != 0) {
foreach ($updateable_repos as $app_path => $repo) {
//set the value
$x = 0;
//skip this application if the file doesn't exist
if (!file_exists($app_path.'/app_config.php')) {
continue;
}
//build the $apps array
include $app_path.'/app_config.php';
//skip this application if the name or uuid are empty
if (empty($apps[$x]['name']) || empty($apps[$x]['uuid'])) { continue; }
//build the updateable_repos array
$updateable_repos[$app_path]['app'] = $repo[0];
$updateable_repos[$app_path]['name'] = $apps[$x]['name'];
$updateable_repos[$app_path]['uuid'] = $apps[$x]['uuid'];
$updateable_repos[$app_path]['version'] = $apps[$x]['version'];
$updateable_repos[$app_path]['description'] = $apps[$x]['description'][$settings->get('domain', 'language', 'en-us')];
$updateable_repos[$app_path]['version'] = $apps[$x]['version'] ?? '';
$updateable_repos[$app_path]['description'] = $apps[$x]['description'][$language] ?? '';
//unset the values
unset($apps, $updateable_repos[$app_path][0]);
}
}
@@ -323,8 +341,8 @@
if (!empty($updateable_repos) && is_array($updateable_repos)) {
foreach ($updateable_repos as $app_path => $app) {
$repo_info = git_repo_info($app_path);
$pull_method = substr($repo_info['url'], 0, 4) == 'http' ? 'http' : 'ssh';
if (empty($repo_info)) { continue; }
$pull_method = substr($repo_info['url'], 0, 4) == 'http' ? 'http' : 'ssh';
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr onclick=\"if (document.getElementById('do_".$app['app']."')) { document.getElementById('do_".$app['app']."').checked = !document.getElementById('do_".$app['app']."').checked; if (document.getElementById('do_".$app['app']."').checked == false) { document.getElementById('view_source_code_options').checked = false; } }\">\n";
echo " <td width='30%' class='vncell' style='vertical-align: middle;'>\n";

2
resources/functions.php
View File

@@ -3132,7 +3132,7 @@ if (!function_exists('git_repo_info')) {
//get the remote origin url for updates
exec("git config --get remote.origin.url", $git_url);
$repo['url'] = preg_replace('/\.git$/', '', $git_url[0] );
$repo['url'] = preg_replace('/\.git$/', '', $git_url[0] ?? '');
//add the path to the repo array
$repo['path'] = $path;