[phpMP-CVS] CVS: phpMP/includes config.init.php,1.4,1.5 core.php,1.56,1.57 debug.php,1.5,1.6 languag

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	config.init.php core.php debug.php language.php mpcode.php 
	session.php template.php user.php 
Log Message:
Template system fixed and working (to the best of my knowledge).

Index: config.init.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/config.init.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** config.init.php	19 May 2003 23:39:59 -0000	1.4
--- config.init.php	3 Jun 2003 06:48:21 -0000	1.5
***************
*** 41,47 ****
  	}

  	function set($cfgkey, $cfgval)
  	{
! 		if( (!empty($cfgkey)) && (preg_match('/[^a-z][a-z0-9_-]/', $cfgkey)) && (!empty($cfgval)) )
  		{
  			$this->_cfgvars[$cfgkey] = $cfgval;
--- 41,53 ----
  	}

+ 	/**
+ 	 * @return unknown
+ 	 * @param cfgkey unknown
+ 	 * @param cfgval unknown
+ 	 * @desc Inserts the value of a given key into the Config array.
+ 	 */
  	function set($cfgkey, $cfgval)
  	{
! 		if( (!empty($cfgkey)) && (preg_match('/^[a-z][a-z0-9_-]+/', $cfgkey)) && (!empty($cfgval)) )
  		{
  			$this->_cfgvars[$cfgkey] = $cfgval;
***************
*** 54,57 ****
--- 60,68 ----
  	}

+ 	/**
+ 	 * @return unknown
+ 	 * @param cfgkey unknown
+ 	 * @desc Fetches config array values.
+ 	 */
  	function get($cfgkey)
  	{

Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** core.php	2 Jun 2003 22:32:31 -0000	1.56
--- core.php	3 Jun 2003 06:48:21 -0000	1.57
***************
*** 67,72 ****
  		}

! 		error_reporting(E_ERROR | E_WARNING | E_PARSE);
! 		//error_reporting(E_ALL);

  		include_once( PHPMP_ROOT . 'config.php' );
--- 67,72 ----
  		}

! 		//error_reporting(E_ERROR | E_WARNING | E_PARSE);
! 		error_reporting(E_ALL);

  		include_once( PHPMP_ROOT . 'config.php' );
***************
*** 78,83 ****
  		$Debug = new Debug();

- 		set_error_handler(array('Debug', 'msgDisplay'));
- 
  		include_once( PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
  		$DB = new DB();
--- 78,81 ----
***************
*** 125,135 ****
  			}
  		}
! 
  		include_once(PHPMP_ROOT . 'includes/template.php');
  		$Template = new Template();
- 		$Template->set_template('BlueMP');

  		$DB->close();
! 	}		
  }

--- 123,143 ----
  			}
  		}
! 		
  		include_once(PHPMP_ROOT . 'includes/template.php');
  		$Template = new Template();

+ 		if( $User->get('template') == false )
+ 		{
+ 			$Config->set('template', $Config->get('default_tpl'));
+ 		}
+ 		else
+ 		{
+ 			$Config->set('template', $User->get('template'));
+ 		}
+ 
+ 		$Template->set_template( $Config->get('template') );
+ 		echo $Config->get('template');
  		$DB->close();
! 	}
  }

Index: debug.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/debug.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** debug.php	17 May 2003 07:50:17 -0000	1.5
--- debug.php	3 Jun 2003 06:48:21 -0000	1.6
***************
*** 28,32 ****
  	function Debug()
  	{
! 	
  	}

--- 28,32 ----
  	function Debug()
  	{
! 		@set_error_handler( array(&$this, 'msgDisplay') );
  	}

***************
*** 50,54 ****
  				{
  					$DB->close();
! 					echo "A User Error has occurred.  Please notify the <a href=\"mailto: " . $Config['site_contact'] . "\">board administrator</a>.";
  				}
  				break;
--- 50,54 ----
  				{
  					$DB->close();
! 					echo $msg_text;
  				}
  				break;

Index: language.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/language.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** language.php	17 May 2003 07:50:17 -0000	1.12
--- language.php	3 Jun 2003 06:48:21 -0000	1.13
***************
*** 22,26 ****
   *
   */
!  
  class Language
  {
--- 22,26 ----
   *
   */
! 
  class Language
  {
***************
*** 29,35 ****
  	{
  		global $Config, $User, $Local;
- 		($User->get('language') != '') ? ($Config->set('language', $User->get('language'))) : ($Config->set('language', $Config->get('default_lang')));

! 		include_once( PHPMP_ROOT . 'languages/' . $Config->get('language') . '/lang_main.php' );
  		$Local = new Localization();

--- 29,49 ----
  	{
  		global $Config, $User, $Local;

! 		$cfg_lang = $Config->get('default_lang');
! 		$usr_lang = $User->get('language');
! 		$lang = '';
! 		
! 		(empty($usr_lang)) ? $lang = $cfg_lang : $lang = $usr_lang;
! 		
! 		$Config->set('language', $lang);
! 		$lang_file = PHPMP_ROOT . 'languages/' . $lang . '/lang_main.php';
! 		
! 		if (!file_exists($lang_file))
! 		{
! 			trigger_error("localization error - \"$lang_file\" does not exist.", E_USER_ERROR);
! 		}
! 		
! 		include_once( $lang_file );
! 		
  		$Local = new Localization();

Index: mpcode.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/mpcode.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mpcode.php	17 May 2003 07:50:17 -0000	1.6
--- mpcode.php	3 Jun 2003 06:48:21 -0000	1.7
***************
*** 47,51 ****
  	// This may not be the best way, but it works
  	function _replace($string) {
!         include ("phpmp/includes/mpcode_arrays.php");

          foreach ($mpcode as $key => $code) {
--- 47,51 ----
  	// This may not be the best way, but it works
  	function _replace($string) {
!         include (PHPMP_ROOT . "includes/mpcode_arrays.php");

          foreach ($mpcode as $key => $code) {

Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/session.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** session.php	17 May 2003 07:50:17 -0000	1.11
--- session.php	3 Jun 2003 06:48:21 -0000	1.12
***************
*** 133,137 ****

  		// Capture the page we're at.
! 		$this->page = basename($_SERVER['REQUEST_URI']);

  		$cur_time = time(); // Time as of right now.
--- 133,137 ----

  		// Capture the page we're at.
! 		//$this->page = basename($_SERVER['REQUEST_URI']);

  		$cur_time = time(); // Time as of right now.

Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** template.php	2 Jun 2003 22:32:32 -0000	1.35
--- template.php	3 Jun 2003 06:48:21 -0000	1.36
***************
*** 22,28 ****
   *
   */
-  
- // Contains the Template class.
- // This will utilize a flat-file template system.

  /*
--- 22,25 ----
***************
*** 57,62 ****

  	var $force_recompile;
! 
! 
  	function set_template($template = '', $force_recompile = false)
  	{
--- 54,58 ----

  	var $force_recompile;
! 	
  	function set_template($template = '', $force_recompile = false)
  	{
***************
*** 390,398 ****
  		}

  		// This will handle the remaining root-level varrefs
  		else
  		{
- 			global $Local;
- 
  			$text_blocks = preg_replace('#\{L_([A-Z0-9\-_]*?)\}#e', "'<?php echo ((isset(\$this->_tpldata[\'.\'][0][\'L_\\1\'])) ? \$this->_tpldata[\'.\'][0][\'L_\\1\'] : \'' . ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '') . '\'); ?>'" , $text_blocks);
  		}
--- 386,398 ----
  		}

+ 		global $Local;
+ 		
  		// This will handle the remaining root-level varrefs
+ 		if (!$this->static_lang)
+ 		{
+ 			$text_blocks = preg_replace('#\{L_([a-z0-9\-_]*?)\}#is', "<?php echo ((isset(\$this->_tpldata['.'][0]['L_\\1'])) ? \$this->_tpldata['.'][0]['L_\\1'] : ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '{ ' . ucfirst(strtolower(str_replace('_', ' ', '\\1'))) . ' 	}')); ?>", $text_blocks);
+ 		}
  		else
  		{
  			$text_blocks = preg_replace('#\{L_([A-Z0-9\-_]*?)\}#e', "'<?php echo ((isset(\$this->_tpldata[\'.\'][0][\'L_\\1\'])) ? \$this->_tpldata[\'.\'][0][\'L_\\1\'] : \'' . ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '') . '\'); ?>'" , $text_blocks);
  		}

Index: user.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/user.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** user.php	19 May 2003 23:39:59 -0000	1.22
--- user.php	3 Jun 2003 06:48:22 -0000	1.23
***************
*** 34,38 ****
  			foreach( $userkey as $key => $val )
  			{
! 				if(preg_match('/[^a-z][a-z0-9_-]/', $key))
  				{
  					$this->_data[$key] = $val;
--- 34,38 ----
  			foreach( $userkey as $key => $val )
  			{
! 				if(preg_match('/^[a-z][a-z0-9_-]+/', $key))
  				{
  					$this->_data[$key] = $val;
***************
*** 40,44 ****
  			}
  		}
! 		elseif( (!empty($userkey)) && (preg_match('/[^a-z][a-z0-9_-]/', $userkey)) && (!empty($userval)) )
  		{
  			$this->_data[$userkey] = $userval;
--- 40,44 ----
  			}
  		}
! 		elseif( (!empty($userkey)) && (preg_match('/^[a-z][a-z0-9_-]+/', $userkey)) && (!empty($userval)) )
  		{
  			$this->_data[$userkey] = $userval;
***************
*** 51,54 ****
--- 51,59 ----
  	}

+ 	/**
+ 	 * @return unknown
+ 	 * @param userkey unknown
+ 	 * @desc Fetches user variables from the defined array.
+ 	 */
  	function get($userkey)
  	{
***************
*** 66,86 ****
  	function getIPEncoded()
  	{
! 		if( getenv('HTTP_X_FORWARDED_FOR') != '' )
  		{
! 			$client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
! 		
! 			if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
  			{
! 				$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10.\.*/', '/^224.\.*/', '/^240.\.*/');
! 				$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
  			}
  		}
- 		else
- 		{
- 			$client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
- 		}
- 		
- 		$ip_sep = explode('.', $client_ip);
- 		return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]);	
  	}

--- 71,84 ----
  	function getIPEncoded()
  	{
! 		$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : $REMOTE_ADDR;
! 
! 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
  		{
! 			if (preg_match('#^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)#', $_SERVER['HTTP_X_FORWARDED_FOR'], $ip_list))
  			{
! 				$private_ip = array('#^0\.#', '#^127\.0\.0\.1#', '#^192\.168\.#', '#^172\.16\.#', '#^10\.#', '#^224\.#', '#^240\.#');
! 				$this->ip = preg_replace($private_ip, $this->ip, $ip_list[1]);
  			}
  		}
  	}

[phpMP-CVS] CVS: phpMP/includes config.init.php,1.4,1.5 core.php,1.56,1.57 debug.php,1.5,1.6 languag

[phpMP-CVS] CVS: phpMP/includes config.init.php,1.4,1.5 core.php,1.56,1.57 debug.php,1.5,1.6 language.php,1.12,1.13 mpcode.php,1.6,1.7 session.php,1.11,1.12 template.php,1.35,1.36 user.php,1.22,1.23