diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor global variable definitions and require statements

Browse Source
This commit is contained in:
FusionPBX
2025-10-16 12:49:01 -06:00
committed by GitHub
parent 56f4b968ef
commit 79e7614414
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/upgrade/upgrade_menu.php
+8 -11
View File
@@ -32,13 +32,6 @@ defined('STDIN') or die('Unauthorized');
//include files //include files
require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
//create a database connection using default config
$config = config::load();
$database = database::new(['config' => $config]);
//load global defaults
$settings = new settings(['database' => $database]);
//get the language code from global defaults //get the language code from global defaults
$language_code = $settings->get('domain', 'language'); $language_code = $settings->get('domain', 'language');
@@ -341,7 +334,9 @@ function do_upgrade_schema(bool $data_types = false) {
* Restore the default menu * Restore the default menu
*/ */
function do_upgrade_menu() { function do_upgrade_menu() {
global $included, $sel_menu, $menu_uuid, $menu_language, $database; //define the global variables
global $database, $settings, $included, $sel_menu, $menu_uuid, $menu_language;
//get the menu uuid and language //get the menu uuid and language
$sql = "select menu_uuid, menu_language from v_menus "; $sql = "select menu_uuid, menu_language from v_menus ";
$sql .= "where menu_name = :menu_name "; $sql .= "where menu_name = :menu_name ";
@@ -362,7 +357,7 @@ function do_upgrade_menu() {
if (!isset($argv[2]) || $argv[2] == 'default') { if (!isset($argv[2]) || $argv[2] == 'default') {
//restore the menu //restore the menu
$included = true; $included = true;
require_once dirname(__DIR__, 2) . "/core/menu/menu_restore_default.php"; require dirname(__DIR__, 2) . "/core/menu/menu_restore_default.php";
unset($sel_menu); unset($sel_menu);
$text = (new text)->get(null, 'core/upgrade'); $text = (new text)->get(null, 'core/upgrade');
//send message to the console //send message to the console
@@ -374,10 +369,12 @@ function do_upgrade_menu() {
* Restore the default permissions * Restore the default permissions
*/ */
function do_upgrade_permissions() { function do_upgrade_permissions() {
global $included; //define the global variables
global $database, $settings, $included;
//default the permissions //default the permissions
$included = true; $included = true;
require_once dirname(__DIR__, 2) . "/core/groups/permissions_default.php"; require dirname(__DIR__, 2) . "/core/groups/permissions_default.php";
//send message to the console //send message to the console
$text = (new text)->get(null, 'core/upgrade'); $text = (new text)->get(null, 'core/upgrade');