Skip to content

Commit 7a75121

Browse files
author
Luke Shepard
committed
Revert "[ correct errors in removing trailing ?> ]"
This reverts commit f963a70.
1 parent f963a70 commit 7a75121

File tree

8 files changed

+73
-84
lines changed

8 files changed

+73
-84
lines changed

Diff for: ‎Tests/Auth/OpenID/OpenID_Yadis.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
require_once "Auth/OpenID/Discover.php";
1010

1111
global $__XRDS_BOILERPLATE;
12-
$__XRDS_BOILERPLATE = '<?xml version="1.0" encoding="UTF-8"?>
12+
$__XRDS_BOILERPLATE = '<?xml version="1.0" encoding="UTF-8"
1313
<xrds:XRDS xmlns:xrds="xri://$xrds"
1414
xmlns="xri://$xrd*($v*2.0)"
1515
xmlns:openid="http://openid.net/xmlns/1.0">

Diff for: ‎Tests/Auth/OpenID/RPVerify.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function test_badXML()
9090

9191
function test_noEntries()
9292
{
93-
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?>
93+
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"
9494
<xrds:XRDS xmlns:xrds="xri://$xrds"
9595
xmlns="xri://$xrd*($v*2.0)"
9696
>
@@ -102,7 +102,7 @@ function test_noEntries()
102102

103103
function test_noReturnToEntries()
104104
{
105-
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?>
105+
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"
106106
<xrds:XRDS xmlns:xrds="xri://$xrds"
107107
xmlns="xri://$xrd*($v*2.0)"
108108
>
@@ -118,7 +118,7 @@ function test_noReturnToEntries()
118118

119119
function test_oneEntry()
120120
{
121-
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?>
121+
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"
122122
<xrds:XRDS xmlns:xrds="xri://$xrds"
123123
xmlns="xri://$xrd*($v*2.0)"
124124
>
@@ -134,7 +134,7 @@ function test_oneEntry()
134134

135135
function test_twoEntries()
136136
{
137-
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?>
137+
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"
138138
<xrds:XRDS xmlns:xrds="xri://$xrds"
139139
xmlns="xri://$xrd*($v*2.0)"
140140
>
@@ -155,7 +155,7 @@ function test_twoEntries()
155155

156156
function test_twoEntries_withOther()
157157
{
158-
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"?>
158+
$this->failUnlessXRDSHasReturnURLs('<?xml version="1.0" encoding="UTF-8"
159159
<xrds:XRDS xmlns:xrds="xri://$xrds"
160160
xmlns="xri://$xrd*($v*2.0)"
161161
>

Diff for: ‎examples/consumer/index.php

+4-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
require_once "common.php";
33

44
global $pape_policy_uris;
5-
?>
65

76
<html>
87
<head><title>PHP OpenID Authentication Example</title></head>
@@ -49,17 +48,9 @@
4948
is your identity URL.
5049
</p>
5150

52-
<?php
53-
if (isset($msg)) {
54-
print "<div class=\"alert\">$msg</div>";
55-
}
56-
if (isset($error)) {
57-
print "<div class=\"error\">$error</div>";
58-
}
59-
if (isset($success)) {
60-
print "<div class=\"success\">$success</div>";
61-
}
62-
?>
51+
<?php if (isset($msg)) { print "<div class=\"alert\">$msg</div>"; }
52+
<?php if (isset($error)) { print "<div class=\"error\">$error</div>"; }
53+
<?php if (isset($success)) { print "<div class=\"success\">$success</div>"; }
6354

6455
<div id="verify-form">
6556
<form method="get" action="try_auth.php">
@@ -72,8 +63,7 @@
7263
<?php foreach ($pape_policy_uris as $i => $uri) {
7364
print "<input type=\"checkbox\" name=\"policies[]\" value=\"$uri\" />";
7465
print "$uri<br/>";
75-
}
76-
?>
66+
}
7767
</p>
7868

7969
<input type="submit" value="Verify" />

Diff for: ‎examples/discover.php

+13-15
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ function escape($x)
1717

1818

1919
$identifier = getOpenIDIdentifier();
20-
?>
2120

2221
<html>
2322
<head>
@@ -38,65 +37,64 @@ function escape($x)
3837
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
3938
list($normalized_identifier, $endpoints) = Auth_OpenID_discover(
4039
$identifier, $fetcher);
41-
?>
4240

43-
<h3>Discovery Results for <?= escape($identifier) ?></h3>
41+
42+
<h3>Discovery Results for <?= escape($identifier) </h3>
4443

4544
<table cellpadding="7" cellspacing="0">
4645
<tbody>
4746
<tr>
4847
<th>Claimed Identifier</th>
49-
<td><?= escape($normalized_identifier) ?></td>
48+
<td><?= escape($normalized_identifier) </td>
5049
</tr>
5150
<?
5251
if (!$endpoints) {
53-
?>
52+
5453
<tr>
5554
<td colspan="2">No OpenID services discovered.</td>
5655
</tr>
5756
<?
5857
} else {
59-
?>
58+
6059
<tr>
6160
<td colspan="2">Discovered OpenID services:</td>
6261
</tr>
6362
<?
6463
foreach ($endpoints as $endpoint) {
65-
?>
64+
6665
<tr>
6766
<td colspan="2"><hr/></td>
6867
</tr>
6968
<tr>
7069
<th>Server URL</th>
71-
<td><tt><?= escape($endpoint->server_url) ?></tt></td>
70+
<td><tt><?= escape($endpoint->server_url) </tt></td>
7271
</tr>
7372
<tr>
7473
<th>Local ID</th>
75-
<td><tt><?= escape($endpoint->local_id) ?></tt></td>
74+
<td><tt><?= escape($endpoint->local_id) </tt></td>
7675
</tr>
7776
<tr>
7877
<td colspan="2">
7978
<h3>Service types:</h3>
8079
<ul>
8180
<?
8281
foreach ($endpoint->type_uris as $type_uri) {
83-
?>
84-
<li><tt><?= escape($type_uri) ?> </tt></li>
82+
83+
<li><tt><?= escape($type_uri) </tt></li>
8584
<?
8685
}
87-
?>
86+
8887
</ul>
8988
</td>
9089
</tr>
9190
<?
9291
}
9392
}
94-
?>
93+
9594
</tbody>
9695
</table>
9796
<?
9897
}
99-
?>
10098

10199
</body>
102-
</html>
100+
</html>

Diff for: ‎examples/server/lib/render/idpXrds.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
require_once "Auth/OpenID/Discover.php";
77

8-
define('idp_xrds_pat', '<?xml version="1.0" encoding="UTF-8"?>
8+
define('idp_xrds_pat', '<?xml version="1.0" encoding="UTF-8"
99
<xrds:XRDS
1010
xmlns:xrds="xri://$xrds"
1111
xmlns="xri://$xrd*($v*2.0)">

Diff for: ‎examples/server/lib/render/userXrds.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
require_once "Auth/OpenID/Discover.php";
77

8-
define('user_xrds_pat', '<?xml version="1.0" encoding="UTF-8"?>
8+
define('user_xrds_pat', '<?xml version="1.0" encoding="UTF-8"
99
<xrds:XRDS
1010
xmlns:xrds="xri://$xrds"
1111
xmlns="xri://$xrd*($v*2.0)">

Diff for: ‎examples/server/server.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
writeResponse($resp);
3131
} else {
32-
?>
32+
3333
<html>
3434
<head>
3535
<title>PHP OpenID Server</title>

0 commit comments

Comments
 (0)