RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-26 07:16:03 +03:00
Code Issues Projects Releases Wiki Activity
1,167 Commits 14 Branches 14 Tags 22 MiB
0c177b5ea2
Commit Graph

851 Commits

Author SHA1 Message Date
MarkBaker
fca778225c Ajust copyright to 2015 2015-05-02 23:50:37 +01:00
MarkBaker
c9cb4d4286 Abstract function PHPExcel_Worksheet_CellIterator::adjustForExistingOnlyRange() cannot contain body 2015-05-01 08:06:07 +01:00
MarkBaker
7ccb90064b Rework of Iterators for existing cells only 2015-04-30 19:07:49 +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
MarkBaker
d2b0ef2ad9 Pass arguments from Row to RowCellIterator and from Column to ColumnCellIterator 2015-04-26 17:37:48 +01:00
MarkBaker
ceddc13f82 Implement a ColumnIterator, refactoring of RowIterator 
Currently this disables the setIterateOnlyExistingCells option

TODO Re-Implement setIterateOnlyExistingCells logic with the new structure
TODO Rationalise and abstract common methods in the iterator classes
 2015-04-26 13:00:58 +01:00
MarkBaker
f96d9cedba Added RowIterator support for end row, and throws exceptions for invalid arguments 2015-04-25 21:49:30 +01:00
MarkBaker
a287bd44df Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2015-04-16 01:10:04 +01:00
MarkBaker
61f5baac4a GH-543 - Datetime at DefaultValueBinder 
Personally, I don't call it a bug if people pass invalid arguments and it complains with an exception; but I've made some basic changes to support DateTime objects and objects with a __toString() method... Any other objects will throw a catchable fatal error, and it's up to user code to implement any exception handler to convert it to an exception and handle it
 2015-04-16 01:09:29 +01:00
Jared Hall
2736af7994 Update CacheBase.php to prevent fatal error 
When deleteCacheData() is called it will throw a fatal error if the _currentObject is null.
 2015-04-09 14:46:42 -06:00
MarkBaker
caad6b1956 Minor bugfixes for date/time edge cases 2015-03-28 17:45:49 +00:00
MarkBaker
c5a117c82a Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2015-03-26 23:26:04 +00:00
MarkBaker
d44aebc0a4 Improve default value binder handling of string/numeric values 
- Modified regexp to handle scientific notation and apply appropriate tests rather than drop through to string
 - modified handler to detect integers too long for PHP, and treat as string rather than convert to float
 2015-03-26 23:25:24 +00: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
78c2f23621 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2015-03-09 23:59:39 +00:00
MarkBaker
d3148bdcdb Minor bugfixes 2015-03-09 23:59:13 +00:00
Pierre Skowron
412a2520cd Set default plotDirection 2015-03-09 14:17:28 +01:00
MarkBaker
a95e3f6607 Bugfix: Remove cells cleanly when calling RemoveRow() or RemoveColumn() 2015-03-04 23:36:38 +00:00
MarkBaker
538fbcd2e8 Additional regexp handling for UTF-8 strings 2015-02-15 00:01:01 +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
31aa953c0b Remove trailing white space from PCLZip 2015-02-04 15:41:59 +00:00
MarkBaker
71dba49fff Improvements to array arithmetic (MMULT) 
Better setup of calculation function tests to ensure consistent environment
 2015-01-23 23:44:32 +00:00
MarkBaker
976e7f064a Excel TRIM function only trims spaces, not tabs or other spacing characters 2015-01-23 16:49:20 +00:00
MarkBaker
fb18b7b598 Fix to complex number format signing when mask has a decimal 2015-01-23 16:09:36 +00:00
MarkBaker
d778b41524 Fix to negative number handling with complex number format masks, so that the sign only appears once 2015-01-23 15:40:54 +00:00
MarkBaker
dc137c293a Method for reversing the case of a string, for use in comparisons where lower-case/upper-case is reversed 2015-01-18 12:31:18 +00:00
MarkBaker
c089cfd53f Modify numeric comparisons in calculation engine to make allowance for floating point imprecision 2015-01-17 22:51:48 +00:00
MarkBaker
98f4754048 GH-496 - Error for superscript handling in HTML to Rich Text helper 2015-01-13 18:47:29 +00:00
MarkBaker
c7da475ef9 Inline styles for HTML not yet implemented 2015-01-12 23:18:46 +00:00
MarkBaker
5e24bcfedc Fix to getCellStyleXfByHashCode() method 2015-01-08 01:23:11 +00:00
MarkBaker
41d970f125 Force uppercase for cell address arguments 2015-01-07 22:36:19 +00:00
MarkBaker
ee309f6e93 Fix initialisation of html to Rich Text helper, and provide additional examples 2014-12-28 19:08:33 +00:00
MarkBaker
0f146e4f31 Feature: Helper to convert basic HTML markup to a Rich Text object 2014-12-27 23:48:24 +00:00
MarkBaker
c40bb233bf Remove spurious file 2014-12-18 21:56:47 +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
4d67ff7de9 Bugfix: Work Item GH-302 - Fix for CEIL() and FLOOR() when number argument is zero 2014-12-06 17:44:27 +00:00
MarkBaker
741500da14 Add example of cyclic reference calculation 2014-12-06 00:16:41 +00:00
MarkBaker
a4afd4d313 Modify RAND() and RANDBETWEEN() to use mt_rand() 2014-12-06 00:16:09 +00:00
MarkBaker
ab49033479 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-12-06 00:00:18 +00:00
MarkBaker
9daca467d6 Minor modifications to cyclic reference count logic in calculation engine 2014-12-05 23:59:41 +00:00
Mark Baker
51c72f30de Merge pull request #429 from CrandellWS/patch-1 
Fix for substitute value is ZERO=0
 2014-12-05 21:37:16 +00:00
MarkBaker
3f85430e6c Some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE instead of using Codepage 1200 2014-12-05 21:31:17 +00:00
MarkBaker
0296daa75c General: Set default Cyclic Reference behaviour to 1 to eliminate exception when using a single cyclic iteration in formulae 2014-12-03 08:05:25 +00:00
Mark Baker
2d73187b13 Merge pull request #460 from artsafin/develop 
Make PHPExcel_Writer_PDF implement IWriter
 2014-11-27 00:10:07 +00:00
MarkBaker
2be1bb0c2e GH-455 Fix case-sensitivity issue with PHPExcel_Chart_GridLines 2014-11-26 22:53: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
Artur Safin
2338c3caf2 Make PHPExcel_Writer_PDF implement IWriter 2014-11-15 13:00:08 +02:00
Mark Baker
184c1bc290 Merge pull request #446 from wiseloren/develop 
CP21454 "No Impact" conditional formatting fix for NumberFormat
 2014-11-13 00:50:56 +00:00
MarkBaker
5bce69de6f Bugfix: (frozenstupidity) Work Item GH-423 - Fix invalid NA return in VLOOKUP 
Manual merge
 2014-11-12 22:21:47 +00:00
MarkBaker
63de24eeba Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-11-11 23:19:05 +00:00
MarkBaker
fdefb8e392 Discard Autofilters in Excel2007 Reader when filter range isn't a valid range 2014-11-11 23:18:13 +00:00
chamaeleon-nitr
832421bbca Bug in String.php 
In function IsUTF8
 2014-11-10 17:43:16 +03:00
Loren Klingman
26aa0b27f7 "No Impact" conditional formatting fix for NumberFormat 2014-10-15 11:32:27 -05:00
MarkBaker
37b4d18d45 Minor fixes to cyclic references in formulae 2014-09-13 16:12:45 +01:00
MarkBaker
4baab36319 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-09-10 00:00:11 +01:00
MarkBaker
d4a641c5c7 General: Work Item GH-394 - DefaultValueBinder is too much aggressive when converting string to numeric 2014-09-09 23:59:55 +01:00
MarkBaker
31d60ad524 Fix to getStyle() call for cell object 2014-09-09 23:57:16 +01:00
David de Boer
fdfd36cc04 Improve sheet index error handling 
Fix 'Undefined offset: -1' warning, thrown when worksheets could
not be parsed and _activeSheetIndex equals -1.
 2014-09-08 17:24:08 +02: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
57ce19d20a Remove references to PHP versions < 5.2 2014-09-05 10:17:39 +01:00
MarkBaker
66b9ffa8ac Minor tweaks to cell constructor 2014-09-03 22:43:59 +01:00
William Crandell
86a598f3ae Fix for substitute value is ZERO=0 2014-09-01 03:09:52 -05:00
MarkBaker
280620a753 Implement Excel VALUE() function, locale-warts and all 2014-08-30 00:12:31 +01:00
MarkBaker
ba1e16d630 Bugfix: - Fix for percentage operator in formulae for BIFF Writer 2014-08-27 23:27:11 +01:00
MarkBaker
99f4ebab0c Remove unused lineEnding methods from CSV Reader 2014-08-27 22:07:24 +01:00
MarkBaker
6d22097d0e Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-08-24 23:29:48 +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
Progi1984
b518c0d404 Merge pull request #424 from nvanheuverzwijn/patch-1 
Fix indentation in documentation
 2014-08-17 19:33:14 +02:00
MarkBaker
d777d0283d Support for cell readorder Context/LTR/RTL 2014-08-17 18:15:44 +01:00
Nicolas Vanheuverzwijn
cdaabc57f1 Fix indentation in documentation 2014-08-16 14:55:11 -04:00
MarkBaker
125f39c745 Minor performance tweak to PHPTemp and DiscISAM caching 2014-08-16 11:12:32 +01:00
MarkBaker
bdb8b50156 Use th rather than td for cells when in thead 2014-08-06 00:09:44 +01:00
MarkBaker
14e5e806a7 Bugfix: Fix to autoloader registration for backward compatibility with PHP 5.2.0 not accepting the prepend flag 2014-08-05 15:03:54 +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
z38
5e70376018 Use normal array syntax to support PHP <5.4 2014-07-28 16:27:52 +02: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
ab693eafcd Feature: (bolovincev) Work Item GH-269 - Update Worksheet.php getStyleByColumnAndRow() to allow a range of cells rather than just a single cell 2014-07-27 13:12:44 +01:00
Mark Baker
983843d50c Merge pull request #269 from bolovincev/patch-1 
Update Worksheet.php getStyleByColumnAndRow()
 2014-07-27 13:07:19 +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
3e6cf13df2 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-07-26 19:46:43 +01:00
MarkBaker
fe6273f8e0 Fix for nested collapsed grouping when writing BIFF-format files, courtesy of ShadowEDX 2014-07-26 19:46:00 +01:00
Mark Baker
af03e186b3 Merge pull request #334 from atannus/develop 
Fixes html entities to prevent parsing error of generated documentation.
 2014-07-26 16:11:55 +01:00
MarkBaker
59cb459899 Case-sensitivity error 2014-07-26 15:45:44 +01:00
MarkBaker
134bd0fda6 Feature - New methods added for testing cell status within merge groups 2014-07-24 22:50:53 +01:00
MarkBaker
dff9880582 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-07-22 23:48:52 +01:00
MarkBaker
9065cab60c DOMDocument not domDocument 2014-07-22 23:48:32 +01:00
matteofilippetto
38ff5a49f8 again division by zero 
$this->_width and $this->_height are defined as float so !== will return TRUE also if the value is 0 ( as !== use OR )
 2014-07-22 17:40:31 +02: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
MarkBaker
87be8d3d8e Bugfix to ensure that current cell is maintained when executing formula calculations 2014-07-15 23:33:06 +01:00
MarkBaker
c6d0a4d3d0 Additional divide by zero handling 2014-07-14 23:45:46 +01:00
Mark Baker
311d03b4c3 Merge pull request #329 from sarciszewski/patch-2 
Update BaseDrawing.php
 2014-07-14 23:37:03 +01:00