";
- $html .= "![](\"") app_abs_href . "client/icons/16x16/" . ($item->is_folder ? "folder" : "default") . ".png\"/> | ";
+ $html .= "app_abs_href . "client/icons/96/" . $type . ".png\" alt=\"" . $type . "\"/> | ";
$html .= "abs_href . "\">" . basename($item->abs_path) . " | ";
$html .= "" . date("Y-m-d H:i", $item->date) . " | ";
$html .= "" . ($item->size !== null ? intval($item->size / 1000) . " KB" : "" ) . " | ";
@@ -278,18 +280,21 @@ 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;
- $convert = @preg_match("/convert(.exe)?$/i", `which convert`) > 0;
- $ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `which ffmpeg`) > 0;
- $du = @preg_match("/du(.exe)?$/i", `which du`) > 0;
+ $tar = @preg_match("/tar(.exe)?$/i", `command -v tar`) > 0;
+ $zip = @preg_match("/zip(.exe)?$/i", `command -v zip`) > 0;
+ $convert = @preg_match("/convert(.exe)?$/i", `command -v convert`) > 0;
+ $ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `command -v ffmpeg`) > 0;
+ $du = @preg_match("/du(.exe)?$/i", `command -v du`) > 0;
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,
diff --git a/src/_h5ai/server/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php
index 80482eb3..92fd30f0 100644
--- a/src/_h5ai/server/php/inc/Archive.php
+++ b/src/_h5ai/server/php/inc/Archive.php
@@ -44,9 +44,9 @@ class Archive {
private function shell_cmd($cmd) {
- $cmd = str_replace("[ROOTDIR]", "\"" . $this->app->get_abs_path() . "\"", $cmd);
- $cmd = str_replace("[DIRS]", count($this->dirs) ? "\"" . implode("\" \"", array_values($this->dirs)) . "\"" : "", $cmd);
- $cmd = str_replace("[FILES]", count($this->files) ? "\"" . implode("\" \"", array_values($this->files)) . "\"" : "", $cmd);
+ $cmd = str_replace("[ROOTDIR]", escapeshellarg($this->app->get_abs_path()), $cmd);
+ $cmd = str_replace("[DIRS]", count($this->dirs) ? implode(" ", array_map("escapeshellarg", $this->dirs)) : "", $cmd);
+ $cmd = str_replace("[FILES]", count($this->files) ? implode(" ", array_map("escapeshellarg", $this->files)) : "", $cmd);
try {
passthru($cmd);
} catch (Exeption $err) {
@@ -113,7 +113,7 @@ class Archive {
. str_repeat("\0", 100) // linkname [100]
. "ustar\0" // magic [6]
. "00" // version [2]
- . str_repeat("\0", 80) // uname, gname, defmajor, devminor [32 + 32 + 8 + 8] ?92?
+ . str_repeat("\0", 80) // uname, gname, defmajor, devminor [32 + 32 + 8 + 8]
. str_pad($prefix, 155, "\0") // filename [155]
. str_repeat("\0", 12); // fill [12]
assert(strlen($header) === 512);
@@ -153,7 +153,7 @@ class Archive {
if ($code == App::$MAGIC_SEQUENCE && !$this->app->is_ignored($n)) {
$real_file = $this->app->get_abs_path($href);
- $archived_file = preg_replace("!^" . normalize_path($this->app->get_abs_path(), true) . "!", "", $real_file);
+ $archived_file = preg_replace("!^" . preg_quote(normalize_path($this->app->get_abs_path(), true)) . "!", "", $real_file);
if (is_dir($real_file)) {
$this->add_dir($real_file, $archived_file);
diff --git a/src/_h5ai/server/php/inc/Item.php b/src/_h5ai/server/php/inc/Item.php
index 1a5c6135..2da5bffa 100644
--- a/src/_h5ai/server/php/inc/Item.php
+++ b/src/_h5ai/server/php/inc/Item.php
@@ -2,7 +2,7 @@
class Item {
- private static $FOLDER_SIZE_CMD = "du -sk \"[DIR]\"";
+ private static $FOLDER_SIZE_CMD = "du -sk [DIR]";
public static function cmp($item1, $item2) {
@@ -57,7 +57,7 @@ class Item {
$this->size = null;
$options = $app->get_options();
if ($options["foldersize"]["enabled"]) {
- $cmd = str_replace("[DIR]", $this->abs_path, Item::$FOLDER_SIZE_CMD);
+ $cmd = str_replace("[DIR]", escapeshellarg($this->abs_path), Item::$FOLDER_SIZE_CMD);
$this->size = intval(preg_replace("/\s.*$/", "", `$cmd`), 10) * 1024;
}
} else {
diff --git a/src/_h5ai/server/php/inc/Thumb.php b/src/_h5ai/server/php/inc/Thumb.php
index d4b6dacd..5912f376 100644
--- a/src/_h5ai/server/php/inc/Thumb.php
+++ b/src/_h5ai/server/php/inc/Thumb.php
@@ -2,8 +2,9 @@
class Thumb {
- private static $FFMPEG_CMD = "ffmpeg -i \"[SOURCE]\" -an -ss 3 -vframes 1 \"[TARGET]\"";
- private static $CONVERT_CMD = "convert -strip \"[SOURCE][0]\" \"[TARGET]\"";
+ private static $FFMPEG_CMD = "ffmpeg -i [SOURCE] -an -ss 3 -vframes 1 [TARGET]";
+ private static $CONVERT_CMD = "convert -strip [SOURCE][0] [TARGET]";
+ private static $THUMB_CACHE = "thumbs";
public static final function is_supported() {
@@ -22,6 +23,8 @@ class Thumb {
public function __construct($app) {
$this->app = $app;
+ $this->thumbs_path = $this->app->get_cache_abs_path() . "/" . Thumb::$THUMB_CACHE;
+ $this->thumbs_href = $this->app->get_cache_abs_href() . Thumb::$THUMB_CACHE;
}
@@ -47,17 +50,22 @@ class Thumb {
return null;
}
+ if (!is_dir($this->thumbs_path)) {
+ @mkdir($this->thumbs_path, 0755, true);
+ }
+
$name = "thumb-" . sha1("$source_abs_path-$width-$height-$mode") . ".jpg";
- $thumb_abs_path = $this->app->get_cache_abs_path() . "/" . $name;
- $thumb_abs_href = $this->app->get_cache_abs_href() . $name;
+ $thumb_abs_path = $this->thumbs_path . "/" . $name;
+ $thumb_abs_href = $this->thumbs_href . "/" . $name;
if (!file_exists($thumb_abs_path) || filemtime($source_abs_path) >= filemtime($thumb_abs_path)) {
$image = new Image();
$et = false;
- if (function_exists("exif_thumbnail")) {
- $et = exif_thumbnail($source_abs_path);
+ $opts = $this->app->get_options();
+ if ($opts["thumbnails"]["exif"] === true && function_exists("exif_thumbnail")) {
+ $et = @exif_thumbnail($source_abs_path);
}
if($et !== false) {
file_put_contents($thumb_abs_path, $et);
@@ -84,8 +92,8 @@ class Thumb {
$capture_abs_path = $this->app->get_cache_abs_path() . "/capture-" . sha1($source_abs_path) . ".jpg";
if (!file_exists($capture_abs_path) || filemtime($source_abs_path) >= filemtime($capture_abs_path)) {
- $cmd = str_replace("[SOURCE]", $source_abs_path, $cmd);
- $cmd = str_replace("[TARGET]", $capture_abs_path, $cmd);
+ $cmd = str_replace("[SOURCE]", escapeshellarg($source_abs_path), $cmd);
+ $cmd = str_replace("[TARGET]", escapeshellarg($capture_abs_path), $cmd);
`$cmd`;
}
@@ -94,66 +102,6 @@ class Thumb {
}
-
-class Magic {
-
- private static $GET_SIZE_CMD = "identify -format \"%w %h\" \"[SOURCE]\"";
- private static $RESIZE_CMD = "convert -strip -transparent-color \"#ffffff\" -resize [WIDTH]x[HEIGHT] -quality 80 \"[SOURCE]\" \"[TARGET]\"";
- private static $SQUARE_CMD = "convert -strip -transparent-color \"#ffffff\" -crop [CWIDTH]x[CWIDTH]+[CLEFT]+[CTOP] -resize [WIDTH]x[WIDTH] -quality 80 \"[SOURCE]\" \"[TARGET]\"";
-
-
- private static final function img_size($source) {
-
- $cmd = str_replace("[SOURCE]", str_replace("\"", "\\\"", $source), Magic::$GET_SIZE_CMD);
- $size = explode(" ", `$cmd`);
- $size[0] = intval($size[0]);
- $size[1] = intval($size[1]);
- return $size;
- }
-
- private static final function rational($source, $target, $width, $height) {
-
- $cmd = str_replace("[SOURCE]", str_replace("\"", "\\\"", $source), Magic::$RESIZE_CMD);
- $cmd = str_replace("[TARGET]", str_replace("\"", "\\\"", $target), $cmd);
- $cmd = str_replace("[WIDTH]", $width, $cmd);
- $cmd = str_replace("[HEIGHT]", $height, $cmd);
- `$cmd`;
- }
-
- private static final function square($source, $target, $width) {
-
- $size = Magic::img_size($source);
- $w = $size[0];
- $h = $size[1];
-
- $cwidth = min($w, $h);
- $cleft = ($w - $cwidth) / 2;
- $ctop = ($h - $cwidth) / 2;
-
- $cmd = str_replace("[SOURCE]", str_replace("\"", "\\\"", $source), Magic::$SQUARE_CMD);
- $cmd = str_replace("[TARGET]", str_replace("\"", "\\\"", $target), $cmd);
- $cmd = str_replace("[CWIDTH]", $cwidth, $cmd);
- $cmd = str_replace("[CLEFT]", $cleft, $cmd);
- $cmd = str_replace("[CTOP]", $ctop, $cmd);
- $cmd = str_replace("[WIDTH]", $width, $cmd);
- `$cmd`;
- }
-
- public static final function thumb($mode, $source, $target, $width, $height = null, $color = null) {
-
- if ($height === null) {
- $height = $width;
- }
- if ($mode === "square") {
- Magic::square($source, $target, $width);
- } elseif ($mode === "rational") {
- Magic::rational($source, $target, $width, $height);
- }
- }
-}
-
-
-
class Image {
private $source_file, $source, $width, $height, $type, $dest;
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index 6b56d57d..f49aec7e 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -6,7 +6,7 @@ doctype 5
//if lt IE 9
//[if gt IE 8]> $value) {
- $result[$key] = array_merge($result[$key], $b[$key]);
- }
-
- return $result;
-}
-*/
-
?>
\ No newline at end of file
diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php
index 50916f7d..967d49b1 100644
--- a/src/_h5ai/server/php/index.php
+++ b/src/_h5ai/server/php/index.php
@@ -53,8 +53,6 @@ if (array_key_exists("action", $_REQUEST)) {
$api = new Api($app);
$api->apply();
- json_fail(100, "unsupported request");
-
} else {
header("Content-type: text/html;charset=utf-8");