[mxbb-commits] core/includes/sessions/phpbb3 session.php,1.3,1.4

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31374

Modified Files:
	session.php 
Log Message:
Stuff for the new AdminCP :)

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** session.php	16 Dec 2007 16:15:49 -0000	1.3
--- session.php	13 Jan 2008 12:09:01 -0000	1.4
***************
*** 246,250 ****
  				// Validate IP length according to admin ... enforces an IP
  				// check on bots if admin requires this
! //				$quadcheck = ($board_config['ip_check_bot'] && $this->data['user_type'] & USER_BOT) ? 4 : $board_config['ip_check'];
  
  				if (strpos($this->ip, ':') !== false && strpos($this->data['session_ip'], ':') !== false)
--- 246,250 ----
  				// Validate IP length according to admin ... enforces an IP
  				// check on bots if admin requires this
! 				//$quadcheck = ($board_config['ip_check_bot'] && $this->data['user_type'] & USER_BOT) ? 4 : $board_config['ip_check'];
  
  				if (strpos($this->ip, ':') !== false && strpos($this->data['session_ip'], ':') !== false)
***************
*** 1266,1269 ****
--- 1266,1285 ----
  		}
  
+ 		//mxBB
+ 		//To do
+ 		// We include acp language file here to not load it every time a custom language file is included
+ 		/*
+ 		if (defined('IN_ADMIN'))
+ 		{
+ 			if ((include $this->lang_path . "acp/common.$phpEx") === false)
+ 			{
+ 				//this will fix the path for anonymouse users
+ 				if ((include $phpbb_root_path . $this->lang_path . "acp/common.$phpEx") === false)
+ 				{
+ 					die('Language file ' . $phpbb_root_path . $this->lang_path . "acp/common.$phpEx" . " couldn't be opened.");
+ 				}
+ 			}
+ 		}*/
+ 
  		$this->add_lang($lang_set);
  		unset($lang_set);
***************
*** 1425,1429 ****
  			if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
  			{
! 				$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg");
  				foreach ($cfg_data_imageset_data as $image_name => $value)
  				{
--- 1441,1445 ----
  			if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"))
  			{
! 				$cfg_data_imageset_data = phpBB3::parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg");
  				foreach ($cfg_data_imageset_data as $image_name => $value)
  				{
***************
*** 1584,1588 ****
  	function add_lang($lang_set, $use_db = false, $use_help = false)
  	{
! 		global $phpEx;
  
  		if (is_array($lang_set))
--- 1600,1604 ----
  	function add_lang($lang_set, $use_db = false, $use_help = false)
  	{
! 		global $lang, $phpEx;
  
  		if (is_array($lang_set))