General tidying up

modules/service/classes/controller/admin/service.php

@@ -10,10 +10,10 @@
  * @copyright  (c) 2010 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Controller_Admin_Service extends Controller_TemplateDefault {
+class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 	protected $control = array('Services'=>'services');
 
-	public $secure_actions = array(
+	protected $secure_actions = array(
 		'listbycheckout'=>TRUE,
 		'listadslservices'=>TRUE,
 		'listhspaservices'=>TRUE,

modules/service/classes/controller/service.php

@@ -0,0 +1,15 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides service management
+ *
+ * @package    lnApp
+ * @subpackage Page/Service
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_Service extends Controller_TemplateDefault {
+}
+?>

modules/service/classes/controller/user/service.php

@@ -10,21 +10,11 @@
  * @copyright  (c) 2010 Deon George
  * @license    http://dev.leenooks.net/license.html
  */
-class Controller_User_Service extends Controller_TemplateDefault {
-	public $secure_actions = array(
+class Controller_User_Service extends Controller_TemplateDefault_User {
+	protected $secure_actions = array(
 		'list'=>TRUE,
 		'view'=>TRUE,
 	);
-	// Our acccount object
-	private $ao;
-
-	public function before() {
-		parent::before();
-
-		$this->ao = ORM::factory('account',Auth::instance()->get_user()->id);
-		if (! $this->ao->loaded())
-			throw new Kohana_Exception('Account doesnt exist :account ?',array(':account'=>Auth::instance()->get_user()->id));
-	}
 
 	/**
 	 * Show a product