Fixes to google chart and other minor items

application/classes/controller/admin/account.php

@@ -25,7 +25,7 @@ class Controller_Admin_Account extends Controller_TemplateDefault_Admin {
 				ORM::factory('account_log')->order_by('id','DESC')->find_all(),
 				25,
 				array(
-					'id'=>array('label'=>'ID','url'=>'admin/account/view/'),
+					'id'=>array('label'=>'ID'),
 					'date_orig'=>array('label'=>'Date'),
 					'account->name()'=>array('label'=>'Account'),
 					'ip'=>array('label'=>'IP Address'),

application/classes/controller/lnapp/login.php

@@ -18,7 +18,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
 		// If user already signed-in
 		if (Auth::instance()->logged_in()!= 0) {
 			// Redirect to the user account
-			Request::current()->redirect('user/welcome');
+			Request::current()->redirect('user/welcome/index');
 		}
 
 		// If there is a post and $_POST is not empty
@@ -35,7 +35,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault {
 					Request::current()->redirect($redir);
 					
 				} else
-					Request::current()->redirect('user/welcome');
+					Request::current()->redirect('user/welcome/index');
 
 			} else {
 				SystemMessage::add(array(

application/classes/controller/templatedefault/admin.php

@@ -1,9 +1,9 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * OSB User Main home page controller
+ * lnApp User Main home page controller
  *
- * @package    OSB
+ * @package    lnApp
  * @subpackage Page/Admin
  * @category   Controllers
  * @author     Deon George

application/classes/controller/templatedefault/user.php

@@ -1,9 +1,9 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
 /**
- * OSB User Main home page controller
+ * lnApp User Main home page controller
  *
- * @package    OSB
+ * @package    lnApp
  * @subpackage Page/User
  * @category   Controllers
  * @author     Deon George

application/classes/controller/welcome.php

@@ -14,6 +14,12 @@ class Controller_Welcome extends Controller_TemplateDefault {
 	protected $auth_required = FALSE;
 
 	public function action_index() {
+		if (! Kohana::config('config.appname'))
+			Request::current()->redirect('guide/app');
+
+		if (! Auth::instance()->logged_in())
+			Request::current()->redirect('login');
+
 		Block::add(array(
 			'title'=>'Welcome to lnApp (public)!',
 			'subtitle'=>'Using lnApp',

application/classes/country.php

@@ -4,7 +4,7 @@
  * This class provides Country routines
  *
  * @package    OSB
- * @subpackage Cart
+ * @subpackage Country
  * @category   Helpers
  * @author     Deon George
  * @copyright  (c) 2010 Deon George