diff --git a/.gitignore b/.gitignore
index f1affa7..19f2280 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,11 +17,9 @@
/cms/dflip/
/cms/js/firstlevel/
/conlite/external/**/.git
-/dievino/
/conlite/logs/debug.log
/cms/data/config/production/config.mod_rewrite.php
/cms/data/config/production/config.local.php
/cms/cache/*
-/setup/lib/defines.local.php
-/cms/js/fancybox/
-/.dev/
+composer.phar
+/conlite/vendor/
diff --git a/.idea/GitLink.xml b/.idea/GitLink.xml
new file mode 100644
index 0000000..5143819
--- /dev/null
+++ b/.idea/GitLink.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/clphp8.iml b/.idea/clphp8.iml
new file mode 100644
index 0000000..a2ca22a
--- /dev/null
+++ b/.idea/clphp8.iml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeception.xml b/.idea/codeception.xml
index 9da3754..70e3d14 100644
--- a/.idea/codeception.xml
+++ b/.idea/codeception.xml
@@ -9,6 +9,9 @@
+
+
+
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
new file mode 100644
index 0000000..353c755
--- /dev/null
+++ b/.idea/deployment.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 37c4794..743b270 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index cfc573f..0059912 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -12,52 +12,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
index ec7e1d4..c7cfbc2 100644
--- a/.idea/phpspec.xml
+++ b/.idea/phpspec.xml
@@ -8,6 +8,9 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
index 13091a5..c2d3615 100644
--- a/.idea/phpunit.xml
+++ b/.idea/phpunit.xml
@@ -11,6 +11,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index ddb69a7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
-
\ No newline at end of file
diff --git a/README.md b/README.md
index 58ca2d4..b8c79cb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-----------------------------------------------------------------------------------------------------
This is the readme file for ConLite 2.2.0 beta
Any help you need you may find by visiting the following links.
diff --git a/composer.json b/composer.json
index a5a12bf..b0726cd 100644
--- a/composer.json
+++ b/composer.json
@@ -8,9 +8,6 @@
"email": "ortwin.pinke@php-backoffice.de"
}
],
- "config": {
- "vendor-dir": "conlite/external"
- },
"require": {
"php": "^8.0",
"phpmailer/phpmailer": "v6.8.0"
@@ -19,10 +16,5 @@
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.0",
"rector/rector": "^0.15"
- },
- "autoload": {
- "psr-4": {
- "Conlite\\External\\": "conlite/external"
- }
}
}
diff --git a/composer.lock b/composer.lock
index c06c01b..d0e5935 100644
--- a/composer.lock
+++ b/composer.lock
@@ -316,16 +316,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.11",
+ "version": "1.10.14",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21"
+ "reference": "d232901b09e67538e5c86a724be841bea5768a7c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8aa62e6ea8b58ffb650e02940e55a788cbc3fe21",
- "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d232901b09e67538e5c86a724be841bea5768a7c",
+ "reference": "d232901b09e67538e5c86a724be841bea5768a7c",
"shasum": ""
},
"require": {
@@ -374,20 +374,20 @@
"type": "tidelift"
}
],
- "time": "2023-04-04T19:17:42+00:00"
+ "time": "2023-04-19T13:47:27+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "10.0.2",
+ "version": "10.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "20800e84296ea4732f9a125e08ce86b4004ae3e4"
+ "reference": "884a0da7f9f46f28b2cb69134217fd810b793974"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/20800e84296ea4732f9a125e08ce86b4004ae3e4",
- "reference": "20800e84296ea4732f9a125e08ce86b4004ae3e4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/884a0da7f9f46f28b2cb69134217fd810b793974",
+ "reference": "884a0da7f9f46f28b2cb69134217fd810b793974",
"shasum": ""
},
"require": {
@@ -406,7 +406,7 @@
"theseer/tokenizer": "^1.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^10.1"
},
"suggest": {
"ext-pcov": "PHP extension that provides line coverage",
@@ -415,7 +415,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.0-dev"
+ "dev-main": "10.1-dev"
}
},
"autoload": {
@@ -443,7 +443,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.2"
+ "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.1"
},
"funding": [
{
@@ -451,7 +452,7 @@
"type": "github"
}
],
- "time": "2023-03-06T13:00:19+00:00"
+ "time": "2023-04-17T12:15:40+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -696,16 +697,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.0.19",
+ "version": "10.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "20c23e85c86e5c06d63538ba464e8054f4744e62"
+ "reference": "6f0cd95be71add539f8fd2be25b2a4a29789000b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20c23e85c86e5c06d63538ba464e8054f4744e62",
- "reference": "20c23e85c86e5c06d63538ba464e8054f4744e62",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6f0cd95be71add539f8fd2be25b2a4a29789000b",
+ "reference": "6f0cd95be71add539f8fd2be25b2a4a29789000b",
"shasum": ""
},
"require": {
@@ -719,7 +720,7 @@
"phar-io/manifest": "^2.0.3",
"phar-io/version": "^3.0.2",
"php": ">=8.1",
- "phpunit/php-code-coverage": "^10.0",
+ "phpunit/php-code-coverage": "^10.1.1",
"phpunit/php-file-iterator": "^4.0",
"phpunit/php-invoker": "^4.0",
"phpunit/php-text-template": "^3.0",
@@ -745,7 +746,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.0-dev"
+ "dev-main": "10.1-dev"
}
},
"autoload": {
@@ -777,7 +778,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.19"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.1.2"
},
"funding": [
{
@@ -793,25 +794,25 @@
"type": "tidelift"
}
],
- "time": "2023-03-27T11:46:33+00:00"
+ "time": "2023-04-22T07:38:19+00:00"
},
{
"name": "rector/rector",
- "version": "0.15.24",
+ "version": "0.15.25",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/rector.git",
- "reference": "716473919bcfdc27bdd2a32afb72adbf4c224e59"
+ "reference": "015935c7ed9e48a4f5895ba974f337e20a263841"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/rectorphp/rector/zipball/716473919bcfdc27bdd2a32afb72adbf4c224e59",
- "reference": "716473919bcfdc27bdd2a32afb72adbf4c224e59",
+ "url": "https://api.github.com/repos/rectorphp/rector/zipball/015935c7ed9e48a4f5895ba974f337e20a263841",
+ "reference": "015935c7ed9e48a4f5895ba974f337e20a263841",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0",
- "phpstan/phpstan": "^1.10.1"
+ "phpstan/phpstan": "^1.10.14"
},
"conflict": {
"rector/rector-doctrine": "*",
@@ -846,7 +847,7 @@
],
"support": {
"issues": "https://github.com/rectorphp/rector/issues",
- "source": "https://github.com/rectorphp/rector/tree/0.15.24"
+ "source": "https://github.com/rectorphp/rector/tree/0.15.25"
},
"funding": [
{
@@ -854,7 +855,7 @@
"type": "github"
}
],
- "time": "2023-04-05T08:49:11+00:00"
+ "time": "2023-04-20T16:07:39+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -1158,16 +1159,16 @@
},
{
"name": "sebastian/diff",
- "version": "5.0.1",
+ "version": "5.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02"
+ "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/aae9a0a43bff37bd5d8d0311426c87bf36153f02",
- "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
+ "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
"shasum": ""
},
"require": {
@@ -1213,7 +1214,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
"security": "https://github.com/sebastianbergmann/diff/security/policy",
- "source": "https://github.com/sebastianbergmann/diff/tree/5.0.1"
+ "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3"
},
"funding": [
{
@@ -1221,20 +1222,20 @@
"type": "github"
}
],
- "time": "2023-03-23T05:12:41+00:00"
+ "time": "2023-05-01T07:48:21+00:00"
},
{
"name": "sebastian/environment",
- "version": "6.0.0",
+ "version": "6.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc"
+ "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b6f3694c6386c7959915a0037652e0c40f6f69cc",
- "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951",
+ "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951",
"shasum": ""
},
"require": {
@@ -1276,7 +1277,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
- "source": "https://github.com/sebastianbergmann/environment/tree/6.0.0"
+ "security": "https://github.com/sebastianbergmann/environment/security/policy",
+ "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1"
},
"funding": [
{
@@ -1284,7 +1286,7 @@
"type": "github"
}
],
- "time": "2023-02-03T07:03:04+00:00"
+ "time": "2023-04-11T05:39:26+00:00"
},
{
"name": "sebastian/exporter",
diff --git a/conlite/classes/class.genericdb.php b/conlite/classes/class.genericdb.php
index ba08eda..a3a070e 100644
--- a/conlite/classes/class.genericdb.php
+++ b/conlite/classes/class.genericdb.php
@@ -1311,7 +1311,7 @@ abstract class Item extends cItemBaseAbstract {
* List of funcion names of the filtersused when data is retrieved from the db
* @var array
*/
- protected $_arrOutFilters = array('stripslashes', 'htmldecode','urldecode', 'utf8_encode');
+ protected $_arrOutFilters = array('stripslashes', 'htmldecode','urldecode');
/**
* Class name of meta object
diff --git a/conlite/external/phpqrcode/CHANGELOG b/conlite/external/phpqrcode/CHANGELOG
deleted file mode 100644
index a6c53d2..0000000
--- a/conlite/external/phpqrcode/CHANGELOG
+++ /dev/null
@@ -1,38 +0,0 @@
-* 1.0.0 build 2010031920
-
- - first public release
- - help in readme, install
- - cleanup ans separation of QRtools and QRspec
- - now TCPDF binding requires minimal changes in TCPDF, having most of job
- done in QRtools tcpdfBarcodeArray
- - nicer QRtools::timeBenchmark output
- - license and copyright notices in files
- - indent cleanup - from tab to 4spc, keep it that way please :)
- - sf project, repository, wiki
- - simple code generator in index.php
-
-* 1.1.0 build 2010032113
-
- - added merge tool wich generate merged version of code
- located in phpqrcode.php
- - splited qrconst.php from qrlib.php
-
-* 1.1.1 build 2010032405
-
- - patch by Rick Seymour allowing saving PNG and displaying it at the same time
- - added version info in VERSION file
- - modified merge tool to include version info into generated file
- - fixed e-mail in almost all head comments
-
-* 1.1.2 build 2010032722
-
- - full integration with TCPDF thanks to Nicola Asuni, it's author
- - fixed bug with alphanumeric encoding detection
-
-* 1.1.3 build 2010081807
-
- - short opening tags replaced with standard ones
-
-* 1.1.4 build 2010100721
-
- - added missing static keyword QRinput::check (found by Luke Brookhart, Onjax LLC)
diff --git a/conlite/external/phpqrcode/INSTALL b/conlite/external/phpqrcode/INSTALL
deleted file mode 100644
index 945c95a..0000000
--- a/conlite/external/phpqrcode/INSTALL
+++ /dev/null
@@ -1,67 +0,0 @@
-== REQUIREMENTS ==
-
- * PHP5
- * PHP GD2 extension with JPEG and PNG support
-
-== INSTALLATION ==
-
-If you want to recreate cache by yourself make sure cache directory is
-writable and you have permisions to write into it. Also make sure you are
-able to read files in it if you have cache option enabled
-
-== CONFIGURATION ==
-
-Feel free to modify config constants in qrconfig.php file. Read about it in
-provided comments and project wiki page (links in README file)
-
-== QUICK START ==
-
-Notice: probably you should'nt use all of this in same script :)
-
-encode('PHP QR Code :)');
-QRspec::debug($tab, true);
-
-== TCPDF INTEGRATION ==
-
-Inside bindings/tcpdf you will find slightly modified 2dbarcodes.php.
-Instal phpqrcode liblaty inside tcpdf folder, then overwrite (or merge)
-2dbarcodes.php
-
-Then use similar as example #50 from TCPDF examples:
-
- true,
- 'padding' => 4,
- 'fgcolor' => array(0,0,0),
- 'bgcolor' => false, //array(255,255,255)
-);
-
-//code name: QR, specify error correction level after semicolon (L,M,Q,H)
-$pdf->write2DBarcode('PHP QR Code :)', 'QR,L', '', '', 30, 30, $style, 'N');
diff --git a/conlite/external/phpqrcode/LICENSE b/conlite/external/phpqrcode/LICENSE
deleted file mode 100644
index 31afd6d..0000000
--- a/conlite/external/phpqrcode/LICENSE
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- 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.
diff --git a/conlite/external/phpqrcode/README b/conlite/external/phpqrcode/README
deleted file mode 100644
index dd598f0..0000000
--- a/conlite/external/phpqrcode/README
+++ /dev/null
@@ -1,45 +0,0 @@
-This is PHP implementation of QR Code 2-D barcode generator. It is pure-php
-LGPL-licensed implementation based on C libqrencode by Kentaro Fukuchi.
-
-== LICENSING ==
-
-Copyright (C) 2010 by Dominik Dzienia
-
-This library 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 any later version.
-
-This library 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 (LICENSE file)
-for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this library; if not, write to the Free Software Foundation, Inc., 51
-Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-== INSTALATION AND USAGE ==
-
- * INSTALL file
- * http://sourceforge.net/apps/mediawiki/phpqrcode/index.php?title=Main_Page
-
-== CONTACT ==
-
-Fell free to contact me via e-mail (deltalab at poczta dot fm) or using
-folowing project pages:
-
- * http://sourceforge.net/projects/phpqrcode/
- * http://phpqrcode.sourceforge.net/
-
-== ACKNOWLEDGMENTS ==
-
-Based on C libqrencode library (ver. 3.1.1)
-Copyright (C) 2006-2010 by Kentaro Fukuchi
-http://megaui.net/fukuchi/works/qrencode/index.en.html
-
-QR Code is registered trademarks of DENSO WAVE INCORPORATED in JAPAN and other
-countries.
-
-Reed-Solomon code encoder is written by Phil Karn, KA9Q.
-Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q
-
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/VERSION b/conlite/external/phpqrcode/VERSION
deleted file mode 100644
index 2677b36..0000000
--- a/conlite/external/phpqrcode/VERSION
+++ /dev/null
@@ -1,2 +0,0 @@
-1.1.4
-2010100721
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/bindings/tcpdf/qrcode.php b/conlite/external/phpqrcode/bindings/tcpdf/qrcode.php
deleted file mode 100644
index 7995460..0000000
--- a/conlite/external/phpqrcode/bindings/tcpdf/qrcode.php
+++ /dev/null
@@ -1,2875 +0,0 @@
-
-// http://phpqrcode.sourceforge.net/
-// https://sourceforge.net/projects/phpqrcode/
-//
-// The "PHP QR Code encoder" is based on
-// "C libqrencode library" (ver. 3.1.1)
-// License: GNU-LGPL 2.1
-// Copyright (C) 2006-2010 by Kentaro Fukuchi
-// http://megaui.net/fukuchi/works/qrencode/index.en.html
-//
-// Reed-Solomon code encoder is written by Phil Karn, KA9Q.
-// Copyright (C) 2002-2006 Phil Karn, KA9Q
-//
-// QR Code is registered trademark of DENSO WAVE INCORPORATED
-// http://www.denso-wave.com/qrcode/index-e.html
-// ---------------------------------------------------------
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright 2010:
-// Nicola Asuni
-// Tecnick.com S.r.l.
-// Via della Pace, 11
-// 09044 Quartucciu (CA)
-// ITALY
-// www.tecnick.com
-// info@tecnick.com
-//============================================================+
-
-/**
- * Class to create QR-code arrays for TCPDF class.
- * QR Code symbol is a 2D barcode that can be scanned by handy terminals such as a mobile phone with CCD.
- * The capacity of QR Code is up to 7000 digits or 4000 characters, and has high robustness.
- * This class supports QR Code model 2, described in JIS (Japanese Industrial Standards) X0510:2004 or ISO/IEC 18004.
- * Currently the following features are not supported: ECI and FNC1 mode, Micro QR Code, QR Code model 1, Structured mode.
- *
- * This class is derived from "PHP QR Code encoder" by Dominik Dzienia (http://phpqrcode.sourceforge.net/) based on "libqrencode C library 3.1.1." by Kentaro Fukuchi (http://megaui.net/fukuchi/works/qrencode/index.en.html), contains Reed-Solomon code written by Phil Karn, KA9Q. QR Code is registered trademark of DENSO WAVE INCORPORATED (http://www.denso-wave.com/qrcode/index-e.html).
- * Please read comments on this class source file for full copyright and license information.
- *
- * @package com.tecnick.tcpdf
- * @abstract Class for generating QR-code array for TCPDF.
- * @author Nicola Asuni
- * @copyright 2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.002
- */
-
-// definitions
-if (!defined('QRCODEDEFS')) {
-
- /**
- * Indicate that definitions for this class are set
- */
- define('QRCODEDEFS', true);
-
- // -----------------------------------------------------
-
- // Encoding modes (characters which can be encoded in QRcode)
-
- /**
- * Encoding mode
- */
- define('QR_MODE_NL', -1);
-
- /**
- * Encoding mode numeric (0-9). 3 characters are encoded to 10bit length. In theory, 7089 characters or less can be stored in a QRcode.
- */
- define('QR_MODE_NM', 0);
-
- /**
- * Encoding mode alphanumeric (0-9A-Z $%*+-./:) 45characters. 2 characters are encoded to 11bit length. In theory, 4296 characters or less can be stored in a QRcode.
- */
- define('QR_MODE_AN', 1);
-
- /**
- * Encoding mode 8bit byte data. In theory, 2953 characters or less can be stored in a QRcode.
- */
- define('QR_MODE_8B', 2);
-
- /**
- * Encoding mode KANJI. A KANJI character (multibyte character) is encoded to 13bit length. In theory, 1817 characters or less can be stored in a QRcode.
- */
- define('QR_MODE_KJ', 3);
-
- /**
- * Encoding mode STRUCTURED (currently unsupported)
- */
- define('QR_MODE_ST', 4);
-
- // -----------------------------------------------------
-
- // Levels of error correction.
- // QRcode has a function of an error correcting for miss reading that white is black.
- // Error correcting is defined in 4 level as below.
-
- /**
- * Error correction level L : About 7% or less errors can be corrected.
- */
- define('QR_ECLEVEL_L', 0);
-
- /**
- * Error correction level M : About 15% or less errors can be corrected.
- */
- define('QR_ECLEVEL_M', 1);
-
- /**
- * Error correction level Q : About 25% or less errors can be corrected.
- */
- define('QR_ECLEVEL_Q', 2);
-
- /**
- * Error correction level H : About 30% or less errors can be corrected.
- */
- define('QR_ECLEVEL_H', 3);
-
- // -----------------------------------------------------
-
- // Version. Size of QRcode is defined as version.
- // Version is from 1 to 40.
- // Version 1 is 21*21 matrix. And 4 modules increases whenever 1 version increases.
- // So version 40 is 177*177 matrix.
-
- /**
- * Maximum QR Code version.
- */
- define('QRSPEC_VERSION_MAX', 40);
-
- /**
- * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
- */
- define('QRSPEC_WIDTH_MAX', 177);
-
- // -----------------------------------------------------
-
- /**
- * Matrix index to get width from $capacity array.
- */
- define('QRCAP_WIDTH', 0);
-
- /**
- * Matrix index to get number of words from $capacity array.
- */
- define('QRCAP_WORDS', 1);
-
- /**
- * Matrix index to get remainder from $capacity array.
- */
- define('QRCAP_REMINDER', 2);
-
- /**
- * Matrix index to get error correction level from $capacity array.
- */
- define('QRCAP_EC', 3);
-
- // -----------------------------------------------------
-
- // Structure (currently usupported)
-
- /**
- * Number of header bits for structured mode
- */
- define('STRUCTURE_HEADER_BITS', 20);
-
- /**
- * Max number of symbols for structured mode
- */
- define('MAX_STRUCTURED_SYMBOLS', 16);
-
- // -----------------------------------------------------
-
- // Masks
-
- /**
- * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
- */
- define('N1', 3);
-
- /**
- * Down point base value for case 2 mask pattern (module block of same color)
- */
- define('N2', 3);
-
- /**
- * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
- */
- define('N3', 40);
-
- /**
- * Down point base value for case 4 mask pattern (ration of dark modules in whole)
- */
- define('N4', 10);
-
- // -----------------------------------------------------
-
- // Optimization settings
-
- /**
- * if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
- */
- define('QR_FIND_BEST_MASK', true);
-
- /**
- * if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
- */
- define('QR_FIND_FROM_RANDOM', 2);
-
- /**
- * when QR_FIND_BEST_MASK === false
- */
- define('QR_DEFAULT_MASK', 2);
-
- // -----------------------------------------------------
-
-} // end of definitions
-
-// #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
-
-if (!class_exists('QRcode', false)) {
-
- // for compaibility with PHP4
- if (!function_exists('str_split')) {
- /**
- * Convert a string to an array (needed for PHP4 compatibility)
- * @param string $string The input string.
- * @param int $split_length Maximum length of the chunk.
- * @return If the optional split_length parameter is specified, the returned array will be broken down into chunks with each being split_length in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
- */
- function str_split($string, $split_length=1) {
- if ((strlen($string) > $split_length) OR (!$split_length)) {
- do {
- $c = strlen($string);
- $parts[] = substr($string, 0, $split_length);
- $string = substr($string, $split_length);
- } while ($string !== false);
- } else {
- $parts = array($string);
- }
- return $parts;
- }
- }
-
- // #####################################################
-
- /**
- * Class to create QR-code arrays for TCPDF class.
- * QR Code symbol is a 2D barcode that can be scanned by handy terminals such as a mobile phone with CCD.
- * The capacity of QR Code is up to 7000 digits or 4000 characters, and has high robustness.
- * This class supports QR Code model 2, described in JIS (Japanese Industrial Standards) X0510:2004 or ISO/IEC 18004.
- * Currently the following features are not supported: ECI and FNC1 mode, Micro QR Code, QR Code model 1, Structured mode.
- *
- * This class is derived from "PHP QR Code encoder" by Dominik Dzienia (http://phpqrcode.sourceforge.net/) based on "libqrencode C library 3.1.1." by Kentaro Fukuchi (http://megaui.net/fukuchi/works/qrencode/index.en.html), contains Reed-Solomon code written by Phil Karn, KA9Q. QR Code is registered trademark of DENSO WAVE INCORPORATED (http://www.denso-wave.com/qrcode/index-e.html).
- * Please read comments on this class source file for full copyright and license information.
- *
- * @name QRcode
- * @package com.tecnick.tcpdf
- * @abstract Class for generating QR-code array for TCPDF.
- * @author Nicola Asuni
- * @copyright 2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.002
- */
- class QRcode {
-
- /**
- * @var barcode array to be returned which is readable by TCPDF
- * @access protected
- */
- protected $barcode_array = array();
-
- /**
- * @var QR code version. Size of QRcode is defined as version. Version is from 1 to 40. Version 1 is 21*21 matrix. And 4 modules increases whenever 1 version increases. So version 40 is 177*177 matrix.
- * @access protected
- */
- protected $version = 0;
-
- /**
- * @var Levels of error correction. See definitions for possible values.
- * @access protected
- */
- protected $level = QR_ECLEVEL_L;
-
- /**
- * @var Encoding mode
- * @access protected
- */
- protected $hint = QR_MODE_8B;
-
- /**
- * @var if true the input string will be converted to uppercase
- * @access protected
- */
- protected $casesensitive = true;
-
- /**
- * @var structured QR code (not supported yet)
- * @access protected
- */
- protected $structured = 0;
-
- /**
- * @var mask data
- * @access protected
- */
- protected $data;
-
- // FrameFiller
-
- /**
- * @var width
- * @access protected
- */
- protected $width;
-
- /**
- * @var frame
- * @access protected
- */
- protected $frame;
-
- /**
- * @var X position of bit
- * @access protected
- */
- protected $x;
-
- /**
- * @var Y position of bit
- * @access protected
- */
- protected $y;
-
- /**
- * @var direction
- * @access protected
- */
- protected $dir;
-
- /**
- * @var single bit
- * @access protected
- */
- protected $bit;
-
- // ---- QRrawcode ----
-
- /**
- * @var data code
- * @access protected
- */
- protected $datacode = array();
-
- /**
- * @var error correction code
- * @access protected
- */
- protected $ecccode = array();
-
- /**
- * @var blocks
- * @access protected
- */
- protected $blocks;
-
- /**
- * @var Reed-Solomon blocks
- * @access protected
- */
- protected $rsblocks = array(); //of RSblock
-
- /**
- * @var counter
- * @access protected
- */
- protected $count;
-
- /**
- * @var data length
- * @access protected
- */
- protected $dataLength;
-
- /**
- * @var error correction length
- * @access protected
- */
- protected $eccLength;
-
- /**
- * @var b1
- * @access protected
- */
- protected $b1;
-
- // ---- QRmask ----
-
- /**
- * @var run length
- * @access protected
- */
- protected $runLength = array();
-
- // ---- QRsplit ----
-
- /**
- * @var input data string
- * @access protected
- */
- protected $dataStr = '';
-
- /**
- * @var input items
- * @access protected
- */
- protected $items;
-
- // Reed-Solomon items
-
- /**
- * @var Reed-Solomon items
- * @access protected
- */
- protected $rsitems = array();
-
- /**
- * @var array of frames
- * @access protected
- */
- protected $frames = array();
-
- /**
- * @var alphabet-numeric convesion table
- * @access protected
- */
- protected $anTable = array(
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
- 36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, //
- -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 //
- );
-
- /**
- * @var array Table of the capacity of symbols
- * See Table 1 (pp.13) and Table 12-16 (pp.30-36), JIS X0510:2004.
- * @access protected
- */
- protected $capacity = array(
- array( 0, 0, 0, array( 0, 0, 0, 0)), //
- array( 21, 26, 0, array( 7, 10, 13, 17)), // 1
- array( 25, 44, 7, array( 10, 16, 22, 28)), //
- array( 29, 70, 7, array( 15, 26, 36, 44)), //
- array( 33, 100, 7, array( 20, 36, 52, 64)), //
- array( 37, 134, 7, array( 26, 48, 72, 88)), // 5
- array( 41, 172, 7, array( 36, 64, 96, 112)), //
- array( 45, 196, 0, array( 40, 72, 108, 130)), //
- array( 49, 242, 0, array( 48, 88, 132, 156)), //
- array( 53, 292, 0, array( 60, 110, 160, 192)), //
- array( 57, 346, 0, array( 72, 130, 192, 224)), // 10
- array( 61, 404, 0, array( 80, 150, 224, 264)), //
- array( 65, 466, 0, array( 96, 176, 260, 308)), //
- array( 69, 532, 0, array( 104, 198, 288, 352)), //
- array( 73, 581, 3, array( 120, 216, 320, 384)), //
- array( 77, 655, 3, array( 132, 240, 360, 432)), // 15
- array( 81, 733, 3, array( 144, 280, 408, 480)), //
- array( 85, 815, 3, array( 168, 308, 448, 532)), //
- array( 89, 901, 3, array( 180, 338, 504, 588)), //
- array( 93, 991, 3, array( 196, 364, 546, 650)), //
- array( 97, 1085, 3, array( 224, 416, 600, 700)), // 20
- array(101, 1156, 4, array( 224, 442, 644, 750)), //
- array(105, 1258, 4, array( 252, 476, 690, 816)), //
- array(109, 1364, 4, array( 270, 504, 750, 900)), //
- array(113, 1474, 4, array( 300, 560, 810, 960)), //
- array(117, 1588, 4, array( 312, 588, 870, 1050)), // 25
- array(121, 1706, 4, array( 336, 644, 952, 1110)), //
- array(125, 1828, 4, array( 360, 700, 1020, 1200)), //
- array(129, 1921, 3, array( 390, 728, 1050, 1260)), //
- array(133, 2051, 3, array( 420, 784, 1140, 1350)), //
- array(137, 2185, 3, array( 450, 812, 1200, 1440)), // 30
- array(141, 2323, 3, array( 480, 868, 1290, 1530)), //
- array(145, 2465, 3, array( 510, 924, 1350, 1620)), //
- array(149, 2611, 3, array( 540, 980, 1440, 1710)), //
- array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
- array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
- array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
- array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
- array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
- array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
- array(177, 3706, 0, array( 750, 1372, 2040, 2430)) // 40
- );
-
- /**
- * @var array Length indicator
- * @access protected
- */
- protected $lengthTableBits = array(
- array(10, 12, 14),
- array( 9, 11, 13),
- array( 8, 16, 16),
- array( 8, 10, 12)
- );
-
- /**
- * @var array Table of the error correction code (Reed-Solomon block)
- * See Table 12-16 (pp.30-36), JIS X0510:2004.
- * @access protected
- */
- protected $eccTable = array(
- array(array( 0, 0), array( 0, 0), array( 0, 0), array( 0, 0)), //
- array(array( 1, 0), array( 1, 0), array( 1, 0), array( 1, 0)), // 1
- array(array( 1, 0), array( 1, 0), array( 1, 0), array( 1, 0)), //
- array(array( 1, 0), array( 1, 0), array( 2, 0), array( 2, 0)), //
- array(array( 1, 0), array( 2, 0), array( 2, 0), array( 4, 0)), //
- array(array( 1, 0), array( 2, 0), array( 2, 2), array( 2, 2)), // 5
- array(array( 2, 0), array( 4, 0), array( 4, 0), array( 4, 0)), //
- array(array( 2, 0), array( 4, 0), array( 2, 4), array( 4, 1)), //
- array(array( 2, 0), array( 2, 2), array( 4, 2), array( 4, 2)), //
- array(array( 2, 0), array( 3, 2), array( 4, 4), array( 4, 4)), //
- array(array( 2, 2), array( 4, 1), array( 6, 2), array( 6, 2)), // 10
- array(array( 4, 0), array( 1, 4), array( 4, 4), array( 3, 8)), //
- array(array( 2, 2), array( 6, 2), array( 4, 6), array( 7, 4)), //
- array(array( 4, 0), array( 8, 1), array( 8, 4), array(12, 4)), //
- array(array( 3, 1), array( 4, 5), array(11, 5), array(11, 5)), //
- array(array( 5, 1), array( 5, 5), array( 5, 7), array(11, 7)), // 15
- array(array( 5, 1), array( 7, 3), array(15, 2), array( 3, 13)), //
- array(array( 1, 5), array(10, 1), array( 1, 15), array( 2, 17)), //
- array(array( 5, 1), array( 9, 4), array(17, 1), array( 2, 19)), //
- array(array( 3, 4), array( 3, 11), array(17, 4), array( 9, 16)), //
- array(array( 3, 5), array( 3, 13), array(15, 5), array(15, 10)), // 20
- array(array( 4, 4), array(17, 0), array(17, 6), array(19, 6)), //
- array(array( 2, 7), array(17, 0), array( 7, 16), array(34, 0)), //
- array(array( 4, 5), array( 4, 14), array(11, 14), array(16, 14)), //
- array(array( 6, 4), array( 6, 14), array(11, 16), array(30, 2)), //
- array(array( 8, 4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
- array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), //
- array(array( 8, 4), array(22, 3), array( 8, 26), array(12, 28)), //
- array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
- array(array( 7, 7), array(21, 7), array( 1, 37), array(19, 26)), //
- array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
- array(array(13, 3), array( 2, 29), array(42, 1), array(23, 28)), //
- array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), //
- array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), //
- array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), //
- array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), // 35
- array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
- array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), //
- array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
- array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), //
- array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)) // 40
- );
-
- /**
- * @var array Positions of alignment patterns.
- * This array includes only the second and the third position of the alignment patterns. Rest of them can be calculated from the distance between them.
- * See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
- * @access protected
- */
- protected $alignmentPattern = array(
- array( 0, 0),
- array( 0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5
- array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
- array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
- array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
- array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
- array(30, 58), array(34, 62), array(26, 50), array(30, 54), array(26, 52), // 26-30
- array(30, 56), array(34, 60), array(30, 58), array(34, 62), array(30, 54), // 31-35
- array(24, 50), array(28, 54), array(32, 58), array(26, 54), array(30, 58) // 35-40
- );
-
- /**
- * @var array Version information pattern (BCH coded).
- * See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
- * size: [QRSPEC_VERSION_MAX - 6]
- * @access protected
- */
- protected $versionPattern = array(
- 0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d, //
- 0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9, //
- 0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75, //
- 0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, //
- 0x27541, 0x28c69
- );
-
- /**
- * @var array Format information
- * @access protected
- */
- protected $formatInfo = array(
- array(0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976), //
- array(0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0), //
- array(0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed), //
- array(0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b) //
- );
-
-
- // -------------------------------------------------
- // -------------------------------------------------
-
-
- /**
- * This is the class constructor.
- * Creates a QRcode object
- * @param string $code code to represent using QRcode
- * @param string $eclevel error level:
.
- */
- protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
- foreach ($this->rsitems as $rs) {
- if (($rs['pad'] != $pad) OR ($rs['nroots'] != $nroots) OR ($rs['mm'] != $symsize)
- OR ($rs['gfpoly'] != $gfpoly) OR ($rs['fcr'] != $fcr) OR ($rs['prim'] != $prim)) {
- continue;
- }
- return $rs;
- }
- $rs = $this->init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad);
- array_unshift($this->rsitems, $rs);
- return $rs;
- }
-
- // - - - - - - - - - - - - - - - - - - - - - - - - -
-
- // QRrsItem
-
- /**
- * modnn
- * @param array RS values
- * @param int $x X position
- * @return int X osition
- */
- protected function modnn($rs, $x) {
- while ($x >= $rs['nn']) {
- $x -= $rs['nn'];
- $x = ($x >> $rs['mm']) + ($x & $rs['nn']);
- }
- return $x;
- }
-
- /**
- * Initialize a Reed-Solomon codec and returns an array of values.
- * @param int $symsize symbol size, bits
- * @param int $gfpoly Field generator polynomial coefficients
- * @param int $fcr first root of RS code generator polynomial, index form
- * @param int $prim primitive element to generate polynomial roots
- * @param int $nroots RS code generator polynomial degree (number of roots)
- * @param int $pad padding bytes at front of shortened block
- * @return array Array of RS values:
mm = Bits per symbol;
nn = Symbols per block;
alpha_to = log lookup table array;
index_of = Antilog lookup table array;
genpoly = Generator polynomial array;
nroots = Number of generator;
roots = number of parity symbols;
fcr = First consecutive root, index form;
prim = Primitive element, index form;
iprim = prim-th root of 1, index form;
pad = Padding bytes in shortened block;
gfpoly
.
- */
- protected function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
- // Based on Reed solomon encoder by Phil Karn, KA9Q (GNU-LGPLv2)
- $rs = null;
- // Check parameter ranges
- if (($symsize < 0) OR ($symsize > 8)) {
- return $rs;
- }
- if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
- return $rs;
- }
- if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
- return $rs;
- }
- if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
- return $rs;
- }
- if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
- return $rs;
- }
- $rs = array();
- $rs['mm'] = $symsize;
- $rs['nn'] = (1 << $symsize) - 1;
- $rs['pad'] = $pad;
- $rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
- $rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
- // PHP style macro replacement ;)
- $NN =& $rs['nn'];
- $A0 =& $NN;
- // Generate Galois field lookup tables
- $rs['index_of'][0] = $A0; // log(zero) = -inf
- $rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
- $sr = 1;
- for ($i=0; $i<$rs['nn']; ++$i) {
- $rs['index_of'][$sr] = $i;
- $rs['alpha_to'][$i] = $sr;
- $sr <<= 1;
- if ($sr & (1 << $symsize)) {
- $sr ^= $gfpoly;
- }
- $sr &= $rs['nn'];
- }
- if ($sr != 1) {
- // field generator polynomial is not primitive!
- return NULL;
- }
- // Form RS code generator polynomial from its roots
- $rs['genpoly'] = array_fill(0, ($nroots + 1), 0);
- $rs['fcr'] = $fcr;
- $rs['prim'] = $prim;
- $rs['nroots'] = $nroots;
- $rs['gfpoly'] = $gfpoly;
- // Find prim-th root of 1, used in decoding
- for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
- ; // intentional empty-body loop!
- }
- $rs['iprim'] = (int)($iprim / $prim);
- $rs['genpoly'][0] = 1;
-
-
- for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
- $rs['genpoly'][$i+1] = 1;
- // Multiply rs->genpoly[] by @**(root + x)
- for ($j = $i; $j > 0; --$j) {
- if ($rs['genpoly'][$j] != 0) {
- $rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
- } else {
- $rs['genpoly'][$j] = $rs['genpoly'][$j-1];
- }
- }
- // rs->genpoly[0] can never be zero
- $rs['genpoly'][0] = $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][0]] + $root)];
- }
- // convert rs->genpoly[] to index form for quicker encoding
- for ($i = 0; $i <= $nroots; ++$i) {
- $rs['genpoly'][$i] = $rs['index_of'][$rs['genpoly'][$i]];
- }
- return $rs;
- }
-
- /**
- * Encode a Reed-Solomon codec and returns the parity array
- * @param array $rs RS values
- * @param array $data data
- * @param array $parity parity
- * @return parity array
- */
- protected function encode_rs_char($rs, $data, $parity) {
- $MM =& $rs['mm']; // bits per symbol
- $NN =& $rs['nn']; // the total number of symbols in a RS block
- $ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
- $INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
- $GENPOLY =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
- $NROOTS =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
- $FCR =& $rs['fcr']; // first consecutive root, index form
- $PRIM =& $rs['prim']; // primitive element, index form
- $IPRIM =& $rs['iprim']; // prim-th root of 1, index form
- $PAD =& $rs['pad']; // the number of pad symbols in a block
- $A0 =& $NN;
- $parity = array_fill(0, $NROOTS, 0);
- for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
- $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
- if ($feedback != $A0) {
- // feedback term is non-zero
- // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
- // always be for the polynomials constructed by init_rs()
- $feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
- for ($j=1; $j < $NROOTS; ++$j) {
- $parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
- }
- }
- // Shift
- array_shift($parity);
- if ($feedback != $A0) {
- array_push($parity, $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[0])]);
- } else {
- array_push($parity, 0);
- }
- }
- return $parity;
- }
-
- } // end QRcode class
-
-} // END OF "class_exists QRcode"
-?>
diff --git a/conlite/external/phpqrcode/index.php b/conlite/external/phpqrcode/index.php
deleted file mode 100644
index 0906d2f..0000000
--- a/conlite/external/phpqrcode/index.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- *
- * This library 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 any later version.
- *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- echo "
PHP QR Code
";
-
- //set it to writable location, a place for temp generated PNG files
- $PNG_TEMP_DIR = dirname(__FILE__).DIRECTORY_SEPARATOR.'temp'.DIRECTORY_SEPARATOR;
-
- //html PNG location prefix
- $PNG_WEB_DIR = 'temp/';
-
- include "qrlib.php";
-
- //ofcourse we need rights to create temp dir
- if (!file_exists($PNG_TEMP_DIR))
- mkdir($PNG_TEMP_DIR);
-
-
- $filename = $PNG_TEMP_DIR.'test.png';
-
- //processing form input
- //remember to sanitize user input in real-life solution !!!
- $errorCorrectionLevel = 'L';
- if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))
- $errorCorrectionLevel = $_REQUEST['level'];
-
- $matrixPointSize = 4;
- if (isset($_REQUEST['size']))
- $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
-
-
- if (isset($_REQUEST['data'])) {
-
- //it's very important!
- if (trim($_REQUEST['data']) == '')
- die('data cannot be empty! back');
-
- // user data
- $filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
- QRcode::png($_REQUEST['data'], $filename, $errorCorrectionLevel, $matrixPointSize, 2);
-
- } else {
-
- //default data
- echo 'You can provide data in GET parameter: like that';
- QRcode::png('PHP QR Code :)', $filename, $errorCorrectionLevel, $matrixPointSize, 2);
-
- }
-
- //display generated file
- echo '';
-
- //config form
- echo '';
-
- // benchmark
- QRtools::timeBenchmark();
-
-
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/phpqrcode.php b/conlite/external/phpqrcode/phpqrcode.php
deleted file mode 100644
index ea8c08f..0000000
--- a/conlite/external/phpqrcode/phpqrcode.php
+++ /dev/null
@@ -1,3312 +0,0 @@
-
- *
- * This library 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 any later version.
- *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-
-/*
- * Version: 1.1.4
- * Build: 2010100721
- */
-
-
-
-//---- qrconst.php -----------------------------
-
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Common constants
- *
- * Based on libqrencode C library distributed under LGPL 2.1
- * Copyright (C) 2006, 2007, 2008, 2009 Kentaro Fukuchi
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia
- *
- * This library 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 any later version.
- *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // Encoding modes
-
- define('QR_MODE_NUL', -1);
- define('QR_MODE_NUM', 0);
- define('QR_MODE_AN', 1);
- define('QR_MODE_8', 2);
- define('QR_MODE_KANJI', 3);
- define('QR_MODE_STRUCTURE', 4);
-
- // Levels of error correction.
-
- define('QR_ECLEVEL_L', 0);
- define('QR_ECLEVEL_M', 1);
- define('QR_ECLEVEL_Q', 2);
- define('QR_ECLEVEL_H', 3);
-
- // Supported output formats
-
- define('QR_FORMAT_TEXT', 0);
- define('QR_FORMAT_PNG', 1);
-
- class qrstr {
- public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
- $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
- }
- }
-
-
-
-//---- merged_config.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Config file, tuned-up for merged verion
- */
-
- define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there
- define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true
- define('QR_LOG_DIR', false); // default error logs dir
-
- define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
- define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
- define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false
-
- define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
-
-
-
-
-//---- qrtools.php -----------------------------
-
-
-
-
-/*
- * PHP QR Code encoder
- *
- * Toolset, handy and debug utilites.
- *
- * PHP QR Code is distributed under LGPL 3
- * Copyright (C) 2010 Dominik Dzienia
- *
- * This library 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 any later version.
- *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- class QRtools {
-
- //----------------------------------------------------------------------
- public static function binarize($frame)
- {
- $len = count($frame);
- foreach ($frame as &$frameLine) {
-
- for($i=0; $i<$len; $i++) {
- $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
- }
- }
-
- return $frame;
- }
-
- //----------------------------------------------------------------------
- public static function tcpdfBarcodeArray($code, $mode = 'QR,L', $tcPdfVersion = '4.5.037')
- {
- $barcode_array = array();
-
- if (!is_array($mode))
- $mode = explode(',', $mode);
-
- $eccLevel = 'L';
-
- if (count($mode) > 1) {
- $eccLevel = $mode[1];
- }
-
- $qrTab = QRcode::text($code, false, $eccLevel);
- $size = count($qrTab);
-
- $barcode_array['num_rows'] = $size;
- $barcode_array['num_cols'] = $size;
- $barcode_array['bcode'] = array();
-
- foreach ($qrTab as $line) {
- $arrAdd = array();
- foreach(str_split($line) as $char)
- $arrAdd[] = ($char=='1')?1:0;
- $barcode_array['bcode'][] = $arrAdd;
- }
-
- return $barcode_array;
- }
-
- //----------------------------------------------------------------------
- public static function clearCache()
- {
- self::$frames = array();
- }
-
- //----------------------------------------------------------------------
- public static function buildCache()
- {
- QRtools::markTime('before_build_cache');
-
- $mask = new QRmask();
- for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
- $frame = QRspec::newFrame($a);
- if (QR_IMAGE) {
- $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
- QRimage::png(self::binarize($frame), $fileName, 1, 0);
- }
-
- $width = count($frame);
- $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
- for ($maskNo=0; $maskNo<8; $maskNo++)
- $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
- }
-
- QRtools::markTime('after_build_cache');
- }
-
- //----------------------------------------------------------------------
- public static function log($outfile, $err)
- {
- if (QR_LOG_DIR !== false) {
- if ($err != '') {
- if ($outfile !== false) {
- file_put_contents(QR_LOG_DIR.basename($outfile).'-errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
- } else {
- file_put_contents(QR_LOG_DIR.'errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);
- }
- }
- }
- }
-
- //----------------------------------------------------------------------
- public static function dumpMask($frame)
- {
- $width = count($frame);
- for($y=0;$y<$width;$y++) {
- for($x=0;$x<$width;$x++) {
- echo ord($frame[$y][$x]).',';
- }
- }
- }
-
- //----------------------------------------------------------------------
- public static function markTime($markerId)
- {
- list($usec, $sec) = explode(" ", microtime());
- $time = ((float)$usec + (float)$sec);
-
- if (!isset($GLOBALS['qr_time_bench']))
- $GLOBALS['qr_time_bench'] = array();
-
- $GLOBALS['qr_time_bench'][$markerId] = $time;
- }
-
- //----------------------------------------------------------------------
- public static function timeBenchmark()
- {
- self::markTime('finish');
-
- $lastTime = 0;
- $startTime = 0;
- $p = 0;
-
- echo '
-
BENCHMARK
- ';
-
- foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
- if ($p > 0) {
- echo '
';
- }
-
- }
-
- //##########################################################################
-
- QRtools::markTime('start');
-
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/tools/merge.bat b/conlite/external/phpqrcode/tools/merge.bat
deleted file mode 100644
index 2b5eebb..0000000
--- a/conlite/external/phpqrcode/tools/merge.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-php ./merge.php
-pause
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/tools/merge.php b/conlite/external/phpqrcode/tools/merge.php
deleted file mode 100644
index 9e809c8..0000000
--- a/conlite/external/phpqrcode/tools/merge.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *
- * This library 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 any later version.
- *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- $QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
- $QR_TOOLSDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;
-
- $outputFile = $QR_BASEDIR.'phpqrcode.php';
-
- // Required libs
-
- $fileList = array(
- $QR_BASEDIR.'qrconst.php',
- $QR_TOOLSDIR.'merged_config.php',
- $QR_BASEDIR.'qrtools.php',
- $QR_BASEDIR.'qrspec.php',
- $QR_BASEDIR.'qrimage.php',
- $QR_BASEDIR.'qrinput.php',
- $QR_BASEDIR.'qrbitstream.php',
- $QR_BASEDIR.'qrsplit.php',
- $QR_BASEDIR.'qrrscode.php',
- $QR_BASEDIR.'qrmask.php',
- $QR_BASEDIR.'qrencode.php'
- );
-
- $headerFile = $QR_TOOLSDIR.'merged_header.php';
- $versionFile = $QR_BASEDIR.'VERSION';
-
- $outputCode = '';
-
- foreach($fileList as $fileName) {
- $outputCode .= "\n\n".'//---- '.basename($fileName).' -----------------------------'."\n\n";
- $anotherCode = file_get_contents($fileName);
- $anotherCode = preg_replace ('/^<\?php/', '', $anotherCode);
- $anotherCode = preg_replace ('/\?>\*$/', '', $anotherCode);
- $outputCode .= "\n\n".$anotherCode."\n\n";
- }
-
- $versionDataEx = explode("\n", file_get_contents($versionFile));
-
- $outputContents = file_get_contents($headerFile);
- $outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";
- $outputContents .= $outputCode;
-
- file_put_contents($outputFile, $outputContents);
-
-
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/tools/merge.sh b/conlite/external/phpqrcode/tools/merge.sh
deleted file mode 100644
index 1a2515b..0000000
--- a/conlite/external/phpqrcode/tools/merge.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-php ./merge.php
\ No newline at end of file
diff --git a/conlite/external/phpqrcode/tools/merged_config.php b/conlite/external/phpqrcode/tools/merged_config.php
deleted file mode 100644
index 8cd917d..0000000
--- a/conlite/external/phpqrcode/tools/merged_config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
- *
- * This library 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 any later version.
- *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
\ No newline at end of file
diff --git a/conlite/includes/include.mod_translate_stringlist.php b/conlite/includes/include.mod_translate_stringlist.php
index ab03558..4eb8975 100644
--- a/conlite/includes/include.mod_translate_stringlist.php
+++ b/conlite/includes/include.mod_translate_stringlist.php
@@ -50,8 +50,8 @@ $mylink = new cHTMLLink;
while ($translation = $translations->next()) {
- $string = utf8_encode($translation->get("original"));
- $tstring = utf8_encode($translation->get("translation"));
+ $string = $translation->get("original");
+ $tstring = $translation->get("translation");
$link->setCustom("idmod", $idmod);
$link->setCustom("idmodtranslation", $translation->get("idmodtranslation"));
diff --git a/conlite/includes/startup.php b/conlite/includes/startup.php
index 8b0f655..6b0588d 100644
--- a/conlite/includes/startup.php
+++ b/conlite/includes/startup.php
@@ -142,7 +142,7 @@ require_once($cfg['path']['conlite'] . $cfg['path']['includes'] . '/api/function
include_once($cfg['path']['conlite'] . $cfg['path']['classes'] . 'class.autoload.php');
cAutoload::initialize($cfg);
// init composer autoload
-include_once($cfg['path']['conlite'] . $cfg['path']['external'] . 'autoload.php');
+include_once($cfg['path']['conlite'] . 'vendor/autoload.php');
// 2. security check: Check HTTP parameters, if requested
diff --git a/data/config/production/config.misc.php b/data/config/production/config.misc.php
index 4a0ee3b..e0553a1 100644
--- a/data/config/production/config.misc.php
+++ b/data/config/production/config.misc.php
@@ -148,9 +148,7 @@ ini_set("log_errors", true);
ini_set("error_log", $cfg['path']['conlite_logs'] . "errorlog.txt");
/**
- * Report all errors except warnings
- * @todo change first if to use a local config var for servername
- *
+ * Report all errors except warnings
**/
if ($cfg["develop"]["show_errors"]) {
error_reporting(E_ALL);
diff --git a/conlite/external/autoload.php b/vendor/autoload.php
similarity index 85%
rename from conlite/external/autoload.php
rename to vendor/autoload.php
index 955af5a..c68fce0 100644
--- a/conlite/external/autoload.php
+++ b/vendor/autoload.php
@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit4710875e1096bb659e0da9fbf88400bb::getLoader();
+return ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00::getLoader();
diff --git a/conlite/external/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
similarity index 100%
rename from conlite/external/composer/ClassLoader.php
rename to vendor/composer/ClassLoader.php
diff --git a/conlite/external/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
similarity index 100%
rename from conlite/external/composer/InstalledVersions.php
rename to vendor/composer/InstalledVersions.php
diff --git a/conlite/external/composer/LICENSE b/vendor/composer/LICENSE
similarity index 100%
rename from conlite/external/composer/LICENSE
rename to vendor/composer/LICENSE
diff --git a/conlite/external/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
similarity index 82%
rename from conlite/external/composer/autoload_classmap.php
rename to vendor/composer/autoload_classmap.php
index 37e449b..0fb0a2c 100644
--- a/conlite/external/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -3,7 +3,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(__DIR__);
-$baseDir = dirname(dirname($vendorDir));
+$baseDir = dirname($vendorDir);
return array(
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
diff --git a/conlite/external/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
similarity index 72%
rename from conlite/external/composer/autoload_namespaces.php
rename to vendor/composer/autoload_namespaces.php
index f1ae7a0..15a2ff3 100644
--- a/conlite/external/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -3,7 +3,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(__DIR__);
-$baseDir = dirname(dirname($vendorDir));
+$baseDir = dirname($vendorDir);
return array(
);
diff --git a/conlite/external/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
similarity index 65%
rename from conlite/external/composer/autoload_psr4.php
rename to vendor/composer/autoload_psr4.php
index 35cfe40..28567a0 100644
--- a/conlite/external/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -3,9 +3,8 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(__DIR__);
-$baseDir = dirname(dirname($vendorDir));
+$baseDir = dirname($vendorDir);
return array(
'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),
- 'Conlite\\External\\' => array($vendorDir . ''),
);
diff --git a/conlite/external/composer/autoload_real.php b/vendor/composer/autoload_real.php
similarity index 62%
rename from conlite/external/composer/autoload_real.php
rename to vendor/composer/autoload_real.php
index 522aa8a..08dfdc9 100644
--- a/conlite/external/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit4710875e1096bb659e0da9fbf88400bb
+class ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00
{
private static $loader;
@@ -24,12 +24,12 @@ class ComposerAutoloaderInit4710875e1096bb659e0da9fbf88400bb
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit4710875e1096bb659e0da9fbf88400bb', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
- spl_autoload_unregister(array('ComposerAutoloaderInit4710875e1096bb659e0da9fbf88400bb', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit4710875e1096bb659e0da9fbf88400bb::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit030320213c853f2cfb8481e1bb7caf00::getInitializer($loader));
$loader->register(true);
diff --git a/conlite/external/composer/autoload_static.php b/vendor/composer/autoload_static.php
similarity index 55%
rename from conlite/external/composer/autoload_static.php
rename to vendor/composer/autoload_static.php
index 7f9ddc8..f306b86 100644
--- a/conlite/external/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,17 +4,13 @@
namespace Composer\Autoload;
-class ComposerStaticInit4710875e1096bb659e0da9fbf88400bb
+class ComposerStaticInit030320213c853f2cfb8481e1bb7caf00
{
public static $prefixLengthsPsr4 = array (
'P' =>
array (
'PHPMailer\\PHPMailer\\' => 20,
),
- 'C' =>
- array (
- 'Conlite\\External\\' => 17,
- ),
);
public static $prefixDirsPsr4 = array (
@@ -22,10 +18,6 @@ class ComposerStaticInit4710875e1096bb659e0da9fbf88400bb
array (
0 => __DIR__ . '/..' . '/phpmailer/phpmailer/src',
),
- 'Conlite\\External\\' =>
- array (
- 0 => __DIR__ . '/../../..' . '/conlite/external',
- ),
);
public static $classMap = array (
@@ -35,9 +27,9 @@ class ComposerStaticInit4710875e1096bb659e0da9fbf88400bb
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit4710875e1096bb659e0da9fbf88400bb::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit4710875e1096bb659e0da9fbf88400bb::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInit4710875e1096bb659e0da9fbf88400bb::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit030320213c853f2cfb8481e1bb7caf00::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit030320213c853f2cfb8481e1bb7caf00::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInit030320213c853f2cfb8481e1bb7caf00::$classMap;
}, null, ClassLoader::class);
}
diff --git a/conlite/external/composer/installed.json b/vendor/composer/installed.json
similarity index 100%
rename from conlite/external/composer/installed.json
rename to vendor/composer/installed.json
diff --git a/conlite/external/composer/installed.php b/vendor/composer/installed.php
similarity index 79%
rename from conlite/external/composer/installed.php
rename to vendor/composer/installed.php
index e750583..6e63756 100644
--- a/conlite/external/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,9 +3,9 @@
'name' => 'org.conlite/conlite',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => '219d52f73993933b39969e150ab402f9f28347e1',
+ 'reference' => '8798c805f60d265de3beef0209d06a80ee44266a',
'type' => 'library',
- 'install_path' => __DIR__ . '/../../../',
+ 'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev' => false,
),
@@ -13,9 +13,9 @@
'org.conlite/conlite' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
- 'reference' => '219d52f73993933b39969e150ab402f9f28347e1',
+ 'reference' => '8798c805f60d265de3beef0209d06a80ee44266a',
'type' => 'library',
- 'install_path' => __DIR__ . '/../../../',
+ 'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev_requirement' => false,
),
diff --git a/conlite/external/composer/platform_check.php b/vendor/composer/platform_check.php
similarity index 100%
rename from conlite/external/composer/platform_check.php
rename to vendor/composer/platform_check.php
diff --git a/conlite/external/phpmailer/phpmailer/COMMITMENT b/vendor/phpmailer/phpmailer/COMMITMENT
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/COMMITMENT
rename to vendor/phpmailer/phpmailer/COMMITMENT
diff --git a/conlite/external/phpmailer/phpmailer/LICENSE b/vendor/phpmailer/phpmailer/LICENSE
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/LICENSE
rename to vendor/phpmailer/phpmailer/LICENSE
diff --git a/conlite/external/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/README.md
rename to vendor/phpmailer/phpmailer/README.md
diff --git a/conlite/external/phpmailer/phpmailer/SECURITY.md b/vendor/phpmailer/phpmailer/SECURITY.md
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/SECURITY.md
rename to vendor/phpmailer/phpmailer/SECURITY.md
diff --git a/conlite/external/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/VERSION
rename to vendor/phpmailer/phpmailer/VERSION
diff --git a/conlite/external/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/composer.json
rename to vendor/phpmailer/phpmailer/composer.json
diff --git a/conlite/external/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/get_oauth_token.php
rename to vendor/phpmailer/phpmailer/get_oauth_token.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-af.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-af.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ar.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ar.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-az.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-az.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ba.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ba.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-be.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-be.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-bg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-bg.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ca.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ca.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-cs.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-cs.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-da.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-da.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-de.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-de.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-el.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-el.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-eo.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-eo.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-es.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-es.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-et.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-et.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fa.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fa.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fi.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fo.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fo.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fr.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-gl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-gl.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-he.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-he.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hi.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hr.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hu.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hu.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hy.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hy.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-id.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-id.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-it.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-it.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ja.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ka.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ka.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ko.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ko.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lt.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lt.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lv.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lv.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-mg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-mg.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-mn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-mn.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ms.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ms.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nb.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nb.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nl.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pl.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ro.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ru.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sk.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sl.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sr.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sv.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sv.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-tl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-tl.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-tr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-tr.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-uk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-uk.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-vi.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-vi.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
diff --git a/conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
rename to vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
diff --git a/conlite/external/phpmailer/phpmailer/src/DSNConfigurator.php b/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/DSNConfigurator.php
rename to vendor/phpmailer/phpmailer/src/DSNConfigurator.php
diff --git a/conlite/external/phpmailer/phpmailer/src/Exception.php b/vendor/phpmailer/phpmailer/src/Exception.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/Exception.php
rename to vendor/phpmailer/phpmailer/src/Exception.php
diff --git a/conlite/external/phpmailer/phpmailer/src/OAuth.php b/vendor/phpmailer/phpmailer/src/OAuth.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/OAuth.php
rename to vendor/phpmailer/phpmailer/src/OAuth.php
diff --git a/conlite/external/phpmailer/phpmailer/src/OAuthTokenProvider.php b/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/OAuthTokenProvider.php
rename to vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
diff --git a/conlite/external/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/PHPMailer.php
rename to vendor/phpmailer/phpmailer/src/PHPMailer.php
diff --git a/conlite/external/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/POP3.php
rename to vendor/phpmailer/phpmailer/src/POP3.php
diff --git a/conlite/external/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
similarity index 100%
rename from conlite/external/phpmailer/phpmailer/src/SMTP.php
rename to vendor/phpmailer/phpmailer/src/SMTP.php