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

4 files changed, 3 insertions, 53 deletions

diff --git a/lib/gisstv.php b/lib/gisstv.php
deleted file mode 100644
index 24e11340a..000000000
--- a/lib/gisstv.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function videolist_parseurl_gisstv($url) {
-	$parsed = parse_url($url);
-	$path = explode('/', $parsed['path']);
-
-	if ($parsed['host'] != 'giss.tv' || $path[1] != 'dmmdb') {
-		return false;
-	}
-	
-	if($path[2] == 'contents' && isset($path[3])) {
-		$video_id = $path[3];
-	} elseif($path[3] == 'contents' && isset($path[4])) {
-		$video_id = $path[4];
-	} else {
-		return false;
-	}
-	
-	return array(
-		'videotype' => 'gisstv',
-		'video_id' => $video_id,
-	);
-}
-
-function videolist_get_data_gisstv($parsed){
-	$video_id = $parsed['video_id'];
-	
-	$buffer = file_get_contents('http://giss.tv/dmmdb//rss.php');
-	$xml = new SimpleXMLElement($buffer);
-	
-	$data = array();
-	foreach($xml->xpath('/rss/channel/item') as $item){
-		if(sanitize_string($item->link) == 'http://giss.tv/dmmdb//contents/'.$video_id) {
-			$data['title'] = sanitize_string($item->title);
-			$data['description'] = strip_tags($item->description);
-			$data['thumbnail'] = sanitize_string($item->thumbnail);
-			break;
-		}
-	}
-	return $data;
-}
diff --git a/lib/videolist.php b/lib/videolist.php
index 2dfc7d8fc..4e12c5361 100644
--- a/lib/videolist.php
+++ b/lib/videolist.php
@@ -1,6 +1,6 @@
 <?php
 
-define('VIDEOLIST_SUPPORTED_PLATFORMS', 'youtube, vimeo, metacafe, bliptv, gisstv');
+define('VIDEOLIST_SUPPORTED_PLATFORMS', 'youtube, vimeo, metacafe, bliptv');
 
 foreach(explode(', ', VIDEOLIST_SUPPORTED_PLATFORMS) as $videotype){
 	include(elgg_get_plugins_path()."videolist/lib/$videotype.php");
diff --git a/manifest.xml b/manifest.xml
index e4cdbcc4e..d288e875c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,12 +2,12 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
 	<name>Video List</name>
 	<author>Prateek Choudhary, Core developers, Lorea</author>
-	<version>1.8</version>
+	<version>1.8-beta</version>
 	<category>bundled</category>
 	<category>content</category>
 	<category>multimedia</category>
 	<description>This plugin allows users to create a library of videos.</description>
-	<website>https://lorea.cc/</website>
+	<website>http://elgg.org/</website>
 	<copyright>(C) prateek.choudhary 2008-09, Elgg 2010, Lorea 2011</copyright>
 	<license>GNU Public License version 2</license>
 	<requires>
diff --git a/views/default/videolist/watch/gisstv.php b/views/default/videolist/watch/gisstv.php
deleted file mode 100644
index 15a903ab1..000000000
--- a/views/default/videolist/watch/gisstv.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$video_id = $vars['entity']->video_id;
-$width = $vars['width'];
-$height = $vars['height'];
-
-echo "<video width=\"$width\" height=\"$height\" controls=\"\" tabindex=\"0\">
-	<source type=\"video/ogg\" src=\"http://giss.tv/dmmdb//contents/$video_id\"></source>
-</video>";