http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72179
Revision: 72179
Author: dale
Date: 2010-09-01 23:47:03 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
* added domain restriction support for assets
* restrict wikimedia usage to upload.wikimedia.org
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
branches/MwEmbedStandAlone/modules/SmilPlayer/loader.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified: branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
2010-09-01 23:21:24 UTC (rev 72178)
+++ branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
2010-09-01 23:47:03 UTC (rev 72179)
@@ -15,7 +15,7 @@
'mwe-sequencer-visual-editor'=> "Visual sequence editor",
'mwe-sequencer-text-editor-warn'=> 'Text XML editor ( not recommended )
',
- 'mwe-sequencer-restore-text-edit' => '[$1 Restore text editor] ( note
this <i>highly</i> recommended that you use the visual editor )',
+ 'mwe-sequencer-restore-text-edit' => '[$1 Restore text editor] ( It\'s
<i>highly</i> recommended that you use the visual editor',
'mwe-sequencer-loading-timeline' => 'Loading timeline ...',
'mwe-sequencer-loading-player' => 'Loading player ...',
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
2010-09-01 23:21:24 UTC (rev 72178)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
2010-09-01 23:47:03 UTC (rev 72179)
@@ -38,12 +38,6 @@
"Sequencer.TimelineTrackHeight" : 100,
// Default timeline audio or collapsed timeline height
- "Sequencer.TimelineColapsedTrackSize" : 35,
-
- // Asset domain restriction array of domains or keyword 'none'
- // Before any asset is displayed its domain is checked against this
array of wildcard domains
- // Additionally best effort is made to check any text/html asset
references
- // for example [ '*.wikimedia.org', 'en.wikipeida.org']
- "Sequencer.DomainRestriction" : 'none'
+ "Sequencer.TimelineColapsedTrackSize" : 35
})
\ No newline at end of file
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-01 23:21:24 UTC (rev 72178)
+++
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-01 23:47:03 UTC (rev 72179)
@@ -89,11 +89,11 @@
// pause event should fire
mw.remoteSequencerAddEditOverlay( embedPlayerId );
- // show the credits screen after 3 seconds
+ // show the credits screen after 3 seconds 1/2 second
to fade in
setTimeout(function(){
$j( embedPlayer ).siblings(
'.kalturaEditOverlay' ).fadeOut( 'fast' );
embedPlayer.$interface.find('.k-menu').fadeIn('fast');
- }, 3000)
+ }, 3500)
// On end runs before interface bindings (give the dom
10ms to build out the menu )
setTimeout(function(){
@@ -519,7 +519,7 @@
'titleKey' : wgPageName,
'pagePathUrl' : wgServer + wgArticlePath,
'userName' : wgUserName
- },
+ },
// Set the add media wizard to only include commons:
addMedia : {
'enabled_providers':[ 'wiki_commons' ],
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/loader.js 2010-09-01
23:21:24 UTC (rev 72178)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/loader.js 2010-09-01
23:47:03 UTC (rev 72179)
@@ -6,7 +6,14 @@
mw.setDefaultConfig( {
// The framerate for the smil player
- 'SmilPlayer.framerate': 30
+ 'SmilPlayer.framerate': 30,
+
+ // Array of Asset approved domains or keyword '*' for no
restriction
+ // Before any asset is displayed its domain is checked against
this array of wildcard domains
+ // Additionally best effort is made to check any text/html
asset references
+ // for example [ '*.wikimedia.org', 'en.wikipeida.org']
+ 'SmilPlayer.AssetDomainWhiteList' : '*'
+
} );
mw.addResourcePaths( {
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js 2010-09-01
23:21:24 UTC (rev 72178)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js 2010-09-01
23:47:03 UTC (rev 72179)
@@ -367,7 +367,23 @@
getAssetUrl : function( assetPath ) {
// Context url is the smil document url:
var contextUrl = mw.absoluteUrl(this.smilContextUrl);
- return mw.absoluteUrl(assetPath, contextUrl);
+ var absoluteUrl = mw.absoluteUrl(assetPath, contextUrl);
+ // Restrict any display url
+ if( mw.getConfig( 'SmilPlayer.AssetDomainWhiteList' ) != '*' ){
+ var approvedDomainList = mw.getConfig(
'SmilPlayer.AssetDomainWhiteList' );
+ var approved = false;
+ for( var i =0; i < approvedDomainList.length; i++){
+ if( mw.parseUri( absoluteUrl ).host ==
approvedDomainList[i] ){
+ approved = true;
+ }
+ }
+ if( ! approved ){
+ mw.log("Error: getAssetUrl: Asset url " +
absoluteUrl + ' is not smil player asset domains:' + approvedDomainList);
+ return mw.getConfig('imagesPath') +
'vid_default_thumb.jpg';
+ }
+ }
+
+ return absoluteUrl;
},
/**
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-01 23:21:24 UTC
(rev 72178)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-01 23:47:03 UTC
(rev 72179)
@@ -67,6 +67,24 @@
}
}
+
+
+
+
+/*******************************
+* Wikimedia specific config
+********************************/
+mw.setConfig( 'Sequencer.KalturaPlayerEditOverlay', true );
+mw.setConfig( 'SwarmTransport.Enable', true );
+mw.setConfig( 'SmilPlayer.AssetDomainWhiteList', ['upload.wikimedia.org'] );
+
+
+
+
+
+
+
+
// Use wikibits onLoad hook: ( since we don't have js2 / mw object loaded )
addOnloadHook( function() {
doPageSpecificRewrite();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
