X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=api.php;h=18c7179cd1b9306a1ab34acb4bc6c2ed43b5f4f6;hp=50e8bfe3cfa2cc5cc1fad902cc24cde9757d03e8;hb=9acc365249b5e630da6b5cdd23e3a8015f39ddc7;hpb=4acc8da49e3d4083fd9906388dd8fe0212bb9f42 diff --git a/api.php b/api.php index 50e8bfe..18c7179 100644 --- a/api.php +++ b/api.php @@ -20,7 +20,7 @@ function success_feature ($feature, $request) { $res .= "" . ($feature->imgpath ? - full_url_from_imgpath ($feature->imgpath) + image_url_from_imgpath ($feature->imgpath) : "") . ""; @@ -98,8 +98,21 @@ function save_uploaded_file ($file, $con) { (!move_uploaded_file ($file ["tmp_name"], $dest))) { server_error (); } + $mini_dest = getthumbsdir () . "/mini_" . basename_safe ($dest); + + try { + $thumbnail_ok = create_thumbnail ($dest, $mini_dest); + } catch (Exception $e) { + $thumbnail_ok = false; + } + if (!$thumbnail_ok) { + if (!copy ($dest, $mini_dest)) { + server_error (); + } + } + } - return basename($dest); + return basename_safe ($dest); } function img_check_upload ($file) { @@ -120,14 +133,17 @@ function delete_image_if_unused ($imgpath, $con) { return; } if ($con->imgpath_exists ($imgpath)) { - return false; + return; } + $path = UPLOADDIR . "/" . $imgpath; - if (file_exists($path)) { + if (file_exists ($path)) { unlink ($path); - return true; - } else { - return false; + } + + $thumb_path = getthumbsdir () . "/mini_" . $imgpath; + if (file_exists ($thumb_path)) { + unlink ($thumb_path); } } @@ -148,7 +164,7 @@ function unique_file ($dirname, $relpath, $con) { while ($counter < 1000) { if (!file_exists ($filename) && - !($con->imgpath_exists (basename ($filename)))) { + !($con->imgpath_exists (basename_safe ($filename)))) { return $filename; } else { $counter++;