Vendor updates
This commit is contained in:
parent
98ea166a22
commit
c34d4eafd9
@ -4,7 +4,8 @@
|
|||||||
"cocur/background-process" : "~0.7",
|
"cocur/background-process" : "~0.7",
|
||||||
"tecnickcom/tcpdf" : "~6.2",
|
"tecnickcom/tcpdf" : "~6.2",
|
||||||
"pacificsec/cpe" : "1.0.1",
|
"pacificsec/cpe" : "1.0.1",
|
||||||
"monolog/monolog" : "~1.23"
|
"monolog/monolog" : "~1.23",
|
||||||
|
"openlss/lib-array2xml" : "~0.5"
|
||||||
},
|
},
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"phpunit/phpunit" : "~7.3"
|
"phpunit/phpunit" : "~7.3"
|
||||||
|
123
inc/composer.lock
generated
123
inc/composer.lock
generated
@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "8bf5f4a76098ff9277648c58793a04b5",
|
"content-hash": "0cb5c8b41ce699cfddd3ad1295045652",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "cocur/background-process",
|
"name": "cocur/background-process",
|
||||||
@ -46,16 +46,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "markbaker/complex",
|
"name": "markbaker/complex",
|
||||||
"version": "1.4.6",
|
"version": "1.4.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/MarkBaker/PHPComplex.git",
|
"url": "https://github.com/MarkBaker/PHPComplex.git",
|
||||||
"reference": "a78d82ae4e682c3809fc3023d1b0ce654f6ab12b"
|
"reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/a78d82ae4e682c3809fc3023d1b0ce654f6ab12b",
|
"url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
|
||||||
"reference": "a78d82ae4e682c3809fc3023d1b0ce654f6ab12b",
|
"reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -137,7 +137,7 @@
|
|||||||
"complex",
|
"complex",
|
||||||
"mathematics"
|
"mathematics"
|
||||||
],
|
],
|
||||||
"time": "2018-07-31T08:38:40+00:00"
|
"time": "2018-10-13T23:28:42+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
@ -217,6 +217,55 @@
|
|||||||
],
|
],
|
||||||
"time": "2017-06-19T01:22:40+00:00"
|
"time": "2017-06-19T01:22:40+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "openlss/lib-array2xml",
|
||||||
|
"version": "0.5.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/nullivex/lib-array2xml.git",
|
||||||
|
"reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/c8b5998a342d7861f2e921403f44e0a2f3ef2be0",
|
||||||
|
"reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"LSS": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"Apache-2.0"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Bryan Tong",
|
||||||
|
"email": "contact@nullivex.com",
|
||||||
|
"homepage": "http://bryantong.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Tony Butler",
|
||||||
|
"email": "spudz76@gmail.com",
|
||||||
|
"homepage": "http://openlss.org"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Array2XML conversion library credit to lalit.org",
|
||||||
|
"homepage": "http://openlss.org",
|
||||||
|
"keywords": [
|
||||||
|
"array",
|
||||||
|
"array conversion",
|
||||||
|
"xml",
|
||||||
|
"xml conversion"
|
||||||
|
],
|
||||||
|
"time": "2016-11-10T19:10:18+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "pacificsec/cpe",
|
"name": "pacificsec/cpe",
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
@ -262,16 +311,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpoffice/phpspreadsheet",
|
"name": "phpoffice/phpspreadsheet",
|
||||||
"version": "1.4.0",
|
"version": "1.4.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
|
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
|
||||||
"reference": "125f462a718956f37d81305ca0df4f17cef0f3b9"
|
"reference": "57404f43742a8164b5eac3ab03b962d8740885c1"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/125f462a718956f37d81305ca0df4f17cef0f3b9",
|
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/57404f43742a8164b5eac3ab03b962d8740885c1",
|
||||||
"reference": "125f462a718956f37d81305ca0df4f17cef0f3b9",
|
"reference": "57404f43742a8164b5eac3ab03b962d8740885c1",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -304,7 +353,7 @@
|
|||||||
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
|
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
|
||||||
"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
|
"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
|
||||||
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
|
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
|
||||||
"tecnick.com/tcpdf": "Option for rendering PDF with PDF Writer"
|
"tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -345,7 +394,7 @@
|
|||||||
"xls",
|
"xls",
|
||||||
"xlsx"
|
"xlsx"
|
||||||
],
|
],
|
||||||
"time": "2018-08-06T02:58:06+00:00"
|
"time": "2018-09-30T03:57:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psr/log",
|
"name": "psr/log",
|
||||||
@ -444,16 +493,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "tecnickcom/tcpdf",
|
"name": "tecnickcom/tcpdf",
|
||||||
"version": "6.2.22",
|
"version": "6.2.26",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/tecnickcom/TCPDF.git",
|
"url": "https://github.com/tecnickcom/TCPDF.git",
|
||||||
"reference": "ac6e92fccc7d9383dfd787056831349621b1aca2"
|
"reference": "367241059ca166e3a76490f4448c284e0a161f15"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/ac6e92fccc7d9383dfd787056831349621b1aca2",
|
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/367241059ca166e3a76490f4448c284e0a161f15",
|
||||||
"reference": "ac6e92fccc7d9383dfd787056831349621b1aca2",
|
"reference": "367241059ca166e3a76490f4448c284e0a161f15",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -502,7 +551,7 @@
|
|||||||
"pdf417",
|
"pdf417",
|
||||||
"qrcode"
|
"qrcode"
|
||||||
],
|
],
|
||||||
"time": "2018-09-14T15:26:29+00:00"
|
"time": "2018-10-16T17:24:05+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
@ -927,16 +976,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
"version": "6.0.7",
|
"version": "6.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||||
"reference": "865662550c384bc1db7e51d29aeda1c2c161d69a"
|
"reference": "0685fb6a43aed1b2e09804d1aaf17144c82861f8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0685fb6a43aed1b2e09804d1aaf17144c82861f8",
|
||||||
"reference": "865662550c384bc1db7e51d29aeda1c2c161d69a",
|
"reference": "0685fb6a43aed1b2e09804d1aaf17144c82861f8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -960,7 +1009,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "6.0-dev"
|
"dev-master": "6.1-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -986,7 +1035,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2018-06-01T07:51:50+00:00"
|
"time": "2018-10-16T05:37:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-file-iterator",
|
"name": "phpunit/php-file-iterator",
|
||||||
@ -1179,16 +1228,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "7.3.5",
|
"version": "7.4.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "7b331efabbb628c518c408fdfcaf571156775de2"
|
"reference": "f3837fa1e07758057ae06e8ddec6d06ba183f126"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7b331efabbb628c518c408fdfcaf571156775de2",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3837fa1e07758057ae06e8ddec6d06ba183f126",
|
||||||
"reference": "7b331efabbb628c518c408fdfcaf571156775de2",
|
"reference": "f3837fa1e07758057ae06e8ddec6d06ba183f126",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1213,7 +1262,7 @@
|
|||||||
"sebastian/exporter": "^3.1",
|
"sebastian/exporter": "^3.1",
|
||||||
"sebastian/global-state": "^2.0",
|
"sebastian/global-state": "^2.0",
|
||||||
"sebastian/object-enumerator": "^3.0.3",
|
"sebastian/object-enumerator": "^3.0.3",
|
||||||
"sebastian/resource-operations": "^1.0",
|
"sebastian/resource-operations": "^2.0",
|
||||||
"sebastian/version": "^2.0.1"
|
"sebastian/version": "^2.0.1"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
@ -1233,7 +1282,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "7.3-dev"
|
"dev-master": "7.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -1259,7 +1308,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2018-09-08T15:14:29+00:00"
|
"time": "2018-10-05T04:05:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/code-unit-reverse-lookup",
|
"name": "sebastian/code-unit-reverse-lookup",
|
||||||
@ -1741,25 +1790,25 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/resource-operations",
|
"name": "sebastian/resource-operations",
|
||||||
"version": "1.0.0",
|
"version": "2.0.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/resource-operations.git",
|
"url": "https://github.com/sebastianbergmann/resource-operations.git",
|
||||||
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
|
"reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
|
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
|
||||||
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
|
"reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.6.0"
|
"php": "^7.1"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.0.x-dev"
|
"dev-master": "2.0-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -1779,7 +1828,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Provides a list of PHP built-in functions that operate on resources",
|
"description": "Provides a list of PHP built-in functions that operate on resources",
|
||||||
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
|
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
|
||||||
"time": "2015-07-28T20:34:47+00:00"
|
"time": "2018-10-04T04:07:39+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/version",
|
"name": "sebastian/version",
|
||||||
|
2
inc/vendor/composer/ClassLoader.php
vendored
2
inc/vendor/composer/ClassLoader.php
vendored
@ -377,7 +377,7 @@ class ClassLoader
|
|||||||
$subPath = $class;
|
$subPath = $class;
|
||||||
while (false !== $lastPos = strrpos($subPath, '\\')) {
|
while (false !== $lastPos = strrpos($subPath, '\\')) {
|
||||||
$subPath = substr($subPath, 0, $lastPos);
|
$subPath = substr($subPath, 0, $lastPos);
|
||||||
$search = $subPath.'\\';
|
$search = $subPath . '\\';
|
||||||
if (isset($this->prefixDirsPsr4[$search])) {
|
if (isset($this->prefixDirsPsr4[$search])) {
|
||||||
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
|
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
|
||||||
foreach ($this->prefixDirsPsr4[$search] as $dir) {
|
foreach ($this->prefixDirsPsr4[$search] as $dir) {
|
||||||
|
1
inc/vendor/composer/autoload_namespaces.php
vendored
1
inc/vendor/composer/autoload_namespaces.php
vendored
@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
|
|||||||
$baseDir = dirname($vendorDir);
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
|
'LSS' => array($vendorDir . '/openlss/lib-array2xml'),
|
||||||
);
|
);
|
||||||
|
11
inc/vendor/composer/autoload_static.php
vendored
11
inc/vendor/composer/autoload_static.php
vendored
@ -101,6 +101,16 @@ class ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
public static $prefixesPsr0 = array (
|
||||||
|
'L' =>
|
||||||
|
array (
|
||||||
|
'LSS' =>
|
||||||
|
array (
|
||||||
|
0 => __DIR__ . '/..' . '/openlss/lib-array2xml',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
public static $classMap = array (
|
public static $classMap = array (
|
||||||
'Datamatrix' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
|
'Datamatrix' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/datamatrix.php',
|
||||||
'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
|
'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
|
||||||
@ -123,6 +133,7 @@ class ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72
|
|||||||
return \Closure::bind(function () use ($loader) {
|
return \Closure::bind(function () use ($loader) {
|
||||||
$loader->prefixLengthsPsr4 = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$prefixLengthsPsr4;
|
$loader->prefixLengthsPsr4 = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$prefixLengthsPsr4;
|
||||||
$loader->prefixDirsPsr4 = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$prefixDirsPsr4;
|
$loader->prefixDirsPsr4 = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$prefixDirsPsr4;
|
||||||
|
$loader->prefixesPsr0 = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$prefixesPsr0;
|
||||||
$loader->classMap = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$classMap;
|
$loader->classMap = ComposerStaticInit69a0c53551ee5f4e61c53efb549e5e72::$classMap;
|
||||||
|
|
||||||
}, null, ClassLoader::class);
|
}, null, ClassLoader::class);
|
||||||
|
89
inc/vendor/composer/installed.json
vendored
89
inc/vendor/composer/installed.json
vendored
@ -41,17 +41,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "markbaker/complex",
|
"name": "markbaker/complex",
|
||||||
"version": "1.4.6",
|
"version": "1.4.7",
|
||||||
"version_normalized": "1.4.6.0",
|
"version_normalized": "1.4.7.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/MarkBaker/PHPComplex.git",
|
"url": "https://github.com/MarkBaker/PHPComplex.git",
|
||||||
"reference": "a78d82ae4e682c3809fc3023d1b0ce654f6ab12b"
|
"reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/a78d82ae4e682c3809fc3023d1b0ce654f6ab12b",
|
"url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
|
||||||
"reference": "a78d82ae4e682c3809fc3023d1b0ce654f6ab12b",
|
"reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -67,7 +67,7 @@
|
|||||||
"sebastian/phpcpd": "2.*",
|
"sebastian/phpcpd": "2.*",
|
||||||
"squizlabs/php_codesniffer": "^3.3.0"
|
"squizlabs/php_codesniffer": "^3.3.0"
|
||||||
},
|
},
|
||||||
"time": "2018-07-31T08:38:40+00:00",
|
"time": "2018-10-13T23:28:42+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -216,6 +216,57 @@
|
|||||||
"psr-3"
|
"psr-3"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "openlss/lib-array2xml",
|
||||||
|
"version": "0.5.1",
|
||||||
|
"version_normalized": "0.5.1.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/nullivex/lib-array2xml.git",
|
||||||
|
"reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/c8b5998a342d7861f2e921403f44e0a2f3ef2be0",
|
||||||
|
"reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.2"
|
||||||
|
},
|
||||||
|
"time": "2016-11-10T19:10:18+00:00",
|
||||||
|
"type": "library",
|
||||||
|
"installation-source": "dist",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"LSS": ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"Apache-2.0"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Bryan Tong",
|
||||||
|
"email": "contact@nullivex.com",
|
||||||
|
"homepage": "http://bryantong.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Tony Butler",
|
||||||
|
"email": "spudz76@gmail.com",
|
||||||
|
"homepage": "http://openlss.org"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Array2XML conversion library credit to lalit.org",
|
||||||
|
"homepage": "http://openlss.org",
|
||||||
|
"keywords": [
|
||||||
|
"array",
|
||||||
|
"array conversion",
|
||||||
|
"xml",
|
||||||
|
"xml conversion"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "pacificsec/cpe",
|
"name": "pacificsec/cpe",
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
@ -263,17 +314,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpoffice/phpspreadsheet",
|
"name": "phpoffice/phpspreadsheet",
|
||||||
"version": "1.4.0",
|
"version": "1.4.1",
|
||||||
"version_normalized": "1.4.0.0",
|
"version_normalized": "1.4.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
|
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
|
||||||
"reference": "125f462a718956f37d81305ca0df4f17cef0f3b9"
|
"reference": "57404f43742a8164b5eac3ab03b962d8740885c1"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/125f462a718956f37d81305ca0df4f17cef0f3b9",
|
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/57404f43742a8164b5eac3ab03b962d8740885c1",
|
||||||
"reference": "125f462a718956f37d81305ca0df4f17cef0f3b9",
|
"reference": "57404f43742a8164b5eac3ab03b962d8740885c1",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -306,9 +357,9 @@
|
|||||||
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
|
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
|
||||||
"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
|
"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
|
||||||
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
|
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
|
||||||
"tecnick.com/tcpdf": "Option for rendering PDF with PDF Writer"
|
"tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
|
||||||
},
|
},
|
||||||
"time": "2018-08-06T02:58:06+00:00",
|
"time": "2018-09-30T03:57:24+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "source",
|
"installation-source": "source",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -451,23 +502,23 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "tecnickcom/tcpdf",
|
"name": "tecnickcom/tcpdf",
|
||||||
"version": "6.2.22",
|
"version": "6.2.26",
|
||||||
"version_normalized": "6.2.22.0",
|
"version_normalized": "6.2.26.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/tecnickcom/TCPDF.git",
|
"url": "https://github.com/tecnickcom/TCPDF.git",
|
||||||
"reference": "ac6e92fccc7d9383dfd787056831349621b1aca2"
|
"reference": "367241059ca166e3a76490f4448c284e0a161f15"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/ac6e92fccc7d9383dfd787056831349621b1aca2",
|
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/367241059ca166e3a76490f4448c284e0a161f15",
|
||||||
"reference": "ac6e92fccc7d9383dfd787056831349621b1aca2",
|
"reference": "367241059ca166e3a76490f4448c284e0a161f15",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.0"
|
"php": ">=5.3.0"
|
||||||
},
|
},
|
||||||
"time": "2018-09-14T15:26:29+00:00",
|
"time": "2018-10-16T17:24:05+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"installation-source": "dist",
|
"installation-source": "dist",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
1
inc/vendor/markbaker/complex/README.md
vendored
1
inc/vendor/markbaker/complex/README.md
vendored
@ -9,6 +9,7 @@ Master: [![Build Status](https://travis-ci.org/MarkBaker/PHPComplex.png?branch=m
|
|||||||
|
|
||||||
Develop: [![Build Status](https://travis-ci.org/MarkBaker/PHPComplex.png?branch=develop)](http://travis-ci.org/MarkBaker/PHPComplex)
|
Develop: [![Build Status](https://travis-ci.org/MarkBaker/PHPComplex.png?branch=develop)](http://travis-ci.org/MarkBaker/PHPComplex)
|
||||||
|
|
||||||
|
[![Complex Numbers](https://imgs.xkcd.com/comics/complex_numbers_2x.png)](https://xkcd.com/2028/)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ class Autoloader
|
|||||||
spl_autoload_register('__autoload');
|
spl_autoload_register('__autoload');
|
||||||
}
|
}
|
||||||
// Register ourselves with SPL
|
// Register ourselves with SPL
|
||||||
return spl_autoload_register(['Complex\Autoloader', 'Load']);
|
return spl_autoload_register(['Complex\\Autoloader', 'Load']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ class Autoloader
|
|||||||
|
|
||||||
$pClassFilePath = __DIR__ . DIRECTORY_SEPARATOR .
|
$pClassFilePath = __DIR__ . DIRECTORY_SEPARATOR .
|
||||||
'src' . DIRECTORY_SEPARATOR .
|
'src' . DIRECTORY_SEPARATOR .
|
||||||
str_replace('Complex\\', '', $pClassName) .
|
str_replace(['Complex\\', '\\'], ['', '/'], $pClassName) .
|
||||||
'.php';
|
'.php';
|
||||||
|
|
||||||
if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
|
if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
|
||||||
|
14
inc/vendor/markbaker/complex/composer.json
vendored
14
inc/vendor/markbaker/complex/composer.json
vendored
@ -73,5 +73,19 @@
|
|||||||
"classes/src/operations/divideinto.php"
|
"classes/src/operations/divideinto.php"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"scripts": {
|
||||||
|
"style": [
|
||||||
|
"phpcs --report-width=200 --report-summary --report-full classes/src/ --standard=PSR2 -n"
|
||||||
|
],
|
||||||
|
"mess": [
|
||||||
|
"phpmd classes/src/ xml codesize,unusedcode,design,naming -n"
|
||||||
|
],
|
||||||
|
"lines": [
|
||||||
|
"phploc classes/src/ -n"
|
||||||
|
],
|
||||||
|
"cpd": [
|
||||||
|
"phpcpd classes/src/ -n"
|
||||||
|
]
|
||||||
|
},
|
||||||
"minimum-stability": "dev"
|
"minimum-stability": "dev"
|
||||||
}
|
}
|
2
inc/vendor/openlss/lib-array2xml/.gitignore
vendored
Normal file
2
inc/vendor/openlss/lib-array2xml/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
/vendor
|
||||||
|
/composer.lock
|
674
inc/vendor/openlss/lib-array2xml/COPYING
vendored
Normal file
674
inc/vendor/openlss/lib-array2xml/COPYING
vendored
Normal file
@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
165
inc/vendor/openlss/lib-array2xml/COPYING LESSER
vendored
Normal file
165
inc/vendor/openlss/lib-array2xml/COPYING LESSER
vendored
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser General Public License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
205
inc/vendor/openlss/lib-array2xml/LSS/Array2XML.php
vendored
Normal file
205
inc/vendor/openlss/lib-array2xml/LSS/Array2XML.php
vendored
Normal file
@ -0,0 +1,205 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* OpenLSS - Lighter Smarter Simpler
|
||||||
|
*
|
||||||
|
* This file is part of OpenLSS.
|
||||||
|
*
|
||||||
|
* OpenLSS is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* OpenLSS is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the
|
||||||
|
* GNU Lesser General Public License along with OpenLSS.
|
||||||
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
namespace LSS;
|
||||||
|
|
||||||
|
use \DomDocument;
|
||||||
|
use \Exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Array2XML: A class to convert array in PHP to XML
|
||||||
|
* It also takes into account attributes names unlike SimpleXML in PHP
|
||||||
|
* It returns the XML in form of DOMDocument class for further manipulation.
|
||||||
|
* It throws exception if the tag name or attribute name has illegal chars.
|
||||||
|
*
|
||||||
|
* Author : Lalit Patel
|
||||||
|
* Website: http://www.lalit.org/lab/convert-php-array-to-xml-with-attributes
|
||||||
|
* License: Apache License 2.0
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* Version: 0.1 (10 July 2011)
|
||||||
|
* Version: 0.2 (16 August 2011)
|
||||||
|
* - replaced htmlentities() with htmlspecialchars() (Thanks to Liel Dulev)
|
||||||
|
* - fixed a edge case where root node has a false/null/0 value. (Thanks to Liel Dulev)
|
||||||
|
* Version: 0.3 (22 August 2011)
|
||||||
|
* - fixed tag sanitize regex which didn't allow tagnames with single character.
|
||||||
|
* Version: 0.4 (18 September 2011)
|
||||||
|
* - Added support for CDATA section using @cdata instead of @value.
|
||||||
|
* Version: 0.5 (07 December 2011)
|
||||||
|
* - Changed logic to check numeric array indices not starting from 0.
|
||||||
|
* Version: 0.6 (04 March 2012)
|
||||||
|
* - Code now doesn't @cdata to be placed in an empty array
|
||||||
|
* Version: 0.7 (24 March 2012)
|
||||||
|
* - Reverted to version 0.5
|
||||||
|
* Version: 0.8 (02 May 2012)
|
||||||
|
* - Removed htmlspecialchars() before adding to text node or attributes.
|
||||||
|
* Version: 0.11 (28 October 2015)
|
||||||
|
* - Fixed typos; Added support for plain insertion of XML trough @xml.
|
||||||
|
*
|
||||||
|
* Usage:
|
||||||
|
* $xml = Array2XML::createXML('root_node_name', $php_array);
|
||||||
|
* echo $xml->saveXML();
|
||||||
|
*/
|
||||||
|
class Array2XML {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var DOMDocument
|
||||||
|
*/
|
||||||
|
private static $xml = null;
|
||||||
|
private static $encoding = 'UTF-8';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize the root XML node [optional]
|
||||||
|
* @param $version
|
||||||
|
* @param $encoding
|
||||||
|
* @param $format_output
|
||||||
|
*/
|
||||||
|
public static function init($version = '1.0', $encoding = 'UTF-8', $format_output = true) {
|
||||||
|
self::$xml = new DomDocument($version, $encoding);
|
||||||
|
self::$xml->formatOutput = $format_output;
|
||||||
|
self::$encoding = $encoding;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert an Array to XML
|
||||||
|
* @param string $node_name - name of the root node to be converted
|
||||||
|
* @param array $arr - aray to be converterd
|
||||||
|
* @return DomDocument
|
||||||
|
*/
|
||||||
|
public static function &createXML($node_name, $arr = array()) {
|
||||||
|
$xml = self::getXMLRoot();
|
||||||
|
$xml->appendChild(self::convert($node_name, $arr));
|
||||||
|
|
||||||
|
self::$xml = null; // clear the xml node in the class for 2nd time use.
|
||||||
|
return $xml;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert an Array to XML.
|
||||||
|
*
|
||||||
|
* @param string $node_name
|
||||||
|
* Name of the root node to be converted.
|
||||||
|
* @param array $arr
|
||||||
|
* Array to be converted.
|
||||||
|
*
|
||||||
|
* @throws \Exception
|
||||||
|
*
|
||||||
|
* @return \DOMNode
|
||||||
|
*/
|
||||||
|
private static function &convert($node_name, $arr = array()) {
|
||||||
|
|
||||||
|
//print_arr($node_name);
|
||||||
|
$xml = self::getXMLRoot();
|
||||||
|
$node = $xml->createElement($node_name);
|
||||||
|
|
||||||
|
if (is_array($arr)) {
|
||||||
|
// get the attributes first.;
|
||||||
|
if (isset($arr['@attributes'])) {
|
||||||
|
foreach ($arr['@attributes'] as $key => $value) {
|
||||||
|
if (!self::isValidTagName($key)) {
|
||||||
|
throw new Exception('[Array2XML] Illegal character in attribute name. attribute: ' . $key . ' in node: ' . $node_name);
|
||||||
|
}
|
||||||
|
$node->setAttribute($key, self::bool2str($value));
|
||||||
|
}
|
||||||
|
unset($arr['@attributes']); //remove the key from the array once done.
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if it has a value stored in @value, if yes store the value and return
|
||||||
|
// else check if its directly stored as string
|
||||||
|
if (isset($arr['@value'])) {
|
||||||
|
$node->appendChild($xml->createTextNode(self::bool2str($arr['@value'])));
|
||||||
|
unset($arr['@value']); //remove the key from the array once done.
|
||||||
|
//return from recursion, as a note with value cannot have child nodes.
|
||||||
|
return $node;
|
||||||
|
} else if (isset($arr['@cdata'])) {
|
||||||
|
$node->appendChild($xml->createCDATASection(self::bool2str($arr['@cdata'])));
|
||||||
|
unset($arr['@cdata']); //remove the key from the array once done.
|
||||||
|
//return from recursion, as a note with cdata cannot have child nodes.
|
||||||
|
return $node;
|
||||||
|
}
|
||||||
|
else if (isset($arr['@xml'])) {
|
||||||
|
$fragment = $xml->createDocumentFragment();
|
||||||
|
$fragment->appendXML($arr['@xml']);
|
||||||
|
$node->appendChild($fragment);
|
||||||
|
unset($arr['@xml']);
|
||||||
|
return $node;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//create subnodes using recursion
|
||||||
|
if (is_array($arr)) {
|
||||||
|
// recurse to get the node for that key
|
||||||
|
foreach ($arr as $key => $value) {
|
||||||
|
if (!self::isValidTagName($key)) {
|
||||||
|
throw new Exception('[Array2XML] Illegal character in tag name. tag: ' . $key . ' in node: ' . $node_name);
|
||||||
|
}
|
||||||
|
if (is_array($value) && is_numeric(key($value))) {
|
||||||
|
// MORE THAN ONE NODE OF ITS KIND;
|
||||||
|
// if the new array is numeric index, means it is array of nodes of the same kind
|
||||||
|
// it should follow the parent key name
|
||||||
|
foreach ($value as $k => $v) {
|
||||||
|
$node->appendChild(self::convert($key, $v));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// ONLY ONE NODE OF ITS KIND
|
||||||
|
$node->appendChild(self::convert($key, $value));
|
||||||
|
}
|
||||||
|
unset($arr[$key]); //remove the key from the array once done.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// after we are done with all the keys in the array (if it is one)
|
||||||
|
// we check if it has any text value, if yes, append it.
|
||||||
|
if (!is_array($arr)) {
|
||||||
|
$node->appendChild($xml->createTextNode(self::bool2str($arr)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $node;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get the root XML node, if there isn't one, create it.
|
||||||
|
*/
|
||||||
|
private static function getXMLRoot() {
|
||||||
|
if (empty(self::$xml)) {
|
||||||
|
self::init();
|
||||||
|
}
|
||||||
|
return self::$xml;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get string representation of boolean value
|
||||||
|
*/
|
||||||
|
private static function bool2str($v) {
|
||||||
|
//convert boolean to text value.
|
||||||
|
$v = $v === true ? 'true' : $v;
|
||||||
|
$v = $v === false ? 'false' : $v;
|
||||||
|
return $v;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check if the tag name or attribute name contains illegal characters
|
||||||
|
* Ref: http://www.w3.org/TR/xml/#sec-common-syn
|
||||||
|
*/
|
||||||
|
private static function isValidTagName($tag) {
|
||||||
|
$pattern = '/^[a-z_]+[a-z0-9\:\-\.\_]*[^:]*$/i';
|
||||||
|
return preg_match($pattern, $tag, $matches) && $matches[0] == $tag;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
169
inc/vendor/openlss/lib-array2xml/LSS/XML2Array.php
vendored
Normal file
169
inc/vendor/openlss/lib-array2xml/LSS/XML2Array.php
vendored
Normal file
@ -0,0 +1,169 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* OpenLSS - Lighter Smarter Simpler
|
||||||
|
*
|
||||||
|
* This file is part of OpenLSS.
|
||||||
|
*
|
||||||
|
* OpenLSS is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* OpenLSS is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the
|
||||||
|
* GNU Lesser General Public License along with OpenLSS.
|
||||||
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
namespace LSS;
|
||||||
|
use \DOMDocument;
|
||||||
|
use \Exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* XML2Array: A class to convert XML to array in PHP
|
||||||
|
* It returns the array which can be converted back to XML using the Array2XML script
|
||||||
|
* It takes an XML string or a DOMDocument object as an input.
|
||||||
|
*
|
||||||
|
* See Array2XML: http://www.lalit.org/lab/convert-php-array-to-xml-with-attributes
|
||||||
|
*
|
||||||
|
* Author : Lalit Patel
|
||||||
|
* Website: http://www.lalit.org/lab/convert-xml-to-array-in-php-xml2array
|
||||||
|
* License: Apache License 2.0
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* Version: 0.1 (07 Dec 2011)
|
||||||
|
* Version: 0.2 (04 Mar 2012)
|
||||||
|
* Fixed typo 'DomDocument' to 'DOMDocument'
|
||||||
|
*
|
||||||
|
* Usage:
|
||||||
|
* $array = XML2Array::createArray($xml);
|
||||||
|
*/
|
||||||
|
|
||||||
|
class XML2Array {
|
||||||
|
|
||||||
|
protected static $xml = null;
|
||||||
|
protected static $encoding = 'UTF-8';
|
||||||
|
protected static $prefix_attributes = '@';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize the root XML node [optional]
|
||||||
|
* @param $version
|
||||||
|
* @param $encoding
|
||||||
|
* @param $format_output
|
||||||
|
*/
|
||||||
|
public static function init($version = '1.0', $encoding = 'UTF-8', $format_output = true) {
|
||||||
|
self::$xml = new DOMDocument($version, $encoding);
|
||||||
|
self::$xml->formatOutput = $format_output;
|
||||||
|
self::$encoding = $encoding;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert an XML to Array
|
||||||
|
* @param string $node_name - name of the root node to be converted
|
||||||
|
* @param int - Bitwise OR of the libxml option constants see @link http://php.net/manual/zh/libxml.constants.php
|
||||||
|
* @param array $arr - aray to be converterd
|
||||||
|
* @return DOMDocument
|
||||||
|
*/
|
||||||
|
public static function &createArray($input_xml, $options = 0) {
|
||||||
|
$xml = self::getXMLRoot();
|
||||||
|
if(is_string($input_xml)) {
|
||||||
|
$parsed = $xml->loadXML($input_xml, $options);
|
||||||
|
if(!$parsed) {
|
||||||
|
throw new Exception('[XML2Array] Error parsing the XML string.');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if(get_class($input_xml) != 'DOMDocument') {
|
||||||
|
throw new Exception('[XML2Array] The input XML object should be of type: DOMDocument.');
|
||||||
|
}
|
||||||
|
$xml = self::$xml = $input_xml;
|
||||||
|
}
|
||||||
|
$array[$xml->documentElement->tagName] = self::convert($xml->documentElement);
|
||||||
|
self::$xml = null; // clear the xml node in the class for 2nd time use.
|
||||||
|
return $array;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert an Array to XML
|
||||||
|
* @param mixed $node - XML as a string or as an object of DOMDocument
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
protected static function &convert($node) {
|
||||||
|
$output = array();
|
||||||
|
|
||||||
|
switch ($node->nodeType) {
|
||||||
|
case XML_CDATA_SECTION_NODE:
|
||||||
|
$output[static::$prefix_attributes.'cdata'] = trim($node->textContent);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case XML_TEXT_NODE:
|
||||||
|
$output = trim($node->textContent);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case XML_ELEMENT_NODE:
|
||||||
|
|
||||||
|
// for each child node, call the covert function recursively
|
||||||
|
for ($i=0, $m=$node->childNodes->length; $i<$m; $i++) {
|
||||||
|
$child = $node->childNodes->item($i);
|
||||||
|
$v = self::convert($child);
|
||||||
|
if(isset($child->tagName)) {
|
||||||
|
$t = $child->tagName;
|
||||||
|
|
||||||
|
// avoid fatal error if the content looks like '<html><body>You are being <a href="https://some.url">redirected</a>.</body></html>'
|
||||||
|
if(isset($output) && !is_array($output)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// assume more nodes of same kind are coming
|
||||||
|
if(!isset($output[$t])) {
|
||||||
|
$output[$t] = array();
|
||||||
|
}
|
||||||
|
$output[$t][] = $v;
|
||||||
|
} else {
|
||||||
|
//check if it is not an empty text node
|
||||||
|
if($v !== '') {
|
||||||
|
$output = $v;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(is_array($output)) {
|
||||||
|
// if only one node of its kind, assign it directly instead if array($value);
|
||||||
|
foreach ($output as $t => $v) {
|
||||||
|
if(is_array($v) && count($v)==1) {
|
||||||
|
$output[$t] = $v[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(empty($output)) {
|
||||||
|
//for empty nodes
|
||||||
|
$output = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// loop through the attributes and collect them
|
||||||
|
if($node->attributes->length) {
|
||||||
|
$a = array();
|
||||||
|
foreach($node->attributes as $attrName => $attrNode) {
|
||||||
|
$a[$attrName] = (string) $attrNode->value;
|
||||||
|
}
|
||||||
|
// if its an leaf node, store the value in @value instead of directly storing it.
|
||||||
|
if(!is_array($output)) {
|
||||||
|
$output = array(static::$prefix_attributes.'value' => $output);
|
||||||
|
}
|
||||||
|
$output[static::$prefix_attributes.'attributes'] = $a;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $output;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get the root XML node, if there isn't one, create it.
|
||||||
|
*/
|
||||||
|
protected static function getXMLRoot(){
|
||||||
|
if(empty(self::$xml)) {
|
||||||
|
self::init();
|
||||||
|
}
|
||||||
|
return self::$xml;
|
||||||
|
}
|
||||||
|
}
|
69
inc/vendor/openlss/lib-array2xml/README.md
vendored
Normal file
69
inc/vendor/openlss/lib-array2xml/README.md
vendored
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
lib-array2xml
|
||||||
|
=============
|
||||||
|
|
||||||
|
Array2XML conversion library credit to lalit.org
|
||||||
|
|
||||||
|
Usage
|
||||||
|
----
|
||||||
|
```php
|
||||||
|
//create XML
|
||||||
|
$xml = Array2XML::createXML('root_node_name', $php_array);
|
||||||
|
echo $xml->saveXML();
|
||||||
|
|
||||||
|
//create Array
|
||||||
|
$array = XML2Array::createArray($xml);
|
||||||
|
print_r($array);
|
||||||
|
```
|
||||||
|
|
||||||
|
Array2XML
|
||||||
|
----
|
||||||
|
|
||||||
|
@xml example:
|
||||||
|
```php
|
||||||
|
// Build the array that should be transformed into a XML object.
|
||||||
|
$array = [
|
||||||
|
'title' => 'A title',
|
||||||
|
'body' => [
|
||||||
|
'@xml' => '<html><body><p>The content for the news item</p></body></html>',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
// Use the Array2XML object to transform it.
|
||||||
|
$xml = Array2XML::createXML('news', $array);
|
||||||
|
echo $xml->saveXML();
|
||||||
|
```
|
||||||
|
This will result in the following.
|
||||||
|
```xml
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<news>
|
||||||
|
<title>A title</title>
|
||||||
|
<body>
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
<p>The content for the news item</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
</body>
|
||||||
|
</news>
|
||||||
|
```
|
||||||
|
|
||||||
|
Reference
|
||||||
|
----
|
||||||
|
More complete references can be found here
|
||||||
|
http://www.lalit.org/lab/convert-xml-to-array-in-php-xml2array/
|
||||||
|
http://www.lalit.org/lab/convert-php-array-to-xml-with-attributes/
|
||||||
|
|
||||||
|
## Changelog
|
||||||
|
|
||||||
|
### 0.5.1
|
||||||
|
* Fix fata error when the array passed is empty fixed by pull request #6
|
||||||
|
|
||||||
|
### 0.5.0
|
||||||
|
* add second parameter to XML2Array::createArray for DOMDocument::load, e.g: LIBXML_NOCDATA
|
||||||
|
* change method visibility from private to protected for overloading
|
||||||
|
* Merge pull request #5 to add child xml
|
||||||
|
* Merge pull request #4 to change method visibility and add second parameter for load.
|
||||||
|
|
||||||
|
|
||||||
|
### 0.1.0
|
||||||
|
* Initial Release
|
33
inc/vendor/openlss/lib-array2xml/composer.json
vendored
Normal file
33
inc/vendor/openlss/lib-array2xml/composer.json
vendored
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"name": "openlss/lib-array2xml"
|
||||||
|
,"homepage": "http://openlss.org"
|
||||||
|
,"description": "Array2XML conversion library credit to lalit.org"
|
||||||
|
,"license": "Apache-2.0"
|
||||||
|
,"type": "library"
|
||||||
|
,"keywords": [
|
||||||
|
"array"
|
||||||
|
,"xml"
|
||||||
|
,"xml conversion"
|
||||||
|
,"array conversion"
|
||||||
|
]
|
||||||
|
,"authors": [
|
||||||
|
{
|
||||||
|
"name": "Bryan Tong"
|
||||||
|
,"email": "contact@nullivex.com"
|
||||||
|
,"homepage": "http://bryantong.com"
|
||||||
|
}
|
||||||
|
,{
|
||||||
|
"name": "Tony Butler"
|
||||||
|
,"email": "spudz76@gmail.com"
|
||||||
|
,"homepage": "http://openlss.org"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
,"require": {
|
||||||
|
"php": ">=5.3.2"
|
||||||
|
}
|
||||||
|
,"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"LSS": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
The format is based on [Keep a Changelog](http://keepachangelog.com/)
|
||||||
and this project adheres to [Semantic Versioning](http://semver.org/).
|
and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
|
## [1.4.1] - 2018-09-30
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Remove locale from formatting string - [#644](https://github.com/PHPOffice/PhpSpreadsheet/pull/644)
|
||||||
|
- Allow iterators to go out of bounds with prev - [#587](https://github.com/PHPOffice/PhpSpreadsheet/issues/587)
|
||||||
|
- Fix warning when reading xlsx without styles - [#631](https://github.com/PHPOffice/PhpSpreadsheet/pull/631)
|
||||||
|
- Fix broken sample links on windows due to $baseDir having backslash - [#653](https://github.com/PHPOffice/PhpSpreadsheet/pull/653)
|
||||||
|
|
||||||
## [1.4.0] - 2018-08-06
|
## [1.4.0] - 2018-08-06
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
@ -61,7 +61,7 @@
|
|||||||
"suggest": {
|
"suggest": {
|
||||||
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
|
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
|
||||||
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
|
"dompdf/dompdf": "Option for rendering PDF with PDF Writer",
|
||||||
"tecnick.com/tcpdf": "Option for rendering PDF with PDF Writer",
|
"tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer",
|
||||||
"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
|
"jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -43,7 +43,7 @@ usage of PhpSpreadsheet.
|
|||||||
## Common use cases
|
## Common use cases
|
||||||
|
|
||||||
PhpSpreadsheet does not ship with alternative cache implementation. It is up to
|
PhpSpreadsheet does not ship with alternative cache implementation. It is up to
|
||||||
you to select the most appropriate implementation for your environnement. You
|
you to select the most appropriate implementation for your environment. You
|
||||||
can either implement [PSR-16](http://www.php-fig.org/psr/psr-16/) from scratch,
|
can either implement [PSR-16](http://www.php-fig.org/psr/psr-16/) from scratch,
|
||||||
or use [pre-existing libraries](https://packagist.org/search/?q=psr-16).
|
or use [pre-existing libraries](https://packagist.org/search/?q=psr-16).
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ class Sample
|
|||||||
|
|
||||||
$files = [];
|
$files = [];
|
||||||
foreach ($regex as $file) {
|
foreach ($regex as $file) {
|
||||||
$file = str_replace($baseDir . '/', '', $file[0]);
|
$file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0]));
|
||||||
$info = pathinfo($file);
|
$info = pathinfo($file);
|
||||||
$category = str_replace('_', ' ', $info['dirname']);
|
$category = str_replace('_', ' ', $info['dirname']);
|
||||||
$name = str_replace('_', ' ', preg_replace('/(|\.php)/', '', $info['filename']));
|
$name = str_replace('_', ' ', preg_replace('/(|\.php)/', '', $info['filename']));
|
||||||
|
@ -1127,7 +1127,7 @@ class Xls extends BaseReader
|
|||||||
// TODO: Why is there no BSE Index? Is this a new Office Version? Password protected field?
|
// TODO: Why is there no BSE Index? Is this a new Office Version? Password protected field?
|
||||||
// More likely : a uncompatible picture
|
// More likely : a uncompatible picture
|
||||||
if (!$BSEindex) {
|
if (!$BSEindex) {
|
||||||
continue;
|
continue 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
|
$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
|
||||||
|
@ -643,7 +643,7 @@ class Xlsx extends BaseReader
|
|||||||
$excel->addCellXf($objStyle);
|
$excel->addCellXf($objStyle);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
|
foreach (isset($xmlStyles->cellStyleXfs->xf) ? $xmlStyles->cellStyleXfs->xf : [] as $xf) {
|
||||||
$numFmt = NumberFormat::FORMAT_GENERAL;
|
$numFmt = NumberFormat::FORMAT_GENERAL;
|
||||||
if ($numFmts && $xf['numFmtId']) {
|
if ($numFmts && $xf['numFmtId']) {
|
||||||
$tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
|
$tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
|
||||||
|
@ -320,7 +320,7 @@ class OLE
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
continue;
|
break;
|
||||||
}
|
}
|
||||||
fseek($fh, 1, SEEK_CUR);
|
fseek($fh, 1, SEEK_CUR);
|
||||||
$pps->Type = $type;
|
$pps->Type = $type;
|
||||||
|
@ -691,6 +691,9 @@ class NumberFormat extends Supervisor
|
|||||||
// Strip #
|
// Strip #
|
||||||
$format = preg_replace('/\\#/', '0', $format);
|
$format = preg_replace('/\\#/', '0', $format);
|
||||||
|
|
||||||
|
// Remove locale code [$-###]
|
||||||
|
$format = preg_replace('/\[\$\-.*\]/', '', $format);
|
||||||
|
|
||||||
$n = '/\\[[^\\]]+\\]/';
|
$n = '/\\[[^\\]]+\\]/';
|
||||||
$m = preg_replace($n, '', $format);
|
$m = preg_replace($n, '', $format);
|
||||||
$number_regex = '/(0+)(\\.?)(0*)/';
|
$number_regex = '/(0+)(\\.?)(0*)/';
|
||||||
|
@ -153,10 +153,6 @@ class ColumnCellIterator extends CellIterator
|
|||||||
*/
|
*/
|
||||||
public function prev()
|
public function prev()
|
||||||
{
|
{
|
||||||
if ($this->currentRow <= $this->startRow) {
|
|
||||||
throw new PhpSpreadsheetException("Row is already at the beginning of range ({$this->startRow} - {$this->endRow})");
|
|
||||||
}
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
--$this->currentRow;
|
--$this->currentRow;
|
||||||
} while (($this->onlyExistingCells) &&
|
} while (($this->onlyExistingCells) &&
|
||||||
@ -171,7 +167,7 @@ class ColumnCellIterator extends CellIterator
|
|||||||
*/
|
*/
|
||||||
public function valid()
|
public function valid()
|
||||||
{
|
{
|
||||||
return $this->currentRow <= $this->endRow;
|
return $this->currentRow <= $this->endRow && $this->currentRow >= $this->startRow;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -157,14 +157,9 @@ class ColumnIterator implements \Iterator
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the iterator to its previous value.
|
* Set the iterator to its previous value.
|
||||||
*
|
|
||||||
* @throws PhpSpreadsheetException
|
|
||||||
*/
|
*/
|
||||||
public function prev()
|
public function prev()
|
||||||
{
|
{
|
||||||
if ($this->currentColumnIndex <= $this->startColumnIndex) {
|
|
||||||
throw new PhpSpreadsheetException('Column is already at the beginning of range (' . Coordinate::stringFromColumnIndex($this->endColumnIndex) . ' - ' . Coordinate::stringFromColumnIndex($this->endColumnIndex) . ')');
|
|
||||||
}
|
|
||||||
--$this->currentColumnIndex;
|
--$this->currentColumnIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,6 +170,6 @@ class ColumnIterator implements \Iterator
|
|||||||
*/
|
*/
|
||||||
public function valid()
|
public function valid()
|
||||||
{
|
{
|
||||||
return $this->currentColumnIndex <= $this->endColumnIndex;
|
return $this->currentColumnIndex <= $this->endColumnIndex && $this->currentColumnIndex >= $this->startColumnIndex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ class Iterator implements \Iterator
|
|||||||
*
|
*
|
||||||
* @param Spreadsheet $subject
|
* @param Spreadsheet $subject
|
||||||
*/
|
*/
|
||||||
public function __construct(Spreadsheet $subject = null)
|
public function __construct(Spreadsheet $subject)
|
||||||
{
|
{
|
||||||
// Set subject
|
// Set subject
|
||||||
$this->subject = $subject;
|
$this->subject = $subject;
|
||||||
@ -82,6 +82,6 @@ class Iterator implements \Iterator
|
|||||||
*/
|
*/
|
||||||
public function valid()
|
public function valid()
|
||||||
{
|
{
|
||||||
return $this->position < $this->subject->getSheetCount();
|
return $this->position < $this->subject->getSheetCount() && $this->position >= 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -155,9 +155,6 @@ class RowCellIterator extends CellIterator
|
|||||||
*/
|
*/
|
||||||
public function prev()
|
public function prev()
|
||||||
{
|
{
|
||||||
if ($this->currentColumnIndex <= $this->startColumnIndex) {
|
|
||||||
throw new PhpSpreadsheetException('Column is already at the beginning of range (' . Coordinate::stringFromColumnIndex($this->endColumnIndex) . ' - ' . Coordinate::stringFromColumnIndex($this->endColumnIndex) . ')');
|
|
||||||
}
|
|
||||||
do {
|
do {
|
||||||
--$this->currentColumnIndex;
|
--$this->currentColumnIndex;
|
||||||
} while (($this->onlyExistingCells) && (!$this->worksheet->cellExistsByColumnAndRow($this->currentColumnIndex, $this->rowIndex)) && ($this->currentColumnIndex >= $this->startColumnIndex));
|
} while (($this->onlyExistingCells) && (!$this->worksheet->cellExistsByColumnAndRow($this->currentColumnIndex, $this->rowIndex)) && ($this->currentColumnIndex >= $this->startColumnIndex));
|
||||||
@ -170,7 +167,7 @@ class RowCellIterator extends CellIterator
|
|||||||
*/
|
*/
|
||||||
public function valid()
|
public function valid()
|
||||||
{
|
{
|
||||||
return $this->currentColumnIndex <= $this->endColumnIndex;
|
return $this->currentColumnIndex <= $this->endColumnIndex && $this->currentColumnIndex >= $this->startColumnIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -152,15 +152,9 @@ class RowIterator implements \Iterator
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the iterator to its previous value.
|
* Set the iterator to its previous value.
|
||||||
*
|
|
||||||
* @throws PhpSpreadsheetException
|
|
||||||
*/
|
*/
|
||||||
public function prev()
|
public function prev()
|
||||||
{
|
{
|
||||||
if ($this->position <= $this->startRow) {
|
|
||||||
throw new PhpSpreadsheetException("Row is already at the beginning of range ({$this->startRow} - {$this->endRow})");
|
|
||||||
}
|
|
||||||
|
|
||||||
--$this->position;
|
--$this->position;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,6 +165,6 @@ class RowIterator implements \Iterator
|
|||||||
*/
|
*/
|
||||||
public function valid()
|
public function valid()
|
||||||
{
|
{
|
||||||
return $this->position <= $this->endRow;
|
return $this->position <= $this->endRow && $this->position >= $this->startRow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,9 +78,8 @@ class ColumnCellIteratorTest extends TestCase
|
|||||||
|
|
||||||
public function testPrevOutOfRange()
|
public function testPrevOutOfRange()
|
||||||
{
|
{
|
||||||
$this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
|
|
||||||
|
|
||||||
$iterator = new ColumnCellIterator($this->mockWorksheet, 'A', 2, 4);
|
$iterator = new ColumnCellIterator($this->mockWorksheet, 'A', 2, 4);
|
||||||
$iterator->prev();
|
$iterator->prev();
|
||||||
|
self::assertFalse($iterator->valid());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -77,9 +77,8 @@ class ColumnIteratorTest extends TestCase
|
|||||||
|
|
||||||
public function testPrevOutOfRange()
|
public function testPrevOutOfRange()
|
||||||
{
|
{
|
||||||
$this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
|
|
||||||
|
|
||||||
$iterator = new ColumnIterator($this->mockWorksheet, 'B', 'D');
|
$iterator = new ColumnIterator($this->mockWorksheet, 'B', 'D');
|
||||||
$iterator->prev();
|
$iterator->prev();
|
||||||
|
self::assertFalse($iterator->valid());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
28
inc/vendor/phpoffice/phpspreadsheet/tests/PhpSpreadsheetTests/Worksheet/IteratorTest.php
vendored
Normal file
28
inc/vendor/phpoffice/phpspreadsheet/tests/PhpSpreadsheetTests/Worksheet/IteratorTest.php
vendored
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
|
||||||
|
|
||||||
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
class IteratorTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testIteratorFullRange()
|
||||||
|
{
|
||||||
|
$spreadsheet = new Spreadsheet();
|
||||||
|
$spreadsheet->createSheet();
|
||||||
|
$spreadsheet->createSheet();
|
||||||
|
|
||||||
|
$iterator = new Iterator($spreadsheet);
|
||||||
|
$columnIndexResult = 0;
|
||||||
|
self::assertEquals($columnIndexResult, $iterator->key());
|
||||||
|
|
||||||
|
foreach ($iterator as $key => $column) {
|
||||||
|
self::assertEquals($columnIndexResult++, $key);
|
||||||
|
self::assertInstanceOf(Worksheet::class, $column);
|
||||||
|
}
|
||||||
|
self::assertSame(3, $columnIndexResult);
|
||||||
|
}
|
||||||
|
}
|
@ -80,9 +80,8 @@ class RowCellIteratorTest extends TestCase
|
|||||||
|
|
||||||
public function testPrevOutOfRange()
|
public function testPrevOutOfRange()
|
||||||
{
|
{
|
||||||
$this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
|
|
||||||
|
|
||||||
$iterator = new RowCellIterator($this->mockWorksheet, 2, 'B', 'D');
|
$iterator = new RowCellIterator($this->mockWorksheet, 2, 'B', 'D');
|
||||||
$iterator->prev();
|
$iterator->prev();
|
||||||
|
self::assertFalse($iterator->valid());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -75,9 +75,8 @@ class RowIteratorTest extends TestCase
|
|||||||
|
|
||||||
public function testPrevOutOfRange()
|
public function testPrevOutOfRange()
|
||||||
{
|
{
|
||||||
$this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
|
|
||||||
|
|
||||||
$iterator = new RowIterator($this->mockWorksheet, 2, 4);
|
$iterator = new RowIterator($this->mockWorksheet, 2, 4);
|
||||||
$iterator->prev();
|
$iterator->prev();
|
||||||
|
self::assertFalse($iterator->valid());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -186,4 +186,24 @@ return [
|
|||||||
-1234567.8899999999,
|
-1234567.8899999999,
|
||||||
'0000:00.00',
|
'0000:00.00',
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'18.952',
|
||||||
|
18.952,
|
||||||
|
'[$-409]General',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'9.98',
|
||||||
|
9.98,
|
||||||
|
'[$-409]#,##0.00;-#,##0.00',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'18.952',
|
||||||
|
18.952,
|
||||||
|
'[$-1010409]General',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'9.98',
|
||||||
|
9.98,
|
||||||
|
'[$-1010409]#,##0.00;-#,##0.00',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
@ -62,4 +62,14 @@ return [
|
|||||||
43270.603472222,
|
43270.603472222,
|
||||||
'hh:mm:ss\ AM/PM',
|
'hh:mm:ss\ AM/PM',
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'8/20/2018',
|
||||||
|
43332,
|
||||||
|
'[$-409]m/d/yyyy',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'8/20/2018',
|
||||||
|
43332,
|
||||||
|
'[$-1010409]m/d/yyyy',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
11
inc/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
vendored
11
inc/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
vendored
@ -1,4 +1,13 @@
|
|||||||
6.2.20
|
6.2.25
|
||||||
|
- Fix support for image URLs.
|
||||||
|
|
||||||
|
6.2.24
|
||||||
|
- Support remote urls when checking if file exists.
|
||||||
|
|
||||||
|
6.2.23
|
||||||
|
- Simplify file_exists function.
|
||||||
|
|
||||||
|
6.2.22
|
||||||
- Fix for security vulnerability: Using the phar:// wrapper it was possible to trigger the unserialization of user provided data.
|
- Fix for security vulnerability: Using the phar:// wrapper it was possible to trigger the unserialization of user provided data.
|
||||||
|
|
||||||
6.2.19
|
6.2.19
|
||||||
|
2
inc/vendor/tecnickcom/tcpdf/composer.json
vendored
2
inc/vendor/tecnickcom/tcpdf/composer.json
vendored
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tecnickcom/tcpdf",
|
"name": "tecnickcom/tcpdf",
|
||||||
"version": "6.2.22",
|
"version": "6.2.26",
|
||||||
"homepage": "http://www.tcpdf.org/",
|
"homepage": "http://www.tcpdf.org/",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
|
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
|
||||||
|
BIN
inc/vendor/tecnickcom/tcpdf/include/sRGB.icc
vendored
BIN
inc/vendor/tecnickcom/tcpdf/include/sRGB.icc
vendored
Binary file not shown.
@ -2003,7 +2003,11 @@ class TCPDF_FONTS {
|
|||||||
$chars = str_split($str);
|
$chars = str_split($str);
|
||||||
$carr = array_map('ord', $chars);
|
$carr = array_map('ord', $chars);
|
||||||
}
|
}
|
||||||
$currentfont['subsetchars'] += array_fill_keys($carr, true);
|
if (is_array($currentfont['subsetchars']) && is_array($carr)) {
|
||||||
|
$currentfont['subsetchars'] += array_fill_keys($carr, true);
|
||||||
|
} else {
|
||||||
|
$currentfont['subsetchars'] = array_merge($currentfont['subsetchars'], $carr);
|
||||||
|
}
|
||||||
return $carr;
|
return $carr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
|||||||
* Current TCPDF version.
|
* Current TCPDF version.
|
||||||
* @private static
|
* @private static
|
||||||
*/
|
*/
|
||||||
private static $tcpdf_version = '6.2.22';
|
private static $tcpdf_version = '6.2.26';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String alias for total number of pages.
|
* String alias for total number of pages.
|
||||||
@ -1821,6 +1821,31 @@ class TCPDF_STATIC {
|
|||||||
return fopen($filename, $mode);
|
return fopen($filename, $mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the URL exist.
|
||||||
|
* @param url (string) URL to check.
|
||||||
|
* @return Returns TRUE if the URL exists; FALSE otherwise.
|
||||||
|
* @public static
|
||||||
|
*/
|
||||||
|
public static function url_exists($url) {
|
||||||
|
$crs = curl_init();
|
||||||
|
curl_setopt($crs, CURLOPT_URL, $url);
|
||||||
|
curl_setopt($crs, CURLOPT_NOBODY, true);
|
||||||
|
curl_setopt($crs, CURLOPT_FAILONERROR, true);
|
||||||
|
if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
|
||||||
|
curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
|
||||||
|
}
|
||||||
|
curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
|
||||||
|
curl_setopt($crs, CURLOPT_TIMEOUT, 30);
|
||||||
|
curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
|
||||||
|
curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
|
||||||
|
curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
|
||||||
|
curl_exec($crs);
|
||||||
|
$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($crs);
|
||||||
|
return ($code == 200);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper for file_exists.
|
* Wrapper for file_exists.
|
||||||
* Checks whether a file or directory exists.
|
* Checks whether a file or directory exists.
|
||||||
@ -1830,20 +1855,11 @@ class TCPDF_STATIC {
|
|||||||
* @public static
|
* @public static
|
||||||
*/
|
*/
|
||||||
public static function file_exists($filename) {
|
public static function file_exists($filename) {
|
||||||
if (strpos($filename, '://') > 0) {
|
if (preg_match('|^https?://|', $filename) == 1) {
|
||||||
$wrappers = stream_get_wrappers();
|
return self::url_exists($filename);
|
||||||
foreach ($wrappers as $wrapper) {
|
|
||||||
if (($wrapper === 'http') || ($wrapper === 'https')) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (stripos($filename, $wrapper.'://') === 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!@file_exists($filename)) {
|
if (strpos($filename, '://')) {
|
||||||
// try to encode spaces on filename
|
return false; // only support http and https wrappers for security reasons
|
||||||
$filename = str_replace(' ', '%20', $filename);
|
|
||||||
}
|
}
|
||||||
return @file_exists($filename);
|
return @file_exists($filename);
|
||||||
}
|
}
|
||||||
|
220
inc/vendor/tecnickcom/tcpdf/tcpdf.php
vendored
220
inc/vendor/tecnickcom/tcpdf/tcpdf.php
vendored
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
//============================================================+
|
//============================================================+
|
||||||
// File name : tcpdf.php
|
// File name : tcpdf.php
|
||||||
// Version : 6.2.22
|
// Version : 6.2.26
|
||||||
// Begin : 2002-08-03
|
// Begin : 2002-08-03
|
||||||
// Last Update : 2018-09-14
|
// Last Update : 2018-09-14
|
||||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||||
@ -104,7 +104,7 @@
|
|||||||
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
||||||
* @package com.tecnick.tcpdf
|
* @package com.tecnick.tcpdf
|
||||||
* @author Nicola Asuni
|
* @author Nicola Asuni
|
||||||
* @version 6.2.22
|
* @version 6.2.26
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// TCPDF configuration
|
// TCPDF configuration
|
||||||
@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
|
|||||||
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
|
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
|
||||||
* @package com.tecnick.tcpdf
|
* @package com.tecnick.tcpdf
|
||||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||||
* @version 6.2.22
|
* @version 6.2.26
|
||||||
* @author Nicola Asuni - info@tecnick.com
|
* @author Nicola Asuni - info@tecnick.com
|
||||||
* @IgnoreAnnotation("protected")
|
* @IgnoreAnnotation("protected")
|
||||||
* @IgnoreAnnotation("public")
|
* @IgnoreAnnotation("public")
|
||||||
@ -5769,10 +5769,9 @@ class TCPDF {
|
|||||||
$this->resetLastH();
|
$this->resetLastH();
|
||||||
}
|
}
|
||||||
if (!TCPDF_STATIC::empty_string($y)) {
|
if (!TCPDF_STATIC::empty_string($y)) {
|
||||||
$this->SetY($y);
|
$this->SetY($y); // set y in order to convert negative y values to positive ones
|
||||||
} else {
|
|
||||||
$y = $this->GetY();
|
|
||||||
}
|
}
|
||||||
|
$y = $this->GetY();
|
||||||
$resth = 0;
|
$resth = 0;
|
||||||
if (($h > 0) AND $this->inPageBody() AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
|
if (($h > 0) AND $this->inPageBody() AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
|
||||||
// spit cell in more pages/columns
|
// spit cell in more pages/columns
|
||||||
@ -9648,7 +9647,7 @@ class TCPDF {
|
|||||||
protected function _putcatalog() {
|
protected function _putcatalog() {
|
||||||
// put XMP
|
// put XMP
|
||||||
$xmpobj = $this->_putXMP();
|
$xmpobj = $this->_putXMP();
|
||||||
// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
|
// if required, add standard sRGB ICC colour profile
|
||||||
if ($this->pdfa_mode OR $this->force_srgb) {
|
if ($this->pdfa_mode OR $this->force_srgb) {
|
||||||
$iccobj = $this->_newobj();
|
$iccobj = $this->_newobj();
|
||||||
$icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
|
$icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
|
||||||
@ -18818,102 +18817,124 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'img': {
|
case 'img': {
|
||||||
if (!empty($tag['attribute']['src'])) {
|
if (empty($tag['attribute']['src'])) {
|
||||||
if ($tag['attribute']['src'][0] === '@') {
|
break;
|
||||||
// data stream
|
}
|
||||||
$tag['attribute']['src'] = '@'.base64_decode(substr($tag['attribute']['src'], 1));
|
$imgsrc = $tag['attribute']['src'];
|
||||||
$type = '';
|
if ($imgsrc[0] === '@') {
|
||||||
} else {
|
// data stream
|
||||||
// get image type
|
$imgsrc = '@'.base64_decode(substr($imgsrc, 1));
|
||||||
$type = TCPDF_IMAGES::getImageFileType($tag['attribute']['src']);
|
$type = '';
|
||||||
}
|
} else {
|
||||||
if (!isset($tag['width'])) {
|
if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
|
||||||
$tag['width'] = 0;
|
// fix image path
|
||||||
}
|
$findroot = strpos($imgsrc, $_SERVER['DOCUMENT_ROOT']);
|
||||||
if (!isset($tag['height'])) {
|
if (($findroot === false) OR ($findroot > 1)) {
|
||||||
$tag['height'] = 0;
|
if (substr($_SERVER['DOCUMENT_ROOT'], -1) == '/') {
|
||||||
}
|
$imgsrc = substr($_SERVER['DOCUMENT_ROOT'], 0, -1).$imgsrc;
|
||||||
//if (!isset($tag['attribute']['align'])) {
|
} else {
|
||||||
// the only alignment supported is "bottom"
|
$imgsrc = $_SERVER['DOCUMENT_ROOT'].$imgsrc;
|
||||||
// further development is required for other modes.
|
|
||||||
$tag['attribute']['align'] = 'bottom';
|
|
||||||
//}
|
|
||||||
switch($tag['attribute']['align']) {
|
|
||||||
case 'top': {
|
|
||||||
$align = 'T';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 'middle': {
|
|
||||||
$align = 'M';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 'bottom': {
|
|
||||||
$align = 'B';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
$align = 'B';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$prevy = $this->y;
|
|
||||||
$xpos = $this->x;
|
|
||||||
$imglink = '';
|
|
||||||
if (isset($this->HREF['url']) AND !TCPDF_STATIC::empty_string($this->HREF['url'])) {
|
|
||||||
$imglink = $this->HREF['url'];
|
|
||||||
if ($imglink[0] == '#') {
|
|
||||||
// convert url to internal link
|
|
||||||
$lnkdata = explode(',', $imglink);
|
|
||||||
if (isset($lnkdata[0])) {
|
|
||||||
$page = intval(substr($lnkdata[0], 1));
|
|
||||||
if (empty($page) OR ($page <= 0)) {
|
|
||||||
$page = $this->page;
|
|
||||||
}
|
|
||||||
if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
|
|
||||||
$lnky = floatval($lnkdata[1]);
|
|
||||||
} else {
|
|
||||||
$lnky = 0;
|
|
||||||
}
|
|
||||||
$imglink = $this->AddLink();
|
|
||||||
$this->SetLink($imglink, $lnky, $page);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
$imgsrc = urldecode($imgsrc);
|
||||||
$border = 0;
|
$testscrtype = @parse_url($imgsrc);
|
||||||
if (isset($tag['border']) AND !empty($tag['border'])) {
|
if (empty($testscrtype['query'])) {
|
||||||
// currently only support 1 (frame) or a combination of 'LTRB'
|
// convert URL to server path
|
||||||
$border = $tag['border'];
|
$imgsrc = str_replace(K_PATH_URL, K_PATH_MAIN, $imgsrc);
|
||||||
}
|
} elseif (preg_match('|^https?://|', $imgsrc) !== 1) {
|
||||||
$iw = '';
|
// convert URL to server path
|
||||||
if (isset($tag['width'])) {
|
$imgsrc = str_replace(K_PATH_MAIN, K_PATH_URL, $imgsrc);
|
||||||
$iw = $this->getHTMLUnitToUnits($tag['width'], ($tag['fontsize'] / $this->k), 'px', false);
|
|
||||||
}
|
|
||||||
$ih = '';
|
|
||||||
if (isset($tag['height'])) {
|
|
||||||
$ih = $this->getHTMLUnitToUnits($tag['height'], ($tag['fontsize'] / $this->k), 'px', false);
|
|
||||||
}
|
|
||||||
if (($type == 'eps') OR ($type == 'ai')) {
|
|
||||||
$this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
|
|
||||||
} elseif ($type == 'svg') {
|
|
||||||
$this->ImageSVG($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
|
|
||||||
} else {
|
|
||||||
$this->Image($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
|
|
||||||
}
|
|
||||||
switch($align) {
|
|
||||||
case 'T': {
|
|
||||||
$this->y = $prevy;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
case 'M': {
|
}
|
||||||
$this->y = (($this->img_rb_y + $prevy - ($this->getCellHeight($tag['fontsize'] / $this->k))) / 2);
|
// get image type
|
||||||
break;
|
$type = TCPDF_IMAGES::getImageFileType($imgsrc);
|
||||||
}
|
}
|
||||||
case 'B': {
|
if (!isset($tag['width'])) {
|
||||||
$this->y = $this->img_rb_y - ($this->getCellHeight($tag['fontsize'] / $this->k) - ($this->getFontDescent($tag['fontname'], $tag['fontstyle'], $tag['fontsize']) * $this->cell_height_ratio));
|
$tag['width'] = 0;
|
||||||
break;
|
}
|
||||||
|
if (!isset($tag['height'])) {
|
||||||
|
$tag['height'] = 0;
|
||||||
|
}
|
||||||
|
//if (!isset($tag['attribute']['align'])) {
|
||||||
|
// the only alignment supported is "bottom"
|
||||||
|
// further development is required for other modes.
|
||||||
|
$tag['attribute']['align'] = 'bottom';
|
||||||
|
//}
|
||||||
|
switch($tag['attribute']['align']) {
|
||||||
|
case 'top': {
|
||||||
|
$align = 'T';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'middle': {
|
||||||
|
$align = 'M';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'bottom': {
|
||||||
|
$align = 'B';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
$align = 'B';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$prevy = $this->y;
|
||||||
|
$xpos = $this->x;
|
||||||
|
$imglink = '';
|
||||||
|
if (isset($this->HREF['url']) AND !TCPDF_STATIC::empty_string($this->HREF['url'])) {
|
||||||
|
$imglink = $this->HREF['url'];
|
||||||
|
if ($imglink[0] == '#') {
|
||||||
|
// convert url to internal link
|
||||||
|
$lnkdata = explode(',', $imglink);
|
||||||
|
if (isset($lnkdata[0])) {
|
||||||
|
$page = intval(substr($lnkdata[0], 1));
|
||||||
|
if (empty($page) OR ($page <= 0)) {
|
||||||
|
$page = $this->page;
|
||||||
|
}
|
||||||
|
if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
|
||||||
|
$lnky = floatval($lnkdata[1]);
|
||||||
|
} else {
|
||||||
|
$lnky = 0;
|
||||||
|
}
|
||||||
|
$imglink = $this->AddLink();
|
||||||
|
$this->SetLink($imglink, $lnky, $page);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$border = 0;
|
||||||
|
if (isset($tag['border']) AND !empty($tag['border'])) {
|
||||||
|
// currently only support 1 (frame) or a combination of 'LTRB'
|
||||||
|
$border = $tag['border'];
|
||||||
|
}
|
||||||
|
$iw = '';
|
||||||
|
if (isset($tag['width'])) {
|
||||||
|
$iw = $this->getHTMLUnitToUnits($tag['width'], ($tag['fontsize'] / $this->k), 'px', false);
|
||||||
|
}
|
||||||
|
$ih = '';
|
||||||
|
if (isset($tag['height'])) {
|
||||||
|
$ih = $this->getHTMLUnitToUnits($tag['height'], ($tag['fontsize'] / $this->k), 'px', false);
|
||||||
|
}
|
||||||
|
if (($type == 'eps') OR ($type == 'ai')) {
|
||||||
|
$this->ImageEps($imgsrc, $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
|
||||||
|
} elseif ($type == 'svg') {
|
||||||
|
$this->ImageSVG($imgsrc, $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
|
||||||
|
} else {
|
||||||
|
$this->Image($imgsrc, $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
|
||||||
|
}
|
||||||
|
switch($align) {
|
||||||
|
case 'T': {
|
||||||
|
$this->y = $prevy;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'M': {
|
||||||
|
$this->y = (($this->img_rb_y + $prevy - ($this->getCellHeight($tag['fontsize'] / $this->k))) / 2);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'B': {
|
||||||
|
$this->y = $this->img_rb_y - ($this->getCellHeight($tag['fontsize'] / $this->k) - ($this->getFontDescent($tag['fontname'], $tag['fontstyle'], $tag['fontsize']) * $this->cell_height_ratio));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'dl': {
|
case 'dl': {
|
||||||
@ -24207,9 +24228,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
|||||||
}
|
}
|
||||||
$img = urldecode($img);
|
$img = urldecode($img);
|
||||||
$testscrtype = @parse_url($img);
|
$testscrtype = @parse_url($img);
|
||||||
if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
|
if (empty($testscrtype['query'])) {
|
||||||
// convert URL to server path
|
// convert URL to server path
|
||||||
$img = str_replace(K_PATH_URL, K_PATH_MAIN, $img);
|
$img = str_replace(K_PATH_URL, K_PATH_MAIN, $img);
|
||||||
|
} elseif (preg_match('|^https?://|', $img) !== 1) {
|
||||||
|
// convert server path to URL
|
||||||
|
$img = str_replace(K_PATH_MAIN, K_PATH_URL, $img);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// get image type
|
// get image type
|
||||||
|
Loading…
Reference in New Issue
Block a user