Changeset 269 for trunk/trax/vendor

Timestamp:

10/31/06 18:44:25 (6 years ago)

Author:

john

Message:

minor fix to AC for the browser_url

Location:

trunk/trax/vendor/trax

Files:

• action_controller.php (modified) (2 diffs)
• action_view/helpers/form_options_helper.php (modified) (2 diffs)

trunk/trax/vendor/trax/action_controller.php

@@ -415 +415 @@
 
         # current url
-        if(isset($_SERVER['REDIRECT_URL'])) {
+        if(isset($_SERVER['REDIRECT_URL']) && !stristr($_SERVER['REDIRECT_URL'], 'dispatch.php')) {
             $browser_url = $_SERVER['REDIRECT_URL'];
-        } else {
-            $browser_url = $_SERVER['REQUEST_URI'];        
-        }        
-        #if(strstr($_SERVER['REQUEST_URI'], "?"))
-        #    $browser_url = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], "?"));
-        #else
-        #    $browser_url = $_SERVER['REQUEST_URI'];    
-        
+        } elseif(isset($_SERVER['REQUEST_URI'])) {
+            $browser_url = strstr($_SERVER['REQUEST_URI'], "?") ?
+                substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], "?")) :
+                $_SERVER['REQUEST_URI'];
+        }
+
         //error_log('browser url='.$browser_url);
         # strip off url prefix, if any
@@ -431 +429 @@
         }
 
-        # strip leading slash
-        // FIXME: Do we know for sure that the
-        // initial '/' will be there?
-        $browser_url = substr($browser_url,1);
+        # strip leading slash (if any)
+        if(substr($browser_url, 0, 1) == "/") {
+            $browser_url = substr($browser_url, 1);
+        }
 
         # strip trailing slash (if any)

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

@@ -121 +121 @@
                     . htmlspecialchars($choice_value)
                     . "\" selected=\"selected\">"
-                    . htmlspecialchars($choice_text)."</option>";
+                    . htmlspecialchars(is_object($choice_text) ? $choice_text->__toString() : $choice_text)."</option>";
                 } else {
                     $options[] = "<option value=\""
                     . htmlspecialchars($choice_value)
                     . "\">"
-                    . htmlspecialchars($choice_text)."</option>";
+                    . htmlspecialchars(is_object($choice_text) ? $choice_text->__toString() : $choice_text)."</option>";
                 }                        
             }    
@@ -157 +157 @@
             foreach($collection as $object) {
                 if(is_object($object)) {
-                    $options[$object->send($attribute_value)] =
-                        $object->send($attribute_text);            
+                    //$options[$object->send($attribute_value)] = $object->send($attribute_text);
+                    $options[$object->$attribute_value] = $object->$attribute_text;
                 }
             }