Update php script to prevent error w.r.t. missing gef4 builds.
diff --git a/downloads/index.php b/downloads/index.php
index 0d71eb5..2c3297c 100755
--- a/downloads/index.php
+++ b/downloads/index.php
@@ -37,12 +37,6 @@
)
);
-$gef4_dls = array (
- "GEF4 Common, Geometry, FX, MVC, Graph, Layout, Zest, DOT, Cloudio" => array (
- "<acronym title=\"Click to download archived All-In-One p2 Update Site\"><img alt=\"Click to download archived All-In-One p2 Update Site\" src=\"/modeling/images/dl-icon-update-zip.gif\"/> <b style=\"color:green\">GEF4 Update Site</b></acronym>" => "Update"
- )
-);
-
$gef3_dls = array (
"Draw2D, GEF (MVC) 3.x and Zest 1.x" => array (
"<acronym title=\"Click to download archived All-In-One p2 Update Site\"><img alt=\"Click to download archived All-In-One p2 Update Site\" src=\"/modeling/images/dl-icon-update-zip.gif\"/> <b style=\"color:green\">GEF-Legacy Update Site</b></acronym>" => "Update"
@@ -108,7 +102,6 @@
$showMax = (isset ( $_GET ["showMax"] ) && preg_match ( "/^(\d+)$/", $_GET ["showMax"], $regs ) ? $regs [1] : "5");
$GEF_DROPS_DIR = getPWD ( "downloads/drops" ); // see scripts.php
-$GEF4_DROPS_DIR = getPWD ( "downloads/drops/gef4" ); // see scripts.php
$GEF_LEGACY_DROPS_DIR = getPWD ( "downloads/drops/legacy" ); // see scripts.php
$downloadScript = getDownloadScript();
@@ -128,7 +121,6 @@
$buildTypes = getBuildTypes ( $branches, $buildtypes );
$gefBuilds = getBuildsFromDirs ( $GEF_DROPS_DIR );
-$gef4Builds = getBuildsFromDirs ( $GEF4_DROPS_DIR );
$gefLegacyBuilds = getBuildsFromDirs ( $GEF_LEGACY_DROPS_DIR );
print "<h3>Update-Site Archives</h3>";
@@ -136,7 +128,7 @@
print "<p><small>Please note that SDK archives (in runnable form) for GEF-Legacy (3.x) are no longer provided since Mars SR1 (see <a href=\"https://bugs.eclipse.org/bugs/show_bug.cgi?id=470240\">bug #470240</a> for details).</small></p>";
print "<div id=\"midcolumn\">\n";
-if (sizeof ( $gefBuilds ) == 0 || sizeof ( $gefLegacyBuilds ) == 0 || sizeof ( $gef4Builds ) == 0) {
+if (sizeof ( $gefBuilds ) == 0 || sizeof ( $gefLegacyBuilds ) == 0) {
print "<h4>Builds</h4>\n";
print "<ul>\n";
print "<li><i><b>Error!</b></i> No builds found on this server!</li>";
@@ -146,18 +138,14 @@
$c = 0;
foreach ( $buildTypes as $branch => $types ) {
foreach ( $types as $type => $label ) {
- // Check if a GEF or GEF4 build exists
- if ((array_key_exists ( $branch, $gefBuilds ) && array_key_exists ( $type, $gefBuilds [$branch] )) || (array_key_exists ( $branch, $gefLegacyBuilds ) && array_key_exists ( $type, $gefLegacyBuilds [$branch] )) || (array_key_exists ( $branch, $gef4Builds ) && array_key_exists ( $type, $gef4Builds [$branch] ))) {
+ // Check if a GEF or GEF Legacy build exists
+ if ((array_key_exists ( $branch, $gefBuilds ) && array_key_exists ( $type, $gefBuilds [$branch] )) || (array_key_exists ( $branch, $gefLegacyBuilds ) && array_key_exists ( $type, $gefLegacyBuilds [$branch] ))) {
print "<h4>" . $label . "s</h4>\n";
print "<ul>\n";
// output GEF builds
if (array_key_exists ( $branch, $gefBuilds ) && array_key_exists ( $type, $gefBuilds [$branch] )) {
showBuilds ( "", $GEF_DROPS_DIR, $branch, $gefBuilds [$branch] [$type], "GEF ", "GEF", $gef_dls, $c );
}
- // output GEF4 builds
- if (array_key_exists ( $branch, $gef4Builds ) && array_key_exists ( $type, $gef4Builds [$branch] )) {
- showBuilds ( "gef4", $GEF4_DROPS_DIR, $branch, $gef4Builds [$branch] [$type], "GEF4 ", "GEF4", $gef4_dls, $c );
- }
// output GEF legacy builds
if (array_key_exists ( $branch, $gefLegacyBuilds ) && array_key_exists ( $type, $gefLegacyBuilds [$branch] )) {
showBuilds ( "legacy", $GEF_LEGACY_DROPS_DIR, $branch, $gefLegacyBuilds [$branch] [$type], "GEF-Legacy ", "GEF3", $gef3_dls, $c );
@@ -185,4 +173,4 @@
// Generate the web page
$App->AddExtraHtmlHeader ( '<script src="/gef/downloads/downloads.js" type="text/javascript"></script>' . "\n" ); // ie doesn't understand self closing script tags, and won't even try to render the page if you use one
$App->generatePage ( $theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html );
-?>
\ No newline at end of file
+?>
