From e5e67a59bbf2c3abedcf1219906662f323e038fe Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Thu, 22 Nov 2012 14:13:14 +1100
Subject: [PATCH] Misc updates

---
 application/classes/orm.php               |   4 +-
 application/config/cache.php              |   4 +-
 application/guide/pta/index.md            |   4 +-
 application/guide/pta/install.md          |   2 -
 includes/kohana/application/bootstrap.php | 118 ----------------------
 5 files changed, 6 insertions(+), 126 deletions(-)
 delete mode 100644 includes/kohana/application/bootstrap.php

diff --git a/application/classes/orm.php b/application/classes/orm.php
index a71c8ad..19396d6 100644
--- a/application/classes/orm.php
+++ b/application/classes/orm.php
@@ -11,8 +11,8 @@
  * @license    http://dev.leenooks.net/license.html
  */
 class ORM extends Kohana_ORM {
-	protected $_table_names_plural = false;
-	protected $_model_names_plural = false;
+	protected $_table_names_plural = FALSE;
+	protected $_model_names_plural = FALSE;
 	private $_object_formated = array();
 	private $_formated = FALSE;
 	// Our filters used to display values in a friendly format
diff --git a/application/config/cache.php b/application/config/cache.php
index 62ec8f0..c7946c3 100644
--- a/application/config/cache.php
+++ b/application/config/cache.php
@@ -1,9 +1,9 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * PTA Configuration - Cache Driver
+ * lnApp Configuration - Cache Driver
  *
- * @package    PTA
+ * @package    lnApp
  * @subpackage Cache
  * @category   Configuration
  * @author     Deon George
diff --git a/application/guide/pta/index.md b/application/guide/pta/index.md
index 62bd210..ef23538 100644
--- a/application/guide/pta/index.md
+++ b/application/guide/pta/index.md
@@ -3,7 +3,7 @@
 phpTSMadmin is an operational admin interface to help with managing a Tivoli Storage Manager (TSM) server.
 This web interface is not designed to replace that interface that you use to manage TSM, but rather to help you understand your TSM environment, so that you can better manage your server(s).
 
-By default PTA uses TSM's command line interface (CLI) to communicate with the TSM server. While this provides a very simple way to get PTA up and running, it does have performance implications because each query to the TSM server results in a fork-exec to extra the data from TSM. As this is the only method to talk to a TSM v5.x server, it is your only option. For TSM v6.x users, it will be possible to query the DB2 database directly, which should be significantly better. Look out for an update with this feature.
+By default PTA uses TSM's command line interface (CLI) to communicate with the TSM server. While this provides a very simple way to get PTA up and running, it does have performance implications because each query to the TSM server results in a fork-exec to extract the data from TSM. As this is the only method to talk to a TSM v5.x server, it is your only option. For TSM v6.x users, it will be possible to query the DB2 database directly, which should be significantly better. Look out for an update with this feature.
 
 ## Tools used to make PTA available.
 phpTSMadmin uses some great open source tools, please make sure you provide feedback/enhancements to the authors of the components you use:
@@ -13,4 +13,4 @@ phpTSMadmin uses some great open source tools, please make sure you provide feed
 * PHP
 
 ## Information on Development
-This web interface has been developed on a CentOS 5.5 server, using PHP 5.3. It has also been tested against TSM v5.x and TSM v6.x servers.
+This web interface has been developed on a CentOS 5.5 server, using PHP 5.3. It has also been tested against TSM v5.x and TSM v6.2.2.30 servers. (Early versions of TSM v6.x may not work with this interface, as database schema definitions may be missing from the TSM server database. Since the best practise is to use the most current version of a TSM server, no specific development activity will be done to enable this web interface to work with earlier TSM v6.x servers. Its better that you upgrade. :)
diff --git a/application/guide/pta/install.md b/application/guide/pta/install.md
index 53b1ff5..9c8afe1 100644
--- a/application/guide/pta/install.md
+++ b/application/guide/pta/install.md
@@ -47,5 +47,3 @@ These steps assume that you have installed, configured and running:
 1. Then, point your browser to your phpTSMadmin URL.
 
 For help drop me an email phptsmadmin-devel@lists.sourceforge.net.
-## Information on Development
-This web interface has been developed on a CentOS 5.5 server, using PHP 5.3. It has also been tested against TSM v5.x and TSM v6.x servers.
diff --git a/includes/kohana/application/bootstrap.php b/includes/kohana/application/bootstrap.php
deleted file mode 100644
index d6081cd..0000000
--- a/includes/kohana/application/bootstrap.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-// -- Environment setup --------------------------------------------------------
-
-// Load the core Kohana class
-require SYSPATH.'classes/kohana/core'.EXT;
-
-if (is_file(APPPATH.'classes/kohana'.EXT))
-{
-	// Application extends the core
-	require APPPATH.'classes/kohana'.EXT;
-}
-else
-{
-	// Load empty core extension
-	require SYSPATH.'classes/kohana'.EXT;
-}
-
-/**
- * Set the default time zone.
- *
- * @see  http://kohanaframework.org/guide/using.configuration
- * @see  http://php.net/timezones
- */
-date_default_timezone_set('America/Chicago');
-
-/**
- * Set the default locale.
- *
- * @see  http://kohanaframework.org/guide/using.configuration
- * @see  http://php.net/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
- */
-spl_autoload_register(array('Kohana', 'auto_load'));
-
-/**
- * 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
- */
-ini_set('unserialize_callback_func', 'spl_autoload_call');
-
-// -- Configuration and initialization -----------------------------------------
-
-/**
- * Set the default language
- */
-I18n::lang('en-us');
-
-/**
- * Set Kohana::$environment if a 'KOHANA_ENV' environment variable has been supplied.
- *
- * Note: If you supply an invalid environment name, a PHP warning will be thrown
- * saying "Couldn't find constant Kohana::<INVALID_ENV_NAME>"
- */
-if (isset($_SERVER['KOHANA_ENV']))
-{
-	Kohana::$environment = constant('Kohana::'.strtoupper($_SERVER['KOHANA_ENV']));
-}
-
-/**
- * Initialize Kohana, setting the default options.
- *
- * The following options are available:
- *
- * - string   base_url    path, and optionally domain, of your application   NULL
- * - 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
- * - boolean  errors      enable or disable error handling                   TRUE
- * - boolean  profile     enable or disable internal profiling               TRUE
- * - boolean  caching     enable or disable internal caching                 FALSE
- */
-Kohana::init(array(
-	'base_url'   => '/',
-));
-
-/**
- * Attach the file write to logging. Multiple writers are supported.
- */
-Kohana::$log->attach(new Log_File(APPPATH.'logs'));
-
-/**
- * Attach a file reader to config. Multiple readers are supported.
- */
-Kohana::$config->attach(new Config_File);
-
-/**
- * Enable modules. Modules are referenced by a relative or absolute path.
- */
-Kohana::modules(array(
-	// 'auth'       => MODPATH.'auth',       // Basic authentication
-	// 'cache'      => MODPATH.'cache',      // Caching with multiple backends
-	// 'codebench'  => MODPATH.'codebench',  // Benchmarking tool
-	// 'database'   => MODPATH.'database',   // Database access
-	// 'image'      => MODPATH.'image',      // Image manipulation
-	// 'orm'        => MODPATH.'orm',        // Object Relationship Mapping
-	// 'unittest'   => MODPATH.'unittest',   // Unit testing
-	// 'userguide'  => MODPATH.'userguide',  // User guide and API documentation
-	));
-
-/**
- * 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>)))')
-	->defaults(array(
-		'controller' => 'welcome',
-		'action'     => 'index',
-	));