Changeset 1503

Timestamp:

12/12/2007 04:13:09 PM (13 months ago)

Author:

Shadowhand

Message:

Updated Form_Checklist with new syntax. Options are now defined as: $options = array($value => array($title, $checked)).

Files:

• trunk/modules/forge/libraries/Form_Checklist.php (modified) (5 diffs)

trunk/modules/forge/libraries/Form_Checklist.php

@@ -5 +5 @@
         protected $data = array
         (
-                'name'  => '',
-                'type'  => 'checkbox',
-                'class' => 'checklist',
+                'name'    => '',
+                'type'    => 'checkbox',
+                'class'   => 'checklist',
+                'options' => array(),
         );
 
@@ -22 +23 @@
                 {
                         // Return the currently checked values
-                        return array_keys($this->data['options'], TRUE);
+                        $array = array();
+                        foreach($this->data['options'] as $id => $opt)
+                        {
+                                // Return the options that are checked
+                                ($opt[1] == TRUE) and $array[] = $id;
+                        }
+                        return $array;
                 }
 
@@ -40 +47 @@
 
                 $checklist = '<ul class="'.arr::remove('class', $base_data).'">'.$nl;
-                foreach(arr::remove('options', $base_data) as $val => $checked)
+                foreach(arr::remove('options', $base_data) as $val => $opt)
                 {
                         // New set of input data
                         $data = $base_data;
+
+                        // Get the title and checked status
+                        list ($title, $checked) = $opt;
 
                         // Set the name, value, and checked status
@@ -49 +59 @@
                         $data['checked'] = $checked;
 
-                        $checklist .= '<li><label>'.form::checkbox($data).' '.$val.'</label></li>'.$nl;
+                        $checklist .= '<li><label>'.form::checkbox($data).' '.$title.'</label></li>'.$nl;
                 }
                 $checklist .= '</ul>';
@@ -65 +75 @@
                         if (empty($_POST[$this->data['name']]))
                         {
-                                $this->data['options'][$val] = FALSE;
+                                $this->data['options'][$val][1] = FALSE;
                         }
                         else
                         {
-                                $this->data['options'][$val] = in_array($val, $_POST[$this->data['name']]);
+                                $this->data['options'][$val][1] = in_array($val, $_POST[$this->data['name']]);
                         }
                 }