[mxbb-commits] core/includes mx_functions_core.php, 1.82, 1.83 mx_functions_phpbb.php, 1.49, 1.50 mx_functions_style.php, 1.52, 1.53

[Jon O. <jon...@us...>]

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

Modified Files:
	mx_functions_core.php mx_functions_phpbb.php 
	mx_functions_style.php 
Log Message:
Custom module default style update for panel parameters
blockCP stays in current page

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** mx_functions_core.php	22 Feb 2008 23:02:49 -0000	1.82
--- mx_functions_core.php	23 Feb 2008 19:36:11 -0000	1.83
***************
*** 2123,2127 ****
  					ob_start();
  					$this->is_panel = false;
! 					$template = new mx_Template($mx_root_path . $this->module_root_path . 'templates/' . $theme['template_name']);
  
  					switch ( $parameter_data['parameter_type'] )
--- 2123,2127 ----
  					ob_start();
  					$this->is_panel = false;
! 					$template = new mx_Template($mx_root_path . $this->module_root_path);
  
  					switch ( $parameter_data['parameter_type'] )
***************
*** 2166,2170 ****
--- 2166,2172 ----
  							break;
  						default:
+ 							$module_root_path = $mx_root_path . $this->module_root_path;
  							$this->is_panel = $this->_get_custom_module_parameters($parameter_data, $block_id);
+ 							$module_root_path = '';
  						break;
  					}

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** mx_functions_style.php	17 Feb 2008 22:10:24 -0000	1.52
--- mx_functions_style.php	23 Feb 2008 19:36:12 -0000	1.53
***************
*** 300,304 ****
  		{
  			//
! 			// Then check Cloned template
  			//
  			$filename = $mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename;
--- 300,304 ----
  		{
  			//
! 			// Then check Default template
  			//
  			$filename = $mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename;
***************
*** 1590,1593 ****
--- 1590,1595 ----
  	function extend($lang_mode = MX_LANG_MAIN, $image_mode = MX_IMAGES)
  	{
+ 		global $mx_block;
+ 
  		if (defined('IN_ADMIN'))
  		{
***************
*** 1595,1598 ****
--- 1597,1607 ----
  		}
  
+ 		if (!empty($this->loaded_default_styles[$mx_block->module_root_path]))
+ 		{
+ 			$this->default_module_style = $this->loaded_default_styles[$mx_block->module_root_path];
+ 			$this->default_template_name = $this->default_module_style;
+ 			$this->default_current_template_path = 'templates/' . $this->default_template_name;
+ 		}
+ 
  		if ($lang_mode != MX_LANG_NONE)
  		{
***************
*** 1610,1614 ****
  		if (!empty($this->default_module_style))
  		{
! 			$this->default_template_name = '_core';
  			$this->default_current_template_path = 'templates/' . $this->default_template_name;
  			$this->default_module_style = '';
--- 1619,1623 ----
  		if (!empty($this->default_module_style))
  		{
! 			$this->default_template_name = 'subSilver';
  			$this->default_current_template_path = 'templates/' . $this->default_template_name;
  			$this->default_module_style = '';
***************
*** 1620,1634 ****
  		global $mx_block;
  
! 		if (!empty($default_module_style))
! 		{
! 			$this->default_module_style = $default_module_style;
! 			$this->default_template_name = $this->default_module_style;
! 			$this->default_current_template_path = 'templates/' . $this->default_template_name;
! 		}
! 
! 		if (!defined('IN_ADMIN'))
! 		{
! 			$this->loaded_default_styles[$mx_block->module_root_path] = $this->default_module_style;
! 		}
  	}
  }	// class mx_user
--- 1629,1633 ----
  		global $mx_block;
  
! 			$this->loaded_default_styles[$mx_block->module_root_path] = $default_module_style;
  	}
  }	// class mx_user

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** mx_functions_phpbb.php	23 Feb 2008 15:52:46 -0000	1.49
--- mx_functions_phpbb.php	23 Feb 2008 19:36:12 -0000	1.50
***************
*** 439,443 ****
  	}
  
! 	if ( empty($page_id) )
  	{
  		$page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
--- 439,447 ----
  	}
  
! 	if ( empty($page_id) && $mx_request_vars->is_request('portalpage') )
! 	{
! 		$page_id = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1);
! 	}
! 	else if ( empty($page_id) )
  	{
  		$page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);