mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-05-02 02:59:09 -04:00
Squashed commit of the following: commit4c2b2ebd3fAuthor: Chad Parry <github@chad.parry.org> Date: Wed Apr 27 20:52:35 2011 -0600 Remove a newline at the end of the file that I accidentally introduced. commit6d564f185eMerge:7ff485f4060640Author: Chad Parry <github@chad.parry.org> Date: Wed Apr 27 20:35:58 2011 -0600 Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto commit7ff485fa48Author: Chad Parry <github@chad.parry.org> Date: Wed Apr 27 20:29:06 2011 -0600 Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class. commit26585fed03Merge:809567fc8f90e8Author: Chad Parry <github@chad.parry.org> Date: Sun Apr 24 08:28:39 2011 -0600 Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto commit809567f128Author: Chad Parry <github@chad.parry.org> Date: Sun Apr 24 08:10:04 2011 -0600 Expose the data file field. commitfcb06bf175Author: Chad Parry <github@chad.parry.org> Date: Sun Apr 24 00:45:12 2011 -0600 Don't assign to the item->name field if the name is unchanged, because the save method will crash. commitc6ef706d70Author: Chad Parry <github@chad.parry.org> Date: Sat Apr 23 22:55:59 2011 -0600 Preserve old data files long enough for them to be available to event handlers. commit0d6a3a3cfcAuthor: Chad Parry <github@chad.parry.org> Date: Sat Apr 23 21:19:47 2011 -0600 Create a tempnam substitute that safely creates files with a given extension. commite149cf7238Author: Chad Parry <github@chad.parry.org> Date: Sat Apr 23 16:39:25 2011 -0600 Support data files that change their extension and MIME type. commit6702104f57Author: Chad Parry <github@chad.parry.org> Date: Sat Apr 23 16:35:00 2011 -0600 Resolve an infinite recursion that happens when the path caches are updated during saving. commit944cb72eeaMerge:567522b5af74d4Author: Chad Parry <github@chad.parry.org> Date: Fri Apr 22 14:10:42 2011 -0600 Merge remote branch 'origin/master' into rawphoto commit567522bfa0Author: Chad Parry <github@chad.parry.org> Date: Thu Apr 21 20:12:32 2011 -0600 Add an event for when a new graphics toolkit is chosen. commit31ba081b79Author: Chad Parry <github@chad.parry.org> Date: Thu Apr 21 02:06:53 2011 -0600 Add an event that will collect all valid filename extensions.
137 lines
4.9 KiB
PHP
137 lines
4.9 KiB
PHP
<?php defined("SYSPATH") or die("No direct script access.");
|
|
/**
|
|
* Gallery - a web based photo album viewer and editor
|
|
* Copyright (C) 2000-2011 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 Uploader_Controller extends Controller {
|
|
public function index($id) {
|
|
$item = ORM::factory("item", $id);
|
|
access::required("view", $item);
|
|
access::required("add", $item);
|
|
if (!$item->is_album()) {
|
|
$item = $item->parent();
|
|
}
|
|
|
|
print $this->_get_add_form($item);
|
|
}
|
|
|
|
public function start() {
|
|
access::verify_csrf();
|
|
batch::start();
|
|
}
|
|
|
|
public function add_photo($id) {
|
|
$album = ORM::factory("item", $id);
|
|
access::required("view", $album);
|
|
access::required("add", $album);
|
|
access::verify_csrf();
|
|
|
|
// The Flash uploader not call /start directly, so simulate it here for now.
|
|
if (!batch::in_progress()) {
|
|
batch::start();
|
|
}
|
|
|
|
$form = $this->_get_add_form($album);
|
|
|
|
// Uploadify adds its own field to the form, so validate that separately.
|
|
$file_validation = new Validation($_FILES);
|
|
$file_validation->add_rules(
|
|
"Filedata", "upload::valid", "upload::required",
|
|
"upload::type[" . implode(",", extensions::get_upload_extensions()) . "]");
|
|
|
|
if ($form->validate() && $file_validation->validate()) {
|
|
$temp_filename = upload::save("Filedata");
|
|
try {
|
|
$item = ORM::factory("item");
|
|
$item->name = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds
|
|
$item->title = item::convert_filename_to_title($item->name);
|
|
$item->parent_id = $album->id;
|
|
$item->set_data_file($temp_filename);
|
|
|
|
$path_info = @pathinfo($temp_filename);
|
|
if (array_key_exists("extension", $path_info) &&
|
|
in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v"))) {
|
|
$item->type = "movie";
|
|
$item->save();
|
|
log::success("content", t("Added a movie"),
|
|
html::anchor("movies/$item->id", t("view movie")));
|
|
} else {
|
|
$item->type = "photo";
|
|
$item->save();
|
|
log::success("content", t("Added a photo"),
|
|
html::anchor("photos/$item->id", t("view photo")));
|
|
}
|
|
|
|
module::event("add_photos_form_completed", $item, $form);
|
|
} catch (Exception $e) {
|
|
// The Flash uploader has no good way of reporting complex errors, so just keep it simple.
|
|
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
|
|
|
|
// Ugh. I hate to use instanceof, But this beats catching the exception separately since
|
|
// we mostly want to treat it the same way as all other exceptions
|
|
if ($e instanceof ORM_Validation_Exception) {
|
|
Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
|
|
}
|
|
|
|
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: " . t("Invalid upload");
|
|
}
|
|
}
|
|
|
|
public function status($success_count, $error_count) {
|
|
if ($error_count) {
|
|
// The "errors" won't be properly pluralized :-/
|
|
print t2("Uploaded %count photo (%error errors)",
|
|
"Uploaded %count photos (%error errors)",
|
|
$success_count,
|
|
array("error" => $error_count));
|
|
} else {
|
|
print t2("Uploaded %count photo", "Uploaded %count photos", $success_count);}
|
|
}
|
|
|
|
public function finish() {
|
|
access::verify_csrf();
|
|
|
|
batch::stop();
|
|
json::reply(array("result" => "success"));
|
|
}
|
|
|
|
private function _get_add_form($album) {
|
|
$form = new Forge("uploader/finish", "", "post", array("id" => "g-add-photos-form"));
|
|
$group = $form->group("add_photos")
|
|
->label(t("Add photos to %album_title", array("album_title" => html::purify($album->title))));
|
|
$group->uploadify("uploadify")->album($album);
|
|
|
|
$group = $form->group("actions");
|
|
$group->uploadify_buttons("");
|
|
|
|
module::event("add_photos_form", $album, $form);
|
|
|
|
return $form;
|
|
}
|
|
}
|