Smarty5 compliance sorted, but PHP8.4 style advisories still need addressing

3 files changed, 8 insertions, 12 deletions

diff --git a/admin/admin_newsletters.php b/admin/admin_newsletters.php
index 42885e9..05dbd9d 100644..100755
--- a/admin/admin_newsletters.php
+++ b/admin/admin_newsletters.php
@@ -39,8 +39,8 @@ if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
 $gContent->invokeServices( 'content_edit_function' );
 
 $newsletters = $gContent->getList( $listHash );
-$gBitSmarty->assignByRef( 'newsletters', $newsletters );
-$gBitSmarty->assignByRef( 'listInfo', $listHash );
+$gBitSmarty->assign( 'newsletters', $newsletters );
+$gBitSmarty->assign( 'listInfo', $listHash );
 
 // Fill array with possible number of questions per page
 /*
@@ -64,4 +64,3 @@ include_once( CATEGORIES_PKG_INCLUDE_PATH.'categorize_list_inc.php' );
 // Display the template
 $gBitSystem->display( 'bitpackage:newsletters/list_newsletters.tpl', NULL, array( 'display_mode' => 'admin' ));
 
-?>
diff --git a/admin/mail_queue.php b/admin/mail_queue.php
index 7c1efee..0d79434 100644..100755
--- a/admin/mail_queue.php
+++ b/admin/mail_queue.php
@@ -28,8 +28,7 @@ if( !empty( $_REQUEST['batch_command'] ) && !empty( $_REQUEST['queue_id'] ) ) {
 if( empty( $_REQUEST['batch_command'] ) || $_REQUEST['batch_command'] != 'send' ) {
 	$listHash = array();
 	$queue = $gBitNewsletterMailer->getQueue( $listHash );
-	$gBitSmarty->assignByRef( 'queue', $queue );
+	$gBitSmarty->assign( 'queue', $queue );
 
 	$gBitSystem->display( 'bitpackage:newsletters/mail_queue.tpl' , NULL, array( 'display_mode' => 'admin' ));
 }
-?>
diff --git a/admin/send.php b/admin/send.php
index 93abbef..77f46ae 100644..100755
--- a/admin/send.php
+++ b/admin/send.php
@@ -33,7 +33,7 @@ $validated = !empty( $_REQUEST["validated"] ) ? TRUE : FALSE;
 
 if( $gContent->isValid() && isset( $_REQUEST['preview'] ) && isset( $_REQUEST['send_group'] ) ) {
 	$recipients = $gContent->getRecipients( $_REQUEST['send_group'], $validated, !empty( $_REQUEST['test_mode'] ) );
-	$gBitSmarty->assignByRef( 'recipientList', $recipients );
+	$gBitSmarty->assign( 'recipientList', $recipients );
 	$gBitSmarty->assign( 'validated', $validated );
 	$gBitSmarty->assign( 'sending', TRUE );
 } elseif( $gContent->isValid() && isset( $_REQUEST["send"] ) ) {
@@ -52,21 +52,19 @@ if( $gContent->isValid() ) {
 	$groupListHash = array();
 	$groups = $gBitUser->getAllGroups( $groupListHash );
 	$groups['send_subs']['group_name'] = 'Send to subscribers';
-	$gBitSmarty->assignByRef( 'groupList', $groups );
+	$gBitSmarty->assign( 'groupList', $groups );
 } else {
 	$listHash = array();
 	$editions = $gContent->getList( $listHash );
-	$gBitSmarty->assignByRef( 'editionList', $editions );
+	$gBitSmarty->assign( 'editionList', $editions );
 
 /*	if( $gBitSystem->isFeatureActive( 'bit_p_use_content_templates' ) ) {
 		$templates = $bitlib->list_templates('newsletters', 0, -1, 'name_asc', '');
-		$gBitSmarty->assignByRef('templates', $templates["data"]);
+		$gBitSmarty->assign('templates', $templates["data"]);
 	}*/
 }
 
-$gBitSmarty->assignByRef( 'feedback', $feedback );
+$gBitSmarty->assign( 'feedback', $feedback );
 // Display the template
 $gBitSystem->display( 'bitpackage:newsletters/send_newsletters.tpl' , tra( "Send Newsletter" ).': '.$gContent->getTitle() , array( 'display_mode' => 'admin' ));
 
-?>
-