From d76e1194d1c544337beed6d6202f53d8881c77a3 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Tue, 23 Jul 2013 20:09:56 +0200
Subject: [PATCH] Adds EXIF and PHP version to info page.
---
src/_h5ai/client/js/inc/info.js | 1 +
src/_h5ai/conf/options.json | 6 +++---
src/_h5ai/index.html.jade | 6 +++++-
src/_h5ai/server/php/inc/App.php | 3 +++
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/_h5ai/client/js/inc/info.js b/src/_h5ai/client/js/inc/info.js
index 58197760..54bb59cc 100644
--- a/src/_h5ai/client/js/inc/info.js
+++ b/src/_h5ai/client/js/inc/info.js
@@ -22,6 +22,7 @@ modulejs.define('info', ['$'], function ($) {
setCheckResult(this, json.checks[$(this).data('id')]);
});
+ $('.test.php .test-result').text(json.checks['phpversion']);
}
});
};
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index c5079066..59d3f241 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -57,7 +57,7 @@ Options
- interval: number, update interval in milliseconds, at least 1000
*/
"autorefresh": {
- "enabled": false,
+ "enabled": true,
"interval": 5000
},
@@ -84,7 +84,7 @@ Options
Allow file deletion.
*/
"delete": {
- "enabled": false
+ "enabled": true
},
/* [EXPERIMENTAL]
@@ -95,7 +95,7 @@ Options
- maxfilesize: number, file size is in MB
*/
"dropbox": {
- "enabled": false,
+ "enabled": true,
"maxfiles": 10,
"maxfilesize": 1000
},
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index 708aee0e..6f29d1ee 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -32,7 +32,7 @@ html.no-js( lang="en" )
h2 server supports
ul#tests
- li.test( data-id="php" )
+ li.test.php( data-id="php" )
span.test-label php version
span.test-result ?
div.test-info PHP version >= 5.2.1
@@ -44,6 +44,10 @@ html.no-js( lang="en" )
span.test-label image thumbs
span.test-result ?
div.test-info PHP GD extension with JPEG support available
+ li.test( data-id="exif" )
+ span.test-label use exif thumbs
+ span.test-result ?
+ div.test-info PHP EXIF extension available
li.test( data-id="ffmpeg" )
span.test-label movie thumbs
span.test-result ?
diff --git a/src/_h5ai/server/php/inc/App.php b/src/_h5ai/server/php/inc/App.php
index 1617ad4c..77e97c06 100644
--- a/src/_h5ai/server/php/inc/App.php
+++ b/src/_h5ai/server/php/inc/App.php
@@ -278,6 +278,7 @@ class App {
$gdinfo = gd_info();
$gd = array_key_exists("JPG Support", $gdinfo) && $gdinfo["JPG Support"] || array_key_exists("JPEG Support", $gdinfo) && $gdinfo["JPEG Support"];
}
+ $exif = function_exists("exif_thumbnail");
$cache = @is_writable($this->get_cache_abs_path());
$tar = @preg_match("/tar(.exe)?$/i", `which tar`) > 0;
$zip = @preg_match("/zip(.exe)?$/i", `which zip`) > 0;
@@ -287,9 +288,11 @@ class App {
return array(
"idx" => $this->app_abs_href . "server/php/index.php",
+ "phpversion" => PHP_VERSION,
"php" => $php,
"cache" => $cache,
"thumbs" => $gd,
+ "exif" => $exif,
"tar" => $tar,
"zip" => $zip,
"convert" => $convert,