Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with new extension verification

This commit is contained in:
Gabriel Bull 2014-03-12 11:22:41 -04:00
parent d991fdc6d1
commit 5e0fc7a2d8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPWord/Writer/Word2007.php
View File

@ -199,8 +199,6 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
*/ */
private function checkContentTypes($src) private function checkContentTypes($src)
{ {
$supportedImageTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM);
$extension = null; $extension = null;
if (stripos(strrev($src), strrev('.php')) === 0) { if (stripos(strrev($src), strrev('.php')) === 0) {
$extension = 'php'; $extension = 'php';
@ -219,7 +217,7 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
} }
} }
if (in_array($extension, $supportedImageTypes)) { if (isset($extension)) {
$imageData = getimagesize($src); $imageData = getimagesize($src);
$imageType = image_type_to_mime_type($imageData[2]); $imageType = image_type_to_mime_type($imageData[2]);
$imageExtension = str_replace('.', '', image_type_to_extension($imageData[2])); $imageExtension = str_replace('.', '', image_type_to_extension($imageData[2]));

8
Tests/_inc/TestHelperDOCX.php
View File

@ -59,4 +59,12 @@ class TestHelperDOCX
rmdir($dir); rmdir($dir);
} }
/**
* @return string
*/
public static function getFile()
{
return self::$file;
}
} }