[Phpgroupware-cvs] sitemgr/sitemgr-site/inc class.sitebo.inc.php [skwashd-16-compat]

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    sitemgr
Branch:         skwashd-16-compat
Changes by:     Dave Hall <address@hidden>      06/05/15 11:08:37

Modified files:
        sitemgr-site/inc: class.sitebo.inc.php 

Log message:
        add current cat hack, add def_page info for cats - all new nav related

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sitemgr/sitemgr-site/inc/class.sitebo.inc.php.diff?only_with_tag=skwashd-16-compat&tr1=1.1.2.3.4.1&tr2=1.1.2.3.4.2&r1=text&r2=text

Patches:
Index: sitemgr/sitemgr-site/inc/class.sitebo.inc.php
diff -u sitemgr/sitemgr-site/inc/class.sitebo.inc.php:1.1.2.3.4.1 
sitemgr/sitemgr-site/inc/class.sitebo.inc.php:1.1.2.3.4.2
--- sitemgr/sitemgr-site/inc/class.sitebo.inc.php:1.1.2.3.4.1   Mon Mar 27 
13:13:24 2006
+++ sitemgr/sitemgr-site/inc/class.sitebo.inc.php       Mon May 15 11:08:37 2006
@@ -8,13 +8,14 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your  *
        * option) any later version.                                            
  *
        
\*************************************************************************/
-       /* $Id: class.sitebo.inc.php,v 1.1.2.3.4.1 2006/03/27 13:13:24 skwashd 
Exp $ */
+       /* $Id: class.sitebo.inc.php,v 1.1.2.3.4.2 2006/05/15 11:08:37 skwashd 
Exp $ */
 
        class sitebo
        {
                var $pages_bo;
                var $catbo;
                var $acl;
+               var $cur_cat = 0;
 
                function sitebo()
                {
@@ -70,7 +71,7 @@
 
                function get_themesel()
                {
-                       $theme = $sitemgr_info['themesel'];
+                       $theme = $GLOBALS['sitemgr_info']['themesel'];
                        
                        if ( isset($_GET['page_name']) && $_GET['page_name'] )
                        {
@@ -78,6 +79,7 @@
                                if ( isset($page->cat_id) && $page->cat_id )
                                {
                                        $cat = 
$GLOBALS['Common_BO']->cats->getCategory($page->cat_id);
+                                       $this->cur_cat = $cat->id;
                                        if ( isset($cat->cat_tpl) && 
$cat->cat_tpl )
                                        {
                                                return $cat->cat_tpl;
@@ -87,6 +89,7 @@
                        elseif ( isset($_GET['category_id']) && 
$_GET['category_id'] )
                        {       
                                $cat = 
$GLOBALS['Common_BO']->cats->getCategory($_GET['category_id']);
+                               $this->cur_cat = $cat->id;
                                if ( isset($cat->cat_tpl) && $cat->cat_tpl )
                                {
                                        return $cat->cat_tpl;
@@ -98,6 +101,7 @@
                                if ( isset($page->cat_id) && $page->cat_id )
                                {
                                        $cat = 
$GLOBALS['Common_BO']->cats->getCategory($page->cat_id);
+                                       $this->cur_cat = $cat->id;
                                        if ( isset($cat->cat_tpl) && 
$cat->cat_tpl )
                                        {
                                                return $cat->cat_tpl;
@@ -120,6 +124,7 @@
                                        if ( isset($page->cat_id) && 
$page->cat_id )
                                        {
                                                $cat = 
$GLOBALS['Common_BO']->cats->getCategory($page->cat_id);
+                                               $this->cur_cat = $cat->id;
                                                if ( isset($cat->cat_tpl) && 
$cat->cat_tpl )
                                                {
                                                        return $cat->cat_tpl;
@@ -237,11 +242,13 @@
                        foreach($cat_list as $cat_id)
                        {
                                $category = $this->getcatwrapper($cat_id);
-                               $catlinks[$cat_id] = array(
-                                       'name'=>$category->name,
-                                       'link'=>'<a 
href="'.sitemgr_link('category_id='.$cat_id).'">'.$category->name.'</a>',
-                                       'description'=>$category->description,
-                                       'depth'=>$category->depth
+                               $catlinks[$cat_id] = array
+                               (
+                                       'name'          => $category->name,
+                                       'link'          => '<a 
href="'.sitemgr_link('category_id='.$cat_id).'">'.$category->name.'</a>',
+                                       'description'   => 
$category->description,
+                                       'depth'         => $category->depth,
+                                       'def_page'      => $category->def_page
                                );
                        }
                        return $catlinks;