[Phpgroupware-cvs] property/inc hook_sidebox_menu.inc.php class.me...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/12/28 19:11:17

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

Log message:
        bug #18601 - and added a menuitem for future IFC-integration

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36

Patches:
Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- hook_sidebox_menu.inc.php   16 Oct 2006 07:52:22 -0000      1.2
+++ hook_sidebox_menu.inc.php   28 Dec 2006 19:11:17 -0000      1.3
@@ -1,6 +1,8 @@
 <?php
        $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. 
lang('Menu');
        $menu = 
$GLOBALS['phpgw']->session->appsession('menu_property','sidebox');      
+       if(isset($menu) && is_array($menu))
+       {
        display_sidebox($appname,$menu_title,$menu['module'],$use_lang = false);
        if(isset($menu['menu_title_2']) && $menu['menu_title_2'])
        {
@@ -10,4 +12,5 @@
        {
                display_sidebox($appname,$menu['menu_title_3'] . ' ' . lang 
('sub menu'),$menu['sub_menu_2'],$use_lang = false);
        }       
+       }       
 ?>

Index: class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- class.menu.inc.php  27 Dec 2006 10:37:59 -0000      1.35
+++ class.menu.inc.php  28 Dec 2006 19:11:17 -0000      1.36
@@ -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.35 2006/12/27 10:37:59 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.36 2006/12/28 19:11:17 sigurdne 
Exp $
        */
 
        /**
@@ -44,6 +44,7 @@
 //_debug_array($page);
                        if(!isset($menu) || !$menu)
                        {
+                               $menu = '';  // set to '' as appsession dos'nt 
return empty array correctly 
                                $this->acl                      = 
CreateObject('phpgwapi.acl');
 
                                $i=0;
@@ -59,6 +60,18 @@
                                        $i++;
                                }
 
+                               if ($this->acl->check('.ifc',1))
+                               {
+                                       if($sub=='ifc')
+                                       {
+                                               
$menu['module'][$i]['this']=True;
+                                       }
+                                       $menu['module'][$i]['url']              
        =       $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$currentapp.'.uiifc.import'));
+                                       $menu['module'][$i]['text']             
        =       lang('IFC');
+                                       $menu['module'][$i]['statustext']       
=       lang('IFC');
+                                       $i++;
+                               }
+
                                if ($this->acl->check('.ticket',1))
                                {
                                        if($sub=='ticket')
@@ -582,6 +595,21 @@
                                        $i++;
                                }
 
+                               if ($sub == 'ifc')
+                               {
+                                       $menu['menu_title_2']=lang('ifc');
+
+                                       if($page=='ifc.import')
+                                       {
+                                               
$menu['sub_menu'][$i]['this']=True;
+                                       }
+                                       $menu['sub_menu'][$i]['url']            
        =       $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$currentapp.'.uiifc.import'));
+                                       $menu['sub_menu'][$i]['text']           
        =       lang('import');
+                                       $menu['sub_menu'][$i]['statustext']     
        =       lang('import ifc xml');
+                                       $i++;
+
+                               }
+
                                
$GLOBALS['phpgw']->session->appsession('menu',substr(md5($currentapp.$sub . '_' 
. $page . '_' . $page_2),-20),$menu);
                        }