Update of /cvsroot/xoops/xoops-current/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv4641
Modified Files:
functions.php
Log Message:
no message
Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** functions.php 3 Sep 2002 06:45:39 -0000 1.11
--- functions.php 6 Sep 2002 02:36:50 -0000 1.12
***************
*** 418,422 ****
global $xoopsUser;
$xoopsblock = new XoopsBlock();
- $arr = array();
if ( $side == "left" ) {
$side = XOOPS_SIDEBLOCK_LEFT;
--- 418,421 ----
***************
*** 427,438 ****
}
if ( $xoopsUser ) {
! $arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
} else {
! $arr = $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
}
! foreach ( $arr as $myblock ) {
$block = array();
! $block = $myblock->buildBlock();
! if($block){
if ( $side == XOOPS_SIDEBLOCK_LEFT ) {
themesidebox($block['title'],$block['content']);
--- 426,438 ----
}
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 = array();
! $block =& $arr[$i]->buildBlock();
! if ($block) {
if ( $side == XOOPS_SIDEBLOCK_LEFT ) {
themesidebox($block['title'],$block['content']);
***************
*** 443,447 ****
}
}
- unset($myblock);
unset($block);
}
--- 443,446 ----
***************
*** 457,470 ****
$arr = array();
if ( $xoopsUser ) {
! $arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
} else {
! $arr = $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
}
! if ( count($arr) > 0 ){
! foreach ( $arr as $myblock ) {
! $block = array();
! $block = $myblock->buildBlock();
if ( $block ) {
! if ( XOOPS_CENTERBLOCK_CENTER == $myblock->getVar("side") ) {
if ( $block['title'] != "" ) {
$cc_block .= "<tr valign='top'><td colspan='2'><b>".$block['title']."</b><br />".$block['content']."<br /><br /></td></tr>\n";
--- 456,469 ----
$arr = array();
if ( $xoopsUser ) {
! $arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
} else {
! $arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
}
! $block_count = count($arr);
! if ($block_count > 0) {
! for ($i = 0; $i < $block_count; $i++) {
! $block =& $arr[$i]->buildBlock();
if ( $block ) {
! if ( XOOPS_CENTERBLOCK_CENTER == $arr[$i]->getVar("side") ) {
if ( $block['title'] != "" ) {
$cc_block .= "<tr valign='top'><td colspan='2'><b>".$block['title']."</b><br />".$block['content']."<br /><br /></td></tr>\n";
***************
*** 472,476 ****
$cc_block .= "<tr><td colspan='2'>".$block['content']."<br /><br /></td></tr>\n";
}
! } elseif ( XOOPS_CENTERBLOCK_LEFT == $myblock->getVar("side") ) {
if ( $block['title'] != "" ) {
$cl_block .= "<p><b>".$block['title']."</b><br />".$block['content']."</p>\n";
--- 471,475 ----
$cc_block .= "<tr><td colspan='2'>".$block['content']."<br /><br /></td></tr>\n";
}
! } elseif ( XOOPS_CENTERBLOCK_LEFT == $arr[$i]->getVar("side") ) {
if ( $block['title'] != "" ) {
$cl_block .= "<p><b>".$block['title']."</b><br />".$block['content']."</p>\n";
***************
*** 486,490 ****
}
}
- unset($myblock);
unset($block);
}
--- 485,488 ----
|
