[Phpgroupware-cvs] hrm/inc class.boadmin.inc.php class.souser.inc....

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/15 09:09:48

Modified files:
        inc            : class.boadmin.inc.php class.souser.inc.php 
                         class.uijob.inc.php hook_admin.inc.php 
Removed files:
        inc            : class.acl2.inc.php 

Log message:
        use acl from api

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.boadmin.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.souser.inc.php.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.uijob.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/hook_admin.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: hrm/inc/class.boadmin.inc.php
diff -u hrm/inc/class.boadmin.inc.php:1.7 hrm/inc/class.boadmin.inc.php:1.8
--- hrm/inc/class.boadmin.inc.php:1.7   Fri Feb 24 13:24:05 2006
+++ hrm/inc/class.boadmin.inc.php       Mon May 15 09:09:48 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage admin
-       * @version $Id: class.boadmin.inc.php,v 1.7 2006/02/24 13:24:05 
sigurdne Exp $
+       * @version $Id: class.boadmin.inc.php,v 1.8 2006/05/15 09:09:48 
sigurdne Exp $
        */
 
        /**
@@ -31,8 +31,7 @@
                        $this->so                       = 
CreateObject($this->currentapp.'.soadmin');
                        $this->catbo = createobject('phpgwapi.categories');
 
-//                     $this->acl              = $GLOBALS['phpgw']->acl;
-                       $this->acl              = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl              = $GLOBALS['phpgw']->acl;
                        $this->right            = array(1,2,4,8,16);
 
                        if ($session)
Index: hrm/inc/class.souser.inc.php
diff -u hrm/inc/class.souser.inc.php:1.11 hrm/inc/class.souser.inc.php:1.12
--- hrm/inc/class.souser.inc.php:1.11   Sat Apr 15 19:04:13 2006
+++ hrm/inc/class.souser.inc.php        Mon May 15 09:09:48 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage user
-       * @version $Id: class.souser.inc.php,v 1.11 2006/04/15 19:04:13 
sigurdne Exp $
+       * @version $Id: class.souser.inc.php,v 1.12 2006/05/15 09:09:48 
sigurdne Exp $
        */
 
        /**
@@ -31,7 +31,7 @@
                        $this->db               = $this->bocommon->new_db();
                        $this->db2              = $this->bocommon->new_db();
 
-                       $this->acl              = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl              = CreateObject('phpgwapi.acl');
                        $this->grants           = 
$this->acl->get_grants('hrm','.user');
                        $this->left_join        = $this->bocommon->left_join;
                        $this->join             = $this->bocommon->join;
Index: hrm/inc/class.uijob.inc.php
diff -u hrm/inc/class.uijob.inc.php:1.19 hrm/inc/class.uijob.inc.php:1.20
--- hrm/inc/class.uijob.inc.php:1.19    Fri Apr 21 12:57:27 2006
+++ hrm/inc/class.uijob.inc.php Mon May 15 09:09:48 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage job
-       * @version $Id: class.uijob.inc.php,v 1.19 2006/04/21 12:57:27 sigurdne 
Exp $
+       * @version $Id: class.uijob.inc.php,v 1.20 2006/05/15 09:09:48 sigurdne 
Exp $
        */
 
        /**
@@ -55,7 +55,7 @@
                        $this->bo                                       = 
CreateObject($this->currentapp.'.bojob',true);
                        $this->bocommon                         = 
CreateObject($this->currentapp.'.bocommon');
                        $this->bocategory                       = 
CreateObject($this->currentapp.'.bocategory');
-                       $this->acl                                      = 
CreateObject($this->currentapp.'.acl2');
+                       $this->acl                                      = 
CreateObject('phpgwapi.acl');
                        $this->menu                                     = 
CreateObject($this->currentapp.'.menu');
                        $this->menu->sub                        ='job';
 
Index: hrm/inc/hook_admin.inc.php
diff -u hrm/inc/hook_admin.inc.php:1.7 hrm/inc/hook_admin.inc.php:1.8
--- hrm/inc/hook_admin.inc.php:1.7      Fri Apr 21 12:57:27 2006
+++ hrm/inc/hook_admin.inc.php  Mon May 15 09:09:48 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage admin
-       * @version $Id: hook_admin.inc.php,v 1.7 2006/04/21 12:57:27 sigurdne 
Exp $
+       * @version $Id: hook_admin.inc.php,v 1.8 2006/05/15 09:09:48 sigurdne 
Exp $
        */
 
                {
@@ -26,8 +26,7 @@
                                'skill level'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=skill_level'),
                                'experience category'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=experience'),
                                'qualification category'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=qualification'),
-                               'Configure Access Permissions'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl'),
-                               'Configure Access Permissions(API version)'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.list_acl&acl_app='.$appname),
+                               'Configure Access Permissions'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiadmin_acl.list_acl&acl_app='.$appname),
                        );
                        display_section($appname,$appname,$file);
                }