diff --git a/modules/embed_videos/controllers/embedded_videos.php b/modules/embed_videos/controllers/embedded_videos.php
index 5b3a25b1..fdb7b5e1 100644
--- a/modules/embed_videos/controllers/embedded_videos.php
+++ b/modules/embed_videos/controllers/embedded_videos.php
@@ -18,144 +18,6 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Embedded_videos_Controller extends Controller {
-<<<<<<< HEAD
- 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", "url() }\">view");
- 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);
- 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 = '';
- $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;
- }
- }
- }
- //$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->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;
- $item->set_data_file($temp_filename);
- $path_info = @pathinfo($temp_filename);
- $item->save();
- //module::event("item_created", $item);
- 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;
- }
- } else {
- $form->add_embedded_video->inputs['video_url']->add_error('invalid_id', 1);
- $valid = false;
-=======
public function create($id) {
$album = ORM::factory("item", $id);
access::required("view", $album);
@@ -187,26 +49,9 @@ class Embedded_videos_Controller extends Controller {
$temp_filename = VARPATH . "tmp/$itemname";
if ($content) {
$valid_url = true;
->>>>>>> js-solution
}
+ }
}
-<<<<<<< HEAD
- catch(Exception $e) {
- // Lame error handling for now. Just record the exception and move on
- 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));
- foreach($e->validation->errors() as $key => $error) {
- $form->add_embed->inputs[$key]->add_error($error, 1);
- }
- $valid = false;
- }
- if (file_exists($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) {
@@ -231,18 +76,38 @@ class Embedded_videos_Controller extends Controller {
} else {
$form->add_embedded_video->inputs['video_url']->add_error('invalid_id', 1);
$valid = false;
->>>>>>> js-solution
}
- if (file_exists($temp_filename)) {
- unlink($temp_filename);
+ } else {
+ $form->add_embedded_video->inputs['video_url']->add_error('invalid_id', 1);
+ $valid = false;
+ }
+ }
+ catch(Exception $e) {
+ // Lame error handling for now. Just record the exception and move on
+ 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));
+ foreach($e->validation->errors() as $key => $error) {
+ $form->add_embed->inputs[$key]->add_error($error, 1);
}
- batch::stop();
- if ($valid) {
- //print json_encode(array("result" => "success"));
- json::reply(array("result" => "success", "location" => $item->url()));
- } else {
- //json::reply(array("result" => "error", "form" => (string)$form));
- print $form;
+ $valid = false;
+ }
+ if (file_exists($temp_filename)) {
+ unlink($temp_filename);
+ }
+ }
+ if (file_exists($temp_filename)) {
+ unlink($temp_filename);
+ }
+ batch::stop();
+ if ($valid) {
+ //print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success", "location" => $item->url()));
+ } else {
+ //json::reply(array("result" => "error", "form" => (string)$form));
+ print $form;
}
}
public function form_add($album_id) {