[phpMP-CVS] CVS: phpMP/includes core.php,1.60,1.61 language.php,1.15,1.16 template.php,1.43,1.44

[Gordon P. H. <gph...@us...>]

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

Modified Files:
	core.php language.php template.php 
Log Message:
I updated a few remaining variables of PHPMP_ROOT to C_PHPMP_ROOT. I also fixed the Admin Panel by correcting the define()'s because the variables were not surrounded by ' (as in 'VARIABLE'). - GPHemsley

Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** core.php	29 Jun 2003 18:33:21 -0000	1.60
--- core.php	29 Jun 2003 19:38:19 -0000	1.61
***************
*** 62,68 ****
  
  		// This code *should* be changed later.
! 		if( !defined("PHPMP_ROOT") )
  		{
! 			define( 'PHPMP_ROOT', './' );
  		}
  
--- 62,68 ----
  
  		// This code *should* be changed later.
! 		if( !defined("C_PHPMP_ROOT") )
  		{
! 			define( 'C_PHPMP_ROOT', './' );
  		}
  
***************
*** 70,82 ****
  		error_reporting(E_ERROR | E_WARNING | E_PARSE);
  		
! 		include_once( PHPMP_ROOT . 'config.php' );
  
  		// Globalize all major class-containing variables.
  		global $Config, $Debug, $DB, $User, $MPCode, $Template;
  
! 		include_once( PHPMP_ROOT . 'includes/debug.php' );
  		$Debug = new Debug();
  
! 		include_once( PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
  		$DB = new DB();
  		$DB->connect();
--- 70,82 ----
  		error_reporting(E_ERROR | E_WARNING | E_PARSE);
  		
! 		include_once( C_PHPMP_ROOT . 'config.php' );
  
  		// Globalize all major class-containing variables.
  		global $Config, $Debug, $DB, $User, $MPCode, $Template;
  
! 		include_once( C_PHPMP_ROOT . 'includes/debug.php' );
  		$Debug = new Debug();
  
! 		include_once( C_PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
  		$DB = new DB();
  		$DB->connect();
***************
*** 89,105 ****
  		define("DB_TEMPLATE_VARS_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'template_vars');
  
! 		include_once(PHPMP_ROOT . 'includes/config.init.php');
  		$Config = new Config();
  
! 		include_once(PHPMP_ROOT . 'includes/constants.php');
  		
! 		include_once(PHPMP_ROOT . 'includes/functions.php');
  
! 		include_once(PHPMP_ROOT . 'includes/user.php');
  		$User = new User();  // Create an instance of User.
  
  		create_vars();
  		
! 		include_once(PHPMP_ROOT . 'includes/session.php');
  		$Session = new Session();
  		
--- 89,105 ----
  		define("DB_TEMPLATE_VARS_TABLE", DB_NAME . '.' . DB_TABLE_PREFIX . 'template_vars');
  
! 		include_once(C_PHPMP_ROOT . 'includes/config.init.php');
  		$Config = new Config();
  
! 		include_once(C_PHPMP_ROOT . 'includes/constants.php');
  		
! 		include_once(C_PHPMP_ROOT . 'includes/functions.php');
  
! 		include_once(C_PHPMP_ROOT . 'includes/user.php');
  		$User = new User();  // Create an instance of User.
  
  		create_vars();
  		
! 		include_once(C_PHPMP_ROOT . 'includes/session.php');
  		$Session = new Session();
  		
***************
*** 107,114 ****
  		$Session->run();
  
! 		include_once(PHPMP_ROOT . 'includes/language.php');
  		$Language = new Language();
  
! 		include_once(PHPMP_ROOT . 'includes/mpcode.php');
  
  		// This while() statement will loop through the
--- 107,114 ----
  		$Session->run();
  
! 		include_once(C_PHPMP_ROOT . 'includes/language.php');
  		$Language = new Language();
  
! 		include_once(C_PHPMP_ROOT . 'includes/mpcode.php');
  
  		// This while() statement will loop through the
***************
*** 119,128 ****
  			while( $my_file = $optional_files[$i] )
  			{
! 				include_once(PHPMP_ROOT . 'includes/' . $my_file . '.php');
  				$i++;
  			}
  		}
  		
! 		include_once(PHPMP_ROOT . 'includes/template.php');
  		$Template = new Template();
  		
--- 119,128 ----
  			while( $my_file = $optional_files[$i] )
  			{
! 				include_once(C_PHPMP_ROOT . 'includes/' . $my_file . '.php');
  				$i++;
  			}
  		}
  		
! 		include_once(C_PHPMP_ROOT . 'includes/template.php');
  		$Template = new Template();
  		

Index: language.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/language.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** language.php	29 Jun 2003 08:19:55 -0000	1.15
--- language.php	29 Jun 2003 19:38:20 -0000	1.16
***************
*** 37,41 ****
  		
  		$Config->set('language', $lang);
! 		$lang_file = PHPMP_ROOT . 'languages/' . $lang . '/lang_main.php';
  		
  		if (!file_exists($lang_file))
--- 37,41 ----
  		
  		$Config->set('language', $lang);
! 		$lang_file = C_PHPMP_ROOT . 'languages/' . $lang . '/lang_main.php';
  		
  		if (!file_exists($lang_file))

Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** template.php	29 Jun 2003 18:50:13 -0000	1.43
--- template.php	29 Jun 2003 19:38:20 -0000	1.44
***************
*** 60,65 ****
  	{
  
! 		$this->root = PHPMP_ROOT . 'templates/' . $template;
!         $this->cachedir = PHPMP_ROOT . $this->cache_root . $template . '/';
  
  		$this->static_lang = $static_lang;
--- 60,65 ----
  	{
  
! 		$this->root = C_PHPMP_ROOT . 'templates/' . $template;
!         $this->cachedir = C_PHPMP_ROOT . $this->cache_root . $template . '/';
  
  		$this->static_lang = $static_lang;