Thread: [Xoops-cvs2] xoops-current/html header.php,1.5,1.6 footer.php,1.5,1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	header.php footer.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** header.php	6 Sep 2002 03:20:02 -0000	1.5
--- header.php	18 Sep 2002 12:38:10 -0000	1.6
***************
*** 18,22 ****
  //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
  // ------------------------------------------------------------------------- //
! //ss_timing_start();
  if ( !defined("XOOPS_HEADER_INCLUDED") ) {
  	define("XOOPS_HEADER_INCLUDED",1);
--- 18,22 ----
  //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
  // ------------------------------------------------------------------------- //
! 
  if ( !defined("XOOPS_HEADER_INCLUDED") ) {
  	define("XOOPS_HEADER_INCLUDED",1);
***************
*** 43,53 ****
  	} else {
  		// include Smarty template engine and initialize it
! 		require_once(SMARTY_DIR."Smarty.class.php");
! 		$xoopsTpl = new Smarty();
! 		//$xoopsTpl->caching = 2;
! 		//$xoopsTpl->debugging = true;
! 		//$xoopsTpl->cache_dir = XOOPS_ROOT_PATH.'/cache';
! 		$xoopsTpl->compile_dir = XOOPS_ROOT_PATH.'/templates_c';
! 		$xoopsTpl->template_dir = XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'];
  		$theme_css = getcss($xoopsConfig['default_theme']);
  		if ( $theme_css != '' ) {
--- 43,55 ----
  	} else {
  		// include Smarty template engine and initialize it
! 		require_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
! 		$xoopsTpl = new XoopsTpl();
! 		$xoopsTpl->setCaching(2);
! 		if ($xoopsConfig['debug']) {
! 			$xoopsTpl->setDebugging(true);
! 		}
! 		$xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
! 		$xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
! 		$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
  		$theme_css = getcss($xoopsConfig['default_theme']);
  		if ( $theme_css != '' ) {
***************
*** 69,98 ****
  		}
  		// display right blocks?
! 		$xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
! 		$xoopsTpl->assign('xoops_showrblock', $xoopsOption['show_rblock']);
  		// get all blocks and assign to smarty
  		$xoopsblock = new XoopsBlock();
  		$arr = array();
- 		if ( $xoopsOption['show_rblock'] == 1 ) {
- 			$side = XOOPS_SIDEBLOCK_BOTH;
- 		} else {
- 			$side = XOOPS_SIDEBLOCK_LEFT;
- 		}
  		if ( $xoopsUser ) {
! 			$arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
  		}
  		$block_count = count($arr);
  		for ($i = 0; $i < $block_count; $i++) {
! 			$block =& $arr[$i]->buildBlock();
! 			if ( $block ) {
! 				if ( XOOPS_SIDEBLOCK_LEFT == $arr[$i]->getVar('side') ) {
! 					$xoopsTpl->append('xoops_lblocks', array('title' => $block['title'], 'content' => $block['content']));
  				} else {
! 					$xoopsTpl->append('xoops_rblocks', array('title' => $block['title'], 'content' => $block['content']));
  				}
  			}
! 			unset($block);
  		}
  		// set some header variables
--- 71,162 ----
  		}
  		// display right blocks?
! 		//$xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
! 		//$xoopsTpl->assign('xoops_showrblock', $xoopsOption['show_rblock']);
  		// get all blocks and assign to smarty
  		$xoopsblock = new XoopsBlock();
  		$arr = array();
  		if ( $xoopsUser ) {
! 			if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == $xoopsModule->dirname()) {
! 					$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $xoopsModule->mid(), true, XOOPS_BLOCK_VISIBLE);
! 				} else {
! 					$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $xoopsModule->mid(), false, XOOPS_BLOCK_VISIBLE);
! 				}
! 			} else {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == 'none') {
! 					$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), 0, true, XOOPS_BLOCK_VISIBLE);
! 				} else {
! 					$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), 0, false, XOOPS_BLOCK_VISIBLE);
! 				}
! 			}
  		} else {
! 			if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == $xoopsModule->dirname()) {
! 					$arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), $xoopsModule->mid(), true, XOOPS_BLOCK_VISIBLE);
! 				} else {
! 					$arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), $xoopsModule->mid(), false, XOOPS_BLOCK_VISIBLE);
! 				}
! 			} else {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == 'none') {
! 					$arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), 0, true, XOOPS_BLOCK_VISIBLE);
! 				} else {
! 					$arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), 0, false, XOOPS_BLOCK_VISIBLE);
! 				}
! 			}
  		}
  		$block_count = count($arr);
  		for ($i = 0; $i < $block_count; $i++) {
! 			$btemplate = $arr[$i]->getVar('btemplate');
! 			$btemplate = ($btemplate == '') ? 'block1.html' : $btemplate;
! 			$bcachetime = intval($arr[$i]->getVar('bcachetime'));
! 			if (!$xoopsTpl->is_cached('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $arr[$i]->getVar('bid'))) {
! 				$xoopsLogger->addBlock($arr[$i]->getVar('name'));
! 				$block =& $arr[$i]->buildBlock();
! 				if ($block) {
! 					$xoopsTpl->assign_by_ref('xoops_block', $block);
  				} else {
! 					continue;
  				}
+ 				unset($block);
+ 			} else {
+ 				$xoopsLogger->addBlock($arr[$i]->getVar('name'), true, $bcachetime);
  			}
! 			$xoopsTpl->cache_lifetime = $bcachetime;
! 			$fetched = $xoopsTpl->fetch('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $arr[$i]->getVar('bid'));
! 			switch ($arr[$i]->getVar('side')) {
! 			case XOOPS_SIDEBLOCK_LEFT:
! 				$xoopsTpl->append_by_ref('xoops_lblocks', $fetched);
! 				break;
! 			case XOOPS_CENTERBLOCK_LEFT:
! 				if (!isset($show_cblock)) {
! 					$xoopsTpl->assign('xoops_showcblock', 1);
! 					$show_cblock = 1;
! 				}
! 				$xoopsTpl->append_by_ref('xoops_clblocks', $fetched);
! 				break;
! 			case XOOPS_CENTERBLOCK_RIGHT:
! 				if (!isset($show_cblock)) {
! 					$xoopsTpl->assign('xoops_showcblock', 1);
! 					$show_cblock = 1;
! 				}
! 				$xoopsTpl->append_by_ref('xoops_crblocks', $fetched);
! 				break;
! 			case XOOPS_CENTERBLOCK_CENTER:
! 				if (!isset($show_cblock)) {
! 					$xoopsTpl->assign('xoops_showcblock', 1);
! 					$show_cblock = 1;
! 				}
! 				$xoopsTpl->append_by_ref('xoops_ccblocks', $fetched);
! 				break;
! 			case XOOPS_SIDEBLOCK_RIGHT:
! 				if (!isset($show_rblock)) {
! 					$xoopsTpl->assign('xoops_showrblock', 1);
! 					$show_rblock = 1;
! 				}
! 				$xoopsTpl->append_by_ref('xoops_rblocks', $fetched);
! 				break;
! 			}
! 			$xoopsTpl->assign_by_ref($arr[$i]->getVar('balias'), $fetched);
! 			unset($fetched);
  		}
  		// set some header variables

Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/footer.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** footer.php	5 Sep 2002 11:10:36 -0000	1.5
--- footer.php	18 Sep 2002 12:38:10 -0000	1.6
***************
*** 9,16 ****
  		}
  		themefooter($xoopsOption['show_rblock'], $footer);
- 		//echo "<div style='font-size: smaller;'>\n";
- 		//ss_timing_stop();
- 		//printf("Page took %s seconds to load.",ss_timing_current());
- 		//echo "</div>\n";
  		xoops_footer();
  	} else {
--- 9,12 ----
***************
*** 35,46 ****
  					}
  				}
! 				//$cache = !empty($xoopsContentsTplCache) ? intval($xoopsContentsTplCache) : 0;
! 				//$xoopsTpl->cache_lifetime = $cache;
  				$xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsContentsTpl));
  			}
  		}
  		$xoopsTpl->assign('xoops_footer', $footer);
  		header ('Content-Type:text/html; charset='._CHARSET);
! 		//$xoopsTpl->cache_lifetime = 0;
  		$xoopsTpl->display('layout.html');
  	}
--- 31,47 ----
  					}
  				}
! 				$cache = !empty($xoopsContentsTplCache) ? intval($xoopsContentsTplCache) : 0;
! 				$xoopsTpl->cache_lifetime = $cache;
  				$xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsContentsTpl));
  			}
  		}
+ 		if ($xoopsConfig['debug']) {
+ 			$xoopsLogger->stopTime();
+ 			$xoopsLogger =& XoopsLogger::getInstance();
+ 			$footer .= $xoopsLogger->dumpAll();
+ 		}
  		$xoopsTpl->assign('xoops_footer', $footer);
  		header ('Content-Type:text/html; charset='._CHARSET);
! 		$xoopsTpl->cache_lifetime = 0;
  		$xoopsTpl->display('layout.html');
  	}

Thread: [Xoops-cvs2] xoops-current/html header.php,1.5,1.6 footer.php,1.5,1.6

The world's leading content management systems (CMS) written in PHP

xoops-cvs2