Skip to content

Commit

Permalink
Updated NHL
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshyPHP committed Sep 30, 2017
1 parent 3533201 commit 2cf4aa2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 17 deletions.
4 changes: 2 additions & 2 deletions build/addon-s9e.xml
@@ -1,4 +1,4 @@
<addon addon_id="s9e" title="s9e Media Pack" url="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" version_id="201709041" version_string="20170904b" install_callback_class="s9e_MediaBBCodes" install_callback_method="install" uninstall_callback_class="s9e_MediaBBCodes" uninstall_callback_method="uninstall">
<addon addon_id="s9e" title="s9e Media Pack" url="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" version_id="201709300" version_string="20170930" install_callback_class="s9e_MediaBBCodes" install_callback_method="install" uninstall_callback_class="s9e_MediaBBCodes" uninstall_callback_method="uninstall">
<bb_code_media_sites/>
<phrases>
<phrase title="option_group_s9e" version_id="1" version_string="1">s9e Media Pack</phrase>
Expand Down Expand Up @@ -73,7 +73,7 @@ $0</replace>
</modification>
<modification action="str_replace" description="Adds a link back to s9e Media Pack" enabled="1" execution_order="10" modification_key="s9e_footer" template="footer">
<find>{xen:phrase extra_copyright}</find>
<replace> | &lt;a class="concealed" href="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" title="Media BBCodes provided by s9e Media Pack v20170904b"&gt;Media embeds by s9e&lt;/a&gt;$0</replace>
<replace> | &lt;a class="concealed" href="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" title="Media BBCodes provided by s9e Media Pack v20170930"&gt;Media embeds by s9e&lt;/a&gt;$0</replace>
</modification>
<modification action="preg_replace" description="Defers the loading of embedded content" enabled="0" execution_order="10" modification_key="s9e_lazy_loading" template="ad_thread_view_below_messages">
<find>(^)</find>
Expand Down
6 changes: 3 additions & 3 deletions build/upload/library/s9e/MediaBBCodes.php
Expand Up @@ -144,7 +144,7 @@ class s9e_MediaBBCodes
'natgeovideo'=>array('National Geographic Video','http://video.nationalgeographic.com/',array('documentaries'=>1),'@(?P<id>)video\\.nationalgeographic\\.com/(?:tv|video)/\\w@',array(),true,array(array('extract'=>array('@guid="(?P<id>[-\\w]+)"@'),'match'=>array('@video\\.nationalgeographic\\.com/(?:tv|video)/\\w@'))),'<span data-s9e-mediaembed="natgeovideo" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" src="//player.d.nationalgeographic.com/players/ngsvideo/share/?guid={$id}" style="border:0;height:100%;left:0;position:absolute;width:100%"></iframe></span></span>'),
'nbcnews'=>array('NBC News','http://www.nbcnews.com/video/',array('news'=>1),'!nbcnews\\.com/(?:widget/video-embed/|video/[-\\w]+?-)(?P<id>\\d+)!',array('!nbcnews\\.com/(?:widget/video-embed/|video/[-\\w]+?-)(?P<id>\\d+)!'),7=>'<span data-s9e-mediaembed="nbcnews" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" src="//www.nbcnews.com/widget/video-embed/{$id}" style="border:0;height:100%;left:0;position:absolute;width:100%"></iframe></span></span>'),
'nbcsports'=>array('NBC Sports','http://www.nbcsports.com/video',array('sports'=>1),'!(?P<id>)nbcsports\\.com/video/.!',array(),true,array(array('extract'=>array('!select/media/(?P<id>\\w+)!'),'match'=>array('!nbcsports\\.com/video/.!'))),'<span data-s9e-mediaembed="nbcsports" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" src="//vplayer.nbcsports.com/p/BxmELC/nbcsports_embed/select/media/{$id}?parentUrl=" style="border:0;height:100%;left:0;position:absolute;width:100%"></iframe></span></span>'),
'nhl'=>array('NHL Videos and Highlights','https://www.nhl.com/video',array('sports'=>1),"#nhl\\.com/videocenter/.*?\\Wid=(?P<id>[-\\w]+)#\n#(?P<id>)nhl\\.com/(?:\\w+/)?video(?:/(?![ct]-)[-\\w]+)?(?:/t-(?P<t>\\d+))?(?:/c-(?P<c>\\d+))?#",array('#nhl\\.com/videocenter/.*?\\Wid=(?P<id>[-\\w]+)#','#nhl\\.com/(?:\\w+/)?video(?:/(?![ct]-)[-\\w]+)?(?:/t-(?P<t>\\d+))?(?:/c-(?P<c>\\d+))?#'),true),
'nhl'=>array('NHL Videos and Highlights','https://www.nhl.com/video',array('sports'=>1),'#(?P<id>)nhl\\.com/(?:\\w+/)?video(?:/(?![ct]-)[-\\w]+)?(?:/t-(?P<t>\\d+))?(?:/c-(?P<c>\\d+))?#',array('#nhl\\.com/(?:\\w+/)?video(?:/(?![ct]-)[-\\w]+)?(?:/t-(?P<t>\\d+))?(?:/c-(?P<c>\\d+))?#'),true),
'npr'=>array('NPR','http://www.npr.org/',array('podcasts'=>1),"!(?P<id>)npr\\.org/[/\\w]+/\\d+!\n!(?P<id>)n\\.pr/\\w!",array(),true,array(array('extract'=>array('!player/embed/(?P<i>\\d+)/(?P<m>\\d+)!'),'match'=>array('!npr\\.org/[/\\w]+/\\d+!','!n\\.pr/\\w!')))),
'nytimes'=>array('The New York Times Video','http://www.nytimes.com/video/',array('movies'=>1,'news'=>1),"!nytimes\\.com/video/[a-z]+/(?:[a-z]+/)?(?P<id>\\d+)!\n!nytimes\\.com/video/\\d+/\\d+/\\d+/[a-z]+/(?P<id>\\d+)!\n!(?P<id>)nytimes\\.com/movie(?:s/movie)?/(?P<playlist>\\d+)/[-\\w]+/trailers!",array('!nytimes\\.com/video/[a-z]+/(?:[a-z]+/)?(?P<id>\\d+)!','!nytimes\\.com/video/\\d+/\\d+/\\d+/[a-z]+/(?P<id>\\d+)!'),true,array(array('extract'=>array('!/video/movies/(?P<id>\\d+)!'),'match'=>array('!nytimes\\.com/movie(?:s/movie)?/(?P<playlist>\\d+)/[-\\w]+/trailers!'),'url'=>'http://www.nytimes.com/svc/video/api/playlist/{@playlist}?externalId=true')),'<span data-s9e-mediaembed="nytimes" style="display:inline-block;width:100%;max-width:585px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:68.376068%"><iframe allowfullscreen="" scrolling="no" src="//graphics8.nytimes.com/video/players/offsite/index.html?videoId={$id}" style="border:0;height:100%;left:0;position:absolute;width:100%"></iframe></span></span>'),
'oddshot'=>array('Oddshot','http://oddshot.tv/',array('gaming'=>1),'!(?=.*?[./]oddshot\\.tv[:/]).*?oddshot.tv/s/(?P<id>[-\\w]+)!',array('!(?=.*?[./]oddshot\\.tv[:/]).*?oddshot.tv/s/(?P<id>[-\\w]+)!'),7=>'<span data-s9e-mediaembed="oddshot" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" src="https://oddshot.tv/s/{$id}/embed" style="border:0;height:100%;left:0;position:absolute;width:100%"></iframe></span></span>'),
Expand Down Expand Up @@ -1282,9 +1282,9 @@ public static function renderMedium($vars)

public static function renderNhl($vars)
{
$vars += array('c' => null, 'id' => null, 't' => null);
$vars += array('c' => null, 't' => null);

$html='<span data-s9e-mediaembed="nhl" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" style="border:0;height:100%;left:0;position:absolute;width:100%" src="';if(isset($vars['c'])||isset($vars['t'])){$html.='//www.nhl.com/video/embed';if(isset($vars['t']))$html.='/t-'.htmlspecialchars($vars['t'],2);if(isset($vars['c']))$html.='/c-'.htmlspecialchars($vars['c'],2);$html.='?autostart=false';}else$html.='//video.nhl.com/videocenter/embed?playlist='.htmlspecialchars($vars['id'],2);$html.='"></iframe></span></span>';
$html='<span data-s9e-mediaembed="nhl" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" style="border:0;height:100%;left:0;position:absolute;width:100%" src="https://www.nhl.com/video/embed';if(isset($vars['t']))$html.='/t-'.htmlspecialchars($vars['t'],2);if(isset($vars['c']))$html.='/c-'.htmlspecialchars($vars['c'],2);$html.='?autostart=false"></iframe></span></span>';

return $html;
}
Expand Down
13 changes: 1 addition & 12 deletions tests/Test.php
Expand Up @@ -782,11 +782,6 @@ public function getMatchCallbackTests()
'http://video.nationalgeographic.com/video/news/140916-bison-smithsonian-zoo-vin?source=featuredvideo',
'00000148-7a7d-d0bf-a3ff-7f7d480e0001'
),
array(
'nhl',
'http://video.nhl.com/videocenter/console?id=783647',
'783647'
),
array(
'nhl',
'https://www.nhl.com/video/recap-min-2-ott-1-fot/t-277753022/c-46330703',
Expand Down Expand Up @@ -1289,17 +1284,11 @@ function ()
'',
'<span data-s9e-mediaembed="livestream" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" style="border:0;height:100%;left:0;position:absolute;width:100%" src="//cdn.livestream.com/embed/maps_cp?layout=4&amp;autoplay=false&amp;clip=pla_d1501f90-438c-401d-98ae-e96ab34a09ae"></iframe></span></span>'
),
array(
'nhl',
'783647',
'',
'<span data-s9e-mediaembed="nhl" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" style="border:0;height:100%;left:0;position:absolute;width:100%" src="//video.nhl.com/videocenter/embed?playlist=783647"></iframe></span></span>'
),
array(
'nhl',
'c=46330703;t=277753022',
'',
'<span data-s9e-mediaembed="nhl" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" style="border:0;height:100%;left:0;position:absolute;width:100%" src="//www.nhl.com/video/embed/t-277753022/c-46330703?autostart=false"></iframe></span></span>'
'<span data-s9e-mediaembed="nhl" style="display:inline-block;width:100%;max-width:640px"><span style="display:block;overflow:hidden;position:relative;padding-bottom:56.25%"><iframe allowfullscreen="" scrolling="no" style="border:0;height:100%;left:0;position:absolute;width:100%" src="https://www.nhl.com/video/embed/t-277753022/c-46330703?autostart=false"></iframe></span></span>'
),
array(
'pinterest',
Expand Down

0 comments on commit 2cf4aa2

Please sign in to comment.