[mxbb-commits] core/includes/sessions/phpbb3 login.php,1.7,1.8

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

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

Modified Files:
	login.php 
Log Message:
temp fix

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/login.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** login.php	4 Oct 2008 07:04:25 -0000	1.7
--- login.php	9 Oct 2008 18:31:28 -0000	1.8
***************
*** 71,76 ****
  					if (!function_exists('utf8_to_cp1252'))
  					{
! 						global $phpbb_root_path, $phpEx;
! 						include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
  					}
  
--- 71,76 ----
  					if (!function_exists('utf8_to_cp1252'))
  					{
! 						global $mx_root_path, $phpEx;
! 						include_once($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
  					}
  
***************
*** 98,102 ****
  							WHERE user_id = ' . $row['user_id'];
  						$db->sql_query($sql);
! 
  						return array(
  							'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
--- 98,102 ----
  							WHERE user_id = ' . $row['user_id'];
  						$db->sql_query($sql);
! 						mx_message_die(GENERAL_MESSAGE, 'We are sorry but password convertion failed, please login direct in forums or rewuest a new activation link.');
  						return array(
  							'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
***************
*** 105,109 ****
  						);
  					}
! 				}
  			}
  			else
--- 105,109 ----
  						);
  					}
! 				}				
  			}
  			else
***************
*** 120,125 ****
  					if (!function_exists('utf8_to_cp1252'))
  					{
! 							global $phpbb_root_path, $phpEx;
! 							include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
  					}
  				
--- 120,125 ----
  					if (!function_exists('utf8_to_cp1252'))
  					{
! 							global $mx_root_path, $phpEx;
! 							include_once($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
  					}
  				
***************
*** 189,193 ****
  					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
  					{
! 
  					}
  
--- 189,193 ----
  					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
  					{
! 						mx_message_die(GENERAL_MESSAGE, 'Inactive User');
  					}
  
***************
*** 202,206 ****
  						mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
  					}
! 				}
  			}
  		}
--- 202,206 ----
  						mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__);
  					}
! 				}				
  			}
  		}