[phpMP-CVS] CVS: phpMP/includes constants.php,1.19,1.20 core.php,1.47,1.48 session.php,1.5,1.6 template.php,1.29,1.30

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

Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv1971/includes

Modified Files:
	constants.php core.php session.php template.php 
Log Message:
See Changelog.


Index: constants.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/constants.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** constants.php	2 May 2003 04:52:57 -0000	1.19
--- constants.php	4 May 2003 21:12:06 -0000	1.20
***************
*** 5,8 ****
--- 5,10 ----
  define("ACTIVATE_ADMIN", 2);
  
+ define("ANONYMOUS", 1);
+ 
  define("AUTH_LVL_GUEST", 0);	// Guest.
  define("AUTH_LVL_MEM", 1);		// Standard Member

Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** core.php	2 May 2003 04:52:57 -0000	1.47
--- core.php	4 May 2003 21:12:06 -0000	1.48
***************
*** 58,61 ****
--- 58,62 ----
  		define("DB_MODULES_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'modules');
  		define("DB_BLOCK_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'blocks');
+ 		define("DB_TEMPLATE_VARS_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'template_vars');
  
  		$result = $DB->query( "SELECT * FROM " . DB_CONFIG_TABLE );
***************
*** 101,107 ****
  		}
  
! 		include_once(PHPMP_ROOT . 'includes/Smarty.class.php');
  		include_once(PHPMP_ROOT . 'includes/template.php');
! 		$Template = new Template();  // Create an instance of Template.
  		
  		$DB->close();
--- 102,108 ----
  		}
  
! 		//include_once(PHPMP_ROOT . 'includes/Smarty.class.php');
  		include_once(PHPMP_ROOT . 'includes/template.php');
! 		$Template = new Template('index');  // Create an instance of Template.
  		
  		$DB->close();

Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/session.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** session.php	2 May 2003 04:52:57 -0000	1.5
--- session.php	4 May 2003 21:12:06 -0000	1.6
***************
*** 26,40 ****
  	function destroy()
  	{
! 		global $DB, $Config;
  		
  		$exp_time = time() + $Config['session_length'];
  		$page = basename($_SERVER['REQUEST_URI']);
  		
  		// Sets the session as owned by an anonymous user.
! 		$sql = 'UPDATE ' . DB_SESSIONS_TABLE . '
! 				SET session_exp_time=\'' . $exp_time . '\'
! 					AND session_page=\'' . $page . '\'
! 					AND session_user_id=1
! 				WHERE session_key=\'' . $this->session_key . '\'';
  		
  		$DB->query($sql);
--- 26,42 ----
  	function destroy()
  	{
! 		global $DB, $Config, $SID;
  		
  		$exp_time = time() + $Config['session_length'];
  		$page = basename($_SERVER['REQUEST_URI']);
  		
+ 		$SID = "?sid=";
+ 		
  		// Sets the session as owned by an anonymous user.
! 		$sql = "UPDATE " . DB_SESSIONS_TABLE . "
! 				SET session_exp_time=" . $exp_time . "
! 					AND session_page='" . $page . "'
! 					AND session_user_id=" . ANONYMOUS . "
! 				WHERE session_key='" . $this->session_key . "'";
  		
  		$DB->query($sql);
***************
*** 83,87 ****
  	function run()
  	{
! 		global $User, $DB, $Config;
  		
  		if( (isset($_POST['do_login'])) && ($_POST['do_login'] == true) )
--- 85,89 ----
  	function run()
  	{
! 		global $User, $DB, $Config, $SID;
  		
  		if( (isset($_POST['do_login'])) && ($_POST['do_login'] == true) )
***************
*** 127,130 ****
--- 129,134 ----
  				$session_exists = false;
  			}
+ 			
+ 			$this->session_user_id = $this->session_data['session_user_id'];
  		}
  		
***************
*** 148,152 ****
  			if( $this->is_logged_in == false )
  			{
! 				$this->session_user_id = 1;
  			}
  			
--- 152,156 ----
  			if( $this->is_logged_in == false )
  			{
! 				$this->session_user_id = ANONYMOUS;
  			}
  			
***************
*** 169,173 ****
  		
  		$cookie_data = urlencode( $this->session_user_id . ':' . $this->session_key );
! 		setcookie($Config['cookie_name'] . '_data', $cookie_data, $cur_time + $Config['session_length'], $Config['cookie_path'], $Config['cookie_domain'], $Config['cookie_secure']);
  		$this->clean();
  	}
--- 173,177 ----
  		
  		$cookie_data = urlencode( $this->session_user_id . ':' . $this->session_key );
! 		(setcookie($Config['cookie_name'] . '_data', $cookie_data, $cur_time + $Config['session_length'], $Config['cookie_path'], $Config['cookie_domain'], $Config['cookie_secure'])) ? ($SID = "?sid=") : ($SID = "?sid=" . $this->session_key);
  		$this->clean();
  	}
***************
*** 183,187 ****
  			$DB->query($sql);
  			
! 			if((!empty($this->session_user_id)) && ($this->session_user_id != 1) && (!empty($this->session_key)))
  			// Note that, if we reach this point, the following query will remove past sessions for this user which may not have expired.
  			// This is good, but would be better if done for all users or if done during the creation of new sessions.
--- 187,191 ----
  			$DB->query($sql);
  			
! 			if((!empty($this->session_user_id)) && ($this->session_user_id != ANONYMOUS) && (!empty($this->session_key)))
  			// Note that, if we reach this point, the following query will remove past sessions for this user which may not have expired.
  			// This is good, but would be better if done for all users or if done during the creation of new sessions.
***************
*** 211,214 ****
--- 215,222 ----
  			}
  		}
+ 		elseif(!empty($_GET['sid']))
+ 		{
+ 			$this->session_key = $_GET['sid'];
+ 		}
  		
  		if(empty($this->session_key)) // If we don't have a session key by now, there isn't one saved.
***************
*** 219,223 ****
  		
  		// The user is currently anonymous, so let's check for auto-login.
! 		if( ($this->session_user_id == 1) || empty($this->session_user_id) )
  		{
  			if( !empty( $_COOKIE[$Config['cookie_name'] . '_auto'] ) ) // We have an autologin cookie set.
--- 227,231 ----
  		
  		// The user is currently anonymous, so let's check for auto-login.
! 		if( ($this->session_user_id == ANONYMOUS) || empty($this->session_user_id) )
  		{
  			if( !empty( $_COOKIE[$Config['cookie_name'] . '_auto'] ) ) // We have an autologin cookie set.
***************
*** 244,248 ****
  					setcookie($Config['cookie_name'] . '_auto', '', time() - 31536000, $Config['cookie_path'], $Config['cookie_domain'], $Config['cookie_secure']);
  					return false;
! 					$this->session_user_id = 1;
  				}
  			}
--- 252,256 ----
  					setcookie($Config['cookie_name'] . '_auto', '', time() - 31536000, $Config['cookie_path'], $Config['cookie_domain'], $Config['cookie_secure']);
  					return false;
! 					$this->session_user_id = ANONYMOUS;
  				}
  			}

Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** template.php	2 May 2003 04:52:57 -0000	1.29
--- template.php	4 May 2003 21:12:06 -0000	1.30
***************
*** 6,11 ****
  class template
  {
! 	var $tplname, $tplvars;
! 	$tplvars = new array();
  	
  	/**
--- 6,11 ----
  class template
  {
! 	var $tplname;
! 	var $tplvars = array();
  	
  	/**
***************
*** 20,24 ****
  	function template($tplname)
  	{
! 		$query = $DB->query("SELECT * FROM " . DB_TABLE_PREFIX . "template_vars WHERE tpl_name='$tplname'");
  	
  		$this->tplname = $tplname;
--- 20,25 ----
  	function template($tplname)
  	{
! 		global $DB;
! 		$query = $DB->query("SELECT * FROM " . DB_TEMPLATE_VARS_TABLE . " WHERE tpl_name='$tplname'");
  	
  		$this->tplname = $tplname;