merge recent changes to HEAD

1 files changed, 10 insertions, 11 deletions

diff --git a/assigned_modules.php b/assigned_modules.php
index 85f8e43..c372ecd 100644
--- a/assigned_modules.php
+++ b/assigned_modules.php
@@ -3,13 +3,13 @@
  * assigned_modules
  *
  * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.3 $
+ * @version  $Revision: 1.4 $
  * @package  users
  * @subpackage  functions
  * @copyright Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
  * @license Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
  */
-// $Header: /cvsroot/bitweaver/_bit_users/assigned_modules.php,v 1.3 2005/08/01 18:42:01 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_users/assigned_modules.php,v 1.4 2005/10/12 15:14:07 spiderr Exp $
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Initialization
 
@@ -24,7 +24,7 @@ include_once( KERNEL_PKG_PATH.'mod_lib.php' );
 
 $gBitSystem->verifyPermission('bit_p_configure_modules');
 
-if ($gBitSystem->getPreference('feature_user_layout') != 'y' && $gBitSystem->getPreference('feature_user_layout') != 'h' && $gBitSystem->getPreference('feature_user_theme') != 'y' && $gBitSystem->getPreference('feature_user_theme') != 'h') {
+if( !$gBitUser->canCustomizeLayout() && !$gBitUser->canCustomizeTheme() ) {
 	$gBitSmarty->assign('msg', tra("This feature is disabled").": user layout");
 	$gBitSystem->display( 'error.tpl' );
 	die;
@@ -46,24 +46,23 @@ if ($gQueryUser->mUserId != $gBitUser->mUserId && !$gBitUser->object_has_permiss
 
 $_REQUEST['fLayout'] = HOMEPAGE_LAYOUT; //we hardcode to a single layout for all users.... for now >:-)
 if (isset($_REQUEST['fSubmitSetTheme'] ) ) {
-	if( ($gBitSystem->getPreference('feature_user_theme') == 'y' || $gBitSystem->getPreference('feature_user_theme') == 'h') && isset( $_REQUEST["style"]) ) {
-		
-		$gQueryUser->storePreference( 'theme', $_REQUEST["style"]);
+	if( $gBitUser->canCustomizeTheme() ) {
+		$gQueryUser->storePreference( 'theme', !empty( $_REQUEST["style"] ) ? $_REQUEST["style"] : NULL );
 		$assignStyle = $_REQUEST["style"];
 	}
 } elseif (isset($_REQUEST['fSubmitSetHeading'] ) ) {
-	
+
 	$homeHeader = substr( trim( $_REQUEST['homeHeaderData']), 0, 250 );
 	$gQueryUser->storePreference( 'homepage_header', $homeHeader );
 } elseif( isset( $_REQUEST["fSubmitAssign"] ) ) {
-	
+
 	$fAssign = &$_REQUEST['fAssign'];
 	$fAssign['user_id'] = $gQueryUser->mUserId;
 	$fAssign['layout'] = $_REQUEST['fLayout'];
 	$modlib->storeLayout( $fAssign );
 	$gBitSmarty->assign_by_ref( 'fAssign', $fAssign );
 } elseif (isset($_REQUEST["fMove"])) {
-	
+
 	if( isset( $_REQUEST["fMove"] ) && isset( $_REQUEST["fModule"] ) ) {
 		switch( $_REQUEST["fMove"] ) {
 			case "unassign":
@@ -91,7 +90,7 @@ for ($i = 1; $i < 20; $i++) {
 $gBitSmarty->assign_by_ref('orders', $orders);
 $gBitSmarty->assign( 'homeHeaderData', $gQueryUser->getPreference( 'homepage_header' ) );
 // get styles
-if( $gBitSystem->getPreference('feature_user_theme') ) {
+if( $gBitUser->canCustomizeTheme() ) {
 	include_once( THEMES_PKG_PATH.'theme_control_lib.php' );
 	$styles = &$tcontrollib->getStyles( NULL, TRUE, TRUE );
 	$gBitSmarty->assign_by_ref( 'styles', $styles );
@@ -115,6 +114,6 @@ $gBitSmarty->assign_by_ref( 'layoutAreas', $layoutAreas );
 $gBitSmarty->assign_by_ref('modules', $modules);
 //print_r($modules);
 
-
 $gBitSystem->display( 'bitpackage:users/user_assigned_modules.tpl', 'Edit Layout');
+
 ?>