[mxbb-commits] core/includes page_header.php,1.67,1.68

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32191

Modified Files:
	page_header.php 
Log Message:
clean up

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** page_header.php	10 Jan 2009 16:15:11 -0000	1.67
--- page_header.php	10 Jan 2009 16:37:36 -0000	1.68
***************
*** 187,190 ****
--- 187,206 ----
  $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
  
+ 
+ switch (PORTAL_BACKEND)
+ {
+ 	case 'internal':
+ 
+ 	case 'phpbb2':
+ 
+ 		$admin = ($userdata['session_logged_in'] && $userdata['user_level'] == ADMIN) ? true : false;
+ 		break;
+ 
+ 	case 'phpbb3':
+ 
+ 		$admin = (!$phpbb_auth->acl_get('a_') && $mx_user->data['user_id'] != ANONYMOUS) ? true : false;
+ 		break;
+ }
+ 
  $layouttemplate->assign_vars(array(
  	'SITENAME' => $board_config['sitename'],
***************
*** 242,246 ****
  	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
! 	'S_ADMIN_AUTH' => (!$phpbb_auth->acl_get('a_') && $mx_user->data['user_id'] != ANONYMOUS), 	
  
  	//
--- 258,265 ----
  	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx),
! 	'S_ADMIN_AUTH' => $admin,
! 
! 	//Old phpBB2 Backend Contant 
! 	'IS_ADMIN' => $admin, 	
  
  	//
***************
*** 321,327 ****
  
  	// swithes for logged in users?
! 	'USER_LOGGED_IN' => $userdata['session_logged_in'],
! 	'USER_LOGGED_OUT' => !$userdata['session_logged_in'],
! 	'IS_ADMIN' => $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN,
  
  	// Do NOT set basedir when in EDIT mode
--- 340,351 ----
  
  	// swithes for logged in users?
! 	'USERNAME'			=> ($admin) ? $userdata['username'] : '',	
! 	'USER_LOGGED_IN' 	=> $userdata['session_logged_in'],
! 	'USER_LOGGED_OUT' 	=> !$userdata['session_logged_in'],
! 	
! 	//This phpBB3 features are disbled for Admins in MXP3 for now and default vaues used
! 	//To make use of this features Admins can login direct in forums
! 	'USERNAME_CREDENTIAL'	=> 'username',
! 	'PASSWORD_CREDENTIAL'	=> 'password',	
  
  	// Do NOT set basedir when in EDIT mode