mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-05-20 19:39:16 -04:00
and verifying user permissions, but there are several above-the-bar changes: 1) Server add is now only available to admins. This is a hard requirement because we have to limit server access (eg: server_add::children) to a user subset and the current permission model doesn't include that. Easiest fix is to restrict to admins. Got rid of the server_add permission. 2) We now know check permissions at every level, which means in controllers AND in helpers. This "belt and suspenders" approach will give us defense in depth in case we overlook it in one area. 3) We now do CSRF checking in every controller method that changes the code, in addition to the Forge auto-check. Again, defense in depth and it makes scanning the code for security much simpler. 4) Moved Simple_Uploader_Controller::convert_filename_to_title to item:convert_filename_to_title 5) Fixed a bug in sending notification emails. 6) Fixed the Organize code to verify that you only have access to your own tasks. In general, added permission checks to organize which had pretty much no validation code. I did my best to verify every feature that I touched.
239 lines
7.5 KiB
PHP
239 lines
7.5 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 Albums_Controller extends Items_Controller {
|
|
|
|
/**
|
|
* @see REST_Controller::_show($resource)
|
|
*/
|
|
public function _show($album) {
|
|
if (!access::can("view", $album)) {
|
|
if ($album->id == 1) {
|
|
print new Theme_View("login_page.html", "album");
|
|
return;
|
|
} else {
|
|
access::forbidden();
|
|
}
|
|
}
|
|
|
|
$page_size = module::get_var("gallery", "page_size", 9);
|
|
$show = $this->input->get("show");
|
|
|
|
if ($show) {
|
|
$index = $album->get_position($show);
|
|
$page = ceil($index / $page_size);
|
|
if ($page == 1) {
|
|
url::redirect("albums/$album->id");
|
|
} else {
|
|
url::redirect("albums/$album->id?page=$page");
|
|
}
|
|
}
|
|
|
|
$page = $this->input->get("page", "1");
|
|
$children_count = $album->viewable()->children_count();
|
|
$offset = ($page - 1) * $page_size;
|
|
$max_pages = max(ceil($children_count / $page_size), 1);
|
|
|
|
// Make sure that the page references a valid offset
|
|
if ($page < 1) {
|
|
url::redirect("albums/$album->id");
|
|
} else if ($page > $max_pages) {
|
|
url::redirect("albums/$album->id?page=$max_pages");
|
|
}
|
|
|
|
$template = new Theme_View("page.html", "album");
|
|
$template->set_global("page_size", $page_size);
|
|
$template->set_global("item", $album);
|
|
$template->set_global("children", $album->viewable()->children($page_size, $offset));
|
|
$template->set_global("children_count", $children_count);
|
|
$template->set_global("parents", $album->parents());
|
|
$template->content = new View("album.html");
|
|
|
|
// We can't use math in ORM or the query builder, so do this by hand. It's important
|
|
// that we do this with math, otherwise concurrent accesses will damage accuracy.
|
|
Database::instance()->query(
|
|
"UPDATE {items} SET `view_count` = `view_count` + 1 WHERE `id` = $album->id");
|
|
|
|
print $template;
|
|
}
|
|
|
|
/**
|
|
* @see REST_Controller::_create($resource)
|
|
*/
|
|
public function _create($album) {
|
|
access::verify_csrf();
|
|
access::required("view", $album);
|
|
access::required("add", $album);
|
|
|
|
switch ($this->input->post("type")) {
|
|
case "album":
|
|
return $this->_create_album($album);
|
|
|
|
case "photo":
|
|
return $this->_create_photo($album);
|
|
|
|
default:
|
|
access::forbidden();
|
|
}
|
|
}
|
|
|
|
private function _create_album($album) {
|
|
access::required("view", $album);
|
|
access::required("add", $album);
|
|
|
|
$form = album::get_add_form($album);
|
|
if ($form->validate()) {
|
|
$new_album = album::create(
|
|
$album,
|
|
$this->input->post("name"),
|
|
$this->input->post("title", $this->input->post("name")),
|
|
$this->input->post("description"),
|
|
user::active()->id);
|
|
|
|
log::success("content", "Created an album",
|
|
html::anchor("albums/$new_album->id", "view album"));
|
|
message::success(t("Created album %album_title", array("album_title" => $new_album->title)));
|
|
|
|
print json_encode(
|
|
array("result" => "success",
|
|
"location" => url::site("albums/$new_album->id"),
|
|
"resource" => url::site("albums/$new_album->id")));
|
|
} else {
|
|
print json_encode(
|
|
array(
|
|
"result" => "error",
|
|
"form" => $form->__toString() . html::script("modules/gallery/js/albums_form_add.js")));
|
|
}
|
|
}
|
|
|
|
private function _create_photo($album) {
|
|
access::required("view", $album);
|
|
access::required("add", $album);
|
|
|
|
// If we set the content type as JSON, it triggers saving the result as
|
|
// a document in the browser (well, in Chrome at least).
|
|
// @todo figure out why and fix this.
|
|
$form = photo::get_add_form($album);
|
|
if ($form->validate()) {
|
|
$photo = photo::create(
|
|
$album,
|
|
$this->input->post("file"),
|
|
$_FILES["file"]["name"],
|
|
$this->input->post("title", $this->input->post("name")),
|
|
$this->input->post("description"),
|
|
user::active()->id);
|
|
|
|
log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo"));
|
|
message::success(t("Added photo %photo_title", array("photo_title" => $photo->title)));
|
|
|
|
print json_encode(
|
|
array("result" => "success",
|
|
"resource" => url::site("photos/$photo->id"),
|
|
"location" => url::site("photos/$photo->id")));
|
|
} else {
|
|
print json_encode(
|
|
array("result" => "error",
|
|
"form" => $form->__toString()));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @see REST_Controller::_update($resource)
|
|
*/
|
|
public function _update($album) {
|
|
access::verify_csrf();
|
|
access::required("view", $album);
|
|
access::required("edit", $album);
|
|
|
|
$form = album::get_edit_form($album);
|
|
if ($valid = $form->validate()) {
|
|
// Make sure that there's not a conflict
|
|
if (Database::instance()
|
|
->from("items")
|
|
->where("parent_id", $album->parent_id)
|
|
->where("id <>", $album->id)
|
|
->where("name", $form->edit_album->dirname->value)
|
|
->count_records()) {
|
|
$form->edit_album->dirname->add_error("conflict", 1);
|
|
$valid = false;
|
|
}
|
|
}
|
|
|
|
// @todo
|
|
// @todo we need to make sure that filename / dirname components can't contain a /
|
|
// @todo
|
|
|
|
if ($valid) {
|
|
$orig = clone $album;
|
|
$album->title = $form->edit_album->title->value;
|
|
$album->description = $form->edit_album->description->value;
|
|
$album->sort_column = $form->edit_album->sort_order->column->value;
|
|
$album->sort_order = $form->edit_album->sort_order->direction->value;
|
|
$album->rename($form->edit_album->dirname->value);
|
|
$album->save();
|
|
|
|
module::event("item_updated", $orig, $album);
|
|
|
|
log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
|
|
message::success(t("Saved album %album_title", array("album_title" => $album->title)));
|
|
|
|
print json_encode(
|
|
array("result" => "success",
|
|
"location" => url::site("albums/$album->id")));
|
|
} else {
|
|
print json_encode(
|
|
array("result" => "error",
|
|
"form" => $form->__toString()));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @see REST_Controller::_form_add($parameters)
|
|
*/
|
|
public function _form_add($album_id) {
|
|
$album = ORM::factory("item", $album_id);
|
|
access::required("view", $album);
|
|
access::required("add", $album);
|
|
|
|
switch ($this->input->get("type")) {
|
|
case "album":
|
|
print album::get_add_form($album) .
|
|
html::script("modules/gallery/js/albums_form_add.js");
|
|
break;
|
|
|
|
case "photo":
|
|
print photo::get_add_form($album);
|
|
break;
|
|
|
|
default:
|
|
kohana::show_404();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @see REST_Controller::_form_add($parameters)
|
|
*/
|
|
public function _form_edit($album) {
|
|
access::required("view", $album);
|
|
access::required("edit", $album);
|
|
|
|
print album::get_edit_form($album);
|
|
}
|
|
}
|