Changeset 316 for trunk

Timestamp:

07/08/09 02:35:59 (3 years ago)

Author:

john

Message:

bug fixes / updates

Location:

trunk/trax/vendor/trax

Files:

• action_view/helpers/active_record_helper.php (modified) (1 diff)
• action_view/helpers/date_helper.php (modified) (1 diff)
• action_view/helpers/form_helper.php (modified) (2 diffs)
• action_view/helpers/form_options_helper.php (modified) (1 diff)
• session.php (modified) (1 diff)
• trax.php (modified) (2 diffs)

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

@@ -173 +173 @@
             $header_sub_message = isset($options['header_sub_message']) ?
                 $options['header_sub_message'] : "There were problems with the following fields:";
-                
+
             return $this->content_tag("div",
                 $this->content_tag(

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

@@ -1591 +1591 @@
     $date_helper = new DateHelper($object, $attribute);
     return $date_helper->expiration_date_select($options);        
+} 
+
+/**
+ *  Make a new DateHelper object and call its select_year() method
+ *
+ *  Generate HTML/XML for year selector pull-down menu using only
+ *  explicit month specification.<br />
+ *  <b>NB:</b>  An attempt to get value of an attribute will always
+ *  fail because there is no way to set
+ *  {@link DateHelper::object_name} and
+ *  {@link DateHelper::attribute_name}.
+ *  @uses DateHelper::select_year()
+ */
+function select_year() {
+    $date_helper = new DateHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($date_helper, 'select_year'), $args);    
 }
 

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

@@ -367 +367 @@
  * is set to 0 which is convenient for boolean values. Usually unchecked checkboxes don't post anything.
  * We work around this problem by adding a hidden value with the same name as the checkbox.
-#
+ *
  * Example: Imagine that $post->validated is 1:
  *   check_box("post", "validated");
@@ -373 +373 @@
  *   <input type="checkbox" id="post_validate" name="post[validated] value="1" checked="checked" />
  *   <input name="post[validated]" type="hidden" value="0" />
-#
+ *
  * Example: Imagine that $puppy->gooddog is no:
  *   check_box("puppy", "gooddog", array(), "yes", "no");

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

@@ -202 +202 @@
     function to_select_tag($choices, $options, $html_options) {
         $html_options = $this->add_default_name_and_id($html_options);
-        $value = $this->value();
+        $value = isset($options['selected']) ? $options['selected'] : $this->value();
         return $this->error_wrapping(
             $this->content_tag(

trunk/trax/vendor/trax/session.php

@@ -202 +202 @@
      */
     function is_aol_host() {
-        if(ereg("proxy\.aol\.com$", gethostbyaddr($_SERVER['REMOTE_ADDR'])) ||
+        if(isset($_SERVER['REMOTE_ADDR']) && ereg("proxy\.aol\.com$", gethostbyaddr($_SERVER['REMOTE_ADDR'])) ||
            stristr($_SERVER['HTTP_USER_AGENT'], "AOL")) {
             return true;

trunk/trax/vendor/trax/trax.php

@@ -98 +98 @@
         ini_set("log_errors", "On");
         ini_set("error_log", self::$log_path."/".TRAX_ENV.".log");
-
+         
         if(TRAX_ENV == "development") {
             # Display errors to browser if in development mode for debugging
@@ -128 +128 @@
         include_once("router.php");
 
-        # Make sure database settings are cleared out
-        ActiveRecord::$database_settings = array();
+        self::load_active_record_connections_config();
+
+    }  
+    
+    function load_active_record_connections_config() {
+        # Make sure database settings are cleared out 
+        ActiveRecord::$database_settings = array();   
+        ActiveRecord::clear_all_connections();
         if(file_exists(self::$config_path."/database.ini")) {
             # Load databse settings 
-            ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true);
+            ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true); 
+            #error_log("db settings:".print_r(ActiveRecord::$database_settings, true));
         }
-        ActiveRecord::$environment = TRAX_ENV;
-
+        ActiveRecord::$environment = TRAX_ENV;        
     }