accounts.php and user.php are not modules yet!

~dev_rating/application/bootstrap.php

@@ -131,14 +131,13 @@ define('ASSEMBLY_VERSION', '0.9');
  * Enable modules. Modules are referenced by a relative or absolute path.
  */
 Kohana::modules(array(
-         'account'     => MODPATH.'account', // Authentication and account manager
          'kotwig'     => MODPATH.'kotwig', // Twig template engine
          'mpdf'     => MODPATH.'mpdf', // HTML->PDF converter
          'phpexcel' => MODPATH.'phpexcel', // HTML->MS Excel 2007 converter
          'mailer' => MODPATH.'mail',
-		// 'codebench'  => MODPATH.'codebench',  // Benchmarking tool
-	 	'database'   => MODPATH.'database',   // Database access
-	));
+        // 'codebench'  => MODPATH.'codebench',  // Benchmarking tool
+        'database'   => MODPATH.'database',   // Database access
+    ));
 
 /**
  * Set the routes. Each route must have a minimum of a name, a URI and a set of

~dev_rating/modules/account/classes/Kohana/Account.php → ~dev_rating/application/classes/Account.php

@@ -41,8 +41,8 @@ function gradeSendMail($subject, $body, $sendToEmail, $sendToName) {
     }
 }
 
-class Kohana_Account {
-    
+class Account {
+
     protected static $_instance;
     protected $_config;
     protected $_model;
@@ -58,7 +58,7 @@ class Kohana_Account {
         }
         return self::$_instance;
     }
-    
+
     private function __construct($config = array()) {
         $this->_config = $config;
         $this->_model = new Model_Account;

~dev_rating/application/classes/Controller/Authentication.php

@@ -51,7 +51,11 @@ class Controller_Authentication extends Controller {
         public function action_enter_frontdoor()
         {
             $check = false;
-            $role = (int)User::instance()->RoleMark;
+            try {
+                $role = (int)User::instance()->RoleMark;
+            } catch (Exception $e) {
+                $role = (int)1;
+            }
             $isNotSigned = !User::instance()->isSignedIn();
 
             if($isNotSigned || ($role & 8) == 0) // if not signed or not admin

~dev_rating/modules/account/classes/Model/Kohana/Account.php → ~dev_rating/application/classes/Model/Account.php

 <?php defined('SYSPATH') or die('No direct script access.');
 
-class Model_Kohana_Account extends Model
+class Model_Account extends Model
 {
     public function setHashKey($key)
     {

~dev_rating/modules/account/classes/Kohana/User.php → ~dev_rating/application/classes/User.php

@@ -28,7 +28,7 @@
  * @property-read $PasswordHash string
  * @property-read $start_time int
  */
-class Kohana_User implements ArrayAccess
+class User implements ArrayAccess
 {
     protected static $_instance;
     protected $_session;

~dev_rating/modules/account/classes/Account.php

-<?php
-
-class Account extends Kohana_Account { }
\ No newline at end of file

~dev_rating/modules/account/classes/Model/Account.php

-<?php
-
-class Model_Account extends Model_Kohana_Account { }
\ No newline at end of file

~dev_rating/modules/account/classes/User.php

-<?php
-
-class User extends Kohana_User { }
\ No newline at end of file