From 5de5b936ab61231d4f28a22d2d7fc25217f6053a Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Tue, 13 Feb 2001 01:00:16 +0000
Subject: [PATCH] readjust grantor record layout

---
 calendar/acl_preferences.php   | 4 ++--
 phpgwapi/inc/class.acl.inc.php | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/calendar/acl_preferences.php b/calendar/acl_preferences.php
index be7ad633b8..eb4b08c8fe 100755
--- a/calendar/acl_preferences.php
+++ b/calendar/acl_preferences.php
@@ -71,7 +71,7 @@
       while(list($right,$permission) = each($acllist)) {
         $totalacl += $right;
       }
-      $acl->add($phpgw_info["flags"]["currentapp"],'g_'.$group_id,$totalacl);
+      $acl->add($phpgw_info["flags"]["currentapp"],$group_id,$totalacl);
     }
 
 // User records
@@ -83,7 +83,7 @@
       while(list($right,$permission) = each($acllist)) {
         $totalacl += $right;
       }
-      $acl->add($phpgw_info["flags"]["currentapp"],'u_'.$user_id,$totalacl);
+      $acl->add($phpgw_info["flags"]["currentapp"],$user_id,$totalacl);
     }
   }
 
diff --git a/phpgwapi/inc/class.acl.inc.php b/phpgwapi/inc/class.acl.inc.php
index 77bdba8b11..2d6f058970 100644
--- a/phpgwapi/inc/class.acl.inc.php
+++ b/phpgwapi/inc/class.acl.inc.php
@@ -327,9 +327,6 @@ It should use the values in the $this->data
       
       $db2 = $this->db;
       
-      $group_pre = 'g_';
-      $user_pre = 'u_';
-      
       if ($app==False)
       {
         $app = $phpgw_info['flags']['currentapp'];
@@ -337,12 +334,12 @@ It should use the values in the $this->data
 
       $sql = "select acl_account, acl_rights from phpgw_acl where acl_appname = '$app' and "
            . "acl_location in ";
-      $security = "('". $user_pre . $phpgw_info['user']['account_id'] ."'";
+      $security = "('". $phpgw_info['user']['account_id'] ."'";
       $my_memberships = $phpgw->accounts->memberships($phpgw_info['user']['account_id']);
       while($groups = each($my_memberships))
       {
         $group = each($groups);
-        $security .= ",'" . $group_pre . $group[1]['account_id'] . "'";
+        $security .= ",'" . $group[1]['account_id'] . "'";
       }
 	  $security .= ')';
 	  $db2->query($sql . $security ,__LINE__,__FILE__);