[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.17, 1.18

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

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13006

Modified Files:
	session.php 
Log Message:
workaround to load phpBB3 imagesets for anonymouse users and for default style

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** session.php	19 Jun 2008 05:44:41 -0000	1.17
--- session.php	23 Jun 2008 09:07:08 -0000	1.18
***************
*** 1245,1248 ****
--- 1245,1250 ----
  		global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache;
  
+ 		global $mx_request_vars, $portal_config; //added for mxp
+ 		
  		$template = new mx_Template($mx_root_path . 'templates/' . $this->template_name);
  
***************
*** 1342,1347 ****
  		else
  		{
  			// Set up style
! 			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $board_config['default_style']);
  		}
  
--- 1344,1362 ----
  		else
  		{
+ 			//Workaround by OryNider in this "else"
+ 			$sql = "SELECT bbt.*
+ 				FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt
+ 				WHERE mxt.style_name = bbt.style_name
+ 				AND mxt.portal_backend = '" . PORTAL_BACKEND . "'
+ 				AND mxt.themes_id = " . (int) $this->style;
+ 			if ( !($result = $db->sql_query($sql, 120)) )
+ 			{
+ 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
+ 			}
+ 			$this->phpbb_style = $db->sql_fetchrow($result);
+ 			$db->sql_freeresult($result);			
+ 			
  			// Set up style
! 			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
  		}
  
***************
*** 1352,1356 ****
  				AND c.theme_id = s.theme_id
  				AND i.imageset_id = s.imageset_id";
! 		$result = $db->sql_query($sql, 3600);
  		$this->theme = $db->sql_fetchrow($result);
  		$db->sql_freeresult($result);
--- 1367,1375 ----
  				AND c.theme_id = s.theme_id
  				AND i.imageset_id = s.imageset_id";
! 		if ( !($result = $db->sql_query($sql, 3600)) )
! 		{
! 			mx_message_die(CRITICAL_ERROR, "Could not query database for imageset_id info style_id [$style]", "", __LINE__, __FILE__, $sql);
! 		}		
! 		
  		$this->theme = $db->sql_fetchrow($result);
  		$db->sql_freeresult($result);