[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.18.2.6.2.10, 1.18.2.6.2.11 class.uideliveries.inc.php, 1.21.2.3.2.9, 1.21.2.3.2.10 class.uiprojecthours.inc.php, 1.22.2.5.2.12, 1.22.2.5.2.13 class.uiprojects.inc.php, 1.47.2.7.2.40, 1.47.2.7.2.41 class.uistatistics.inc.php, 1.10.2.2.2.8, 1.10.2.2.2.9 hook_sidebox_menu.inc.php, 1.1.2.1, 1.1.2.2

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv9860/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.uibilling.inc.php class.uideliveries.inc.php 
        class.uiprojecthours.inc.php class.uiprojects.inc.php 
        class.uistatistics.inc.php hook_sidebox_menu.inc.php 
Log Message:
fix

Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** hook_sidebox_menu.inc.php   21 Nov 2003 22:40:38 -0000      1.1.2.1
--- hook_sidebox_menu.inc.php   25 Nov 2003 15:51:46 -0000      1.1.2.2
***************
*** 29,47 ****
                        if ($boprojects->isprojectadmin('pad'))
                        {
!                               $file['Activities'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act');
!                               $file['Budget']     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains');
                        }
!                       $file['Projects']       = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains');
  
                        if ($boprojects->isprojectadmin('pbo'))
                        {
!                               $file['Billing']    = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains');
!                               $file['Deliveries'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains');
                        }
!                       $file['Jobs']           = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs');
!                       $file['Work hours']          = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours');
  
!                       $file['Statistics']     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains');
!                       $file['Archive']        = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains');
  
                        display_sidebox($appname,$menu_title,$file);
--- 29,47 ----
                        if ($boprojects->isprojectadmin('pad'))
                        {
!                               $file['Activities']     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act');
!                               $file['Budget']         = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains');
                        }
!                       $file['Projects']               = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains');
  
                        if ($boprojects->isprojectadmin('pbo'))
                        {
!                               $file['Billing']        = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains');
!                               $file['Deliveries']     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains');
                        }
!                       $file['Jobs']                   = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs');
!                       $file['Work hours']             = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours');
  
!                       $file['Statistics']             = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains');
!                       $file['Archive']                = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains');
  
                        display_sidebox($appname,$menu_title,$file);
***************
*** 51,57 ****
                                $menu_title = 
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Preferences');
                                $file = Array(
!                                       'Preferences'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.preferences'),
!                                       'Grant Access'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
!                                       'Edit categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=projects&cats_level=True&global_cats=True')
                                );
                                display_sidebox($appname,$menu_title,$file);
--- 51,57 ----
                                $menu_title = 
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Preferences');
                                $file = Array(
!                                       'Preferences'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.preferences'),
!                                       'Grant Access'          => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
!                                       'Edit categories'       => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=projects&cats_level=True&global_cats=True')
                                );
                                display_sidebox($appname,$menu_title,$file);

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.40
retrieving revision 1.47.2.7.2.41
diff -C2 -d -r1.47.2.7.2.40 -r1.47.2.7.2.41
*** class.uiprojects.inc.php    21 Nov 2003 22:38:45 -0000      1.47.2.7.2.40
--- class.uiprojects.inc.php    25 Nov 2003 15:51:46 -0000      1.47.2.7.2.41
***************
*** 65,69 ****
                        //$this->action                                 = 
(isset($action)?$action:'mains');
  
!                       $this->bo                                               
= CreateObject('projects.boprojects',True, $action);
                        $this->nextmatchs                               = 
CreateObject('phpgwapi.nextmatchs');
                        $this->sbox                                             
= CreateObject('phpgwapi.sbox');
--- 65,69 ----
                        //$this->action                                 = 
(isset($action)?$action:'mains');
  
!                       $this->boprojects                               = 
CreateObject('projects.boprojects',True, $action);
                        $this->nextmatchs                               = 
CreateObject('phpgwapi.nextmatchs');
[...1243 lines suppressed...]
*** 2253,2261 ****
                        if($s_id)
                        {
!                               $values = $this->bo->get_single_mstone($s_id);
  
                                
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
  
!                               //if 
($this->bo->check_perms($this->grants[$values['coordinator']],PHPGW_ACL_DELETE) 
|| $values['coordinator'] == $this->account)
                                //{
                                
$GLOBALS['phpgw']->template->set_var('delete','<input type="submit" 
name="delete" value="' . lang('Delete') .'">');
--- 2253,2261 ----
                        if($s_id)
                        {
!                               $values = 
$this->boprojects->get_single_mstone($s_id);
  
                                
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
  
!                               //if 
($this->boprojects->check_perms($this->grants[$values['coordinator']],PHPGW_ACL_DELETE)
 || $values['coordinator'] == $this->account)
                                //{
                                
$GLOBALS['phpgw']->template->set_var('delete','<input type="submit" 
name="delete" value="' . lang('Delete') .'">');

Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.8
retrieving revision 1.10.2.2.2.9
diff -C2 -d -r1.10.2.2.2.8 -r1.10.2.2.2.9
*** class.uistatistics.inc.php  21 Nov 2003 22:40:13 -0000      1.10.2.2.2.8
--- class.uistatistics.inc.php  25 Nov 2003 15:51:46 -0000      1.10.2.2.2.9
***************
*** 123,127 ****
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
--- 123,127 ----
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->boprojects->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 134,138 ****
                                }
  
!                               if ($this->bo->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 134,138 ----
                                }
  
!                               if ($this->boprojects->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));

Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.9
retrieving revision 1.21.2.3.2.10
diff -C2 -d -r1.21.2.3.2.9 -r1.21.2.3.2.10
*** class.uideliveries.inc.php  21 Nov 2003 22:38:32 -0000      1.21.2.3.2.9
--- class.uideliveries.inc.php  25 Nov 2003 15:51:46 -0000      1.21.2.3.2.10
***************
*** 117,120 ****
--- 117,121 ----
                        
$GLOBALS['phpgw']->template->set_var('lang_work_date',lang('Work date'));
                        
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('Submit'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_jobs',lang('Jobs'));
                }
  
***************
*** 126,130 ****
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
--- 127,131 ----
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->boprojects->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 137,141 ****
                                }
  
!                               if ($this->bo->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 138,142 ----
                                }
  
!                               if ($this->boprojects->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));

Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.10
retrieving revision 1.18.2.6.2.11
diff -C2 -d -r1.18.2.6.2.10 -r1.18.2.6.2.11
*** class.uibilling.inc.php     21 Nov 2003 22:38:13 -0000      1.18.2.6.2.10
--- class.uibilling.inc.php     25 Nov 2003 15:51:45 -0000      1.18.2.6.2.11
***************
*** 128,132 ****
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
--- 128,132 ----
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->boprojects->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 139,143 ****
                                }
  
!                               if ($this->bo->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 139,143 ----
                                }
  
!                               if ($this->boprojects->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));

Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.12
retrieving revision 1.22.2.5.2.13
diff -C2 -d -r1.22.2.5.2.12 -r1.22.2.5.2.13
*** class.uiprojecthours.inc.php        21 Nov 2003 22:38:42 -0000      
1.22.2.5.2.12
--- class.uiprojecthours.inc.php        25 Nov 2003 15:51:46 -0000      
1.22.2.5.2.13
***************
*** 133,137 ****
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
--- 133,137 ----
                                
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->boprojects->isprojectadmin('pad'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 144,148 ****
                                }
  
!                               if ($this->bo->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 144,148 ----
                                }
  
!                               if ($this->boprojects->isprojectadmin('pbo'))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));