[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.blocks_bo.inc.php,1.2,1.3

[Michael Totschnig <address@hidden>]

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;