[Phpgroupware-cvs] property/inc class.menu.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/27 08:04:07

Modified files:
        inc            : class.menu.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30

Patches:
Index: class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.menu.inc.php  14 Oct 2006 13:49:30 -0000      1.29
+++ class.menu.inc.php  27 Oct 2006 08:04:07 -0000      1.30
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.menu.inc.php,v 1.29 2006/10/14 13:49:30 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.30 2006/10/27 08:04:07 sigurdne 
Exp $
        */
 
        /**
@@ -42,6 +42,8 @@
                                $this->acl                      = 
CreateObject('phpgwapi.acl');
 
                                $i=0;
+                               if ($this->acl->check('.location',1))
+                               {
                                if($sub=='location')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -50,7 +52,10 @@
                                $menu['module'][$i]['text']             = 
lang('Location');
                                $menu['module'][$i]['statustext']       = 
lang('Location');
                                $i++;
+                               }
 
+                               if ($this->acl->check('.ticket',1))
+                               {
                                if($sub=='ticket')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -59,6 +64,10 @@
                                $menu['module'][$i]['text']                     
=       lang('Helpdesk');
                                $menu['module'][$i]['statustext']       =       
lang('Helpdesk');
                                $i++;
+                               }
+
+                               if ($this->acl->check('.project',1))
+                               {
                                if($sub=='project')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -67,6 +76,10 @@
                                $menu['module'][$i]['text']                     
=       lang('Project');
                                $menu['module'][$i]['statustext']       =       
lang('Project');
                                $i++;
+                               }
+
+                               if ($this->acl->check('.invoice',1))
+                               {
                                if($sub=='invoice')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -74,8 +87,11 @@
                                $menu['module'][$i]['url']                      
=       $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$currentapp.'.uiinvoice.index'));
                                $menu['module'][$i]['text']                     
=       lang('Invoice');
                                $menu['module'][$i]['statustext']       =       
lang('Invoice');
-
                                $i++;
+                               }
+
+                               if ($this->acl->check('.budget',1))
+                               {
                                if($sub=='budget')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -83,8 +99,11 @@
                                $menu['module'][$i]['url']                      
=       $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$currentapp.'.uibudget.index'));
                                $menu['module'][$i]['text']                     
=       lang('budget');
                                $menu['module'][$i]['statustext']       =       
lang('budget');
-//--------------------
                                $i++;
+                               }
+//--------------------
+                               if ($this->acl->check('.agreement',1))
+                               {
                                if($sub=='agreement')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -92,8 +111,12 @@
                                $menu['module'][$i]['url']                      
=       $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$currentapp.'.uiagreement.index'));
                                $menu['module'][$i]['text']                     
=       lang('Agreement');
                                $menu['module'][$i]['statustext']       =       
lang('Agreement');
-//----------------------
                                $i++;
+                               }
+//----------------------
+
+                               if ($this->acl->check('.document',1))
+                               {
                                if($sub=='document')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -102,6 +125,10 @@
                                $menu['module'][$i]['text']                     
=       lang('Documentation');
                                $menu['module'][$i]['statustext']       =       
lang('Documentation');
                                $i++;
+                               }
+
+                               if ($this->acl->check('.custom',1))
+                               {
                                if($sub=='custom')
                                {
                                        $menu['module'][$i]['this']=True;
@@ -109,6 +136,7 @@
                                $menu['module'][$i]['url']                      
=       $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$currentapp.'.uicustom.index'));
                                $menu['module'][$i]['text']                     
=       lang('Custom');
                                $menu['module'][$i]['statustext']       =       
lang('Custom queries');
+                               }
 
                                $entity                 = 
CreateObject($this->currentapp.'.soadmin_entity');
                                $entity_list    = 
$entity->read(array('allrows'=>True));
@@ -117,6 +145,8 @@
                                {
                                        foreach($entity_list as $entry)
                                        {
+                                               if 
($this->acl->check('.entity.' . $entry['id'],1))
+                                               {
                                                $i++;
                                                if($sub=='entity_' . 
$entry['id'])
                                                {
@@ -127,10 +157,13 @@
                                                
$menu['module'][$i]['statustext']       =       $entry['descr'];
                                        }
                                }
+                               }
 
                                unset($entity);
 
                                $i = 0;
+                               if ($this->acl->check('.location',1))
+                               {
                                if ($sub == 'location')
                                {
                                        $menu['menu_title_2']=lang('Location');
@@ -179,6 +212,7 @@
                                        $menu['sub_menu'][$i]['statustext']     
        =       lang('Summary');
                                        $i++;
                                }
+                               }
 
                                if ($sub == 'invoice')
                                {