[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.6,1.7

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22560/inc

Modified Files:
        header.inc.php 
Log Message:
no message

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** header.inc.php      4 Sep 2002 17:56:09 -0000       1.6
--- header.inc.php      5 Sep 2002 16:48:15 -0000       1.7
***************
*** 24,27 ****
--- 24,37 ----
  
  
+       $admins = $GLOBALS['phpgw']->session->appsession('admins','property');
+       $module_order = 
$GLOBALS['phpgw']->session->appsession('module_order','property');
+ 
+       
$admin_equipment=$admins[$module_order['equipment']]['equipment']['admin'];
+       
$admin_workorder=$admins[$module_order['workorder']]['workorder']['admin'];
+       $admin_activity=$admins[$module_order['activity']]['activity']['admin'];
+ 
+ //    echo 'admin_activity: '.$admin_activity .'<BR>';
+ //    print_r($admins);
+ 
        if (!$sub)
        {
***************
*** 33,45 ****
  
  //    $isadmin = ispropertyadmin();
! //    if ($isadmin==1) {
! //            
$t->set_var('link_activities',$GLOBALS['phpgw']->link('/property/activities.php'));
! //            $t->set_var('lang_activities',lang('Activities'));
! //    }
! //    else
! //    {
! //            $t->set_var('link_activities','');
! //            $t->set_var('lang_activities','');
! //    }
        
$t->set_var('link_property',$GLOBALS['phpgw']->link('/property/list_property.php','sub=p_property'));
        $t->set_var('lang_property',lang('Property'));
--- 43,47 ----
  
  //    $isadmin = ispropertyadmin();
! 
        
$t->set_var('link_property',$GLOBALS['phpgw']->link('/property/list_property.php','sub=p_property'));
        $t->set_var('lang_property',lang('Property'));
***************
*** 60,65 ****
        
$t->set_var('link_invoice',$GLOBALS['phpgw']->link('/property/list_invoice.php','sub=p_invoice'));
        $t->set_var('lang_invoice',lang('Invoice'));
!       
$t->set_var('link_activities',$GLOBALS['phpgw']->link('/property/list_activity.php','sub=p_activity'));
!       $t->set_var('lang_activities',lang('Activities'));
  
        if ($sub == p_ticket)
--- 62,74 ----
        
$t->set_var('link_invoice',$GLOBALS['phpgw']->link('/property/list_invoice.php','sub=p_invoice'));
        $t->set_var('lang_invoice',lang('Invoice'));
!       if ($admin_activity)
!       {
!               
$t->set_var('link_activities',$GLOBALS['phpgw']->link('/property/list_activity.php','sub=p_activity'));
!               $t->set_var('lang_activities',lang('Activities'));
!       }
!       else
!       {
!               $t->set_var('lang_activities','');
!       }
  
        if ($sub == p_ticket)
***************
*** 70,85 ****
        if ($sub == p_equipment)
        {
-               
$t->set_var('sublink_equipment_type',$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sub=p_equipment'));
-               $t->set_var('sublang_equipment_type',lang('Equipment type'));
                
$t->set_var('sublink_equipment',$GLOBALS['phpgw']->link('/property/list_equipment.php','sub=p_equipment'));
                $t->set_var('sublang_equipment',lang('Equipment'));
                $admin_info = lang('equipment');
        }
        else
        {
-               $t->set_var('sublink_equipment_type','');
-               $t->set_var('sublang_equipment_type','');
                $t->set_var('sublink_equipment','');
                $t->set_var('sublang_equipment','');
        }
  
--- 79,102 ----
        if ($sub == p_equipment)
        {
                
$t->set_var('sublink_equipment',$GLOBALS['phpgw']->link('/property/list_equipment.php','sub=p_equipment'));
                $t->set_var('sublang_equipment',lang('Equipment'));
                $admin_info = lang('equipment');
+               if ($admin_equipment)
+               {
+                       
$t->set_var('sublink_equipment_type',$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sub=p_equipment'));
+                       $t->set_var('sublang_equipment_type',lang('Equipment 
type'));
+               }
+               else
+               {
+                       $t->set_var('sublink_equipment_type','');
+                       $t->set_var('sublang_equipment_type','');
+               }
        }
        else
        {
                $t->set_var('sublink_equipment','');
                $t->set_var('sublang_equipment','');
+               $t->set_var('sublink_equipment_type','');
+               $t->set_var('sublang_equipment_type','');
        }
  
***************
*** 142,146 ****
                $t->set_var('sublang_invoice_consume','');
        }
!       if ($sub == p_activity)
        {
                
$t->set_var('sub_activities_list',$phpgw->link('/property/list_activity.php','sub=p_activity'));
--- 159,163 ----
                $t->set_var('sublang_invoice_consume','');
        }
!       if ($sub == p_activity && $admin_activity)
        {
                
$t->set_var('sub_activities_list',$phpgw->link('/property/list_activity.php','sub=p_activity'));