Extra tools updated to PHP8.4 and namespace

2 files changed, 29 insertions, 52 deletions

diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
index ec4eafa..3d130c4 100644..100755
--- a/includes/bit_setup_inc.php
+++ b/includes/bit_setup_inc.php
@@ -1,81 +1,58 @@
 <?php
-$registerHash = array(
+namespace Bitweaver\Themes;
+$pRegisterHash = [
 	'package_name' => 'themes',
 	'package_path' => dirname( dirname( __FILE__ ) ).'/',
-	'activatable' => FALSE,
-	'required_package'=> TRUE,
-);
-$gBitSystem->registerPackage( $registerHash );
+	'activatable' => false,
+	'required_package'=> true,
+];
+
+// fix to quieten down VS Code which can't see the dynamic creation of these ...
+define( 'THEMES_PKG_NAME', $pRegisterHash['package_name'] );
+define( 'THEMES_PKG_URL', BIT_ROOT_URL . basename( $pRegisterHash['package_path'] ) . '/' );
+
+$gBitSystem->registerPackage( $pRegisterHash );
 
 define( 'DEFAULT_ICON_STYLE', $gBitSystem->getConfig( 'default_icon_style', 'tango' ) );
 
 $gLibertySystem->registerService(
 	LIBERTY_SERVICE_THEMES,
 	THEMES_PKG_NAME,
-	array(
+	[
 		'content_display_function' => 'themes_content_display',
 		'content_list_function' => 'themes_content_list',
-	),
-	array( 'description' => 'Applied when user themes are enabled; See theme pkg administration to enable.' )
+	],
+	[ 'description' => 'Applied when user themes are enabled; See theme pkg administration to enable.' ]
 );
 
-// Set up themes engine
-require_once( THEMES_PKG_CLASS_PATH.'BitThemes.php' );
 BitThemes::loadSingleton();
 global $gBitThemes, $gBitSmarty;
+
 $gBitSmarty->verifyCompileDir();
+
 // setStyle first, in case package decides it wants to reset the style in it's own <package>/bit_setup_inc.php
 if( !$gBitThemes->getStyle() ) {
 	$gBitThemes->setStyle( DEFAULT_THEME );
 }
-$gBitSmarty->assignByRef( 'gBitThemes', $gBitThemes );
+$gBitSmarty->assign( 'gBitThemes', $gBitThemes );
 
 // load some core javascript files
-$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/bitweaver.js', TRUE, 1 );
+$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/bitweaver.js', true, 1 );
 $gBitThemes->loadAjax( $gBitSystem->getConfig( 'themes_jquery_hosting', 'jquery' ) );
 
 if( $gBitSystem->isFeatureActive( 'site_fancy_zoom' )) {
-	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fancyzoom/js-global/FancyZoom.js', TRUE, 80 );
-	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fancyzoom/js-global/FancyZoomHTML.js', TRUE, 81 );
+	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fancyzoom/js-global/FancyZoom.js', true, 80 );
+	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/fancyzoom/js-global/FancyZoomHTML.js', true, 81 );
 	$gBitSystem->setOnloadScript( 'setupZoom();' );
 }
 
 $gBitSystem->mOnload[] = 'BitBase.setupShowHide();';
 
-$styleString = $gBitSystem->getConfig('style');
+$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/jquery.innerfade.js', FALSE, 700, FALSE );
+$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/overlib.js', FALSE, 701, FALSE );
+$gBitThemes->loadJavascript( THEMES_PKG_PATH.'js/haccordion/haccordion.js', FALSE, 702, FALSE );
+// Only used in medw.uk
 
-if( !defined( 'THEMES_PATH' ) ) {
-	define( 'THEMES_PATH', CONFIG_PKG_PATH.'themes/' );
-}
-if( !defined( 'THEMES_URL' ) ) {
-	define( 'THEMES_URL', CONFIG_PKG_URL.'themes/' );
-}
-if( !defined( 'THEMES_URI' ) ) {
-	define( 'THEMES_URI', CONFIG_PKG_URI.'themes/' );
-}
-if( !defined( 'ICONSETS_PATH' ) ) {
-	define( 'ICONSETS_PATH', CONFIG_PKG_PATH.'iconsets/' );
-}
-if( !defined( 'ICONSETS_URL' ) ) {
-	define( 'ICONSETS_URL', CONFIG_PKG_URL.'iconsets/' );
+if( is_readable(CONFIG_PKG_PATH.'theme_setup_inc.php')) {
+	include_once CONFIG_PKG_PATH.'theme_setup_inc.php';
 }
-if( !defined( 'ICONSETS_URI' ) ) {
-	define( 'ICONSETS_URI', CONFIG_PKG_URI.'iconsets/' );
-}
-
-if( !defined( 'CONFIG_THEME_PATH' ) ) {
-	define( 'CONFIG_THEME_PATH', THEMES_PATH.$styleString.'/' );
-}
-if( !defined( 'CONFIG_THEME_URL' ) ) {
-	define( 'CONFIG_THEME_URL', THEMES_URL.$styleString.'/' );
-}
-if( !defined( 'CONFIG_IMAGE_PATH' ) ) {
-	define( 'CONFIG_IMAGE_PATH', THEMES_PATH.$styleString.'/images/' );
-}
-if( !defined( 'CONFIG_IMAGE_URL' ) ) {
-	define( 'CONFIG_IMAGE_URL', THEMES_URL.$styleString.'/images/' );
-}
-
-// Global feedback mechanism
-require_once( THEMES_PKG_CLASS_PATH.'BitFeedback.php' );
-
diff --git a/includes/menu_register_inc.php b/includes/menu_register_inc.php
index 74dc1db..3de8896 100644
--- a/includes/menu_register_inc.php
+++ b/includes/menu_register_inc.php
@@ -10,13 +10,13 @@
 global $gBitUser, $gBitSystem, $gBitSmarty;
 
 // Global menu
-//	$gBitSystem->registerAppMenu( 'global', NULL, NULL, 'bitpackage:kernel/menu_global.tpl' );
+//	$gBitSystem->registerAppMenu( 'global', null, null, 'bitpackage:kernel/menu_global.tpl' );
 
 // Application menu
 uasort( $gBitSystem->mAppMenu, "mAppMenu_sort" );
 
 // Admin menu
-$adminMenu = array();
+$adminMenu = [];
 foreach( array_keys( $gBitSystem->mPackages ) as $package ) {
 	if( $gBitUser->hasPermission( 'p_'.$package.'_admin' ) ) {
 		$package = strtolower( $package );
@@ -30,7 +30,7 @@ foreach( array_keys( $gBitSystem->mPackages ) as $package ) {
 
 if( !empty( $adminMenu ) ) {
 	ksort( $adminMenu );
-	$gBitSmarty->assignByRef( 'adminMenu', $adminMenu );
+	$gBitSmarty->assign( 'adminMenu', $adminMenu );
 }
 
 /**