phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: property/inc class.sotemplate.inc.php, 1.5, 1.6


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.sotemplate.inc.php, 1.5, 1.6 class.sowo_hour.inc.php, 1.11, 1.12 class.uidocument.inc.php, 1.14, 1.15 class.uidrawing.inc.php, 1.22, 1.23 class.uiequipment.inc.php, 1.30, 1.31 class.uigab.inc.php, 1.12, 1.13 class.uiinvestment.inc.php, 1.24, 1.25 class.uiinvoice.inc.php, 1.29, 1.30 class.uilocation.inc.php, 1.20, 1.21 class.uimeter.inc.php, 1.14, 1.15 class.uipricebook.inc.php, 1.16, 1.17 class.uiproject.inc.php, 1.35, 1.36 class.uireport.inc.php, 1.11, 1.12 class.uirequest.inc.php, 1.23, 1.24 class.uitemplate.inc.php, 1.12, 1.13 class.uitts.inc.php, 1.34, 1.35 class.uiworkorder.inc.php, 1.29, 1.30
Date: Thu, 17 Jul 2003 14:15:53 -0400

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

Modified Files:
        class.sotemplate.inc.php class.sowo_hour.inc.php 
        class.uidocument.inc.php class.uidrawing.inc.php 
        class.uiequipment.inc.php class.uigab.inc.php 
        class.uiinvestment.inc.php class.uiinvoice.inc.php 
        class.uilocation.inc.php class.uimeter.inc.php 
        class.uipricebook.inc.php class.uiproject.inc.php 
        class.uireport.inc.php class.uirequest.inc.php 
        class.uitemplate.inc.php class.uitts.inc.php 
        class.uiworkorder.inc.php 
Log Message:
no message

Index: class.sotemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotemplate.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sotemplate.inc.php    9 Jul 2003 11:12:17 -0000       1.5
--- class.sotemplate.inc.php    17 Jul 2003 18:15:50 -0000      1.6
***************
*** 19,22 ****
--- 19,23 ----
  
                        $this->join                     = $this->socommon->join;
+                       $this->left_join                        = 
$this->socommon->left_join;
                }
  
***************
*** 76,80 ****
  
                        $sql = "SELECT 
fm_template.id,fm_template.descr,fm_template.name,fm_template.owner,fm_template.entry_date,"
!                        . " fm_chapter.descr as chapter  FROM fm_template 
$this->join fm_chapter  on fm_template.chapter_id=fm_chapter.id"
                         . " $filtermethod $querymethod";
  
--- 77,81 ----
  
                        $sql = "SELECT 
fm_template.id,fm_template.descr,fm_template.name,fm_template.owner,fm_template.entry_date,"
!                        . " fm_chapter.descr as chapter  FROM fm_template 
$this->left_join fm_chapter  on fm_template.chapter_id=fm_chapter.id"
                         . " $filtermethod $querymethod";
  

Index: class.sowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.sowo_hour.inc.php     9 Jul 2003 11:12:17 -0000       1.11
--- class.sowo_hour.inc.php     17 Jul 2003 18:15:50 -0000      1.12
***************
*** 159,162 ****
--- 159,167 ----
                        {
  
+                               if(!$hour[$i]['grouping_id'])
+                               {
+                                       $hour[$i]['grouping_id']='NULL';
+                               }
+ 
                                $this->db->query("insert into fm_template_hours 
(activity_id,activity_num,owner,hours_descr,unit,"
                                . 
"cost,quantity,billperae,ns3420_id,dim_d,grouping_id,grouping_descr,remark,tolerance,building_part,record,template_id)
 "
***************
*** 171,176 ****
                                        $hour[$i]['billperae'] . "','" .
                                        $hour[$i]['ns3420_id'] . "','" .
!                                       $hour[$i]['dim_d'] . "','" .
!                                       $hour[$i]['grouping_id'] . "','" .
                                        $hour[$i]['grouping_descr'] . "','" .
                                        $hour[$i]['remark'] . "','" .
--- 176,181 ----
                                        $hour[$i]['billperae'] . "','" .
                                        $hour[$i]['ns3420_id'] . "','" .
!                                       $hour[$i]['dim_d'] . "'," .
!                                       $hour[$i]['grouping_id'] . ",'" .
                                        $hour[$i]['grouping_descr'] . "','" .
                                        $hour[$i]['remark'] . "','" .
***************
*** 321,324 ****
--- 326,334 ----
                        }
  
+                       if(!$hour['grouping_id'])
+                       {
+                               $hour['grouping_id']='NULL';
+                       }
+ 
                        $this->db->query("insert into fm_wo_hours 
(owner,hours_descr,unit,cost,quantity,billperae,ns3420_id,dim_d,"
                                . " 
grouping_id,grouping_descr,record,building_part,tolerance,remark,entry_date,workorder_id)
 "
***************
*** 331,336 ****
                                        $hour['billperae'] . "','" .
                                        $hour['ns3420_id'] . "','" .
!                                       $hour['dim_d'] . "','" .
!                                       $hour['grouping_id'] . "','" .
                                        $hour['grouping_descr'] . "','" .
                                        $hour['record'] . "','" .
--- 341,346 ----
                                        $hour['billperae'] . "','" .
                                        $hour['ns3420_id'] . "','" .
!                                       $hour['dim_d'] . "'," .
!                                       $hour['grouping_id'] . ",'" .
                                        $hour['grouping_descr'] . "','" .
                                        $hour['record'] . "','" .
***************
*** 454,457 ****
--- 464,473 ----
                        }
  
+                       if(!$hour['grouping_id'])
+                       {
+                               $hour['grouping_id']='NULL';
+                       }
+ 
+ 
                        $this->db->query("UPDATE fm_wo_hours set
                                hours_descr                     ='" . 
$hour['descr'] . "',
***************
*** 465,469 ****
                                building_part           ='" . 
$hour['building_part_id'] . "',
                                dim_d                           ='" . 
$hour['dim_d'] . "',
!                               grouping_id                     ='" . 
$hour['grouping_id'] . "',
                                grouping_descr          ='" . 
$hour['grouping_descr']
                                . "' WHERE id= '" . $hour['hour_id'] 
."'",__LINE__,__FILE__);
--- 481,485 ----
                                building_part           ='" . 
$hour['building_part_id'] . "',
                                dim_d                           ='" . 
$hour['dim_d'] . "',
!                               grouping_id                     =" . 
$hour['grouping_id'] . ",
                                grouping_descr          ='" . 
$hour['grouping_descr']
                                . "' WHERE id= '" . $hour['hour_id'] 
."'",__LINE__,__FILE__);

Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uidocument.inc.php    30 Jun 2003 10:49:14 -0000      1.14
--- class.uidocument.inc.php    17 Jul 2003 18:15:50 -0000      1.15
***************
*** 79,82 ****
--- 79,87 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
+ 
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('document','values','table_header',

Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uidrawing.inc.php     30 Jun 2003 10:49:14 -0000      1.22
--- class.uidrawing.inc.php     17 Jul 2003 18:15:50 -0000      1.23
***************
*** 78,81 ****
--- 78,86 ----
                {
  
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
+ 
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('drawing','values','table_header',
                                                                                
'menu',

Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.uiequipment.inc.php   28 Jun 2003 16:11:47 -0000      1.30
--- class.uiequipment.inc.php   17 Jul 2003 18:15:50 -0000      1.31
***************
*** 77,80 ****
--- 77,84 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        $GLOBALS['phpgw']->xslttpl->add_file(array('equipment',

Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uigab.inc.php 8 Jul 2003 08:11:41 -0000       1.12
--- class.uigab.inc.php 17 Jul 2003 18:15:50 -0000      1.13
***************
*** 76,79 ****
--- 76,83 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        $GLOBALS['phpgw']->xslttpl->add_file(array('gab',

Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.uiinvestment.inc.php  28 Jun 2003 16:11:47 -0000      1.24
--- class.uiinvestment.inc.php  17 Jul 2003 18:15:50 -0000      1.25
***************
*** 37,40 ****
--- 37,44 ----
                        $this->bolocation                       = 
CreateObject($this->currentapp.'.bolocation');
                        $this->acl2                             = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl_read                         = 
$this->acl2->check('.invoice',1);
+                       $this->acl_add                          = 
$this->acl2->check('.invoice',2);
+                       $this->acl_edit                         = 
$this->acl2->check('.invoice',4);
+                       $this->acl_delete                       = 
$this->acl2->check('.invoice',8);
  
                        $this->start                            = 
$this->bo->start;
***************
*** 68,71 ****
--- 72,79 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        $GLOBALS['phpgw']->xslttpl->add_file(array('investment',

Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.uiinvoice.inc.php     14 Jul 2003 10:36:43 -0000      1.29
--- class.uiinvoice.inc.php     17 Jul 2003 18:15:50 -0000      1.30
***************
*** 52,69 ****
  
                        $this->acl2                     = 
CreateObject($this->currentapp.'.acl2');
  
                        
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
  
- 
- /*                    if(!$this->acl2->check('.invoice',1) && 
!$this->acl2->check('.invoice',2) && !$this->acl2->check('.invoice',4) && 
!$this->acl2->check('.invoice',8) && !$this->acl2->check('.invoice',16) )
-                       {
-                               $GLOBALS['phpgw_info']['flags']['noframework'] 
= True;
- 
-                               echo '<br>You lack sufficient rights to enter 
this section<br>';
- 
-                               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/home.php'));
-                       }
- */
- 
                }
  
--- 52,62 ----
  
                        $this->acl2                     = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl_read                         = 
$this->acl2->check('.invoice',1);
+                       $this->acl_add                          = 
$this->acl2->check('.invoice',2);
+                       $this->acl_edit                         = 
$this->acl2->check('.invoice',4);
+                       $this->acl_delete                       = 
$this->acl2->check('.invoice',8);
  
                        
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
  
                }
  
***************
*** 86,89 ****
--- 79,86 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',

Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uilocation.inc.php    5 Jul 2003 21:41:35 -0000       1.20
--- class.uilocation.inc.php    17 Jul 2003 18:15:50 -0000      1.21
***************
*** 24,28 ****
                        'edit'          => True,
                        'delete'        => True,
!                       'update_cat'=> True
                );
  
--- 24,29 ----
                        'edit'          => True,
                        'delete'        => True,
!                       'update_cat'=> True,
!                       'stop'=> True
                );
  
***************
*** 73,76 ****
--- 74,81 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        $GLOBALS['phpgw']->xslttpl->add_file(array('location',
***************
*** 928,931 ****
--- 933,955 ----
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('update_cat' => $data));
+               }
+ 
+               function stop()
+               {
+                       $GLOBALS['phpgw']->xslttpl->add_file(array('location'));
+ 
+                       $receipt['error'][]=array('msg'=>lang('Contact your 
administrator to get appropriate rights for this application'));
+ 
+                       $msgbox_data = $this->bocommon->msgbox_data($receipt);
+ 
+                       $data = array
+                       (
+                               'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data)
+                       );
+ 
+                       $appname                = lang('Access error');
+                       $function_msg   = lang('Update the not active category 
for locations');
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' : ' . $appname;
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('stop' => $data));
                }
        }

Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uimeter.inc.php       25 Jun 2003 09:47:28 -0000      1.14
--- class.uimeter.inc.php       17 Jul 2003 18:15:50 -0000      1.15
***************
*** 71,74 ****
--- 71,78 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('meter','values','table_header',

Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uipricebook.inc.php   23 May 2003 08:40:19 -0000      1.16
--- class.uipricebook.inc.php   17 Jul 2003 18:15:50 -0000      1.17
***************
*** 36,50 ****
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
-                       $this->cats                                     = 
CreateObject('phpgwapi.categories');
-                       $this->cats->app_name           = 'p_building';
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
-                       $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
-                       $this->grants                           = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
-                       $this->grants[$this->account] = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
                        $this->bo                                       = 
CreateObject($this->currentapp.'.bopricebook',True);
                        $this->bocommon                                 = 
CreateObject($this->currentapp.'.bocommon');
                        $this->contacts                                 = 
CreateObject('phpgwapi.contacts');
  
                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
--- 36,52 ----
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
  
                        $this->bo                                       = 
CreateObject($this->currentapp.'.bopricebook',True);
                        $this->bocommon                                 = 
CreateObject($this->currentapp.'.bocommon');
                        $this->contacts                                 = 
CreateObject('phpgwapi.contacts');
  
+                       $this->acl2                             = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl_read                         = 
$this->acl2->check('.pricebook',1);
+                       $this->acl_add                          = 
$this->acl2->check('.pricebook',2);
+                       $this->acl_edit                         = 
$this->acl2->check('.pricebook',4);
+                       $this->acl_delete                       = 
$this->acl2->check('.pricebook',8);
+                       $this->acl_manage                       = 
$this->acl2->check('.pricebook',16);
+ 
                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
***************
*** 75,78 ****
--- 77,85 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
+ 
                        
$GLOBALS['phpgw']->session->appsession('referer',$this->currentapp,'');
  

Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.uiproject.inc.php     17 Jul 2003 10:46:22 -0000      1.35
--- class.uiproject.inc.php     17 Jul 2003 18:15:50 -0000      1.36
***************
*** 75,78 ****
--- 75,82 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('project','values','table_header',

Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uireport.inc.php      28 Jun 2003 16:11:47 -0000      1.11
--- class.uireport.inc.php      17 Jul 2003 18:15:50 -0000      1.12
***************
*** 78,81 ****
--- 78,85 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('report','values','table_header',

Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uirequest.inc.php     30 Jun 2003 10:49:14 -0000      1.23
--- class.uirequest.inc.php     17 Jul 2003 18:15:50 -0000      1.24
***************
*** 76,79 ****
--- 76,83 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('request','table_header',

Index: class.uitemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uitemplate.inc.php    11 Jul 2003 11:03:53 -0000      1.12
--- class.uitemplate.inc.php    17 Jul 2003 18:15:50 -0000      1.13
***************
*** 33,45 ****
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
-                       $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
- 
-                       $this->grants                           = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
-                       $this->grants[$this->account] = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
                        $this->bo                                       = 
CreateObject($this->currentapp.'.botemplate',True);
                        $this->bowo_hour                        = 
CreateObject($this->currentapp.'.bowo_hour');
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');
                        $this->bopricebook                      = 
CreateObject($this->currentapp.'.bopricebook');
- 
  
                        $this->start                            = 
$this->bo->start;
--- 33,40 ----

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.uitts.inc.php 17 Jul 2003 10:46:22 -0000      1.34
--- class.uitts.inc.php 17 Jul 2003 18:15:50 -0000      1.35
***************
*** 32,39 ****
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
-                       $this->cats                                     = 
CreateObject('phpgwapi.categories');
-                       $this->cats->app_name           = 'p_ticket';
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
-                       $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
                        $this->bo                                       = 
CreateObject($this->currentapp.'.botts',True);
--- 32,36 ----
***************
*** 42,45 ****
--- 39,49 ----
                        $this->bolocation                       = 
CreateObject($this->currentapp.'.bolocation');
  
+                       $this->acl2                             = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl_read                         = 
$this->acl2->check('.ticket',1);
+                       $this->acl_add                          = 
$this->acl2->check('.ticket',2);
+                       $this->acl_edit                         = 
$this->acl2->check('.ticket',4);
+                       $this->acl_delete                       = 
$this->acl2->check('.ticket',8);
+                       $this->acl_manage                       = 
$this->acl2->check('.ticket',16);
+ 
                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;
***************
*** 69,72 ****
--- 73,80 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        $GLOBALS['phpgw']->xslttpl->add_file(array('tts',

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.uiworkorder.inc.php   17 Jul 2003 10:46:22 -0000      1.29
--- class.uiworkorder.inc.php   17 Jul 2003 18:15:50 -0000      1.30
***************
*** 75,78 ****
--- 75,82 ----
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
+                       }
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder','values','table_header',





reply via email to

[Prev in Thread] Current Thread [Next in Thread]