From 12c93a68d9187a49c02290795bc79cac6825d13e Mon Sep 17 00:00:00 2001 From: Lester Caine Date: Fri, 15 May 2026 15:38:31 +0100 Subject: To simplyfy maintenence BitUser classes have been retired and active code base defaulted to ROLE_MODEL --- blogs_rss.php | 18 +++--------------- list_blogs.php | 4 +--- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/blogs_rss.php b/blogs_rss.php index a6f2da9..5e93ccb 100755 --- a/blogs_rss.php +++ b/blogs_rss.php @@ -3,9 +3,9 @@ use Bitweaver\Blogs\BitBlog; use Bitweaver\KernelTools; use Bitweaver\Rss\FeedItem; -use Bitweaver\Users\BitPermUser; -use Bitweaver\Users\BitUser; +use Bitweaver\Blogs\BitBlogPost; use Bitweaver\Users\RoleUser; +use Bitweaver\Users\RolePermUser; /** * @version $Header$ * @package blogs @@ -16,8 +16,6 @@ use Bitweaver\Users\RoleUser; * Initialization */ require_once( "../kernel/includes/setup_inc.php" ); -use Bitweaver\Blogs\BitBlogPost; -use Bitweaver\Users\RolePermUser; $gBitSystem->verifyPackage( 'rss' ); $gBitSystem->verifyPackage( 'blogs' ); @@ -43,7 +41,7 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $listHash['parse_data'] = true; $listHash['full_data'] = true; if( !empty( $_REQUEST['user_id'] ) ) { - $blogUser = $gBitSystem->getConfig( 'user_class', 'BitPermUser' ) == 'RolePermUser' ? new RoleUser() : new BitUser(); + $blogUser = new RoleUser(); $userData = $blogUser->getUserInfo( [ 'user_id' => $_REQUEST['user_id'] ] ); // dont try and fool me @@ -52,16 +50,6 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $rss->title = $userName." at ".$gBitSystem->getConfig( 'site_title' ); $listHash['user_id'] = $_REQUEST['user_id']; } - } else if( !empty( $_REQUEST['group_id'] ) ) { - require_once USERS_PKG_PATH . 'BitPermUser.php'; - $permUser = new BitPermUser(); - $groupData = $permUser->getGroupInfo( $_REQUEST['group_id'] ); - // dont try and fool me - if (!empty($groupData)){ - $groupName = $groupData['group_name']; - $rss->title = $groupName." Group at ".$gBitSystem->getConfig( 'site_title' ); - $listHash['group_id'] = $_REQUEST['group_id']; - } } else if( !empty( $_REQUEST['role_id'] ) ) { $permUser = new RolePermUser(); $roleData = $permUser->getRoleInfo( $_REQUEST['role_id'] ); diff --git a/list_blogs.php b/list_blogs.php index 2b38aa1..6057713 100755 --- a/list_blogs.php +++ b/list_blogs.php @@ -49,8 +49,6 @@ $blogsList = $gContent->getList( $_REQUEST ); $gBitSmarty->assign( 'listInfo', $_REQUEST['listInfo'] ); $gBitSmarty->assign( 'blogsList', $blogsList ); -if( defined(ROLE_MODEL) ) { - $gBitSmarty->assign( 'role_model', true ); -} +$gBitSmarty->assign( 'role_model', true ); // Display the template $gBitSystem->display( 'bitpackage:blogs/list_blogs.tpl', null, [ 'display_mode' => 'list' ]); -- cgit v1.3