diff options
| -rw-r--r-- | Auth/OpenID/Consumer/Consumer.php | 31 | ||||
| -rw-r--r-- | Auth/OpenID/Util.php | 9 |
2 files changed, 17 insertions, 23 deletions
diff --git a/Auth/OpenID/Consumer/Consumer.php b/Auth/OpenID/Consumer/Consumer.php index d8726b4..dce431d 100644 --- a/Auth/OpenID/Consumer/Consumer.php +++ b/Auth/OpenID/Consumer/Consumer.php @@ -503,7 +503,7 @@ class Auth_OpenID_Consumer { $error = Auth_OpenID_array_get($query, 'openid.error', null); if ($error !== null) { - Auth_OpenID_log($error); + trigger_error("In OpenID completeAuth: $error", E_USER_NOTICE); } return array(Auth_OpenID_FAILURE, null); } else if ($mode == 'id_res') { @@ -671,8 +671,9 @@ class Auth_OpenID_Consumer { $error = Auth_OpenID_array_get($results, 'error', null); if ($error !== null) { - Auth_OpenID_log(sprintf("Error message from server during " . - "check_authentication: %s", $error)); + $msg = sprintf("Error message from server during " . + "check_authentication: %s", $error); + trigger_error($msg, E_USER_NOTICE); } return Auth_OpenID_FAILURE; @@ -829,22 +830,23 @@ class Auth_OpenID_Consumer { $ret = @$this->fetcher->post($server_url, $body); if ($ret === null) { $fmt = 'Getting association: failed to fetch URL: %s'; - Auth_OpenID_log(sprintf($fmt, $server_url)); + trigger_error(sprintf($fmt, $server_url), E_USER_NOTICE); return null; } list($http_code, $url, $data) = $ret; $results = Auth_OpenID_kvToArray($data); if ($http_code == 400) { - $server_error = Auth_OpenID_array_get($results, 'error', - '<no message from server>'); + $error = Auth_OpenID_array_get($results, 'error', + '<no message from server>'); $fmt = 'Getting association: error returned from server %s: %s'; - Auth_OpenID_log(sprintf($fmt, $server_url, $server_error)); + trigger_error(sprintf($fmt, $server_url, $error), E_USER_NOTICE); return null; } else if ($http_code != 200) { $fmt = 'Getting association: bad status code from server %s: %s'; - Auth_OpenID_log(sprintf($fmt, $server_url, $http_code)); + $msg = sprintf($fmt, $server_url, $http_code); + trigger_error($msg, E_USER_NOTICE); return null; } @@ -863,10 +865,9 @@ class Auth_OpenID_Consumer { foreach ($required_keys as $key) { if (!array_key_exists($key, $results)) { - Auth_OpenID_log(sprintf("Getting association: missing key in ". - "response from %s: %s", - $server_url, $key), - E_USER_WARNING); + $fmt = "associate: missing key in response from %s: %s"; + $msg = sprintf($fmt, $server_url, $key); + trigger_error($msg, E_USER_NOTICE); return null; } } @@ -874,7 +875,8 @@ class Auth_OpenID_Consumer { $assoc_type = $results['assoc_type']; if ($assoc_type != 'HMAC-SHA1') { $fmt = 'Unsupported assoc_type returned from server %s: %s'; - Auth_OpenID_log(sprintf($fmt, $server_url, $assoc_type)); + $msg = sprintf($fmt, $server_url, $assoc_type); + trigger_error($msg, E_USER_NOTICE); return null; } @@ -888,7 +890,8 @@ class Auth_OpenID_Consumer { } else { $fmt = 'Unsupported session_type returned from server %s: %s'; if ($session_type != 'DH-SHA1') { - Auth_OpenID_log(sprintf($fmt, $server_url, $session_type)); + $msg = sprintf($fmt, $server_url, $session_type); + trigger_error($msg, E_USER_NOTICE); return null; } diff --git a/Auth/OpenID/Util.php b/Auth/OpenID/Util.php index dba3c28..f0ea66d 100644 --- a/Auth/OpenID/Util.php +++ b/Auth/OpenID/Util.php @@ -52,15 +52,6 @@ function Auth_OpenID_array_get($arr, $key, $fallback = null) } } - -/** - * Prints the specified message using trigger_error(E_USER_NOTICE). - */ -function Auth_OpenID_log($message, $unused_level = 0) -{ - trigger_error($message, E_USER_NOTICE); -} - /** * Rename query arguments back to 'openid.' from 'openid_' * |