Upgrade to KH 3.3.0

application/bootstrap.php

@@ -3,48 +3,56 @@
 // -- Environment setup --------------------------------------------------------
 
 // Load the core Kohana class
-require SYSPATH.'classes/kohana/core'.EXT;
+require SYSPATH.'classes/Kohana/Core'.EXT;
 
-if (is_file(APPPATH.'classes/kohana'.EXT))
+if (is_file(APPPATH.'classes/Kohana'.EXT))
 {
 	// Application extends the core
-	require APPPATH.'classes/kohana'.EXT;
+	require APPPATH.'classes/Kohana'.EXT;
 }
 else
 {
 	// Load empty core extension
-	require SYSPATH.'classes/kohana'.EXT;
+	require SYSPATH.'classes/Kohana'.EXT;
 }
 
 /**
  * Set the default time zone.
  *
- * @see  http://kohanaframework.org/guide/using.configuration
- * @see  http://php.net/timezones
+ * @link http://kohanaframework.org/guide/using.configuration
+ * @link http://www.php.net/manual/timezones
  */
 date_default_timezone_set('Australia/Melbourne');
 
 /**
  * Set the default locale.
  *
- * @see  http://kohanaframework.org/guide/using.configuration
- * @see  http://php.net/setlocale
+ * @link http://kohanaframework.org/guide/using.configuration
+ * @link http://www.php.net/manual/function.setlocale
  */
 setlocale(LC_ALL, 'en_US.utf-8');
 
 /**
  * Enable the Kohana auto-loader.
  *
- * @see  http://kohanaframework.org/guide/using.autoloading
- * @see  http://php.net/spl_autoload_register
+ * @link http://kohanaframework.org/guide/using.autoloading
+ * @link http://www.php.net/manual/function.spl-autoload-register
  */
 spl_autoload_register(array('Kohana', 'auto_load'));
 
+/**
+ * Optionally, you can enable a compatibility auto-loader for use with
+ * older modules that have not been updated for PSR-0.
+ *
+ * It is recommended to not enable this unless absolutely necessary.
+ */
+//spl_autoload_register(array('Kohana', 'auto_load_lowercase'));
+
 /**
  * Enable the Kohana auto-loader for unserialization.
  *
- * @see  http://php.net/spl_autoload_call
- * @see  http://php.net/manual/var.configuration.php#unserialize-callback-func
+ * @link http://www.php.net/manual/function.spl-autoload-call
+ * @link http://www.php.net/manual/var.configuration#unserialize-callback-func
  */
 ini_set('unserialize_callback_func', 'spl_autoload_call');
 
@@ -75,15 +83,16 @@ if (isset($_SERVER['KOHANA_ENV']))
  * - string   index_file  name of your index file, usually "index.php"       index.php
  * - string   charset     internal character set used for input and output   utf-8
  * - string   cache_dir   set the internal cache directory                   APPPATH/cache
+ * - integer  cache_life  lifetime, in seconds, of items cached              60
  * - boolean  errors      enable or disable error handling                   TRUE
  * - boolean  profile     enable or disable internal profiling               TRUE
  * - boolean  caching     enable or disable internal caching                 FALSE
+ * - boolean  expose      set the X-Powered-By header                        FALSE
  */
 Kohana::init(array(
-	'base_url'   => '/pta',
-	'index_file' => '',
+	'base_url'   => '/pta/',
 	'caching'    => TRUE,
-	'cache_dir'  => '/dev/shm/lnapp',
+	'index_file' => '',
 ));
 
 /**
@@ -102,10 +111,15 @@ Kohana::$config->attach(new Config_File);
 Kohana::modules(array(
 	'auth'       => SMDPATH.'auth',       // Basic authentication
 	'cache'      => SMDPATH.'cache',      // Caching with multiple backends
+	'cron'       => SMDPATH.'cron',       // Kohana Cron Module
 	// 'codebench'  => SMDPATH.'codebench',  // Benchmarking tool
 	'database'   => SMDPATH.'database',   // Database access
+	'gchart'     => MODPATH.'gchart',     // Google Chart Module
 	// 'image'      => SMDPATH.'image',      // Image manipulation
+	'khemail'    => SMDPATH.'khemail',    // Email module for Kohana 3 PHP Framework
+	'minion'     => SMDPATH.'minion',     // CLI Tasks
 	'orm'        => SMDPATH.'orm',        // Object Relationship Mapping
+	'pagination' => SMDPATH.'pagination', // Kohana Pagination module for Kohana 3 PHP Framework
 	// 'unittest'   => SMDPATH.'unittest',   // Unit testing
 	'userguide'  => SMDPATH.'userguide',  // User guide and API documentation
 	));
@@ -115,24 +129,33 @@ Kohana::modules(array(
  */
 Route::set('sections', '<directory>/<controller>(/<action>(/<id>(/<sid>)))',
 	array(
-		'directory' => '('.implode('|',Kohana::config('config.method_directory')).')'
+		'directory' => '('.implode('|',Kohana::$config->load('config')->method_directory).')'
+	))
+	->defaults(array(
+		'action'     => 'index',
 	));
 
 // Static file serving (CSS, JS, images)
 Route::set('default/media', 'media(/<file>)', array('file' => '.+'))
 	->defaults(array(
-		'controller' => 'welcome',
-		'action'     => 'media',
-		'file'       => NULL,
+		'controller' => 'media',
+		'action'     => 'get',
 	));
 
 /**
  * Set the routes. Each route must have a minimum of a name, a URI and a set of
  * defaults for the URI.
  */
-Route::set('default', '(<controller>(/<action>(/<id>)))', array('id' => '[a-zA-Z0-9_.-]+'))
+Route::set('default', '(<controller>(/<action>(/<id>)))', array('id'=>'[a-zA-Z0-9_.-]+'))
 	->defaults(array(
 		'controller' => 'welcome',
 		'action'     => 'index',
 	));
-?>
+
+/**
+ * If APC is enabled, and we need to clear the cache
+ */
+if (file_exists(APPPATH.'cache/CLEAR_APC_CACHE') AND function_exists('apc_clear_cache') AND ! Kohana::$is_cli) {
+	if (! apc_clear_cache() OR ! unlink(APPPATH.'cache/CLEAR_APC_CACHE'))
+		throw new Kohana_Exception('Unable to clear the APC cache.');
+}