dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix missing variable in default template (#7222) 

When 'dev' or 'all' error level is set in the config.conf file, the menu will fail to expand or contract. This commit adds the missing variable causing a PHP warning responsible for the behavior.
This commit is contained in:
frytimo 2025-01-24 19:05:37 -04:00 committed by GitHub
parent 965b245794
commit da1da92d01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/footer.php
View File

@ -27,6 +27,12 @@
//includes files //includes files
require_once __DIR__ . "/require.php"; require_once __DIR__ . "/require.php";
//database and settings
$domain_uuid = $_SESSION['domain_uuid'] ?? '';
$user_uuid = $_SESSION['user_uuid'] ?? '';
$database = database::new();
$settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid, 'user_uuid' => $user_uuid]);
//set variables if not set //set variables if not set
//if (!isset($_SESSION["template_content"])) { $_SESSION["template_content"] = null; } //if (!isset($_SESSION["template_content"])) { $_SESSION["template_content"] = null; }
if (!isset($document)) { $document = null; } if (!isset($document)) { $document = null; }
@ -154,7 +160,7 @@
$settings_array['theme']['footer'] = isset($settings_array['theme']['footer']) ? $settings_array['theme']['footer'] : '&copy; '.$text['theme-label-copyright'].' 2008 - '.date('Y')." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved']; $settings_array['theme']['footer'] = isset($settings_array['theme']['footer']) ? $settings_array['theme']['footer'] : '&copy; '.$text['theme-label-copyright'].' 2008 - '.date('Y')." <a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a> ".$text['theme-label-all_rights_reserved'];
$settings_array['theme']['menu_side_item_main_sub_icon_contract'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_contract']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_contract'])[1] : null; $settings_array['theme']['menu_side_item_main_sub_icon_contract'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_contract']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_contract'])[1] : null;
$settings_array['theme']['menu_side_item_main_sub_icon_expand'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_expand']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_expand'])[1] : null; $settings_array['theme']['menu_side_item_main_sub_icon_expand'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_expand']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_expand'])[1] : null;
$settings_array['theme']['menu_brand_type'] = $settings->get('theme', 'menu_brand_type', '');
//assign the setings //assign the setings
$view->assign('settings', $settings_array); $view->assign('settings', $settings_array);
} }

8
resources/header.php
View File

@ -33,6 +33,9 @@
session_start(); session_start();
} }
//connect to the database if not initialized
$database = database::new();
//set the domains session //set the domains session
if (!isset($_SESSION['domains'])) { if (!isset($_SESSION['domains'])) {
$domain = new domains(); $domain = new domains();
@ -81,11 +84,6 @@
$content = ''; $content = '';
} }
//connect to the database if not initialized
if (!($database instanceof database)) {
$database = new database();
}
//get the parent id //get the parent id
$sql = "select menu_item_parent_uuid from v_menu_items "; $sql = "select menu_item_parent_uuid from v_menu_items ";
$sql .= "where menu_uuid = :menu_uuid "; $sql .= "where menu_uuid = :menu_uuid ";