[mxbb-commits] core common.php,1.36,1.37 login.php,1.8,1.9

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

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

Modified Files:
	common.php login.php 
Log Message:
updated for phpBB 2.0.17

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/login.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** login.php	28 Apr 2005 14:26:26 -0000	1.8
--- login.php	10 Sep 2005 22:08:24 -0000	1.9
***************
*** 54,58 ****
  if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) )
  { 
! 	if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
  	{
  		$username = isset($HTTP_POST_VARS['username']) ? phpbb_clean_username($HTTP_POST_VARS['username']) : '';
--- 54,58 ----
  if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) )
  { 
! 	if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && (!$userdata['session_logged_in'] || isset($HTTP_POST_VARS['admin'])) )
  	{
  		$username = isset($HTTP_POST_VARS['username']) ? phpbb_clean_username($HTTP_POST_VARS['username']) : '';
***************
*** 79,83 ****
  					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin);
  
  					if( $session_id )
--- 79,84 ----
  					$autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0;
  
! 					$admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0;
! 					$session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin);
  
  					if( $session_id )
***************
*** 160,164 ****
  	// user not already logged in
  	//
! 	if( !$userdata['session_logged_in'] )
  	{
  		$page_title = $lang['Login'];
--- 161,165 ----
  	// user not already logged in
  	//
! 	if( !$userdata['session_logged_in'] || (isset($HTTP_GET_VARS['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN))
  	{
  		$page_title = $lang['Login'];
***************
*** 209,212 ****
--- 210,214 ----
  
  		$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
+ 		$s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : '';
  
  		make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id);
***************
*** 214,218 ****
  			'USERNAME' => $username,
  
! 			'L_ENTER_PASSWORD' => $lang['Enter_password'],
  			'L_SEND_PASSWORD' => $lang['Forgotten_password'],
  
--- 216,220 ----
  			'USERNAME' => $username,
  
! 			'L_ENTER_PASSWORD' => (isset($HTTP_GET_VARS['admin'])) ? $lang['Admin_reauthenticate'] : $lang['Enter_password'],
  			'L_SEND_PASSWORD' => $lang['Forgotten_password'],
  

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** common.php	6 Sep 2005 18:51:56 -0000	1.36
--- common.php	10 Sep 2005 22:08:24 -0000	1.37
***************
*** 204,209 ****
  
  str_replace("//", "/", $phpbb_root_path);
- include_once($mx_root_path . 'config.' . $phpEx);
- 
  include_once($phpbb_root_path . 'includes/constants.' . $phpEx);
  include_once($mx_root_path . 'includes/template.' . $phpEx);
--- 204,207 ----