';
if ($link)
$s = '\n"; - } elseif ((ord($this->data[$spos+6])==1) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { - //Boolean formula. Result is in +2; 0=false,1=true - } elseif ((ord($this->data[$spos+6])==2) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { - //Error formula. Error code is in +2; - } elseif ((ord($this->data[$spos+6])==3) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { - //Formula result is a null string. - } else { - // result is a number, so first 14 bytes are just like a _NUMBER record - $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent - if ($this->isDate($spos)) { - list($string, $raw) = $this->createDate($tmp['double']); - // $this->addcell(DateRecord($r, 1)); - }else{ - //$raw = $tmp['']; - if (isset($this->_columnsFormat[$column + 1])){ - $this->curformat = $this->_columnsFormat[$column + 1]; - } - $raw = $this->createNumber($spos); - $string = sprintf($this->curformat, $raw * $this->multiplier); - - // $this->addcell(NumberRecord($r)); - } - $this->addcell($row, $column, $string, $raw); - //echo "Number $row $column $string\n"; - } - break; - case SPREADSHEET_EXCEL_READER_TYPE_BOOLERR: - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; - $string = ord($this->data[$spos+6]); - $this->addcell($row, $column, $string); - //echo 'Type_BOOLERR '."\n"; - break; - case SPREADSHEET_EXCEL_READER_TYPE_ROW: - case SPREADSHEET_EXCEL_READER_TYPE_DBCELL: - case SPREADSHEET_EXCEL_READER_TYPE_MULBLANK: - break; - case SPREADSHEET_EXCEL_READER_TYPE_LABEL: - $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; - $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; - $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8)); - - // $this->addcell(LabelRecord($r)); - break; - - case SPREADSHEET_EXCEL_READER_TYPE_EOF: - $cont = false; - break; - default: - //echo ' unknown :'.base_convert($r['code'],10,16)."\n"; - break; - - } - $spos += $length; - } - - if (!isset($this->sheets[$this->sn]['numRows'])) - $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow']; - if (!isset($this->sheets[$this->sn]['numCols'])) - $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol']; - - } - - /** - * Check whether the current record read is a date - * - * @param todo - * @return boolean True if date, false otherwise - */ - function isDate($spos) - { - //$xfindex = GetInt2d(, 4); - $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8; - //echo 'check is date '.$xfindex.' '.$this->formatRecords['xfrecords'][$xfindex]['type']."\n"; - //var_dump($this->formatRecords['xfrecords'][$xfindex]); - if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'date') { - $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format']; - $this->rectype = 'date'; - return true; - } else { - if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'number') { - $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format']; - $this->rectype = 'number'; - if (($xfindex == 0x9) || ($xfindex == 0xa)){ - $this->multiplier = 100; - } - }else{ - $this->curformat = $this->_defaultFormat; - $this->rectype = 'unknown'; - } - return false; - } - } - - //}}} - //{{{ createDate() - - /** - * Convert the raw Excel date into a human readable format - * - * Dates in Excel are stored as number of seconds from an epoch. On - * Windows, the epoch is 30/12/1899 and on Mac it's 01/01/1904 - * - * @access private - * @param integer The raw Excel value to convert - * @return array First element is the converted date, the second element is number a unix timestamp - */ - function createDate($numValue) - { - if ($numValue > 1) { - $utcDays = $numValue - ($this->nineteenFour ? SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904 : SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS); - $utcValue = round(($utcDays+1) * SPREADSHEET_EXCEL_READER_MSINADAY); - $string = date ($this->curformat, $utcValue); - $raw = $utcValue; - } else { - $raw = $numValue; - $hours = floor($numValue * 24); - $mins = floor($numValue * 24 * 60) - $hours * 60; - $secs = floor($numValue * SPREADSHEET_EXCEL_READER_MSINADAY) - $hours * 60 * 60 - $mins * 60; - $string = date ($this->curformat, mktime($hours, $mins, $secs)); - } - - return array($string, $raw); - } - - function createNumber($spos) - { - $rknumhigh = $this->_GetInt4d($this->data, $spos + 10); - $rknumlow = $this->_GetInt4d($this->data, $spos + 6); - //for ($i=0; $i<8; $i++) { echo ord($this->data[$i+$spos+6]) . " "; } echo "
"; - $sign = ($rknumhigh & 0x80000000) >> 31; - $exp = ($rknumhigh & 0x7ff00000) >> 20; - $mantissa = (0x100000 | ($rknumhigh & 0x000fffff)); - $mantissalow1 = ($rknumlow & 0x80000000) >> 31; - $mantissalow2 = ($rknumlow & 0x7fffffff); - $value = $mantissa / pow( 2 , (20- ($exp - 1023))); - if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023))); - $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023))); - //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2
\n"; - if ($sign) {$value = -1 * $value;} - return $value; - } - - function addcell($row, $col, $string, $raw = '') - { - //echo "ADD cel $row-$col $string\n"; - $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset); - $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset); - $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string; - if ($raw) - $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw; - if (isset($this->rectype)) - $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype; - - } - - - function _GetIEEE754($rknum) - { - if (($rknum & 0x02) != 0) { - $value = $rknum >> 2; - } else { -//mmp -// first comment out the previously existing 7 lines of code here -// $tmp = unpack("d", pack("VV", 0, ($rknum & 0xfffffffc))); -// //$value = $tmp['']; -// if (array_key_exists(1, $tmp)) { -// $value = $tmp[1]; -// } else { -// $value = $tmp['']; -// } -// I got my info on IEEE754 encoding from -// http://research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html -// The RK format calls for using only the most significant 30 bits of the -// 64 bit floating point value. The other 34 bits are assumed to be 0 -// So, we use the upper 30 bits of $rknum as follows... - $sign = ($rknum & 0x80000000) >> 31; - $exp = ($rknum & 0x7ff00000) >> 20; - $mantissa = (0x100000 | ($rknum & 0x000ffffc)); - $value = $mantissa / pow( 2 , (20- ($exp - 1023))); - if ($sign) {$value = -1 * $value;} -//end of changes by mmp - - } - - if (($rknum & 0x01) != 0) { - $value /= 100; - } - return $value; - } - - function _encodeUTF16($string) - { - $result = $string; - if ($this->_defaultEncoding){ - switch ($this->_encoderFunction){ - case 'iconv' : $result = iconv('UTF-16LE', $this->_defaultEncoding, $string); - break; - case 'mb_convert_encoding' : $result = mb_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE' ); - break; - } - } - return $result; - } - - function _GetInt4d($data, $pos) - { - $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); - if ($value>=4294967294) - { - $value=-2; - } - return $value; - } - -} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * c-hanging-comment-ender-p: nil - * End: - */; \ No newline at end of file + +* @license http://www.php.net/license/3_0.txt PHP License 3.0 +* @version CVS: $Id: reader.php 19 2007-03-13 12:42:41Z shangxiao $ +* @link http://pear.php.net/package/Spreadsheet_Excel_Reader +* @see OLE, Spreadsheet_Excel_Writer +*/ + + +//require_once 'PEAR.php'; +require_once 'oleread.inc.php'; +//require_once 'OLE.php'; + +define('SPREADSHEET_EXCEL_READER_BIFF8', 0x600); +define('SPREADSHEET_EXCEL_READER_BIFF7', 0x500); +define('SPREADSHEET_EXCEL_READER_WORKBOOKGLOBALS', 0x5); +define('SPREADSHEET_EXCEL_READER_WORKSHEET', 0x10); + +define('SPREADSHEET_EXCEL_READER_TYPE_BOF', 0x809); +define('SPREADSHEET_EXCEL_READER_TYPE_EOF', 0x0a); +define('SPREADSHEET_EXCEL_READER_TYPE_BOUNDSHEET', 0x85); +define('SPREADSHEET_EXCEL_READER_TYPE_DIMENSION', 0x200); +define('SPREADSHEET_EXCEL_READER_TYPE_ROW', 0x208); +define('SPREADSHEET_EXCEL_READER_TYPE_DBCELL', 0xd7); +define('SPREADSHEET_EXCEL_READER_TYPE_FILEPASS', 0x2f); +define('SPREADSHEET_EXCEL_READER_TYPE_NOTE', 0x1c); +define('SPREADSHEET_EXCEL_READER_TYPE_TXO', 0x1b6); +define('SPREADSHEET_EXCEL_READER_TYPE_RK', 0x7e); +define('SPREADSHEET_EXCEL_READER_TYPE_RK2', 0x27e); +define('SPREADSHEET_EXCEL_READER_TYPE_MULRK', 0xbd); +define('SPREADSHEET_EXCEL_READER_TYPE_MULBLANK', 0xbe); +define('SPREADSHEET_EXCEL_READER_TYPE_INDEX', 0x20b); +define('SPREADSHEET_EXCEL_READER_TYPE_SST', 0xfc); +define('SPREADSHEET_EXCEL_READER_TYPE_EXTSST', 0xff); +define('SPREADSHEET_EXCEL_READER_TYPE_CONTINUE', 0x3c); +define('SPREADSHEET_EXCEL_READER_TYPE_LABEL', 0x204); +define('SPREADSHEET_EXCEL_READER_TYPE_LABELSST', 0xfd); +define('SPREADSHEET_EXCEL_READER_TYPE_NUMBER', 0x203); +define('SPREADSHEET_EXCEL_READER_TYPE_NAME', 0x18); +define('SPREADSHEET_EXCEL_READER_TYPE_ARRAY', 0x221); +define('SPREADSHEET_EXCEL_READER_TYPE_STRING', 0x207); +define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA', 0x406); +define('SPREADSHEET_EXCEL_READER_TYPE_FORMULA2', 0x6); +define('SPREADSHEET_EXCEL_READER_TYPE_FORMAT', 0x41e); +define('SPREADSHEET_EXCEL_READER_TYPE_XF', 0xe0); +define('SPREADSHEET_EXCEL_READER_TYPE_BOOLERR', 0x205); +define('SPREADSHEET_EXCEL_READER_TYPE_UNKNOWN', 0xffff); +define('SPREADSHEET_EXCEL_READER_TYPE_NINETEENFOUR', 0x22); +define('SPREADSHEET_EXCEL_READER_TYPE_MERGEDCELLS', 0xE5); + +define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS' , 25569); +define('SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904', 24107); +define('SPREADSHEET_EXCEL_READER_MSINADAY', 86400); +//define('SPREADSHEET_EXCEL_READER_MSINADAY', 24 * 60 * 60); + +//define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%.2f"); +define('SPREADSHEET_EXCEL_READER_DEF_NUM_FORMAT', "%s"); + + +/* +* Place includes, constant defines and $_GLOBAL settings here. +* Make sure they have appropriate docblocks to avoid phpDocumentor +* construing they are documented by the page-level docblock. +*/ + +/** +* A class for reading Microsoft Excel Spreadsheets. +* +* Originally developed by Vadim Tkachenko under the name PHPExcelReader. +* (http://sourceforge.net/projects/phpexcelreader) +* Based on the Java version by Andy Khan (http://www.andykhan.com). Now +* maintained by David Sanders. Reads only Biff 7 and Biff 8 formats. +* +* @category Spreadsheet +* @package Spreadsheet_Excel_Reader +* @author Vadim Tkachenko
\n"; + } elseif ((ord($this->data[$spos+6])==1) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { + //Boolean formula. Result is in +2; 0=false,1=true + } elseif ((ord($this->data[$spos+6])==2) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { + //Error formula. Error code is in +2; + } elseif ((ord($this->data[$spos+6])==3) && (ord($this->data[$spos+12])==255) && (ord($this->data[$spos+13])==255)) { + //Formula result is a null string. + } else { + // result is a number, so first 14 bytes are just like a _NUMBER record + $tmp = unpack("ddouble", substr($this->data, $spos + 6, 8)); // It machine machine dependent + if ($this->isDate($spos)) { + list($string, $raw) = $this->createDate($tmp['double']); + // $this->addcell(DateRecord($r, 1)); + }else{ + //$raw = $tmp['']; + if (isset($this->_columnsFormat[$column + 1])){ + $this->curformat = $this->_columnsFormat[$column + 1]; + } + $raw = $this->createNumber($spos); + $string = sprintf($this->curformat, $raw * $this->multiplier); + + // $this->addcell(NumberRecord($r)); + } + $this->addcell($row, $column, $string, $raw); + //echo "Number $row $column $string\n"; + } + break; + case SPREADSHEET_EXCEL_READER_TYPE_BOOLERR: + $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; + $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; + $string = ord($this->data[$spos+6]); + $this->addcell($row, $column, $string); + //echo 'Type_BOOLERR '."\n"; + break; + case SPREADSHEET_EXCEL_READER_TYPE_ROW: + case SPREADSHEET_EXCEL_READER_TYPE_DBCELL: + case SPREADSHEET_EXCEL_READER_TYPE_MULBLANK: + break; + case SPREADSHEET_EXCEL_READER_TYPE_LABEL: + $row = ord($this->data[$spos]) | ord($this->data[$spos+1])<<8; + $column = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8; + $this->addcell($row, $column, substr($this->data, $spos + 8, ord($this->data[$spos + 6]) | ord($this->data[$spos + 7])<<8)); + + // $this->addcell(LabelRecord($r)); + break; + + case SPREADSHEET_EXCEL_READER_TYPE_EOF: + $cont = false; + break; + default: + //echo ' unknown :'.base_convert($r['code'],10,16)."\n"; + break; + + } + $spos += $length; + } + + if (!isset($this->sheets[$this->sn]['numRows'])) + $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow']; + if (!isset($this->sheets[$this->sn]['numCols'])) + $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol']; + + } + + /** + * Check whether the current record read is a date + * + * @param todo + * @return boolean True if date, false otherwise + */ + function isDate($spos) + { + //$xfindex = GetInt2d(, 4); + $xfindex = ord($this->data[$spos+4]) | ord($this->data[$spos+5]) << 8; + //echo 'check is date '.$xfindex.' '.$this->formatRecords['xfrecords'][$xfindex]['type']."\n"; + //var_dump($this->formatRecords['xfrecords'][$xfindex]); + if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'date') { + $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format']; + $this->rectype = 'date'; + return true; + } else { + if ($this->formatRecords['xfrecords'][$xfindex]['type'] == 'number') { + $this->curformat = $this->formatRecords['xfrecords'][$xfindex]['format']; + $this->rectype = 'number'; + if (($xfindex == 0x9) || ($xfindex == 0xa)){ + $this->multiplier = 100; + } + }else{ + $this->curformat = $this->_defaultFormat; + $this->rectype = 'unknown'; + } + return false; + } + } + + //}}} + //{{{ createDate() + + /** + * Convert the raw Excel date into a human readable format + * + * Dates in Excel are stored as number of seconds from an epoch. On + * Windows, the epoch is 30/12/1899 and on Mac it's 01/01/1904 + * + * @access private + * @param integer The raw Excel value to convert + * @return array First element is the converted date, the second element is number a unix timestamp + */ + function createDate($numValue) + { + if ($numValue > 1) { + $utcDays = $numValue - ($this->nineteenFour ? SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS1904 : SPREADSHEET_EXCEL_READER_UTCOFFSETDAYS); + $utcValue = round(($utcDays+1) * SPREADSHEET_EXCEL_READER_MSINADAY); + $string = date ($this->curformat, $utcValue); + $raw = $utcValue; + } else { + $raw = $numValue; + $hours = floor($numValue * 24); + $mins = floor($numValue * 24 * 60) - $hours * 60; + $secs = floor($numValue * SPREADSHEET_EXCEL_READER_MSINADAY) - $hours * 60 * 60 - $mins * 60; + $string = date ($this->curformat, mktime($hours, $mins, $secs)); + } + + return array($string, $raw); + } + + function createNumber($spos) + { + $rknumhigh = $this->_GetInt4d($this->data, $spos + 10); + $rknumlow = $this->_GetInt4d($this->data, $spos + 6); + //for ($i=0; $i<8; $i++) { echo ord($this->data[$i+$spos+6]) . " "; } echo "
"; + $sign = ($rknumhigh & 0x80000000) >> 31; + $exp = ($rknumhigh & 0x7ff00000) >> 20; + $mantissa = (0x100000 | ($rknumhigh & 0x000fffff)); + $mantissalow1 = ($rknumlow & 0x80000000) >> 31; + $mantissalow2 = ($rknumlow & 0x7fffffff); + $value = $mantissa / pow( 2 , (20- ($exp - 1023))); + if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023))); + $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023))); + //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2
\n"; + if ($sign) {$value = -1 * $value;} + return $value; + } + + function addcell($row, $col, $string, $raw = '') + { + //echo "ADD cel $row-$col $string\n"; + $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset); + $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset); + $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string; + if ($raw) + $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw; + if (isset($this->rectype)) + $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype; + + } + + + function _GetIEEE754($rknum) + { + if (($rknum & 0x02) != 0) { + $value = $rknum >> 2; + } else { +//mmp +// first comment out the previously existing 7 lines of code here +// $tmp = unpack("d", pack("VV", 0, ($rknum & 0xfffffffc))); +// //$value = $tmp['']; +// if (array_key_exists(1, $tmp)) { +// $value = $tmp[1]; +// } else { +// $value = $tmp['']; +// } +// I got my info on IEEE754 encoding from +// http://research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html +// The RK format calls for using only the most significant 30 bits of the +// 64 bit floating point value. The other 34 bits are assumed to be 0 +// So, we use the upper 30 bits of $rknum as follows... + $sign = ($rknum & 0x80000000) >> 31; + $exp = ($rknum & 0x7ff00000) >> 20; + $mantissa = (0x100000 | ($rknum & 0x000ffffc)); + $value = $mantissa / pow( 2 , (20- ($exp - 1023))); + if ($sign) {$value = -1 * $value;} +//end of changes by mmp + + } + + if (($rknum & 0x01) != 0) { + $value /= 100; + } + return $value; + } + + function _encodeUTF16($string) + { + $result = $string; + if ($this->_defaultEncoding){ + switch ($this->_encoderFunction){ + case 'iconv' : $result = iconv('UTF-16LE', $this->_defaultEncoding, $string); + break; + case 'mb_convert_encoding' : $result = mb_convert_encoding($string, $this->_defaultEncoding, 'UTF-16LE' ); + break; + } + } + return $result; + } + + function _GetInt4d($data, $pos) + { + $value = ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24); + if ($value>=4294967294) + { + $value=-2; + } + return $value; + } + +} + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * c-hanging-comment-ender-p: nil + * End: + */; diff --git a/AvocadoAmber/lib/Hook/hook.class.php b/AvocadoAmber/lib/Hook/hook.class.php index 5b1facd..b3c5a70 100644 --- a/AvocadoAmber/lib/Hook/hook.class.php +++ b/AvocadoAmber/lib/Hook/hook.class.php @@ -35,7 +35,7 @@ class Hook * * @var array */ - protected $callbacks = array(); + protected $callbacks = []; /** * Number of actions executed. @@ -44,7 +44,7 @@ class Hook * * @var array */ - protected $actions = array('count' => 0); + protected $actions = ['count' => 0]; /** * Current action hook. @@ -71,7 +71,7 @@ class Hook * * @var array */ - private static $instances = array(); + private static $instances = []; /** * Get instance. @@ -143,7 +143,7 @@ class Hook public static function addActions($actions) { foreach ($actions as $arguments) { - call_user_func_array(array(__CLASS__, 'addAction'), $arguments); + call_user_func_array([__CLASS__, 'addAction'], $arguments); } return true; @@ -166,7 +166,7 @@ class Hook * * @return mixed returns the output of the last action or false */ - public static function doAction($tag, $args = array(), $remove = true) + public static function doAction($tag, $args = [], $remove = true) { $that = self::getInstance(self::$id); @@ -259,14 +259,14 @@ class Hook if (!($class && $method) && function_exists($function)) { return call_user_func($function, $args); - } elseif ($obj = call_user_func(array($class, $this->singleton))) { + } elseif ($obj = call_user_func([$class, $this->singleton])) { if ($obj !== false) { - return call_user_func_array(array($obj, $method), $args); + return call_user_func_array([$obj, $method], $args); } } elseif (class_exists($class)) { $instance = new $class; - return call_user_func_array(array($instance, $method), $args); + return call_user_func_array([$instance, $method], $args); } return null; @@ -291,7 +291,7 @@ class Hook } } - return isset($actions) ? $actions : array(); + return isset($actions) ? $actions : []; } /** @@ -307,7 +307,7 @@ class Hook protected function getArguments($argsNumber, $arguments) { if ($argsNumber == 1 && is_string($arguments)) { - return array($arguments); + return [$arguments]; } elseif ($argsNumber === count($arguments)) { return $arguments; } @@ -321,6 +321,6 @@ class Hook return $args; } - return array(); + return []; } } diff --git a/AvocadoAmber/lib/Hook/hook.extends.class.php b/AvocadoAmber/lib/Hook/hook.extends.class.php index 95ab392..30dee34 100644 --- a/AvocadoAmber/lib/Hook/hook.extends.class.php +++ b/AvocadoAmber/lib/Hook/hook.extends.class.php @@ -5,9 +5,9 @@ if (!defined('_GNUBOARD_')) class GML_Hook extends Hook { - protected $filters = array('count' => 0); + protected $filters = ['count' => 0]; - protected $callback_filters = array(); + protected $callback_filters = []; protected static $current_filter = false; @@ -23,14 +23,14 @@ class GML_Hook extends Hook if (!($class && $method) && is_callable($function)) { return call_user_func_array($function, $args); - } elseif ($obj = call_user_func(array($class, $this->singleton))) { + } elseif ($obj = call_user_func([$class, $this->singleton])) { if ($obj !== false) { - return call_user_func_array(array($obj, $method), $args); + return call_user_func_array([$obj, $method], $args); } } elseif (class_exists($class)) { $instance = new $class; - return call_user_func_array(array($instance, $method), $args); + return call_user_func_array([$instance, $method], $args); } } @@ -43,7 +43,7 @@ class GML_Hook extends Hook } } - return (isset($filters)) ? $filters : array(); + return (isset($filters)) ? $filters : []; } public static function get_properties($type, $is_callback = false) @@ -70,7 +70,7 @@ class GML_Hook extends Hook return true; } - public static function apply_filters($tag, $args = array(), $remove = true) + public static function apply_filters($tag, $args = [], $remove = true) { $that = self::getInstance(self::$id); @@ -109,12 +109,12 @@ class GML_Hook extends Hook protected function getArguments($argsNumber, $arguments) { if ($argsNumber == 1 && is_string($arguments)) { - return array($arguments); + return [$arguments]; } elseif ($argsNumber === count($arguments)) { return $arguments; } - $args = array(); + $args = []; for ($i = 0; $i < $argsNumber; $i++) { if (is_array($arguments) && array_key_exists($i, $arguments)) { diff --git a/AvocadoAmber/lib/common.lib.php b/AvocadoAmber/lib/common.lib.php index 44ca6dd..fe34f56 100644 --- a/AvocadoAmber/lib/common.lib.php +++ b/AvocadoAmber/lib/common.lib.php @@ -246,12 +246,12 @@ function url_auto_link($str) // 140326 유창화님 제안코드로 수정 // http://sir.kr/pg_lecture/461 // http://sir.kr/pg_lecture/463 - $str = str_replace(array("<", ">", "&", """, " ", "'"), array("\t_lt_\t", "\t_gt_\t", "&", "\"", "\t_nbsp_\t", "'"), $str); + $str = str_replace(["<", ">", "&", """, " ", "'"], ["\t_lt_\t", "\t_gt_\t", "&", "\"", "\t_nbsp_\t", "'"], $str); //$str = preg_replace("`(?:(?:(?:href|src)\s*=\s*(?:\"|'|)){0})((http|https|ftp|telnet|news|mms)://[^\"'\s()]+)`", "\\1", $str); $str = preg_replace("/([^(href=\"?'?)|(src=\"?'?)]|\(|^)((http|https|ftp|telnet|news|mms):\/\/[a-zA-Z0-9\.-]+\.[가-힣\xA1-\xFEa-zA-Z0-9\.:&#=_\?\/~\+%@;\-\|\,\(\)]+)/i", "\\1\\2", $str); $str = preg_replace("/(^|[\"'\s(])(www\.[^\"'\s()]+)/i", "\\1\\2", $str); $str = preg_replace("/[0-9a-z_-]+@[a-z0-9._-]{4,}/i", "\\0", $str); - $str = str_replace(array("\t_nbsp_\t", "\t_lt_\t", "\t_gt_\t", "'"), array(" ", "<", ">", "'"), $str); + $str = str_replace(["\t_nbsp_\t", "\t_lt_\t", "\t_gt_\t", "'"], [" ", "<", ">", "'"], $str); /* // 속도 향상 031011 @@ -483,8 +483,8 @@ function search_font($stx, $str) global $config; // 문자앞에 \ 를 붙입니다. - $src = array('/', '|'); - $dst = array('\/', '\|'); + $src = ['/', '|']; + $dst = ['\/', '\|']; if (!trim($stx)) return $str; @@ -1475,7 +1475,7 @@ function get_text($str, $html = 0, $restore = false) // HTML 특수문자 변환 htmlspecialchars function hsc($str) { - $trans = array("\"" => """, "'" => "'", "<"=>"<", ">"=>">"); + $trans = ["\"" => """, "'" => "'", "<"=>"<", ">"=>">"]; $str = strtr($str, $trans); return $str; } @@ -1826,7 +1826,7 @@ function referer_check($url = '') // 한글 요일 function get_yoil($date, $full = 0) { - $arr_yoil = array('일', '월', '화', '수', '목', '금', '토'); + $arr_yoil = ['일', '월', '화', '수', '목', '금', '토']; $yoil = date("w", strtotime($date)); $str = $arr_yoil[$yoil]; @@ -2571,7 +2571,7 @@ function board_notice($bo_notice, $wr_id, $insert = false) if ($insert && in_array($wr_id, $notice_array)) return $bo_notice; - $notice_array = array_merge(array($wr_id), $notice_array); + $notice_array = array_merge([$wr_id], $notice_array); $notice_array = array_unique($notice_array); foreach ($notice_array as $key => $value) { if (!trim($value)) @@ -2596,7 +2596,7 @@ function googl_short_url($longUrl) // URL Shortener API ON $apiKey = $config['cf_googl_shorturl_apikey']; - $postData = array('longUrl' => $longUrl); + $postData = ['longUrl' => $longUrl]; $jsonData = json_encode($postData); $curlObj = curl_init(); @@ -2605,7 +2605,7 @@ function googl_short_url($longUrl) curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curlObj, CURLOPT_SSL_VERIFYPEER, 0); curl_setopt($curlObj, CURLOPT_HEADER, 0); - curl_setopt($curlObj, CURLOPT_HTTPHEADER, array('Content-type:application/json')); + curl_setopt($curlObj, CURLOPT_HTTPHEADER, ['Content-type:application/json']); curl_setopt($curlObj, CURLOPT_POST, 1); curl_setopt($curlObj, CURLOPT_POSTFIELDS, $jsonData); @@ -2846,7 +2846,7 @@ function check_input_vars() // HTML 특수문자 변환 htmlspecialchars function htmlspecialchars2($str) { - $trans = array("\"" => """, "'" => "'", "<" => "<", ">" => ">"); + $trans = ["\"" => """, "'" => "'", "<" => "<", ">" => ">"]; $str = strtr($str, $trans); return $str; } @@ -2906,7 +2906,7 @@ function clean_xss_tags($str, $check_entities = 0, $is_remove_tags = 0, $cur_str $result = preg_replace('#]*+>#i', '', $str); if ($check_entities) { - $result = str_replace(array(':', '(', ')', ' ', ' '), '', $result); + $result = str_replace([':', '(', ')', ' ', ' '], '', $result); } $result = preg_replace( @@ -2977,8 +2977,8 @@ function clean_relative_paths($path) // unescape nl 얻기 function conv_unescape_nl($str) { - $search = array('\\r', '\r', '\\n', '\n'); - $replace = array('', '', "\n", "\n"); + $search = ['\\r', '\r', '\\n', '\n']; + $replace = ['', '', "\n", "\n"]; return str_replace($search, $replace, $str); } @@ -3484,7 +3484,7 @@ function is_include_path_check($path = '', $is_input = '') } // resolve path parts (single dot, double dot and double delimiters) - $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path); + $path = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $path); $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen'); $absolutes = []; foreach ($parts as $part) { diff --git a/AvocadoAmber/lib/json.lib.php b/AvocadoAmber/lib/json.lib.php index 16dbcdc..f17881d 100644 --- a/AvocadoAmber/lib/json.lib.php +++ b/AvocadoAmber/lib/json.lib.php @@ -20,7 +20,7 @@ if (!function_exists('json_encode')) { return floatval(str_replace(',', '.', strval($a))); } if (is_string($a)) { - static $jsonReplaces = array(array('\\', '/', "\n", "\t", "\r", "\b", "\f", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"')); + static $jsonReplaces = [['\\', '/', "\n", "\t", "\r", "\b", "\f", '"'], ['\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"']]; return '"' . str_replace($jsonReplaces[0], $jsonReplaces[1], $a) . '"'; } else return $a; @@ -32,7 +32,7 @@ if (!function_exists('json_encode')) { break; } } - $result = array(); + $result = []; if ($isList) { foreach ($a as $v) $result[] = json_encode($v); diff --git a/AvocadoAmber/lib/latest.lib.php b/AvocadoAmber/lib/latest.lib.php index e5b7678..4805ac0 100644 --- a/AvocadoAmber/lib/latest.lib.php +++ b/AvocadoAmber/lib/latest.lib.php @@ -36,7 +36,7 @@ function latest($skin_dir = '', $bo_table, $rows = 10, $subject_len = 40, $cache } if (!G5_USE_CACHE || $cache_fwrite) { - $list = array(); + $list = []; $sql = "SELECT * FROM {$g5['board_table']} where bo_table = '{$bo_table}' "; $board = sql_fetch($sql); diff --git a/AvocadoAmber/lib/mailer.lib.php b/AvocadoAmber/lib/mailer.lib.php index 83d39f8..3076fe3 100644 --- a/AvocadoAmber/lib/mailer.lib.php +++ b/AvocadoAmber/lib/mailer.lib.php @@ -70,6 +70,6 @@ function attach_file($filename, $tmp_name) // 서버에 업로드 되는 파일은 확장자를 주지 않는다. (보안 취약점) $dest_file = G5_DATA_PATH . '/tmp/' . str_replace('/', '_', $tmp_name); move_uploaded_file($tmp_name, $dest_file); - $tmpfile = array("name" => $filename, "path" => $dest_file); + $tmpfile = ["name" => $filename, "path" => $dest_file]; return $tmpfile; } diff --git a/AvocadoAmber/lib/naver_syndi.lib.php b/AvocadoAmber/lib/naver_syndi.lib.php index 5131085..a5cefd7 100644 --- a/AvocadoAmber/lib/naver_syndi.lib.php +++ b/AvocadoAmber/lib/naver_syndi.lib.php @@ -44,7 +44,7 @@ function naver_syndi_ping($bo_table, $wr_id) CURLOPT_RETURNTRANSFER => true, CURLOPT_CONNECTTIMEOUT => 10, CURLOPT_TIMEOUT => 10, - CURLOPT_HTTPHEADER => array("Host: apis.naver.com", "Pragma: no-cache", "Accept: */*", $ping_auth_header) + CURLOPT_HTTPHEADER => ["Host: apis.naver.com", "Pragma: no-cache", "Accept: */*", $ping_auth_header] ); //print_r2($ping_client_opt); exit; diff --git a/AvocadoAmber/lib/thumbnail.lib.php b/AvocadoAmber/lib/thumbnail.lib.php index b1245b4..d2d0d9e 100644 --- a/AvocadoAmber/lib/thumbnail.lib.php +++ b/AvocadoAmber/lib/thumbnail.lib.php @@ -11,7 +11,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ $filename = $alt = $data_path = ''; $edt = false; - $empty_array = array('src' => '', 'ori' => '', 'alt' => ''); + $empty_array = ['src' => '', 'ori' => '', 'alt' => '']; $write = get_thumbnail_find_cache($bo_table, $wr_id, 'content'); @@ -62,7 +62,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ if (!$filename) return $empty_array; - if ($thumbnail_info = run_replace('get_list_thumbnail_info', array(), array('bo_table' => $bo_table, 'wr_id' => $wr_id, 'data_path' => $data_path, 'edt' => $edt, 'filename' => $filename, 'filepath' => $filepath, 'thumb_width' => $thumb_width, 'thumb_height' => $thumb_height, 'is_create' => $is_create, 'is_crop' => $is_crop, 'crop_mode' => $crop_mode, 'is_sharpen' => $is_sharpen, 'um_value' => $um_value))) { + if ($thumbnail_info = run_replace('get_list_thumbnail_info', [], ['bo_table' => $bo_table, 'wr_id' => $wr_id, 'data_path' => $data_path, 'edt' => $edt, 'filename' => $filename, 'filepath' => $filepath, 'thumb_width' => $thumb_width, 'thumb_height' => $thumb_height, 'is_create' => $is_create, 'is_crop' => $is_crop, 'crop_mode' => $crop_mode, 'is_sharpen' => $is_sharpen, 'um_value' => $um_value])) { return $thumbnail_info; } @@ -82,7 +82,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ return $empty_array; } - $thumb = array("src" => $src, "ori" => $ori, "alt" => $alt); + $thumb = ["src" => $src, "ori" => $ori, "alt" => $alt]; return $thumb; } @@ -117,7 +117,7 @@ function get_view_thumbnail($contents, $thumb_width = 0) if (empty($matches)) return $contents; - $extensions = array(1 => 'gif', 2 => 'jpg', 3 => 'png', 18 => 'webp'); + $extensions = [1 => 'gif', 2 => 'jpg', 3 => 'png', 18 => 'webp']; for ($i = 0; $i < count($matches[1]); $i++) { @@ -244,7 +244,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h $size = @getimagesize($source_file); - $extensions = array(1 => 'gif', 2 => 'jpg', 3 => 'png', 18 => 'webp'); + $extensions = [1 => 'gif', 2 => 'jpg', 3 => 'png', 18 => 'webp']; $file_ext = $extensions[$size[2]]; // 파일 확장자 if (!$file_ext) return; @@ -638,9 +638,9 @@ function UnsharpMask($img, $amount, $radius, $threshold) if (function_exists('imageconvolution')) { // PHP >= 5.1 $matrix = array( - array(1, 2, 1), - array(2, 4, 2), - array(1, 2, 1) + [1, 2, 1], + [2, 4, 2], + [1, 2, 1] ); $divisor = array_sum(array_map('array_sum', $matrix)); $offset = 0; @@ -762,7 +762,7 @@ function is_animated_webp($filename) function is_animated_gif($filename) { - static $cache = array(); + static $cache = []; $key = md5($filename); if (isset($cache[$key])) { diff --git a/AvocadoAmber/lib/url.lib.php b/AvocadoAmber/lib/url.lib.php index 2d57c5c..2ee16bf 100644 --- a/AvocadoAmber/lib/url.lib.php +++ b/AvocadoAmber/lib/url.lib.php @@ -8,7 +8,7 @@ function get_pretty_url($folder, $no = '', $query_string = '', $action = '') global $g5, $config; $boards = get_board_names(); - $segments = array(); + $segments = []; $url = $add_query = ''; if ($url = run_replace('get_pretty_url', $url, $folder, $no, $query_string, $action)) { @@ -111,7 +111,7 @@ function short_url_clean($string_url, $add_qry = '') $url = parse_url($string_url); $page_name = isset($url['path']) ? basename($url['path'], ".php") : ''; - $array_page_names = run_replace('url_clean_page_names', array('board', 'write', 'content')); + $array_page_names = run_replace('url_clean_page_names', ['board', 'write', 'content']); if (stripos(preg_replace('/^https?:/i', '', $string_url), preg_replace('/^https?:/i', '', G5_BBS_URL)) === false || !in_array($page_name, $array_page_names)) { //게시판이 아니면 리턴 return run_replace('false_short_url_clean', $string_url, $url, $page_name, $array_page_names); @@ -127,15 +127,15 @@ function short_url_clean($string_url, $add_qry = '') if ($page_name === 'write') { $vars['action'] = 'write'; - $allow_param_keys = array('bo_table' => '', 'action' => ''); + $allow_param_keys = ['bo_table' => '', 'action' => '']; } else if ($page_name === 'content') { $vars['action'] = 'content'; - $allow_param_keys = array('action' => '', 'co_id' => ''); + $allow_param_keys = ['action' => '', 'co_id' => '']; } else { - $allow_param_keys = array('bo_table' => '', 'wr_id' => ''); + $allow_param_keys = ['bo_table' => '', 'wr_id' => '']; } - $s = array(); + $s = []; foreach ($allow_param_keys as $key => $v) { if (!isset($vars[$key]) || empty($vars[$key])) @@ -159,7 +159,7 @@ function short_url_clean($string_url, $add_qry = '') if (isset($url['host'])) { - $array_file_paths = run_replace('url_clean_page_paths', array('/' . G5_BBS_DIR . '/board.php', '/' . G5_BBS_DIR . '/write.php', '/' . G5_BBS_DIR . '/content.php')); + $array_file_paths = run_replace('url_clean_page_paths', ['/' . G5_BBS_DIR . '/board.php', '/' . G5_BBS_DIR . '/write.php', '/' . G5_BBS_DIR . '/content.php']); $str_path = isset($url['path']) ? $url['path'] : ''; $http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://'; @@ -354,7 +354,7 @@ function get_nginx_conf_rules($return_string = false) $get_path_url = parse_url(G5_URL); $base_path = isset($get_path_url['path']) ? $get_path_url['path'] . '/' : '/'; - $rules = array(); + $rules = []; $rules[] = '#### ' . G5_VERSION . ' nginx rules BEGIN #####'; if ($add_rules = run_replace('add_nginx_conf_pre_rules', '', $get_path_url, $base_path, $return_string)) { @@ -385,7 +385,7 @@ function get_mod_rewrite_rules($return_string = false) $get_path_url = parse_url(G5_URL); $base_path = isset($get_path_url['path']) ? $get_path_url['path'] . '/' : '/'; - $rules = array(); + $rules = []; $rules[] = '#### ' . G5_VERSION . ' rewrite BEGIN #####'; $rules[] = '
