salmon error handling issue

diff --git a/include/auth.php b/include/auth.php
index 0a6050a17e1cc92774d6d327c0d013a79afed564..05d5dfd6fc72b21421bd912ce5a54d7e57ee5187 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -114,7 +114,7 @@ else {
                                // new account
                                $_SESSION['register'] = 1;
                                $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-                               $openid->optional = array('namePerson/first');
+                               $openid->optional = array('namePerson/first','media/image/aspect11');
                                goaway($openid->authUrl());
                                // NOTREACHED   
                        }

diff --git a/include/salmon.php b/include/salmon.php
index d998b27043568a2f5a58ae6f2afb5e0e89758312..49384efea76d80009e6036a48669d625bc896ee6 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -182,7 +182,9 @@ EOT;
 
        // check for success, e.g. 2xx
 
-       if(($return_code >= 200) && ($return_code < 300)) {
+       if($return_code > 299) {
+
+               logger('slapper: compliant salmon failed. Falling back to status.net hack');
 
                // Entirely likely that their salmon implementation is
                // non-compliant. Let's try once more, this time only signing

diff --git a/mod/register.php b/mod/register.php
index 3b26f69712f56d4694378a334e488dba5afdd126..69c34f8e9c59880153f142e2892f1a5b1fc4b396 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -49,7 +49,7 @@ function register_post(&$a) {
                        $openid->identity = $openid_url;
                        $openid->returnUrl = $a->get_baseurl() . '/openid'; 
                        $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-                       $openid->optional = array('namePerson/first');
+                       $openid->optional = array('namePerson/first','media/image/aspect11');
                        goaway($openid->authUrl());
                        // NOTREACHED   
                }