[geeklog-cvs] geeklog: Facebook now uses Full Name as the Geeklog login name. ...

[geeklog-cvs at lists.geeklog.net]

changeset 8262:fa4e0c541458
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/fa4e0c541458
user: Tom <websitemaster at cogeco.net>
date: Fri Apr 29 19:13:15 2011 -0400
description:
Facebook now uses Full Name as the Geeklog login name. Fixed checking if login name is unique

diffstat:

 system/classes/oauth/facebook.auth.class.php |   2 +-
 system/classes/oauthhelper.class.php         |  21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diffs (44 lines):

diff -r 5e3bac1a0207 -r fa4e0c541458 system/classes/oauth/facebook.auth.class.php
--- a/system/classes/oauth/facebook.auth.class.php	Fri Apr 29 18:57:55 2011 -0400
+++ b/system/classes/oauth/facebook.auth.class.php	Fri Apr 29 19:13:15 2011 -0400
@@ -195,7 +195,7 @@
 
     protected function _getCreateUserInfo($info) {
         $users = array(
-            'loginname'      => $info->id,
+            'loginname'      => $info->name,
             'email'          => $info->email,
             'passwd'         => '',
             'passwd2'        => '',
diff -r 5e3bac1a0207 -r fa4e0c541458 system/classes/oauthhelper.class.php
--- a/system/classes/oauthhelper.class.php	Fri Apr 29 18:57:55 2011 -0400
+++ b/system/classes/oauthhelper.class.php	Fri Apr 29 19:13:15 2011 -0400
@@ -267,18 +267,17 @@
             // initial login - create account
             $status = USER_ACCOUNT_ACTIVE;
 
-            // COM_errorLog("checking remoteusername for uniqueness");
-            // the likelihood that a remoteusername would not be unique within a given service is extremely unlikely
-            // but, i guess it's better to be safe than sorry
-            $checkName = DB_getItem($_TABLES['users'], 'username', "username='{$users['remoteusername']}'");
+            // COM_errorLog("checking remoteuser login name for uniqueness");
+            $checkName = DB_getItem($_TABLES['users'], 'username', "username='{$users['loginname']}'");
             if (!empty($checkName)) {
-                if (function_exists('CUSTOM_uniqueRemoteUsername')) {
-                    // COM_errorLog("CUSTOM_uniqueRemoteUserName function exists, calling it");
-                    $loginname = CUSTOM_uniqueRemoteUsername($loginname, $remoteservice);
-                }
-                if ($checkName == $loginname) {
-                    // COM_errorLog("remoteusername is not unique, using USER_uniqueUsername() to create one");
-                    $loginname = USER_uniqueUsername($loginname);
+                if ($checkName == $users['loginname']) {
+                    if (function_exists('CUSTOM_uniqueRemoteUsername')) {
+                        // COM_errorLog("CUSTOM_uniqueRemoteUserName function exists, calling it");
+                        $users['loginname'] = CUSTOM_uniqueRemoteUsername($users['loginname'], $users['remoteservice']);
+                    } else {
+                        // COM_errorLog("loginname is not unique, using USER_uniqueUsername() to create one");
+                        $users['loginname'] = USER_uniqueUsername($users['loginname']);
+                    }
                 }
             }