[phpMP-CVS] CVS: phpMP/core debug.php,1.3,1.4 session.php,1.6,1.7

[Brian R. <hei...@us...>]

Update of /cvsroot/phpmp/phpMP/core
In directory sc8-pr-cvs1:/tmp/cvs-serv17615/core

Modified Files:
	debug.php session.php 
Log Message:
Finally fixed the tempate issue.

Index: debug.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/core/debug.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** debug.php	14 Sep 2003 09:24:25 -0000	1.3
--- debug.php	15 Sep 2003 07:31:30 -0000	1.4
***************
*** 26,32 ****
  {
  
! 	/**

! 	 * @return void

! 	 * @desc Sets the error handler. 

  	 */
  	function Debug()
--- 26,32 ----
  {
  
! 	/**
! 	 * @return void
! 	 * @desc Sets the error handler. 
  	 */
  	function Debug()
***************
*** 35,46 ****
  	}
  
! 	/**

  	 * @return void
  	 * @param errno int
  	 * @param msg_text string
  	 * @param errfile string
! 	 * @param errline int

  	 * @desc Error/message handler. Taken from phpBB2.
! 	 	 I still don't quite understand it. :P

  	 */
  	function msg_display($errno, $msg_text, $errfile, $errline)
--- 35,46 ----
  	}
  
! 	/**
  	 * @return void
  	 * @param errno int
  	 * @param msg_text string
  	 * @param errfile string
! 	 * @param errline int
  	 * @desc Error/message handler. Taken from phpBB2.
! 	 	 I still don't quite understand it. :P
  	 */
  	function msg_display($errno, $msg_text, $errfile, $errline)
***************
*** 60,64 ****
  				if(isset($DB))
  				{
! 					$DB->close();
  					echo $msg_text;
  				}
--- 60,64 ----
  				if(isset($DB))
  				{
! 					$DB->sql_close();
  					echo $msg_text;
  				}

Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/core/session.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** session.php	15 Sep 2003 07:26:06 -0000	1.6
--- session.php	15 Sep 2003 07:31:30 -0000	1.7
***************
*** 70,74 ****
  				WHERE session_key='" . $this->session_key . "'";
  		
! 		$DB->query($sql);
  		
  		$this->session_user_id = ANONYMOUS;
--- 70,74 ----
  				WHERE session_key='" . $this->session_key . "'";
  		
! 		$DB->sql_query($sql);
  		
  		$this->session_user_id = ANONYMOUS;
***************
*** 100,109 ****
  			AND user_passwd='" . $passwd_enc . "'";
  		
! 		$result = $DB->query($sql);
! 		$num_rows = $DB->num_rows($result);
  		
  		if( $num_rows == 1 ) // We have a user!
  		{
! 			$User->set( $DB->fetch_assoc($result) );
  			$this->session_user_id = $User->get('user_id');
  			$this->is_logged_in = true;
--- 100,109 ----
  			AND user_passwd='" . $passwd_enc . "'";
  		
! 		$result = $DB->sql_query($sql);
! 		$num_rows = $DB->sql_num_rows($result);
  		
  		if( $num_rows == 1 ) // We have a user!
  		{
! 			$User->set( $DB->sql_fetch_row($result) );
  			$this->session_user_id = $User->get('user_id');
  			$this->is_logged_in = true;
***************
*** 243,247 ****
  			{
  				$sql = "DELETE FROM " . DB_SESSIONS_TABLE . " WHERE session_user_id=" . $this->session_user_id . " AND session_key!='" . $this->session_key . "'";
! 				$DB->query($sql);
  			}
  		}
--- 243,247 ----
  			{
  				$sql = "DELETE FROM " . DB_SESSIONS_TABLE . " WHERE session_user_id=" . $this->session_user_id . " AND session_key!='" . $this->session_key . "'";
! 				$DB->sql_query($sql);
  			}
  		}
***************
*** 293,302 ****
  							AND user_passwd='" . $auto_cookie_array[1] . "'";
  				
! 				$result = $DB->query($sql);
! 				$num_rows = $DB->num_rows($result);
  				
  				if( $num_rows == 1 ) // This cookie is valid.
  				{
! 					$User->set( $DB->fetch_assoc($result) );
  					$User->set('invisible_mode', $auto_cookie_array[2]);
  					$this->session_user_id = $auto_cookie_array[0];
--- 293,302 ----
  							AND user_passwd='" . $auto_cookie_array[1] . "'";
  				
! 				$result = $DB->sql_query($sql);
! 				$num_rows = $DB->sql_num_rows($result);
  				
  				if( $num_rows == 1 ) // This cookie is valid.
  				{
! 					$User->set( $DB->sql_fetch_row($result) );
  					$User->set('invisible_mode', $auto_cookie_array[2]);
  					$this->session_user_id = $auto_cookie_array[0];