alex/PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,159 Commits 2 Branches 0 Tags 29 MiB
09352e3e80
Commit Graph

208 Commits

Author SHA1 Message Date
Progi1984
09352e3e80 PSR2 Fixes 2015-05-17 15:00:02 +02:00
Progi1984
1d842ed218 PSR2 Fixes 2015-05-17 14:16:53 +02:00
Progi1984
6b1764f771 PSR2 Fixes 2015-05-17 12:11:56 +02:00
Progi1984
9140e3da2e PSR2 Fixes 2015-05-17 11:22:28 +02:00
MarkBaker
334747867d Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 
Conflicts:
	Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
 2015-05-17 00:47:17 +01:00
MarkBaker
1663ef141c More psr-2 changes 2015-05-17 00:16:41 +01:00
Progi1984
1bf5ea414b PSR2 Fixes 2015-05-16 13:04:38 +02:00
Progi1984
2881bca443 PSR-2 : Fixes 2015-05-13 12:27:01 +02:00
Progi1984
61b5fa0beb Validation PSR-2 : Tabs to spaces 2015-05-12 11:22:06 +02:00
MarkBaker
c70e289dac More efforts to get codebase to conform with PSR-2 coding standards 2015-05-11 22:38:52 +01:00
MarkBaker
fca778225c Ajust copyright to 2015 2015-05-02 23:50:37 +01:00
MarkBaker
75bb9d7eda Fix regexp for XEE validation 2015-04-29 22:41:54 +01:00
MarkBaker
bc7028ae4e Modified XEE security scan to handle UTF-16 charset, and added unit tests for the security scan 2015-04-29 22:23:14 +01:00
MarkBaker
0ab614fd95 Security: XML filescan in XML-based Readers to prevent XML Entity Expansion (XEE) 
(see http://projects.webappsec.org/w/page/13247002/XML%20Entity%20Expansion for an explanation of XEE injection) attacks
 2015-04-29 00:43:04 +01:00
Mark Baker
929add1e36 Merge pull request #512 from andrey-yantsen/patch-1 
Check for variable before using it
 2015-03-19 09:43:11 +00:00
MarkBaker
518fbc1d36 GH-514 HTML Reader incorrectly converts some UTF-8 string cells to FALSE after regexp space trim 2015-02-14 23:52:57 +00:00
Andrey Yantsen
26e75b1f7a Check for variable before using it 
In some cases $xfrm is empty SimpleXmlElement, so we should check for it before using $xfrm->ext->attributes()
 2015-02-10 09:44:13 +03:00
MarkBaker
c7da475ef9 Inline styles for HTML not yet implemented 2015-01-12 23:18:46 +00:00
MarkBaker
180ad168cb Additional minor tweaks to HTML reader for merged cells 2014-12-07 23:45:15 +00:00
MarkBaker
d7ea3e2ab0 Feature: (cifren/MBaker) Work Item GH-205 - Handling merge cells in HTML Reader 2014-12-07 14:45:55 +00:00
MarkBaker
9940b262c4 Remove spurious worksheet created when instantiating the PHPExcel object, and only create sheets defined in the Excel2003XML file 2014-11-26 22:40:49 +00:00
MarkBaker
e7cfdacf95 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-11-26 22:25:36 +00:00
MarkBaker
903f737a39 Bugfix: (bobwitlox) Work Item GH-467 - Bug in Excel2003XML reader, parsing merged cells 2014-11-26 22:24:53 +00:00
Mohd Farhan Firdaus Jamil
793fc2a08f Check for is_object 
Without this , it give php-warning-invalid-argument-supplied-for-foreach error.
 2014-11-16 23:00:45 +08:00
MarkBaker
fdefb8e392 Discard Autofilters in Excel2007 Reader when filter range isn't a valid range 2014-11-11 23:18:13 +00:00
MarkBaker
f77d3d1668 Bugfix: Work Item GH-384 - DOM loadHTMLFile() failing with options flags when using PHP < 5.4.0 
Additional check that libxml is running at an appropriate version by testing if libxml flag value constants are defined
 2014-09-05 10:20:12 +01:00
MarkBaker
99f4ebab0c Remove unused lineEnding methods from CSV Reader 2014-08-27 22:07:24 +01:00
MarkBaker
a7cf8c63e2 Bugfix: Work Item GH-384 - DOM loadHTMLFile() failing with options flags when using PHP < 5.4.0 2014-08-23 13:54:21 +01:00
MarkBaker
d777d0283d Support for cell readorder Context/LTR/RTL 2014-08-17 18:15:44 +01:00
MarkBaker
780cb74782 URL Hyperlink data may not use the full length of the data field, but could instead be terminated by a null byte character 2014-08-03 22:02:46 +01:00
MarkBaker
d9fa784e1b Bugfix: Work Item CP18105 - Loading an Excel 2007 spreadsheet throws an "Autofilter must be set on a range of cells" exception 
Fix to jpgraph path for Chart Rendering tests
 2014-07-27 15:18:00 +01:00
MarkBaker
698a56eb92 Bugfix: Work Item GH-350 - Keep/set the value on Reader _loadSheetsOnly as NULL, courtesy of Restless-ET 2014-07-27 12:51:38 +01:00
Mark Baker
23479fdde2 Merge pull request #379 from frost-nzcr4/ft-camelcase 
Change the getter/setter for zeroHeight to camel case
 2014-07-27 12:21:13 +01:00
Mark Baker
2a06bc9675 Merge pull request #405 from ymaerschalck/develop 
XML External Entity (XXE) Processing
 2014-07-27 12:18:58 +01:00
MarkBaker
9065cab60c DOMDocument not domDocument 2014-07-22 23:48:32 +01:00
Yves Maerschalck
0787e56d41 XML External Entity (XXE) Processing 
https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing

change simplexml_load_file to
simplexml_load_string(file_get_contents()) because load_file doesn't
work when
http://php.net/manual/en/function.libxml-disable-entity-loader.php is
true
 2014-07-16 09:28:33 +02:00
Alexander Pervakov
524c093895 Fix reader when comment within text:p element 2014-07-14 17:55:46 +04:00
Martin Evans
a6672451a5 Minor Docblock update: return values on load function for PHPExcel_Reader_IReader and Excel2007 now listed as @return PHPExcel in order to utilize auto complete via IDE. 2014-06-12 09:20:16 +01:00
MarkBaker
4935236f7b Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-06-06 23:57:40 +01:00
MarkBaker
5ab877958f Reduce memory usage after an xls load 2014-06-06 23:56:57 +01:00
Shawn Welch
5569c92449 Invalid Index 
This happened when I tried to load an Excel doc that was exported by Google Docs. I'm guessing there is no author information or something? I dunno but this fixed worked.
 2014-05-30 16:46:44 -04:00
Alexander Pervakov
a6f00db9c6 Change the getter/setter for zeroHeight to camel case 2014-05-30 14:37:11 +04:00
Scott Arciszewski
758f48baac Update Excel2007.php 
Fix output corruption
 2014-02-24 11:34:08 -05:00
Mark Baker
e892215970 Bugfix: Work item GH321, GH158, CP17824 - LibreOffice created XLSX files results in an empty file. 
Bugfix: Work item CP20760 - Formula references to cell on another sheet in ODS files
 2014-02-23 15:35:05 +00:00
Mark Baker
2caeb22122 Bugfix: Work item CP20760 - Formula references to cell on another sheet in ODS files 2014-02-22 12:30:36 +00:00
Mark Baker
8f265a9342 Added XXE protection to HTML Reader 2014-02-21 11:08:57 +00:00
Maarten Balliauw
1dad681142 Disabled libxml external entity loading by default. 
If you want to allow loading external entity references in XML, call PHPExcel_Settings::setLibXmlLoaderOptions(0).
 2014-02-21 09:23:55 +01:00
Mark Baker
992aee683a Update to copyright year in file headers 2013-12-31 18:36:33 +00:00
Mark Baker
8cd6f56fdd Bugfix: (Jazzo) Work Item GH-248 - Excel2007 does not correctly mark rows as hidden 2013-12-30 22:19:05 +00:00
Mark Baker
7a90c5b888 Mods to handle encrypted files on both 32-bit and 64-bit versions of PHP - currently only tested on 32-bit Windows 2013-12-03 13:51:40 +00:00