To simplyfy maintenence BitUser classes have been retired and active code base defaulted to ROLE_MODEL

3 files changed, 9 insertions, 31 deletions

diff --git a/admin/admin_layout_inc.php b/admin/admin_layout_inc.php
index 6e938c8..1346010 100755
--- a/admin/admin_layout_inc.php
+++ b/admin/admin_layout_inc.php
@@ -4,14 +4,8 @@
 // Initialization
 require_once '../../kernel/includes/setup_inc.php';
 
-if( defined( 'ROLE_MODEL' )) {
-	if( !isset($_REQUEST["roles"] ) ) {
-		$_REQUEST["roles"] = [];
-	}
-} else {
-	if( !isset($_REQUEST["groups"] ) ) {
-		$_REQUEST["groups"] = [];
-	}
+if( !isset($_REQUEST["roles"] ) ) {
+	$_REQUEST["roles"] = [];
 }
 
 if( empty( $_REQUEST['module_package'] ) ) {
@@ -68,14 +62,8 @@ if( isset( $_REQUEST['module_id'] ) && !empty( $_REQUEST['move_module'] )) {
 } elseif( $processForm == 'Center' || $processForm == 'Column' ) {
 	$fAssign = &$_REQUEST['fAssign'];
 
-	if( defined( 'ROLE_MODEL' )) {
-		if( !empty( $_REQUEST['roles'] ) ) {
-			 $fAssign['roles'] = $_REQUEST['roles'];
-		}
-	} else {
-		if( !empty( $_REQUEST['groups'] ) ) {
-			$fAssign['groups'] = $_REQUEST['groups'];
-		}
+	if( !empty( $_REQUEST['roles'] ) ) {
+		$fAssign['roles'] = $_REQUEST['roles'];
 	}
 
 	// either add the module to all available layouts or just the active one
@@ -150,13 +138,8 @@ for( $i = 1; $i < 50; $i++ ) {
 
 $gBitSmarty->assign( 'orders', $orders );
 
-if( defined( 'ROLE_MODEL' )) {
-	$roles = $gBitUser->getAllUserRoles( ROOT_USER_ID );
-	$gBitSmarty->assign( "roles", $roles );
-} else {
-	$groups = $gBitUser->getAllUserGroups( ROOT_USER_ID );
-	$gBitSmarty->assign( "groups", $groups );
-}
+$roles = $gBitUser->getAllUserRoles( ROOT_USER_ID );
+$gBitSmarty->assign( "roles", $roles );
 // we need gBitThemes as well
 $gBitSmarty->assign( "gBitThemes", $gBitThemes );
 
diff --git a/admin/admin_layout_overview_inc.php b/admin/admin_layout_overview_inc.php
index bc21be0..3565796 100755
--- a/admin/admin_layout_overview_inc.php
+++ b/admin/admin_layout_overview_inc.php
@@ -59,11 +59,6 @@ ksort( $allModulesHelp );
 $gBitSmarty->assign( 'allModulesHelp', $allModulesHelp );
 
 $gBitSmarty->assign( 'pageName', 'Layout Options' );
-if( defined( 'ROLE_MODEL' )) {
-	$roles = $gBitUser->getAllUserRoles( ROOT_USER_ID );
-	$gBitSmarty->assign( "roles", $roles );
-} else {
-	$groups = $gBitUser->getAllUserGroups( ROOT_USER_ID );
-	$gBitSmarty->assign( "groups", $groups );
-}
+$roles = $gBitUser->getAllUserRoles( ROOT_USER_ID );
+$gBitSmarty->assign( "roles", $roles );
 ?>
diff --git a/admin/admin_themes_inc.php b/admin/admin_themes_inc.php
index d8b4c6c..ff68a38 100755
--- a/admin/admin_themes_inc.php
+++ b/admin/admin_themes_inc.php
@@ -28,7 +28,7 @@ $themeSettings = [
 	],
 	'site_fancy_zoom' => [
 		'label' => "Enable Fancy Zoom for images",
-		'note'  => "If checked, a Javascript zooms images when clicking on them. This will modify the behaviour when viewing most images. If you are running a commercial site, please read the license notice in /util/javascript/fancyzoom/js-global/FancyZoom.js.",
+		'note'  => "If checked, a Javascript zooms images when clicking on them. This will modify the behaviour when viewing most images. If you are running a commercial site, please read the license notice in /themes/js/fancyzoom/js-global/FancyZoom.js.",
 	],
 	'site_mods_req_admn_grp' => [
 		'label' => 'Modules require membership',