| Index: trunk/extensions/OpenID/php-openid-2.2.2.patch |
| — | — | @@ -0,0 +1,81 @@ |
| | 2 | +diff -bru _Auth//OpenID/Consumer.php Auth//OpenID/Consumer.php |
| | 3 | +--- _Auth//OpenID/Consumer.php 2010-04-29 22:41:05.000000000 +0200 |
| | 4 | +@@ -666,7 +666,7 @@ |
| | 5 | + '_completeInvalid'); |
| | 6 | + |
| | 7 | + return call_user_func_array(array($this, $method), |
| | 8 | +- array($message, &$endpoint, $return_to)); |
| | 9 | ++ array($message, $endpoint, $return_to)); |
| | 10 | + } |
| | 11 | + |
| | 12 | + /** |
| | 13 | +@@ -1181,7 +1181,7 @@ |
| | 14 | + // oidutil.log('Performing discovery on %s' % (claimed_id,)) |
| | 15 | + list($unused, $services) = call_user_func($this->discoverMethod, |
| | 16 | + $claimed_id, |
| | 17 | +- &$this->fetcher); |
| | 18 | ++ $this->fetcher); |
| | 19 | + |
| | 20 | + if (!$services) { |
| | 21 | + return new Auth_OpenID_FailureResponse(null, |
| | 22 | +diff -bru _Auth//OpenID/Server.php Auth//OpenID/Server.php |
| | 23 | +--- _Auth//OpenID/Server.php 2010-04-29 22:41:05.000000000 +0200 |
| | 24 | +@@ -1704,7 +1704,7 @@ |
| | 25 | + { |
| | 26 | + if (method_exists($this, "openid_" . $request->mode)) { |
| | 27 | + $handler = array($this, "openid_" . $request->mode); |
| | 28 | +- return call_user_func($handler, &$request); |
| | 29 | ++ return call_user_func($handler, $request); |
| | 30 | + } |
| | 31 | + return null; |
| | 32 | + } |
| | 33 | +diff -bru _Auth//OpenID/TrustRoot.php Auth//OpenID/TrustRoot.php |
| | 34 | +--- _Auth//OpenID/TrustRoot.php 2010-04-29 22:41:05.000000000 +0200 |
| | 35 | +@@ -413,7 +413,7 @@ |
| | 36 | + } |
| | 37 | + |
| | 38 | + call_user_func_array($discover_function, |
| | 39 | +- array($relying_party_url, &$fetcher)); |
| | 40 | ++ array($relying_party_url, $fetcher)); |
| | 41 | + |
| | 42 | + $return_to_urls = array(); |
| | 43 | + $matching_endpoints = Auth_OpenID_extractReturnURL($endpoints); |
| | 44 | +diff -bru _Auth//Yadis/Manager.php Auth//Yadis/Manager.php |
| | 45 | +--- _Auth//Yadis/Manager.php 2010-04-29 22:41:05.000000000 +0200 |
| | 46 | +@@ -413,7 +413,7 @@ |
| | 47 | + |
| | 48 | + list($yadis_url, $services) = call_user_func($discover_cb, |
| | 49 | + $this->url, |
| | 50 | +- &$fetcher); |
| | 51 | ++ $fetcher); |
| | 52 | + |
| | 53 | + $manager = $this->createManager($services, $yadis_url); |
| | 54 | + } |
| | 55 | +diff -bru _Auth//Yadis/XRDS.php Auth//Yadis/XRDS.php |
| | 56 | +--- _Auth//Yadis/XRDS.php 2010-04-29 22:41:05.000000000 +0200 |
| | 57 | +@@ -429,7 +429,7 @@ |
| | 58 | + |
| | 59 | + foreach ($filters as $filter) { |
| | 60 | + |
| | 61 | +- if (call_user_func_array($filter, array(&$service))) { |
| | 62 | ++ if (call_user_func_array($filter, array($service))) { |
| | 63 | + $matches++; |
| | 64 | + |
| | 65 | + if ($filter_mode == SERVICES_YADIS_MATCH_ANY) { |
| | 66 | +diff -bru _Auth//Yadis/Yadis.php Auth//Yadis/Yadis.php |
| | 67 | +--- _Auth//Yadis/Yadis.php 2010-04-29 22:41:05.000000000 +0200 |
| | 68 | +@@ -141,7 +141,7 @@ |
| | 69 | + } |
| | 70 | + |
| | 71 | + $yadis_result = call_user_func_array($discover_func, |
| | 72 | +- array($input_url, &$fetcher)); |
| | 73 | ++ array($input_url, $fetcher)); |
| | 74 | + |
| | 75 | + if ($yadis_result === null) { |
| | 76 | + return array($input_url, array()); |
| Index: trunk/extensions/OpenID/Makefile |
| — | — | @@ -2,15 +2,41 @@ |
| 3 | 3 | SUBDIR=openid-php-openid-782224d |
| 4 | 4 | # how to make that one predictable easily? |
| 5 | 5 | |
| | 6 | +# http://www.mediawiki.org/wiki/Extension:OpenID |
| | 7 | +# |
| | 8 | +# This makefile automates the installation of a prerequisite for the MediaWiki OpenID extension. |
| | 9 | +# |
| | 10 | +# First download the extension which includes this makefile from |
| | 11 | +# http://www.mediawiki.org/wiki/Special:ExtensionDistributor/OpenID |
| | 12 | +# |
| | 13 | +# MediaWiki OpenID depends on the OpenIDEnabled.com PHP library for OpenID, |
| | 14 | +# which in turn depends on the OpenIDEnabled.com PHP library for YADIS. |
| | 15 | +# |
| | 16 | +# Installation: |
| | 17 | +# |
| | 18 | +# cd $IP/extensions/OpenID |
| | 19 | +# make |
| | 20 | +# |
| | 21 | +# The makefile downloads the openid-php library from http://www.openidenabled.com/php-openid/ |
| | 22 | +# and applies a patch to avoid PHP errors because Call-time pass-by-reference is deprecated |
| | 23 | +# since PHP 5.3.x see https://github.com/openid/php-openid/issues#issue/8 and |
| | 24 | +# the patch and fork of user kost https://github.com/openid/php-openid/pull/44/files |
| | 25 | +# |
| | 26 | +# T. Gries 20110203 |
| | 27 | + |
| 6 | 28 | php-openid: Auth |
| 7 | 29 | |
| 8 | 30 | Auth: php-openid-$(VER).tar.gz |
| 9 | 31 | tar -xzf php-openid-$(VER).tar.gz $(SUBDIR)/Auth |
| | 32 | + rm -f php-openid-$(VER).tar.gz |
| 10 | 33 | mv $(SUBDIR)/Auth ./ |
| | 34 | + patch -p1 -d Auth < php-openid-$(VER).patch |
| 11 | 35 | rmdir $(SUBDIR) |
| 12 | 36 | |
| 13 | 37 | php-openid-$(VER).tar.gz: |
| 14 | 38 | wget --no-check-certificate https://github.com/openid/php-openid/tarball/$(VER) -O php-openid-$(VER).tar.gz |
| 15 | 39 | |
| | 40 | +# before starting a fresh installation or update, |
| | 41 | +# you could use "make clean" to clean up, then "make" again |
| 16 | 42 | clean: |
| 17 | | - rm -rf Auth php-openid-$(VER).tar.bz2 |
| | 43 | + rm -rf Auth php-openid-$(VER).tar.gz |