Merge branch 'js-solution'
Conflicts: modules/embed_videos/controllers/embedded_videos.php
This commit is contained in:
commit
c0050066ac
@ -18,6 +18,7 @@
|
|||||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
class Embedded_videos_Controller extends Controller {
|
class Embedded_videos_Controller extends Controller {
|
||||||
|
<<<<<<< HEAD
|
||||||
public function show($movie) {
|
public function show($movie) {
|
||||||
if (!is_object($movie)) {
|
if (!is_object($movie)) {
|
||||||
// show() must be public because we route to it in url::parse_url(), so make
|
// show() must be public because we route to it in url::parse_url(), so make
|
||||||
@ -154,8 +155,42 @@ class Embedded_videos_Controller extends Controller {
|
|||||||
} else {
|
} else {
|
||||||
$form->add_embedded_video->inputs['video_url']->add_error('invalid_id', 1);
|
$form->add_embedded_video->inputs['video_url']->add_error('invalid_id', 1);
|
||||||
$valid = false;
|
$valid = false;
|
||||||
|
=======
|
||||||
|
public function create($id) {
|
||||||
|
$album = ORM::factory("item", $id);
|
||||||
|
access::required("view", $album);
|
||||||
|
access::required("add", $album);
|
||||||
|
access::verify_csrf();
|
||||||
|
$form = embed_videos::get_add_form($album);
|
||||||
|
$temp_filename = "";
|
||||||
|
//$form->add_rules('youtubeid', array('required', 'length[11]'));
|
||||||
|
//$form->add_callback('youtubeid', 'valid_youtubeid');
|
||||||
|
batch::start();
|
||||||
|
try {
|
||||||
|
$valid = $form->validate();
|
||||||
|
if ($form->add_embedded_video->inputs['video_url']->value != "") {
|
||||||
|
$youtubeUrlPattern="youtube";
|
||||||
|
$youtubeApiUrl="http://gdata.youtube.com/feeds/api/";
|
||||||
|
$youtubeThumbnailUrl="http://img.youtube.com/vi/";
|
||||||
|
$valid_url=false;
|
||||||
|
$embedded_video = ORM::factory("embedded_video");
|
||||||
|
$item = ORM::factory("item");
|
||||||
|
$item->type = "photo";
|
||||||
|
$url = $form->add_embedded_video->inputs['video_url']->value;
|
||||||
|
if(preg_match("/$youtubeUrlPattern/",$url)) {
|
||||||
|
if(preg_match("/watch\?v=(.*?)(&\S+=\S+)/",$url,$matches)) {
|
||||||
|
$video_id = $matches[1];
|
||||||
|
$embedded_video->embed_code = '<iframe class="youtube-player" type="text/html" width="640" height="385" src="http://www.youtube.com/embed/' . $video_id . '" frameborder="0"></iframe>';
|
||||||
|
$embedded_video->source = "YouTube";
|
||||||
|
$content = file_get_contents("http://img.youtube.com/vi/" . $video_id . "/0.jpg");
|
||||||
|
$itemname = "youtube_" . $video_id . ".jpg";
|
||||||
|
$temp_filename = VARPATH . "tmp/$itemname";
|
||||||
|
if ($content) {
|
||||||
|
$valid_url = true;
|
||||||
|
>>>>>>> js-solution
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
catch(Exception $e) {
|
catch(Exception $e) {
|
||||||
// Lame error handling for now. Just record the exception and move on
|
// Lame error handling for now. Just record the exception and move on
|
||||||
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
|
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
|
||||||
@ -171,6 +206,32 @@ class Embedded_videos_Controller extends Controller {
|
|||||||
if (file_exists($temp_filename)) {
|
if (file_exists($temp_filename)) {
|
||||||
unlink($temp_filename);
|
unlink($temp_filename);
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
//$item->validate();
|
||||||
|
//$content = file_get_contents("http://img.youtube.com/vi/" . $form->add_embedded_video->inputs['name']->value . "/0.jpg");
|
||||||
|
if ($valid_url) {
|
||||||
|
$file = fopen($temp_filename, "wb");
|
||||||
|
fwrite($file, $content);
|
||||||
|
fclose($file);
|
||||||
|
gallery_graphics::composite($temp_filename, $temp_filename, array("file" => "modules/embed_videos/images/embed_video_icon.png", "position" => "center", "transparency" => 95));
|
||||||
|
$item->set_data_file($temp_filename);
|
||||||
|
$item->name = basename($itemname);
|
||||||
|
$item->title = $form->add_embedded_video->title->value;
|
||||||
|
$item->parent_id = $album->id;
|
||||||
|
$item->description = $form->add_embedded_video->description->value;
|
||||||
|
$item->slug = $form->add_embedded_video->slug->value;
|
||||||
|
$path_info = @pathinfo($temp_filename);
|
||||||
|
$item->save();
|
||||||
|
//db::query("UPDATE {items} SET `type` = 'embedded_video' WHERE `id` = $item->id")->execute();
|
||||||
|
$embedded_video->item_id = $item->id;
|
||||||
|
$embedded_video->validate();
|
||||||
|
$embedded_video->save();
|
||||||
|
log::success("content", t("Added a embedded video"), html::anchor("embeds/$item->id", t("view video")));
|
||||||
|
module::event("add_event_form_completed", $item, $form);
|
||||||
|
} else {
|
||||||
|
$form->add_embedded_video->inputs['video_url']->add_error('invalid_id', 1);
|
||||||
|
$valid = false;
|
||||||
|
>>>>>>> js-solution
|
||||||
}
|
}
|
||||||
if (file_exists($temp_filename)) {
|
if (file_exists($temp_filename)) {
|
||||||
unlink($temp_filename);
|
unlink($temp_filename);
|
||||||
@ -190,10 +251,4 @@ class Embedded_videos_Controller extends Controller {
|
|||||||
access::required("add", $album);
|
access::required("add", $album);
|
||||||
print embed_videos::get_add_form($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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -55,52 +55,4 @@ class embed_videos_Core {
|
|||||||
|
|
||||||
return $form;
|
return $form;
|
||||||
}
|
}
|
||||||
|
|
||||||
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"));
|
|
||||||
$group->textarea("description")->label(t("Description"))->value($photo->description);
|
|
||||||
$group->input("slug")->label(t("Internet Address"))->value($photo->slug)
|
|
||||||
->error_messages(
|
|
||||||
"conflict", t("There is already a movie, photo or album with this internet address"))
|
|
||||||
->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"));
|
|
||||||
|
|
||||||
module::event("item_edit_form", $photo, $form);
|
|
||||||
|
|
||||||
$group = $form->group("buttons")->label("");
|
|
||||||
$group->submit("")->value(t("Modify"));
|
|
||||||
return $form;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return scaled width and height.
|
|
||||||
*
|
|
||||||
* @param integer $width
|
|
||||||
* @param integer $height
|
|
||||||
* @param integer $max the target size for the largest dimension
|
|
||||||
* @param string $format the output format using %d placeholders for width and height
|
|
||||||
*/
|
|
||||||
static function img_dimensions($width, $height, $max, $format="width=\"%d\" height=\"%d\"") {
|
|
||||||
if (!$width || !$height) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($width > $height) {
|
|
||||||
$new_width = $max;
|
|
||||||
$new_height = (int)$max * ($height / $width);
|
|
||||||
} else {
|
|
||||||
$new_height = $max;
|
|
||||||
$new_width = (int)$max * ($width / $height);
|
|
||||||
}
|
|
||||||
return sprintf($format, $new_width, $new_height);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
@ -19,27 +19,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
class embed_videos_event_Core {
|
class embed_videos_event_Core {
|
||||||
|
|
||||||
static function item_created($item) {
|
|
||||||
|
|
||||||
if ($item->type == "embedded_video") {
|
|
||||||
// Build our thumbnail/resizes.
|
|
||||||
try {
|
|
||||||
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")));
|
|
||||||
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the parent has no cover item, make this it.
|
|
||||||
$parent = $item->parent();
|
|
||||||
if (access::can("edit", $parent) && $parent->album_cover_item_id == null) {
|
|
||||||
item::make_album_cover($item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
static function item_deleted($item) {
|
static function item_deleted($item) {
|
||||||
ORM::factory("embedded_video")
|
ORM::factory("embedded_video")
|
||||||
->where("item_id", "=", $item->id)
|
->where("item_id", "=", $item->id)
|
||||||
@ -48,7 +27,6 @@ class embed_videos_event_Core {
|
|||||||
}
|
}
|
||||||
static function site_menu($menu, $theme) {
|
static function site_menu($menu, $theme) {
|
||||||
$item = $theme->item();
|
$item = $theme->item();
|
||||||
|
|
||||||
if ($can_add = $item && access::can("add", $item)) {
|
if ($can_add = $item && access::can("add", $item)) {
|
||||||
$menu->get("add_menu")
|
$menu->get("add_menu")
|
||||||
->append(Menu::factory("dialog")
|
->append(Menu::factory("dialog")
|
||||||
|
34
modules/embed_videos/helpers/embed_videos_theme.php
Normal file
34
modules/embed_videos/helpers/embed_videos_theme.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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_theme_Core {
|
||||||
|
static function photo_bottom($theme) {
|
||||||
|
$item = $theme->item();
|
||||||
|
if ($item && $item->is_photo()) {
|
||||||
|
$embedded_video = ORM::factory("embedded_video")
|
||||||
|
->where("item_id", "=", $item->id)
|
||||||
|
->find();
|
||||||
|
if ($embedded_video->loaded()) {
|
||||||
|
$view = new View("embed_video_js.html");
|
||||||
|
$view->embed_code = addslashes($embedded_video->embed_code);
|
||||||
|
return $view;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
27
modules/embed_videos/views/embed_video_js.html.php
Normal file
27
modules/embed_videos/views/embed_video_js.html.php
Normal file
@ -0,0 +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.
|
||||||
|
*/
|
||||||
|
?>
|
||||||
|
<? if (isset($embed_code)): ?>
|
||||||
|
<script type="text/javascript">
|
||||||
|
//$(document).ready(function() {
|
||||||
|
$("#g-photo").replaceWith("<?= $embed_code ?>");
|
||||||
|
//});
|
||||||
|
</script>
|
||||||
|
<? endif ?>
|
Reference in New Issue
Block a user