Updated license link, and copyright dates. Closes #2325

kohana · Nov 10, 2009 · 612fde0 · 612fde0
1 parent 3f0681b
commit 612fde0
Show file tree

Hide file tree

Showing 80 changed files with 143 additions and 139 deletions.
diff --git a/Kohana License.html b/Kohana License.html
@@ -12,7 +12,7 @@ <h2>Kohana License Agreement</h2>
 
 <p>This license is a legal agreement between you and the Kohana Software Foundation for the use of Kohana Framework (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.</p>
 
-<p>Copyright (c) 2007-2008 Kohana Team<br/>All rights reserved.</p>
+<p>Copyright (c) 2007-2009 Kohana Team<br/>All rights reserved.</p>
 
 <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
 

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 
 // Kohana benchmarks are prefixed to prevent collisions

diff --git a/system/controllers/captcha.php b/system/controllers/captcha.php
@@ -8,8 +8,8 @@
  *
  * @package    Captcha
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class Captcha_Controller extends Controller {
 

diff --git a/system/controllers/template.php b/system/controllers/template.php
@@ -11,8 +11,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 abstract class Template_Controller extends Controller {
 

diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 final class Benchmark {
 

diff --git a/system/core/Event.php b/system/core/Event.php
@@ -8,8 +8,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  * @link       http://docs.kohanaphp.com/general/events
  */
 abstract class Event_Core {

diff --git a/system/core/Kohana.php b/system/core/Kohana.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 
 // Test of Kohana is running in Windows

diff --git a/system/core/Kohana_Config.php b/system/core/Kohana_Config.php
@@ -8,7 +8,7 @@
  * @package    KohanaConfig
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 class Kohana_Config_Core implements ArrayAccess {
 

diff --git a/system/core/Kohana_Exception.php b/system/core/Kohana_Exception.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 
 class Kohana_Exception_Core extends Exception {

diff --git a/system/helpers/arr.php b/system/helpers/arr.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class arr_Core {
 
@@ -102,20 +102,20 @@ public static function extract(array $search, $keys)
 		$found = array();
 		foreach ($keys as $key)
 		{
-			$found[$key] = isset($search[$key]) ? $search[$key] : NULL;
+			$found[$key] = isset($search[$key]) ? 'test' : NULL; //$search[$key] : NULL;
 		}
-
+		
 		return $found;
 	}
 
-	/** 
-	 * Get the value of array[key]. If it doesn't exist, return default. 
-	 * 
-	 * @param   array   array to search 
-	 * @param   string  key name 
-	 * @param   mixed   default value 
-	 * @return  mixed 
-	 */ 
+	/**
+	 * Get the value of array[key]. If it doesn't exist, return default.
+	 *
+	 * @param   array   array to search
+	 * @param   string  key name
+	 * @param   mixed   default value
+	 * @return  mixed
+	 */
 	public static function get(array $array, $key, $default = NULL)
 	{
 		return isset($array[$key]) ? $array[$key] : $default;
@@ -255,7 +255,7 @@ public static function to_object(array $array, $class = 'stdClass')
 
 		return $object;
 	}
-    
+
 	/**
 	 * Returns specific key/column from an array of objects.
 	 *

diff --git a/system/helpers/cookie.php b/system/helpers/cookie.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class cookie_Core {
 

diff --git a/system/helpers/date.php b/system/helpers/date.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class date_Core {
 

diff --git a/system/helpers/db.php b/system/helpers/db.php
@@ -7,7 +7,7 @@
  * @package    Core
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
  class db_Core {
 

diff --git a/system/helpers/download.php b/system/helpers/download.php
@@ -7,7 +7,7 @@
  * @package    Core
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 class download_Core {
 

diff --git a/system/helpers/expires.php b/system/helpers/expires.php
@@ -7,7 +7,7 @@
  * @package    Core
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 class expires_Core {
 

diff --git a/system/helpers/feed.php b/system/helpers/feed.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class feed_Core {
 

diff --git a/system/helpers/file.php b/system/helpers/file.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class file_Core {
 

diff --git a/system/helpers/form.php b/system/helpers/form.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class form_Core {
 

diff --git a/system/helpers/format.php b/system/helpers/format.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class format_Core {
 

diff --git a/system/helpers/html.php b/system/helpers/html.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class html_Core {
 

diff --git a/system/helpers/inflector.php b/system/helpers/inflector.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class inflector_Core {
 

diff --git a/system/helpers/num.php b/system/helpers/num.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class num_Core {
 

diff --git a/system/helpers/remote.php b/system/helpers/remote.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class remote_Core {
 

diff --git a/system/helpers/request.php b/system/helpers/request.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class request_Core {
 

diff --git a/system/helpers/security.php b/system/helpers/security.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class security_Core {
 

diff --git a/system/helpers/text.php b/system/helpers/text.php
@@ -7,7 +7,7 @@
  * @package    Core
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 class text_Core {
 

diff --git a/system/helpers/upload.php b/system/helpers/upload.php
@@ -7,8 +7,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class upload_Core {
 

diff --git a/system/helpers/url.php b/system/helpers/url.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class url_Core {
 

diff --git a/system/helpers/valid.php b/system/helpers/valid.php
@@ -6,8 +6,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 class valid_Core {
 

diff --git a/system/libraries/Cache.php b/system/libraries/Cache.php
@@ -9,7 +9,7 @@
  * @package    Cache
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 class Cache_Core {
 

diff --git a/system/libraries/Cache_Exception.php b/system/libraries/Cache_Exception.php
@@ -5,7 +5,7 @@
  * @package    Core
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 
 class Cache_Exception_Core extends Kohana_Exception {}

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
@@ -7,8 +7,8 @@
  *
  * @package    Core
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
  */
 abstract class Controller_Core {
 

diff --git a/system/libraries/Database.php b/system/libraries/Database.php
@@ -7,7 +7,7 @@
  * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2008-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 abstract class Database_Core {
 

diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php
@@ -5,7 +5,7 @@
  * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2008-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @license    http://kohanaphp.com/license
  */
 class Database_Builder_Core {