Changeset 2598

Timestamp:

04/28/08 15:41:39 (4 months ago)

Author:

Geert

Message:

Fixing accidental overwrite in r2593

Location:

trunk/system

Files:

• helpers/arr.php (modified) (2 diffs)
• libraries/Calendar_Event.php (modified) (1 diff)
• libraries/Router.php (modified) (1 diff)
• libraries/drivers/Cache/Sqlite.php (modified) (1 diff)

trunk/system/helpers/arr.php

@@ -13 +13 @@
 
     /**
+     * Return a callback array from a string, eg: limit[10,20] would become
+     * array('limit', array('10', '20'))
+     *
+     * @param   string  callback string
+     * @return  array
+     */
+    public function callback_string($str)
+    {
+        // command[param,param]
+        if (preg_match('/([^\[]*+)\[(.+)\]/', (string) $str, $match))
+        {
+            // command
+            $command = $match[1];
+
+            // param,param
+            $params = preg_split('/(?<!\\\\),/', $match[2]);
+            $params = str_replace('\,', ',', $params);
+        }
+        else
+        {
+            // command
+            $command = $str;
+
+            // No params
+            $params = NULL;
+        }
+
+        return array($command, $params);
+    }
+
+    /**
      * Rotates a 2D array clockwise.
      * Example, turns a 2x3 array into a 3x2 array.
@@ -52 +83 @@
 
         return $val;
+    }
+
+    
+    /**
+     * Extract one or more keys from an array. Each key given after the first
+     * argument (the array) will be extracted. Keys that do not exist in the
+     * search array will be NULL in the extracted data.
+     *
+     * @param   array   array to search
+     * @param   string  key name
+     * @return  array
+     */
+    public function extract(array $search, $keys)
+    {
+        // Get the keys, removing the $search array
+        $keys = array_slice(func_get_args(), 1);
+
+        $found = array();
+        foreach ($keys as $key)
+        {
+            if (isset($search[$key]))
+            {
+                $found[$key] = $search[$key];
+            }
+            else
+            {
+                $found[$key] = NULL;
+            }
+        }
+
+        return $found;
     }
 

trunk/system/libraries/Calendar_Event.php

@@ -253 +253 @@
         // Reduce the timestamp by one week for each loop. This has the added
         // benefit of preventing an infinite loop.
-        while($timestamp -= 604800)
+        while ($timestamp -= 604800)
         {
             if (date('m', $timestamp) !== $month)

trunk/system/libraries/Router.php

@@ -108 +108 @@
                     if (is_file($path.$search.'/'.$segment.EXT))
                     {
-                        self::$directory  = $path.$search.'/';
+                        self::$directory       = $path.$search.'/';
                         self::$controller_path = $controller_path;
-                        self::$controller = $segment;
-                        self::$method     = isset(self::$rsegments[$key + 1]) ? self::$rsegments[$key + 1] : 'index';
-                        self::$arguments  = isset(self::$rsegments[$key + 2]) ? array_slice(self::$rsegments, $key + 2) : array();
+                        self::$controller      = $segment;
+                        self::$method          = isset(self::$rsegments[$key + 1]) ? self::$rsegments[$key + 1] : 'index';
+                        self::$arguments       = isset(self::$rsegments[$key + 2]) ? array_slice(self::$rsegments, $key + 2) : array();
 
                         // Stop searching, two levels

trunk/system/libraries/drivers/Cache/Sqlite.php

@@ -137 +137 @@
         {
             $array = array();
-            while($row = $query->fetchObject())
+            while ($row = $query->fetchObject())
             {
                 // Add each id to the array