mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +02:00
Code Issues Releases Wiki Activity

New event trigger names reworked. Replaced all '-' with '_' for compatibility with e_notify.

Browse Source
This commit is contained in:
Cameron
2015-02-12 16:52:30 -08:00
parent 3e802c2751
commit dab64ca165
13 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_handlers/user_model.php
View File

@@ -1455,8 +1455,11 @@ class e_user extends e_user_model
$userlogin = new userlogin();
$userlogin->login($uname, $upass_plain, $uauto, $uchallange, $noredirect);
$this->setSessionData(true)
->setData($userlogin->getUserData());
$userdata = $userlogin->getUserData();
$this->setSessionData(true)->setData($userdata);
e107::getEvent()->trigger('user_login', $userdata);
return $this->isUser();
}
@@ -1475,8 +1478,11 @@ class e_user extends e_user_model
$userlogin = new userlogin();
$userlogin->login($xup, '', 'provider', false, true);
$this->setSessionData(true)
->setData($userlogin->getUserData());
$userdata = $userlogin->getUserData();
$this->setSessionData(true)->setData($userdata);
e107::getEvent()->trigger('user_xup_login', $userdata);
return $this->isUser();
}
@@ -1828,9 +1834,9 @@ class e_user extends e_user_model
final protected function _load($user_id)
{
$qry = 'SELECT u.*, ue.* FROM #user AS u LEFT JOIN #user_extended as ue ON u.user_id=ue.user_extended_id WHERE user_id='.intval($user_id);
if(e107::getDb()->db_Select_gen($qry))
if(e107::getDb()->gen($qry))
{
return e107::getDb()->db_Fetch();
return e107::getDb()->fetch();
}
return array();
}