diff options
29 files changed, 78 insertions, 71 deletions
diff --git a/plugins/openid/admin_panels.php b/plugins/openid/admin_panels.php index b5305933..ed65dc6a 100644 --- a/plugins/openid/admin_panels.php +++ b/plugins/openid/admin_panels.php @@ -570,7 +570,7 @@ function openid_printSystemStatus() { $status[] = array( 'Curl Support', isset($curl_version), $curl_message ); } - if (extension_loaded('gmp') and @gmp_init(1)) { + if (extension_loaded('gmp') and @gmp_add(1,1)==2) { $status[] = array( 'Big Integer support', true, 'GMP is installed.' ); } elseif (extension_loaded('bcmath') and @bcadd(1,1)==2) { $status[] = array( 'Big Integer support', true, 'BCMath is installed (though <a href="http://www.php.net/gmp">GMP</a> is preferred).' ); diff --git a/plugins/openid/lib/Auth/OpenID/AX.php b/plugins/openid/lib/Auth/OpenID/AX.php index 7370715e..49cf2676 100644 --- a/plugins/openid/lib/Auth/OpenID/AX.php +++ b/plugins/openid/lib/Auth/OpenID/AX.php @@ -69,7 +69,7 @@ function Auth_OpenID_AX_checkAlias($alias) * @package OpenID */ class Auth_OpenID_AX_Error { - function Auth_OpenID_AX_Error($message=null) + function __construct($message=null) { $this->message = $message; } @@ -151,7 +151,7 @@ class Auth_OpenID_AX_AttrInfo { * @param string $alias The name that should be given to this * attribute in the request. */ - function Auth_OpenID_AX_AttrInfo($type_uri, $count, $required, + function __construct($type_uri, $count, $required, $alias) { /** @@ -269,7 +269,7 @@ class Auth_OpenID_AX_FetchRequest extends Auth_OpenID_AX_Message { var $mode = 'fetch_request'; - function Auth_OpenID_AX_FetchRequest($update_url=null) + function __construct($update_url=null) { /** * requested_attributes: The attributes that have been @@ -540,7 +540,7 @@ class Auth_OpenID_AX_FetchRequest extends Auth_OpenID_AX_Message { */ class Auth_OpenID_AX_KeyValueMessage extends Auth_OpenID_AX_Message { - function Auth_OpenID_AX_KeyValueMessage() + function __construct() { $this->data = array(); } @@ -793,9 +793,9 @@ class Auth_OpenID_AX_KeyValueMessage extends Auth_OpenID_AX_Message { class Auth_OpenID_AX_FetchResponse extends Auth_OpenID_AX_KeyValueMessage { var $mode = 'fetch_response'; - function Auth_OpenID_AX_FetchResponse($update_url=null) + function __construct($update_url=null) { - $this->Auth_OpenID_AX_KeyValueMessage(); + parent::__construct(); $this->update_url = $update_url; } @@ -990,7 +990,7 @@ class Auth_OpenID_AX_StoreResponse extends Auth_OpenID_AX_Message { return new Auth_OpenID_AX_StoreResponse($succeeded, $error_message); } - function Auth_OpenID_AX_StoreResponse($succeeded=true, $error_message=null) + function __construct($succeeded=true, $error_message=null) { if ($succeeded) { $this->mode = $this->SUCCESS_MODE; diff --git a/plugins/openid/lib/Auth/OpenID/Association.php b/plugins/openid/lib/Auth/OpenID/Association.php index 2729138e..47eac84d 100644 --- a/plugins/openid/lib/Auth/OpenID/Association.php +++ b/plugins/openid/lib/Auth/OpenID/Association.php @@ -128,7 +128,7 @@ class Auth_OpenID_Association { * this time is 'HMAC-SHA1' and 'HMAC-SHA256', but new types may * be defined in the future. */ - function Auth_OpenID_Association( + function __construct( $handle, $secret, $issued, $lifetime, $assoc_type) { if (!in_array($assoc_type, @@ -523,7 +523,7 @@ function Auth_OpenID_getEncryptedNegotiator() * @package OpenID */ class Auth_OpenID_SessionNegotiator { - function Auth_OpenID_SessionNegotiator($allowed_types) + function __construct($allowed_types) { $this->allowed_types = array(); $this->setAllowedTypes($allowed_types); diff --git a/plugins/openid/lib/Auth/OpenID/Consumer.php b/plugins/openid/lib/Auth/OpenID/Consumer.php index 9ac0c500..c2b8c34b 100644 --- a/plugins/openid/lib/Auth/OpenID/Consumer.php +++ b/plugins/openid/lib/Auth/OpenID/Consumer.php @@ -258,7 +258,7 @@ class Auth_OpenID_Consumer { * when creating the internal consumer object. This is used for * testing. */ - function Auth_OpenID_Consumer($store, $session = null, + function __construct($store, $session = null, $consumer_cls = null) { if ($session === null) { @@ -456,7 +456,7 @@ class Auth_OpenID_DiffieHellmanSHA1ConsumerSession { var $secret_size = 20; var $allowed_assoc_types = array('HMAC-SHA1'); - function Auth_OpenID_DiffieHellmanSHA1ConsumerSession($dh = null) + function __construct($dh = null) { if ($dh === null) { $dh = new Auth_OpenID_DiffieHellman(); @@ -611,7 +611,7 @@ class Auth_OpenID_GenericConsumer { * in the module description. The default value is False, which * disables immediate mode. */ - function Auth_OpenID_GenericConsumer($store) + function __construct($store) { $this->store = $store; $this->negotiator = Auth_OpenID_getDefaultNegotiator(); @@ -1757,7 +1757,7 @@ class Auth_OpenID_AuthRequest { * class. Instances of this class are created by the library when * needed. */ - function Auth_OpenID_AuthRequest($endpoint, $assoc) + function __construct($endpoint, $assoc) { $this->assoc = $assoc; $this->endpoint = $endpoint; @@ -2036,7 +2036,7 @@ class Auth_OpenID_SuccessResponse extends Auth_OpenID_ConsumerResponse { /** * @access private */ - function Auth_OpenID_SuccessResponse($endpoint, $message, $signed_args=null) + function __construct($endpoint, $message, $signed_args=null) { $this->endpoint = $endpoint; $this->identity_url = $endpoint->claimed_id; @@ -2139,7 +2139,7 @@ class Auth_OpenID_SuccessResponse extends Auth_OpenID_ConsumerResponse { class Auth_OpenID_FailureResponse extends Auth_OpenID_ConsumerResponse { var $status = Auth_OpenID_FAILURE; - function Auth_OpenID_FailureResponse($endpoint, $message = null, + function __construct($endpoint, $message = null, $contact = null, $reference = null) { $this->setEndpoint($endpoint); @@ -2164,7 +2164,7 @@ class Auth_OpenID_TypeURIMismatch extends Auth_OpenID_FailureResponse { * @package OpenID */ class Auth_OpenID_ServerErrorContainer { - function Auth_OpenID_ServerErrorContainer($error_text, + function __construct($error_text, $error_code, $message) { @@ -2202,7 +2202,7 @@ class Auth_OpenID_ServerErrorContainer { class Auth_OpenID_CancelResponse extends Auth_OpenID_ConsumerResponse { var $status = Auth_OpenID_CANCEL; - function Auth_OpenID_CancelResponse($endpoint) + function __construct($endpoint) { $this->setEndpoint($endpoint); } @@ -2228,7 +2228,7 @@ class Auth_OpenID_CancelResponse extends Auth_OpenID_ConsumerResponse { class Auth_OpenID_SetupNeededResponse extends Auth_OpenID_ConsumerResponse { var $status = Auth_OpenID_SETUP_NEEDED; - function Auth_OpenID_SetupNeededResponse($endpoint, + function __construct($endpoint, $setup_url = null) { $this->setEndpoint($endpoint); diff --git a/plugins/openid/lib/Auth/OpenID/DiffieHellman.php b/plugins/openid/lib/Auth/OpenID/DiffieHellman.php index 3e25b7db..27759a52 100644 --- a/plugins/openid/lib/Auth/OpenID/DiffieHellman.php +++ b/plugins/openid/lib/Auth/OpenID/DiffieHellman.php @@ -47,7 +47,7 @@ class Auth_OpenID_DiffieHellman { var $private; var $lib = null; - function Auth_OpenID_DiffieHellman($mod = null, $gen = null, + function __construct($mod = null, $gen = null, $private = null, $lib = null) { if ($lib === null) { diff --git a/plugins/openid/lib/Auth/OpenID/Discover.php b/plugins/openid/lib/Auth/OpenID/Discover.php index 7b0c640c..569402e3 100644 --- a/plugins/openid/lib/Auth/OpenID/Discover.php +++ b/plugins/openid/lib/Auth/OpenID/Discover.php @@ -62,7 +62,7 @@ function Auth_OpenID_getOpenIDTypeName($type_uri) { * Object representing an OpenID service endpoint. */ class Auth_OpenID_ServiceEndpoint { - function Auth_OpenID_ServiceEndpoint() + function __construct() { $this->claimed_id = null; $this->server_url = null; diff --git a/plugins/openid/lib/Auth/OpenID/DumbStore.php b/plugins/openid/lib/Auth/OpenID/DumbStore.php index e8f29ace..b79bf658 100644 --- a/plugins/openid/lib/Auth/OpenID/DumbStore.php +++ b/plugins/openid/lib/Auth/OpenID/DumbStore.php @@ -50,7 +50,7 @@ class Auth_OpenID_DumbStore extends Auth_OpenID_OpenIDStore { * @param string secret_phrase The phrase used to create the auth * key returned by getAuthKey */ - function Auth_OpenID_DumbStore($secret_phrase) + function __construct($secret_phrase) { $this->auth_key = Auth_OpenID_SHA1($secret_phrase); } diff --git a/plugins/openid/lib/Auth/OpenID/FileStore.php b/plugins/openid/lib/Auth/OpenID/FileStore.php index d74f83dc..730225e0 100644 --- a/plugins/openid/lib/Auth/OpenID/FileStore.php +++ b/plugins/openid/lib/Auth/OpenID/FileStore.php @@ -46,7 +46,7 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore { * @param string $directory This is the directory to put the store * directories in. */ - function Auth_OpenID_FileStore($directory) + function __construct($directory) { if (!Auth_OpenID::ensureDir($directory)) { trigger_error('Not a directory and failed to create: ' diff --git a/plugins/openid/lib/Auth/OpenID/MDB2Store.php b/plugins/openid/lib/Auth/OpenID/MDB2Store.php index fb27d5c4..9349702e 100644 --- a/plugins/openid/lib/Auth/OpenID/MDB2Store.php +++ b/plugins/openid/lib/Auth/OpenID/MDB2Store.php @@ -62,7 +62,7 @@ class Auth_OpenID_MDB2Store extends Auth_OpenID_OpenIDStore { * the name of the table used for storing nonces. The default * value is 'oid_nonces'. */ - function Auth_OpenID_MDB2Store($connection, + function __construct($connection, $associations_table = null, $nonces_table = null) { diff --git a/plugins/openid/lib/Auth/OpenID/MemcachedStore.php b/plugins/openid/lib/Auth/OpenID/MemcachedStore.php index fc10800b..10785860 100644 --- a/plugins/openid/lib/Auth/OpenID/MemcachedStore.php +++ b/plugins/openid/lib/Auth/OpenID/MemcachedStore.php @@ -41,7 +41,7 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore { * * @param resource connection Memcache connection resourse */ - function Auth_OpenID_MemcachedStore($connection, $compress = false) + function __construct($connection, $compress = false) { $this->connection = $connection; $this->compress = $compress ? MEMCACHE_COMPRESSED : 0; diff --git a/plugins/openid/lib/Auth/OpenID/Message.php b/plugins/openid/lib/Auth/OpenID/Message.php index 16ec1c1d..41a8a316 100644 --- a/plugins/openid/lib/Auth/OpenID/Message.php +++ b/plugins/openid/lib/Auth/OpenID/Message.php @@ -127,7 +127,7 @@ class Auth_OpenID_Mapping { * Initialize a mapping. If $classic_array is specified, its keys * and values are used to populate the mapping. */ - function Auth_OpenID_Mapping($classic_array = null) + function __construct($classic_array = null) { $this->keys = array(); $this->values = array(); @@ -274,7 +274,7 @@ class Auth_OpenID_Mapping { * @package OpenID */ class Auth_OpenID_NamespaceMap { - function Auth_OpenID_NamespaceMap() + function __construct() { $this->alias_to_namespace = new Auth_OpenID_Mapping(); $this->namespace_to_alias = new Auth_OpenID_Mapping(); @@ -414,7 +414,7 @@ class Auth_OpenID_NamespaceMap { */ class Auth_OpenID_Message { - function Auth_OpenID_Message($openid_namespace = null) + function __construct($openid_namespace = null) { // Create an empty Message $this->allowed_openid_namespaces = array( diff --git a/plugins/openid/lib/Auth/OpenID/PAPE.php b/plugins/openid/lib/Auth/OpenID/PAPE.php index f08ca8bd..a910fd69 100644 --- a/plugins/openid/lib/Auth/OpenID/PAPE.php +++ b/plugins/openid/lib/Auth/OpenID/PAPE.php @@ -37,7 +37,7 @@ class Auth_OpenID_PAPE_Request extends Auth_OpenID_Extension { var $ns_alias = 'pape'; var $ns_uri = Auth_OpenID_PAPE_NS_URI; - function Auth_OpenID_PAPE_Request($preferred_auth_policies=null, + function __construct($preferred_auth_policies=null, $max_auth_age=null) { if ($preferred_auth_policies === null) { @@ -161,7 +161,7 @@ class Auth_OpenID_PAPE_Response extends Auth_OpenID_Extension { var $ns_alias = 'pape'; var $ns_uri = Auth_OpenID_PAPE_NS_URI; - function Auth_OpenID_PAPE_Response($auth_policies=null, $auth_time=null, + function __construct($auth_policies=null, $auth_time=null, $nist_auth_level=null) { if ($auth_policies) { diff --git a/plugins/openid/lib/Auth/OpenID/Parse.php b/plugins/openid/lib/Auth/OpenID/Parse.php index 0461bdcf..9c0a255e 100644 --- a/plugins/openid/lib/Auth/OpenID/Parse.php +++ b/plugins/openid/lib/Auth/OpenID/Parse.php @@ -108,7 +108,7 @@ class Auth_OpenID_Parse { var $_open_tag_expr = "<%s\b"; var $_close_tag_expr = "<((\/%s\b)|(%s[^>\/]*\/))>"; - function Auth_OpenID_Parse() + function __construct() { $this->_link_find = sprintf("/<link\b(?!:)([^>]*)(?!<)>/%s", $this->_re_flags); diff --git a/plugins/openid/lib/Auth/OpenID/PredisStore.php b/plugins/openid/lib/Auth/OpenID/PredisStore.php index 14ecbbd6..96384a89 100644 --- a/plugins/openid/lib/Auth/OpenID/PredisStore.php +++ b/plugins/openid/lib/Auth/OpenID/PredisStore.php @@ -45,7 +45,7 @@ class Auth_OpenID_PredisStore extends Auth_OpenID_OpenIDStore { * @param \Predis\Client $redis Predis client object * @param string $prefix Prefix for all keys stored to the Redis */ - function Auth_OpenID_PredisStore(\Predis\Client $redis, $prefix = '') + function __construct(\Predis\Client $redis, $prefix = '') { $this->prefix = $prefix; $this->redis = $redis; diff --git a/plugins/openid/lib/Auth/OpenID/SQLStore.php b/plugins/openid/lib/Auth/OpenID/SQLStore.php index 2dc731a7..a9e2ad53 100644 --- a/plugins/openid/lib/Auth/OpenID/SQLStore.php +++ b/plugins/openid/lib/Auth/OpenID/SQLStore.php @@ -75,7 +75,7 @@ class Auth_OpenID_SQLStore extends Auth_OpenID_OpenIDStore { * the name of the table used for storing nonces. The default * value is 'oid_nonces'. */ - function Auth_OpenID_SQLStore($connection, + function __construct($connection, $associations_table = null, $nonces_table = null) { diff --git a/plugins/openid/lib/Auth/OpenID/SReg.php b/plugins/openid/lib/Auth/OpenID/SReg.php index 5ece7072..ae1eb91a 100644 --- a/plugins/openid/lib/Auth/OpenID/SReg.php +++ b/plugins/openid/lib/Auth/OpenID/SReg.php @@ -418,7 +418,7 @@ class Auth_OpenID_SRegResponse extends Auth_OpenID_SRegBase { var $ns_alias = 'sreg'; - function Auth_OpenID_SRegResponse($data=null, + function __construct($data=null, $sreg_ns_uri=Auth_OpenID_SREG_NS_URI) { if ($data === null) { diff --git a/plugins/openid/lib/Auth/OpenID/Server.php b/plugins/openid/lib/Auth/OpenID/Server.php index 9887d1e8..5984c002 100644 --- a/plugins/openid/lib/Auth/OpenID/Server.php +++ b/plugins/openid/lib/Auth/OpenID/Server.php @@ -148,7 +148,7 @@ class Auth_OpenID_ServerError { /** * @access private */ - function Auth_OpenID_ServerError($message = null, $text = null, + function __construct($message = null, $text = null, $reference = null, $contact = null) { $this->message = $message; @@ -292,10 +292,10 @@ class Auth_OpenID_ServerError { * @package OpenID */ class Auth_OpenID_NoReturnToError extends Auth_OpenID_ServerError { - function Auth_OpenID_NoReturnToError($message = null, + function __construct($message = null, $text = "No return_to URL available") { - parent::Auth_OpenID_ServerError($message, $text); + parent::__construct($message, $text); } function toString() @@ -310,10 +310,10 @@ class Auth_OpenID_NoReturnToError extends Auth_OpenID_ServerError { * @package OpenID */ class Auth_OpenID_MalformedReturnURL extends Auth_OpenID_ServerError { - function Auth_OpenID_MalformedReturnURL($message, $return_to) + function __construct($message, $return_to) { $this->return_to = $return_to; - parent::Auth_OpenID_ServerError($message, "malformed return_to URL"); + parent::__construct($message, "malformed return_to URL"); } } @@ -323,10 +323,10 @@ class Auth_OpenID_MalformedReturnURL extends Auth_OpenID_ServerError { * @package OpenID */ class Auth_OpenID_MalformedTrustRoot extends Auth_OpenID_ServerError { - function Auth_OpenID_MalformedTrustRoot($message = null, + function __construct($message = null, $text = "Malformed trust root") { - parent::Auth_OpenID_ServerError($message, $text); + parent::__construct($message, $text); } function toString() @@ -353,7 +353,7 @@ class Auth_OpenID_CheckAuthRequest extends Auth_OpenID_Request { var $mode = "check_authentication"; var $invalidate_handle = null; - function Auth_OpenID_CheckAuthRequest($assoc_handle, $signed, + function __construct($assoc_handle, $signed, $invalidate_handle = null) { $this->assoc_handle = $assoc_handle; @@ -463,7 +463,7 @@ class Auth_OpenID_DiffieHellmanSHA1ServerSession { var $allowed_assoc_types = array('HMAC-SHA1'); var $hash_func = 'Auth_OpenID_SHA1'; - function Auth_OpenID_DiffieHellmanSHA1ServerSession($dh, $consumer_pubkey) + function __construct($dh, $consumer_pubkey) { $this->dh = $dh; $this->consumer_pubkey = $consumer_pubkey; @@ -590,7 +590,7 @@ class Auth_OpenID_AssociateRequest extends Auth_OpenID_Request { 'DH-SHA256' => 'Auth_OpenID_DiffieHellmanSHA256ServerSession'); } - function Auth_OpenID_AssociateRequest($session, $assoc_type) + function __construct($session, $assoc_type) { $this->session = $session; $this->namespace = Auth_OpenID_OPENID2_NS; @@ -763,7 +763,7 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request { } } - function Auth_OpenID_CheckIDRequest($identity, $return_to, + function __construct($identity, $return_to, $trust_root = null, $immediate = false, $assoc_handle = null, $server = null, $claimed_id = null) @@ -1184,7 +1184,7 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request { */ class Auth_OpenID_ServerResponse { - function Auth_OpenID_ServerResponse($request) + function __construct($request) { $this->request = $request; $this->fields = new Auth_OpenID_Message($this->request->namespace); @@ -1271,7 +1271,7 @@ class Auth_OpenID_WebResponse { var $code = AUTH_OPENID_HTTP_OK; var $body = ""; - function Auth_OpenID_WebResponse($code = null, $headers = null, + function __construct($code = null, $headers = null, $body = null) { if ($code) { @@ -1311,7 +1311,7 @@ class Auth_OpenID_Signatory { /** * Create a new signatory using a given store. */ - function Auth_OpenID_Signatory($store) + function __construct($store) { // assert store is not None $this->store = $store; @@ -1483,7 +1483,7 @@ class Auth_OpenID_Encoder { */ class Auth_OpenID_SigningEncoder extends Auth_OpenID_Encoder { - function Auth_OpenID_SigningEncoder($signatory) + function __construct($signatory) { $this->signatory = $signatory; } @@ -1521,7 +1521,7 @@ class Auth_OpenID_SigningEncoder extends Auth_OpenID_Encoder { */ class Auth_OpenID_Decoder { - function Auth_OpenID_Decoder($server) + function __construct($server) { $this->server = $server; @@ -1604,9 +1604,11 @@ class Auth_OpenID_Decoder { * @package OpenID */ class Auth_OpenID_EncodingError { - function Auth_OpenID_EncodingError($response) + function __construct($response = null) { - $this->response = $response; + if ($response !== null) { + $this->response = $response; + } } } @@ -1616,7 +1618,7 @@ class Auth_OpenID_EncodingError { * @package OpenID */ class Auth_OpenID_AlreadySigned extends Auth_OpenID_EncodingError { - // This response is already signed. + } /** @@ -1626,10 +1628,10 @@ class Auth_OpenID_AlreadySigned extends Auth_OpenID_EncodingError { * @package OpenID */ class Auth_OpenID_UntrustedReturnURL extends Auth_OpenID_ServerError { - function Auth_OpenID_UntrustedReturnURL($message, $return_to, + function __construct($message, $return_to, $trust_root) { - parent::Auth_OpenID_ServerError($message, "Untrusted return_to URL"); + parent::__construct($message, "Untrusted return_to URL"); $this->return_to = $return_to; $this->trust_root = $trust_root; } @@ -1679,7 +1681,7 @@ class Auth_OpenID_UntrustedReturnURL extends Auth_OpenID_ServerError { * @package OpenID */ class Auth_OpenID_Server { - function Auth_OpenID_Server($store, $op_endpoint=null) + function __construct($store, $op_endpoint=null) { $this->store = $store; $this->signatory = new Auth_OpenID_Signatory($this->store); diff --git a/plugins/openid/lib/Auth/OpenID/ServerRequest.php b/plugins/openid/lib/Auth/OpenID/ServerRequest.php index 69222a5e..84c7758e 100644 --- a/plugins/openid/lib/Auth/OpenID/ServerRequest.php +++ b/plugins/openid/lib/Auth/OpenID/ServerRequest.php @@ -28,7 +28,7 @@ require_once "Auth/OpenID.php"; * @package OpenID */ class Auth_OpenID_ServerRequest { - function Auth_OpenID_ServerRequest() + function __construct() { $this->mode = null; } diff --git a/plugins/openid/lib/Auth/Yadis/HTTPFetcher.php b/plugins/openid/lib/Auth/Yadis/HTTPFetcher.php index 148cde1b..76bc3239 100644 --- a/plugins/openid/lib/Auth/Yadis/HTTPFetcher.php +++ b/plugins/openid/lib/Auth/Yadis/HTTPFetcher.php @@ -23,7 +23,7 @@ define('Auth_OpenID_USER_AGENT', 'php-openid/'.Auth_OpenID_VERSION.' (php/'.phpversion().')'); class Auth_Yadis_HTTPResponse { - function Auth_Yadis_HTTPResponse($final_url = null, $status = null, + function __construct($final_url = null, $status = null, $headers = null, $body = null) { $this->final_url = $final_url; diff --git a/plugins/openid/lib/Auth/Yadis/Manager.php b/plugins/openid/lib/Auth/Yadis/Manager.php index 664521c9..8c8c3e5a 100644 --- a/plugins/openid/lib/Auth/Yadis/Manager.php +++ b/plugins/openid/lib/Auth/Yadis/Manager.php @@ -280,7 +280,7 @@ class Auth_Yadis_Manager { * * @access private */ - function Auth_Yadis_Manager($starting_url, $yadis_url, + function __construct($starting_url, $yadis_url, $services, $session_key) { // The URL that was used to initiate the Yadis protocol @@ -387,7 +387,7 @@ class Auth_Yadis_Discovery { * @param string $session_key_suffix The optional session key * suffix override. */ - function Auth_Yadis_Discovery($session, $url, + function __construct($session, $url, $session_key_suffix = null) { /// Initialize a discovery object diff --git a/plugins/openid/lib/Auth/Yadis/ParanoidHTTPFetcher.php b/plugins/openid/lib/Auth/Yadis/ParanoidHTTPFetcher.php index 627ea9a8..d15969be 100644 --- a/plugins/openid/lib/Auth/Yadis/ParanoidHTTPFetcher.php +++ b/plugins/openid/lib/Auth/Yadis/ParanoidHTTPFetcher.php @@ -27,7 +27,7 @@ require_once "Auth/OpenID.php"; * @package OpenID */ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher { - function Auth_Yadis_ParanoidHTTPFetcher() + function __construct() { $this->reset(); } diff --git a/plugins/openid/lib/Auth/Yadis/ParseHTML.php b/plugins/openid/lib/Auth/Yadis/ParseHTML.php index 255d7cd2..e0e9043c 100644 --- a/plugins/openid/lib/Auth/Yadis/ParseHTML.php +++ b/plugins/openid/lib/Auth/Yadis/ParseHTML.php @@ -43,7 +43,7 @@ class Auth_Yadis_ParseHTML { */ var $_attr_find = '\b([-\w]+)=(".*?"|\'.*?\'|.+?)[\/\s>]'; - function Auth_Yadis_ParseHTML() + function __construct() { $this->_attr_find = sprintf("/%s/%s", $this->_attr_find, diff --git a/plugins/openid/lib/Auth/Yadis/XML.php b/plugins/openid/lib/Auth/Yadis/XML.php index 2b8a20eb..c96b2a90 100644 --- a/plugins/openid/lib/Auth/Yadis/XML.php +++ b/plugins/openid/lib/Auth/Yadis/XML.php @@ -134,7 +134,7 @@ class Auth_Yadis_XMLParser { * @package OpenID */ class Auth_Yadis_domxml extends Auth_Yadis_XMLParser { - function Auth_Yadis_domxml() + function __construct() { $this->xml = null; $this->doc = null; @@ -217,7 +217,7 @@ class Auth_Yadis_domxml extends Auth_Yadis_XMLParser { * @package OpenID */ class Auth_Yadis_dom extends Auth_Yadis_XMLParser { - function Auth_Yadis_dom() + function __construct() { $this->xml = null; $this->doc = null; diff --git a/plugins/openid/lib/Auth/Yadis/XRDS.php b/plugins/openid/lib/Auth/Yadis/XRDS.php index 044d1e76..4f1ede07 100644 --- a/plugins/openid/lib/Auth/Yadis/XRDS.php +++ b/plugins/openid/lib/Auth/Yadis/XRDS.php @@ -85,7 +85,7 @@ class Auth_Yadis_Service { /** * Creates an empty service object. */ - function Auth_Yadis_Service() + function __construct() { $this->element = null; $this->parser = null; @@ -255,7 +255,7 @@ class Auth_Yadis_XRDS { * Instantiate a Auth_Yadis_XRDS object. Requires an XPath * instance which has been used to parse a valid XRDS document. */ - function Auth_Yadis_XRDS($xmlParser, $xrdNodes) + function __construct($xmlParser, $xrdNodes) { $this->parser = $xmlParser; $this->xrdNode = $xrdNodes[count($xrdNodes) - 1]; diff --git a/plugins/openid/lib/Auth/Yadis/XRIRes.php b/plugins/openid/lib/Auth/Yadis/XRIRes.php index 5e115873..b484beec 100644 --- a/plugins/openid/lib/Auth/Yadis/XRIRes.php +++ b/plugins/openid/lib/Auth/Yadis/XRIRes.php @@ -8,7 +8,7 @@ require_once 'Auth/Yadis/XRDS.php'; require_once 'Auth/Yadis/XRI.php'; class Auth_Yadis_ProxyResolver { - function Auth_Yadis_ProxyResolver($fetcher, $proxy_url = null) + function __construct($fetcher, $proxy_url = null) { $this->fetcher = $fetcher; $this->proxy_url = $proxy_url; diff --git a/plugins/openid/lib/Auth/Yadis/Yadis.php b/plugins/openid/lib/Auth/Yadis/Yadis.php index f8853671..5be56da1 100644 --- a/plugins/openid/lib/Auth/Yadis/Yadis.php +++ b/plugins/openid/lib/Auth/Yadis/Yadis.php @@ -68,7 +68,7 @@ class Auth_Yadis_DiscoveryResult { // Did the discovery fail miserably? var $failed = false; - function Auth_Yadis_DiscoveryResult($request_uri) + function __construct($request_uri) { // Initialize the state of the object // sets all attributes to None except the request_uri diff --git a/plugins/openid/login.php b/plugins/openid/login.php index ee4da241..c0b95a1d 100644 --- a/plugins/openid/login.php +++ b/plugins/openid/login.php @@ -37,6 +37,7 @@ function openid_authenticate($user) { if ( !wp_verify_nonce($_REQUEST['_wpnonce'], 'openid_login_' . md5($identity_url)) ) { $user = new WP_Error('openid_login_error', __('Error during OpenID authentication. Please try again. (invalid nonce)', 'openid')); + return $user; } if ( $identity_url ) { diff --git a/plugins/openid/openid.php b/plugins/openid/openid.php index 0de281bf..5ad309fe 100644 --- a/plugins/openid/openid.php +++ b/plugins/openid/openid.php @@ -5,7 +5,7 @@ * Description: Allows the use of OpenID for account registration, authentication, and commenting. Also includes an OpenID provider which can turn WordPress author URLs into OpenIDs. * Author: DiSo Development Team * Author URI: http://diso-project.org/ - * Version: 3.4.1 + * Version: 3.4.2 * License: Apache 2.0 * License URI: https://www.apache.org/licenses/LICENSE-2.0 * Text Domain: openid diff --git a/plugins/openid/readme.txt b/plugins/openid/readme.txt index b3fb63b5..a7b350ec 100644 --- a/plugins/openid/readme.txt +++ b/plugins/openid/readme.txt @@ -2,8 +2,8 @@ Contributors: willnorris, factoryjoe, pfefferle Tags: openid, authentication, login, comments Requires at least: 2.8 -Tested up to: 4.4.1 -Stable tag: 3.4.1 +Tested up to: 4.6.1 +Stable tag: 3.4.2 License: Apache 2.0 License URI: https://www.apache.org/licenses/LICENSE-2.0 @@ -105,6 +105,10 @@ report at <http://code.google.com/p/diso/issues/list>. Project maintined on github at [diso/wordpress-openid](https://github.com/diso/wordpress-openid). += version 3.4.2 (Nov 20, 2016) = + - update to latest OpenID library + - fixed error response if nonce doesn't match https://github.com/diso/wordpress-openid/pull/46 + = version 3.4.1 (Jan 31, 2016) = - update to latest OpenID library. Full changelog [on github](https://github.com/openid/php-openid). - fix comment bug https://wordpress.org/support/topic/false-error-please-fill-the-required-fields-name-email-commenting?replies=5 |