OpenID fixes:

- avoid notice spew when checking sreg items that weren't provided
- fix keys spec for user_openid, clears up problems with removing openid associations
- fix keys spec for user_openid_trustroot

diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index 5ef05b4c774220af6ed4b416cc22ae2d286dc59f..1beff9ea304afebbeeec5c1391137ae0c802c2df 100644 (file)
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -44,6 +44,11 @@ class User_openid extends Memcached_DataObject
      * Unique keys used for lookup *MUST* be listed to ensure proper caching.
      */
     function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    function keyTypes()
     {
         return array('canonical' => 'K', 'display' => 'U', 'user_id' => 'U');
     }

diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index 0b411b8f7f11ba9e10cfa932cb58407809dc0f18..17c03afb02aee3dd707ac88c7fe077408e490b7c 100644 (file)
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -42,6 +42,11 @@ class User_openid_trustroot extends Memcached_DataObject
     }
 
     function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    function keyTypes()
     {
         return array('trustroot' => 'K', 'user_id' => 'K');
     }

diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 8f949c9c5dce26f111edc8875e862f1f5a939230..9e02c7a8834566bd8ec852c90ae84dbc4573dde0 100644 (file)
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -225,11 +225,11 @@ function oid_update_user(&$user, &$sreg)
 
     $orig_profile = clone($profile);
 
-    if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
+    if (!empty($sreg['fullname']) && strlen($sreg['fullname']) <= 255) {
         $profile->fullname = $sreg['fullname'];
     }
 
-    if ($sreg['country']) {
+    if (!empty($sreg['country'])) {
         if ($sreg['postcode']) {
             # XXX: use postcode to get city and region
             # XXX: also, store postcode somewhere -- it's valuable!
@@ -249,7 +249,7 @@ function oid_update_user(&$user, &$sreg)
 
     $orig_user = clone($user);
 
-    if ($sreg['email'] && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
+    if (!empty($sreg['email']) && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
         $user->email = $sreg['email'];
     }