Changeset 2344

Timestamp:

03/25/2008 09:21:45 AM (8 months ago)

Author:

Geert

Message:

Added prep_url() method to Validation

Files:

• trunk/system/libraries/Validation.php (modified) (3 diffs)

trunk/system/libraries/Validation.php

@@ -138 +138 @@
         public function pre_filter($filter, $field = TRUE)
         {
+                if (method_exists($this, $filter))
+                {
+                        // Make the filter a valid callback
+                        $filter = array($this, $filter);
+                }
+
                 if ( ! is_callable($filter))
                         throw new Kohana_Exception('validation.filter_not_callable');
@@ -174 +180 @@
         public function post_filter($filter, $field = TRUE)
         {
+                if (method_exists($this, $filter))
+                {
+                        // Make the filter a valid callback
+                        $filter = array($this, $filter);
+                }
+
                 if ( ! is_callable($filter, TRUE))
                         throw new Kohana_Exception('validation.filter_not_callable');
@@ -587 +599 @@
         }
 
+        /**
+         * Filter: prep_url. Prepares a URL for valid::url().
+         *
+         * @param   string  possibly incomplete URL
+         * @return  string
+         */
+        public function prep_url($str = '')
+        {
+                if ($str === '' OR $str === 'http://' OR $str === 'https://')
+                        return '';
+
+                if (substr($str, 0, 7) !== 'http://' AND substr($str, 0, 8) !== 'https://')
+                        return 'http://'.$str;
+        }
+
 } // End Validation