[mxbb-commits] core/includes mx_functions_style.php, 1.91, 1.92 page_header.php, 1.59, 1.60

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

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

Modified Files:
	mx_functions_style.php page_header.php 
Log Message:
some modifications

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** page_header.php	29 Aug 2008 00:32:33 -0000	1.59
--- page_header.php	6 Sep 2008 02:53:20 -0000	1.60
***************
*** 304,307 ****
--- 304,308 ----
  
  	'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'],
+ 	'T_STYLESHEET_LINK'		=> (!$mx_user->theme['theme_storedb']) ? "{$phpbb_root_path}styles/" . $mx_user->theme['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&id=" . $mx_user->theme['style_id'] . '&lang=' . $mx_user->encode_lang($board_config['default_lang']),	
  	'T_MXBB_STYLESHEET' => $theme['head_stylesheet'],
  	'T_GECKO_STYLESHEET' => 'gecko.css',

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** mx_functions_style.php	1 Sep 2008 02:14:16 -0000	1.91
--- mx_functions_style.php	6 Sep 2008 02:53:19 -0000	1.92
***************
*** 241,246 ****
  					{
  						//Do not include phpBB3 overall header and footer files.
! 						$temppath = str_replace('overall_header', 'index', $temppath);
! 						$temppath = str_replace('overall_footer', 'index', $temppath);				
  					}					
  					
--- 241,246 ----
  					{
  						//Do not include phpBB3 overall header and footer files.
! 						$temppath = str_replace('overall_header', 'overall_header_plugin', $temppath);
! 						$temppath = str_replace('overall_footer', 'overall_footer_plugin', $temppath);				
  					}					
  					
***************
*** 383,388 ****
  			if (strpos($this->files[$handle],'overall_header.'))
  			{
! 				$filename3 = 'overall_header_plugin.html';
! 				$filename2 = 'index.htm';
  				$this->debug_paths .= '<br>Module';
  				$fileSearch = array();
--- 383,389 ----
  			if (strpos($this->files[$handle],'overall_header.'))
  			{
! 				//$this->files[$handle] = str_replace('overall_header', 'overall_header_plugin', $this->files[$handle]);
! 				$filename2 = 'overall_header_plugin.html';
! 				$filename3 = 'index.htm';
  				$this->debug_paths .= '<br>Module';
  				$fileSearch = array();
***************
*** 392,401 ****
  				$fileSearch[] = './'; // Compatibility with primitive modules
  
! 				$this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path);												
  			}
  			
  			if (strpos($this->files[$handle],'overall_footer.'))
! 			{			
! 				$this->files[$handle] = $module_root_path . "templates/index.htm"; //Temp fix													
  			}
  		}
--- 393,411 ----
  				$fileSearch[] = './'; // Compatibility with primitive modules
  
! 				$this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path);	
  			}
  			
  			if (strpos($this->files[$handle],'overall_footer.'))
! 			{
! 				$filename2 = 'overall_footer_plugin.html';
! 				$filename3 = 'index.htm';
! 				$this->debug_paths .= '<br>Module';
! 				$fileSearch = array();
! 				$fileSearch[] = $style_path; // First check current template
! 				$fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template
! 				$fileSearch[] = $moduleDefault; // Finally check Default template
! 				$fileSearch[] = './'; // Compatibility with primitive modules
! 
! 				$this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path);												
  			}
  		}