Changeset 15893

Timestamp:

01/18/12 02:04:39 (4 months ago)

Author:

Alexander Trofimov

Message:

Grid - visibile_for_levels field was added to sys_objects_grid table

Location:

trunk/inc/classes

Files:

• BxDolAcl.php (modified) (1 diff)
• BxDolGrid.php (modified) (3 diffs)
• BxDolPage.php (modified) (1 diff)

trunk/inc/classes/BxDolAcl.php

@@ -103 +103 @@
 
         return $GLOBALS['bxDolClasses'][__CLASS__];
+    }
+
+    /**
+     * Check if member has one of the provided membership levels
+     * @param $iPermissions - integer value to check permissions for, every bit is matched with some membership id
+     * @param $iProfileId - profile if to check, if it isn't provided or is 0 then currently loggen in profile is used.
+     * @return true if member has privided membership levels, or false if member hasn't.
+     */
+    public function isMemberLevelInSet($iPermissions, $iProfileId = 0) {
+        if (!$iPermissions)
+            return false;
+        if (!(int)$iProfileId)
+            $iProfileId = 1; // TODO: get current profile id
+        $aACL = $this->getMemberMembershipInfo($iProfileId);
+        return ($iPermissions & pow(2, $aACL['id'] - 1));
     }
 

trunk/inc/classes/BxDolGrid.php

@@ -67 +67 @@
  *      - auto: use 'like' or 'fulltext', depending on 'useLikeOperator' setting option.
  * - sorting_fields: comma separated field names, which will be allowed for sorting.
+ * - visibile_for_levels: bit field with set of member level ids. To use member level id in bit field - the level id minus 1 as power of 2 is used, for example:
+ *      - user level id = 1 -> 2^(1-1) = 1
+ *      - user level id = 2 -> 2^(2-1) = 2
+ *      - user level id = 3 -> 2^(3-1) = 4
+ *      - user level id = 4 -> 2^(4-1) = 8
  * - override_class_name: user defined class name which is derived from BxTemplGrid.
  * - override_class_file: the location of the user defined class, leave it empty if class is located in system folders.
@@ -281 +286 @@
         
         $o = new $sClass($aObject);
+        
+        if (!$o->_isVisibleGrid($aObject))
+            return false;
 
         return ($GLOBALS['bxDolClasses']['BxDolGrid!'.$sObject] = $o);
@@ -407 +415 @@
         return str_replace(' ', '', ucwords(str_replace('_' , ' ', $s)));
     }
+
+    protected function _isVisibleGrid ($a) {
+        bx_import('BxDolAcl');
+        return BxDolAcl::getInstance()->isMemberLevelInSet($a['visibile_for_levels']);
+    }
 }
 

trunk/inc/classes/BxDolPage.php

@@ -144 +144 @@
     }    
 
-    protected function _isVisible ($a) {
-        if (!$a['visibile_for_levels'])
-            return false;
-        bx_import('BxTemplAcl');
-        $oACL = BxTemplAcl::getInstance();
-        $iProfileId = 1; // TODO: get current profile id
-        $aACL = $oACL->getMemberMembershipInfo($iProfileId);
-        return ($a['visibile_for_levels'] & pow(2, $aACL['id'] - 1));
-    }
-
     protected function _isVisibleBlock ($a) {
-        return $this->_isVisible ($a);
+        bx_import('BxDolAcl');
+        return BxDolAcl::getInstance()->isMemberLevelInSet($a['visibile_for_levels']);
     }
 
     protected function _isVisiblePage ($a) {
-        return $this->_isVisible ($a);
+        bx_import('BxDolAcl');
+        return BxDolAcl::getInstance()->isMemberLevelInSet($a['visibile_for_levels']);
     }