From acf23fae7dbc313e1c2794a9d2d6d3d7be6d5ecb Mon Sep 17 00:00:00 2001 From: lonalore Date: Thu, 1 Dec 2016 09:26:57 +0100 Subject: [PATCH 1/5] Issue #2083 - Fix for "user_xup_login" event triggering... loginProvider() method call used 2 parameters, but method uses 1 parameter. --- e107_handlers/user_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index 4140ab628..e0fa68d85 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -1397,7 +1397,7 @@ class e_user_provider } $this->adapter = $this->hybridauth->authenticate($this->getProvider()); - $check = e107::getUser()->setProvider($this)->loginProvider($this->userId(), false); + $check = e107::getUser()->setProvider($this)->loginProvider($this->userId()); if($redirectUrl) From 8d838bb9a8ac01566f11f52cb6e1a6265a6d32f3 Mon Sep 17 00:00:00 2001 From: lonalore Date: Thu, 1 Dec 2016 09:39:32 +0100 Subject: [PATCH 2/5] Prevent debug message if debug mode is disabled. --- e107_handlers/user_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php index ebbb97688..1738ff6c2 100644 --- a/e107_handlers/user_model.php +++ b/e107_handlers/user_model.php @@ -1586,7 +1586,10 @@ class e_user extends e_user_model $userdata = $userlogin->getUserData(); - e107::getLog()->add('XUP Debug', (__CLASS__.':'.__METHOD__.'-'.__LINE__), E_LOG_INFORMATIVE, "XUP_DEBUG"); + if(defset('E107_DEBUG_LEVEL', 0) > 0) + { + e107::getLog()->add('XUP Debug', (__CLASS__ . ':' . __METHOD__ . '-' . __LINE__), E_LOG_INFORMATIVE, "XUP_DEBUG"); + } $this->setSessionData(true)->setData($userdata); From 3fa89bc13a3ce1c93c52f7b15f4ab07b14c9b6ff Mon Sep 17 00:00:00 2001 From: lonalore Date: Thu, 1 Dec 2016 09:53:50 +0100 Subject: [PATCH 3/5] New "user_xup_profile_updated" event. --- e107_handlers/user_model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php index 1738ff6c2..fe611dd4c 100644 --- a/e107_handlers/user_model.php +++ b/e107_handlers/user_model.php @@ -1593,7 +1593,7 @@ class e_user extends e_user_model $this->setSessionData(true)->setData($userdata); - e107::getEvent()->trigger('user_xup_login', $userdata); + e107::getEvent()->trigger('user_xup_login', $userdata); return $this->isUser(); } @@ -1760,6 +1760,7 @@ class e_user extends e_user_model if($sql->update('user', $updateQry) !==false) { + e107::getEvent()->trigger('user_xup_profile_updated', $userdata); e107::getLog()->add('User Profile Updated', $userdata, E_LOG_INFORMATIVE, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name'])); } else From 77bcd1656972df0ece78b3d38a95579f7095b456 Mon Sep 17 00:00:00 2001 From: lonalore Date: Thu, 1 Dec 2016 10:07:05 +0100 Subject: [PATCH 4/5] Trigger event with updated profile data. --- e107_handlers/user_model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php index fe611dd4c..41ec63621 100644 --- a/e107_handlers/user_model.php +++ b/e107_handlers/user_model.php @@ -1760,7 +1760,8 @@ class e_user extends e_user_model if($sql->update('user', $updateQry) !==false) { - e107::getEvent()->trigger('user_xup_profile_updated', $userdata); + $updatedProfile = array_replace($user, $userdata); + e107::getEvent()->trigger('user_xup_profile_updated', $updatedProfile); e107::getLog()->add('User Profile Updated', $userdata, E_LOG_INFORMATIVE, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name'])); } else From 5ef0f56b8fedc5e76a2ed20106c5ff458fb312ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=B3na=20Lore?= Date: Thu, 1 Dec 2016 22:57:00 +0100 Subject: [PATCH 5/5] Use "user_xup_updated" event name. --- e107_handlers/user_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php index 41ec63621..cad0e4f34 100644 --- a/e107_handlers/user_model.php +++ b/e107_handlers/user_model.php @@ -1761,7 +1761,7 @@ class e_user extends e_user_model if($sql->update('user', $updateQry) !==false) { $updatedProfile = array_replace($user, $userdata); - e107::getEvent()->trigger('user_xup_profile_updated', $updatedProfile); + e107::getEvent()->trigger('user_xup_updated', $updatedProfile); e107::getLog()->add('User Profile Updated', $userdata, E_LOG_INFORMATIVE, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name'])); } else