diff --git a/modules/embed_videos/helpers/embed_videos.php b/modules/embed_videos/helpers/embed_videos.php index b46d4d73..edf6b875 100644 --- a/modules/embed_videos/helpers/embed_videos.php +++ b/modules/embed_videos/helpers/embed_videos.php @@ -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); diff --git a/modules/embed_videos/helpers/embed_videos_event.php b/modules/embed_videos/helpers/embed_videos_event.php index 8cc83827..30a946f5 100644 --- a/modules/embed_videos/helpers/embed_videos_event.php +++ b/modules/embed_videos/helpers/embed_videos_event.php @@ -1,9 +1,26 @@ 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"))); } } } diff --git a/modules/embed_videos/helpers/embed_videos_installer.php b/modules/embed_videos/helpers/embed_videos_installer.php index 2c3c847a..dd69489a 100644 --- a/modules/embed_videos/helpers/embed_videos_installer.php +++ b/modules/embed_videos/helpers/embed_videos_installer.php @@ -1,9 +1,27 @@ 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"); + } } diff --git a/modules/embed_videos/models/embedded_video.php b/modules/embed_videos/models/embedded_video.php index 6c849d72..6ea97e8f 100644 --- a/modules/embed_videos/models/embedded_video.php +++ b/modules/embed_videos/models/embedded_video.php @@ -1,4 +1,22 @@ - diff --git a/modules/embed_videos/views/photo.html.php b/modules/embed_videos/views/photo.html.php deleted file mode 100644 index 8d96ebdc..00000000 --- a/modules/embed_videos/views/photo.html.php +++ /dev/null @@ -1,25 +0,0 @@ - -where('item_id', $item->id)->find(); - if ($embedded_video->loaded()) { -?> -
- photo_top() ?> - - paginator() ?> - -
- resize_top($item) ?> - embed_code ?> - resize_bottom($item) ?> -
- -
-

title) ?>

-
description)) ?>
-
- - photo_bottom() ?> -
-name . 'views/photo.html.php'); - } ?> \ No newline at end of file