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

Removed direct references to and

Browse Source
This commit is contained in:
Deon George 2016-08-03 15:56:14 +10:00
parent 4bbf00a3d1
commit a7616960f0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/lnApp/Auth/ORM.php
View File

@ -121,7 +121,7 @@ abstract class lnApp_Auth_ORM extends Kohana_Auth_ORM {
$uo = parent::get_user($default); $uo = parent::get_user($default);
// If we are not logged in, see if there is token for the user // If we are not logged in, see if there is token for the user
if (is_null($uo) AND $tokenuser AND ($token=Session::instance()->get('token')) OR (! empty($_REQUEST['token']) AND $token=$_REQUEST['token'])) if (is_null($uo) AND $tokenuser AND ($token=Session::instance()->get('token')) OR ($token=Arr::get($_REQUEST,'token')))
$uo = $this->_get_token_user($token); $uo = $this->_get_token_user($token);
return $uo; return $uo;

2
classes/lnApp/Controller/Login.php
View File

@ -111,7 +111,7 @@ abstract class lnApp_Controller_Login extends Controller_TemplateDefault {
if (Auth::instance()->logged_in()) if (Auth::instance()->logged_in())
HTTP::redirect(URL::link('user','welcome/index')); HTTP::redirect(URL::link('user','welcome/index'));
// If there is a post and $_POST is not empty // If there is a post
if ($this->request->post()) { if ($this->request->post()) {
// If the post data validates using the rules setup in the user model // If the post data validates using the rules setup in the user model
if (Auth::instance()->login($this->request->post('username'),$this->request->post('password'))) { if (Auth::instance()->login($this->request->post('username'),$this->request->post('password'))) {

2
classes/lnApp/Controller/User/Account.php
View File

@ -21,7 +21,7 @@ abstract class lnApp_Controller_User_Account extends Controller_Account {
* Enable User to Edit their Account Details * Enable User to Edit their Account Details
*/ */
public function action_edit() { public function action_edit() {
if ($_POST AND $this->ao->values($_POST)->changed() AND (! $this->save($this->ao))) if ($this->request->post() AND $this->ao->values($this->request->post())->changed() AND (! $this->save($this->ao)))
$this->ao->reload(); $this->ao->reload();
Block::factory() Block::factory()

2
classes/lnApp/Table.php
View File

@ -315,7 +315,7 @@ $(document).ready(function() {
// We have preference for parameters passed to the action. // We have preference for parameters passed to the action.
if (is_null($id = Request::current()->param('id'))) { if (is_null($id = Request::current()->param('id'))) {
// First save our POST id data into the session, so we dont need it when going to each page // First save our POST id data into the session, so we dont need it when going to each page
if (isset($_POST['id']) AND is_array($_POST['id'])) if (is_array($this->request->post('id')))
Session::instance()->set('page_table_view'.$key,'id'); Session::instance()->set('page_table_view'.$key,'id');
if ($ids = Session::instance()->get('page_table_view'.$key)) { if ($ids = Session::instance()->get('page_table_view'.$key)) {