[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.blocks_bo.inc.php
From: |
Michael Totschnig <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.blocks_bo.inc.php,1.2,1.3 |
Date: |
Thu, 05 Dec 2002 23:56:02 -0500 |
Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc
In directory subversions:/tmp/cvs-serv29901/sitemgr-site/inc
Modified Files:
class.blocks_bo.inc.php
Log Message:
blockmanager replaces blockconfig.inc.php
Index: class.blocks_bo.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.blocks_bo.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.blocks_bo.inc.php 5 Dec 2002 22:15:00 -0000 1.2
--- class.blocks_bo.inc.php 6 Dec 2002 04:56:00 -0000 1.3
***************
*** 18,25 ****
function blocks_bo()
{
! global $blocks;
!
require_once($GLOBALS['sitemgr_info']['sitemgr-site_path'] .
'/blockconfig.inc.php');
! $this->b = $blocks;
$this->bo = new bo;
}
--- 18,27 ----
function blocks_bo()
{
! // global $blocks;
! //
require_once($GLOBALS['sitemgr_info']['sitemgr-site_path'] .
'/blockconfig.inc.php');
! // $this->b = $blocks;
$this->bo = new bo;
+ $this->so = CreateObject('sitemgr.Blocks_SO');
+ $this->b = $this->so->getactiveblocks();
}
***************
*** 42,46 ****
function get_blocktitle($block)
{
! return $block['title'];
}
--- 44,48 ----
function get_blocktitle($block)
{
! return lang($block['title']);
}
***************
*** 48,54 ****
{
$content='';
! if (file_exists('blocks/'.$block['blockfile']) &&
trim($block['blockfile']))
{
! include('blocks/'.$block['blockfile']);
if (!$content)
{
--- 50,56 ----
{
$content='';
! if (file_exists('blocks/'.$block['filename']) &&
trim($block['filename']))
{
! include('blocks/'.$block['filename']);
if (!$content)
{
***************
*** 74,78 ****
foreach($this->b as $block)
{
! if($block['position']==$side)
{
if ($this->block_allowed($block))
--- 76,80 ----
foreach($this->b as $block)
{
! if($block['side']==$side)
{
if ($this->block_allowed($block))
***************
*** 92,96 ****
foreach($this->b as $block)
{
! if ($block['blockfile'] ==
'block-'.$block_name.'.php')
{
return $block;
--- 94,98 ----
foreach($this->b as $block)
{
! if ($block['filename'] ==
'block-'.$block_name.'.php')
{
return $block;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.blocks_bo.inc.php,1.2,1.3,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: sitemgr/setup setup.inc.php,1.8,1.9 tables_current.inc.php,1.6,1.7 tables_update.inc.php,1.5,1.6
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/blocks block-Amazon.php,1.1.1.1,1.2 block-Choose_lang.php,1.2,1.3 block-Current_Section.php,1.3,1.4 block-GoogleSearch.php,1.2,1.3 block-Login.php,1.2,1.3 block-Msn.php,1.1.1.1,1.2 block-Sample_Block.php,1.1.1.1,1.2 block-SiteIndex.php,1.3,1.4 block-Table_of_Contents.php,1.3,1.4 block-Total_Hits.php,1.1.1.1,1.2 block-Who_is_Online.php,1.1.1.1,1.2 block-phpgwCalendar.php,1.3,1.4 block-ystock.php,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: sitemgr/setup setup.inc.php,1.8,1.9 tables_current.inc.php,1.6,1.7 tables_update.inc.php,1.5,1.6
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/blocks block-Amazon.php,1.1.1.1,1.2 block-Choose_lang.php,1.2,1.3 block-Current_Section.php,1.3,1.4 block-GoogleSearch.php,1.2,1.3 block-Login.php,1.2,1.3 block-Msn.php,1.1.1.1,1.2 block-Sample_Block.php,1.1.1.1,1.2 block-SiteIndex.php,1.3,1.4 block-Table_of_Contents.php,1.3,1.4 block-Total_Hits.php,1.1.1.1,1.2 block-Who_is_Online.php,1.1.1.1,1.2 block-phpgwCalendar.php,1.3,1.4 block-ystock.php,1.1.1.1,1.2
- Index(es):