Changeset 233 for trunk

Timestamp:

07/28/06 05:18:21 (6 years ago)

Author:

john

Message:

helper fixes

Location:

trunk/trax/vendor/trax/action_view

Files:

• helpers.php (modified) (2 diffs)
• helpers/form_helper.php (modified) (1 diff)
• helpers/form_options_helper.php (modified) (8 diffs)

trunk/trax/vendor/trax/action_view/helpers.php

@@ -292 +292 @@
         $html = "<$name ";
         $html .= $this->tag_options($options);
+        if($options['strip_slashes']) {
+            $content = stripslashes($content);    
+        }
         $html .= ">$content</$name>";
         return $html."\n";
@@ -313 +316 @@
      */
     function error_wrapping($html_tag, $has_error) {
-        return ($has_error ? '<span class="fieldWithErrors">' . $html_tag . '</span>' : $html_tag);
+        return ($has_error ? '<span class="fieldWithErrors">' . eregi_replace("[\n\r]", '', $html_tag) . '</span>' : $html_tag);
     }         
 

trunk/trax/vendor/trax/action_view/helpers/form_helper.php

@@ -269 +269 @@
 
         $options = $this->add_default_name_and_id($options);
-        return $this->error_wrapping($this->tag("input", $options) . $this->tag("input", array("name" => $options["name"], "type" => "hidden", "value" => $unchecked_value)),$this->object()->errors[$this->attribute_name]);
+        return $this->error_wrapping($this->tag("input", array("name" => $options["name"], "type" => "hidden", "value" => $unchecked_value)) . $this->tag("input", $options),$this->object()->errors[$this->attribute_name]);
     }
 

trunk/trax/vendor/trax/action_view/helpers/form_options_helper.php

@@ -110 +110 @@
         if(is_array($choices)) {
             foreach($choices as $choice_value => $choice_text) {
-                if(!empty($choice_value)) {
+                if(!empty($choice_value) || is_numeric($choice_value)) {
                     $is_selected = ($choice_value == $selected)
                         ? true : false;   
@@ -119 +119 @@
                 if($is_selected) {
                     $options[] = "<option value=\""
-              . htmlspecialchars($choice_value)
-              . "\" selected=\"selected\">"
-              . htmlspecialchars($choice_text)."</option>";
+                    . htmlspecialchars($choice_value)
+                    . "\" selected=\"selected\">"
+                    . htmlspecialchars($choice_text)."</option>";
                 } else {
                     $options[] = "<option value=\""
-              . htmlspecialchars($choice_value)
-              . "\">"
-              . htmlspecialchars($choice_text)."</option>";
+                    . htmlspecialchars($choice_value)
+                    . "\">"
+                    . htmlspecialchars($choice_text)."</option>";
                 }                        
             }    
@@ -202 +202 @@
     function to_select_tag($choices, $options, $html_options) {
         $html_options = $this->add_default_name_and_id($html_options);
+        $value = $this->value();
         return $this->error_wrapping(
             $this->content_tag(
                  "select",
                  $this->add_options(
-                           $this->options_for_select($choices, $this->value()),
+                           $this->options_for_select($choices, $value),
                            $options,
-                           $this->value()),
+                           $value),
                  $html_options),
              $this->object()->errors[$this->attribute_name]);
@@ -226 +227 @@
                                       $html_options) {
         $html_options = $this->add_default_name_and_id($html_options);
+        $value = $this->value();
         return $this->error_wrapping(
             $this->content_tag(
@@ -234 +236 @@
                         $attribute_value,
                         $attribute_text,
-                        $this->value()),
+                        $value),
                     $options,
-                    $this->value()),
+                    $value),
                 $html_options),
             $this->object()->errors[$this->attribute_name]);
@@ -252 +254 @@
                                    $options, $html_options) {
         $html_options = $this->add_default_name_and_id($html_options);
+        $value = $this->value();
         return $this->error_wrapping(
             $this->content_tag(
                 "select",
                 $this->add_options(
-                        $this->country_options_for_select($this->value(),
+                        $this->country_options_for_select($value,
                                                           $priority_countries),
                         $options,
-                        $this->value),
+                        $value),
                 $html_options),
             $this->object()->errors[$this->attribute_name]);
@@ -270 +273 @@
      *  @param string[]
      *  @param string
-     *  @todo <b>FIXME:</b> Why the third argument?  It's overwritten!
      *  @uses value()
      */
@@ -278 +280 @@
             $option_tags = "<option value=\"\"></option>\n" . $option_tags;
         } 
-        $value = $this->value();
         if(empty($value) && array_key_exists('prompt', $options)) {
             $text = $options['prompt'] ? $options['prompt'] : "Please select";