[mxbb-commits] core common.php,1.37,1.38 index.php,1.39,1.40 login.php,1.9,1.10

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15865

Modified Files:
	common.php index.php login.php 
Log Message:
adding fixes for mxBB 2.8 RC 6

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/login.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** login.php	10 Sep 2005 22:08:24 -0000	1.9
--- login.php	20 Sep 2005 15:30:58 -0000	1.10
***************
*** 102,106 ****
  					}
  
! 					$template->assign_vars(array(
  						'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  					);
--- 102,106 ----
  					}
  
! 					$layouttemplate->assign_vars(array(
  						'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  					);
***************
*** 122,126 ****
  			}
  
! 			$template->assign_vars(array(
  				'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  			);
--- 122,126 ----
  			}
  
! 			$layouttemplate->assign_vars(array(
  				'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  			);
***************
*** 166,170 ****
  		include($mx_root_path . 'includes/page_header.'.$phpEx);
  
! 		$template->set_filenames(array(
  			'body' => 'login_body.tpl')
  		);
--- 166,170 ----
  		include($mx_root_path . 'includes/page_header.'.$phpEx);
  
! 		$layouttemplate->set_filenames(array(
  			'body' => 'login_body.tpl')
  		);
***************
*** 213,217 ****
  
  		make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id);
! 		$template->assign_vars(array(
  			'USERNAME' => $username,
  
--- 213,217 ----
  
  		make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id);
! 		$layouttemplate->assign_vars(array(
  			'USERNAME' => $username,
  
***************
*** 224,228 ****
  		);
  
! 		$template->pparse('body');
  
  		include($mx_root_path . 'includes/page_tail.'.$phpEx);
--- 224,228 ----
  		);
  
! 		$layouttemplate->pparse('body');
  
  		include($mx_root_path . 'includes/page_tail.'.$phpEx);

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** common.php	10 Sep 2005 22:08:24 -0000	1.37
--- common.php	20 Sep 2005 15:30:58 -0000	1.38
***************
*** 270,274 ****
  }
  
- 
  //
  // Initialize GZIP handler (if necessary) and PHP sessions
--- 270,273 ----
***************
*** 277,304 ****
  mx_session_start();		// Note: this needs $board_config populated!
  
- 
- //++ MX System
- //
- //	if ( $language )
- //	{
- //		$board_config['default_lang'] = $language;
- //		setcookie('default_lang', $language, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- //	}
- //	elseif ( isset($HTTP_COOKIE_VARS['default_lang']) )
- //	{
- //		$board_config['default_lang'] = $HTTP_COOKIE_VARS['default_lang'];
- //	}
- //	if ( $style )
- //	{
- //		$board_config['default_style'] = $style;
- //		setcookie('default_style', $style, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- //	}
- //	elseif ( isset($HTTP_COOKIE_VARS['default_style']) )
- //	{
- //		$board_config['default_style'] = $HTTP_COOKIE_VARS['default_style'];
- //	}
- //
- //-- MX System
- 
  if( file_exists($phpbb_root_path . 'attach_mod') )
  {
--- 276,279 ----

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** index.php	6 Sep 2005 18:51:56 -0000	1.39
--- index.php	20 Sep 2005 15:30:58 -0000	1.40
***************
*** 78,85 ****
  }
  
- //
- // Output header
- //
- include( $mx_root_path . 'includes/page_header.' . $phpEx );
  
  //
--- 78,81 ----
***************
*** 332,335 ****
--- 328,336 ----
  
  //
+ // Output header
+ //
+ include( $mx_root_path . 'includes/page_header.' . $phpEx );
+ 
+ //
  // Output page 
  //