alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'psr2' into develop

This commit is contained in:
MarkBaker 2015-05-20 23:20:16 +01:00
parent 17c644bef6 c4ff34dde4
commit 547d495247
9 changed files with 150 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Classes/PHPExcel/Calculation.php
View File

@ -2407,7 +2407,7 @@ class PHPExcel_Calculation
public static function _translateSeparator($fromSeparator, $toSeparator, $formula, &$inBraces)
public static function translateSeparator($fromSeparator, $toSeparator, $formula, &$inBraces)
{
$strlen = mb_strlen($formula);
for ($i = 0; $i < $strlen; ++$i) {
@ -2428,7 +2428,7 @@ class PHPExcel_Calculation
return $formula;
}
private static function _translateFormula($from, $to, $formula, $fromSeparator, $toSeparator)
private static function translateFormula($from, $to, $formula, $fromSeparator, $toSeparator)
{
// Convert any Excel function names to the required language
if (self::$localeLanguage !== 'en_us') {
@ -2443,7 +2443,7 @@ class PHPExcel_Calculation
// Only count/replace in alternating array entries
if ($i = !$i) {
$value = preg_replace($from, $to, $value);
$value = self::_translateSeparator($fromSeparator, $toSeparator, $value, $inBraces);
$value = self::translateSeparator($fromSeparator, $toSeparator, $value, $inBraces);
}
}
unset($value);
@ -2452,7 +2452,7 @@ class PHPExcel_Calculation
} else {
// If there's no quoted strings, then we do a simple count/replace
$formula = preg_replace($from, $to, $formula);
$formula = self::_translateSeparator($fromSeparator, $toSeparator, $formula, $inBraces);
$formula = self::translateSeparator($fromSeparator, $toSeparator, $formula, $inBraces);
}
}
@ -2485,7 +2485,7 @@ class PHPExcel_Calculation
}
}
return self::_translateFormula(self::$functionReplaceFromExcel, self::$functionReplaceToLocale, $formula, ',', self::$localeArgumentSeparator);
return self::translateFormula(self::$functionReplaceFromExcel, self::$functionReplaceToLocale, $formula, ',', self::$localeArgumentSeparator);
}
@ -2514,7 +2514,7 @@ class PHPExcel_Calculation
}
}
return self::_translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$localeArgumentSeparator, ',');
return self::translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$localeArgumentSeparator, ',');
}
@ -3503,7 +3503,7 @@ class PHPExcel_Calculation
}
private static function _dataTestReference(&$operandData)
private static function dataTestReference(&$operandData)
{
$operand = $operandData['value'];
if (($operandData['reference'] === null) && (is_array($operand))) {
@ -3548,8 +3548,8 @@ class PHPExcel_Calculation
return $this->raiseFormulaError('Internal error - Operand value missing from stack');
}
$operand1 = self::_dataTestReference($operand1Data);
$operand2 = self::_dataTestReference($operand2Data);
$operand1 = self::dataTestReference($operand1Data);
$operand2 = self::dataTestReference($operand2Data);
// Log what we're doing
if ($token == ':') {

10
Classes/PHPExcel/Reader/Gnumeric.php
View File

@ -426,7 +426,13 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
} else {
$expression = $this->expressions[$ExprID];
$cell = $this->referenceHelper->updateFormulaReferences($expression['formula'], 'A1', $cellAttributes->Col - $expression['column'], $cellAttributes->Row - $expression['row'], $worksheetName);
$cell = $this->referenceHelper->updateFormulaReferences(
$expression['formula'],
'A1',
$cellAttributes->Col - $expression['column'],
$cellAttributes->Row - $expression['row'],
$worksheetName
);
// echo 'SHARED EXPRESSION ', $ExprID,'<br />';
// echo 'New Value is ', $cell,'<br />';
}
@ -441,8 +447,8 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
$cell = ($cell == 'TRUE') ? true: false;
break;
case '30': // Integer
// Excel 2007+ doesn't differentiate between integer and float, so set the value and dropthru to the next (numeric) case
$cell = intval($cell);
// Excel 2007+ doesn't differentiate between integer and float, so set the value and dropthru to the next (numeric) case
case '40': // Float
$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
break;

49
Classes/PHPExcel/Reader/HTML.php
View File

@ -179,31 +179,31 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
}
// Data Array used for testing only, should write to PHPExcel object on completion of tests
protected $_dataArray = array();
protected $_tableLevel = 0;
protected $_nestedColumn = array('A');
protected $dataArray = array();
protected $tableLevel = 0;
protected $nestedColumn = array('A');
protected function setTableStartColumn($column)
{
if ($this->_tableLevel == 0) {
if ($this->tableLevel == 0) {
$column = 'A';
}
++$this->_tableLevel;
$this->_nestedColumn[$this->_tableLevel] = $column;
++$this->tableLevel;
$this->nestedColumn[$this->tableLevel] = $column;
return $this->_nestedColumn[$this->_tableLevel];
return $this->nestedColumn[$this->tableLevel];
}
protected function getTableStartColumn()
{
return $this->_nestedColumn[$this->_tableLevel];
return $this->nestedColumn[$this->tableLevel];
}
protected function releaseTableStartColumn()
{
--$this->_tableLevel;
--$this->tableLevel;
return array_pop($this->_nestedColumn);
return array_pop($this->nestedColumn);
}
protected function flushCell($sheet, $column, $row, &$cellContent)
@ -216,12 +216,12 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
// Write to worksheet to be done here...
// ... we return the cell so we can mess about with styles more easily
$sheet->setCellValue($column . $row, $cellContent, true);
$this->_dataArray[$row][$column] = $cellContent;
$this->dataArray[$row][$column] = $cellContent;
}
} else {
// We have a Rich Text run
// TODO
$this->_dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
$this->dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
}
$cellContent = (string) '';
}
@ -291,8 +291,9 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
$this->flushCell($sheet, $column, $row, $cellContent);
}
++$row;
// Add a break after a horizontal rule, simply by allowing the code to dropthru
case 'br':
if ($this->_tableLevel > 0) {
if ($this->tableLevel > 0) {
// If we're inside a table, replace with a \n
$cellContent .= "\n";
} else {
@ -328,7 +329,7 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
case 'ol':
case 'ul':
case 'p':
if ($this->_tableLevel > 0) {
if ($this->tableLevel > 0) {
// If we're inside a table, replace with a \n
$cellContent .= "\n";
// echo 'LIST ENTRY: ' , '<br />';
@ -353,7 +354,7 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
}
break;
case 'li':
if ($this->_tableLevel > 0) {
if ($this->tableLevel > 0) {
// If we're inside a table, replace with a \n
$cellContent .= "\n";
// echo 'LIST ENTRY: ' , '<br />';
@ -374,14 +375,14 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
case 'table':
$this->flushCell($sheet, $column, $row, $cellContent);
$column = $this->setTableStartColumn($column);
// echo 'START OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
if ($this->_tableLevel > 1) {
// echo 'START OF TABLE LEVEL ' , $this->tableLevel , '<br />';
if ($this->tableLevel > 1) {
--$row;
}
$this->processDomElement($child, $sheet, $row, $column, $cellContent);
// echo 'END OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
// echo 'END OF TABLE LEVEL ' , $this->tableLevel , '<br />';
$column = $this->releaseTableStartColumn();
if ($this->_tableLevel > 1) {
if ($this->tableLevel > 1) {
++$column;
} else {
++$row;
@ -394,16 +395,16 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
case 'tr':
$column = $this->getTableStartColumn();
$cellContent = '';
// echo 'START OF TABLE ' , $this->_tableLevel , ' ROW<br />';
// echo 'START OF TABLE ' , $this->tableLevel , ' ROW<br />';
$this->processDomElement($child, $sheet, $row, $column, $cellContent);
++$row;
// echo 'END OF TABLE ' , $this->_tableLevel , ' ROW<br />';
// echo 'END OF TABLE ' , $this->tableLevel , ' ROW<br />';
break;
case 'th':
case 'td':
// echo 'START OF TABLE ' , $this->_tableLevel , ' CELL<br />';
// echo 'START OF TABLE ' , $this->tableLevel , ' CELL<br />';
$this->processDomElement($child, $sheet, $row, $column, $cellContent);
// echo 'END OF TABLE ' , $this->_tableLevel , ' CELL<br />';
// echo 'END OF TABLE ' , $this->tableLevel , ' CELL<br />';
while (isset($this->rowspan[$column . $row])) {
++$column;
@ -453,7 +454,7 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
$row = 1;
$column = 'A';
$content = '';
$this->_tableLevel = 0;
$this->tableLevel = 0;
$this->processDomElement($child, $sheet, $row, $column, $cellContent);
break;
default:

2
Classes/PHPExcel/Reader/OOCalc.php
View File

@ -619,7 +619,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
$value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value); // Cell reference in another sheet
$value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value); // Cell range reference
$value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value); // Simple cell reference
$value = PHPExcel_Calculation::_translateSeparator(';', ',', $value, $inBraces);
$value = PHPExcel_Calculation::translateSeparator(';', ',', $value, $inBraces);
}
}
unset($value);

20
Classes/PHPExcel/Shared/File.php
View File

@ -1,6 +1,7 @@
<?php
/**
* PHPExcel
* PHPExcel_Shared_File
*
* Copyright (c) 2006 - 2015 PHPExcel
*
@ -24,15 +25,6 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
/**
* PHPExcel_Shared_File
*
* @category PHPExcel
* @package PHPExcel_Shared
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Shared_File
{
/*
@ -41,7 +33,7 @@ class PHPExcel_Shared_File
* @protected
* @var boolean
*/
protected static $_useUploadTempDirectory = false;
protected static $useUploadTempDirectory = false;
/**
@ -51,7 +43,7 @@ class PHPExcel_Shared_File
*/
public static function setUseUploadTempDirectory($useUploadTempDir = false)
{
self::$_useUploadTempDirectory = (boolean) $useUploadTempDir;
self::$useUploadTempDirectory = (boolean) $useUploadTempDir;
}
@ -62,7 +54,7 @@ class PHPExcel_Shared_File
*/
public static function getUseUploadTempDirectory()
{
return self::$_useUploadTempDirectory;
return self::$useUploadTempDirectory;
}
@ -138,7 +130,7 @@ class PHPExcel_Shared_File
*/
public static function sys_get_temp_dir()
{
if (self::$_useUploadTempDirectory) {
if (self::$useUploadTempDirectory) {
// use upload-directory when defined to allow running on environments having very restricted
// open_basedir configs
if (ini_get('upload_tmp_dir') !== false) {

58
Classes/PHPExcel/Shared/JAMA/Matrix.php
View File

@ -111,7 +111,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function __construct()
}
/**
* getArray
@ -121,7 +121,7 @@ class PHPExcel_Shared_JAMA_Matrix
public function getArray()
{
return $this->A;
} // function getArray()
}
/**
* getRowDimension
@ -131,7 +131,7 @@ class PHPExcel_Shared_JAMA_Matrix
public function getRowDimension()
{
return $this->m;
} // function getRowDimension()
}
/**
* getColumnDimension
@ -141,7 +141,7 @@ class PHPExcel_Shared_JAMA_Matrix
public function getColumnDimension()
{
return $this->n;
} // function getColumnDimension()
}
/**
* get
@ -154,7 +154,7 @@ class PHPExcel_Shared_JAMA_Matrix
public function get($i = null, $j = null)
{
return $this->A[$i][$j];
} // function get()
}
/**
* getMatrix
@ -306,7 +306,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function getMatrix()
}
/**
* checkMatrixDimensions
@ -354,7 +354,7 @@ class PHPExcel_Shared_JAMA_Matrix
public function identity($m = null, $n = null)
{
return $this->diagonal($m, $n, 1);
} // function identity()
}
/**
* diagonal
@ -372,7 +372,7 @@ class PHPExcel_Shared_JAMA_Matrix
$R->set($i, $i, $c);
}
return $R;
} // function diagonal()
}
/**
* getMatrixByRow
@ -393,7 +393,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
}
} // function getMatrixByRow()
}
/**
* getMatrixByCol
@ -414,7 +414,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::ArgumentTypeException);
}
} // function getMatrixByCol()
}
/**
* transpose
@ -447,7 +447,7 @@ class PHPExcel_Shared_JAMA_Matrix
$s += $this->A[$i][$i];
}
return $s;
} // function trace()
}
/**
* uminus
@ -457,7 +457,7 @@ class PHPExcel_Shared_JAMA_Matrix
*/
public function uminus()
{
} // function uminus()
}
/**
* plus
@ -497,7 +497,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function plus()
}
/**
* plusEquals
@ -551,7 +551,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function plusEquals()
}
/**
* minus
@ -591,7 +591,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function minus()
}
/**
* minusEquals
@ -645,7 +645,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function minusEquals()
}
/**
* arrayTimes
@ -686,7 +686,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function arrayTimes()
}
/**
* arrayTimesEquals
@ -741,7 +741,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function arrayTimesEquals()
}
/**
* arrayRightDivide
@ -801,7 +801,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function arrayRightDivide()
}
/**
@ -843,7 +843,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function arrayRightDivideEquals()
}
/**
@ -885,7 +885,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function arrayLeftDivide()
}
/**
@ -927,7 +927,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function arrayLeftDivideEquals()
}
/**
@ -1023,7 +1023,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function times()
}
/**
* power
@ -1077,7 +1077,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function power()
}
/**
* concat
@ -1116,7 +1116,7 @@ class PHPExcel_Shared_JAMA_Matrix
} else {
throw new PHPExcel_Calculation_Exception(self::PolymorphicArgumentException);
}
} // function concat()
}
/**
* Solve A*X = B.
@ -1133,7 +1133,7 @@ class PHPExcel_Shared_JAMA_Matrix
$QR = new PHPExcel_Shared_JAMA_QRDecomposition($this);
return $QR->solve($B);
}
} // function solve()
}
/**
* Matrix inverse or pseudoinverse.
@ -1143,7 +1143,7 @@ class PHPExcel_Shared_JAMA_Matrix
public function inverse()
{
return $this->solve($this->identity($this->m, $this->m));
} // function inverse()
}
/**
* det
@ -1155,5 +1155,5 @@ class PHPExcel_Shared_JAMA_Matrix
{
$L = new PHPExcel_Shared_JAMA_LUDecomposition($this);
return $L->det();
} // function det()
} // class PHPExcel_Shared_JAMA_Matrix
}
}

14
Classes/PHPExcel/Shared/OLE/PPS/Root.php
View File

@ -34,7 +34,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
* Directory for temporary files
* @var string
*/
protected $_tmp_dir = null;
protected $tempDirectory = null;
/**
* @param integer $time_1st A timestamp
@ -63,20 +63,20 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
// Initial Setting for saving
$this->_BIG_BLOCK_SIZE = pow(
2,
(isset($this->_BIG_BLOCK_SIZE))? self::_adjust2($this->_BIG_BLOCK_SIZE) : 9
(isset($this->_BIG_BLOCK_SIZE))? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
);
$this->_SMALL_BLOCK_SIZE= pow(
2,
(isset($this->_SMALL_BLOCK_SIZE))? self::_adjust2($this->_SMALL_BLOCK_SIZE) : 6
(isset($this->_SMALL_BLOCK_SIZE))? self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
);
if (is_resource($filename)) {
$this->_FILEH_ = $filename;
} elseif ($filename == '-' || $filename == '') {
if ($this->_tmp_dir === null) {
$this->_tmp_dir = PHPExcel_Shared_File::sys_get_temp_dir();
if ($this->tempDirectory === null) {
$this->tempDirectory = PHPExcel_Shared_File::sys_get_temp_dir();
}
$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
$this->_tmp_filename = tempnam($this->tempDirectory, "OLE_PPS_Root");
$this->_FILEH_ = fopen($this->_tmp_filename, "w+b");
if ($this->_FILEH_ == false) {
throw new PHPExcel_Writer_Exception("Can't create temporary file.");
@ -158,7 +158,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
* @see save()
* @return integer
*/
private static function _adjust2($i2)
private static function adjust2($i2)
{
$iWk = log($i2)/log(2);
return ($iWk > floor($iWk))? floor($iWk)+1:$iWk;

112
Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
View File

@ -190,19 +190,19 @@ define('PCLZIP_CB_POST_DELETE', 78008);
class PclZip
{
// ----- Filename of the zip file
var $zipname = '';
public $zipname = '';
// ----- File descriptor of the zip file
var $zip_fd = 0;
public $zip_fd = 0;
// ----- Internal error handling
var $error_code = 1;
var $error_string = '';
public $error_code = 1;
public $error_string = '';
// ----- Current status of the magic_quotes_runtime
// This value store the php configuration for magic_quotes
// The class can then disable the magic_quotes and reset it after
var $magic_quotes_status;
public $magic_quotes_status;
// --------------------------------------------------------------------------------
// Function : PclZip()
@ -212,7 +212,7 @@ class PclZip
// Note that no real action is taken, if the archive does not exist it is not
// created. Use create() for that.
// --------------------------------------------------------------------------------
function PclZip($p_zipname)
public function PclZip($p_zipname)
{
// ----- Tests the zlib
@ -267,7 +267,7 @@ class PclZip
// The list of the added files, with a status of the add action.
// (see PclZip::listContent() for list entry format)
// --------------------------------------------------------------------------------
function create($p_filelist)
public function create($p_filelist)
{
$v_result=1;
@ -433,7 +433,7 @@ class PclZip
// The list of the added files, with a status of the add action.
// (see PclZip::listContent() for list entry format)
// --------------------------------------------------------------------------------
function add($p_filelist)
public function add($p_filelist)
{
$v_result=1;
@ -607,7 +607,7 @@ class PclZip
// 0 on an unrecoverable failure,
// The list of the files in the archive.
// --------------------------------------------------------------------------------
function listContent()
public function listContent()
{
$v_result=1;
@ -663,7 +663,7 @@ class PclZip
// The list of the extracted files, with a status of the action.
// (see PclZip::listContent() for list entry format)
// --------------------------------------------------------------------------------
function extract()
public function extract()
{
$v_result=1;
@ -814,7 +814,7 @@ class PclZip
// (see PclZip::listContent() for list entry format)
// --------------------------------------------------------------------------------
//function extractByIndex($p_index, options...)
function extractByIndex($p_index)
public function extractByIndex($p_index)
{
$v_result=1;
@ -957,7 +957,7 @@ class PclZip
// The list of the files which are still present in the archive.
// (see PclZip::listContent() for list entry format)
// --------------------------------------------------------------------------------
function delete()
public function delete()
{
$v_result=1;
@ -1017,7 +1017,7 @@ class PclZip
// ***** Deprecated *****
// delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
// --------------------------------------------------------------------------------
function deleteByIndex($p_index)
public function deleteByIndex($p_index)
{
$p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
@ -1041,7 +1041,7 @@ class PclZip
// 0 on failure,
// An array with the archive properties.
// --------------------------------------------------------------------------------
function properties()
public function properties()
{
// ----- Reset the error handler
@ -1111,7 +1111,7 @@ class PclZip
// 1 on success.
// 0 or a negative value on error (error code).
// --------------------------------------------------------------------------------
function duplicate($p_archive)
public function duplicate($p_archive)
{
$v_result = 1;
@ -1160,7 +1160,7 @@ class PclZip
// 1 on success,
// 0 or negative values on error (see below).
// --------------------------------------------------------------------------------
function merge($p_archive_to_add)
public function merge($p_archive_to_add)
{
$v_result = 1;
@ -1202,7 +1202,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function errorCode()
public function errorCode()
{
if (PCLZIP_ERROR_EXTERNAL == 1) {
return(PclErrorCode());
@ -1217,7 +1217,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function errorName($p_with_code = false)
public function errorName($p_with_code = false)
{
$v_name = array(
PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
@ -1262,7 +1262,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function errorInfo($p_full = false)
public function errorInfo($p_full = false)
{
if (PCLZIP_ERROR_EXTERNAL == 1) {
return(PclErrorString());
@ -1299,7 +1299,7 @@ class PclZip
// true on success,
// false on error, the error code is set.
// --------------------------------------------------------------------------------
function privCheckFormat($p_level = 0)
public function privCheckFormat($p_level = 0)
{
$v_result = true;
@ -1352,7 +1352,7 @@ class PclZip
// 1 on success.
// 0 on failure.
// --------------------------------------------------------------------------------
function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
{
$v_result=1;
@ -1714,7 +1714,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privOptionDefaultThreshold(&$p_options)
public function privOptionDefaultThreshold(&$p_options)
{
$v_result=1;
@ -1759,7 +1759,7 @@ class PclZip
// 1 on success.
// 0 on failure.
// --------------------------------------------------------------------------------
function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
{
$v_result=1;
@ -1875,7 +1875,7 @@ class PclZip
// 1 on success.
// 0 on failure.
// --------------------------------------------------------------------------------
function privFileDescrExpand(&$p_filedescr_list, &$p_options)
public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
{
$v_result=1;
@ -1986,7 +1986,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
{
$v_result=1;
$v_list_detail = array();
@ -2020,7 +2020,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
{
$v_result=1;
$v_list_detail = array();
@ -2189,7 +2189,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function privOpenFd($p_mode)
public function privOpenFd($p_mode)
{
$v_result=1;
@ -2221,7 +2221,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function privCloseFd()
public function privCloseFd()
{
$v_result=1;
@ -2248,8 +2248,8 @@ class PclZip
// $p_remove_dir : Path to remove in the filename path archived
// Return Values :
// --------------------------------------------------------------------------------
// function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
// public function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
{
$v_result=1;
@ -2310,7 +2310,7 @@ class PclZip
// $p_result_list : list of added files with their properties (specially the status field)
// Return Values :
// --------------------------------------------------------------------------------
function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
{
$v_result=1;
$v_header = array();
@ -2362,7 +2362,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privAddFile($p_filedescr, &$p_header, &$p_options)
public function privAddFile($p_filedescr, &$p_header, &$p_options)
{
$v_result=1;
@ -2606,7 +2606,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
{
$v_result=PCLZIP_ERR_NO_ERROR;
@ -2716,7 +2716,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privCalculateStoredFilename(&$p_filedescr, &$p_options)
public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
{
$v_result=1;
@ -2814,7 +2814,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privWriteFileHeader(&$p_header)
public function privWriteFileHeader(&$p_header)
{
$v_result=1;
@ -2851,7 +2851,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privWriteCentralFileHeader(&$p_header)
public function privWriteCentralFileHeader(&$p_header)
{
$v_result=1;
@ -2893,7 +2893,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
{
$v_result = 1;
@ -2919,7 +2919,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privList(&$p_list)
public function privList(&$p_list)
{
$v_result = 1;
@ -3001,7 +3001,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privConvertHeader2FileInfo($p_header, &$p_info)
public function privConvertHeader2FileInfo($p_header, &$p_info)
{
$v_result=1;
@ -3040,7 +3040,7 @@ class PclZip
// Return Values :
// 1 on success,0 or less on error (see error code list)
// --------------------------------------------------------------------------------
function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
{
$v_result=1;
@ -3314,7 +3314,7 @@ class PclZip
// 1 : ... ?
// PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
// --------------------------------------------------------------------------------
function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
{
$v_result=1;
@ -3591,7 +3591,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privExtractFileUsingTempFile(&$p_entry, &$p_options)
public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
{
$v_result=1;
@ -3664,7 +3664,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privExtractFileInOutput(&$p_entry, &$p_options)
public function privExtractFileInOutput(&$p_entry, &$p_options)
{
$v_result=1;
@ -3768,7 +3768,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
{
$v_result=1;
@ -3877,7 +3877,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privReadFileHeader(&$p_header)
public function privReadFileHeader(&$p_header)
{
$v_result=1;
@ -3973,7 +3973,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privReadCentralFileHeader(&$p_header)
public function privReadCentralFileHeader(&$p_header)
{
$v_result = 1;
@ -4078,7 +4078,7 @@ class PclZip
// 1 on success,
// 0 on error;
// --------------------------------------------------------------------------------
function privCheckFileHeaders(&$p_local_header, &$p_central_header)
public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
{
$v_result=1;
@ -4115,7 +4115,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privReadEndCentralDir(&$p_central_dir)
public function privReadEndCentralDir(&$p_central_dir)
{
$v_result=1;
@ -4261,7 +4261,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privDeleteByRule(&$p_result_list, &$p_options)
public function privDeleteByRule(&$p_result_list, &$p_options)
{
$v_result=1;
$v_list_detail = array();
@ -4526,7 +4526,7 @@ class PclZip
// 1 : OK
// -1 : Unable to create directory
// --------------------------------------------------------------------------------
function privDirCheck($p_dir, $p_is_dir = false)
public function privDirCheck($p_dir, $p_is_dir = false)
{
$v_result = 1;
@ -4574,7 +4574,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privMerge(&$p_archive_to_add)
public function privMerge(&$p_archive_to_add)
{
$v_result=1;
@ -4745,7 +4745,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privDuplicate($p_archive_filename)
public function privDuplicate($p_archive_filename)
{
$v_result=1;
@ -4800,7 +4800,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function privErrorLog($p_error_code = 0, $p_error_string = '')
public function privErrorLog($p_error_code = 0, $p_error_string = '')
{
if (PCLZIP_ERROR_EXTERNAL == 1) {
PclError($p_error_code, $p_error_string);
@ -4816,7 +4816,7 @@ class PclZip
// Description :
// Parameters :
// --------------------------------------------------------------------------------
function privErrorReset()
public function privErrorReset()
{
if (PCLZIP_ERROR_EXTERNAL == 1) {
PclErrorReset();
@ -4833,7 +4833,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privDisableMagicQuotes()
public function privDisableMagicQuotes()
{
$v_result=1;
@ -4866,7 +4866,7 @@ class PclZip
// Parameters :
// Return Values :
// --------------------------------------------------------------------------------
function privSwapBackMagicQuotes()
public function privSwapBackMagicQuotes()
{
$v_result=1;

14
Classes/PHPExcel/Worksheet.php
View File

@ -416,7 +416,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @return string The valid string
* @throws Exception
*/
private static function _checkSheetCodeName($pValue)
private static function checkSheetCodeName($pValue)
{
$CharCount = PHPExcel_Shared_String::CountCharacters($pValue);
if ($CharCount == 0) {
@ -444,7 +444,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @return string The valid string
* @throws PHPExcel_Exception
*/
private static function _checkSheetTitle($pValue)
private static function checkSheetTitle($pValue)
{
// Some of the printable ASCII characters are invalid: * : / \ ? [ ]
if (str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) {
@ -825,7 +825,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// Syntax check
self::_checkSheetTitle($pValue);
self::checkSheetTitle($pValue);
// Old title
$oldTitle = $this->getTitle();
@ -1173,7 +1173,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// Create new cell object
return $this->_createNewCell($pCoordinate);
return $this->createNewCell($pCoordinate);
}
/**
@ -1192,7 +1192,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
return $this->cellCollection->getCacheData($coordinate);
}
return $this->_createNewCell($coordinate);
return $this->createNewCell($coordinate);
}
/**
@ -1201,7 +1201,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param string $pCoordinate Coordinate of the cell
* @return PHPExcel_Cell Cell that was created
*/
private function _createNewCell($pCoordinate)
private function createNewCell($pCoordinate)
{
$cell = $this->cellCollection->addCacheData(
$pCoordinate,
@ -2906,7 +2906,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pValue = str_replace(' ', '_', $pValue);//Excel does this automatically without flinching, we are doing the same
// Syntax check
// throw an exception if not valid
self::_checkSheetCodeName($pValue);
self::checkSheetCodeName($pValue);
// We use the same code that setTitle to find a valid codeName else not using a space (Excel don't like) but a '_'