http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70230
Revision: 70230
Author: platonides
Date: 2010-07-31 19:28:18 +0000 (Sat, 31 Jul 2010)
Log Message:
-----------
Use <?php instead of <? tags
Remove ?> at end of file
Use dirname( __FILE__ ) for the requires.
htmlspecialchars()
Modified Paths:
--------------
trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
trunk/extensions/MetavidWiki/includes/MV_Settings.php
trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php
trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/MvFlv.php
trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/mvFlvServer.php
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Bitstream.php
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Flac.php
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Media.php
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Speex.php
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Theora.php
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Vorbis.php
Modified: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php
2010-07-31 19:25:54 UTC (rev 70229)
+++ trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -1,4 +1,4 @@
-<?
+<?php
/**
* Global functions and constants for Metavid MediaWiki.
*
Modified:
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
===================================================================
---
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -1,4 +1,4 @@
-<?
+<?php
/*
* Created on Jun 28, 2007
*
Modified: trunk/extensions/MetavidWiki/includes/MV_Settings.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/MV_Settings.php 2010-07-31
19:25:54 UTC (rev 70229)
+++ trunk/extensions/MetavidWiki/includes/MV_Settings.php 2010-07-31
19:28:18 UTC (rev 70230)
@@ -1,4 +1,4 @@
-<?
+<?php
if ( !defined( 'MEDIAWIKI' ) ) die( 1 );
# ##
Modified: trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php
===================================================================
--- trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php
2010-07-31 19:25:54 UTC (rev 70229)
+++ trunk/extensions/MetavidWiki/maintenance/ogg_thumb_insert.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -10,7 +10,7 @@
* @url http://metavid.org
*/
- $cur_path = $IP = dirname( __FILE__ );
+$cur_path = $IP = dirname( __FILE__ );
// include commandLine.inc from the mediaWiki maintance dir:
require_once ( '../../../maintenance/commandLine.inc' );
require_once ( 'metavid2mvWiki.inc.php' );
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php
2010-07-31 19:25:54 UTC (rev 70229)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -104,4 +104,4 @@
</html>
<?php
}
-?>
\ No newline at end of file
+
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_playlists.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -17,7 +17,7 @@
<h3> Sample Playlists</h3>
The <b>default attributes:</b>:
<span id="default_attr">
-<?
+<?php
$sample_embed = array();
// playlist tags:
@@ -84,4 +84,4 @@
</html>
<?php
}
-?>
+
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_timed_text.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -1,4 +1,4 @@
-<?
+<?php
do_sample_page();
function do_sample_page(){
@@ -17,10 +17,10 @@
$examples = Array();
//set up tags for easy display:
$roe_url =
'http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=House_proceeding_07-18-06_00&t=1:23:16/1:23:44&feed_format=roe';
-$examples[] = array( 'tag' => '<video roe="'.$roe_url.'" ></video>',
+$examples[] = array( 'tag' => '<video roe="' . htmlspecialchars( $roe_url )
. '" ></video>',
'desc' => 'Metavid based ROE file
using CMML<br /> <pre>' .
- htmlspecialchars('<video
roe="'.$roe_url.'" ></video>'). '</pre>'.
- '<iframe width="600"
height="250" src="'.$roe_url.'" ></iframe>'
+ htmlspecialchars('<video roe="'
. htmlspecialchars( $roe_url ) . '" ></video>' ) . '</pre>'.
+ '<iframe width="600"
height="250" src="' . htmlspecialchars( $roe_url ) . '" ></iframe>'
);
$srt_tag = ''.
'<video src="sample_fish.ogg" poster="sample_fish.jpg" duration="26">
@@ -52,6 +52,6 @@
</table>
</body>
</html>
-<?
+<?php
}
-?>
\ No newline at end of file
+
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/MvFlv.php
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/MvFlv.php
2010-07-31 19:25:54 UTC (rev 70229)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/MvFlv.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -299,4 +299,4 @@
}
}
}
-?>
\ No newline at end of file
+
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/mvFlvServer.php
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/mvFlvServer.php
2010-07-31 19:25:54 UTC (rev 70229)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/mvFlvServer.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -113,4 +113,4 @@
}
return ($hours*3600) + ($min*60) + $sec;
}
-?>
+
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Bitstream.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Bitstream.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Bitstream.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -138,4 +138,3 @@
}
-?>
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Flac.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Flac.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Flac.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -21,7 +21,7 @@
// | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA |
//
+----------------------------------------------------------------------------+
-require_once('File/Ogg/Media.php');
+require_once dirname( __FILE__ ) . '/Media.php';
/**
* @author David Grant <da...@grant.org.uk>, Tim Starling
<tstarl...@wikimedia.org>
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Media.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Media.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Media.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -21,7 +21,7 @@
// | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA |
//
+----------------------------------------------------------------------------+
-require_once('File/Ogg/Bitstream.php');
+require_once dirname( __FILE__ ) . '/Bitstream.php';
/**
* Parent class for media bitstreams
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Speex.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Speex.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Speex.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -21,7 +21,7 @@
// | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA |
//
+----------------------------------------------------------------------------+
-require_once('File/Ogg/Media.php');
+require_once dirname( __FILE__ ) . '/Media.php';
/**
* @author David Grant <da...@grant.org.uk>, Tim Starling
<tstarl...@wikimedia.org>
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Theora.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Theora.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Theora.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -21,7 +21,7 @@
// | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA |
//
+----------------------------------------------------------------------------+
-require_once('File/Ogg/Bitstream.php');
+require_once dirname(__FILE__) . '/Bitstream.php';
define( 'OGG_THEORA_IDENTIFICATION_HEADER', 0x80 );
define( 'OGG_THEORA_COMMENTS_HEADER', 0x81 );
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Vorbis.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Vorbis.php
2010-07-31 19:25:54 UTC (rev 70229)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/oggServer/PEAR/File_Ogg/File/Ogg/Vorbis.php
2010-07-31 19:28:18 UTC (rev 70230)
@@ -21,7 +21,7 @@
// | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA |
//
+----------------------------------------------------------------------------+
-require_once('File/Ogg/Bitstream.php');
+require_once dirname( __FILE__ ) . '/Bitstream.php';
/**
* Check number for the first header in a Vorbis stream.
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
