diff --git a/src/_h5ai/client/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less index 1d5d9d24..8ea650da 100644 --- a/src/_h5ai/client/css/inc/h5ai-info.less +++ b/src/_h5ai/client/css/inc/h5ai-info.less @@ -134,7 +134,7 @@ body#h5ai-info { margin: 4px 0 12px 12px; font-size: 0.7em; color: #aaa; - width: 380px; + width: 460px; line-height: 1.2em; } } diff --git a/src/_h5ai/client/js/inc/info.js b/src/_h5ai/client/js/inc/info.js index a44a96ac..831944fe 100644 --- a/src/_h5ai/client/js/inc/info.js +++ b/src/_h5ai/client/js/inc/info.js @@ -46,6 +46,21 @@ modulejs.define('info', ['$', 'config'], function ($, config) { $(testsTemp).appendTo('body'); + addTest( + 'Index file found', 'Add ' + setup.INDEX_HREF + ' to your index file list', + setup.INDEX_HREF + ); + + addTest( + 'Options parsable', 'File options.json is readable and syntax seams to be correct', + config.options !== null + ); + + addTest( + 'Types parsable', 'File types.json is readable and syntax seams to be correct', + config.types !== null + ); + addTest( 'Server software', 'Server is one of apache, lighttpd, nginx or cherokee', setup.HAS_SERVER, setup.SERVER_NAME + ' ' + setup.SERVER_VERSION diff --git a/src/_h5ai/server/php/inc/setup.php b/src/_h5ai/server/php/inc/setup.php index 8421be5b..17358600 100644 --- a/src/_h5ai/server/php/inc/setup.php +++ b/src/_h5ai/server/php/inc/setup.php @@ -72,9 +72,13 @@ function setup() { define("CURRENT_HREF", $current_href); define("CURRENT_PATH", $current_path); - define("INDEX_HREF", normalize_path(APP_HREF . "server/php/index.php", false)); + $index_href = null; + if (@is_readable(normalize_path(APP_PATH . "/server/php/index.php", false))) { + $index_href = normalize_path(APP_HREF . "/server/php/index.php", false); + } + define("INDEX_HREF", $index_href); - define("CACHE_HREF", normalize_path(APP_HREF . "cache", true)); + define("CACHE_HREF", normalize_path(APP_HREF . "/cache", true)); define("CACHE_PATH", normalize_path(APP_PATH . "/cache", false)); define("HAS_WRITABLE_CACHE", @is_writable(CACHE_PATH));