General changes to cover uninitialized variables and style changes for PHP8.4

1 files changed, 26 insertions, 21 deletions

diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php
index 6e3e534..7738a6e 100644..100755
--- a/includes/bit_setup_inc.php
+++ b/includes/bit_setup_inc.php
@@ -1,28 +1,35 @@
 <?php
 
-$registerHash = array(
+/**
+ * required setup
+ */
+namespace Bitweaver;
+
+$pRegisterHash = [
 	'package_name' => 'languages',
 	'package_path' => dirname( dirname( __FILE__ ) ).'/',
 	'service' => LIBERTY_SERVICE_TRANSLATION,
-	'required_package'=> TRUE,
-);
-$gBitSystem->registerPackage( $registerHash );
+	'required_package'=> true,
+];
+define( 'LANGUAGES_PKG_NAME', $pRegisterHash['package_name'] );
+define( 'LANGUAGES_PKG_URL', BIT_ROOT_URL . basename( $pRegisterHash['package_path'] ) . '/' );
+$gBitSystem->registerPackage( $pRegisterHash );
 
 // **********  BABELFISH  ************
 if ($gBitSystem->isFeatureActive('babelfish') ) {
-	require_once(LANGUAGES_PKG_CLASS_PATH.'Babelfish.php');
-	$gBitSmarty->assignByRef('babelfish_links', Babelfish::links( $gBitSystem->getConfig('language', 'en') ));
+	require_once LANGUAGES_PKG_CLASS_PATH.'Babelfish.php';
+	$gBitSmarty->assign('babelfish_links', \Babelfish::links( $gBitSystem->getConfig('language', 'en') ));
 }
 if ($gBitSystem->isFeatureActive('babelfish_logo') ) {
-	require_once(LANGUAGES_PKG_CLASS_PATH.'Babelfish.php');
-	$gBitSmarty->assign('babelfish_logo', Babelfish::logo($gBitLanguage->mLanguage));
+	require_once LANGUAGES_PKG_CLASS_PATH.'Babelfish.php';
+	$gBitSmarty->assign('babelfish_logo', \Babelfish::logo($gBitLanguage->mLanguage));
 }
 if( $gBitSystem->isPackageActive( 'languages' ) && $gBitUser->hasPermission( 'p_languages_edit' ) ) {
-	$menuHash = array(
+	$menuHash = [
 		'package_name'  => LANGUAGES_PKG_NAME,
 		'index_url'     => LANGUAGES_PKG_URL.'edit_languages.php',
 		'menu_template' => 'bitpackage:languages/menu_languages.tpl',
-	);
+	];
 	$gBitSystem->registerAppMenu( $menuHash );
 }
 
@@ -40,12 +47,12 @@ if( !empty( $_REQUEST['oe'] ) && !empty( $gBitLanguage->mLanguageList[$_REQUEST[
 	$gBitLanguage->setLanguage( $_REQUEST['oe'] );
 }
 
-$gBitSmarty->assignByRef('gBitLanguage', $gBitLanguage);
+$gBitSmarty->assign('gBitLanguage', $gBitLanguage);
 $gBitSmarty->assign('bitlanguage', $gBitLanguage->mLanguage);
 
 if( !empty( $gLibertySystem ) && $gBitSystem->isFeatureActive( 'i18n_content_translation' ) ) {
-	require_once( LANGUAGES_PKG_CLASS_PATH.'LibertyTranslations.php' );
-	$gLibertySystem->registerService( LIBERTY_SERVICE_TRANSLATION, LANGUAGES_PKG_NAME, array(
+	require_once LANGUAGES_PKG_CLASS_PATH.'LibertyTranslations.php';
+	$gLibertySystem->registerService( LIBERTY_SERVICE_TRANSLATION, LANGUAGES_PKG_NAME, [
 		'content_display_function' => 'translation_content_display',
 		//'content_preview_function' => 'translation_content_edit',
 		'content_edit_function' => 'translation_content_edit',
@@ -55,15 +62,14 @@ if( !empty( $gLibertySystem ) && $gBitSystem->isFeatureActive( 'i18n_content_tra
 		//'content_load_sql_function' => 'translation_content_load',
 		'content_edit_mini_tpl' => 'bitpackage:languages/select_translations.tpl',
 		'content_icon_tpl' => 'bitpackage:languages/i18n_service_icons.tpl',
-	) );
+	] );
 
 	if( !empty( $_POST['i18n']['translate'] ) ) {
-		if( @BitBase::verifyId( $_POST['i18n']['to_id'] ) ) {
-			$get = '&content_id='.$_POST['i18n']['to_id'];
-		} else {
-			$get = 'i18n[lang_code]='.$_POST['i18n']['to_id'];
-		}
-		if( @BitBase::verifyId( $_POST['i18n']['translation_id'] ) ) {
+		$get = BitBase::verifyId( $_POST['i18n']['to_id'] )
+			? '&content_id='.$_POST['i18n']['to_id']
+			: 'i18n[lang_code]='.$_POST['i18n']['to_id'];
+
+		if( BitBase::verifyId( $_POST['i18n']['translation_id'] ) ) {
 			$get .= '&i18n[translation_id]='.$_POST['i18n']['translation_id'];
 		}
 		if( !empty( $_POST['i18n']['google'] ) ) {
@@ -74,4 +80,3 @@ if( !empty( $gLibertySystem ) && $gBitSystem->isFeatureActive( 'i18n_content_tra
 		die;
 	}
 }
-?>