[Phpgroupware-cvs] CVS: timetrack/inc header.inc.php,1.10,1.11 hook_admin.inc.php,1.7,1.8

[Bob Schader <address@hidden>]

Update of /cvsroot/phpgroupware/timetrack/inc
In directory subversions:/tmp/cvs-serv19513/inc

Modified Files:
        header.inc.php hook_admin.inc.php 
Log Message:
Merged 0_9_14 branch back into head

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/inc/header.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** header.inc.php      12 Nov 2001 18:28:20 -0000      1.10
--- header.inc.php      18 Mar 2002 03:18:04 -0000      1.11
***************
*** 11,16 ****
   \**************************************************************************/
  
!  $phpgw_info["apps"]["timetrack"]["ismanager"] = 0;
!  $phpgw_info["apps"]["timetrack"]["ispayroll"] = 0;
  
   $userGroups = $phpgw->accounts->membership();
--- 11,16 ----
   \**************************************************************************/
  
!  $GLOBALS['phpgw_info']["apps"]["timetrack"]["ismanager"] = 0;
!  $GLOBALS['phpgw_info']["apps"]["timetrack"]["ispayroll"] = 0;
  
   $userGroups = $phpgw->accounts->membership();
***************
*** 20,28 ****
     if ($gname == "TTrack_Managers")
     {
!      $phpgw_info["apps"]["timetrack"]["ismanager"] = 1;
     }
     if ($gname == "TTrack_Payroll")
     {
!      $phpgw_info["apps"]["timetrack"]["ispayroll"] = 1;
     }
   }
--- 20,28 ----
     if ($gname == "TTrack_Managers")
     {
!      $GLOBALS['phpgw_info']["apps"]["timetrack"]["ismanager"] = 1;
     }
     if ($gname == "TTrack_Payroll")
     {
!      $GLOBALS['phpgw_info']["apps"]["timetrack"]["ispayroll"] = 1;
     }
   }
***************
*** 30,38 ****
  /*********** End of check groups code section ****************/
  
! //$t = new Template($phpgw_info["server"]["app_tpl"]);
  $t = new Template($phpgw->common->get_tpl_dir('timetrack'));
  $t->set_file(array("app_header" => "header.tpl"));
  $app_info = lang("Time Tracking");
! $t->set_var("app_info", "<td bgcolor=\"" . $phpgw_info["theme"]["th_bg"]
        . "\" align=\"left\"><b>" . $app_info);
  
--- 30,38 ----
  /*********** End of check groups code section ****************/
  
! //$t = new Template($GLOBALS['phpgw_info']["server"]["app_tpl"]);
  $t = new Template($phpgw->common->get_tpl_dir('timetrack'));
  $t->set_file(array("app_header" => "header.tpl"));
  $app_info = lang("Time Tracking");
! $t->set_var("app_info", "<td bgcolor=\"" . 
$GLOBALS['phpgw_info']["theme"]["th_bg"]
        . "\" align=\"left\"><b>" . $app_info);
  
***************
*** 49,53 ****
  $t->set_var("link_custlist","<a href=\"" . 
$phpgw->link("/timetrack/customers.php") . "\">" 
        . lang("Customer List") ."</a> &nbsp;|");
! if($phpgw_info["apps"]["timetrack"]["ismanager"]) {
    $t->set_var("link_editprofiles","<a href=\"" . 
$phpgw->link("/timetrack/profiles.php") . "\">" 
        . lang("Edit Profiles") ."</a> &nbsp;|");
--- 49,53 ----
  $t->set_var("link_custlist","<a href=\"" . 
$phpgw->link("/timetrack/customers.php") . "\">" 
        . lang("Customer List") ."</a> &nbsp;|");
! if($GLOBALS['phpgw_info']["apps"]["timetrack"]["ismanager"]) {
    $t->set_var("link_editprofiles","<a href=\"" . 
$phpgw->link("/timetrack/profiles.php") . "\">" 
        . lang("Edit Profiles") ."</a> &nbsp;|");

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/inc/hook_admin.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** hook_admin.inc.php  23 Nov 2001 20:08:42 -0000      1.7
--- hook_admin.inc.php  18 Mar 2002 03:18:04 -0000      1.8
***************
*** 19,23 ****
                'Edit Location Table'   => 
$GLOBALS['phpgw']->link('/timetrack/admin1.php'),
                'Edit Job Status ID Table'      => 
$GLOBALS['phpgw']->link('/timetrack/admin2.php'),
!               'Edit Work Catagory Table'      =>      
$GLOBALS['phpgw']->link('/timetrack/admin3.php')
        );
  //Do not modify below this line
--- 19,24 ----
                'Edit Location Table'   => 
$GLOBALS['phpgw']->link('/timetrack/admin1.php'),
                'Edit Job Status ID Table'      => 
$GLOBALS['phpgw']->link('/timetrack/admin2.php'),
!               'Edit Work Catagory Table'      =>      
$GLOBALS['phpgw']->link('/timetrack/admin3.php'),
!               'Site Setup' => $GLOBALS['phpgw']->link('/timetrack/admin5.php')
        );
  //Do not modify below this line