From 903b29c4c0b6d148fcd54758b80ddfad8c405036 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 1 Jul 2014 03:03:41 +0200 Subject: [PATCH] Refactor PHP. --- src/_h5ai/server/php/inc/class-api.php | 2 +- src/_h5ai/server/php/inc/page.php.jade | 1 + src/_h5ai/server/php/inc/util.php | 11 +++++++---- src/_h5ai/server/php/index.php | 7 +------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/_h5ai/server/php/inc/class-api.php b/src/_h5ai/server/php/inc/class-api.php index 86db2bc3..10c51132 100644 --- a/src/_h5ai/server/php/inc/class-api.php +++ b/src/_h5ai/server/php/inc/class-api.php @@ -103,7 +103,7 @@ class Api { $response["all_items"] = $this->app->get_all_items(); } - if (count($_REQUEST)) { + if (AS_ADMIN && count($_REQUEST)) { $response["unused"] = $_REQUEST; } diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index 4b9333d9..82ddb9dc 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -2,6 +2,7 @@ - var app_href = "" - var fallback = "" + doctype 5 //if lt IE 10 diff --git a/src/_h5ai/server/php/inc/util.php b/src/_h5ai/server/php/inc/util.php index e4bb2a3d..fc2d091f 100644 --- a/src/_h5ai/server/php/inc/util.php +++ b/src/_h5ai/server/php/inc/util.php @@ -3,14 +3,18 @@ function normalize_path($path, $trailing_slash = false) { - $path = preg_replace("#\\\\+|/+#", "/", $path); + $path = preg_replace("#[\\\\/]+#", "/", $path); return preg_match("#^(\w:)?/$#", $path) ? $path : (rtrim($path, "/") . ($trailing_slash ? "/" : "")); } function json_exit($obj = array()) { - $obj["code"] = 0; + if (!isset($obj["code"])) { + $obj["code"] = 0; + } + + header("Content-type: application/json;charset=utf-8"); echo json_encode($obj); exit; } @@ -19,8 +23,7 @@ function json_exit($obj = array()) { function json_fail($code, $msg = "", $cond = true) { if ($cond) { - echo json_encode(array("code" => $code, "msg" => $msg)); - exit; + json_exit(array("code" => $code, "msg" => $msg)); } } diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php index c117b81e..bfd13c08 100644 --- a/src/_h5ai/server/php/index.php +++ b/src/_h5ai/server/php/index.php @@ -13,7 +13,7 @@ define("PASSHASH", "da39a3ee5e6b4b0d3255bfef95601890afd80709"); function normalized_require_once($lib) { - require_once(preg_replace("#\\\\+|/+#", "/", dirname(__FILE__) . "/inc/${lib}.php")); + require_once(preg_replace("#[\\\\/]+#", "/", dirname(__FILE__) . "/inc/${lib}.php")); } normalized_require_once("util"); @@ -28,14 +28,9 @@ setup(); $app = new App(); if (has_request_param("action")) { - - header("Content-type: application/json;charset=utf-8"); $api = new Api($app); $api->apply(); - } else { - - header("Content-type: text/html;charset=utf-8"); define("FALLBACK", $app->get_fallback()); normalized_require_once("page"); }