jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343810 )
Change subject: Remove support for Sevenload along with other references
......................................................................
Remove support for Sevenload along with other references
Bug: T160972
Change-Id: Ie529b410906ee49f5a75d86d22f18d8bbd222a9e
---
M VideoClass.php
M extension.json
M i18n/en.json
D providers/SevenloadVideo.php
4 files changed, 2 insertions(+), 35 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VideoClass.php b/VideoClass.php
index 4c44107..d385527 100644
--- a/VideoClass.php
+++ b/VideoClass.php
@@ -84,22 +84,14 @@
* @var array
*/
static $providers = array(
- //'archiveorg' => 'ArchiveOrgVideoProvider', // broken/dont
know how this works
'bliptv' => 'BlipTVVideoProvider',
'dailymotion' => 'DailyMotionVideoProvider',
'gametrailers' => 'GametrailersVideoProvider',
- //'gamevideos' => 'GamevideosVideoProvider', // broken
- //'gogreentube' => 'GoGreenTubeVideoProvider', // Down
'google' => 'GoogleVideoProvider',
'hulu' => 'HuluVideoProvider',
'metacafe' => 'MetaCafeVideoProvider',
'movieclips' => 'MovieClipsVideoProvider',
- // I'd rather not wade through the shit that is MySpace to
figure out
- // how videos work, someone else can do that..
- //'myspace' => 'MySpaceVideoProvider',
'myvideo' => 'MyVideoVideoProvider',
- //'thenewsroom' => 'NewsRoomVideoProvider', // Website sucks
too much
- 'sevenload' => 'SevenloadVideoProvider',
'southparkstudios' => 'SouthParkStudiosVideoProvider',
'youtube' => 'YouTubeVideoProvider',
'viddler' => 'ViddlerVideoProvider',
diff --git a/extension.json b/extension.json
index 95279c8..29803d5 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Video",
- "version": "1.5.5",
+ "version": "1.5.6",
"author": [
"David Pean",
"Jack Phoenix",
@@ -49,7 +49,6 @@
"MovieClipsVideoProvider": "providers/MovieClipsVideo.php",
"MTVNetworksVideoProvider": "providers/MTVNetworksVideo.php",
"MyVideoVideoProvider": "providers/MyVideoVideo.php",
- "SevenloadVideoProvider": "providers/SevenloadVideo.php",
"SouthParkStudiosVideoProvider":
"providers/SouthParkStudiosVideo.php",
"ViddlerVideoProvider": "providers/ViddlerVideo.php",
"VimeoVideoProvider": "providers/VimeoVideo.php",
diff --git a/i18n/en.json b/i18n/en.json
index 208923b..b50b674 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,7 +13,7 @@
"video-addvideo-title": "Add video",
"video-addvideo-dest": "Add video for $1",
"video-addvideo-button": "Add video",
- "video-provider-list": "*[http://www.youtube.com/
YouTube]\n*[http://vids.myspace.com/ MySpaceTV]\n*[http://video.google.com/
Google Video]\n*[http://www.metacafe.com/ Metacafe]\n*[http://archive.org/
Archive.org]\n*[http://blip.tv/ Blip.tv]\n*[http://www.dailymotion.com/
Dailymotion]\n*[http://www.gametrailers.com
Gametrailers]\n*[http://gamevideos.1up.com/
Gamevideos]\n*[http://www.gogreentube.com/ GoGreenTube]\n*[http://www.hulu.com/
Hulu]\n*[http://www.myvideo.de/ MyVideo]\n*[http://movieclips.com/
MovieClips]\n*[http://www.sevenload.com/
Sevenload]\n*[http://www.southparkstudios.com/ South Park
Studios]\n*[http://www.viddler.com/ Viddler]\n*[http://www.vimeo.com/
Vimeo]\n*[http://www.wegame.com/ WeGame]",
+ "video-provider-list": "*[http://www.youtube.com/
YouTube]\n*[http://video.google.com/ Google Video]\n*[http://www.metacafe.com/
Metacafe]\n*[http://blip.tv/ Blip.tv]\n*[http://www.dailymotion.com/
Dailymotion]\n*[http://www.gametrailers.com
Gametrailers]\n*[http://www.hulu.com/ Hulu]\n*[http://www.myvideo.de/
MyVideo]\n*[http://movieclips.com/
MovieClips]\n*[http://www.southparkstudios.com/ South Park
Studios]\n*[http://www.viddler.com/ Viddler]\n*[http://www.vimeo.com/
Vimeo]\n*[http://www.wegame.com/ WeGame]",
"video-addvideo-instructions": "Adding a video to {{SITENAME}} is
easy.\nJust paste the video embed code ''or'' the video's URL into the
following form, add a name for the video, and press the
\"{{int:video-addvideo-button}}\" button.\nIf you want to embed the video on a
page use the following format: '''<nowiki>[[</nowiki>{{ns:video}}:Video
Title<nowiki>]]</nowiki>'''.\nYou can add a video from the following
providers:\n{{int:video-provider-list}}\n===Example of a Video Embed
Code===\nThis is an example video embed code from YouTube:\n\n<pre
style=\"background-color: #F9F9F9; border: 1px dashed #2F6FAB; color: black;
line-height: 1.1em; padding: 1em;\">\n<nowiki><object width=\"425\"
height=\"355\">\n<param name=\"movie\"
value=\"http://www.youtube.com/v/hUcFWPgB8oY\";></param>\n<param name=\"wmode\"
value=\"transparent\"></param>\n<embed
src=\"http://www.youtube.com/v/hUcFWPgB8oY\";
type=\"application/x-shockwave-flash\"\nwmode=\"transparent\" width=\"425\"
height=\"355\"></embed>\n</object></nowiki>\n</pre>\n\n===Example of a Video
URL===\nBelow is an example of a video's URL from YouTube:\n<pre
style=\"background-color: #F9F9F9; border: 1px dashed #2F6FAB; color: black;
line-height: 1.1em; padding:
1em;\">http://www.youtube.com/watch?v=hUcFWPgB8oY</pre>",
"video-addvideo-invalidcode": "The code or URL you pasted is invalid.
Please try again.",
"video-addvideo-exists": "The title for your video already exists.
Please choose another title for the video.",
diff --git a/providers/SevenloadVideo.php b/providers/SevenloadVideo.php
deleted file mode 100644
index 28bf761..0000000
--- a/providers/SevenloadVideo.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Bartek Łapiński's notes from WikiaVideo extension:
- * needs an API key - to be done last
- * 1. create a token
- * http://api.sevenload.com/rest/1.0/tokens/create with user and password
- *
- * 2. load the data using the token
- * http://api.sevenload.com/rest/1.0/items/A2C4E6G \
- * ?username=XYZ&token-id=8b8453ca4b79f500e94aac1fc7025b0704f3f2c7
- */
-
-class SevenloadVideoProvider extends BaseVideoProvider {
- protected $videoIdRegex =
'#/([a-zA-Z0-9]+)-[a-zA-Z0-9\-]*?(?:(?:\#|\?).*?)?$#';
- protected $embedTemplate = '<object
type="application/x-shockwave-flash"
data="http://en.sevenload.com/pl/$video_id/$widthx$height/swf"; width="$width"
height="$height"><param name="allowFullscreen" value="true" /><param
name="allowScriptAccess" value="always" /><param name="movie"
value="http://en.sevenload.com/pl/$video_id/$widthx$height/swf"; /></object>';
-
- protected function getRatio() {
- return 500 / 408;
- }
-
- public static function getDomains() {
- return array( 'sevenload.com' );
- }
-}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/343810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie529b410906ee49f5a75d86d22f18d8bbd222a9e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
