From df7776931d500a5b8d75528efe38416b6c544d27 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 4 Oct 2014 00:39:18 +1000
Subject: [PATCH] Login and Register working

---
 application/classes/Controller/Welcome.php | 22 ++++++++++-------
 application/classes/Model/Country.php      | 23 ------------------
 application/classes/Model/Language.php     | 19 ---------------
 application/classes/StaticList/Title.php   | 28 ----------------------
 application/config/config.php              |  1 +
 modules/lnapp                              |  2 +-
 modules/lnauth                             |  2 +-
 7 files changed, 16 insertions(+), 81 deletions(-)
 delete mode 100644 application/classes/Model/Country.php
 delete mode 100644 application/classes/Model/Language.php
 delete mode 100644 application/classes/StaticList/Title.php

diff --git a/application/classes/Controller/Welcome.php b/application/classes/Controller/Welcome.php
index 9e82ace..11c00f1 100644
--- a/application/classes/Controller/Welcome.php
+++ b/application/classes/Controller/Welcome.php
@@ -1,19 +1,23 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class Controller_Welcome extends Controller_TemplateDefault {
+/**
+ * Main home page for un-authenticated users
+ *
+ * @package    lnApp
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_Welcome extends lnApp_Controller_Welcome {
 	protected $auth_required = FALSE;
 
 	public function action_index() {
-		if (! Kohana::$config->load('config')->appname)
-			throw HTTP_Exception::factory(500,'Site not setup!');
-
-		$output = '';
-
-		$output = View::factory('pages/welcome');
 		Style::factory()
 			->type('file')
 			->data('media/css/pages/welcome.css');
 
-		$this->template->content = $output;
+		$this->template->content = View::factory('pages/welcome');
 	}
-} // End Welcome
+}
+?>
diff --git a/application/classes/Model/Country.php b/application/classes/Model/Country.php
deleted file mode 100644
index 4361475..0000000
--- a/application/classes/Model/Country.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-/**
- * Membership Database Country Model
- *
- * @package    Membership Database
- * @category   Models
- * @author     Deon George
- * @copyright  (c) 2014 Deon George
- * @license    http://dev.leenooks.net/license.html
- */
-class Model_Country extends ORM {
-	protected $_sorting = array(
-		'name'=>'ASC',
-	);
-
-	protected $_form = array('id'=>'id','value'=>'name');
-
-	public static function icon() {
-		return HTML::image(sprintf('media/img/country/%s.png',strtolower($this->two_code)),array('alt'=>$this->currency->symbol));
-	}
-}
-?>
diff --git a/application/classes/Model/Language.php b/application/classes/Model/Language.php
deleted file mode 100644
index 21a4466..0000000
--- a/application/classes/Model/Language.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-/**
- * Membership Database Language Model
- *
- * @package    Membership Database
- * @category   Models
- * @author     Deon George
- * @copyright  (c) 2014 Deon George
- * @license    http://dev.leenooks.net/license.html
- */
-class Model_Language extends ORM {
-	protected $_sorting = array(
-		'name'=>'ASC',
-	);
-
-	protected $_form = array('id'=>'id','value'=>'name');
-}
-?>
diff --git a/application/classes/StaticList/Title.php b/application/classes/StaticList/Title.php
deleted file mode 100644
index 83ffa81..0000000
--- a/application/classes/StaticList/Title.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-/**
- * This is class renders Person Title responses and forms.
- *
- * @package    Membership Database
- * @category   Helpers
- * @author     Deon George
- * @copyright  (c) 2014 Deon George
- * @license    http://dev.leenooks.net/license.html
- */
-class StaticList_Title extends StaticList {
-	protected function _table() {
-		return array(
-			'mr'=>_('Mr'),
-			'ms'=>_('Ms'),
-			'mrs'=>_('Mrs'),
-			'miss'=>_('Miss'),
-			'dr'=>_('Dr'),
-			'prof'=>_('Prof')
-		);
-	}
-
-	public static function get($value) {
-		return self::factory()->_get($value);
-	}
-}
-?>
diff --git a/application/config/config.php b/application/config/config.php
index 149c177..ba892e8 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -3,6 +3,7 @@
 return array
 (
 	'appname'         => 'Membership Database',
+	'language'        => 'en_AU',
 	'theme'           => 'focusbusiness',
 	'theme_admin'     => 'baseadmin',
 );
diff --git a/modules/lnapp b/modules/lnapp
index 9ae0980..f679bf9 160000
--- a/modules/lnapp
+++ b/modules/lnapp
@@ -1 +1 @@
-Subproject commit 9ae0980221266ec69497da88d5ff7741ccdb72f1
+Subproject commit f679bf9c06e17f7fe69dc34c0227d91ef30b56b0
diff --git a/modules/lnauth b/modules/lnauth
index f8490ed..d034b84 160000
--- a/modules/lnauth
+++ b/modules/lnauth
@@ -1 +1 @@
-Subproject commit f8490ed97ebad329c565fd7a1d22055fb9528c33
+Subproject commit d034b846a6212e8ce8b8a6815b61f91988867b26