Changeset 1449

Timestamp:

12/07/2007 03:04:05 PM (10 months ago)

Author:

Geert

Message:

• Added uri->rsegment_array(), uri->total_rsegments() and uri->last_rsegment()
  
• Synced i18n/nl_NL
  
• Some other minor changes
  

Location:

trunk/system

Files:

• helpers/valid.php (modified) (3 diffs)
• i18n/nl_NL/cache.php (modified) (1 diff)
• i18n/nl_NL/core.php (modified) (1 diff)
• libraries/Pagination.php (modified) (1 diff)
• libraries/Payment.php (modified) (2 diffs)
• libraries/URI.php (modified) (4 diffs)

trunk/system/helpers/valid.php

@@ -153 +153 @@
                                 'luhn'   => TRUE
                         ),
+                        'maestro' => array
+                        (
+                                'length' => '16,18',
+                                'prefix' => '50(?:20|38)|6(?:304|759)',
+                                'luhn'   => TRUE
+                        ),
+                        'mastercard' => array
+                        (
+                                'length' => '16',
+                                'prefix' => '5[1-5]',
+                                'luhn'   => TRUE
+                        ),
                         'visa' => array
                         (
@@ -159 +171 @@
                                 'luhn'   => TRUE
                         ),
-                        'maestro' => array
-                        (
-                                'length' => '16,18',
-                                'prefix' => '50(?:20|38)|6(?:304|759)',
-                                'luhn'   => TRUE
-                        ),
-                        'mastercard' => array
+                        'visa electron' => array
                         (
                                 'length' => '16',
-                                'prefix' => '5[1-5]',
+                                'prefix' => '4(?:17500|91[37]|508|844)',
                                 'luhn'   => TRUE
                         ),
@@ -225 +231 @@
         public static function phone($number)
         {
-                $number = preg_replace('/[^0-9]/', '', $number);
+                $number = preg_replace('/\D+/', '', $number);
 
                 if (strlen($number) > 10 AND substr($number, 0, 1) === '1')

trunk/system/i18n/nl_NL/cache.php

@@ -6 +6 @@
         'unwritable'           => 'De geconfigureerde opslaglocatie, <tt>%s</tt>, is niet schrijfbaar.',
         'resources'            => 'Het cachen van resources is onmogelijk omdat resources niet geserialized kunnen worden.',
+        'driver_error'         => '%s',
 );

trunk/system/i18n/nl_NL/core.php

@@ -12 +12 @@
         'page_not_found'        => 'De opgevraagde pagina, <tt>%s</tt>, kon niet gevonden worden.',
         'stats_footer'          => 'Geladen in {execution_time} seconden, met een geheugengebruik van {memory_usage}. Aangedreven door Kohana v{kohana_version}.',
-        'error_message'         => 'Fout vond plaats op <strong>lijn %s</strong> van <strong>%s</strong>.'
+        'error_message'         => 'Fout vond plaats op <strong>lijn %s</strong> van <strong>%s</strong>.',
+        'stack_trace'           => 'Stack Trace',
 );

trunk/system/libraries/Pagination.php

@@ -93 +93 @@
                         }
 
-                        // Create a generic base_url with {page} and {query_string} placeholders
+                        // Create a generic base_url including query string and a {page} placeholder
                         $this->base_url[$this->uri_segment - 1] = '{page}';
                         $this->base_url = url::site(implode('/', $this->base_url)).Router::$query_string;

trunk/system/libraries/Payment.php

@@ -17 +17 @@
                 'driver'      => NULL,
                 // Curl config, see http://us.php.net/manual/en/function.curl-setopt.php for details
-                'curl_config' => array(CURLOPT_HEADER => FALSE,
-                               CURLOPT_RETURNTRANSFER => TRUE,
-                               CURLOPT_SSL_VERIFYPEER => FALSE
-                              ),
+                'curl_config' => array
+                (
+                        CURLOPT_HEADER         => FALSE,
+                        CURLOPT_RETURNTRANSFER => TRUE,
+                        CURLOPT_SSL_VERIFYPEER => FALSE
+                ),
                 // Test mode is set to true by default
                 'test_mode'   => TRUE,
@@ -69 +71 @@
                         $config = Config::item('payment.default');
                 }
-                else if (is_string($config))
+                elseif (is_string($config))
                 {
                         $this->config['driver'] = $config;

trunk/system/libraries/URI.php

@@ -126 +126 @@
 
         /**
+         * Method: rsegment_array
+         *  Returns an array containing all the re-routed URI segments.
+         *
+         * Parameters:
+         *  offset      - rsegment offset
+         *  associative - return an associative array
+         *
+         * Returns:
+         *   Array of re-routed URI segments
+         */
+        public function rsegment_array($offset = 0, $associative = FALSE)
+        {
+                $segment_array = self::$rsegments;
+                array_unshift($segment_array, 0);
+                $segment_array = array_slice($segment_array, $offset + 1, $this->total_segments(), TRUE);
+
+                if ( ! $associative)
+                        return $segment_array;
+
+                $segment_array_assoc = array();
+
+                foreach (array_chunk($segment_array, 2) as $pair)
+                {
+                        $segment_array_assoc[$pair[0]] = isset($pair[1]) ? $pair[1] : '';
+                }
+
+                return $segment_array_assoc;
+        }
+
+        /**
          * Method: string
          *  Returns the complete URI as a string.
@@ -136 +166 @@
                 return self::$current_uri;
         }
-        
+
+        /**
+         * Method: __toString
+         *  Magic method for converting an object to a string.
+         *
+         * Returns:
+         *  Full URI as string
+         */     
         public function __toString()
         {
@@ -152 +189 @@
         {
                 return count(self::$segments);
+        }
+
+        /**
+         * Method: total_rsegments
+         *  Returns the total number of re-routed URI segments.
+         *
+         * Returns:
+         *   Total number of re-routed URI segments
+         */
+        public function total_rsegments()
+        {
+                return count(self::$rsegments);
         }
 
@@ -169 +218 @@
         }
 
+        /**
+         * Method: last_rsegment
+         *  Returns the last re-routed URI segment.
+         *
+         * Returns:
+         *   Last re-routed URI segment
+         */
+        public function last_rsegment($default = FALSE)
+        {
+                if ($this->total_rsegments() < 1)
+                        return $default;
+                
+                return end(self::$rsegments);
+        }
+
 } // End URI Class