[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uidocument.inc.php, 1.15, 1.
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uidocument.inc.php, 1.15, 1.16 class.uidrawing.inc.php, 1.23, 1.24 class.uiequipment.inc.php, 1.31, 1.32 class.uigab.inc.php, 1.13, 1.14 class.uiinvestment.inc.php, 1.25, 1.26 class.uiinvoice.inc.php, 1.30, 1.31 class.uilocation.inc.php, 1.21, 1.22 class.uimeter.inc.php, 1.15, 1.16 class.uipricebook.inc.php, 1.17, 1.18 class.uiproject.inc.php, 1.36, 1.37 class.uireport.inc.php, 1.12, 1.13 class.uirequest.inc.php, 1.24, 1.25 class.uistandard_entity.inc.php, 1.14, 1.15 class.uitts.inc.php, 1.35, 1.36 class.uiwo_hour.inc.php, 1.31, 1.32 class.uiworkorder.inc.php, 1.30, 1.31 |
|
Date: |
Fri, 18 Jul 2003 05:34:57 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv7159/inc
Modified Files:
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.uistandard_entity.inc.php class.uitts.inc.php
class.uiwo_hour.inc.php class.uiworkorder.inc.php
Log Message:
no message
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uidocument.inc.php 17 Jul 2003 18:15:50 -0000 1.15
--- class.uidocument.inc.php 18 Jul 2003 09:34:54 -0000 1.16
***************
*** 42,45 ****
--- 42,46 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.document';
$this->acl_read =
$this->acl2->check('.document',1);
$this->acl_add =
$this->acl2->check('.document',2);
***************
*** 81,85 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 82,86 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 310,314 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.index');
}
--- 311,315 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 517,521 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.index');
}
--- 518,522 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 568,572 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.index');
}
--- 569,573 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 851,855 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.index');
}
--- 852,856 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 897,901 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.index');
}
--- 898,902 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uidrawing.inc.php 17 Jul 2003 18:15:50 -0000 1.23
--- class.uidrawing.inc.php 18 Jul 2003 09:34:54 -0000 1.24
***************
*** 41,44 ****
--- 41,45 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.drawing';
$this->acl_read =
$this->acl2->check('.drawing',1);
$this->acl_add =
$this->acl2->check('.drawing',2);
***************
*** 80,84 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 81,85 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 355,359 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index');
}
--- 356,360 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 398,402 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index');
}
--- 399,403 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 643,647 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index');
}
--- 644,648 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 684,688 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index');
}
--- 685,689 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.uiequipment.inc.php 17 Jul 2003 18:15:50 -0000 1.31
--- class.uiequipment.inc.php 18 Jul 2003 09:34:54 -0000 1.32
***************
*** 41,44 ****
--- 41,45 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.equipment';
$this->acl_read =
$this->acl2->check('.equipment',1);
$this->acl_add =
$this->acl2->check('.equipment',2);
***************
*** 79,83 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 80,84 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 293,297 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index');
}
--- 294,298 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 551,555 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index');
}
--- 552,556 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 592,596 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index');
}
--- 593,597 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uigab.inc.php 17 Jul 2003 18:15:50 -0000 1.13
--- class.uigab.inc.php 18 Jul 2003 09:34:54 -0000 1.14
***************
*** 41,44 ****
--- 41,45 ----
$this->config =
CreateObject('phpgwapi.config');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.location';
$this->acl_read =
$this->acl2->check('.location',1);
$this->acl_add =
$this->acl2->check('.location',2);
***************
*** 78,82 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 79,83 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 255,259 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
}
--- 256,260 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 481,485 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
}
--- 482,486 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 654,658 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
}
--- 655,659 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 697,701 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uigab.index');
}
--- 698,702 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uiinvestment.inc.php 17 Jul 2003 18:15:50 -0000 1.25
--- class.uiinvestment.inc.php 18 Jul 2003 09:34:54 -0000 1.26
***************
*** 37,40 ****
--- 37,41 ----
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.invoice';
$this->acl_read =
$this->acl2->check('.invoice',1);
$this->acl_add =
$this->acl2->check('.invoice',2);
***************
*** 74,78 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 75,79 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.uiinvoice.inc.php 17 Jul 2003 18:15:50 -0000 1.30
--- class.uiinvoice.inc.php 18 Jul 2003 09:34:54 -0000 1.31
***************
*** 52,55 ****
--- 52,56 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.invoice';
$this->acl_read =
$this->acl2->check('.invoice',1);
$this->acl_add =
$this->acl2->check('.invoice',2);
***************
*** 81,85 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 82,86 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uilocation.inc.php 17 Jul 2003 18:15:50 -0000 1.21
--- class.uilocation.inc.php 18 Jul 2003 09:34:54 -0000 1.22
***************
*** 39,42 ****
--- 39,43 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.location';
$this->acl_read =
$this->acl2->check('.location',1);
$this->acl_add =
$this->acl2->check('.location',2);
***************
*** 76,80 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 77,81 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 337,341 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.index');
}
--- 338,342 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 674,678 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.index');
}
--- 675,679 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 720,724 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.index');
}
--- 721,725 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 937,943 ****
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);
--- 938,951 ----
function stop()
{
! $perm =
get_var('perm',array('POST','GET'));
! $location =
get_var('acl_location',array('POST','GET'));
!
! $right =
array(1=>'read',2=>'add',4=>'edit',8=>'delete',16=>'manage');
!
! $links = $this->bocommon->menu();
!
!
$GLOBALS['phpgw']->xslttpl->add_file(array('location','menu'));
! $receipt['error'][]=array('msg'=>lang('You need the
right "%1" for this application at "%2" to access this
function',lang($right[$perm]),$location));
$msgbox_data = $this->bocommon->msgbox_data($receipt);
***************
*** 945,949 ****
$data = array
(
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data)
);
--- 953,958 ----
$data = array
(
! 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'links' => $links
);
Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uimeter.inc.php 17 Jul 2003 18:15:50 -0000 1.15
--- class.uimeter.inc.php 18 Jul 2003 09:34:54 -0000 1.16
***************
*** 40,43 ****
--- 40,44 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.equipment';
$this->acl_read =
$this->acl2->check('.equipment',1);
$this->acl_add =
$this->acl2->check('.equipment',2);
***************
*** 73,77 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 74,78 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 292,296 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uimeter.index');
}
--- 293,297 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 446,450 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uimeter.index');
}
--- 447,451 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 487,491 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uimeter.index');
}
--- 488,492 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uipricebook.inc.php 17 Jul 2003 18:15:50 -0000 1.17
--- class.uipricebook.inc.php 18 Jul 2003 09:34:54 -0000 1.18
***************
*** 43,46 ****
--- 43,47 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.pricebook';
$this->acl_read =
$this->acl2->check('.pricebook',1);
$this->acl_add =
$this->acl2->check('.pricebook',2);
***************
*** 79,83 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 80,84 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 104,132 ****
$i=0;
! while (is_array($pricebook_list) && list(,$pricebook) =
each($pricebook_list))
{
! $content[] = array
! (
! 'counter'
=> $i,
! 'activity_id' =>
$pricebook['activity_id'],
! 'num'
=> $pricebook['num'],
! 'branch'
=> $pricebook['branch'],
! 'vendor_id'
=> $pricebook['vendor_id'],
! 'm_cost'
=> $pricebook['m_cost'],
! 'w_cost'
=> $pricebook['w_cost'],
! 'total_cost' =>
$pricebook['total_cost'],
! 'this_index' =>
$pricebook['this_index'],
! 'unit'
=> $pricebook['unit'],
! 'descr'
=> $pricebook['descr'],
! 'index_count' =>
$pricebook['index_count'],
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
. $pricebook['activity_id']),
! 'link_prizing'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
. $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']
.'&cat_id=' .$this->cat_id),
! 'lang_edit_statustext' =>
lang('edit the pricebook'),
! 'lang_prizing_statustext' =>
lang('view or edit prizing history of this element'),
! 'text_edit'
=> lang('edit'),
! 'text_prizing'
=> lang('prizing')
! );
! $i++;
}
--- 105,146 ----
$i=0;
! if (isSet($pricebook_list) AND
is_array($pricebook_list))
{
! foreach($pricebook_list as $pricebook)
! {
! if($this->acl_manage)
! {
! $link_edit
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
. $pricebook['activity_id']);
! $link_prizing
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
. $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']
.'&cat_id=' .$this->cat_id);
! $lang_edit_statustext
= lang('edit the pricebook');
! $lang_prizing_statustext
= lang('view or edit prizing history of this element');
! $text_edit
= lang('edit');
! $text_prizing
= lang('prizing');
! }
!
! $content[] = array
! (
! 'counter'
=> $i,
! 'activity_id'
=> $pricebook['activity_id'],
! 'num'
=> $pricebook['num'],
! 'branch'
=> $pricebook['branch'],
! 'vendor_id'
=> $pricebook['vendor_id'],
! 'm_cost'
=> $pricebook['m_cost'],
! 'w_cost'
=> $pricebook['w_cost'],
! 'total_cost'
=> $pricebook['total_cost'],
! 'this_index'
=> $pricebook['this_index'],
! 'unit'
=> $pricebook['unit'],
! 'descr'
=> $pricebook['descr'],
! 'index_count'
=> $pricebook['index_count'],
! 'link_edit'
=> $link_edit,
! 'link_prizing'
=> $link_prizing,
! 'lang_edit_statustext'
=> $lang_edit_statustext,
! 'lang_prizing_statustext'
=> $lang_prizing_statustext,
! 'text_edit'
=> $text_edit,
! 'text_prizing'
=> $text_prizing
! );
! $i++;
! }
}
***************
*** 175,191 ****
ksort($dlarr);
! $table_update[] = array
! (
! 'lang_new_index' =>
lang('New index'),
! 'lang_new_index_statustext' => lang('Enter
a new index'),
! 'dateformat' =>
(implode($sep,$dlarr)),
! 'link_calendar_date' =>
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
! 'calendar_gif' =>
'./'.$this->currentapp.'/templates/default/images/calendar.gif',
! 'calendar_source' =>
'./'.$this->currentapp.'/inc/calendar.js',
! 'lang_popup_calendar' => lang('Popup
Calendar'),
! 'lang_date_statustext' => lang('Select
the date for the update'),
! 'lang_update' =>
lang('Update'),
! 'lang_update_statustext' => lang('update
selected investments')
! );
$link_data = array
--- 189,208 ----
ksort($dlarr);
! if($this->acl_manage)
! {
! $table_update[] = array
! (
! 'lang_new_index'
=> lang('New index'),
! 'lang_new_index_statustext' =>
lang('Enter a new index'),
! 'dateformat'
=> (implode($sep,$dlarr)),
! 'link_calendar_date' =>
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
! 'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
! 'calendar_source'
=> './'.$this->currentapp.'/inc/calendar.js',
! 'lang_popup_calendar' =>
lang('Popup Calendar'),
! 'lang_date_statustext' =>
lang('Select the date for the update'),
! 'lang_update'
=> lang('Update'),
! 'lang_update_statustext' =>
lang('update selected investments')
! );
! }
$link_data = array
***************
*** 251,254 ****
--- 268,276 ----
function agreement()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
+
$GLOBALS['phpgw']->session->appsession('referer',$this->currentapp,'');
***************
*** 364,367 ****
--- 386,394 ----
function edit_agreement()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
+
$agreement_id =
get_var('agreement_id',array('POST','GET'));
$values =
get_var('values',array('POST','GET'));
***************
*** 492,495 ****
--- 519,527 ----
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
+
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',
'menu',
***************
*** 555,585 ****
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
! while (is_array($pricebook_list) && list(,$pricebook) =
each($pricebook_list))
{
!
! if($pricebook['current_index'])
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=prize&activity_id='
. $activity_id .'&vendor_id=' . $vendor_id .'&index_count=' .
$pricebook['index_count']);
- $value_m_cost =
$pricebook['m_cost'];
- $value_w_cost =
$pricebook['w_cost'];
- $value_total_cost =
$pricebook['total_cost'];
- }
! $content[] = array
! (
! 'm_cost'
=> $pricebook['m_cost'],
! 'w_cost'
=> $pricebook['w_cost'],
! 'total_cost'
=> $pricebook['total_cost'],
! 'this_index'
=> $pricebook['this_index'],
! 'date'
=> $GLOBALS['phpgw']->common->show_date($pricebook['date'],$dateformat),
! 'current_index'
=> $pricebook['current_index'],
! 'index_count'
=> $pricebook['index_count'],
! 'link_delete'
=> $link_delete,
! 'lang_delete_statustext' =>
lang('Delete this entry'),
! 'text_delete'
=> lang('delete'),
! );
}
$table_header[] = array
(
--- 587,620 ----
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
! if (isSet($pricebook_list) AND
is_array($pricebook_list))
{
! foreach($pricebook_list as $pricebook)
{
! if($pricebook['current_index'])
! {
! $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=prize&activity_id='
. $activity_id .'&vendor_id=' . $vendor_id .'&index_count=' .
$pricebook['index_count']);
! $value_m_cost =
$pricebook['m_cost'];
! $value_w_cost =
$pricebook['w_cost'];
! $value_total_cost =
$pricebook['total_cost'];
! }
+ $content[] = array
+ (
+ 'm_cost'
=> $pricebook['m_cost'],
+ 'w_cost'
=> $pricebook['w_cost'],
+ 'total_cost'
=> $pricebook['total_cost'],
+ 'this_index'
=> $pricebook['this_index'],
+ 'date'
=>
$GLOBALS['phpgw']->common->show_date($pricebook['date'],$dateformat),
+ 'current_index'
=> $pricebook['current_index'],
+ 'index_count'
=> $pricebook['index_count'],
+ 'link_delete'
=> $link_delete,
+ 'lang_delete_statustext'
=> lang('Delete this entry'),
+ 'text_delete'
=> lang('delete'),
+ );
+ }
}
+ //_debug_array($content);
$table_header[] = array
(
***************
*** 663,667 ****
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
-
'links'
=> $links,
'allrows'
=> $this->allrows,
--- 698,701 ----
***************
*** 682,686 ****
'value_m_cost'
=> $value_m_cost,
'value_w_cost'
=> $value_w_cost,
! 'value_total_cost'
=> $value_w_cost,
'table_header_prizing' =>
$table_header,
'values_prizing'
=> $content,
--- 716,720 ----
'value_m_cost'
=> $value_m_cost,
'value_w_cost'
=> $value_w_cost,
! 'value_total_cost'
=> $value_total_cost,
'table_header_prizing' =>
$table_header,
'values_prizing'
=> $content,
***************
*** 700,703 ****
--- 734,741 ----
function activity()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',
***************
*** 821,824 ****
--- 859,867 ----
function activity_vendor()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
+
$GLOBALS['phpgw']->session->appsession('referer',$this->currentapp,'');
***************
*** 953,956 ****
--- 996,1004 ----
function edit_activity()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
+
$activity_id =
get_var('activity_id',array('POST','GET'));
$agreement = get_var('agreement',array('GET'));
***************
*** 1108,1111 ****
--- 1156,1164 ----
function delete()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+ }
+
$method =
get_var('method',array('GET'));
$activity_id = get_var('activity_id',array('GET'));
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** class.uiproject.inc.php 17 Jul 2003 18:15:50 -0000 1.36
--- class.uiproject.inc.php 18 Jul 2003 09:34:54 -0000 1.37
***************
*** 42,45 ****
--- 42,46 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.project';
$this->acl_read =
$this->acl2->check('.project',1);
$this->acl_add =
$this->acl2->check('.project',2);
***************
*** 77,81 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 78,82 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 322,326 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiproject.index');
}
$id =
get_var('id',array('POST','GET'));
--- 323,327 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
$id =
get_var('id',array('POST','GET'));
***************
*** 719,723 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiproject.index');
}
--- 720,724 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 760,764 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiproject.index');
}
--- 761,765 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uireport.inc.php 17 Jul 2003 18:15:50 -0000 1.12
--- class.uireport.inc.php 18 Jul 2003 09:34:54 -0000 1.13
***************
*** 42,45 ****
--- 42,46 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.report';
$this->acl_read =
$this->acl2->check('.report',1);
$this->acl_add =
$this->acl2->check('.report',2);
***************
*** 80,84 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 81,85 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 309,313 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uireport.index');
}
--- 310,314 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 354,358 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uireport.index');
}
--- 355,359 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 662,666 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uireport.index');
}
--- 663,667 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 703,707 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uireport.index');
}
--- 704,708 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.uirequest.inc.php 17 Jul 2003 18:15:50 -0000 1.24
--- class.uirequest.inc.php 18 Jul 2003 09:34:54 -0000 1.25
***************
*** 42,45 ****
--- 42,46 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.project';
$this->acl_read =
$this->acl2->check('.project',1);
$this->acl_add =
$this->acl2->check('.project',2);
***************
*** 78,82 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 79,83 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 369,373 ****
if(!$this->acl_manage)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uirequest.index');
}
$GLOBALS['phpgw']->xslttpl->add_file(array('request'));
--- 370,374 ----
if(!$this->acl_manage)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
}
$GLOBALS['phpgw']->xslttpl->add_file(array('request'));
***************
*** 420,424 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uirequest.index');
}
$id =
get_var('id',array('POST','GET'));
--- 421,425 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
$id =
get_var('id',array('POST','GET'));
***************
*** 829,833 ****
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uirequest.index');
}
--- 830,834 ----
if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
***************
*** 870,874 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uirequest.index');
}
--- 871,875 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uistandard_entity.inc.php 23 May 2003 08:40:19 -0000 1.14
--- class.uistandard_entity.inc.php 18 Jul 2003 09:34:54 -0000 1.15
***************
*** 34,39 ****
$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.'.bostandard_entity',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 34,37 ----
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.uitts.inc.php 17 Jul 2003 18:15:50 -0000 1.35
--- class.uitts.inc.php 18 Jul 2003 09:34:54 -0000 1.36
***************
*** 40,43 ****
--- 40,44 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.ticket';
$this->acl_read =
$this->acl2->check('.ticket',1);
$this->acl_add =
$this->acl2->check('.ticket',2);
***************
*** 75,79 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 76,80 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 249,252 ****
--- 250,258 ----
function add()
{
+ if(!$this->acl_add)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+ }
+
$values = get_var('values',array('POST'));
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
***************
*** 390,393 ****
--- 396,404 ----
function view()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+ }
+
$id = get_var('id',array('GET'));
$values = get_var('values',array('POST','GET'));
***************
*** 397,400 ****
--- 408,416 ----
if($values['save'])
{
+ if(!$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=4&acl_location='
. $this->acl2_location);
+ }
+
$receipt =
$this->so2->update_ticket($values,$id);
}
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.uiwo_hour.inc.php 14 Jul 2003 10:36:43 -0000 1.31
--- class.uiwo_hour.inc.php 18 Jul 2003 09:34:54 -0000 1.32
***************
*** 55,58 ****
--- 55,59 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.project';
$this->acl_read =
$this->acl2->check('.project',1);
$this->acl_add =
$this->acl2->check('.project',2);
***************
*** 278,282 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
--- 279,283 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 365,369 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
--- 366,370 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 611,615 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
--- 612,616 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
***************
*** 733,737 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
--- 734,738 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 931,935 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
--- 932,936 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 1159,1163 ****
if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
$from =
get_var('from',array('POST','GET'));
--- 1160,1164 ----
if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
$from =
get_var('from',array('POST','GET'));
***************
*** 1331,1335 ****
if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
$id = get_var('id',array('POST','GET'));
--- 1332,1336 ----
if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
$id = get_var('id',array('POST','GET'));
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.uiworkorder.inc.php 17 Jul 2003 18:15:50 -0000 1.30
--- class.uiworkorder.inc.php 18 Jul 2003 09:34:54 -0000 1.31
***************
*** 43,46 ****
--- 43,47 ----
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->acl2_location = '.project';
$this->acl_read =
$this->acl2->check('.project',1);
$this->acl_add =
$this->acl2->check('.project',2);
***************
*** 77,81 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop');
}
--- 78,82 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
***************
*** 340,344 ****
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
$id =
get_var('id',array('POST','GET'));
--- 341,345 ----
if(!$this->acl_add && !$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
$id =
get_var('id',array('POST','GET'));
***************
*** 677,681 ****
if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
--- 678,682 ----
if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
***************
*** 713,719 ****
function delete()
{
! if(!$this->acl_edit)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
$id = get_var('id',array('POST','GET'));
--- 714,720 ----
function delete()
{
! if(!$this->acl_delete)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
}
$id = get_var('id',array('POST','GET'));
***************
*** 755,759 ****
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index');
}
--- 756,760 ----
if(!$this->acl_read)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uidocument.inc.php, 1.15, 1.16 class.uidrawing.inc.php, 1.23, 1.24 class.uiequipment.inc.php, 1.31, 1.32 class.uigab.inc.php, 1.13, 1.14 class.uiinvestment.inc.php, 1.25, 1.26 class.uiinvoice.inc.php, 1.30, 1.31 class.uilocation.inc.php, 1.21, 1.22 class.uimeter.inc.php, 1.15, 1.16 class.uipricebook.inc.php, 1.17, 1.18 class.uiproject.inc.php, 1.36, 1.37 class.uireport.inc.php, 1.12, 1.13 class.uirequest.inc.php, 1.24, 1.25 class.uistandard_entity.inc.php, 1.14, 1.15 class.uitts.inc.php, 1.35, 1.36 class.uiwo_hour.inc.php, 1.31, 1.32 class.uiworkorder.inc.php, 1.30, 1.31,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default location.xsl, 1.19, 1.20 pricebook.xsl, 1.8, 1.9
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php, 1.11, 1.12 class.boadmin.inc.php, 1.10, 1.11
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default location.xsl, 1.19, 1.20 pricebook.xsl, 1.8, 1.9
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php, 1.11, 1.12 class.boadmin.inc.php, 1.10, 1.11
- Index(es):