mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-05-20 03:19:13 -04:00
a28dd09c4e
a BMP masquerading as a .jpg causing us to be unable to rebuild resizes and thumbnails. Now if that happens, we discard the file, log it and move on.
93 lines
3.2 KiB
PHP
93 lines
3.2 KiB
PHP
<?php defined("SYSPATH") or die("No direct script access.");
|
|
/**
|
|
* Gallery - a web based photo album viewer and editor
|
|
* Copyright (C) 2000-2009 Bharat Mediratta
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
class Simple_Uploader_Controller extends Controller {
|
|
public function app($id) {
|
|
$item = ORM::factory("item", $id);
|
|
access::required("view", $item);
|
|
access::required("add", $item);
|
|
if (!$item->is_album()) {
|
|
$item = $item->parent();
|
|
}
|
|
|
|
$v = new View("simple_uploader.html");
|
|
$v->item = $item;
|
|
print $v;
|
|
}
|
|
|
|
public function start() {
|
|
batch::start();
|
|
}
|
|
|
|
public function add_photo($id) {
|
|
$album = ORM::factory("item", $id);
|
|
access::required("view", $album);
|
|
access::required("add", $album);
|
|
access::verify_csrf();
|
|
|
|
$file_validation = new Validation($_FILES);
|
|
$file_validation->add_rules(
|
|
"Filedata", "upload::valid", "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
|
|
if ($file_validation->validate()) {
|
|
// SimpleUploader.swf does not yet call /start directly, so simulate it here for now.
|
|
if (!batch::in_progress()) {
|
|
batch::start();
|
|
}
|
|
|
|
$temp_filename = upload::save("Filedata");
|
|
try {
|
|
$name = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds
|
|
$title = item::convert_filename_to_title($name);
|
|
$path_info = @pathinfo($temp_filename);
|
|
if (array_key_exists("extension", $path_info) &&
|
|
in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
|
|
$item = movie::create($album, $temp_filename, $name, $title);
|
|
log::success("content", t("Added a movie"),
|
|
html::anchor("movies/$item->id", t("view movie")));
|
|
} else {
|
|
$item = photo::create($album, $temp_filename, $name, $title);
|
|
log::success("content", t("Added a photo"),
|
|
html::anchor("photos/$item->id", t("view photo")));
|
|
}
|
|
} catch (Exception $e) {
|
|
Kohana::log("alert", $e->__toString());
|
|
if (file_exists($temp_filename)) {
|
|
unlink($temp_filename);
|
|
}
|
|
header("HTTP/1.1 500 Internal Server Error");
|
|
print "ERROR: " . $e->getMessage();
|
|
return;
|
|
}
|
|
unlink($temp_filename);
|
|
print "FILEID: $item->id";
|
|
} else {
|
|
header("HTTP/1.1 400 Bad Request");
|
|
print "ERROR: Invalid Upload";
|
|
}
|
|
}
|
|
|
|
public function finish() {
|
|
access::verify_csrf();
|
|
|
|
batch::stop();
|
|
print json_encode(array("result" => "success"));
|
|
}
|
|
|
|
}
|