diff --git a/classes/lnApp/Auth/ORM.php b/classes/lnApp/Auth/ORM.php index 2a9c8cf..2e98a19 100644 --- a/classes/lnApp/Auth/ORM.php +++ b/classes/lnApp/Auth/ORM.php @@ -31,7 +31,7 @@ abstract class lnApp_Auth_ORM extends Kohana_Auth_ORM { * @param $token The token * @return Model_Account|NULL The user that the token is valid for. */ - private function _get_token_user($token) { + protected function _get_token_user($token) { list($id,$key) = explode(':',$token,2); $uo = ORM::factory('Account',$id); diff --git a/classes/lnApp/Controller/Login.php b/classes/lnApp/Controller/Login.php index 8091309..c69a680 100644 --- a/classes/lnApp/Controller/Login.php +++ b/classes/lnApp/Controller/Login.php @@ -24,7 +24,13 @@ class lnApp_Controller_Login extends Controller_TemplateDefault { if ($ao->activated()) HTTP::redirect('login'); - elseif ($ao->activate_code() == $this->request->post('code')) { + elseif (! $ao->active) { + SystemMessage::factory() + ->title(_('Account NOT Activated')) + ->type('warning') + ->body(_('Your account cannot been activated, please contact us.')); + + } elseif ($ao->activate_code() == $this->request->post('code')) { $ao->verified = TRUE; $ao->save(); @@ -32,9 +38,9 @@ class lnApp_Controller_Login extends Controller_TemplateDefault { ->title(_('Account Activated')) ->type('info') ->body(_('Your account has been activated.')); - - HTTP::redirect('welcome'); } + + HTTP::redirect('welcome'); } } elseif (! $this->request->param('id')) @@ -44,7 +50,7 @@ class lnApp_Controller_Login extends Controller_TemplateDefault { ->title('Activate account') ->title_icon('fa-wrench') ->type('form-horizontal') - ->body(View::factory('login/activate')->set('o',Session::instance()->get_once('activate'))); + ->body(View::factory('login/activate')->set('o',Session::instance()->get_once('activate'))->set('email',$this->request->query('email'))); } /** diff --git a/classes/lnApp/HTMLRender.php b/classes/lnApp/HTMLRender.php index 5fc44d2..e740d7c 100644 --- a/classes/lnApp/HTMLRender.php +++ b/classes/lnApp/HTMLRender.php @@ -80,7 +80,7 @@ abstract class lnApp_HTMLRender { public function render_all() { $output = ''; - for ($x=0; $xrecord($x); unset(static::$_data[$x]); diff --git a/classes/lnApp/Site.php b/classes/lnApp/Site.php index 7b9e050..b328e22 100644 --- a/classes/lnApp/Site.php +++ b/classes/lnApp/Site.php @@ -51,12 +51,11 @@ abstract class lnApp_Site { $k = sprintf('%s_%s',strtolower($k),strtoupper($v)); } - if ($x=ORM::factory('Language',array('iso'=>$k))) + if ($x=ORM::factory('Language',array('iso'=>$k)) AND $x->loaded()) return $x; } - // @todo Return Default Language - return Kohana::$config->load('config')->language; + return ORM::factory('Language',array('iso'=>Kohana::$config->load('config')->language)); } /** diff --git a/classes/lnApp/SystemMessage.php b/classes/lnApp/SystemMessage.php index 77defe1..4111021 100644 --- a/classes/lnApp/SystemMessage.php +++ b/classes/lnApp/SystemMessage.php @@ -22,7 +22,7 @@ abstract class lnApp_SystemMessage extends HTMLRender { // If we are a CLI session, then we have no session if (PHP_SAPI !== 'cli') - Session::instance()->set('sessionmsgs',self::$_data); + Session::instance()->set('sessionmsgs',static::$_data); return $this; } @@ -35,13 +35,13 @@ abstract class lnApp_SystemMessage extends HTMLRender { */ public static function add($msg,$prepend=FALSE) { if ($msgs = Session::instance()->get_once('sessionmsgs')) - self::$_data = $msgs; + static::$_data = $msgs; parent::add($msg); - self::$_c = count(self::$_data); + static::$_c = count(static::$_data); // Save our messages in our session, so that we get them for redirects - Session::instance()->set('sessionmsgs',self::$_data); + Session::instance()->set('sessionmsgs',static::$_data); } /** @@ -50,7 +50,7 @@ abstract class lnApp_SystemMessage extends HTMLRender { * @see HTMLRender::render() */ protected function render() { - $record = self::$_data[$this->_x]; + $record = static::$_data[$this->_x]; $output = ''; @@ -58,17 +58,17 @@ abstract class lnApp_SystemMessage extends HTMLRender { $output .= ''; switch ($record['type']) { case 'error': - $output .= ''; + $output .= ''; break; case 'success': - $output .= ''; + $output .= ''; break; case 'warning': - $output .= ''; + $output .= ''; break; case 'info': default: - $output .= ''; + $output .= ''; } $output .= sprintf(' %s: %s',$record['title'],$record['body']); @@ -83,9 +83,12 @@ abstract class lnApp_SystemMessage extends HTMLRender { public function render_all() { // Reload our message from the session if ($msgs = Session::instance()->get_once('sessionmsgs')) - self::$_data = $msgs; + static::$_data = $msgs; return parent::render_all(); } + +public function dump() { +} } ?> diff --git a/views/account/user/edit.php b/views/account/user/edit.php index 4089c0b..aa67c36 100644 --- a/views/account/user/edit.php +++ b/views/account/user/edit.php @@ -1,8 +1,6 @@
Account Details - date_last ? $o->display('date_last') : Site::date(time()),array('label'=>'Last Updated','class'=>'col-md-2','disabled')); ?> - display('email'),array('label'=>'Email','class'=>'col-md-3','placeholder'=>'Email Address','type'=>'email','required','data-error'=>'Invalid EMAIL address')); ?>
diff --git a/views/login/activate.php b/views/login/activate.php index 6481376..08a09dc 100644 --- a/views/login/activate.php +++ b/views/login/activate.php @@ -10,7 +10,7 @@
- +
diff --git a/views/theme/baseadmin/page.php b/views/theme/baseadmin/page.php index 2c919ec..65fa4ce 100644 --- a/views/theme/baseadmin/page.php +++ b/views/theme/baseadmin/page.php @@ -67,12 +67,12 @@
  • Home
    • - get_user()) AND $ao->isAdmin()) : ?> -
  • Admin
    • - - $attributes) : ?> -
    • - + get_user()) AND $ao->isAdmin()) : ?> +
  • Admin
    • + + $attributes) : ?> +
    • +
diff --git a/views/theme/focusbusiness/page.php b/views/theme/focusbusiness/page.php index ba6a012..219392c 100644 --- a/views/theme/focusbusiness/page.php +++ b/views/theme/focusbusiness/page.php @@ -44,6 +44,16 @@ +
+
+
+
+ render_all(); ?> +
+
+
+
+