r95716 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95715‎ | r95716 | r95717 >
Date:22:22, 29 August 2011
Author:preilly
Status:ok
Tags:
Comment:
make sure to convert special characters to HTML entities in user-supplied text
Modified paths:
  • /trunk/extensions/MobileFrontend/MobileFrontend.php (modified) (history)
  • /trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php (modified) (history)
  • /trunk/extensions/MobileFrontend/views/layout/_search_webkit.html.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MobileFrontend/MobileFrontend.php
@@ -65,7 +65,7 @@
6666 );
6767
6868 class ExtMobileFrontend {
69 - const VERSION = '0.5.46';
 69+ const VERSION = '0.5.47';
7070
7171 /**
7272 * @var DOMDocument
@@ -568,7 +568,7 @@
569569 $segments = explode( $this->WMLSectionSeperator, $s );
570570 $card = '';
571571 $idx = 0;
572 - $requestedSegment = self::$requestedSegment;
 572+ $requestedSegment = htmlspecialchars( self::$requestedSegment );
573573 $title = htmlspecialchars( self::$title->getText() );
574574
575575 $card .= "<card id='{$idx}' title='{$title}'><p>{$segments[$requestedSegment]}</p>";
@@ -787,13 +787,13 @@
788788 header( 'Content-Type: application/json' );
789789 header( 'Content-Disposition: attachment; filename="data.js";' );
790790 $json_data = array();
791 - $json_data['title'] = self::$title->getText();
 791+ $json_data['title'] = htmlspecialchars ( self::$title->getText() );
792792 $json_data['html'] = $contentHtml;
793793
794794 $json = FormatJson::encode( $json_data );
795795
796796 if ( !empty( self::$callback ) ) {
797 - $json = urlencode( self::$callback ) . '(' . $json . ')';
 797+ $json = urlencode( htmlspecialchars( self::$callback ) ) . '(' . $json . ')';
798798 }
799799
800800 wfProfileOut( __METHOD__ );
Index: trunk/extensions/MobileFrontend/views/layout/_search_webkit.html.php
@@ -1,7 +1,7 @@
22 <?php
33 global $wgExtensionAssetsPath, $wgMobileFrontendLogo;
44
5 -$searchField = self::$searchField;
 5+$searchField = htmlspecialchars( self::$searchField );
66 $mainPageUrl = self::$mainPageUrl;
77 $randomPageUrl = self::$randomPageUrl;
88 $homeButton = self::$messages['mobile-frontend-home-button'];
Index: trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
@@ -6,15 +6,15 @@
77 $disableImages = self::$messages['mobile-frontend-disable-images'];
88 $enableImages = self::$messages['mobile-frontend-enable-images'];
99
10 -$disableMobileSiteURL = self::$disableMobileSiteURL;
11 -$viewNormalSiteURL = self::$viewNormalSiteURL;
 10+$disableMobileSiteURL = htmlspecialchars( self::$disableMobileSiteURL );
 11+$viewNormalSiteURL = htmlspecialchars( self::$viewNormalSiteURL );
1212
1313 if ( self::$disableImages == 0 ) {
1414 $imagesToggle = $disableImages;
15 - $imagesURL = self::$disableImagesURL;
 15+ $imagesURL = htmlspecialchars( self::$disableImagesURL );
1616 } else {
1717 $imagesToggle = $enableImages;
18 - $imagesURL = self::$enableImagesURL;
 18+ $imagesURL = htmlspecialchars( self::$enableImagesURL );
1919 }
2020
2121 $footerHtml = <<<EOD

Status & tagging log