[mxbb-commits] core/includes mx_functions_phpbb.php,1.60,1.61

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

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

Modified Files:
	mx_functions_phpbb.php 
Log Message:
mx_users, now handles admin users.

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** mx_functions_phpbb.php	10 Jun 2008 03:35:19 -0000	1.60
--- mx_functions_phpbb.php	14 Jun 2008 20:41:08 -0000	1.61
***************
*** 303,307 ****
  		$mx_user->init($user_ip, $page_id, false);
  	}
! 	
  	if(empty($theme))
  	{
--- 303,307 ----
  		$mx_user->init($user_ip, $page_id, false);
  	}
! 
  	if(empty($theme))
  	{
***************
*** 705,714 ****
  	*/
  
! 	//Will this make troble if it's correct?	
  	if ( !empty($_SID) && !preg_match('#sid=#', $url) )
  	{
  		$url .= ( (strpos($url, '?') === false) ?  '?' : (( $non_html_amp ) ? '&' : '&' ) ) . $_SID;
  	}
! 		
  	if ( !empty($SID) && !preg_match('#sid=#', $url) )
  	{
--- 705,714 ----
  	*/
  
! 	//Will this make troble if it's correct?
  	if ( !empty($_SID) && !preg_match('#sid=#', $url) )
  	{
  		$url .= ( (strpos($url, '?') === false) ?  '?' : (( $non_html_amp ) ? '&' : '&' ) ) . $_SID;
  	}
! 
  	if ( !empty($SID) && !preg_match('#sid=#', $url) )
  	{
***************
*** 1033,1037 ****
  		WHERE ";
  	$sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" .  str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS;
! 	if ( !($result = $db->sql_query($sql, 600)) )
  	{
  		message_die(GENERAL_ERROR, 'Tried obtaining data for a non-existent user', '', __LINE__, __FILE__, $sql);
--- 1033,1037 ----
  		WHERE ";
  	$sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" .  str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS;
! 	if ( !($result = $db->sql_query($sql, 120)) )
  	{
  		message_die(GENERAL_ERROR, 'Tried obtaining data for a non-existent user', '', __LINE__, __FILE__, $sql);