[mxbb-commits] core/includes mx_functions_core.php, 1.119, 1.120 page_header.php, 1.70, 1.71

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

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23497/core/includes

Modified Files:
	mx_functions_core.php page_header.php 
Log Message:
some fixed here and there not comitted

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** page_header.php	10 Jan 2009 23:24:14 -0000	1.70
--- page_header.php	23 Oct 2009 07:46:36 -0000	1.71
***************
*** 444,447 ****
--- 444,449 ----
  $meta_str .= '<meta name="author"      content="' . $author    .'" />' . "\n";
  $meta_str .= '<meta name="copyright"   content="' . $copyright .'" />' . "\n";
+ $meta_str .= '<meta name="imagetoolbar"   content="' . $imagetoolbar .'" />' . "\n";
+ $meta_str .= '<meta name="distribution"   content="' . $distribution .'" />' . "\n";
  $meta_str .= '<meta name="keywords"    content="' . $keywords  .'" />' . "\n";
  $meta_str .= '<meta name="description" lang="' . $langcode .'" content="'. $description .'" />' . "\n";

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** mx_functions_core.php	18 Oct 2009 04:15:18 -0000	1.119
--- mx_functions_core.php	23 Oct 2009 07:46:35 -0000	1.120
***************
*** 3101,3105 ****
  	{
  		global $userdata, $mx_root_path, $mx_request_vars, $portal_config, $theme, $lang;
! 		global $mx_block;
  
  		$this->info = $this->page_config[$this->page_id]['page_info'];
--- 3101,3105 ----
  	{
  		global $userdata, $mx_root_path, $mx_request_vars, $portal_config, $theme, $lang;
! 		global $mx_block, $tplEx, $_GET;
  
  		$this->info = $this->page_config[$this->page_id]['page_info'];
***************
*** 3119,3124 ****
  		$this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] );
  		$this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? 1 : 0 ) : ( $this->info['override_user_style'] == 1 ? 1 : 0 );
! 
! 		$this->page_ov_header = !empty($this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header'];
  		$this->page_ov_footer = !empty($this->info['page_footer']) ? $this->info['page_footer'] : $portal_config['overall_footer'];
  		$this->page_main_layout = !empty($this->info['page_main_layout']) ? $this->info['page_main_layout'] : $portal_config['main_layout'];
--- 3119,3133 ----
  		$this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] );
  		$this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? 1 : 0 ) : ( $this->info['override_user_style'] == 1 ? 1 : 0 );
! 		//
! 		// Setup demo style
! 		//
! 		if (isset($_GET['strip']) && ($_GET['strip'] == true))
! 		{
! 			$this->page_ov_header = 'overall_header_print.'.$tplEx;
! 		}
! 		else		
! 		{
! 			$this->page_ov_header = !empty($this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header'];
! 		}
  		$this->page_ov_footer = !empty($this->info['page_footer']) ? $this->info['page_footer'] : $portal_config['overall_footer'];
  		$this->page_main_layout = !empty($this->info['page_main_layout']) ? $this->info['page_main_layout'] : $portal_config['main_layout'];