aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2011-11-03 22:23:57 +0100
committerSem <sembrestels@riseup.net>2011-11-03 22:23:57 +0100
commitecf03771557e24e86a982e5f79ebcb84d8d54883 (patch)
treeef9fdffb2d9f05795f124ca0accd27cdf1a4dd95 /views
parentfc7921d05953d3de3130f9d49b7d73ec4c466b34 (diff)
downloadelgg-ecf03771557e24e86a982e5f79ebcb84d8d54883.tar.gz
elgg-ecf03771557e24e86a982e5f79ebcb84d8d54883.tar.bz2
Moved url parse functions to a library.
Diffstat (limited to 'views')
-rw-r--r--views/default/forms/videolist/add.php84
-rw-r--r--views/default/forms/videolist/edit.php5
2 files changed, 4 insertions, 85 deletions
diff --git a/views/default/forms/videolist/add.php b/views/default/forms/videolist/add.php
index 2ee5d9c2e..b03c18341 100644
--- a/views/default/forms/videolist/add.php
+++ b/views/default/forms/videolist/add.php
@@ -53,90 +53,6 @@ if (!empty($get_addvideourl) && ($Pagecontainer == "youtube")) {
$tags = get_input('videolisttags');
-function video_youtube_parse_url($url) {
- if (!preg_match('/(http:\/\/)([a-zA-Z]{2,3}\.)(youtube\.com\/)(.*)/', $url, $matches)) {
- return false;
- }
-
- $domain = $matches[2] . $matches[3];
- $path = $matches[4];
-
- if (!preg_match('/^(watch\?v=)([a-zA-Z0-9_-]*)(&.*)?$/',$path, $matches)) {
- return false;
- }
-
- $hash = $matches[2];
- return $domain . 'v/' . $hash;
-}
-
-function video_vimeo_parse_url($url) {
- if (!preg_match('/(http:\/\/)([a-zA-Z]{2,3}\.)(vimeo\.com\/)(.*)/', $url, $matches)) {
- return false;
- }
-
- $domain = $matches[2] . $matches[3];
- $path = $matches[4];
-
- $hash = $matches[2];
-
- return $domain . '/' . $hash;
-}
-
-function video_metacafe_parse_url($url) {
- if (!preg_match('/(http:\/\/)([a-zA-Z]{2,3}\.)(metacafe\.com\/)(.*)/', $url, $matches)) {
- return false;
- }
-
- $domain = $matches[2] . $matches[3];
- $path = $matches[4];
-
- $hash = $matches[2];
-
- return $domain . '/' . $hash;
-}
-
-if(isset($confirm_action) && ($confirm_action == 'add_video')) {
- if(isset($title_videourl) && ($title_videourl != '')) {
- if($Pagecontainer != "youtube" || $Pagecontainer != "vimeo" || $Pagecontainer != "metacafe"){
- if(preg_match("/youtube/i", $title_videourl)) {
- $Pagecontainer = "youtube";
- }
-
- if(preg_match("/vimeo/i", $title_videourl)) {
- $Pagecontainer = "vimeo";
- }
-
- if(preg_match("/metacafe/i", $title_videourl)) {
- $Pagecontainer = "metacafe";
- }
- }
- if($Pagecontainer == "youtube") {
- $is_valid_video = video_youtube_parse_url($title_videourl);
- } else if($Pagecontainer == "vimeo") {
- $is_valid_video = video_vimeo_parse_url($title_videourl);
- $is_valid_video = $get_addvideourl;
- } else if($Pagecontainer == "metacafe"){
- $is_valid_video = video_metacafe_parse_url($title_videourl);
- $is_valid_video = $get_addvideourl;
- }
-
- if($is_valid_video) {
- $error['no-video'] = 1;
- $_SESSION['candidate_profile_video'] = $is_valid_video;
- $_SESSION['candidate_profile_video_access_id'] = $access_id;
- $_SESSION['videolisttags'] = $tags;
- $_SESSION['Pagecontainer'] = $Pagecontainer;
- $_SESSION['container_guid'] = $container_guid;
- $url = "action/videolist/add?__elgg_ts={$timestamp}&__elgg_token={$token}";
- forward($url);
- }
- else
- $error['no-video'] = 0;
- }
- else {
- $error['no-video'] = 0;
- }
-}
$body = '<form action="'.$_SERVER['php_self'].'" method="post" id="add_video_form">';
$body .= elgg_view('input/hidden',array('internalname'=>'video_action', 'value'=>'add_video'));
diff --git a/views/default/forms/videolist/edit.php b/views/default/forms/videolist/edit.php
index 7d7901bcd..9bcc64a7a 100644
--- a/views/default/forms/videolist/edit.php
+++ b/views/default/forms/videolist/edit.php
@@ -2,6 +2,9 @@
/**
* Elgg Video Plugin > Edit view
*/
+
+elgg_load_library('elgg:videolist');
+
// Make sure we're logged in (send us to the front page if not)
gatekeeper();
$page_owner = page_owner_entity();
@@ -40,4 +43,4 @@ if($owner instanceof ElggGroup){
<input type="submit" value="<?php echo elgg_echo("save"); ?>" />
</p>
-</form> \ No newline at end of file
+</form>