From 6c00a8e669f006624d72cbdaaaf2f5ef8a4c8dc2 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 27 Oct 2012 04:29:55 +0200
Subject: [PATCH] Moves init code to index file.

---
 src/_h5ai/server/php/inc/init.php | 44 ------------------------------
 src/_h5ai/server/php/index.php    | 45 ++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 45 deletions(-)
 delete mode 100644 src/_h5ai/server/php/inc/init.php

diff --git a/src/_h5ai/server/php/inc/init.php b/src/_h5ai/server/php/inc/init.php
deleted file mode 100644
index b5643a0c..00000000
--- a/src/_h5ai/server/php/inc/init.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-function normalize_path($path, $trailing_slash = false) {
-
-	$path = str_replace("\\", "/", $path);
-	return preg_match("#^(\w:)?/$#", $path) ? $path : (preg_replace('#/$#', '', $path) . ($trailing_slash ? "/" : ""));
-}
-
-define("APP_ABS_PATH", normalize_path(dirname(dirname(dirname(dirname(__FILE__))))));
-define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(getenv("SCRIPT_NAME")))), true));
-define("ABS_HREF", normalize_path(preg_replace('/[^\\/]*$/', '', getenv("REQUEST_URI")), true));
-
-function normalized_require_once($lib) {
-
-	require_once(APP_ABS_PATH . $lib);
-}
-
-normalized_require_once("/server/php/inc/util.php");
-normalized_require_once("/server/php/inc/App.php");
-normalized_require_once("/server/php/inc/Item.php");
-
-$app = new App(APP_ABS_PATH, APP_ABS_HREF, ABS_HREF);
-
-if (array_key_exists("action", $_REQUEST)) {
-
-	header("Content-type: application/json");
-
-	normalized_require_once("/server/php/inc/Api.php");
-	$api = new Api($app);
-	$api->apply();
-
-	json_fail(100, "unsupported request");
-
-} else {
-
-	header("Content-type: text/html");
-
-	$HREF = $app->get_app_abs_href();
-	$FALLBACK = $app->get_no_js_fallback();
-
-	normalized_require_once("/server/php/inc/page.php");
-}
-
-?>
\ No newline at end of file
diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php
index dd3bda2d..aca10b8f 100644
--- a/src/_h5ai/server/php/index.php
+++ b/src/_h5ai/server/php/index.php
@@ -1 +1,44 @@
-<?php require_once(str_replace("\\", "/", dirname(__FILE__)) . "/inc/init.php"); ?>
\ No newline at end of file
+<?php
+
+function normalize_path($path, $trailing_slash = false) {
+
+	$path = str_replace("\\", "/", $path);
+	return preg_match("#^(\w:)?/$#", $path) ? $path : (preg_replace('#/$#', '', $path) . ($trailing_slash ? "/" : ""));
+}
+
+define("APP_ABS_PATH", normalize_path(dirname(dirname(dirname(__FILE__)))));
+define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(getenv("SCRIPT_NAME")))), true));
+define("ABS_HREF", normalize_path(preg_replace('/[^\\/]*$/', '', getenv("REQUEST_URI")), true));
+
+function normalized_require_once($lib) {
+
+	require_once(APP_ABS_PATH . $lib);
+}
+
+normalized_require_once("/server/php/inc/util.php");
+normalized_require_once("/server/php/inc/App.php");
+normalized_require_once("/server/php/inc/Item.php");
+
+$app = new App(APP_ABS_PATH, APP_ABS_HREF, ABS_HREF);
+
+if (array_key_exists("action", $_REQUEST)) {
+
+	header("Content-type: application/json;charset=utf-8");
+
+	normalized_require_once("/server/php/inc/Api.php");
+	$api = new Api($app);
+	$api->apply();
+
+	json_fail(100, "unsupported request");
+
+} else {
+
+	header("Content-type: text/html;charset=utf-8");
+
+	$HREF = $app->get_app_abs_href();
+	$FALLBACK = $app->get_no_js_fallback();
+
+	normalized_require_once("/server/php/inc/page.php");
+}
+
+?>
\ No newline at end of file