Browse Source

Excel上传插件适配php7

q 1 year ago
parent
commit
d9c10677bf

+ 1 - 1
include/PHPExcel/Cell/DefaultValueBinder.php

@@ -83,7 +83,7 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
         } elseif ($pValue instanceof PHPExcel_RichText) {
         } elseif ($pValue instanceof PHPExcel_RichText) {
             return PHPExcel_Cell_DataType::TYPE_INLINE;
             return PHPExcel_Cell_DataType::TYPE_INLINE;
 
 
-        } elseif ($pValue[0] === '=' && strlen($pValue) > 1) {
+        } elseif (is_string($pValue) && $pValue[0] === '=' && strlen($pValue) > 1) {
             return PHPExcel_Cell_DataType::TYPE_FORMULA;
             return PHPExcel_Cell_DataType::TYPE_FORMULA;
 
 
         } elseif (is_bool($pValue)) {
         } elseif (is_bool($pValue)) {

+ 3 - 3
include/PHPExcel/Reader/Excel5.php

@@ -2918,7 +2918,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
 						// this fragment compressed
 						// this fragment compressed
 						$len = min($charsLeft, $limitpos - $pos);
 						$len = min($charsLeft, $limitpos - $pos);
 						for ($j = 0; $j < $len; ++$j) {
 						for ($j = 0; $j < $len; ++$j) {
-							$retstr .= $recordData{$pos + $j} . chr(0);
+							$retstr .= $recordData[$pos + $j] . chr(0);
 						}
 						}
 						$charsLeft -= $len;
 						$charsLeft -= $len;
 						$isCompressed = false;
 						$isCompressed = false;
@@ -4543,9 +4543,9 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
 				$hyperlinkType = 'UNC';
 				$hyperlinkType = 'UNC';
 			} else if (!$isFileLinkOrUrl) {
 			} else if (!$isFileLinkOrUrl) {
 				$hyperlinkType = 'workbook';
 				$hyperlinkType = 'workbook';
-			} else if (ord($recordData{$offset}) == 0x03) {
+			} else if (ord($recordData[$offset]) == 0x03) {
 				$hyperlinkType = 'local';
 				$hyperlinkType = 'local';
-			} else if (ord($recordData{$offset}) == 0xE0) {
+			} else if (ord($recordData[$offset]) == 0xE0) {
 				$hyperlinkType = 'URL';
 				$hyperlinkType = 'URL';
 			}
 			}