[Xoops-cvs2] xoops-current/html header.php,1.8,1.9

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv1432

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** header.php	19 Sep 2002 16:41:43 -0000	1.8
--- header.php	21 Sep 2002 07:20:16 -0000	1.9
***************
*** 24,36 ****
  		die('Theme '.$xoopsConfig['default_theme'].' was not found on your server.');
  	}
! 	if ( file_exists(XOOPS_ROOT_PATH."/themes/".$xoopsConfig['default_theme']."/language/lang-".$xoopsConfig['language'].".php") ) {
! 		include(XOOPS_ROOT_PATH."/themes/".$xoopsConfig['default_theme']."/language/lang-".$xoopsConfig['language'].".php");
! 	} elseif ( file_exists(XOOPS_ROOT_PATH."/themes/".$xoopsConfig['default_theme']."/language/lang-english.php") ) {
! 		include(XOOPS_ROOT_PATH."/themes/".$xoopsConfig['default_theme']."/language/lang-english.php");
  	}
! 	if ( !file_exists(XOOPS_ROOT_PATH."/themes/".$xoopsConfig['default_theme']."/layout.html") ) {
  		// the old way..
  		xoops_header(false);
! 		include(XOOPS_ROOT_PATH."/themes/".$xoopsConfig['default_theme']."/theme.php");
  		$xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
  		themeheader($xoopsOption['show_rblock']);
--- 24,36 ----
  		die('Theme '.$xoopsConfig['default_theme'].' was not found on your server.');
  	}
! 	if (file_exists(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/language/lang-'.$xoopsConfig['language'].'.php')') {
! 		include(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/language/lang-'.$xoopsConfig['language'].'.php');
! 	} elseif (file_exists(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/language/lang-english.php')) {
! 		include(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/language/lang-english.php');
  	}
! 	if (!file_exists(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/layout.html')) {
  		// the old way..
  		xoops_header(false);
! 		include(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/theme.php');
  		$xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
  		themeheader($xoopsOption['show_rblock']);
***************
*** 38,42 ****
  		if (!empty($xoopsOption['use_smarty'])) {
  			echo "This page requires Smarty enabled theme";
! 			include("footer.php");
  			exit();
  		}
--- 38,42 ----
  		if (!empty($xoopsOption['use_smarty'])) {
  			echo "This page requires Smarty enabled theme";
! 			include('footer.php');
  			exit();
  		}
***************
*** 55,59 ****
--- 55,61 ----
  		if ( $theme_css != '' ) {
  			$xoopsTpl->assign("xoops_themecss", $theme_css);
+ 			//$xoopsTpl->assign("xoops_themecss", '<!-- @import url('.$theme_css.'); -->');
  		}
+ 		unset($theme_css);
  		$xoopsTpl->assign('xoops_theme', $xoopsConfig['default_theme']);
  		// assign theme specific language variables if any
***************
*** 68,72 ****
  			$xoopsTpl->assign('xoops_banner', getBanner());
  		} else {
! 			$xoopsTpl->assign('xoops_banner', "");
  		}
  		// get all blocks and assign to smarty
--- 70,74 ----
  			$xoopsTpl->assign('xoops_banner', getBanner());
  		} else {
! 			$xoopsTpl->assign('xoops_banner', '&nbsp;');
  		}
  		// get all blocks and assign to smarty
***************
*** 129,132 ****
--- 131,137 ----
  			switch ($arr[$i]->getVar('side')) {
  			case XOOPS_SIDEBLOCK_LEFT:
+ 				if (!isset($show_lblock)) {
+ 					$show_lblock = 1;
+ 				}
  				$xoopsTpl->append_by_ref('xoops_lblocks', $fetched);
  				break;
***************
*** 163,172 ****
  			unset($fetched);
  		}
  		if (!isset($show_rblock)) {
! 			$xoopsTpl->assign('xoops_showrblock', 0);
  		}
  		if (!isset($show_cblock)) {
! 			$xoopsTpl->assign('xoops_showcblock', 0);
  		}
  		// set some header variables
  		$xoopsTpl->assign('xoops_charset', _CHARSET);
--- 168,193 ----
  			unset($fetched);
  		}
+ 		$xoopsCSS = array('lblock' => '', 'cblock' => '', 'rblock' => '');
+ 		if (!isset($show_lblock)) {
+ 			$xoopsCSS['lblock'] = 'display: none;';
+ 		}
  		if (!isset($show_rblock)) {
! 			$xoopsCSS['rblock'] = 'display: none;';
  		}
  		if (!isset($show_cblock)) {
! 			$xoopsCSS['cblock'] = 'display: none;';
  		}
+ 		ob_start();
+ 		include(XOOPS_ROOT_PATH.'/include/xoopscss.php');
+     		$contents = ob_get_contents();
+     		ob_end_clean();
+ 		$xoopsTpl->assign('xoops_css', $contents);
+ 		unset($xoopsCSS);
+ 		unset($contents);
+ 		ob_start();
+ 		include(XOOPS_ROOT_PATH.'/include/xoopsjs.php');
+     		$contents = ob_get_contents();
+     		ob_end_clean();
+ 		$xoopsTpl->assign('xoops_js', $contents);
  		// set some header variables
  		$xoopsTpl->assign('xoops_charset', _CHARSET);