From b94530b93d98125b1e3105dfc06349cd52477b36 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 20 Sep 2014 22:21:13 +0200
Subject: [PATCH] Refactor PHP init code.

---
 .../{class-setup.php => class-bootstrap.php}  | 24 +++++++++++++++++--
 src/_h5ai/server/php/index.php                | 11 +--------
 2 files changed, 23 insertions(+), 12 deletions(-)
 rename src/_h5ai/server/php/inc/{class-setup.php => class-bootstrap.php} (90%)

diff --git a/src/_h5ai/server/php/inc/class-setup.php b/src/_h5ai/server/php/inc/class-bootstrap.php
similarity index 90%
rename from src/_h5ai/server/php/inc/class-setup.php
rename to src/_h5ai/server/php/inc/class-bootstrap.php
index 512b8264..4182b574 100644
--- a/src/_h5ai/server/php/inc/class-setup.php
+++ b/src/_h5ai/server/php/inc/class-bootstrap.php
@@ -1,8 +1,28 @@
 <?php
 
-class Setup {
+class Bootstrap {
+
+    public static function run() {
+
+        Bootstrap::setup();
+
+        $app = new App();
+        if (Util::has_request_param("action")) {
+            $api = new Api($app);
+            $api->apply();
+        } else {
+            define("FALLBACK", $app->get_fallback());
+            normalized_require_once("page");
+        }
+    }
+
+
+    public static function setup() {
+
+        if (defined("NAME")) {
+            return;
+        }
 
-    public static function init() {
 
         // MISC
         putenv("LANG=en_US.UTF-8");
diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php
index 4fcc581c..3602c08d 100644
--- a/src/_h5ai/server/php/index.php
+++ b/src/_h5ai/server/php/index.php
@@ -21,13 +21,4 @@ function __autoload($class_name) {
     normalized_require_once("class-" . strtolower($class_name));
 }
 
-Setup::init();
-$app = new App();
-
-if (Util::has_request_param("action")) {
-    $api = new Api($app);
-    $api->apply();
-} else {
-    define("FALLBACK", $app->get_fallback());
-    normalized_require_once("page");
-}
+Bootstrap::run();