diff options
101 files changed, 111 insertions, 172 deletions
diff --git a/Auth/OpenID.php b/Auth/OpenID.php index 6556b5b..bc66d62 100644 --- a/Auth/OpenID.php +++ b/Auth/OpenID.php @@ -549,4 +549,4 @@ class Auth_OpenID { "</html>"); } } -?> + diff --git a/Auth/OpenID/AX.php b/Auth/OpenID/AX.php index 2a52448..516adec 100644 --- a/Auth/OpenID/AX.php +++ b/Auth/OpenID/AX.php @@ -1020,4 +1020,3 @@ class Auth_OpenID_AX_StoreResponse extends Auth_OpenID_AX_Message { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/Association.php b/Auth/OpenID/Association.php index 37ce0cb..2cd74e5 100644 --- a/Auth/OpenID/Association.php +++ b/Auth/OpenID/Association.php @@ -610,4 +610,3 @@ class Auth_OpenID_SessionNegotiator { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/BigMath.php b/Auth/OpenID/BigMath.php index 4510494..f787482 100644 --- a/Auth/OpenID/BigMath.php +++ b/Auth/OpenID/BigMath.php @@ -468,4 +468,4 @@ function Auth_OpenID_noMathSupport() return defined('Auth_OpenID_NO_MATH_SUPPORT'); } -?> + diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php index a72684c..b7f9439 100644 --- a/Auth/OpenID/Consumer.php +++ b/Auth/OpenID/Consumer.php @@ -2226,4 +2226,4 @@ class Auth_OpenID_SetupNeededResponse extends Auth_OpenID_ConsumerResponse { } } -?> + diff --git a/Auth/OpenID/CryptUtil.php b/Auth/OpenID/CryptUtil.php index aacc3cd..28433b7 100644 --- a/Auth/OpenID/CryptUtil.php +++ b/Auth/OpenID/CryptUtil.php @@ -106,4 +106,3 @@ class Auth_OpenID_CryptUtil { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/DatabaseConnection.php b/Auth/OpenID/DatabaseConnection.php index 9db6e0e..0c7d08f 100644 --- a/Auth/OpenID/DatabaseConnection.php +++ b/Auth/OpenID/DatabaseConnection.php @@ -128,4 +128,3 @@ class Auth_OpenID_DatabaseConnection { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/DiffieHellman.php b/Auth/OpenID/DiffieHellman.php index f4ded7e..f1006c1 100644 --- a/Auth/OpenID/DiffieHellman.php +++ b/Auth/OpenID/DiffieHellman.php @@ -110,4 +110,4 @@ class Auth_OpenID_DiffieHellman { } } -?> + diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php index c10c82d..6bc30f3 100644 --- a/Auth/OpenID/Discover.php +++ b/Auth/OpenID/Discover.php @@ -545,4 +545,4 @@ function Auth_OpenID_discover($uri, &$fetcher) return $result; } -?> + diff --git a/Auth/OpenID/DumbStore.php b/Auth/OpenID/DumbStore.php index 22fd2d3..e8f29ac 100644 --- a/Auth/OpenID/DumbStore.php +++ b/Auth/OpenID/DumbStore.php @@ -97,4 +97,3 @@ class Auth_OpenID_DumbStore extends Auth_OpenID_OpenIDStore { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/Extension.php b/Auth/OpenID/Extension.php index f362a4b..4c869f8 100644 --- a/Auth/OpenID/Extension.php +++ b/Auth/OpenID/Extension.php @@ -59,4 +59,3 @@ class Auth_OpenID_Extension { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/FileStore.php b/Auth/OpenID/FileStore.php index 29d8d20..6774a7f 100644 --- a/Auth/OpenID/FileStore.php +++ b/Auth/OpenID/FileStore.php @@ -615,4 +615,4 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore { } } -?> + diff --git a/Auth/OpenID/HMAC.php b/Auth/OpenID/HMAC.php index ec42db8..e9779bd 100644 --- a/Auth/OpenID/HMAC.php +++ b/Auth/OpenID/HMAC.php @@ -96,4 +96,3 @@ if (function_exists('hash_hmac') && define('Auth_OpenID_HMACSHA256_SUPPORTED', false); } -?>
\ No newline at end of file diff --git a/Auth/OpenID/Interface.php b/Auth/OpenID/Interface.php index f4c6062..eca6b9c 100644 --- a/Auth/OpenID/Interface.php +++ b/Auth/OpenID/Interface.php @@ -194,4 +194,3 @@ class Auth_OpenID_OpenIDStore { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/KVForm.php b/Auth/OpenID/KVForm.php index fb342a0..18ae7ac 100644 --- a/Auth/OpenID/KVForm.php +++ b/Auth/OpenID/KVForm.php @@ -109,4 +109,3 @@ class Auth_OpenID_KVForm { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/MemcachedStore.php b/Auth/OpenID/MemcachedStore.php index d357c6b..fc10800 100644 --- a/Auth/OpenID/MemcachedStore.php +++ b/Auth/OpenID/MemcachedStore.php @@ -205,4 +205,3 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/Message.php b/Auth/OpenID/Message.php index 5ab115a..d53e93d 100644 --- a/Auth/OpenID/Message.php +++ b/Auth/OpenID/Message.php @@ -917,4 +917,4 @@ class Auth_OpenID_Message { } } -?> + diff --git a/Auth/OpenID/MySQLStore.php b/Auth/OpenID/MySQLStore.php index eb08af0..810f059 100644 --- a/Auth/OpenID/MySQLStore.php +++ b/Auth/OpenID/MySQLStore.php @@ -75,4 +75,3 @@ class Auth_OpenID_MySQLStore extends Auth_OpenID_SQLStore { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/Nonce.php b/Auth/OpenID/Nonce.php index effecac..b83c591 100644 --- a/Auth/OpenID/Nonce.php +++ b/Auth/OpenID/Nonce.php @@ -106,4 +106,3 @@ function Auth_OpenID_mkNonce($when = null) return $time_str . $salt; } -?>
\ No newline at end of file diff --git a/Auth/OpenID/PAPE.php b/Auth/OpenID/PAPE.php index 62cba8a..3876b28 100644 --- a/Auth/OpenID/PAPE.php +++ b/Auth/OpenID/PAPE.php @@ -298,4 +298,3 @@ class Auth_OpenID_PAPE_Response extends Auth_OpenID_Extension { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/Parse.php b/Auth/OpenID/Parse.php index 546f34f..d18eae5 100644 --- a/Auth/OpenID/Parse.php +++ b/Auth/OpenID/Parse.php @@ -349,4 +349,3 @@ function Auth_OpenID_legacy_discover($html_text, $server_rel, } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/PostgreSQLStore.php b/Auth/OpenID/PostgreSQLStore.php index 69d95e7..d90e43e 100644 --- a/Auth/OpenID/PostgreSQLStore.php +++ b/Auth/OpenID/PostgreSQLStore.php @@ -110,4 +110,3 @@ class Auth_OpenID_PostgreSQLStore extends Auth_OpenID_SQLStore { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/SQLStore.php b/Auth/OpenID/SQLStore.php index da93c6a..abd81bf 100644 --- a/Auth/OpenID/SQLStore.php +++ b/Auth/OpenID/SQLStore.php @@ -566,4 +566,4 @@ class Auth_OpenID_SQLStore extends Auth_OpenID_OpenIDStore { } } -?> + diff --git a/Auth/OpenID/SQLiteStore.php b/Auth/OpenID/SQLiteStore.php index ec2bf58..4558fa1 100644 --- a/Auth/OpenID/SQLiteStore.php +++ b/Auth/OpenID/SQLiteStore.php @@ -68,4 +68,3 @@ class Auth_OpenID_SQLiteStore extends Auth_OpenID_SQLStore { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/SReg.php b/Auth/OpenID/SReg.php index 6328076..f8cccfd 100644 --- a/Auth/OpenID/SReg.php +++ b/Auth/OpenID/SReg.php @@ -518,4 +518,4 @@ class Auth_OpenID_SRegResponse extends Auth_OpenID_SRegBase { } } -?> + diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php index f1db4d8..1a2f2e7 100644 --- a/Auth/OpenID/Server.php +++ b/Auth/OpenID/Server.php @@ -1757,4 +1757,4 @@ class Auth_OpenID_Server { } } -?> + diff --git a/Auth/OpenID/ServerRequest.php b/Auth/OpenID/ServerRequest.php index 33a8556..69222a5 100644 --- a/Auth/OpenID/ServerRequest.php +++ b/Auth/OpenID/ServerRequest.php @@ -34,4 +34,3 @@ class Auth_OpenID_ServerRequest { } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/TrustRoot.php b/Auth/OpenID/TrustRoot.php index 4919a60..cf06aa2 100644 --- a/Auth/OpenID/TrustRoot.php +++ b/Auth/OpenID/TrustRoot.php @@ -459,4 +459,3 @@ function Auth_OpenID_verifyReturnTo($realm_str, $return_to, &$fetcher, } } -?>
\ No newline at end of file diff --git a/Auth/OpenID/URINorm.php b/Auth/OpenID/URINorm.php index f821d83..c051b55 100644 --- a/Auth/OpenID/URINorm.php +++ b/Auth/OpenID/URINorm.php @@ -246,4 +246,4 @@ function Auth_OpenID_urinorm($uri) return $scheme . '://' . $authority . $path . $query . $fragment; } -?> + diff --git a/Auth/Yadis/HTTPFetcher.php b/Auth/Yadis/HTTPFetcher.php index 963b9a4..6053410 100644 --- a/Auth/Yadis/HTTPFetcher.php +++ b/Auth/Yadis/HTTPFetcher.php @@ -144,4 +144,3 @@ class Auth_Yadis_HTTPFetcher { } } -?>
\ No newline at end of file diff --git a/Auth/Yadis/Manager.php b/Auth/Yadis/Manager.php index d50cf7a..5b3ce62 100644 --- a/Auth/Yadis/Manager.php +++ b/Auth/Yadis/Manager.php @@ -526,4 +526,3 @@ class Auth_Yadis_Discovery { } } -?>
\ No newline at end of file diff --git a/Auth/Yadis/Misc.php b/Auth/Yadis/Misc.php index 1134a4f..a5afa8e 100644 --- a/Auth/Yadis/Misc.php +++ b/Auth/Yadis/Misc.php @@ -56,4 +56,3 @@ function Auth_Yadis_startswith($s, $stuff) return strpos($s, $stuff) === 0; } -?>
\ No newline at end of file diff --git a/Auth/Yadis/ParanoidHTTPFetcher.php b/Auth/Yadis/ParanoidHTTPFetcher.php index a62f36c..605aecd 100644 --- a/Auth/Yadis/ParanoidHTTPFetcher.php +++ b/Auth/Yadis/ParanoidHTTPFetcher.php @@ -223,4 +223,3 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher { } } -?>
\ No newline at end of file diff --git a/Auth/Yadis/ParseHTML.php b/Auth/Yadis/ParseHTML.php index 297ccbd..6f0f8b7 100644 --- a/Auth/Yadis/ParseHTML.php +++ b/Auth/Yadis/ParseHTML.php @@ -256,4 +256,3 @@ class Auth_Yadis_ParseHTML { } } -?>
\ No newline at end of file diff --git a/Auth/Yadis/PlainHTTPFetcher.php b/Auth/Yadis/PlainHTTPFetcher.php index 3e0ca2b..af441ca 100644 --- a/Auth/Yadis/PlainHTTPFetcher.php +++ b/Auth/Yadis/PlainHTTPFetcher.php @@ -246,4 +246,3 @@ class Auth_Yadis_PlainHTTPFetcher extends Auth_Yadis_HTTPFetcher { } } -?>
\ No newline at end of file diff --git a/Auth/Yadis/XML.php b/Auth/Yadis/XML.php index 81b2ce2..fb4a16a 100644 --- a/Auth/Yadis/XML.php +++ b/Auth/Yadis/XML.php @@ -371,4 +371,4 @@ function &Auth_Yadis_getXMLParser() return $p; } -?> + diff --git a/Auth/Yadis/XRDS.php b/Auth/Yadis/XRDS.php index f14a794..107818b 100644 --- a/Auth/Yadis/XRDS.php +++ b/Auth/Yadis/XRDS.php @@ -475,4 +475,3 @@ class Auth_Yadis_XRDS { } } -?>
\ No newline at end of file diff --git a/Auth/Yadis/XRI.php b/Auth/Yadis/XRI.php index 4e34623..dd41593 100644 --- a/Auth/Yadis/XRI.php +++ b/Auth/Yadis/XRI.php @@ -231,4 +231,4 @@ function Auth_Yadis_getCanonicalID($iname, $xrds) return $canonicalID; } -?> + diff --git a/Auth/Yadis/XRIRes.php b/Auth/Yadis/XRIRes.php index 4e8e8d0..0f4ea10 100644 --- a/Auth/Yadis/XRIRes.php +++ b/Auth/Yadis/XRIRes.php @@ -69,4 +69,4 @@ class Auth_Yadis_ProxyResolver { } } -?> + diff --git a/Auth/Yadis/Yadis.php b/Auth/Yadis/Yadis.php index d89f77c..43cd25d 100644 --- a/Auth/Yadis/Yadis.php +++ b/Auth/Yadis/Yadis.php @@ -379,4 +379,4 @@ class Auth_Yadis_Yadis { } } -?> + diff --git a/Tests/Auth/OpenID/AX.php b/Tests/Auth/OpenID/AX.php index f723379..0a85ed2 100644 --- a/Tests/Auth/OpenID/AX.php +++ b/Tests/Auth/OpenID/AX.php @@ -790,4 +790,3 @@ class Tests_Auth_OpenID_AX extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/Association.php b/Tests/Auth/OpenID/Association.php index 98b2e64..d658296 100644 --- a/Tests/Auth/OpenID/Association.php +++ b/Tests/Auth/OpenID/Association.php @@ -51,4 +51,4 @@ class Tests_Auth_OpenID_Association extends PHPUnit_Framework_TestCase { } } -?> + diff --git a/Tests/Auth/OpenID/AssociationResponse.php b/Tests/Auth/OpenID/AssociationResponse.php index bb37350..6902f95 100644 --- a/Tests/Auth/OpenID/AssociationResponse.php +++ b/Tests/Auth/OpenID/AssociationResponse.php @@ -375,4 +375,3 @@ if (!defined('Auth_OpenID_NO_MATH_SUPPORT')) { $Tests_Auth_OpenID_AssociationResponse_other[] = new TestExtractAssociationDiffieHellman(); } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/AuthRequest.php b/Tests/Auth/OpenID/AuthRequest.php index 9f73814..02ab75d 100644 --- a/Tests/Auth/OpenID/AuthRequest.php +++ b/Tests/Auth/OpenID/AuthRequest.php @@ -297,4 +297,3 @@ class Tests_Auth_OpenID_AuthRequest extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/BigMath.php b/Tests/Auth/OpenID/BigMath.php index 951c9e2..fb258d9 100644 --- a/Tests/Auth/OpenID/BigMath.php +++ b/Tests/Auth/OpenID/BigMath.php @@ -232,4 +232,3 @@ class Tests_Auth_OpenID_BigMath extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php index aa12671..af357f1 100644 --- a/Tests/Auth/OpenID/Consumer.php +++ b/Tests/Auth/OpenID/Consumer.php @@ -2526,4 +2526,4 @@ if (!defined('Auth_OpenID_NO_MATH_SUPPORT') && $Tests_Auth_OpenID_Consumer_other[] = new TestOpenID2SHA256(); } -?> + diff --git a/Tests/Auth/OpenID/CryptUtil.php b/Tests/Auth/OpenID/CryptUtil.php index a4f838c..29022d2 100644 --- a/Tests/Auth/OpenID/CryptUtil.php +++ b/Tests/Auth/OpenID/CryptUtil.php @@ -52,4 +52,3 @@ class Tests_Auth_OpenID_CryptUtil extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/DiffieHellman.php b/Tests/Auth/OpenID/DiffieHellman.php index 173fc35..3336061 100644 --- a/Tests/Auth/OpenID/DiffieHellman.php +++ b/Tests/Auth/OpenID/DiffieHellman.php @@ -156,4 +156,4 @@ class Tests_Auth_OpenID_DiffieHellman extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/Discover_OpenID.php b/Tests/Auth/OpenID/Discover_OpenID.php index a1d62d8..03d25dc 100644 --- a/Tests/Auth/OpenID/Discover_OpenID.php +++ b/Tests/Auth/OpenID/Discover_OpenID.php @@ -779,4 +779,3 @@ $Tests_Auth_OpenID_Discover_OpenID_other = array( new Tests_Auth_OpenID_SSLSupport() ); -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/Extension.php b/Tests/Auth/OpenID/Extension.php index 398cc42..35eb2f2 100644 --- a/Tests/Auth/OpenID/Extension.php +++ b/Tests/Auth/OpenID/Extension.php @@ -42,4 +42,3 @@ class Tests_Auth_OpenID_Extension extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/HMAC.php b/Tests/Auth/OpenID/HMAC.php index 85aa5b0..7423966 100644 --- a/Tests/Auth/OpenID/HMAC.php +++ b/Tests/Auth/OpenID/HMAC.php @@ -162,4 +162,4 @@ class Tests_Auth_OpenID_HMAC extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/KVForm.php b/Tests/Auth/OpenID/KVForm.php index d9de1de..904f2c8 100644 --- a/Tests/Auth/OpenID/KVForm.php +++ b/Tests/Auth/OpenID/KVForm.php @@ -257,4 +257,4 @@ class Tests_Auth_OpenID_KVForm extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/MemStore.php b/Tests/Auth/OpenID/MemStore.php index a45aae9..68a085f 100644 --- a/Tests/Auth/OpenID/MemStore.php +++ b/Tests/Auth/OpenID/MemStore.php @@ -173,4 +173,4 @@ class Tests_Auth_OpenID_MemStore extends Auth_OpenID_OpenIDStore { } } -?> + diff --git a/Tests/Auth/OpenID/Message.php b/Tests/Auth/OpenID/Message.php index 3c5896f..88706e5 100644 --- a/Tests/Auth/OpenID/Message.php +++ b/Tests/Auth/OpenID/Message.php @@ -1248,4 +1248,4 @@ $Tests_Auth_OpenID_Message_other = array( new Tests_Auth_OpenID_GeneralMessageTest() ); -?> + diff --git a/Tests/Auth/OpenID/Negotiation.php b/Tests/Auth/OpenID/Negotiation.php index 52fe9fd..02628fc 100644 --- a/Tests/Auth/OpenID/Negotiation.php +++ b/Tests/Auth/OpenID/Negotiation.php @@ -344,4 +344,3 @@ class Tests_Auth_OpenID_Negotiation extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/Nonce.php b/Tests/Auth/OpenID/Nonce.php index 25d9ea5..1f64948 100644 --- a/Tests/Auth/OpenID/Nonce.php +++ b/Tests/Auth/OpenID/Nonce.php @@ -163,4 +163,4 @@ class Tests_Auth_OpenID_Nonce_BadSplitCase extends PHPUnit_Framework_TestCase { } } -?> + diff --git a/Tests/Auth/OpenID/OpenID_Yadis.php b/Tests/Auth/OpenID/OpenID_Yadis.php index b16e3b8..923dfd3 100644 --- a/Tests/Auth/OpenID/OpenID_Yadis.php +++ b/Tests/Auth/OpenID/OpenID_Yadis.php @@ -9,7 +9,7 @@ require_once "Auth/Yadis/XRDS.php"; require_once "Auth/OpenID/Discover.php"; global $__XRDS_BOILERPLATE; -$__XRDS_BOILERPLATE = '<?xml version="1.0" encoding="UTF-8"?> +$__XRDS_BOILERPLATE = '<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" xmlns:openid="http://openid.net/xmlns/1.0"> @@ -226,4 +226,3 @@ class Tests_Auth_OpenID_OpenID_Yadis extends PHPUnit_Framework_TestSuite { } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/PAPE.php b/Tests/Auth/OpenID/PAPE.php index c258e82..d71036d 100644 --- a/Tests/Auth/OpenID/PAPE.php +++ b/Tests/Auth/OpenID/PAPE.php @@ -241,4 +241,4 @@ class Tests_Auth_OpenID_PAPE extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/Parse.php b/Tests/Auth/OpenID/Parse.php index e4d473f..b0e0350 100644 --- a/Tests/Auth/OpenID/Parse.php +++ b/Tests/Auth/OpenID/Parse.php @@ -182,4 +182,4 @@ class Tests_Auth_OpenID_Parse extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/RPVerify.php b/Tests/Auth/OpenID/RPVerify.php index 4b5cf75..d219f7b 100644 --- a/Tests/Auth/OpenID/RPVerify.php +++ b/Tests/Auth/OpenID/RPVerify.php @@ -90,7 +90,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_Framework_TestCase { function test_noEntries() { - $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?> + $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" > @@ -102,7 +102,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_Framework_TestCase { function test_noReturnToEntries() { - $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?> + $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" > @@ -118,7 +118,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_Framework_TestCase { function test_oneEntry() { - $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?> + $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" > @@ -134,7 +134,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_Framework_TestCase { function test_twoEntries() { - $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?> + $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" > @@ -155,7 +155,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_Framework_TestCase { function test_twoEntries_withOther() { - $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?> + $this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)" > @@ -294,4 +294,3 @@ class Tests_Auth_OpenID_RPVerify extends PHPUnit_Framework_TestSuite { } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/SReg.php b/Tests/Auth/OpenID/SReg.php index 3e453b9..5546600 100644 --- a/Tests/Auth/OpenID/SReg.php +++ b/Tests/Auth/OpenID/SReg.php @@ -670,4 +670,3 @@ class Tests_Auth_OpenID_SReg extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php index ba2160c..bcb4f2a 100644 --- a/Tests/Auth/OpenID/Server.php +++ b/Tests/Auth/OpenID/Server.php @@ -2460,4 +2460,4 @@ class Tests_Auth_OpenID_Server extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php index bd46e02..b51b961 100644 --- a/Tests/Auth/OpenID/StoreTest.php +++ b/Tests/Auth/OpenID/StoreTest.php @@ -703,4 +703,4 @@ class Tests_Auth_OpenID_StoreTest extends PHPUnit_Framework_TestSuite { $this->addTestSuite('Tests_Auth_OpenID_MemcachedStore_Test'); } } -?> + diff --git a/Tests/Auth/OpenID/TestUtil.php b/Tests/Auth/OpenID/TestUtil.php index eabf3d3..28e3ca9 100644 --- a/Tests/Auth/OpenID/TestUtil.php +++ b/Tests/Auth/OpenID/TestUtil.php @@ -58,4 +58,3 @@ class OpenIDTestMixin extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/TrustRoot.php b/Tests/Auth/OpenID/TrustRoot.php index 5ba1918..3603940 100644 --- a/Tests/Auth/OpenID/TrustRoot.php +++ b/Tests/Auth/OpenID/TrustRoot.php @@ -169,4 +169,4 @@ class Tests_Auth_OpenID_TrustRoot extends PHPUnit_Framework_TestSuite { } } -?> + diff --git a/Tests/Auth/OpenID/URINorm.php b/Tests/Auth/OpenID/URINorm.php index da94d59..b79b780 100644 --- a/Tests/Auth/OpenID/URINorm.php +++ b/Tests/Auth/OpenID/URINorm.php @@ -64,4 +64,3 @@ class Tests_Auth_OpenID_URINorm extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/OpenID/Util.php b/Tests/Auth/OpenID/Util.php index e055423..ecaed79 100644 --- a/Tests/Auth/OpenID/Util.php +++ b/Tests/Auth/OpenID/Util.php @@ -316,4 +316,4 @@ assert not should_raise and actual == expected, case } } -?> + diff --git a/Tests/Auth/OpenID/VerifyDisco.php b/Tests/Auth/OpenID/VerifyDisco.php index 015e021..f18d3aa 100644 --- a/Tests/Auth/OpenID/VerifyDisco.php +++ b/Tests/Auth/OpenID/VerifyDisco.php @@ -420,4 +420,3 @@ $Tests_Auth_OpenID_VerifyDisco_other = array( new Tests_openID1Fallback1_0(), ); -?>
\ No newline at end of file diff --git a/Tests/Auth/Yadis/DiscoverData.php b/Tests/Auth/Yadis/DiscoverData.php index 816a06b..bf02d66 100644 --- a/Tests/Auth/Yadis/DiscoverData.php +++ b/Tests/Auth/Yadis/DiscoverData.php @@ -150,4 +150,3 @@ function generateResult($base_url, $input_name, $id_name, $result_name, $success return array($input_url, $result); } -?>
\ No newline at end of file diff --git a/Tests/Auth/Yadis/Discover_Yadis.php b/Tests/Auth/Yadis/Discover_Yadis.php index 6e2d38b..0ca3b2e 100644 --- a/Tests/Auth/Yadis/Discover_Yadis.php +++ b/Tests/Auth/Yadis/Discover_Yadis.php @@ -228,4 +228,3 @@ $Tests_Auth_Yadis_Discover_Yadis_other = array( new Tests_Auth_Yadis_Discover_Yadis_ContentTypes() ); -?>
\ No newline at end of file diff --git a/Tests/Auth/Yadis/ParseHTML.php b/Tests/Auth/Yadis/ParseHTML.php index bc7574f..e3977bc 100644 --- a/Tests/Auth/Yadis/ParseHTML.php +++ b/Tests/Auth/Yadis/ParseHTML.php @@ -84,4 +84,3 @@ class Tests_Auth_Yadis_ParseHTML extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/Yadis/TestUtil.php b/Tests/Auth/Yadis/TestUtil.php index 8936c0e..6c25812 100644 --- a/Tests/Auth/Yadis/TestUtil.php +++ b/Tests/Auth/Yadis/TestUtil.php @@ -27,4 +27,4 @@ function Tests_Auth_Yadis_readlines($name) return Tests_Auth_Yadis_datafile($name, 'file'); } -?> + diff --git a/Tests/Auth/Yadis/XRDS.php b/Tests/Auth/Yadis/XRDS.php index 7d9048e..3bb23e4 100644 --- a/Tests/Auth/Yadis/XRDS.php +++ b/Tests/Auth/Yadis/XRDS.php @@ -245,4 +245,3 @@ class Tests_Auth_Yadis_XRDS extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/Yadis/XRI.php b/Tests/Auth/Yadis/XRI.php index 7f2b04d..220c196 100644 --- a/Tests/Auth/Yadis/XRI.php +++ b/Tests/Auth/Yadis/XRI.php @@ -140,4 +140,3 @@ class Tests_Auth_Yadis_XRI extends PHPUnit_Framework_TestSuite { } } -?>
\ No newline at end of file diff --git a/Tests/Auth/Yadis/Yadis.php b/Tests/Auth/Yadis/Yadis.php index 8c55558..5672a15 100644 --- a/Tests/Auth/Yadis/Yadis.php +++ b/Tests/Auth/Yadis/Yadis.php @@ -86,4 +86,3 @@ class Tests_Auth_Yadis_Yadis extends PHPUnit_Framework_TestSuite { } -?>
\ No newline at end of file diff --git a/Tests/TestDriver.php b/Tests/TestDriver.php index 44675af..27312d2 100644 --- a/Tests/TestDriver.php +++ b/Tests/TestDriver.php @@ -199,4 +199,4 @@ function loadSuite($names=null) return $result; } -?> + diff --git a/admin/adminutil.php b/admin/adminutil.php index 7389838..91be296 100644 --- a/admin/adminutil.php +++ b/admin/adminutil.php @@ -27,4 +27,3 @@ function getParent() return dirname(dirname(realpath(__FILE__))); } -?>
\ No newline at end of file diff --git a/admin/otb_test.php b/admin/otb_test.php index b2fc99f..35b3a97 100644 --- a/admin/otb_test.php +++ b/admin/otb_test.php @@ -17,4 +17,3 @@ function pass2( { } -?>
\ No newline at end of file diff --git a/admin/texttest.php b/admin/texttest.php index 422dd1d..a6f5e93 100644 --- a/admin/texttest.php +++ b/admin/texttest.php @@ -194,4 +194,4 @@ if ($totals['error'] || $totals['failure']) { exit(1); } -?> + diff --git a/admin/webtest.php b/admin/webtest.php index 1076623..61e6fa2 100644 --- a/admin/webtest.php +++ b/admin/webtest.php @@ -9,4 +9,4 @@ $gui = new PHPUnit_GUI_HTML(); $gui->addSuites($suites); $gui->show(); -?> + diff --git a/contrib/signed_assertions/AP.php b/contrib/signed_assertions/AP.php index a242650..266a124 100644 --- a/contrib/signed_assertions/AP.php +++ b/contrib/signed_assertions/AP.php @@ -177,4 +177,4 @@ class RP_OP_Verify } -?> + diff --git a/contrib/signed_assertions/SAML.php b/contrib/signed_assertions/SAML.php index fa6df51..04363c6 100644 --- a/contrib/signed_assertions/SAML.php +++ b/contrib/signed_assertions/SAML.php @@ -217,4 +217,4 @@ class SAML{ } } -?> + diff --git a/examples/consumer/common.php b/examples/consumer/common.php index 2f01ba0..446c6cc 100644 --- a/examples/consumer/common.php +++ b/examples/consumer/common.php @@ -94,4 +94,3 @@ function getTrustRoot() { dirname($_SERVER['PHP_SELF'])); } -?>
\ No newline at end of file diff --git a/examples/consumer/finish_auth.php b/examples/consumer/finish_auth.php index b19a665..0e71b9d 100644 --- a/examples/consumer/finish_auth.php +++ b/examples/consumer/finish_auth.php @@ -95,4 +95,3 @@ function run() { run(); -?>
\ No newline at end of file diff --git a/examples/consumer/index.php b/examples/consumer/index.php index 343a39c..dd2f391 100644 --- a/examples/consumer/index.php +++ b/examples/consumer/index.php @@ -2,7 +2,7 @@ require_once "common.php"; global $pape_policy_uris; -?> + <html> <head><title>PHP OpenID Authentication Example</title></head> <style type="text/css"> @@ -48,9 +48,9 @@ global $pape_policy_uris; is your identity URL. </p> - <?php if (isset($msg)) { print "<div class=\"alert\">$msg</div>"; } ?> - <?php if (isset($error)) { print "<div class=\"error\">$error</div>"; } ?> - <?php if (isset($success)) { print "<div class=\"success\">$success</div>"; } ?> + <?php if (isset($msg)) { print "<div class=\"alert\">$msg</div>"; } + <?php if (isset($error)) { print "<div class=\"error\">$error</div>"; } + <?php if (isset($success)) { print "<div class=\"success\">$success</div>"; } <div id="verify-form"> <form method="get" action="try_auth.php"> @@ -63,7 +63,7 @@ global $pape_policy_uris; <?php foreach ($pape_policy_uris as $i => $uri) { print "<input type=\"checkbox\" name=\"policies[]\" value=\"$uri\" />"; print "$uri<br/>"; - } ?> + } </p> <input type="submit" value="Verify" /> diff --git a/examples/consumer/try_auth.php b/examples/consumer/try_auth.php index 7efec76..61d1828 100644 --- a/examples/consumer/try_auth.php +++ b/examples/consumer/try_auth.php @@ -80,4 +80,3 @@ function run() { run(); -?>
\ No newline at end of file diff --git a/examples/detect.php b/examples/detect.php index 2d06ae1..36b612f 100644 --- a/examples/detect.php +++ b/examples/detect.php @@ -514,4 +514,4 @@ if (!$_include) { $out .= $body . $r->end(); print $out; -?> + diff --git a/examples/discover.php b/examples/discover.php index 31e6b61..4f21465 100644 --- a/examples/discover.php +++ b/examples/discover.php @@ -17,7 +17,7 @@ function escape($x) $identifier = getOpenIDIdentifier(); -?> + <html> <head> <title>OpenID discovery</title> @@ -38,40 +38,40 @@ if ($identifier) { list($normalized_identifier, $endpoints) = Auth_OpenID_discover( $identifier, $fetcher); -?> - <h3>Discovery Results for <?= escape($identifier) ?></h3> + + <h3>Discovery Results for <?= escape($identifier) </h3> <table cellpadding="7" cellspacing="0"> <tbody> <tr> <th>Claimed Identifier</th> - <td><?= escape($normalized_identifier) ?></td> + <td><?= escape($normalized_identifier) </td> </tr> <? if (!$endpoints) { -?> + <tr> <td colspan="2">No OpenID services discovered.</td> </tr> <? } else { -?> + <tr> <td colspan="2">Discovered OpenID services:</td> </tr> <? foreach ($endpoints as $endpoint) { -?> + <tr> <td colspan="2"><hr/></td> </tr> <tr> <th>Server URL</th> - <td><tt><?= escape($endpoint->server_url) ?></tt></td> + <td><tt><?= escape($endpoint->server_url) </tt></td> </tr> <tr> <th>Local ID</th> - <td><tt><?= escape($endpoint->local_id) ?></tt></td> + <td><tt><?= escape($endpoint->local_id) </tt></td> </tr> <tr> <td colspan="2"> @@ -79,22 +79,22 @@ foreach ($endpoints as $endpoint) { <ul> <? foreach ($endpoint->type_uris as $type_uri) { -?> - <li><tt><?= escape($type_uri) ?></tt></li> + + <li><tt><?= escape($type_uri) </tt></li> <? } -?> + </ul> </td> </tr> <? } } -?> + </tbody> </table> <? } -?> + </body> </html>
\ No newline at end of file diff --git a/examples/server/index.php b/examples/server/index.php index 7a95064..b42c5b3 100644 --- a/examples/server/index.php +++ b/examples/server/index.php @@ -2,4 +2,3 @@ header("Location: server.php"); -?>
\ No newline at end of file diff --git a/examples/server/lib/actions.php b/examples/server/lib/actions.php index 50dc19a..9f825e3 100644 --- a/examples/server/lib/actions.php +++ b/examples/server/lib/actions.php @@ -161,4 +161,3 @@ function action_userXrds() return userXrds_render($identity); } -?>
\ No newline at end of file diff --git a/examples/server/lib/common.php b/examples/server/lib/common.php index 80d05f5..8b45da7 100644 --- a/examples/server/lib/common.php +++ b/examples/server/lib/common.php @@ -92,4 +92,3 @@ function doAuth($info, $trusted=null, $fail_cancels=false, } } -?>
\ No newline at end of file diff --git a/examples/server/lib/render.php b/examples/server/lib/render.php index 33d2aef..afa059d 100644 --- a/examples/server/lib/render.php +++ b/examples/server/lib/render.php @@ -111,4 +111,3 @@ function page_render($body, $user, $title, $h1=null, $login=false) return array($headers, $text); } -?>
\ No newline at end of file diff --git a/examples/server/lib/render/about.php b/examples/server/lib/render/about.php index bd35836..7e7cf1a 100644 --- a/examples/server/lib/render/about.php +++ b/examples/server/lib/render/about.php @@ -55,4 +55,3 @@ function about_render($error=false, $internal=true) return page_render($body, $current_user, 'OpenID Server Endpoint'); } -?>
\ No newline at end of file diff --git a/examples/server/lib/render/idpXrds.php b/examples/server/lib/render/idpXrds.php index 6e4ae1c..6dde930 100644 --- a/examples/server/lib/render/idpXrds.php +++ b/examples/server/lib/render/idpXrds.php @@ -5,7 +5,7 @@ require_once "lib/render.php"; require_once "Auth/OpenID/Discover.php"; -define('idp_xrds_pat', '<?xml version="1.0" encoding="UTF-8"?> +define('idp_xrds_pat', '<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)"> @@ -29,4 +29,3 @@ function idpXrds_render() return array($headers, $body); } -?>
\ No newline at end of file diff --git a/examples/server/lib/render/idpage.php b/examples/server/lib/render/idpage.php index 48c2486..a10f46d 100644 --- a/examples/server/lib/render/idpage.php +++ b/examples/server/lib/render/idpage.php @@ -28,4 +28,4 @@ function idpage_render($identity) return array($headers, $body); } -?> + diff --git a/examples/server/lib/render/login.php b/examples/server/lib/render/login.php index 986a885..8568648 100644 --- a/examples/server/lib/render/login.php +++ b/examples/server/lib/render/login.php @@ -62,4 +62,3 @@ function loginError_render($errors) } return sprintf("<ul class=\"error\">\n%s</ul>\n", $text); } -?>
\ No newline at end of file diff --git a/examples/server/lib/render/trust.php b/examples/server/lib/render/trust.php index 681d456..5972e5d 100644 --- a/examples/server/lib/render/trust.php +++ b/examples/server/lib/render/trust.php @@ -53,4 +53,3 @@ function noIdentifier_render() return page_render(no_id_pat, null, 'No Identifier Sent'); } -?>
\ No newline at end of file diff --git a/examples/server/lib/render/userXrds.php b/examples/server/lib/render/userXrds.php index a9ea95e..0f0239e 100644 --- a/examples/server/lib/render/userXrds.php +++ b/examples/server/lib/render/userXrds.php @@ -5,7 +5,7 @@ require_once "lib/render.php"; require_once "Auth/OpenID/Discover.php"; -define('user_xrds_pat', '<?xml version="1.0" encoding="UTF-8"?> +define('user_xrds_pat', '<?xml version="1.0" encoding="UTF-8" <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)"> @@ -31,4 +31,3 @@ function userXrds_render($identity) return array($headers, $body); } -?>
\ No newline at end of file diff --git a/examples/server/lib/session.php b/examples/server/lib/session.php index 201b6ee..13b0ec9 100644 --- a/examples/server/lib/session.php +++ b/examples/server/lib/session.php @@ -175,4 +175,3 @@ function idFromURL($url) return @$parts['user']; } -?>
\ No newline at end of file diff --git a/examples/server/server.php b/examples/server/server.php index f054be8..cbb8288 100644 --- a/examples/server/server.php +++ b/examples/server/server.php @@ -29,7 +29,7 @@ if (function_exists('getOpenIDStore')) { writeResponse($resp); } else { -?> + <html> <head> <title>PHP OpenID Server</title> @@ -45,4 +45,3 @@ if (function_exists('getOpenIDStore')) { </html> <?php } -?>
\ No newline at end of file diff --git a/examples/server/setup.php b/examples/server/setup.php index e25ef34..9ec35f8 100644 --- a/examples/server/setup.php +++ b/examples/server/setup.php @@ -192,7 +192,7 @@ function render_form() { $pgsql_found = true; } -?> + <html> <head> <style type="text/css"> @@ -256,7 +256,7 @@ if ($messages) { print "</div>"; } -?> + <p> Your browser has been redirected to this page so you can configure the @@ -269,13 +269,13 @@ configuration for use with the OpenID server example. <p> The server URL is the URL that points to the "server.php" file. It - looks like your server URL should be <code><?php print build_url(); ?></code>. + looks like your server URL should be <code><?php print build_url(); </code>. </p> <span class="label"><label for="i_server_url">Server URL:</label></span> <span> <input type="text" id="i_server_url" size="35" name="server_url" - value="<?php print $_SESSION['server_url'] ?>"> + value="<?php print $_SESSION['server_url'] "> </span> </div> @@ -292,7 +292,7 @@ configuration for use with the OpenID server example. </span> <span> <input type="text" id="i_include_path" size="35" name="include_path" - value="<?php print $_SESSION['include_path'] ?>"> + value="<?php print $_SESSION['include_path'] "> </span> </div> @@ -308,64 +308,64 @@ configuration for use with the OpenID server example. <div> <input type="radio" name="store_type" value="Filesystem" - id="i_filesystem"<?php if ($_SESSION['store_type'] == 'Filesystem') { print " CHECKED"; } ?>> + id="i_filesystem"<?php if ($_SESSION['store_type'] == 'Filesystem') { print " CHECKED"; } > <label for="i_filesystem">Filesystem</label> <div> <label for="i_fs_path" class="field">Filesystem path:</label> <input type="text" name="fs_path" id="i_fs_path" - value="<?php print @$_SESSION['store_data']['fs_path']; ?>"> - <?php print $basedir_msg; ?> + value="<?php print @$_SESSION['store_data']['fs_path']; "> + <?php print $basedir_msg; </div> </div> -<?php if ($sqlite_found) { ?> +<?php if ($sqlite_found) { <div> <input type="radio" name="store_type" value="SQLite" - id="i_sqlite"<?php if ($_SESSION['store_type'] == 'SQLite') { print " CHECKED"; } ?>> + id="i_sqlite"<?php if ($_SESSION['store_type'] == 'SQLite') { print " CHECKED"; } > <label for="i_sqlite">SQLite</label> <div> <label for="i_sqlite_path" class="field">SQLite database path:</label> - <input type="text" value="<?php print @$_SESSION['store_data']['sqlite_path']; ?>" + <input type="text" value="<?php print @$_SESSION['store_data']['sqlite_path']; " name="sqlite_path" id="i_sqlite_path"> - <?php print $basedir_msg; ?> + <?php print $basedir_msg; </div> </div> -<?php } ?> +<?php } -<?php if ($mysql_found || $pgsql_found) { ?> +<?php if ($mysql_found || $pgsql_found) { <div> -<?php if ($mysql_found) { ?> +<?php if ($mysql_found) { <input type="radio" name="store_type" value="MySQL" - id="i_mysql"<?php if ($_SESSION['store_type'] == 'MySQL') { print " CHECKED"; } ?>> + id="i_mysql"<?php if ($_SESSION['store_type'] == 'MySQL') { print " CHECKED"; } > <label for="i_mysql">MySQL</label> -<?php } ?> +<?php } -<?php if ($pgsql_found) { ?> +<?php if ($pgsql_found) { <input type="radio" name="store_type" value="PostgreSQL" - id="i_pgsql"<?php if ($_SESSION['store_type'] == 'PostgreSQL') { print " CHECKED"; } ?>> + id="i_pgsql"<?php if ($_SESSION['store_type'] == 'PostgreSQL') { print " CHECKED"; } > <label for="i_pgsql">PostgreSQL</label> -<?php } ?> +<?php } <div> <label for="i_m_host" class="field">Host:</label> - <input type="text" value="<?php print @$_SESSION['store_data']['host']; ?>" name="host" id="i_m_host"> + <input type="text" value="<?php print @$_SESSION['store_data']['host']; " name="host" id="i_m_host"> </div> <div> <label for="i_m_database" class="field">Database:</label> - <input value="<?php print @$_SESSION['store_data']['database']; ?>" type="text" name="database" id="i_m_database"> + <input value="<?php print @$_SESSION['store_data']['database']; " type="text" name="database" id="i_m_database"> </div> <div> <label for="i_m_username" class="field">Username:</label> - <input type="text" name="username" id="i_m_username" value="<?php print @$_SESSION['store_data']['username']; ?>"> + <input type="text" name="username" id="i_m_username" value="<?php print @$_SESSION['store_data']['username']; "> </div> <div> <label for="i_m_password" class="field">Password:</label> - <input type="password" name="password" id="i_m_password" value="<?php print @$_SESSION['store_data']['password']; ?>"> + <input type="password" name="password" id="i_m_password" value="<?php print @$_SESSION['store_data']['password']; "> </div> </div> -<?php } ?> +<?php } </div> </div> @@ -416,14 +416,14 @@ function generate_config($download = false) { header("Content-disposition: attachment; filename=config.php"); print "<?php\n"; } else { -?> + <html> <body> <h2>OpenID Example Server Configuration</h2> <p> -Put the following text into <strong><?php print dirname(__FILE__); print DIRECTORY_SEPARATOR; ?>config.php</strong>. +Put the following text into <strong><?php print dirname(__FILE__); print DIRECTORY_SEPARATOR; config.php</strong>. </p> <p> @@ -438,16 +438,16 @@ Put the following text into <strong><?php print dirname(__FILE__); print DIRECTO <?php print "<?php\n"; } -?> -<?php if ($_SESSION['include_path']) { ?> + +<?php if ($_SESSION['include_path']) { /** * Set any extra include paths needed to use the library */ set_include_path(get_include_path() . PATH_SEPARATOR . "<?php print $_SESSION['include_path']; -?>"); +"); -<?php } ?> +<?php } /** * The URL for the server. * @@ -459,7 +459,7 @@ print $_SESSION['include_path']; */ $server_url = "<?php print $_SESSION['server_url']; -?>"; +"; /** * Initialize an OpenID store @@ -488,14 +488,14 @@ function getOpenIDStore() case "MySQL": - ?>require_once 'Auth/OpenID/MySQLStore.php'; + require_once 'Auth/OpenID/MySQLStore.php'; require_once 'DB.php'; $dsn = array( 'phptype' => 'mysql', - 'username' => '<?php print $_SESSION['store_data']['username']; ?>', - 'password' => '<?php print $_SESSION['store_data']['password']; ?>', - 'hostspec' => '<?php print $_SESSION['store_data']['host']; ?>' + 'username' => '<?php print $_SESSION['store_data']['username']; ', + 'password' => '<?php print $_SESSION['store_data']['password']; ', + 'hostspec' => '<?php print $_SESSION['store_data']['host']; ' ); $db =& DB::connect($dsn); @@ -504,7 +504,7 @@ function getOpenIDStore() return null; } - $db->query("USE <?php print $_SESSION['store_data']['database']; ?>"); + $db->query("USE <?php print $_SESSION['store_data']['database']; "); $s =& new Auth_OpenID_MySQLStore($db); @@ -516,15 +516,15 @@ function getOpenIDStore() case "PostgreSQL": - ?>require_once 'Auth/OpenID/PostgreSQLStore.php'; + require_once 'Auth/OpenID/PostgreSQLStore.php'; require_once 'DB.php'; $dsn = array( 'phptype' => 'pgsql', - 'username' => '<?php print $_SESSION['store_data']['username']; ?>', - 'password' => '<?php print $_SESSION['store_data']['password']; ?>', - 'hostspec' => '<?php print $_SESSION['store_data']['host']; ?>', - 'database' => '<?php print $_SESSION['store_data']['database']; ?>' + 'username' => '<?php print $_SESSION['store_data']['username']; ', + 'password' => '<?php print $_SESSION['store_data']['password']; ', + 'hostspec' => '<?php print $_SESSION['store_data']['host']; ', + 'database' => '<?php print $_SESSION['store_data']['database']; ' ); $db =& DB::connect($dsn); @@ -542,17 +542,17 @@ function getOpenIDStore() break; } - ?> + } <?php - print "?>"; + print ""; if (!$download) { -?> + </pre> </body> </html> <?php } } // end function generate_config () -?> + |