Skip to content

Commit f31b60d

Browse files
committed
Clean up classes/VideoService.php
1 parent 85c5219 commit f31b60d

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

classes/VideoService.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,16 @@ class VideoService {
6565
'#^([\d\w\-\+]+)$#is'
6666
]
6767
],
68-
'disclose' => [
69-
'embed' => '<iframe title="%4$s" src="//www.disclose.tv/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true"></iframe>',
68+
'bing' => [
69+
'embed' => '<iframe title="%4$s" src="//hub.video.msn.com/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" scrolling="no" noscroll allowfullscreen="true"></iframe>',
7070
'default_width' => 640,
71-
'default_ratio' => 1.77777777777778, // (640 / 360)
71+
'default_ratio' => 1.77777777777778, // (16 / 9)
7272
'https_enabled' => true,
7373
'url_regex' => [
74-
'#disclose.tv/embed/([\d]+)/([\w-]+)#is',
75-
'#disclose.tv/action/viewvideo/([\d]+)/([\w-]+)/#is'
74+
'#bing.com/videos/watch/video/[\w\d\-]+?/([a-zA-Z0-9]+)(?:/\S+?)?#is'
7675
],
7776
'id_regex' => [
78-
'#^([\d]+)$#is'
77+
'#^([a-zA-Z0-9]+)$#is'
7978
]
8079
],
8180
'blip' => [
@@ -87,18 +86,6 @@ class VideoService {
8786
],
8887
'oembed' => 'http://blip.tv/oembed/?url=%1$s&width=%2$d&maxwidth=%2$d'
8988
],
90-
'bing' => [
91-
'embed' => '<iframe title="%4$s" src="//hub.video.msn.com/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" scrolling="no" noscroll allowfullscreen="true"></iframe>',
92-
'default_width' => 640,
93-
'default_ratio' => 1.77777777777778, // (16 / 9)
94-
'https_enabled' => true,
95-
'url_regex' => [
96-
'#bing.com/videos/watch/video/[\w\d\-]+?/([a-zA-Z0-9]+)(?:/\S+?)?#is'
97-
],
98-
'id_regex' => [
99-
'#^([a-zA-Z0-9]+)$#is'
100-
]
101-
],
10289
'collegehumor' => [
10390
'embed' => '<iframe title="%4$s" src="//www.collegehumor.com/e/%1$s" width="%2$d" height="%3$d" frameborder="0" allowFullScreen="true"></iframe>',
10491
'default_width' => 640,
@@ -123,6 +110,19 @@ class VideoService {
123110
'#^([a-zA-Z0-9]+)(?:_\S+?)?#is'
124111
]
125112
],
113+
'disclose' => [
114+
'embed' => '<iframe title="%4$s" src="//www.disclose.tv/embed/%1$s" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true"></iframe>',
115+
'default_width' => 640,
116+
'default_ratio' => 1.77777777777778, // (640 / 360)
117+
'https_enabled' => true,
118+
'url_regex' => [
119+
'#disclose.tv/embed/([\d]+)/([\w-]+)#is',
120+
'#disclose.tv/action/viewvideo/([\d]+)/([\w-]+)/#is'
121+
],
122+
'id_regex' => [
123+
'#^([\d]+)$#is'
124+
]
125+
],
126126
'divshare' => [
127127
'embed' => '<iframe title="%4$s" src="//www.divshare.com/flash/video2?myId=%1$s" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true"></iframe>',
128128
'default_width' => 640,
@@ -518,8 +518,8 @@ class VideoService {
518518
'archive.org' => 'archiveorg',
519519
'embed.bambuser.com' => ['bambuser', 'bambuser_channel'],
520520
'beam.pro' => 'beam',
521-
'blip.tv' => 'blip',
522521
'bing.com' => 'bing',
522+
'blip.tv' => 'blip',
523523
'collegehumor.com' => 'collegehumor',
524524
'dailymotion.com' => 'dailymotion',
525525
'divshare.com' => 'divshare',
@@ -528,7 +528,7 @@ class VideoService {
528528
'gfycat.com' => 'gfycat',
529529
'content.jwplatform.com' => 'jwplayer',
530530
'kickstarter.com' => 'kickstarter',
531-
'media.ccc.de' => 'mideacccde',
531+
'media.ccc.de' => 'mediacccde',
532532
'metacafe.com' => 'metacafe',
533533
'microsoftstream.com' => 'microsoftstream',
534534
'mixer.com' => 'mixer',
@@ -540,7 +540,7 @@ class VideoService {
540540
'teachertube.com' => 'teachertube',
541541
'ted.com' => 'ted',
542542
'tubitv.com' => 'tubitv',
543-
'tudou.com' => 'todou',
543+
'tudou.com' => 'tudou',
544544
'tvpot.daum.net' => 'tvpot',
545545
'twitch.tv' => ['twitch', 'twitchclip', 'twitchvod'],
546546
'89.160.51.62' => 'videomaten',

0 commit comments

Comments
 (0)