Changeset 2025 for trunk/system/helpers/form.php

Timestamp:

02/10/2008 12:36:29 PM (11 months ago)

Author:

Shadowhand

Message:

Fixing #376, thanks JAAulde.

Files:

• trunk/system/helpers/form.php (modified) (6 diffs)

trunk/system/helpers/form.php

@@ -249 +249 @@
                 }
 
-                return '<textarea'.form::attributes($data).$extra.'>'.html::specialchars($value).'</textarea>';
+                return '<textarea'.form::attributes($data, 'textarea').$extra.'>'.html::specialchars($value).'</textarea>';
         }
 
@@ -277 +277 @@
                 $selected = (string) $selected;
 
-                $input = '<select'.form::attributes($data).$extra.'>'."\n";
+                $input = '<select'.form::attributes($data, 'select').$extra.'>'."\n";
                 foreach ($options as $key => $val)
                 {
@@ -402 +402 @@
                 }
 
-                $data += array
-                (
-                        'type'  => 'button'
-                );
-
                 if (isset($data['value']))
                 {
@@ -418 +413 @@
                 }
 
-                return '<button'.form::attributes($data).$extra.'>'.html::specialchars($value).'</button>';
+                return '<button'.form::attributes($data, 'button').$extra.'>'.html::specialchars($value).'</button>';
         }
 
@@ -468 +463 @@
          * @return  string
          */
-        public static function attributes($attr)
+        public static function attributes($attr, $type = NULL)
         {
                 if (empty($attr))
                         return '';
 
-                if ( ! empty($attr['name']) AND strpos($attr['name'], '[') === FALSE AND empty($attr['id']))
-                {
-                        $attr['id'] = $attr['name'];
+                if ($type === NULL AND ! empty($attr['type']))
+                {
+                        // Set the type by the attributes
+                        $type = $attr['type'];
+                }
+
+                if (isset($attr['name']) AND empty($attr['id']) AND strpos($attr['name'], '[') === FALSE)
+                {
+                        switch ($type)
+                        {
+                                case 'text':
+                                case 'textarea':
+                                case 'password':
+                                case 'select':
+                                case 'checkbox':
+                                case 'file':
+                                case 'image':
+                                case 'button':
+                                case 'submit':
+                                        // Only specific types of inputs use name to id matching
+                                        $attr['id'] = $attr['name'];
+                                break;
+                        }
                 }
 
@@ -508 +523 @@
                         if (isset($attr[$key]))
                         {
+                                // Move the attribute to the sorted array
                                 $sorted[$key] = $attr[$key];
+
+                                // Remove the attribute from unsorted array
+                                unset($attr[$key]);
                         }
                 }
 
-                $sorted = array_merge($sorted, $attr);
-
-                return html::attributes($sorted);
+                // Combine the sorted and unsorted attributes and create an HTML string
+                return html::attributes(array_merge($sorted, $attr));
         }