phpmp-commits

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

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

Modified Files:
	constants.php core.php template.php 
Log Message:
Realized after an hour of long, torturous thought that the constants file wouldn't work as laid out.  Made a few other small updates as well.  Screwed with the other files randomly to get everything working alright.


Index: constants.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/constants.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** constants.php	30 Nov 2002 23:38:06 -0000	1.9
--- constants.php	1 Dec 2002 03:47:22 -0000	1.10
***************
*** 1,9 ****
  <?
  
! define("CONFIG_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'config');
! define("USERS_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'users');
! define("SESSION_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'sessions');
! define("MODULES_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'modules');
! define("BLOCK_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'blocks');
  
  ?>
--- 1,5 ----
  <?
  
! define("TIME_NOW", date( DATE_FORMAT ) );
  
  ?>

Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** core.php	30 Nov 2002 23:18:39 -0000	1.29
--- core.php	1 Dec 2002 03:47:22 -0000	1.30
***************
*** 4,7 ****
--- 4,9 ----
  {
  
+ 	var $DB;
+ 
  	// Initiates configuration from database.
  	// Author: Brian 'Heimidal' Rose
***************
*** 11,26 ****
  	{
  
! 		global $DB; // Globalize DB class.
  
! 		$sql = "SELECT * FROM " . CONFIG_TABLE;
! 		$result = $DB->query( $sql );
  
  		// Loop through all config values from DB.
  		// Define each key as its respective value.
! 		while( $row = $DB->fetch_array( $result ) )
  		{
! 			define( str_to_upper( $row['key'] ), $row['value'] );
  		}
  
  	}
  
--- 13,33 ----
  	{
  
! 		define("CONFIG_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'config');
! 		define("USERS_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'users');
! 		define("SESSION_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'sessions');
! 		define("MODULES_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'modules');
! 		define("BLOCK_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'blocks');
  
! 		$result = $this->DB->query( "SELECT * FROM " . CONFIG_TABLE );
  
  		// Loop through all config values from DB.
  		// Define each key as its respective value.
! 		while( $row = $this->DB->fetchArray( $result ) )
  		{
! 			define( strtoupper( $row['key'] ), $row['value'] );
  		}
  
+ 		print "Config values defined.<br /><br />";
+ 
  	}
  
***************
*** 33,47 ****
  		include_once('./config.php');
  
! 		include_once('./includes/debug.php');
! 		$Debug = new Debug();
  
! 		include_once( './dba/' . DB_TYPE . '.dba' );
! 		$DB = new DB();
! 		$DB->connect;
  
  		$this->_initConfig();  // Grab DB-stored config values.
  
  		include_once('./includes/auth.php');
! 		$Auth = new Auth();  // Create an instance of Auth.
  
  		include_once('./includes/language.php');
--- 40,54 ----
  		include_once('./config.php');
  
! 		//include_once('./includes/debug.php');
! 		//$Debug = new Debug();
  
! 		include( './dba/' . DB_TYPE . '.dba' );
! 		$this->DB = new DB();
! 		$this->DB->connect();
  
  		$this->_initConfig();  // Grab DB-stored config values.
  
  		include_once('./includes/auth.php');
! 		//$Auth = new Auth();  // Create an instance of Auth.
  
  		include_once('./includes/language.php');
***************
*** 72,76 ****
  
  		// Globalize all major class-containing variables.
! 		global $Debug, $DB, $Auth, $Language, $Parser, $Template;
  
  	}
--- 79,83 ----
  
  		// Globalize all major class-containing variables.
! 		global $Debug, $Auth, $Language, $Parser, $Template;
  
  	}

Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** template.php	30 Nov 2002 10:58:23 -0000	1.21
--- template.php	1 Dec 2002 03:47:22 -0000	1.22
***************
*** 14,21 ****
  	{
  
  		// Set up the directories for Smarty.
  		$this->template_dir = './templates/' . TEMPLATE;
  		$this->compile_dir = './templates/' . TEMPLATE . '/compile';
! 		$this->config_dir = './templates/' . TEMPLATE . '/configs'
  		$this->cache_dir = '';
  
--- 14,29 ----
  	{
  
+ 		if( defined( "USR_TPL" ) && ( OVERRIDE_USR_TPL == 0 ) )
+ 		{
+ 			define( "TEMPLATE", USR_TPL );
+ 		}
+ 		else {
+ 			define( "TEMPLATE", DEFAULT_TPL );
+ 		}
+ 
  		// Set up the directories for Smarty.
  		$this->template_dir = './templates/' . TEMPLATE;
  		$this->compile_dir = './templates/' . TEMPLATE . '/compile';
! 		$this->config_dir = './templates/' . TEMPLATE . '/configs';
  		$this->cache_dir = '';
  
***************
*** 34,38 ****
  	// Accepts: none.
  	// Returns: none.
! 	assign_constants()
  	{
  
--- 42,46 ----
  	// Accepts: none.
  	// Returns: none.
! 	function assign_constants()
  	{
  
***************
*** 40,47 ****
  
  			"SITE_ADDR"	=>	SITE_ADDR,
  			"REL_PATH"	=>	REL_PATH,
! 			"TODAY"		=>	TODAY,
! 			"TEMPLATE"	=>	TEMPLATE,
! 			"SITE_NAME"	=>	SITE_NAME
  
  		)	);
--- 48,55 ----
  
  			"SITE_ADDR"	=>	SITE_ADDR,
+ 			"SITE_NAME"	=>	SITE_NAME,
  			"REL_PATH"	=>	REL_PATH,
! 			"TIME_NOW"	=>	TIME_NOW,
! 			"TEMPLATE"	=>	TEMPLATE
  
  		)	);