Skip to content

Commit 1d313b0

Browse files
philwarehamphilwareham
committed
Favour TXT over PHP
Fixes #10
1 parent ad80896 commit 1d313b0

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/templates/pages/plugins.txp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "<txp:variable name="json-beta-version" escape="json" />",
1515
<txp:if_custom_field name="max-txp-version-verified-beta">"verifiedMaxTxpCompatibility": "<txp:custom_field name="max-txp-version-verified-beta" escape="json" />",</txp:if_custom_field>
1616
<txp:if_variable name="json-beta-date">"datePublished": "<txp:variable name="json-beta-date" escape="json" />",</txp:if_variable>
17-
<txp:if_variable name="json-beta-php">"endpointUrl": "<txp:variable name="json-beta-php" escape="json" />"<txp:else />"endpointUrl": "<txp:variable name="json-beta-txt" escape="json" />"</txp:if_variable>
17+
<txp:if_variable name="json-beta-txt">"endpointUrl": "<txp:variable name="json-beta-txt" escape="json" />"<txp:else />"endpointUrl": "<txp:variable name="json-beta-php" escape="json" />"</txp:if_variable>
1818
},
1919
</txp:if_variable>
2020
<txp:if_variable name="json-stable-version">
@@ -23,15 +23,15 @@
2323
<txp:if_custom_field name="max-txp-version-verified">"verifiedMaxTxpCompatibility": "<txp:custom_field name="max-txp-version-verified" escape="json" />",</txp:if_custom_field>
2424
<txp:if_custom_field name="min-txp-version-verified">"verifiedMinTxpCompatibility": "<txp:custom_field name="min-txp-version-verified" escape="json" />",</txp:if_custom_field>
2525
<txp:if_variable name="json-stable-date">"datePublished": "<txp:variable name="json-stable-date" escape="json" />",</txp:if_variable>
26-
<txp:if_variable name="json-stable-php">"endpointUrl": "<txp:variable name="json-stable-php" escape="json" />"<txp:else />"endpointUrl": "<txp:variable name="json-stable-txt" escape="json" />"</txp:if_variable>
26+
<txp:if_variable name="json-stable-txt">"endpointUrl": "<txp:variable name="json-stable-txt" escape="json" />"<txp:else />"endpointUrl": "<txp:variable name="json-stable-php" escape="json" />"</txp:if_variable>
2727
}
2828
<txp:else />
2929
"beta": {
3030
"version": "<txp:variable name="json-beta-version" escape="json" />",
3131
<txp:if_custom_field name="max-txp-version-verified-beta">"verifiedMaxTxpCompatibility": "<txp:custom_field name="max-txp-version-verified-beta" escape="json" />",</txp:if_custom_field>
3232
<txp:if_custom_field name="min-txp-version-verified">"verifiedMinTxpCompatibility": "<txp:custom_field name="min-txp-version-verified" escape="json" />",</txp:if_custom_field>
3333
<txp:if_variable name="json-beta-date">"datePublished": "<txp:variable name="json-beta-date" escape="json" />",</txp:if_variable>
34-
<txp:if_variable name="json-beta-php">"endpointUrl": "<txp:variable name="json-beta-php" escape="json" />"<txp:else />"endpointUrl": "<txp:variable name="json-beta-txt" escape="json" />"</txp:if_variable>
34+
<txp:if_variable name="json-beta-txt">"endpointUrl": "<txp:variable name="json-beta-txt" escape="json" />"<txp:else />"endpointUrl": "<txp:variable name="json-beta-php" escape="json" />"</txp:if_variable>
3535
}
3636
</txp:if_variable>
3737
<txp:php>
@@ -50,10 +50,10 @@ if (!empty($json2['legacy'])) {
5050
$newJson['legacy'][$txpver]['datePublished'] = txpspecialchars($endpointData['datePublished']);
5151
}
5252

53-
if (!empty($endpointData['downloadUrlPhp'])) {
54-
$newJson['legacy'][$txpver]['endpointUrl'] = txpspecialchars($endpointData['downloadUrlPhp']);
55-
} elseif (!empty($endPointData['downloadUrlTxt'])) {
53+
if (!empty($endpointData['downloadUrlTxt'])) {
5654
$newJson['legacy'][$txpver]['endpointUrl'] = txpspecialchars($endpointData['downloadUrlTxt']);
55+
} elseif (!empty($endPointData['downloadUrlPhp'])) {
56+
$newJson['legacy'][$txpver]['endpointUrl'] = txpspecialchars($endpointData['downloadUrlPhp']);
5757
}
5858
}
5959
}
@@ -295,8 +295,8 @@ if (!empty($json2['legacy'])) {
295295
<dd>Release date: <time><txp:variable name="json-beta-date" /></time></dd>
296296
</txp:if_variable>
297297
<dd><p>
298-
<txp:if_variable name="json-beta-php"><a class="button button-primary" href="<txp:variable name="json-beta-php" />">PHP download</a></txp:if_variable>
299298
<txp:if_variable name="json-beta-txt"><a class="button button-primary" href="<txp:variable name="json-beta-txt" />">TXT download</a></txp:if_variable>
299+
<txp:if_variable name="json-beta-php"><a class="button button-primary" href="<txp:variable name="json-beta-php" />">PHP download</a></txp:if_variable>
300300
</p></dd>
301301
</txp:if_variable>
302302
<txp:if_variable name="json-stable-version">
@@ -305,17 +305,17 @@ if (!empty($json2['legacy'])) {
305305
<dd>Release date: <time><txp:variable name="json-stable-date" /></time></dd>
306306
</txp:if_variable>
307307
<dd><p>
308-
<txp:if_variable name="json-stable-php"><a class="button button-primary" href="<txp:variable name="json-stable-php" />">PHP download</a></txp:if_variable>
309308
<txp:if_variable name="json-stable-txt"><a class="button button-primary" href="<txp:variable name="json-stable-txt" />">TXT download</a></txp:if_variable>
309+
<txp:if_variable name="json-stable-php"><a class="button button-primary" href="<txp:variable name="json-stable-php" />">PHP download</a></txp:if_variable>
310310
</p></dd>
311311
<txp:else />
312312
<dt><txp:variable name="json-name" /> <txp:variable name="json-beta-version" /> <small class="alert-block alert-pill warning">Prerelease</small></dt>
313313
<txp:if_variable name="json-beta-date">
314314
<dd>Release date: <time><txp:variable name="json-beta-date" /></time></dd>
315315
</txp:if_variable>
316316
<dd><p>
317-
<txp:if_variable name="json-beta-php"><a class="button button-primary" href="<txp:variable name="json-beta-php" />">PHP download</a></txp:if_variable>
318317
<txp:if_variable name="json-beta-txt"><a class="button button-primary" href="<txp:variable name="json-beta-txt" />">TXT download</a></txp:if_variable>
318+
<txp:if_variable name="json-beta-php"><a class="button button-primary" href="<txp:variable name="json-beta-php" />">PHP download</a></txp:if_variable>
319319
</p></dd>
320320
</txp:if_variable>
321321
<txp:php>
@@ -335,14 +335,14 @@ if (!empty($json->legacy)) {
335335

336336
echo '<dd><p>';
337337

338-
if (!empty($legacy->downloadUrlPhp)) {
339-
echo n.href('PHP download', txpspecialchars($legacy->downloadUrlPhp), array('class' => 'button button-primary'));
340-
}
341-
342338
if (!empty($legacy->downloadUrlTxt)) {
343339
echo n.href('TXT download', txpspecialchars($legacy->downloadUrlTxt), array('class' => 'button button-primary'));
344340
}
345341

342+
if (!empty($legacy->downloadUrlPhp)) {
343+
echo n.href('PHP download', txpspecialchars($legacy->downloadUrlPhp), array('class' => 'button button-primary'));
344+
}
345+
346346
echo '</p></dd>';
347347
}
348348
}

0 commit comments

Comments
 (0)