[phpMP-CVS] CVS: phpMP/core admin.php,1.2,1.3 main.php,1.3,1.4

[Adam A. <ra...@us...>]

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

Modified Files:
	admin.php main.php 
Log Message:
Trying to update paths...

Index: admin.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/core/admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin.php	14 Sep 2003 09:24:25 -0000	1.2
--- admin.php	14 Sep 2003 21:35:19 -0000	1.3
***************
*** 118,122 ****
    	function parse_site($sname, $ovrtpl, $deftpl, $deflang, $defdate, $accact, $systime, $portperms)
    	{
!     	include_once( C_PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
      	$DB = new DB;
      
--- 118,122 ----
    	function parse_site($sname, $ovrtpl, $deftpl, $deflang, $defdate, $accact, $systime, $portperms)
    	{
!     	include_once( C_PHPMP_ROOT . CORE_DIR . 'dba/' . DB_TYPE . '.php' );
      	$DB = new DB;
      
***************
*** 142,146 ****
    	function _show_user()
    	{
!     	include_once( C_PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
      	$DB = new DB;
  
--- 142,146 ----
    	function _show_user()
    	{
!     	include_once( C_PHPMP_ROOT . CORE_DIR . 'dba/' . DB_TYPE . '.php' );
      	$DB = new DB;
  
***************
*** 171,175 ****
      	if (!$userid || $userid == 1) { print "Invalid User"; return; }
      
!     	include_once( C_PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
      	$DB = new DB;
      
--- 171,175 ----
      	if (!$userid || $userid == 1) { print "Invalid User"; return; }
      
!     	include_once( C_PHPMP_ROOT . CORE_DIR . 'dba/' . DB_TYPE . '.php' );
      	$DB = new DB;
      
***************
*** 220,224 ****
    	function parse_user($userid, $username, $passwd, $email, $auth_level, $date_format, $template, $signature, $delete)
    	{
!     	include_once( C_PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
      	$DB = new DB;
      
--- 220,224 ----
    	function parse_user($userid, $username, $passwd, $email, $auth_level, $date_format, $template, $signature, $delete)
    	{
!     	include_once( C_PHPMP_ROOT . CORE_DIR . 'dba/' . DB_TYPE . '.php' );
      	$DB = new DB;
      

Index: main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/core/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** main.php	14 Sep 2003 21:08:31 -0000	1.3
--- main.php	14 Sep 2003 21:35:19 -0000	1.4
***************
*** 28,36 ****
  	var $_cfgvars;
  	
! 	/**

! 	 * @return arr array

! 	 * @param arr array

  	 * @desc Strips magic quotes from the
! 	 *       superglobal arrays.

  	 */
  	function strip_magic_quotes($arr)
--- 28,36 ----
  	var $_cfgvars;
  	
! 	/**
! 	 * @return arr array
! 	 * @param arr array
  	 * @desc Strips magic quotes from the
! 	 *       superglobal arrays.
  	 */
  	function strip_magic_quotes($arr)
***************
*** 51,57 ****
  	}
  
! 	/**

! 	 * @return void

! 	 * @desc Initiates all core components.

  	 */
  	function Main()
--- 51,57 ----
  	}
  
! 	/**
! 	 * @return void
! 	 * @desc Initiates all core components.
  	 */
  	function Main()
***************
*** 77,84 ****
  		global $Debug, $DB, $User, $MPCode, $Template;
  
! 		include_once( C_PHPMP_ROOT . 'core/debug.php' );
  		$Debug = new Debug();
  
! 		include_once( C_PHPMP_ROOT . 'core/dba/' . DB_TYPE . '.php' );
  		$DB = new sql_db();
  		$DB->connect();
--- 77,84 ----
  		global $Debug, $DB, $User, $MPCode, $Template;
  
! 		include_once( C_PHPMP_ROOT . CORE_DIR . '/debug.php' );
  		$Debug = new Debug();
  
! 		include_once( C_PHPMP_ROOT . CORE_DIR . 'dba/' . DB_TYPE . '.php' );
  		$DB = new sql_db();
  		$DB->connect();
***************
*** 91,107 ****
  		define('DB_TEMPLATE_VARS_TABLE', DB_NAME . '.' . DB_TABLE_PREFIX . 'template_vars');
  
! 		include_once(C_PHPMP_ROOT . 'core/config.init.php');
  		$this->_cfg_start();
  
! 		include_once(C_PHPMP_ROOT . 'core/constants.php');
  		
! 		include_once(C_PHPMP_ROOT . 'core/functions.php');
  
! 		include_once(C_PHPMP_ROOT . 'core/user.php');
  		$User = new User();  // Create an instance of User.
  
  		create_vars();
  		
! 		include_once(C_PHPMP_ROOT . 'core/session.php');
  		$Session = new Session();
  		
--- 91,107 ----
  		define('DB_TEMPLATE_VARS_TABLE', DB_NAME . '.' . DB_TABLE_PREFIX . 'template_vars');
  
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'config.init.php');
  		$this->_cfg_start();
  
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'constants.php');
  		
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'functions.php');
  
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'user.php');
  		$User = new User();  // Create an instance of User.
  
  		create_vars();
  		
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'session.php');
  		$Session = new Session();
  		
***************
*** 109,118 ****
  		$Session->run();
  
! 		include_once(C_PHPMP_ROOT . 'core/language.php');
  		$Language = new Language();
  
! 		include_once(C_PHPMP_ROOT . 'core/mpcode.php');
  		
! 		include_once(C_PHPMP_ROOT . 'core/template.php');
  		$Template = new Template();
  		
--- 109,118 ----
  		$Session->run();
  
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'language.php');
  		$Language = new Language();
  
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'mpcode.php');
  		
! 		include_once(C_PHPMP_ROOT . CORE_DIR . 'template.php');
  		$Template = new Template();
  		
***************
*** 130,136 ****
  	}
  	
! 	/**

! 	 * @return void

! 	 * @desc Fetches Config vars. 

  	 */
  	function _cfg_start()
--- 130,136 ----
  	}
  	
! 	/**
! 	 * @return void
! 	 * @desc Fetches Config vars. 
  	 */
  	function _cfg_start()