[PHP-WEBMASTER] com web/php: Simplify code according to @bjori's comment: releases/index.php

[Ferenc Kovacs]

Commit:    bbb58d9d6cab1f9a70cc820ad54535cf50caa553
Author:    Ben Ramsey <b...@benramsey.com>         Mon, 6 Apr 2015 10:00:44 
-0500
Parents:   f051345e2bb5eb64b33590967ab11f7e4e8a2fc1
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=bbb58d9d6cab1f9a70cc820ad54535cf50caa553

Log:
Simplify code according to @bjori's comment

See https://github.com/php/web-php/pull/53#discussion-diff-24725253

Changed paths:
  M  releases/index.php


Diff:
diff --git a/releases/index.php b/releases/index.php
index 6172046..635d69c 100644
--- a/releases/index.php
+++ b/releases/index.php
@@ -4,11 +4,12 @@ $_SERVER['BASE_PAGE'] = 'releases/index.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 include_once $_SERVER["DOCUMENT_ROOT"] . "/include/branches.inc";
 
-if (isset($_GET["serialize"])) {
-       header('Content-type: text/plain');
+if (isset($_GET["serialize"]) || isset($_GET["json"])) {
        $RELEASES[5][$PHP_5_4_VERSION]["date"] = $PHP_5_4_DATE;
        $RELEASES                              = $RELEASES + $OLDRELEASES;
 
+       $return = array();
+
        if (isset($_GET["version"])) {
                $ver = (int)$_GET["version"];
 
@@ -36,14 +37,13 @@ if (isset($_GET["serialize"])) {
 
                                        $return[$version] = $release;
                                }
-                               echo serialize($return);
                        } else {
                                $r["version"] = $version;
 
-                               echo serialize($r);
+                               $return = $r;
                        }
                } else {
-                       echo serialize(array("error" => "Unknown version"));
+                       $return = array("error" => "Unknown version");
                }
        } else {
                $array = array();
@@ -52,60 +52,15 @@ if (isset($_GET["serialize"])) {
                        $r["version"] = $version;
                        $array[$major] = $r;
                }
-               echo serialize($array);
+               $return = $array;
        }
-       return;
-}
-
-if (isset($_GET["json"])) {
-       header('Content-Type: application/json');
-       $RELEASES[5][$PHP_5_4_VERSION]["date"] = $PHP_5_4_DATE;
-       $RELEASES                              = $RELEASES + $OLDRELEASES;
-
-       if (isset($_GET["version"])) {
-               $ver = (int)$_GET["version"];
-
-               if (isset($RELEASES[$ver])) {
-                       list($version, $r) = each($RELEASES[$ver]);
-
-                       if (isset($_GET["max"])) {
-                               $max = (int)$_GET["max"];
-                               if ($max == -1) { $max = PHP_INT_MAX; }
-
-                               $return = array($version => $r);
-
-                               $count = 1;
-
-                               /* check if other $RELEASES[$ver] are there */
-                               /* e.g., 5_3, 5_4, and 5_5 all exist and have a 
release */
-                               while(($z = each($RELEASES[$ver])) && $count++ 
< $max) {
-                                       $return[$z[0]] = $z[1];
-                               }
-
-                               foreach($OLDRELEASES[$ver] as $version => 
$release) {
-                                       if ($max <= $count++) {
-                                               break;
-                                       }
 
-                                       $return[$version] = $release;
-                               }
-                               echo json_encode($return);
-                       } else {
-                               $r["version"] = $version;
-
-                               echo json_encode($r);
-                       }
-               } else {
-                       echo json_encode(array("error" => "Unknown version"));
-               }
-       } else {
-               $array = array();
-               foreach($RELEASES as $major => $release) {
-                       list($version, $r) = each($release);
-                       $r["version"] = $version;
-                       $array[$major] = $r;
-               }
-               echo json_encode($array);
+       if (isset($_GET["serialize"])) {
+               header('Content-type: text/plain');
+               echo serialize($return);
+       } elseif (isset($_GET["json"])) {
+               header('Content-Type: application/json');
+               echo json_encode($return);
        }
        return;
 }


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php