[phpMP-CVS] CVS: phpMP/core main.php,1.10,1.11 session.php,1.5,1.6

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

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

Modified Files:
	main.php session.php 
Log Message:
Template fix.

Index: main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/core/main.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** main.php	15 Sep 2003 06:53:55 -0000	1.10
--- main.php	15 Sep 2003 07:26:06 -0000	1.11
***************
*** 131,135 ****
  		$Template = new Template();
  		
! 		if( $User->get('template') == false )
  		{
  			$this->cfg_set('template', $this->cfg_get('default_tpl'));
--- 131,135 ----
  		$Template = new Template();
  		
! 		if( $User->get('template') == '' )
  		{
  			$this->cfg_set('template', $this->cfg_get('default_tpl'));

Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/core/session.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** session.php	15 Sep 2003 06:40:24 -0000	1.5
--- session.php	15 Sep 2003 07:26:06 -0000	1.6
***************
*** 162,174 ****
  						ORDER BY session_exp_time DESC";
  
! 			$result = $DB->query($sql);
! 			$num_rows = $DB->num_rows($result);
  			
  			// Checks for a session in the database.
! 			($num_rows >= 1) ? ($session_exists = true) : ($session_exists = false);
  			
  			// If the session is expired, we'll go ahead and create a new one regardless.
  			// The old one *should* be cleaned out by our clean() function later.
! 			$this->session_data = $DB->fetch_assoc($result);
  			if( $this->session_data['session_exp_time'] < $cur_time )
  			{
--- 162,174 ----
  						ORDER BY session_exp_time DESC";
  
! 			$result = $DB->sql_query($sql);
! 			$num_rows = $DB->sql_num_rows($result);
  			
  			// Checks for a session in the database.
! 			($num_rows == 1) ? ($session_exists = true) : ($session_exists = false);
  			
  			// If the session is expired, we'll go ahead and create a new one regardless.
  			// The old one *should* be cleaned out by our clean() function later.
! 			$this->session_data = $DB->sql_fetch_row($result);
  			if( $this->session_data['session_exp_time'] < $cur_time )
  			{