Permalink
Browse files

Merge branch 'lorea-1.8' of github.com:lorea/videolist into elgg-vide…

…olist
  • Loading branch information...
Sem
Sem committed Nov 12, 2011
2 parents 89c298b + 4585e37 commit 27cfe71b0bb0e4b18b119a7ba17a449771a065b3
Showing with 22 additions and 11 deletions.
  1. +19 −11 actions/videolist/edit.php
  2. +1 −0 pages/videolist/edit.php
  3. +2 −0 views/default/forms/videolist/edit.php
View
@@ -18,23 +18,33 @@
}
// Get guids
-$videolist_guid = (int)get_input('videolist_guid');
+$video_guid = (int)get_input('video_guid');
$container_guid = (int)get_input('container_guid');
elgg_make_sticky_form('videolist');
elgg_load_library('elgg:videolist');
-if (!$input['video_url']) {
- register_error(elgg_echo('videolist:error:no_url'));
- forward(REFERER);
-}
+// If new video, get data from video providers
+if(!$video_guid) {
+ if (!$input['video_url']) {
+ register_error(elgg_echo('videolist:error:no_url'));
+ forward(REFERER);
+ }
-$parsed_url = videolist_parseurl($input['video_url']);
+ $parsed_url = videolist_parseurl($input['video_url']);
-if(!$parsed_url) {
- register_error(elgg_echo('videolist:error:invalid_url'));
- forward(REFERER);
+ if(!$parsed_url) {
+ register_error(elgg_echo('videolist:error:invalid_url'));
+ forward(REFERER);
+ }
+
+ unset($input['title']);
+ unset($input['description']);
+ $input = array_merge(videolist_get_data($parsed_url), $input);
+
+} else {
+ unset($input['video_url']);
}
if ($video_guid) {
@@ -50,8 +60,6 @@
$new_video = true;
}
-$input = array_merge($input, videolist_get_data($parsed_url));
-
if (sizeof($input) > 0) {
foreach ($input as $name => $value) {
$video->$name = $value;
View
@@ -36,6 +36,7 @@
foreach(array_keys(elgg_get_config('videolist')) as $variable) {
$body_vars[$variable] = $videolist_item->$variable;
}
+$body_vars['container_guid'] = $videolist_item->container_guid;
$content = elgg_view_form('videolist/edit', $form_vars, $body_vars);
@@ -10,6 +10,8 @@
if(empty($vars['guid'])){
unset($variables['title']);
unset($variables['description']);
+} else {
+ unset($variables['video_url']);
}
foreach ($variables as $name => $type) {

0 comments on commit 27cfe71

Please sign in to comment.