Convert horde/Group to using Horde_Session

diff --git a/framework/Group/lib/Horde/Group/Contactlists.php b/framework/Group/lib/Horde/Group/Contactlists.php
index 9f27a00..72fa758 100644 (file)
--- a/framework/Group/lib/Horde/Group/Contactlists.php
+++ b/framework/Group/lib/Horde/Group/Contactlists.php
@@ -562,8 +562,9 @@ class Horde_Group_Contactlists extends Horde_Group
      */
     public function userIsInGroup($user, $gid, $subgroups = true)
     {
-        if (isset($_SESSION['horde']['groups']['i'][$user][$subgroups][$gid])) {
-            return $_SESSION['horde']['groups']['i'][$user][$subgroups][$gid];
+        $id = implode('-', array($user, $subgroups, $gid);
+        if (isset($GLOBALS['session']['horde:groups_i/' . $id])) {
+            return $GLOBALS['session']['horde:groups_i/' . $id];
         }
 
         try {
@@ -573,8 +574,7 @@ class Horde_Group_Contactlists extends Horde_Group
             return false;
         }
 
-        $result = (bool)!empty($users[$user]);
-        $_SESSION['horde']['groups']['i'][$user][$subgroups][$gid] = $result;
+        $GLOBALS['session']['horde:groups_i/' . $id] = $result = (bool)!empty($users[$user]);
 
         return $result;
     }

diff --git a/framework/Group/lib/Horde/Group/Sql.php b/framework/Group/lib/Horde/Group/Sql.php
index 05db962..859daea 100644 (file)
--- a/framework/Group/lib/Horde/Group/Sql.php
+++ b/framework/Group/lib/Horde/Group/Sql.php
@@ -640,8 +640,9 @@ class Horde_Group_Sql extends Horde_Group
      */
     public function getGroupMemberships($user, $parentGroups = false)
     {
-        if (isset($_SESSION['horde']['groups']['m'][$user][$parentGroups])) {
-            return $_SESSION['horde']['groups']['m'][$user][$parentGroups];
+        $id = implode('|', array($user, $parentGroups));
+        if (isset($GLOBALS['session']['horde:groups_m/' . $id])) {
+            return $GLOBALS['session']['horde:groups_m/' . $id];
         }
 
         $sql = 'SELECT g.group_uid AS group_uid, g.group_name AS group_name FROM horde_groups g, horde_groups_members m '
@@ -663,7 +664,7 @@ class Horde_Group_Sql extends Horde_Group
             }
         }
 
-        $_SESSION['horde']['groups']['m'][$user][$parentGroups] = $groups;
+        $GLOBALS['session']['horde:groups_m/' . $id] = $groups;
 
         return $groups;
     }
@@ -680,8 +681,9 @@ class Horde_Group_Sql extends Horde_Group
      */
     public function userIsInGroup($user, $gid, $subgroups = true)
     {
-        if (isset($_SESSION['horde']['groups']['i'][$user][$subgroups][$gid])) {
-            return $_SESSION['horde']['groups']['i'][$user][$subgroups][$gid];
+        $id = implode('|', array($user, $subgroups, $gid));
+        if (isset($GLOBALS['session']['horde:groups_i/' . $id])) {
+            return $GLOBALS['session']['horde:groups_i/' . $id];
         }
 
         if ($subgroups) {
@@ -703,7 +705,8 @@ class Horde_Group_Sql extends Horde_Group
 
         }
 
-        $_SESSION['horde']['groups']['i'][$user][$subgroups][$gid] = (bool)$result;
+        $GLOBALS['session']['horde:groups_i/' . $id] = (bool)$result;
+
         return (bool)$result;
     }