mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Insert email address automatically during Social login if found and missing from database.

Browse Source
This commit is contained in:
Cameron
2017-10-23 13:01:19 -07:00
parent 8566cd73e7
commit e3cf1e4086
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107.htaccess
View File

@@ -111,6 +111,7 @@
Header unset Cookie Header unset Cookie
Header unset Set-Cookie Header unset Set-Cookie
# Header set Access-Control-Allow-Origin "http://mydomain.com" # Header set Access-Control-Allow-Origin "http://mydomain.com"
# Header set Access-Control-Allow-Origin "*" # if you're really stuck.
</IfModule> </IfModule>
</FilesMatch> </FilesMatch>

14
e107_handlers/user_model.php
View File

@@ -1732,6 +1732,7 @@ class e_user extends e_user_model
$userdata['user_name'] = $sql->escape($profile->displayName); $userdata['user_name'] = $sql->escape($profile->displayName);
$userdata['user_image'] = $profile->photoURL; // avatar $userdata['user_image'] = $profile->photoURL; // avatar
$userdata['user_email'] = $profile->email;
$id = $providerId.'_'.$profile->identifier; $id = $providerId.'_'.$profile->identifier;
$where[] = "user_xup='".$sql->escape($id)."'"; $where[] = "user_xup='".$sql->escape($id)."'";
@@ -1739,7 +1740,7 @@ class e_user extends e_user_model
$where = implode(' OR ', $where); $where = implode(' OR ', $where);
if($sql->select('user', 'user_id, user_name, user_image, user_password, user_xup', $where)) if($sql->select('user', 'user_id, user_name, user_email, user_image, user_password, user_xup', $where))
{ {
$user = $sql->fetch(); $user = $sql->fetch();
@@ -1749,7 +1750,7 @@ class e_user extends e_user_model
$spref = e107::pref('social'); $spref = e107::pref('social');
// Update display name or avatar image if they have changed. // Update display name or avatar image if they have changed.
if(!empty($spref['xup_login_update_username']) || !empty($spref['xup_login_update_avatar']) || ($userdata['user_name'] != $user['user_name']) || ($userdata['user_image'] != $user['user_image'])) if(( empty($user['user_email']) && !empty($userdata['user_email']) ) || !empty($spref['xup_login_update_username']) || !empty($spref['xup_login_update_avatar']) || ($userdata['user_name'] != $user['user_name']) || ($userdata['user_image'] != $user['user_image']))
{ {
$updateQry = array(); $updateQry = array();
@@ -1763,17 +1764,22 @@ class e_user extends e_user_model
$updateQry['user_image'] = $userdata['user_image']; $updateQry['user_image'] = $userdata['user_image'];
} }
if(empty($user['user_email']))
{
$updateQry['user_email'] = $userdata['user_email'];
}
$updateQry['WHERE'] = "user_id=".$user['user_id']." LIMIT 1"; $updateQry['WHERE'] = "user_id=".$user['user_id']." LIMIT 1";
if($sql->update('user', $updateQry) !==false) if($sql->update('user', $updateQry) !==false)
{ {
$updatedProfile = array_replace($user, $userdata); $updatedProfile = array_replace($user, $userdata);
e107::getEvent()->trigger('user_xup_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'])); 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'], 'user_email'=>$userdata['user_email']));
} }
else else
{ {
e107::getLog()->add('User Profile Update Failed', $userdata, E_LOG_WARNING, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name'])); e107::getLog()->add('User Profile Update Failed', $userdata, E_LOG_WARNING, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name'], 'user_email'=>$userdata['user_email']));
} }
} }