[MediaWiki-commits] [Gerrit] Add warning about PDF files on the file page. - change (mediawiki...PdfHandler)

2015-03-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add warning about PDF files on the file page.
..


Add warning about PDF files on the file page.

Depends on I3c4b7af7284b5e16e458dd72de789e74db489895 in core.

Bug: T89765
Change-Id: I674bf7f6c1b21ffc9870aa84382479af5f966561
---
M PdfHandler.php
M PdfHandler_body.php
M i18n/en.json
3 files changed, 35 insertions(+), 1 deletion(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PdfHandler.php b/PdfHandler.php
index 63bb0b3..d1aa8a1 100644
--- a/PdfHandler.php
+++ b/PdfHandler.php
@@ -65,3 +65,4 @@
 $wgMediaHandlers['application/pdf'] = 'PdfHandler';
 $wgJobClasses['createPdfThumbnailsJob'] = 'CreatePdfThumbnailsJob';
 $wgHooks['UploadVerifyFile'][] = 'CreatePdfThumbnailsJob::insertJobs';
+$wgHooks['ResourceLoaderRegisterModules'][] = 
'PdfHandler::registerWarningModule';
diff --git a/PdfHandler_body.php b/PdfHandler_body.php
index 2a08a95..ef9cb55 100644
--- a/PdfHandler_body.php
+++ b/PdfHandler_body.php
@@ -22,6 +22,12 @@
  */
 
 class PdfHandler extends ImageHandler {
+   static $messages = array(
+   'main' => 'pdf-file-page-warning',
+   'header' => 'pdf-file-page-warning-header',
+   'info' => 'pdf-file-page-warning-info',
+   'footer' => 'pdf-file-page-warning-footer',
+   );
 
/**
 * @return bool
@@ -383,4 +389,27 @@
return $data['text'][$page - 1];
}
 
+   /**
+* Adds a warning about PDFs being potentially dangerous to the file
+* page. Multiple messages with this base will be used.
+* @param File $file
+* @return array
+*/
+   function getWarningConfig( $file ) {
+   return array(
+   'messages' => self::$messages,
+   'link' => 
'//www.mediawiki.org/wiki/Special:MyLanguage/Help:Security/PDF_files',
+   'module' => 'pdfhandler.messages',
+   );
+   }
+
+   /**
+* Register a module with the warning messages in it.
+* @param &$resourceLoader ResourceLoader
+*/
+   static function registerWarningModule( &$resourceLoader ) {
+   $resourceLoader->register( 'pdfhandler.messages', array(
+   'messages' => array_values( self::$messages ),
+   ) );
+   }
 }
diff --git a/i18n/en.json b/i18n/en.json
index 18bdff8..20ad5db 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,10 +3,14 @@
 "authors": []
 },
 "pdf-desc": "Handler for viewing PDF files in image mode.",
+   "pdf-file-page-warning": "PDF is a complex format that may expose some 
of your private information in some cases. Make sure to configure your PDF 
viewer in a safe way.",
+   "pdf-file-page-warning-header": "Privacy considerations",
+   "pdf-file-page-warning-footer": "This issue is not specific to this 
particular file, but a general issue with the PDF format.",
+   "pdf-file-page-warning-info": "Learn more about this issue.",
 "pdf_no_metadata": "Cannot get metadata from PDF.",
 "pdf_page_error": "Page number not in range.",
 "exif-pdf-producer": "Conversion program",
 "exif-pdf-version": "Version of PDF format",
 "exif-pdf-encrypted": "Encrypted",
 "exif-pdf-pagesize": "Page size"
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/194569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I674bf7f6c1b21ffc9870aa84382479af5f966561
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/PdfHandler
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add warning about PDF files on the file page. - change (mediawiki...PdfHandler)

2015-03-05 Thread MarkTraceur (Code Review) 
MarkTraceur has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/194564

Change subject: Add warning about PDF files on the file page.
..

Add warning about PDF files on the file page.

Depends on a core patch.

Bug: T89765
Change-Id: I49b1eeba61820e84e5d361c7d8d4fd46c9c43cfb
---
M PdfHandler.php
M PdfHandler_body.php
M i18n/en.json
3 files changed, 54 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PdfHandler 
refs/changes/64/194564/1

diff --git a/PdfHandler.php b/PdfHandler.php
index f4e1565..be9eed7 100644
--- a/PdfHandler.php
+++ b/PdfHandler.php
@@ -64,3 +64,4 @@
 $wgMediaHandlers['application/pdf'] = 'PdfHandler';
 $wgJobClasses['createPdfThumbnailsJob'] = 'CreatePdfThumbnailsJob';
 $wgHooks['UploadVerifyFile'][] = 'CreatePdfThumbnailsJob::insertJobs';
+$wgHooks['ResourceLoaderRegisterModules'][] = 
'PdfHandler::registerWarningModule';
diff --git a/PdfHandler_body.php b/PdfHandler_body.php
index 2a08a95..49eaa18 100644
--- a/PdfHandler_body.php
+++ b/PdfHandler_body.php
@@ -383,4 +383,52 @@
return $data['text'][$page - 1];
}
 
+   /**
+* Flags PDFs as potentially dangerous for the end-user.
+* @return bool
+*/
+   function needsWarning() {
+   return true;
+   }
+
+   /**
+* Adds a warning about PDFs being potentially dangerous to the file
+* page. Multiple messages with this base will be used.
+* @return string
+*/
+   function getWarningConfig() {
+   return array(
+   'messages' => array(
+   'main' => 'pdf-file-page-warning',
+   'header' => 'pdf-file-page-warning-header',
+   'info' => 'pdf-file-page-warning-info',
+   'footer' => 'pdf-file-page-warning-footer',
+   ),
+   'link' => 'http://example.com/pdfs-bro.html',
+   'module' => 'pdfhandler.messages',
+   );
+   }
+
+   /**
+* Returns a link for learning more about potential issues with the PDF
+* format, and potential solutions to them.
+*/
+   function getWarningLink() {
+   return 'http://example.com';
+   }
+
+   /**
+* Register a module with the warning messages in it.
+* @param &$resourceLoader ResourceLoader
+*/
+   static function registerWarningModule( &$resourceLoader ) {
+   $resourceLoader->register( 'pdfhandler.messages', array(
+   'messages' => array(
+   'pdf-file-page-warning',
+   'pdf-file-page-warning-header',
+   'pdf-file-page-warning-info',
+   'pdf-file-page-warning-footer',
+   ),
+   ) );
+   }
 }
diff --git a/i18n/en.json b/i18n/en.json
index 18bdff8..20ad5db 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,10 +3,14 @@
 "authors": []
 },
 "pdf-desc": "Handler for viewing PDF files in image mode.",
+   "pdf-file-page-warning": "PDF is a complex format that may expose some 
of your private information in some cases. Make sure to configure your PDF 
viewer in a safe way.",
+   "pdf-file-page-warning-header": "Privacy considerations",
+   "pdf-file-page-warning-footer": "This issue is not specific to this 
particular file, but a general issue with the PDF format.",
+   "pdf-file-page-warning-info": "Learn more about this issue.",
 "pdf_no_metadata": "Cannot get metadata from PDF.",
 "pdf_page_error": "Page number not in range.",
 "exif-pdf-producer": "Conversion program",
 "exif-pdf-version": "Version of PDF format",
 "exif-pdf-encrypted": "Encrypted",
 "exif-pdf-pagesize": "Page size"
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/194564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49b1eeba61820e84e5d361c7d8d4fd46c9c43cfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PdfHandler
Gerrit-Branch: wmf/1.25wmf15
Gerrit-Owner: MarkTraceur 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits