From 26857fea74dba66e3030d3e04357e55e60c7f07f Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 21 Jun 2014 20:51:02 +0200
Subject: [PATCH] Minor changes.

---
 src/_h5ai/client/js/inc/info.js        |  2 +-
 src/_h5ai/client/js/inc/view/ensure.js |  4 ++--
 src/_h5ai/index.html.jade              |  2 +-
 src/_h5ai/server/php/inc/class-app.php | 10 +++++++---
 src/_h5ai/server/php/inc/page.php.jade |  2 +-
 src/_h5ai/server/php/inc/setup.php     |  3 +++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/_h5ai/client/js/inc/info.js b/src/_h5ai/client/js/inc/info.js
index 4c55d863..c5c75c7b 100644
--- a/src/_h5ai/client/js/inc/info.js
+++ b/src/_h5ai/client/js/inc/info.js
@@ -29,7 +29,7 @@ modulejs.define('info', ['$', 'config'], function ($, config) {
 		addTests = function () {
 
 			addTest(
-				'PHP version', 'PHP version &gt;= 5.3.0',
+				'PHP version', 'PHP version &gt;= ' + setup.MIN_PHP_VERSION,
 				setup.HAS_PHP_VERSION
 			);
 
diff --git a/src/_h5ai/client/js/inc/view/ensure.js b/src/_h5ai/client/js/inc/view/ensure.js
index 466a0e8e..3616383c 100644
--- a/src/_h5ai/client/js/inc/view/ensure.js
+++ b/src/_h5ai/client/js/inc/view/ensure.js
@@ -1,10 +1,10 @@
 
-modulejs.define('view/ensure', ['$', 'core/event'], function ($, event) {
+modulejs.define('view/ensure', ['$', 'config', 'core/event'], function ($, config, event) {
 
 	var selb = '#bottombar',
 		selr = selb + ' .right',
 		sela = selr + ' a',
-		sequence = 'powered by h5ai',
+		sequence = 'powered by h5ai ' + config.setup.VERSION,
 		url = 'http://larsjung.de/h5ai/',
 		isVisible = ':visible',
 		styleKey = 'style',
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index 335bf385..b6204a1a 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -38,5 +38,5 @@ html.no-js.browser( lang="en" )
 					| ! ⚡
 			span.right
 				a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
-					| powered by h5ai
+					| powered by h5ai {{pkg.version}}
 			span.center
diff --git a/src/_h5ai/server/php/inc/class-app.php b/src/_h5ai/server/php/inc/class-app.php
index a656f4de..fd16ede9 100644
--- a/src/_h5ai/server/php/inc/class-app.php
+++ b/src/_h5ai/server/php/inc/class-app.php
@@ -25,9 +25,13 @@ class App {
 	public function get_setup() {
 
 		$consts = get_defined_constants(true);
-		$consts_user = $consts["user"];
-		$consts_user["PHP_VERSION"] = PHP_VERSION;
-		return $consts_user;
+		$setup = $consts["user"];
+		$setup["PHP_VERSION"] = PHP_VERSION;
+		unset($setup["APP_PATH"]);
+		unset($setup["ROOT_PATH"]);
+		unset($setup["CURRENT_PATH"]);
+		unset($setup["CACHE_PATH"]);
+		return $setup;
 	}
 
 
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index eed68eac..c5bc1b24 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -35,7 +35,7 @@ html.no-js.browser( lang="en" )
 					| ! ⚡
 			span.right
 				a( href="{{pkg.url}}", title="{{pkg.name}} {{pkg.version}} · {{pkg.description}}" )
-					| powered by h5ai
+					| powered by h5ai {{pkg.version}}
 			span.center
 
 		div#sidebar
diff --git a/src/_h5ai/server/php/inc/setup.php b/src/_h5ai/server/php/inc/setup.php
index e92b5c8e..19dc18e0 100644
--- a/src/_h5ai/server/php/inc/setup.php
+++ b/src/_h5ai/server/php/inc/setup.php
@@ -8,6 +8,9 @@ function setup() {
 	setlocale(LC_CTYPE, "en_US.UTF-8");
 	date_default_timezone_set("UTC");
 
+	define("NAME", "{{pkg.name}}");
+	define("VERSION", "{{pkg.version}}");
+
 	define("BACKEND", "PHP");
 	define("API", true);
 	define("FILE_PREFIX", "_{{pkg.name}}");