Should fix #722

Author: mastacontrola

packages/web/lib/fog/system.class.php

@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.5.10.1695');
+        define('FOG_VERSION', '1.5.10.1696');
         define('FOG_SCHEMA', 273);
         define('FOG_BCACHE_VER', 141);
         define('FOG_CLIENT_VERSION', '0.13.0');

packages/web/lib/plugins/accesscontrol/hooks/addaccesscontroluser.hook.php

@@ -232,23 +232,28 @@ public function userAddAccessControl($arguments)
         if (!in_array($sub, $subs)) {
             return;
         }
+        $ac_setter = $_REQUEST['accesscontrol'];
+        if (!$ac_setter) {
+            return;
+        }
         self::getClass('AccessControlAssociationManager')->destroy(
             array(
-                'userID' => $arguments['User']->get('id')
+                'userID' => $arguments['User']->get('id'),
+                'accesscontrolID' => $ac_setter
             )
         );
         $cnt = self::getClass('AccessControlManager')
             ->count(
-                array('id' => $_REQUEST['accesscontrol'])
+                array('id' => $ac_setter)
             );
         if ($cnt !== 1) {
             return;
         }
-        $Role = new AccessControl($_REQUEST['accesscontrol']);
+        $Role = new AccessControl($ac_setter);
         self::getClass('AccessControlAssociation')
             ->set('userID', $arguments['User']->get('id'))
             ->load('userID')
-            ->set('accesscontrolID', $_REQUEST['accesscontrol'])
+            ->set('accesscontrolID', $ac_setter)
             ->set(
                 'name',
                 sprintf(