Changeset 15905

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

Files:

• inc/classes/BxDolForm.php (modified) (2 diffs)
• inc/classes/BxDolFormQuery.php (modified) (3 diffs)
• install/sql/v70.sql (modified) (3 diffs)
• samples/BxSampleForm.php (modified) (1 diff)
• studio/classes/BxDolStudioFormsQuery.php (modified) (1 diff)
• templates/base/scripts/BxBaseFormView.php (modified) (2 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'],
             );
             

trunk/install/sql/v70.sql

@@ -4046 +4046 @@
   `display_name` varchar(32) NOT NULL,
   `input_name` varchar(32) NOT NULL,
-  `hidden_for_levels` int(10) unsigned NOT NULL,
+  `visible_for_levels` int(11) NOT NULL DEFAULT '2147483647',
   `active` tinyint(4) NOT NULL DEFAULT '0',
   `order` int(11) NOT NULL,
@@ -4564 +4564 @@
   `onclick` varchar(255) NOT NULL,
   `target` varchar(255) NOT NULL,
-  `icon` varchar(255) NOT NULL,  
+  `icon` varchar(255) NOT NULL,    
   `visible_for_levels` int(11) NOT NULL DEFAULT '2147483647',
   `active` tinyint(4) NOT NULL DEFAULT '1',
@@ -4571 +4571 @@
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-INSERT INTO `sys_menu` (`set_name`, `module`, `name`, `title`, `link`, `onclick`, `target`, `icon`, `hidden_for_levels`, `active`, `order`) VALUES
-('sys_site', 'system', 'home', '_Home', 'index.php', '', '', '', 0, 1, 1),
-('sys_site', 'system', 'tags', '_Tags', 'tags.php', '', '', '', 0, 1, 2),
-('sys_site', 'system', 'categories', '_Categories', 'categories.php', '', '', '', 0, 1, 3),
-('sys_site', 'system', 'join', '_Join', 'join.php', '', '', '', 4294967294, 1, 4),
+INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title`, `link`, `onclick`, `target`, `icon`, `visible_for_levels`, `active`, `order`) VALUES
+('sys_site', 'system', 'home', '_Home', 'index.php', '', '', '', 2147483647, 1, 1),
+('sys_site', 'system', 'tags', '_Tags', 'tags.php', '', '', '', 2147483647, 1, 2),
+('sys_site', 'system', 'categories', '_Categories', 'categories.php', '', '', '', 2147483647, 1, 3),
+('sys_site', 'system', 'join', '_Join', 'join.php', '', '', '', 1, 1, 4),
 ('sys_site', 'system', 'login', '_Login', 'member.php', '', '', '', 1, 1, 5),
-('sys_site', 'system', 'about', '_About', 'about_us.php', '', '', '', 0, 1, 6),
-('sys_site', 'system', 'help', '_help', 'help.php', '', '', '', 0, 1, 7),
-('sys_site', 'system', 'contact', '_Contact', 'contact.php', '', '', '', 0, 1, 8),
-('sys_footer', 'system', 'about', '_About', 'about_us.php', '', '', '', 0, 1, 1),
-('sys_footer', 'system', 'help', '_help', 'help.php', '', '', '', 0, 1, 2),
-('sys_footer', 'system', 'contact', '_Contact', 'contact.php', '', '', '', 0, 1, 3);
+('sys_site', 'system', 'about', '_About', 'about_us.php', '', '', '', 2147483647, 1, 6),
+('sys_site', 'system', 'help', '_help', 'help.php', '', '', '', 2147483647, 1, 7),
+('sys_site', 'system', 'contact', '_Contact', 'contact.php', '', '', '', 2147483647, 1, 8),
+('sys_footer', 'system', 'about', '_About', 'about_us.php', '', '', '', 2147483647, 1, 1),
+('sys_footer', 'system', 'help', '_help', 'help.php', '', '', '', 2147483647, 1, 2),
+('sys_footer', 'system', 'contact', '_Contact', 'contact.php', '', '', '', 2147483647, 1, 3);
 
 

trunk/samples/BxSampleForm.php

@@ -82 +82 @@
 -- SQL dump of form inputs association with form display:
 
-INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `hidden_for_levels`, `active`, `order`) VALUES
-('sample_form_objects_add', 'header_contact', 0, 1, 10),
-('sample_form_objects_add', 'text', 0, 1, 20),
-('sample_form_objects_add', 'date', 0, 1, 30),
-('sample_form_objects_add', 'datetime', 0, 1, 40),
-('sample_form_objects_add', 'number', 0, 1, 50),
-('sample_form_objects_add', 'checkbox', 0, 1, 60),
-('sample_form_objects_add', 'file', 0, 1, 70),
-('sample_form_objects_add', 'image', 0, 1, 80),
-('sample_form_objects_add', 'password', 0, 1, 90),
-('sample_form_objects_add', 'slider', 0, 1, 100),
-('sample_form_objects_add', 'doublerange', 0, 1, 110),
-('sample_form_objects_add', 'hidden', 0, 1, 120),
-('sample_form_objects_add', 'switcher', 0, 1, 130),
-('sample_form_objects_add', 'button', 0, 1, 140),
-('sample_form_objects_add', 'reset', 0, 1, 150),
-('sample_form_objects_add', 'submit', 0, 1, 160),
-('sample_form_objects_add', 'textarea', 0, 1, 170),
-('sample_form_objects_add', 'select', 0, 1, 180),
-('sample_form_objects_add', 'select_multiple', 0, 1, 190),
-('sample_form_objects_add', 'checkbox_set', 0, 1, 200),
-('sample_form_objects_add', 'radio_set', 0, 1, 210),
-('sample_form_objects_add', 'input_set', 0, 1, 220),
-('sample_form_objects_add', 'custom', 0, 1, 230),
-('sample_form_objects_add', 'captcha', 0, 1, 240),
-('sample_form_objects_add', 'value', 0, 1, 250),
-('sample_form_objects_add', 'header_submit', 0, 1, 1000),
-('sample_form_objects_add', 'do_submit', 0, 1, 1001),
-('sample_form_objects_edit', 'id', 0, 1, 10),
-('sample_form_objects_edit', 'text', 0, 0, 20),
-('sample_form_objects_edit', 'date', 0, 1, 30),
-('sample_form_objects_edit', 'datetime', 0, 1, 40),
-('sample_form_objects_edit', 'number', 0, 1, 50),
-('sample_form_objects_edit', 'checkbox', 0, 1, 60),
-('sample_form_objects_edit', 'password', 0, 1, 70),
-('sample_form_objects_edit', 'slider', 0, 1, 80),
-('sample_form_objects_edit', 'doublerange', 0, 1, 90),
-('sample_form_objects_edit', 'switcher', 0, 1, 100),
-('sample_form_objects_edit', 'textarea', 0, 1, 110),
-('sample_form_objects_edit', 'select', 0, 1, 120),
-('sample_form_objects_edit', 'select_multiple', 0, 1, 130),
-('sample_form_objects_edit', 'checkbox_set', 0, 1, 140),
-('sample_form_objects_edit', 'radio_set', 0, 1, 150),
-('sample_form_objects_edit', 'custom', 0, 1, 160),
-('sample_form_objects_edit', 'do_submit', 0, 1, 1000);
+INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES
+('sample_form_objects_add', 'header_contact', 2147483647, 1, 10),
+('sample_form_objects_add', 'text', 2147483647, 1, 20),
+('sample_form_objects_add', 'date', 2147483647, 1, 30),
+('sample_form_objects_add', 'datetime', 2147483647, 1, 40),
+('sample_form_objects_add', 'number', 2147483647, 1, 50),
+('sample_form_objects_add', 'checkbox', 2147483647, 1, 60),
+('sample_form_objects_add', 'file', 2147483647, 1, 70),
+('sample_form_objects_add', 'image', 2147483647, 1, 80),
+('sample_form_objects_add', 'password', 2147483647, 1, 90),
+('sample_form_objects_add', 'slider', 2147483647, 1, 100),
+('sample_form_objects_add', 'doublerange', 2147483647, 1, 110),
+('sample_form_objects_add', 'hidden', 2147483647, 1, 120),
+('sample_form_objects_add', 'switcher', 2147483647, 1, 130),
+('sample_form_objects_add', 'button', 2147483647, 1, 140),
+('sample_form_objects_add', 'reset', 2147483647, 1, 150),
+('sample_form_objects_add', 'submit', 2147483647, 1, 160),
+('sample_form_objects_add', 'textarea', 2147483647, 1, 170),
+('sample_form_objects_add', 'select', 2147483647, 1, 180),
+('sample_form_objects_add', 'select_multiple', 2147483647, 1, 190),
+('sample_form_objects_add', 'checkbox_set', 2147483647, 1, 200),
+('sample_form_objects_add', 'radio_set', 2147483647, 1, 210),
+('sample_form_objects_add', 'input_set', 2147483647, 1, 220),
+('sample_form_objects_add', 'custom', 2147483647, 1, 230),
+('sample_form_objects_add', 'captcha', 2147483647, 1, 240),
+('sample_form_objects_add', 'value', 2147483647, 1, 250),
+('sample_form_objects_add', 'header_submit', 2147483647, 1, 1000),
+('sample_form_objects_add', 'do_submit', 2147483647, 1, 1001),
+('sample_form_objects_edit', 'id', 2147483647, 1, 10),
+('sample_form_objects_edit', 'text', 2147483647, 0, 20),
+('sample_form_objects_edit', 'date', 2147483647, 1, 30),
+('sample_form_objects_edit', 'datetime', 2147483647, 1, 40),
+('sample_form_objects_edit', 'number', 2147483647, 1, 50),
+('sample_form_objects_edit', 'checkbox', 2147483647, 1, 60),
+('sample_form_objects_edit', 'password', 2147483647, 1, 70),
+('sample_form_objects_edit', 'slider', 2147483647, 1, 80),
+('sample_form_objects_edit', 'doublerange', 2147483647, 1, 90),
+('sample_form_objects_edit', 'switcher', 2147483647, 1, 100),
+('sample_form_objects_edit', 'textarea', 2147483647, 1, 110),
+('sample_form_objects_edit', 'select', 2147483647, 1, 120),
+('sample_form_objects_edit', 'select_multiple', 2147483647, 1, 130),
+('sample_form_objects_edit', 'checkbox_set', 2147483647, 1, 140),
+('sample_form_objects_edit', 'radio_set', 2147483647, 1, 150),
+('sample_form_objects_edit', 'custom', 2147483647, 1, 160),
+('sample_form_objects_edit', 'do_submit', 2147483647, 1, 1000);
 
 */

trunk/studio/classes/BxDolStudioFormsQuery.php

@@ -122 +122 @@
             `ti`.`type` AS `type`,
             `ti`.`caption` AS `caption`,
-            `tdi`.`hidden_for_levels` AS `hidden_for_levels`,
+            `tdi`.`visible_for_levels` AS `visible_for_levels`,
             `tdi`.`active` AS `active`,
             `tdi`.`order` AS `order`";

trunk/templates/base/scripts/BxBaseFormView.php

@@ -144 +144 @@
                 'name' => 'csrf_token',
                 'value' => $mixedCsrfToken,
-                'db' => array (
-                    'pass' => 'Xss',
-                )
+                'db' => array ('pass' => 'Xss'),
+                'visible_for_levels' => PHP_INT_MAX,
             );
         }        
@@ -163 +162 @@
         $sCont = '';
         foreach ($this->aInputs as $aInput)
-            $sCont .= $this->genRow($aInput);
+            if ($this->_isVisible($aInput)) 
+                $sCont .= $this->genRow($aInput);
         
         $sCloseSection = $this->getCloseSection();