public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:bowlesjd/gallery3-contrib

Browse Source 
Conflicts:
	modules/embed_videos/controllers/embedded_videos.php
This commit is contained in:
John Bowles 2010-08-26 20:51:58 -07:00
commit a58601f640
7 changed files with 190 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
modules/embed_videos/controllers/embedded_videos.php
View File

@ -18,77 +18,78 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Embedded_videos_Controller extends Controller {
public function show($movie) {
if (!is_object($movie)) {
// show() must be public because we route to it in url::parse_url(), so make
// sure that we're actually receiving an object
throw new Kohana_404_Exception();
}
access::required("view", $movie);
$where = array(array("type", "!=", "album"));
$position = $movie->parent()->get_position($movie, $where);
if ($position > 1) {
list($previous_item, $ignore, $next_item) = $movie->parent()->children(3, $position - 2, $where);
} else {
$previous_item = null;
list($next_item) = $movie->parent()->viewable()->children(1, $position, $where);
}
$embedded_video = ORM::factory("embedded_video")->where("item_id", "=", $movie->id)->find();
//$db = Database::instance();
//$result = $db->from('embedded_videos')->select('embed_code')->where('item_id',$movie->id)->get();
$template = new Theme_View("page.html", "item", "embedded_video");
$template->set_global("item", $movie);
$template->set_global("embedded_video", $embedded_video->embed_code);
$template->set_global("children", array());
$template->set_global("children_count", 0);
$template->set_global("parents", $movie->parents());
$template->set_global("next_item", $next_item);
$template->set_global("previous_item", $previous_item);
$template->set_global("sibling_count", $movie->parent()->viewable()->children_count($where));
$template->set_global("position", $position);
$template->content = new View("embedded_video.html");
db::query("UPDATE {items} SET `view_count` = `view_count` + 1 WHERE `id` = $movie->id")->execute();
//$movie->view_count++;
//$movie->save();
print $template;
}
public function update($movie_id) {
access::verify_csrf();
$movie = ORM::factory("item", $movie_id);
access::required("view", $movie);
access::required("edit", $movie);
$form = embed_videos::get_edit_form($movie);
try {
$valid = $form->validate();
$movie->title = $form->edit_item->title->value;
$movie->description = $form->edit_item->description->value;
$movie->slug = $form->edit_item->slug->value;
//$movie->name = $form->edit_item->inputs["name"]->value;
$movie->validate();
}
catch(ORM_Validation_Exception $e) {
// Translate ORM validation errors into form error messages
foreach($e->validation->errors() as $key => $error) {
$form->edit_item->inputs[$key]->add_error($error, 1);
}
$valid = false;
}
if ($valid) {
$movie->save();
module::event("item_edit_form_completed", $movie, $form);
log::success("content", "Updated embed", "<a href=\"{$movie->url() }\">view</a>");
message::success(t("Saved embed %movie_title", array("movie_title" => $movie->title)));
if ($form->from_id->value == $movie->id) {
// Use the new url; it might have changed.
print json_encode(array("result" => "success", "location" => $movie->url()));
} else {
// Stay on the same page
print json_encode(array("result" => "success"));
}
} else {
print json_encode(array("result" => "error", "form" => (string)$form));
}
public function show($movie) {
if (!is_object($movie)) {
// show() must be public because we route to it in url::parse_url(), so make
// sure that we're actually receiving an object
throw new Kohana_404_Exception();
}
access::required("view", $movie);
$where = array(array("type", "!=", "album"));
$position = $movie->parent()->get_position($movie, $where);
if ($position > 1) {
list($previous_item, $ignore, $next_item) = $movie->parent()->children(3, $position - 2, $where);
} else {
$previous_item = null;
list($next_item) = $movie->parent()->viewable()->children(1, $position, $where);
}
$embedded_video = ORM::factory("embedded_video")->where("item_id", "=", $movie->id)->find();
//$db = Database::instance();
//$result = $db->from('embedded_videos')->select('embed_code')->where('item_id',$movie->id)->get();
$template = new Theme_View("page.html", "item", "embedded_video");
$template->set_global("item", $movie);
$template->set_global("embedded_video", $embedded_video->embed_code);
$template->set_global("children", array());
$template->set_global("children_count", 0);
$template->set_global("parents", $movie->parents());
$template->set_global("next_item", $next_item);
$template->set_global("previous_item", $previous_item);
$template->set_global("sibling_count", $movie->parent()->viewable()->children_count($where));
$template->set_global("position", $position);
$template->content = new View("embedded_video.html");
db::query("UPDATE {items} SET `view_count` = `view_count` + 1 WHERE `id` = $movie->id")->execute();
//$movie->view_count++;
//$movie->save();
print $template;
}
public function update($movie_id) {
access::verify_csrf();
$movie = ORM::factory("item", $movie_id);
access::required("view", $movie);
access::required("edit", $movie);
$form = embed_videos::get_edit_form($movie);
try {
$valid = $form->validate();
$movie->title = $form->edit_item->title->value;
$movie->description = $form->edit_item->description->value;
$movie->slug = $form->edit_item->slug->value;
//$movie->name = $form->edit_item->inputs["name"]->value;
$movie->validate();
}
catch(ORM_Validation_Exception $e) {
// Translate ORM validation errors into form error messages
foreach($e->validation->errors() as $key => $error) {
$form->edit_item->inputs[$key]->add_error($error, 1);
}
$valid = false;
}
if ($valid) {
$movie->save();
module::event("item_edit_form_completed", $movie, $form);
log::success("content", "Updated embed", "<a href=\"{$movie->url() }\">view</a>");
message::success(t("Saved embed %movie_title", array("movie_title" => $movie->title)));
if ($form->from_id->value == $movie->id) {
// Use the new url; it might have changed.
print json_encode(array("result" => "success", "location" => $movie->url()));
} else {
// Stay on the same page
print json_encode(array("result" => "success"));
}
} else {
print json_encode(array("result" => "error", "form" => (string)$form));
}
}
public function create($id) {
$album = ORM::factory("item", $id);
access::required("view", $album);
@ -181,18 +182,18 @@ class Embedded_videos_Controller extends Controller {
} else {
//json::reply(array("result" => "error", "form" => (string)$form));
print $form;
}
}
public function form_add($album_id) {
$album = ORM::factory("item", $album_id);
access::required("view", $album);
access::required("add", $album);
print embed_videos::get_add_form($album);
}
public function form_edit($id) {
$embed = ORM::factory("item", $id);
access::required("view", $embed);
access::required("edit", $embed);
print embed_videos::get_edit_form($embed);
}
}
public function form_add($album_id) {
$album = ORM::factory("item", $album_id);
access::required("view", $album);
access::required("add", $album);
print embed_videos::get_add_form($album);
}
public function form_edit($id) {
$embed = ORM::factory("item", $id);
access::required("view", $embed);
access::required("edit", $embed);
print embed_videos::get_edit_form($embed);
}
}

46
modules/embed_videos/helpers/embed_videos.php
View File

@ -19,34 +19,34 @@
*/
/**
* This is the API for handling photos.
* This is the API for handling embedded videos.
*
* Note: by design, this class does not do any permission checking.
*/
class embed_videos_Core {
static function get_add_form($album) {
$form = new Forge("embedded_videos/create/{$album->id}", "", "post", array("id" => "g-add-embed-form"));
$group = $form->group("add_embedded_video")
->label(t("Add embedded video to %album_title", array("album_title" => $album->title)));
->label(t("Add embedded video to %album_title", array("album_title" => $album->title)));
$group->input("title")->label(t("Title"))
->error_messages("required", t("You must provide a title"))
->error_messages("length", t("Your title is too long"));
->error_messages("required", t("You must provide a title"))
->error_messages("length", t("Your title is too long"));
$group->input("video_url")->label(t("Video URL"))
->error_messages(
->error_messages(
"conflict", t("There is already a movie with this ID"))
->error_messages("required", t("You must provide a Youtube ID"))
->error_messages("length", t("Invalid Youtube ID"))
->error_messages("invalid_id", t("Invalid Youtube ID"));
->error_messages("required", t("You must provide a Youtube ID"))
->error_messages("length", t("Invalid Youtube ID"))
->error_messages("invalid_id", t("Invalid Youtube ID"));
$group->textarea("description")->label(t("Description"));
$group->input("slug")->label(t("Internet Address"))
->error_messages(
->error_messages(
"conflict", t("There is already a movie, photo or album with this internet address"))
->error_messages(
->error_messages(
"not_url_safe",
t("The internet address should contain only letters, numbers, hyphens and underscores"))
->error_messages("required", t("You must provide an internet address"))
->error_messages("length", t("Your internet address is too long"));
t("The internet address should contain only letters, numbers, hyphens and underscores"))
->error_messages("required", t("You must provide an internet address"))
->error_messages("length", t("Your internet address is too long"));
module::event("item_add_form", $album, $form);
@ -55,23 +55,23 @@ class embed_videos_Core {
return $form;
}
static function get_edit_form($photo) {
static function get_edit_form($photo) {
$form = new Forge("embedded_videos/update/$photo->id", "", "post", array("id" => "g-edit-embed-form"));
$form->hidden("from_id")->value($photo->id);
$group = $form->group("edit_item")->label(t("Edit Embedded Video"));
$group->input("title")->label(t("Title"))->value($photo->title)
->error_messages("required", t("You must provide a title"))
->error_messages("length", t("Your title is too long"));
->error_messages("required", t("You must provide a title"))
->error_messages("length", t("Your title is too long"));
$group->textarea("description")->label(t("Description"))->value($photo->description);
$group->input("slug")->label(t("Internet Address"))->value($photo->slug)
->error_messages(
->error_messages(
"conflict", t("There is already a movie, photo or album with this internet address"))
->error_messages(
->error_messages(
"not_url_safe",
t("The internet address should contain only letters, numbers, hyphens and underscores"))
->error_messages("required", t("You must provide an internet address"))
->error_messages("length", t("Your internet address is too long"));
t("The internet address should contain only letters, numbers, hyphens and underscores"))
->error_messages("required", t("You must provide an internet address"))
->error_messages("length", t("Your internet address is too long"));
module::event("item_edit_form", $photo, $form);

49
modules/embed_videos/helpers/embed_videos_event.php
View File

@ -1,9 +1,26 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2010 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 embed_videos_event_Core {
static function item_created($item) {
static function item_created($item) {
if ($item->type == "embedded_video") {
// Build our thumbnail/resizes.
@ -11,8 +28,8 @@ class embed_videos_event_Core {
graphics::generate($item);
} catch (Exception $e) {
log::error("graphics", t("Couldn't create a thumbnail or resize for %item_title",
array("item_title" => $item->title)),
html::anchor($item->abs_url(), t("details")));
array("item_title" => $item->title)),
html::anchor($item->abs_url(), t("details")));
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
}
@ -23,21 +40,21 @@ class embed_videos_event_Core {
}
}
}
static function item_deleted($item) {
ORM::factory("embedded_video")
->where("item_id", "=", $item->id)
->find()
->delete();
}
static function site_menu($menu, $theme) {
static function item_deleted($item) {
ORM::factory("embedded_video")
->where("item_id", "=", $item->id)
->find()
->delete();
}
static function site_menu($menu, $theme) {
$item = $theme->item();
if ($can_add = $item && access::can("add", $item)) {
$menu->get("add_menu")
->append(Menu::factory("dialog")
->id("embed_add")
->label(t("Embed Video"))
->url(url::site("form/add/embedded_videos/$item->id")));
->append(Menu::factory("dialog")
->id("embed_add")
->label(t("Embed Video"))
->url(url::site("form/add/embedded_videos/$item->id")));
}
}
}

46
modules/embed_videos/helpers/embed_videos_installer.php
View File

@ -1,9 +1,27 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2010 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 embed_videos_installer {
static function install() {
$db = Database::instance();
$db->query("CREATE TABLE {embedded_videos} (
static function install() {
$db = Database::instance();
$db->query("CREATE TABLE {embedded_videos} (
`id` int(9) NOT NULL auto_increment,
`embed_code` varchar(2048) DEFAULT NULL,
`source` varchar(64) DEFAULT NULL,
@ -11,16 +29,16 @@ class embed_videos_installer {
PRIMARY KEY (`id`),
KEY (`item_id`, `id`))
DEFAULT CHARSET=utf8;");
module::set_version("embed_videos", 2);
//exec("cd modules/gallery/controllers/; ln -s ../../embed/controllers/embeds.php embeds.php");
}
static function deactivate() {
module::set_version("embed_videos", 2);
//exec("cd modules/gallery/controllers/; ln -s ../../embed/controllers/embeds.php embeds.php");
}
}
static function uninstall() {
$db = Database::instance();
$db->query("DROP TABLE IF EXISTS {embedded_videos};");
module::delete("embed_videos");
}
static function deactivate() {
}
static function uninstall() {
$db = Database::instance();
$db->query("DROP TABLE IF EXISTS {embedded_videos};");
module::delete("embed_videos");
}
}

18
modules/embed_videos/models/embedded_video.php
View File

@ -1,4 +1,22 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2010 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 Embedded_video_Model extends ORM {
public function __construct($id=null) {

3
modules/embed_videos/views/embed_videoplayer.html.php
View File

@ -1,3 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<iframe class="youtube-player" type="text/html" width="640" height="385" src="http://www.youtube.com/embed/<?= substr($item->name, 0, strrpos($item->name, '.')); ?>" frameborder="0">
</iframe>

25
modules/embed_videos/views/photo.html.php
View File

@ -1,25 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? $embedded_video = ORM::factory('embedded_video')->where('item_id', $item->id)->find();
if ($embedded_video->loaded()) {
?>
<div id="g-item">
<?= $theme->photo_top() ?>
<?= $theme->paginator() ?>
<div id="g-movie" class="ui-helper-clearfix">
<?= $theme->resize_top($item) ?>
<?= $embedded_video->embed_code ?>
<?= $theme->resize_bottom($item) ?>
</div>
<div id="g-info">
<h1><?= html::purify($item->title) ?></h1>
<div><?= nl2br(html::purify($item->description)) ?></div>
</div>
<?= $theme->photo_bottom() ?>
</div>
<? } else {
require('themes/' . $theme->name . 'views/photo.html.php');
} ?>