various partial fixes towards improved download page
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
index b296867..137b2af 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
@@ -144,6 +144,7 @@
global $debugScript;
global $debugFunctions;
$browser = get_browser(null, true);
+ if ($browser) {
$rawPlatform = $browser['platform'];
if ($debugFunctions) {
echo "browser platfrom: " . $rawPlatform . "<br />" ;
@@ -155,6 +156,7 @@
echo $key . ": " . $browser[$key] . "<br />";
}
}
+ }
$platform = "unknown";
if (strpos($rawPlatform, "Win") === 0) {
$platform="windows";
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
index 37bef8a..31a117d 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
@@ -56,37 +56,18 @@
$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
+// TODO: improve so this hard coding isn't required.
+// This depends on the declare script changing webtools/committers to webtools/downloads
+// And, the logic is such that if it is not mirrored, this URI is not used at all, just
+// a relative reference only
$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
$mirrorScript=$defaultMirrorScript;
$downloadprefix=$defaultWTPMirrorPrefix;
-if ($debugScript) {
- $testMirrorString=$eclipseMirrorScript . "/webtools/downloads/drops/$buildBranch/$build/wtp-sdk-$build.zip";
- $isItMirrored = "false";
- if (isMirrored($testMirrorString)) {
- $isItMirrored = "true";
- }
- echo "isMirrored: " . $isItMirrored . "<br />";
-}
-
-// use mirrors if and only if on eclipse.org download servers.
-// don't even check for them, if not on eclipse.org downloads ... else, causes load for no reason
-// Note: this depends on the declare script changing 'committers/drops' to 'downloads/drops'.
-$serverName = $_SERVER["SERVER_NAME"];
-
-if ($debugScript) {
- echo "serverName: $serverName" . "<br />";
-}
-
-$keytestMirrorString=$eclipseMirrorScript . "/webtools/downloads/drops/$buildBranch/$build/wtp-sdk-$build.zip";
-// well known URL that is mirrored, purely for testing script
-// $keytestMirrorString = "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0.1-20070926042742/wtp-sdk-R-2.0.1-20070926042742.zip";
-
-
-//if (strpos($serverName, "eclipse.org") && isMirrored($keytestMirrorString) ) {
+$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
if (isMirrored($keytestMirrorString) ) {
$mirrorScript=$eclipseMirrorScript;
$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
@@ -151,6 +132,7 @@
<body>
<?php
+
// tiny banner to remind when looking at "local" machine results
$serverName = $_SERVER["SERVER_NAME"];