deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Changed use of active to status

Browse Source
This commit is contained in:
Deon George
2012-08-01 22:43:33 +10:00
parent e4d600b8d0
commit 4220ade8ac
40 changed files with 123 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/classes/lnapp/controller/login.php
View File

@@ -33,13 +33,13 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
if ($redir = Session::instance()->get('afterlogin')) {
Session::instance()->delete('afterlogin');
Request::current()->redirect($redir);
} else
Request::current()->redirect('user/welcome/index');
} else {
SystemMessage::add(array(
'title'=>_('Invalid username or password'),
'title'=>_('Invalid username or password'),
'type'=>'error',
'body'=>_('The username or password was invalid.')
));
@@ -81,7 +81,7 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
// Generic validation reason
default:
SystemMessage::add(array(
'title'=>_('Validation failed'),
'title'=>_('Validation failed'),
'type'=>'error',
'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r)
));
@@ -100,7 +100,7 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
}
SystemMessage::add(array(
'title'=>_('Already have an account?'),
'title'=>_('Already have an account?'),
'type'=>'info',
'body'=>_('If you already have an account, please login..')
));
@@ -184,7 +184,7 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
public function action_noaccess() {
SystemMessage::add(array(
'title'=>_('No access to requested resource'),
'title'=>_('No access to requested resource'),
'type'=>'error',
'body'=>_('You do not have access to the requested resource, please contact your administrator.')
));

2
application/classes/lnapp/pwgen.php
View File

@@ -16,7 +16,7 @@ abstract class lnApp_PWgen {
throw new Kohana_Exception('No configuration for host or port (:host/:port)',array(':host'=>Kohana::Config('pwgen.host'),':port'=>Kohana::Config('pwgen.port')));
$ps = socket_create(AF_INET,SOCK_STREAM,0);
if (! socket_connect($ps,Kohana::Config('pwgen.host'),Kohana::Config('pwgen.port')))
if (! socket_connect($ps,Kohana::Config('pwgen.host'),Kohana::Config('pwgen.port')))
throw new Kohana_Exception('Unable to connect to password server');
// echo "Reading response:\n\n";