[Phpgroupware-cvs] CVS: sitemgr/inc class.module.inc.php,1.3,1.4

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv12116/inc

Modified Files:
        class.module.inc.php 
Log Message:
improve the module's link function so that it also correctly links to toc and 
index


Index: class.module.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.module.inc.php        19 Jan 2003 03:18:28 -0000      1.3
--- class.module.inc.php        31 Jan 2003 18:18:04 -0000      1.4
***************
*** 88,92 ****
        }
  
!       function link($modulevars)
        {
                while (list($key,$value) = @each($modulevars))
--- 88,92 ----
        }
  
!       function link($modulevars=array())
        {
                while (list($key,$value) = @each($modulevars))
***************
*** 94,98 ****
                        $extravars[$this->block->module_name.'['.$key.']'] = 
$value;
                }
!               $extravars['page_id'] = $this->block->page_id;
                return sitemgr_link($extravars);
        }
--- 94,113 ----
                        $extravars[$this->block->module_name.'['.$key.']'] = 
$value;
                }
!               if ($GLOBALS['page']->id)
!               {
!                       $extravars['page_id'] = $GLOBALS['page']->id;
!               }
!               elseif ($GLOBALS['page']->cat_id)
!               {
!                       $extravars['category_id'] = $GLOBALS['page']->cat_id;
!               }
!               elseif ($GLOBALS['page']->toc)
!               {
!                       $extravars['toc'] = 1;
!               }
!               elseif ($GLOBALS['page']->index)
!               {
!                       $extravars['index'] = 1;
!               }
                return sitemgr_link($extravars);
        }