Changeset 15905 for trunk/inc

Timestamp:

01/22/12 23:18:49 (4 months ago)

Author:

Alexander Trofimov

Message:

Forms - hidden_for_levels renamed to visible_for_levels

Location:

trunk/inc/classes

Files:

• BxDolForm.php (modified) (2 diffs)
• BxDolFormQuery.php (modified) (3 diffs)

trunk/inc/classes/BxDolForm.php

@@ -154 +154 @@
  * - display_name - name of the Form Display from sys_form_displays table.
  * - input_name - name of the Form Field from sys_form_inputs table.
- * - hidden_for_levels - bit field with set of member level ids. To use member level id in bit field the level id minus 1 is used as power of 2, for example:
+ * - visible_for_levels - bit field with set of member level ids. To use member level id in bit field the level id minus 1 is used as power of 2, for example:
  *      - user level id = 1 -> 2^(1-1) = 1
  *      - user level id = 2 -> 2^(2-1) = 2
@@ -962 +962 @@
         return $isValid;
     }
+
+    /**
+     * Check if form field is visible.
+     * @param $aInput form field array
+     * @return boolean
+     */ 
+    protected function _isVisible ($aInput) {
+        bx_import('BxDolAcl');
+        echo $aInput['name'] . ' - ' . BxDolAcl::getInstance()->isMemberLevelInSet($aInput['visible_for_levels']) . '<br />';
+        return BxDolAcl::getInstance()->isMemberLevelInSet($aInput['visible_for_levels']);
+    }
 }
 

trunk/inc/classes/BxDolFormQuery.php

@@ -70 +70 @@
 
         // form inputs
-        $sQuery = $oDb->prepare("SELECT `i`.* FROM `sys_form_inputs` AS `i` INNER JOIN `sys_form_display_inputs` AS `d` ON (`d`.`input_name` = `i`.`name`) WHERE `d`.`active` = 1 AND `d`.`display_name` = ? ORDER BY `d`.`order` ASC", $aDisplay['display_name']);
+        $sQuery = $oDb->prepare("SELECT `i`.*, `d`.`visible_for_levels` FROM `sys_form_inputs` AS `i` INNER JOIN `sys_form_display_inputs` AS `d` ON (`d`.`input_name` = `i`.`name`) WHERE `d`.`active` = 1 AND `d`.`display_name` = ? ORDER BY `d`.`order` ASC", $aDisplay['display_name']);
         $aInputs = $oDb->getAllWithKey($sQuery, 'name');
         $aForm['inputs'] = array();
@@ -78 +78 @@
             // main attributes
             $aInput = array (
-                'type' => $a['type'],
+                'type' => $a['type'],                
                 'name' => $a['name'],
                 'caption' => _t($a['caption']),
@@ -88 +88 @@
                 'tr_attrs' => $a['attrs_tr'] ? unserialize($a['attrs_tr']) : false,
                 'attrs_wrapper' => $a['attrs_wrapper'] ? unserialize($a['attrs_wrapper']) : false,
+                'visible_for_levels' => $a['visible_for_levels'],
             );