Refresh kohana from upstream svn trunk r3771.

During this process, remove a considerable number of files from kohana
that we will not be needing in Gallery3, including the following files
and directories:
    kohana/application
    kohana/example.htaccess
    kohana/index.php
    kohana/install.php
    kohana/kohana.png
    kohana/modules/archive
    kohana/modules/auth
    kohana/modules/flot
    kohana/modules/gmaps
    kohana/modules/kodoc
    kohana/modules/payment
    kohana/modules/smarty
    kohana/modules/unit_test/i18n
    kohana/modules/unit_test/tests/Example_Test.php
    kohana/modules/unit_test/tests/Valid_Test.php
    kohana/system/config/captcha.php
    kohana/system/controllers/captcha.php
    kohana/system/fonts
    kohana/system/i18n
    kohana/system/libraries/Calendar.php
    kohana/system/libraries/Calendar_Event.php
    kohana/system/libraries/Captcha.php
    kohana/system/libraries/Tagcloud.php
    kohana/system/vendor
    kohana/system/views/pagination
    kohana/system/views/kohana_calendar.php

1 files changed, 279 insertions, 0 deletions

diff --git a/kohana/libraries/URI.php b/kohana/libraries/URI.php
new file mode 100644
index 00000000..0c99f0f0
--- /dev/null
+++ b/kohana/libraries/URI.php
@@ -0,0 +1,279 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * URI library.
+ *
+ * $Id$
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class URI_Core extends Router {
+
+	/**
+	 * Returns a singleton instance of URI.
+	 *
+	 * @return  object
+	 */
+	public static function instance()
+	{
+		static $instance;
+
+		if ($instance == NULL)
+		{
+			// Initialize the URI instance
+			$instance = new URI;
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * Retrieve a specific URI segment.
+	 *
+	 * @param   integer|string  segment number or label
+	 * @param   mixed           default value returned if segment does not exist
+	 * @return  string
+	 */
+	public function segment($index = 1, $default = FALSE)
+	{
+		if (is_string($index))
+		{
+			if (($key = array_search($index, self::$segments)) === FALSE)
+				return $default;
+
+			$index = $key + 2;
+		}
+
+		$index = (int) $index - 1;
+
+		return isset(self::$segments[$index]) ? self::$segments[$index] : $default;
+	}
+
+	/**
+	 * Retrieve a specific routed URI segment.
+	 *
+	 * @param   integer|string  rsegment number or label
+	 * @param   mixed           default value returned if segment does not exist
+	 * @return  string
+	 */
+	public function rsegment($index = 1, $default = FALSE)
+	{
+		if (is_string($index))
+		{
+			if (($key = array_search($index, self::$rsegments)) === FALSE)
+				return $default;
+
+			$index = $key + 2;
+		}
+
+		$index = (int) $index - 1;
+
+		return isset(self::$rsegments[$index]) ? self::$rsegments[$index] : $default;
+	}
+
+	/**
+	 * Retrieve a specific URI argument.
+	 * This is the part of the segments that does not indicate controller or method
+	 *
+	 * @param   integer|string  argument number or label
+	 * @param   mixed           default value returned if segment does not exist
+	 * @return  string
+	 */
+	public function argument($index = 1, $default = FALSE)
+	{
+		if (is_string($index))
+		{
+			if (($key = array_search($index, self::$arguments)) === FALSE)
+				return $default;
+
+			$index = $key + 2;
+		}
+
+		$index = (int) $index - 1;
+
+		return isset(self::$arguments[$index]) ? self::$arguments[$index] : $default;
+	}
+
+	/**
+	 * Returns an array containing all the URI segments.
+	 *
+	 * @param   integer  segment offset
+	 * @param   boolean  return an associative array
+	 * @return  array
+	 */
+	public function segment_array($offset = 0, $associative = FALSE)
+	{
+		return $this->build_array(self::$segments, $offset, $associative);
+	}
+
+	/**
+	 * Returns an array containing all the re-routed URI segments.
+	 *
+	 * @param   integer  rsegment offset
+	 * @param   boolean  return an associative array
+	 * @return  array
+	 */
+	public function rsegment_array($offset = 0, $associative = FALSE)
+	{
+		return $this->build_array(self::$rsegments, $offset, $associative);
+	}
+
+	/**
+	 * Returns an array containing all the URI arguments.
+	 *
+	 * @param   integer  segment offset
+	 * @param   boolean  return an associative array
+	 * @return  array
+	 */
+	public function argument_array($offset = 0, $associative = FALSE)
+	{
+		return $this->build_array(self::$arguments, $offset, $associative);
+	}
+
+	/**
+	 * Creates a simple or associative array from an array and an offset.
+	 * Used as a helper for (r)segment_array and argument_array.
+	 *
+	 * @param   array    array to rebuild
+	 * @param   integer  offset to start from
+	 * @param   boolean  create an associative array
+	 * @return  array
+	 */
+	public function build_array($array, $offset = 0, $associative = FALSE)
+	{
+		// Prevent the keys from being improperly indexed
+		array_unshift($array, 0);
+
+		// Slice the array, preserving the keys
+		$array = array_slice($array, $offset + 1, count($array) - 1, TRUE);
+
+		if ($associative === FALSE)
+			return $array;
+
+		$associative = array();
+		$pairs       = array_chunk($array, 2);
+
+		foreach ($pairs as $pair)
+		{
+			// Add the key/value pair to the associative array
+			$associative[$pair[0]] = isset($pair[1]) ? $pair[1] : '';
+		}
+
+		return $associative;
+	}
+
+	/**
+	 * Returns the complete URI as a string.
+	 *
+	 * @return  string
+	 */
+	public function string()
+	{
+		return self::$current_uri;
+	}
+
+	/**
+	 * Magic method for converting an object to a string.
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		return self::$current_uri;
+	}
+
+	/**
+	 * Returns the total number of URI segments.
+	 *
+	 * @return  integer
+	 */
+	public function total_segments()
+	{
+		return count(self::$segments);
+	}
+
+	/**
+	 * Returns the total number of re-routed URI segments.
+	 *
+	 * @return  integer
+	 */
+	public function total_rsegments()
+	{
+		return count(self::$rsegments);
+	}
+
+	/**
+	 * Returns the total number of URI arguments.
+	 *
+	 * @return  integer
+	 */
+	public function total_arguments()
+	{
+		return count(self::$arguments);
+	}
+
+	/**
+	 * Returns the last URI segment.
+	 *
+	 * @param   mixed   default value returned if segment does not exist
+	 * @return  string
+	 */
+	public function last_segment($default = FALSE)
+	{
+		if (($end = $this->total_segments()) < 1)
+			return $default;
+
+		return self::$segments[$end - 1];
+	}
+
+	/**
+	 * Returns the last re-routed URI segment.
+	 *
+	 * @param   mixed   default value returned if segment does not exist
+	 * @return  string
+	 */
+	public function last_rsegment($default = FALSE)
+	{
+		if (($end = $this->total_segments()) < 1)
+			return $default;
+
+		return self::$rsegments[$end - 1];
+	}
+
+	/**
+	 * Returns the path to the current controller (not including the actual
+	 * controller), as a web path.
+	 *
+	 * @param   boolean  return a full url, or only the path specifically
+	 * @return  string
+	 */
+	public function controller_path($full = TRUE)
+	{
+		return ($full) ? url::site(self::$controller_path) : self::$controller_path;
+	}
+
+	/**
+	 * Returns the current controller, as a web path.
+	 *
+	 * @param   boolean  return a full url, or only the controller specifically
+	 * @return  string
+	 */
+	public function controller($full = TRUE)
+	{
+		return ($full) ? url::site(self::$controller_path.self::$controller) : self::$controller;
+	}
+
+	/**
+	 * Returns the current method, as a web path.
+	 *
+	 * @param   boolean  return a full url, or only the method specifically
+	 * @return  string
+	 */
+	public function method($full = TRUE)
+	{
+		return ($full) ? url::site(self::$controller_path.self::$controller.'/'.self::$method) : self::$method;
+	}
+
+} // End URI Class