Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv32679
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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** header.php 18 Sep 2002 20:02:00 -0000 1.7
--- header.php 19 Sep 2002 16:41:43 -0000 1.8
***************
*** 70,76 ****
$xoopsTpl->assign('xoops_banner', "");
}
- // 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();
--- 70,73 ----
***************
*** 78,81 ****
--- 75,81 ----
if ( $xoopsUser ) {
if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
+ // set page title
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsTpl->assign('xoops_pagetitle', $myts->oopsHtmlSpecialChars($xoopsModule->name()));
if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == $xoopsModule->dirname()) {
$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $xoopsModule->mid(), true, XOOPS_BLOCK_VISIBLE);
***************
*** 92,95 ****
--- 92,98 ----
} else {
if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
+ // set page title
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsTpl->assign('xoops_pagetitle', $myts->oopsHtmlSpecialChars($xoopsModule->name()));
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);
***************
*** 159,162 ****
--- 162,171 ----
$xoopsTpl->assign_by_ref($arr[$i]->getVar('balias'), $fetched);
unset($fetched);
+ }
+ if (!isset($show_rblock)) {
+ $xoopsTpl->assign('xoops_showrblock', 0);
+ }
+ if (!isset($show_cblock)) {
+ $xoopsTpl->assign('xoops_showcblock', 0);
}
// set some header variables
Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/footer.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** footer.php 18 Sep 2002 23:37:32 -0000 1.7
--- footer.php 19 Sep 2002 16:41:44 -0000 1.8
***************
*** 19,25 ****
// check if the current page is a module page
if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
- // set page title
- $myts =& MyTextSanitizer::getInstance();
- $xoopsTpl->assign('xoops_pagetitle', $myts->oopsHtmlSpecialChars($xoopsModule->name()));
// set module specific template directory
if ( !is_dir(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/'.$xoopsConfig['default_theme'].'/') ) {
--- 19,22 ----
|
