From fe8b0cd9444438389bed15f0e449bd61d1a7ffa9 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 20:04:17 +0200 Subject: [PATCH 1/8] * update to 0.3.0 --- CHANGELOG | 19 +++++++++++++++++++ common.php | 4 ++-- config.php | 2 +- index.php | 2 +- system/compat_pages.php | 2 +- system/counter.php | 2 +- system/countries.conf.php | 2 +- system/functions.php | 2 +- system/hooks.php | 2 +- system/init.php | 2 +- system/item.php | 2 +- system/libs/cache.php | 2 +- system/libs/cache_apc.php | 2 +- system/libs/cache_eaccelerator.php | 2 +- system/libs/cache_file.php | 2 +- system/libs/cache_xcache.php | 2 +- system/libs/data.php | 2 +- system/libs/items.php | 2 +- system/libs/timer.php | 2 +- system/libs/validator.php | 2 +- system/libs/visitors.php | 2 +- system/login.php | 2 +- system/pages/404.php | 2 +- system/pages/account.php | 2 +- system/pages/accountmanagement.php | 2 +- system/pages/admin/changelog.php | 2 +- system/pages/admin/dashboard.php | 2 +- system/pages/admin/login.php | 2 +- system/pages/admin/logs.php | 2 +- system/pages/admin/mailer.php | 2 +- system/pages/admin/notepad.php | 2 +- system/pages/admin/pages.php | 2 +- system/pages/admin/phpinfo.php | 2 +- system/pages/admin/players.php | 2 +- system/pages/admin/plugins.php | 2 +- system/pages/admin/statistics.php | 2 +- system/pages/admin/tools.php | 2 +- system/pages/admin/version.php | 2 +- system/pages/admin/visitors.php | 2 +- system/pages/bans.php | 2 +- system/pages/bugtracker.php | 2 +- system/pages/changelog.php | 2 +- system/pages/characters.php | 2 +- system/pages/commands.php | 2 +- system/pages/createaccount.php | 2 +- system/pages/creatures.php | 2 +- system/pages/custom.php | 2 +- system/pages/downloads.php | 2 +- system/pages/experiencestages.php | 2 +- system/pages/experiencetable.php | 2 +- system/pages/faq.php | 2 +- system/pages/forum.php | 2 +- system/pages/guilds.php | 2 +- system/pages/highscores.php | 2 +- system/pages/houses.php | 2 +- system/pages/lastkills.php | 2 +- system/pages/lostaccount.php | 2 +- system/pages/movies.php | 2 +- system/pages/news.php | 2 +- system/pages/newsarchive.php | 2 +- system/pages/online.php | 2 +- system/pages/polls.php | 2 +- system/pages/records.php | 2 +- system/pages/rules.php | 2 +- system/pages/screenshots.php | 2 +- system/pages/serverinfo.php | 2 +- system/pages/spells.php | 2 +- system/pages/team.php | 2 +- system/status.php | 2 +- system/template.php | 2 +- tools/signature/mango.php | 2 +- tools/signature/tibian.php | 6 ++++-- tools/validate.php | 6 +++--- 73 files changed, 97 insertions(+), 76 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 97f8e780..ee896e75 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,21 @@ +[0.3.0 - 28.08.2017] + - added administration panel for screenshots management with auto thumbnail generator and image auto-resizing + - added Twig template engine and moved some html-in-php code to it + - automatically detect player country based on user location (IP) on create account + - player sex (gender) is now configurable at $config['genders'] + - fixed recovering account and changing password when salt is enabled + - fixed installing samples when for example Rook Sample already exist and other samples not + - fixed some mysql error when character you trying to create already exist + - fixed some warning when you select unexisting country + - password change minimal/maximal length notice is now more precise + - added 'enabled' field in myaac_hooks table, which can enable or disable specified hook + - removed DEFAULT '' for TEXT field. It didn't worked under some systems like MAC OS X. + - minimum PHP version to install the MyAAC is now 5.2.0 cause of pathinfo (extension) function + - removed unused admin stylish template + - removed some unused cities field from myaac_spells table + - moved news adding at installation from schema.sql to finish.php + - some optimizations + [0.2.4 - 09.06.2017] - fixed invite to guild - added id field on monsters, so you can delete them in phpmyadmin @@ -6,6 +24,7 @@ - fixed when file is unable to parse (creatures) - fixed typo loss_items => loss_containers - more elegant way of showing message on reload creatures and spells + [0.2.3 - 31.05.2017] - fixed guild management on OTHire 0.0.3 - set default skills to 10 when creating new character diff --git a/common.php b/common.php index dd3d9baa..8055041b 100644 --- a/common.php +++ b/common.php @@ -21,13 +21,13 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ session_start(); define('MYAAC', true); -define('MYAAC_VERSION', '0.2.4'); +define('MYAAC_VERSION', '0.3.0'); define('DATABASE_VERSION', 7); define('TABLE_PREFIX', 'myaac_'); define('START_TIME', microtime(true)); diff --git a/config.php b/config.php index 529821ef..e4e51d49 100644 --- a/config.php +++ b/config.php @@ -13,7 +13,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ diff --git a/index.php b/index.php index a3811559..33305ed5 100644 --- a/index.php +++ b/index.php @@ -21,7 +21,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ diff --git a/system/compat_pages.php b/system/compat_pages.php index 2bb34f39..bb64929b 100644 --- a/system/compat_pages.php +++ b/system/compat_pages.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/counter.php b/system/counter.php index 9a61beb8..99461b63 100644 --- a/system/counter.php +++ b/system/counter.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/countries.conf.php b/system/countries.conf.php index 495a9839..2e933d8f 100644 --- a/system/countries.conf.php +++ b/system/countries.conf.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/functions.php b/system/functions.php index 3511d1df..fb2c0413 100644 --- a/system/functions.php +++ b/system/functions.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/hooks.php b/system/hooks.php index 250e5cbb..ae95e28b 100644 --- a/system/hooks.php +++ b/system/hooks.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/init.php b/system/init.php index e4e7d748..090abe50 100644 --- a/system/init.php +++ b/system/init.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/item.php b/system/item.php index e6304a27..621dd8fa 100644 --- a/system/item.php +++ b/system/item.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache.php b/system/libs/cache.php index cba9dfaf..27cdef99 100644 --- a/system/libs/cache.php +++ b/system/libs/cache.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_apc.php b/system/libs/cache_apc.php index b85f692f..4de26cd8 100644 --- a/system/libs/cache_apc.php +++ b/system/libs/cache_apc.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_eaccelerator.php b/system/libs/cache_eaccelerator.php index 2ed0838d..c224c819 100644 --- a/system/libs/cache_eaccelerator.php +++ b/system/libs/cache_eaccelerator.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_file.php b/system/libs/cache_file.php index 63ae56e8..afcdbdcd 100644 --- a/system/libs/cache_file.php +++ b/system/libs/cache_file.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/cache_xcache.php b/system/libs/cache_xcache.php index be0a7daf..7569ae36 100644 --- a/system/libs/cache_xcache.php +++ b/system/libs/cache_xcache.php @@ -6,7 +6,7 @@ * @author Slawkens * @author Mark Samman (Talaturen) * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/data.php b/system/libs/data.php index dc6816de..8014c9c7 100644 --- a/system/libs/data.php +++ b/system/libs/data.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/items.php b/system/libs/items.php index 2c195461..c27b6794 100644 --- a/system/libs/items.php +++ b/system/libs/items.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/timer.php b/system/libs/timer.php index f7205106..bdf37db3 100644 --- a/system/libs/timer.php +++ b/system/libs/timer.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/validator.php b/system/libs/validator.php index 23188413..b6039d20 100644 --- a/system/libs/validator.php +++ b/system/libs/validator.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/libs/visitors.php b/system/libs/visitors.php index 62ad104a..d13a3d75 100644 --- a/system/libs/visitors.php +++ b/system/libs/visitors.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/login.php b/system/login.php index e9434bb5..52424c35 100644 --- a/system/login.php +++ b/system/login.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/404.php b/system/pages/404.php index 4e7e44bb..4d8922af 100644 --- a/system/pages/404.php +++ b/system/pages/404.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/account.php b/system/pages/account.php index c8a0defe..ad93dd23 100644 --- a/system/pages/account.php +++ b/system/pages/account.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/accountmanagement.php b/system/pages/accountmanagement.php index 4cd4bdf4..232b127b 100644 --- a/system/pages/accountmanagement.php +++ b/system/pages/accountmanagement.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/changelog.php b/system/pages/admin/changelog.php index 747510dc..64916f5c 100644 --- a/system/pages/admin/changelog.php +++ b/system/pages/admin/changelog.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/dashboard.php b/system/pages/admin/dashboard.php index b06be404..b3017edb 100644 --- a/system/pages/admin/dashboard.php +++ b/system/pages/admin/dashboard.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/login.php b/system/pages/admin/login.php index 834d7e1c..a7ce4a24 100644 --- a/system/pages/admin/login.php +++ b/system/pages/admin/login.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/logs.php b/system/pages/admin/logs.php index fbfbfd33..8703ff62 100644 --- a/system/pages/admin/logs.php +++ b/system/pages/admin/logs.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/mailer.php b/system/pages/admin/mailer.php index 988f02e4..a0917a11 100644 --- a/system/pages/admin/mailer.php +++ b/system/pages/admin/mailer.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/notepad.php b/system/pages/admin/notepad.php index e4545a54..1767fffc 100644 --- a/system/pages/admin/notepad.php +++ b/system/pages/admin/notepad.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/pages.php b/system/pages/admin/pages.php index 944d6d3e..556697cd 100644 --- a/system/pages/admin/pages.php +++ b/system/pages/admin/pages.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/phpinfo.php b/system/pages/admin/phpinfo.php index b8b939e8..e089d5b4 100644 --- a/system/pages/admin/phpinfo.php +++ b/system/pages/admin/phpinfo.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/players.php b/system/pages/admin/players.php index 7b8ed007..6d7b3384 100644 --- a/system/pages/admin/players.php +++ b/system/pages/admin/players.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/plugins.php b/system/pages/admin/plugins.php index c68c178a..70e1c1f5 100644 --- a/system/pages/admin/plugins.php +++ b/system/pages/admin/plugins.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/statistics.php b/system/pages/admin/statistics.php index d042e914..2bb8416a 100644 --- a/system/pages/admin/statistics.php +++ b/system/pages/admin/statistics.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/tools.php b/system/pages/admin/tools.php index a7036017..597b4f01 100644 --- a/system/pages/admin/tools.php +++ b/system/pages/admin/tools.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/version.php b/system/pages/admin/version.php index c9a7a9cf..d8e4ade5 100644 --- a/system/pages/admin/version.php +++ b/system/pages/admin/version.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/admin/visitors.php b/system/pages/admin/visitors.php index 0d8b0359..2310c7de 100644 --- a/system/pages/admin/visitors.php +++ b/system/pages/admin/visitors.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/bans.php b/system/pages/bans.php index 8605d9a3..9dfadfe4 100644 --- a/system/pages/bans.php +++ b/system/pages/bans.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/bugtracker.php b/system/pages/bugtracker.php index bcb3a333..66e6aa86 100644 --- a/system/pages/bugtracker.php +++ b/system/pages/bugtracker.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/changelog.php b/system/pages/changelog.php index c3e0178a..feeafb3a 100644 --- a/system/pages/changelog.php +++ b/system/pages/changelog.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/characters.php b/system/pages/characters.php index 087ec532..0d840e0b 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/commands.php b/system/pages/commands.php index 7de4c9c7..4a22d34d 100644 --- a/system/pages/commands.php +++ b/system/pages/commands.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/createaccount.php b/system/pages/createaccount.php index dec53ad8..06063a4c 100644 --- a/system/pages/createaccount.php +++ b/system/pages/createaccount.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/creatures.php b/system/pages/creatures.php index 3e163b63..4fa3883b 100644 --- a/system/pages/creatures.php +++ b/system/pages/creatures.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/custom.php b/system/pages/custom.php index 475a48b7..70371ae7 100644 --- a/system/pages/custom.php +++ b/system/pages/custom.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/downloads.php b/system/pages/downloads.php index 1d57479e..145cb527 100644 --- a/system/pages/downloads.php +++ b/system/pages/downloads.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ $title = 'Downloads'; diff --git a/system/pages/experiencestages.php b/system/pages/experiencestages.php index 8f02d845..758cbec0 100644 --- a/system/pages/experiencestages.php +++ b/system/pages/experiencestages.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/experiencetable.php b/system/pages/experiencetable.php index 391d5218..14c6eae1 100644 --- a/system/pages/experiencetable.php +++ b/system/pages/experiencetable.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/faq.php b/system/pages/faq.php index 205f4511..48305499 100644 --- a/system/pages/faq.php +++ b/system/pages/faq.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/forum.php b/system/pages/forum.php index 8aff3b48..5d67d8f1 100644 --- a/system/pages/forum.php +++ b/system/pages/forum.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/guilds.php b/system/pages/guilds.php index 677b1656..6a1ebe98 100644 --- a/system/pages/guilds.php +++ b/system/pages/guilds.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/highscores.php b/system/pages/highscores.php index 582c494d..ace963cd 100644 --- a/system/pages/highscores.php +++ b/system/pages/highscores.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/houses.php b/system/pages/houses.php index 767300c7..1da2ab8f 100644 --- a/system/pages/houses.php +++ b/system/pages/houses.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/lastkills.php b/system/pages/lastkills.php index f45eb136..ef7af434 100644 --- a/system/pages/lastkills.php +++ b/system/pages/lastkills.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/lostaccount.php b/system/pages/lostaccount.php index 572fce4c..5b3206d4 100644 --- a/system/pages/lostaccount.php +++ b/system/pages/lostaccount.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/movies.php b/system/pages/movies.php index 9ddcbcf7..8e4e2a0c 100644 --- a/system/pages/movies.php +++ b/system/pages/movies.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/news.php b/system/pages/news.php index 1106c8e0..8ed4f104 100644 --- a/system/pages/news.php +++ b/system/pages/news.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/newsarchive.php b/system/pages/newsarchive.php index 913f3a42..7c88431f 100644 --- a/system/pages/newsarchive.php +++ b/system/pages/newsarchive.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ $_GET['archive'] = true; diff --git a/system/pages/online.php b/system/pages/online.php index d6b188c7..2dfd8e5d 100644 --- a/system/pages/online.php +++ b/system/pages/online.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/polls.php b/system/pages/polls.php index 6cccc504..85852517 100644 --- a/system/pages/polls.php +++ b/system/pages/polls.php @@ -6,7 +6,7 @@ * @author Averatec * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/records.php b/system/pages/records.php index be61d59b..ad64a5c2 100644 --- a/system/pages/records.php +++ b/system/pages/records.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/rules.php b/system/pages/rules.php index 3b514466..f1cbeeb3 100644 --- a/system/pages/rules.php +++ b/system/pages/rules.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/screenshots.php b/system/pages/screenshots.php index 80400fd2..d11f6a1c 100644 --- a/system/pages/screenshots.php +++ b/system/pages/screenshots.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/serverinfo.php b/system/pages/serverinfo.php index 95c9c5a6..100f43bf 100644 --- a/system/pages/serverinfo.php +++ b/system/pages/serverinfo.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/spells.php b/system/pages/spells.php index b58711a6..a172620e 100644 --- a/system/pages/spells.php +++ b/system/pages/spells.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/pages/team.php b/system/pages/team.php index 4f645dd3..10580337 100644 --- a/system/pages/team.php +++ b/system/pages/team.php @@ -6,7 +6,7 @@ * @author Gesior * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/status.php b/system/status.php index 51987e27..11b8bc96 100644 --- a/system/status.php +++ b/system/status.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/system/template.php b/system/template.php index d3bdc56d..740c4ff4 100644 --- a/system/template.php +++ b/system/template.php @@ -5,7 +5,7 @@ * @package MyAAC * @author Slawkens * @copyright 2017 MyAAC - * @version 0.2.4 + * @version 0.3.0 * @link http://my-aac.org */ defined('MYAAC') or die('Direct access not allowed!'); diff --git a/tools/signature/mango.php b/tools/signature/mango.php index 86010147..b69b818f 100644 --- a/tools/signature/mango.php +++ b/tools/signature/mango.php @@ -2,7 +2,7 @@ defined('MYAAC') or die('Direct access not allowed!'); /** - ALTER TABLE `players` ADD `madphp_signature` TINYINT( 4 ) NOT NULL DEFAULT '1' COMMENT 'Absolute Mango � MadPHP.org', ADD `madphp_signature_bg` VARCHAR( 50 ) NOT NULL COMMENT 'Absolute Mango � MadPHP.org' AFTER `madphp_signature`, ADD `madphp_signature_eqs` TINYINT( 4 ) NOT NULL DEFAULT '0' COMMENT 'Absolute Mango � MadPHP.org' AFTER `madphp_signature_bg`, ADD `madphp_signature_bars` TINYINT( 4 ) NOT NULL DEFAULT '1' COMMENT 'Absolute Mango � MadPHP.org' AFTER `madphp_signature_eqs`, ADD `madphp_signature_cache` INT( 11 ) NOT NULL COMMENT 'Absolute Mango � MadPHP.org' AFTER `madphp_signature_bars`; + ALTER TABLE `players` ADD `madphp_signature` TINYINT( 4 ) NOT NULL DEFAULT '1' COMMENT 'Absolute Mango © MadPHP.org', ADD `madphp_signature_bg` VARCHAR( 50 ) NOT NULL COMMENT 'Absolute Mango © MadPHP.org' AFTER `madphp_signature`, ADD `madphp_signature_eqs` TINYINT( 4 ) NOT NULL DEFAULT '0' COMMENT 'Absolute Mango © MadPHP.org' AFTER `madphp_signature_bg`, ADD `madphp_signature_bars` TINYINT( 4 ) NOT NULL DEFAULT '1' COMMENT 'Absolute Mango © MadPHP.org' AFTER `madphp_signature_eqs`, ADD `madphp_signature_cache` INT( 11 ) NOT NULL COMMENT 'Absolute Mango © MadPHP.org' AFTER `madphp_signature_bars`; **/ /** Load the MadGD class **/ diff --git a/tools/signature/tibian.php b/tools/signature/tibian.php index e408c29b..fbb80273 100644 --- a/tools/signature/tibian.php +++ b/tools/signature/tibian.php @@ -1,8 +1,10 @@ - * @copyright 2016 WodzAAC - * @version 0.2.4 - * @link http://myaac.info + * @copyright 2017 MyAAC + * @version 0.3.0 + * @link http://my-aac.org */ // we need some functions From 27e490912bf85361eb67f0be7522d715a17cffb0 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 20:20:42 +0200 Subject: [PATCH 2/8] * some small undefined variable fix --- system/pages/admin/notepad.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/pages/admin/notepad.php b/system/pages/admin/notepad.php index 1767fffc..8e65c8a6 100644 --- a/system/pages/admin/notepad.php +++ b/system/pages/admin/notepad.php @@ -28,7 +28,7 @@ else $_content = $notepad_content; } -echo $twig->render('admin.notepad.html', array('content' => $_content)); +echo $twig->render('admin.notepad.html', array('content' => isset($_content) ? $_content : null)); class Notepad { From 26b88d9d42ead60ec3a99862aec4c41b4acdc0f2 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 20:25:50 +0200 Subject: [PATCH 3/8] * typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ee896e75..36a2aa65 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,7 +6,7 @@ - fixed recovering account and changing password when salt is enabled - fixed installing samples when for example Rook Sample already exist and other samples not - fixed some mysql error when character you trying to create already exist - - fixed some warning when you select unexisting country + - fixed some warning when you select nonexistent country - password change minimal/maximal length notice is now more precise - added 'enabled' field in myaac_hooks table, which can enable or disable specified hook - removed DEFAULT '' for TEXT field. It didn't worked under some systems like MAC OS X. From 6e6ce55a7bf5b9346ae1dd011ca323cc3cf0fc75 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 21:06:57 +0200 Subject: [PATCH 4/8] * some better info when fetching latest version --- system/pages/admin/version.php | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/system/pages/admin/version.php b/system/pages/admin/version.php index d8e4ade5..0381d6ba 100644 --- a/system/pages/admin/version.php +++ b/system/pages/admin/version.php @@ -14,17 +14,28 @@ $title = 'Version check'; // fetch version //$file = @fopen('http://my-aac.org/VERSION', 'r') or die('Error while fetching version.'); //$myaac_version = fgets($file); -$myaac_version = file_get_contents('http://my-aac.org/VERSION'); +$myaac_version = @file_get_contents('http://my-aac.org/VERSION'); +if(!$myaac_version) { + warning('Error while fetching version info from http://my-aac.org. Site might be offline.'); + return; +} // compare them -if(version_compare($myaac_version, MYAAC_VERSION) <= 0) - echo '

MyAAC latest version is ' . $myaac_version . '. You\'re using the latest version. -
View CHANGELOG ' . generateLink(ADMIN_URL . '?p=changelog', 'here') . '

'; -else - echo '

You\'re using outdated version.
+$version_compare = version_compare($myaac_version, MYAAC_VERSION); +if($version_compare == 0) { + success('MyAAC latest version is ' . $myaac_version . '. You\'re using the latest version. +
View CHANGELOG ' . generateLink(ADMIN_URL . '?p=changelog', 'here')); +} +else if($version_compare < 0) { + echo success('Woah, seems you\'re using newer version as latest released one! MyAAC latest released version is ' . $myaac_version . ', and you\'re using version ' . MYAAC_VERSION . '. +
View CHANGELOG ' . generateLink(ADMIN_URL . '?p=changelog', 'here')); +} +else { + warning('You\'re using outdated version.
Your version: ' . MYAAC_VERSION . '
Latest version: ' . $myaac_version . '
- Download available at: www.my-aac.org

'; + Download available at: www.my-aac.org'); +} /* function version_revert($version) From d88de8e07267cb628e7ecf28c1518002fd8d7ff9 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 22:43:03 +0200 Subject: [PATCH 5/8] * fixed Twig loading on case-sensitive systems --- system/init.php | 2 +- system/migrations/4.php | 3 ++- system/migrations/6.php | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/system/init.php b/system/init.php index 090abe50..7fef463a 100644 --- a/system/init.php +++ b/system/init.php @@ -27,7 +27,7 @@ require_once(SYSTEM . 'libs/cache.php'); $cache = Cache::getInstance($config['cache_engine'], $config['cache_prefix']); // twig -require_once LIBS . 'twig/Autoloader.php'; +require_once LIBS . 'Twig/Autoloader.php'; Twig_Autoloader::register(); $loader = new Twig_Loader_Filesystem(SYSTEM . 'templates'); diff --git a/system/migrations/4.php b/system/migrations/4.php index 774b2d5f..fbe17b12 100644 --- a/system/migrations/4.php +++ b/system/migrations/4.php @@ -1,3 +1,4 @@ query("ALTER TABLE `" . TABLE_PREFIX . "monsters` ADD `id` int(11) NOT NULL AUTO_INCREMENT primary key FIRST;"); + if(!fieldExist('id', TABLE_PREFIX . 'monsters')) + $db->query("ALTER TABLE `" . TABLE_PREFIX . "monsters` ADD `id` int(11) NOT NULL AUTO_INCREMENT primary key FIRST;"); ?> \ No newline at end of file diff --git a/system/migrations/6.php b/system/migrations/6.php index 1356dd05..6f1fed1a 100644 --- a/system/migrations/6.php +++ b/system/migrations/6.php @@ -1,3 +1,4 @@ query("ALTER TABLE `" . TABLE_PREFIX . "hooks` ADD `enabled` INT(1) NOT NULL DEFAULT 1;"); + if(!fieldExist('enabled', TABLE_PREFIX . 'hooks')) + $db->query("ALTER TABLE `" . TABLE_PREFIX . "hooks` ADD `enabled` INT(1) NOT NULL DEFAULT 1;"); ?> \ No newline at end of file From 2cd9f80b34c9297f0a5bed29e4982ae35fb07c93 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 22:52:27 +0200 Subject: [PATCH 6/8] * fixed Twig loading on case-sensitive systems --- system/libs/{twig => Twig}/Autoloader.php | 0 system/libs/{twig => Twig}/BaseNodeVisitor.php | 0 system/libs/{twig => Twig}/Compiler.php | 0 system/libs/{twig => Twig}/CompilerInterface.php | 0 system/libs/{twig => Twig}/Environment.php | 0 system/libs/{twig => Twig}/Error.php | 0 system/libs/{twig => Twig}/Error/Loader.php | 0 system/libs/{twig => Twig}/Error/Runtime.php | 0 system/libs/{twig => Twig}/Error/Syntax.php | 0 system/libs/{twig => Twig}/ExistsLoaderInterface.php | 0 system/libs/{twig => Twig}/ExpressionParser.php | 0 system/libs/{twig => Twig}/Extension.php | 0 system/libs/{twig => Twig}/Extension/Core.php | 0 system/libs/{twig => Twig}/Extension/Debug.php | 0 system/libs/{twig => Twig}/Extension/Escaper.php | 0 system/libs/{twig => Twig}/Extension/Optimizer.php | 0 system/libs/{twig => Twig}/Extension/Profiler.php | 0 system/libs/{twig => Twig}/Extension/Sandbox.php | 0 system/libs/{twig => Twig}/Extension/Staging.php | 0 system/libs/{twig => Twig}/Extension/StringLoader.php | 0 system/libs/{twig => Twig}/ExtensionInterface.php | 0 system/libs/{twig => Twig}/FileExtensionEscapingStrategy.php | 0 system/libs/{twig => Twig}/Filter.php | 0 system/libs/{twig => Twig}/Filter/Function.php | 0 system/libs/{twig => Twig}/Filter/Method.php | 0 system/libs/{twig => Twig}/Filter/Node.php | 0 system/libs/{twig => Twig}/FilterCallableInterface.php | 0 system/libs/{twig => Twig}/FilterInterface.php | 0 system/libs/{twig => Twig}/Function.php | 0 system/libs/{twig => Twig}/Function/Function.php | 0 system/libs/{twig => Twig}/Function/Method.php | 0 system/libs/{twig => Twig}/Function/Node.php | 0 system/libs/{twig => Twig}/FunctionCallableInterface.php | 0 system/libs/{twig => Twig}/FunctionInterface.php | 0 system/libs/{twig => Twig}/Lexer.php | 0 system/libs/{twig => Twig}/LexerInterface.php | 0 system/libs/{twig => Twig}/Loader/Array.php | 0 system/libs/{twig => Twig}/Loader/Chain.php | 0 system/libs/{twig => Twig}/Loader/Filesystem.php | 0 system/libs/{twig => Twig}/Loader/String.php | 0 system/libs/{twig => Twig}/LoaderInterface.php | 0 system/libs/{twig => Twig}/Markup.php | 0 system/libs/{twig => Twig}/Node.php | 0 system/libs/{twig => Twig}/Node/AutoEscape.php | 0 system/libs/{twig => Twig}/Node/Block.php | 0 system/libs/{twig => Twig}/Node/BlockReference.php | 0 system/libs/{twig => Twig}/Node/Body.php | 0 system/libs/{twig => Twig}/Node/CheckSecurity.php | 0 system/libs/{twig => Twig}/Node/Do.php | 0 system/libs/{twig => Twig}/Node/Embed.php | 0 system/libs/{twig => Twig}/Node/Expression.php | 0 system/libs/{twig => Twig}/Node/Expression/Array.php | 0 system/libs/{twig => Twig}/Node/Expression/AssignName.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Add.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/And.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/BitwiseAnd.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/BitwiseOr.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/BitwiseXor.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Concat.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Div.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/EndsWith.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Equal.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/FloorDiv.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Greater.php | 0 .../libs/{twig => Twig}/Node/Expression/Binary/GreaterEqual.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/In.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Less.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/LessEqual.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Matches.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Mod.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Mul.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/NotEqual.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/NotIn.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Or.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Power.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Range.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/StartsWith.php | 0 system/libs/{twig => Twig}/Node/Expression/Binary/Sub.php | 0 system/libs/{twig => Twig}/Node/Expression/BlockReference.php | 0 system/libs/{twig => Twig}/Node/Expression/Call.php | 0 system/libs/{twig => Twig}/Node/Expression/Conditional.php | 0 system/libs/{twig => Twig}/Node/Expression/Constant.php | 0 system/libs/{twig => Twig}/Node/Expression/ExtensionReference.php | 0 system/libs/{twig => Twig}/Node/Expression/Filter.php | 0 system/libs/{twig => Twig}/Node/Expression/Filter/Default.php | 0 system/libs/{twig => Twig}/Node/Expression/Function.php | 0 system/libs/{twig => Twig}/Node/Expression/GetAttr.php | 0 system/libs/{twig => Twig}/Node/Expression/MethodCall.php | 0 system/libs/{twig => Twig}/Node/Expression/Name.php | 0 system/libs/{twig => Twig}/Node/Expression/Parent.php | 0 system/libs/{twig => Twig}/Node/Expression/TempName.php | 0 system/libs/{twig => Twig}/Node/Expression/Test.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Constant.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Defined.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Divisibleby.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Even.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Null.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Odd.php | 0 system/libs/{twig => Twig}/Node/Expression/Test/Sameas.php | 0 system/libs/{twig => Twig}/Node/Expression/Unary.php | 0 system/libs/{twig => Twig}/Node/Expression/Unary/Neg.php | 0 system/libs/{twig => Twig}/Node/Expression/Unary/Not.php | 0 system/libs/{twig => Twig}/Node/Expression/Unary/Pos.php | 0 system/libs/{twig => Twig}/Node/Flush.php | 0 system/libs/{twig => Twig}/Node/For.php | 0 system/libs/{twig => Twig}/Node/ForLoop.php | 0 system/libs/{twig => Twig}/Node/If.php | 0 system/libs/{twig => Twig}/Node/Import.php | 0 system/libs/{twig => Twig}/Node/Include.php | 0 system/libs/{twig => Twig}/Node/Macro.php | 0 system/libs/{twig => Twig}/Node/Module.php | 0 system/libs/{twig => Twig}/Node/Print.php | 0 system/libs/{twig => Twig}/Node/Sandbox.php | 0 system/libs/{twig => Twig}/Node/SandboxedPrint.php | 0 system/libs/{twig => Twig}/Node/Set.php | 0 system/libs/{twig => Twig}/Node/SetTemp.php | 0 system/libs/{twig => Twig}/Node/Spaceless.php | 0 system/libs/{twig => Twig}/Node/Text.php | 0 system/libs/{twig => Twig}/NodeInterface.php | 0 system/libs/{twig => Twig}/NodeOutputInterface.php | 0 system/libs/{twig => Twig}/NodeTraverser.php | 0 system/libs/{twig => Twig}/NodeVisitor/Escaper.php | 0 system/libs/{twig => Twig}/NodeVisitor/Optimizer.php | 0 system/libs/{twig => Twig}/NodeVisitor/SafeAnalysis.php | 0 system/libs/{twig => Twig}/NodeVisitor/Sandbox.php | 0 system/libs/{twig => Twig}/NodeVisitorInterface.php | 0 system/libs/{twig => Twig}/Parser.php | 0 system/libs/{twig => Twig}/ParserInterface.php | 0 system/libs/{twig => Twig}/Profiler/Dumper/Blackfire.php | 0 system/libs/{twig => Twig}/Profiler/Dumper/Html.php | 0 system/libs/{twig => Twig}/Profiler/Dumper/Text.php | 0 system/libs/{twig => Twig}/Profiler/Node/EnterProfile.php | 0 system/libs/{twig => Twig}/Profiler/Node/LeaveProfile.php | 0 system/libs/{twig => Twig}/Profiler/NodeVisitor/Profiler.php | 0 system/libs/{twig => Twig}/Profiler/Profile.php | 0 system/libs/{twig => Twig}/Sandbox/SecurityError.php | 0 .../libs/{twig => Twig}/Sandbox/SecurityNotAllowedFilterError.php | 0 .../{twig => Twig}/Sandbox/SecurityNotAllowedFunctionError.php | 0 system/libs/{twig => Twig}/Sandbox/SecurityNotAllowedTagError.php | 0 system/libs/{twig => Twig}/Sandbox/SecurityPolicy.php | 0 system/libs/{twig => Twig}/Sandbox/SecurityPolicyInterface.php | 0 system/libs/{twig => Twig}/SimpleFilter.php | 0 system/libs/{twig => Twig}/SimpleFunction.php | 0 system/libs/{twig => Twig}/SimpleTest.php | 0 system/libs/{twig => Twig}/Template.php | 0 system/libs/{twig => Twig}/TemplateInterface.php | 0 system/libs/{twig => Twig}/Test.php | 0 system/libs/{twig => Twig}/Test/Function.php | 0 system/libs/{twig => Twig}/Test/IntegrationTestCase.php | 0 system/libs/{twig => Twig}/Test/Method.php | 0 system/libs/{twig => Twig}/Test/Node.php | 0 system/libs/{twig => Twig}/Test/NodeTestCase.php | 0 system/libs/{twig => Twig}/TestCallableInterface.php | 0 system/libs/{twig => Twig}/TestInterface.php | 0 system/libs/{twig => Twig}/Token.php | 0 system/libs/{twig => Twig}/TokenParser.php | 0 system/libs/{twig => Twig}/TokenParser/AutoEscape.php | 0 system/libs/{twig => Twig}/TokenParser/Block.php | 0 system/libs/{twig => Twig}/TokenParser/Do.php | 0 system/libs/{twig => Twig}/TokenParser/Embed.php | 0 system/libs/{twig => Twig}/TokenParser/Extends.php | 0 system/libs/{twig => Twig}/TokenParser/Filter.php | 0 system/libs/{twig => Twig}/TokenParser/Flush.php | 0 system/libs/{twig => Twig}/TokenParser/For.php | 0 system/libs/{twig => Twig}/TokenParser/From.php | 0 system/libs/{twig => Twig}/TokenParser/If.php | 0 system/libs/{twig => Twig}/TokenParser/Import.php | 0 system/libs/{twig => Twig}/TokenParser/Include.php | 0 system/libs/{twig => Twig}/TokenParser/Macro.php | 0 system/libs/{twig => Twig}/TokenParser/Sandbox.php | 0 system/libs/{twig => Twig}/TokenParser/Set.php | 0 system/libs/{twig => Twig}/TokenParser/Spaceless.php | 0 system/libs/{twig => Twig}/TokenParser/Use.php | 0 system/libs/{twig => Twig}/TokenParserBroker.php | 0 system/libs/{twig => Twig}/TokenParserBrokerInterface.php | 0 system/libs/{twig => Twig}/TokenParserInterface.php | 0 system/libs/{twig => Twig}/TokenStream.php | 0 178 files changed, 0 insertions(+), 0 deletions(-) rename system/libs/{twig => Twig}/Autoloader.php (100%) rename system/libs/{twig => Twig}/BaseNodeVisitor.php (100%) rename system/libs/{twig => Twig}/Compiler.php (100%) rename system/libs/{twig => Twig}/CompilerInterface.php (100%) rename system/libs/{twig => Twig}/Environment.php (100%) rename system/libs/{twig => Twig}/Error.php (100%) rename system/libs/{twig => Twig}/Error/Loader.php (100%) rename system/libs/{twig => Twig}/Error/Runtime.php (100%) rename system/libs/{twig => Twig}/Error/Syntax.php (100%) rename system/libs/{twig => Twig}/ExistsLoaderInterface.php (100%) rename system/libs/{twig => Twig}/ExpressionParser.php (100%) rename system/libs/{twig => Twig}/Extension.php (100%) rename system/libs/{twig => Twig}/Extension/Core.php (100%) rename system/libs/{twig => Twig}/Extension/Debug.php (100%) rename system/libs/{twig => Twig}/Extension/Escaper.php (100%) rename system/libs/{twig => Twig}/Extension/Optimizer.php (100%) rename system/libs/{twig => Twig}/Extension/Profiler.php (100%) rename system/libs/{twig => Twig}/Extension/Sandbox.php (100%) rename system/libs/{twig => Twig}/Extension/Staging.php (100%) rename system/libs/{twig => Twig}/Extension/StringLoader.php (100%) rename system/libs/{twig => Twig}/ExtensionInterface.php (100%) rename system/libs/{twig => Twig}/FileExtensionEscapingStrategy.php (100%) rename system/libs/{twig => Twig}/Filter.php (100%) rename system/libs/{twig => Twig}/Filter/Function.php (100%) rename system/libs/{twig => Twig}/Filter/Method.php (100%) rename system/libs/{twig => Twig}/Filter/Node.php (100%) rename system/libs/{twig => Twig}/FilterCallableInterface.php (100%) rename system/libs/{twig => Twig}/FilterInterface.php (100%) rename system/libs/{twig => Twig}/Function.php (100%) rename system/libs/{twig => Twig}/Function/Function.php (100%) rename system/libs/{twig => Twig}/Function/Method.php (100%) rename system/libs/{twig => Twig}/Function/Node.php (100%) rename system/libs/{twig => Twig}/FunctionCallableInterface.php (100%) rename system/libs/{twig => Twig}/FunctionInterface.php (100%) rename system/libs/{twig => Twig}/Lexer.php (100%) rename system/libs/{twig => Twig}/LexerInterface.php (100%) rename system/libs/{twig => Twig}/Loader/Array.php (100%) rename system/libs/{twig => Twig}/Loader/Chain.php (100%) rename system/libs/{twig => Twig}/Loader/Filesystem.php (100%) rename system/libs/{twig => Twig}/Loader/String.php (100%) rename system/libs/{twig => Twig}/LoaderInterface.php (100%) rename system/libs/{twig => Twig}/Markup.php (100%) rename system/libs/{twig => Twig}/Node.php (100%) rename system/libs/{twig => Twig}/Node/AutoEscape.php (100%) rename system/libs/{twig => Twig}/Node/Block.php (100%) rename system/libs/{twig => Twig}/Node/BlockReference.php (100%) rename system/libs/{twig => Twig}/Node/Body.php (100%) rename system/libs/{twig => Twig}/Node/CheckSecurity.php (100%) rename system/libs/{twig => Twig}/Node/Do.php (100%) rename system/libs/{twig => Twig}/Node/Embed.php (100%) rename system/libs/{twig => Twig}/Node/Expression.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Array.php (100%) rename system/libs/{twig => Twig}/Node/Expression/AssignName.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Add.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/And.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/BitwiseAnd.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/BitwiseOr.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/BitwiseXor.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Concat.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Div.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/EndsWith.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Equal.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/FloorDiv.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Greater.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/GreaterEqual.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/In.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Less.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/LessEqual.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Matches.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Mod.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Mul.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/NotEqual.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/NotIn.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Or.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Power.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Range.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/StartsWith.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Binary/Sub.php (100%) rename system/libs/{twig => Twig}/Node/Expression/BlockReference.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Call.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Conditional.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Constant.php (100%) rename system/libs/{twig => Twig}/Node/Expression/ExtensionReference.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Filter.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Filter/Default.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Function.php (100%) rename system/libs/{twig => Twig}/Node/Expression/GetAttr.php (100%) rename system/libs/{twig => Twig}/Node/Expression/MethodCall.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Name.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Parent.php (100%) rename system/libs/{twig => Twig}/Node/Expression/TempName.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Constant.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Defined.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Divisibleby.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Even.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Null.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Odd.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Test/Sameas.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Unary.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Unary/Neg.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Unary/Not.php (100%) rename system/libs/{twig => Twig}/Node/Expression/Unary/Pos.php (100%) rename system/libs/{twig => Twig}/Node/Flush.php (100%) rename system/libs/{twig => Twig}/Node/For.php (100%) rename system/libs/{twig => Twig}/Node/ForLoop.php (100%) rename system/libs/{twig => Twig}/Node/If.php (100%) rename system/libs/{twig => Twig}/Node/Import.php (100%) rename system/libs/{twig => Twig}/Node/Include.php (100%) rename system/libs/{twig => Twig}/Node/Macro.php (100%) rename system/libs/{twig => Twig}/Node/Module.php (100%) rename system/libs/{twig => Twig}/Node/Print.php (100%) rename system/libs/{twig => Twig}/Node/Sandbox.php (100%) rename system/libs/{twig => Twig}/Node/SandboxedPrint.php (100%) rename system/libs/{twig => Twig}/Node/Set.php (100%) rename system/libs/{twig => Twig}/Node/SetTemp.php (100%) rename system/libs/{twig => Twig}/Node/Spaceless.php (100%) rename system/libs/{twig => Twig}/Node/Text.php (100%) rename system/libs/{twig => Twig}/NodeInterface.php (100%) rename system/libs/{twig => Twig}/NodeOutputInterface.php (100%) rename system/libs/{twig => Twig}/NodeTraverser.php (100%) rename system/libs/{twig => Twig}/NodeVisitor/Escaper.php (100%) rename system/libs/{twig => Twig}/NodeVisitor/Optimizer.php (100%) rename system/libs/{twig => Twig}/NodeVisitor/SafeAnalysis.php (100%) rename system/libs/{twig => Twig}/NodeVisitor/Sandbox.php (100%) rename system/libs/{twig => Twig}/NodeVisitorInterface.php (100%) rename system/libs/{twig => Twig}/Parser.php (100%) rename system/libs/{twig => Twig}/ParserInterface.php (100%) rename system/libs/{twig => Twig}/Profiler/Dumper/Blackfire.php (100%) rename system/libs/{twig => Twig}/Profiler/Dumper/Html.php (100%) rename system/libs/{twig => Twig}/Profiler/Dumper/Text.php (100%) rename system/libs/{twig => Twig}/Profiler/Node/EnterProfile.php (100%) rename system/libs/{twig => Twig}/Profiler/Node/LeaveProfile.php (100%) rename system/libs/{twig => Twig}/Profiler/NodeVisitor/Profiler.php (100%) rename system/libs/{twig => Twig}/Profiler/Profile.php (100%) rename system/libs/{twig => Twig}/Sandbox/SecurityError.php (100%) rename system/libs/{twig => Twig}/Sandbox/SecurityNotAllowedFilterError.php (100%) rename system/libs/{twig => Twig}/Sandbox/SecurityNotAllowedFunctionError.php (100%) rename system/libs/{twig => Twig}/Sandbox/SecurityNotAllowedTagError.php (100%) rename system/libs/{twig => Twig}/Sandbox/SecurityPolicy.php (100%) rename system/libs/{twig => Twig}/Sandbox/SecurityPolicyInterface.php (100%) rename system/libs/{twig => Twig}/SimpleFilter.php (100%) rename system/libs/{twig => Twig}/SimpleFunction.php (100%) rename system/libs/{twig => Twig}/SimpleTest.php (100%) rename system/libs/{twig => Twig}/Template.php (100%) rename system/libs/{twig => Twig}/TemplateInterface.php (100%) rename system/libs/{twig => Twig}/Test.php (100%) rename system/libs/{twig => Twig}/Test/Function.php (100%) rename system/libs/{twig => Twig}/Test/IntegrationTestCase.php (100%) rename system/libs/{twig => Twig}/Test/Method.php (100%) rename system/libs/{twig => Twig}/Test/Node.php (100%) rename system/libs/{twig => Twig}/Test/NodeTestCase.php (100%) rename system/libs/{twig => Twig}/TestCallableInterface.php (100%) rename system/libs/{twig => Twig}/TestInterface.php (100%) rename system/libs/{twig => Twig}/Token.php (100%) rename system/libs/{twig => Twig}/TokenParser.php (100%) rename system/libs/{twig => Twig}/TokenParser/AutoEscape.php (100%) rename system/libs/{twig => Twig}/TokenParser/Block.php (100%) rename system/libs/{twig => Twig}/TokenParser/Do.php (100%) rename system/libs/{twig => Twig}/TokenParser/Embed.php (100%) rename system/libs/{twig => Twig}/TokenParser/Extends.php (100%) rename system/libs/{twig => Twig}/TokenParser/Filter.php (100%) rename system/libs/{twig => Twig}/TokenParser/Flush.php (100%) rename system/libs/{twig => Twig}/TokenParser/For.php (100%) rename system/libs/{twig => Twig}/TokenParser/From.php (100%) rename system/libs/{twig => Twig}/TokenParser/If.php (100%) rename system/libs/{twig => Twig}/TokenParser/Import.php (100%) rename system/libs/{twig => Twig}/TokenParser/Include.php (100%) rename system/libs/{twig => Twig}/TokenParser/Macro.php (100%) rename system/libs/{twig => Twig}/TokenParser/Sandbox.php (100%) rename system/libs/{twig => Twig}/TokenParser/Set.php (100%) rename system/libs/{twig => Twig}/TokenParser/Spaceless.php (100%) rename system/libs/{twig => Twig}/TokenParser/Use.php (100%) rename system/libs/{twig => Twig}/TokenParserBroker.php (100%) rename system/libs/{twig => Twig}/TokenParserBrokerInterface.php (100%) rename system/libs/{twig => Twig}/TokenParserInterface.php (100%) rename system/libs/{twig => Twig}/TokenStream.php (100%) diff --git a/system/libs/twig/Autoloader.php b/system/libs/Twig/Autoloader.php similarity index 100% rename from system/libs/twig/Autoloader.php rename to system/libs/Twig/Autoloader.php diff --git a/system/libs/twig/BaseNodeVisitor.php b/system/libs/Twig/BaseNodeVisitor.php similarity index 100% rename from system/libs/twig/BaseNodeVisitor.php rename to system/libs/Twig/BaseNodeVisitor.php diff --git a/system/libs/twig/Compiler.php b/system/libs/Twig/Compiler.php similarity index 100% rename from system/libs/twig/Compiler.php rename to system/libs/Twig/Compiler.php diff --git a/system/libs/twig/CompilerInterface.php b/system/libs/Twig/CompilerInterface.php similarity index 100% rename from system/libs/twig/CompilerInterface.php rename to system/libs/Twig/CompilerInterface.php diff --git a/system/libs/twig/Environment.php b/system/libs/Twig/Environment.php similarity index 100% rename from system/libs/twig/Environment.php rename to system/libs/Twig/Environment.php diff --git a/system/libs/twig/Error.php b/system/libs/Twig/Error.php similarity index 100% rename from system/libs/twig/Error.php rename to system/libs/Twig/Error.php diff --git a/system/libs/twig/Error/Loader.php b/system/libs/Twig/Error/Loader.php similarity index 100% rename from system/libs/twig/Error/Loader.php rename to system/libs/Twig/Error/Loader.php diff --git a/system/libs/twig/Error/Runtime.php b/system/libs/Twig/Error/Runtime.php similarity index 100% rename from system/libs/twig/Error/Runtime.php rename to system/libs/Twig/Error/Runtime.php diff --git a/system/libs/twig/Error/Syntax.php b/system/libs/Twig/Error/Syntax.php similarity index 100% rename from system/libs/twig/Error/Syntax.php rename to system/libs/Twig/Error/Syntax.php diff --git a/system/libs/twig/ExistsLoaderInterface.php b/system/libs/Twig/ExistsLoaderInterface.php similarity index 100% rename from system/libs/twig/ExistsLoaderInterface.php rename to system/libs/Twig/ExistsLoaderInterface.php diff --git a/system/libs/twig/ExpressionParser.php b/system/libs/Twig/ExpressionParser.php similarity index 100% rename from system/libs/twig/ExpressionParser.php rename to system/libs/Twig/ExpressionParser.php diff --git a/system/libs/twig/Extension.php b/system/libs/Twig/Extension.php similarity index 100% rename from system/libs/twig/Extension.php rename to system/libs/Twig/Extension.php diff --git a/system/libs/twig/Extension/Core.php b/system/libs/Twig/Extension/Core.php similarity index 100% rename from system/libs/twig/Extension/Core.php rename to system/libs/Twig/Extension/Core.php diff --git a/system/libs/twig/Extension/Debug.php b/system/libs/Twig/Extension/Debug.php similarity index 100% rename from system/libs/twig/Extension/Debug.php rename to system/libs/Twig/Extension/Debug.php diff --git a/system/libs/twig/Extension/Escaper.php b/system/libs/Twig/Extension/Escaper.php similarity index 100% rename from system/libs/twig/Extension/Escaper.php rename to system/libs/Twig/Extension/Escaper.php diff --git a/system/libs/twig/Extension/Optimizer.php b/system/libs/Twig/Extension/Optimizer.php similarity index 100% rename from system/libs/twig/Extension/Optimizer.php rename to system/libs/Twig/Extension/Optimizer.php diff --git a/system/libs/twig/Extension/Profiler.php b/system/libs/Twig/Extension/Profiler.php similarity index 100% rename from system/libs/twig/Extension/Profiler.php rename to system/libs/Twig/Extension/Profiler.php diff --git a/system/libs/twig/Extension/Sandbox.php b/system/libs/Twig/Extension/Sandbox.php similarity index 100% rename from system/libs/twig/Extension/Sandbox.php rename to system/libs/Twig/Extension/Sandbox.php diff --git a/system/libs/twig/Extension/Staging.php b/system/libs/Twig/Extension/Staging.php similarity index 100% rename from system/libs/twig/Extension/Staging.php rename to system/libs/Twig/Extension/Staging.php diff --git a/system/libs/twig/Extension/StringLoader.php b/system/libs/Twig/Extension/StringLoader.php similarity index 100% rename from system/libs/twig/Extension/StringLoader.php rename to system/libs/Twig/Extension/StringLoader.php diff --git a/system/libs/twig/ExtensionInterface.php b/system/libs/Twig/ExtensionInterface.php similarity index 100% rename from system/libs/twig/ExtensionInterface.php rename to system/libs/Twig/ExtensionInterface.php diff --git a/system/libs/twig/FileExtensionEscapingStrategy.php b/system/libs/Twig/FileExtensionEscapingStrategy.php similarity index 100% rename from system/libs/twig/FileExtensionEscapingStrategy.php rename to system/libs/Twig/FileExtensionEscapingStrategy.php diff --git a/system/libs/twig/Filter.php b/system/libs/Twig/Filter.php similarity index 100% rename from system/libs/twig/Filter.php rename to system/libs/Twig/Filter.php diff --git a/system/libs/twig/Filter/Function.php b/system/libs/Twig/Filter/Function.php similarity index 100% rename from system/libs/twig/Filter/Function.php rename to system/libs/Twig/Filter/Function.php diff --git a/system/libs/twig/Filter/Method.php b/system/libs/Twig/Filter/Method.php similarity index 100% rename from system/libs/twig/Filter/Method.php rename to system/libs/Twig/Filter/Method.php diff --git a/system/libs/twig/Filter/Node.php b/system/libs/Twig/Filter/Node.php similarity index 100% rename from system/libs/twig/Filter/Node.php rename to system/libs/Twig/Filter/Node.php diff --git a/system/libs/twig/FilterCallableInterface.php b/system/libs/Twig/FilterCallableInterface.php similarity index 100% rename from system/libs/twig/FilterCallableInterface.php rename to system/libs/Twig/FilterCallableInterface.php diff --git a/system/libs/twig/FilterInterface.php b/system/libs/Twig/FilterInterface.php similarity index 100% rename from system/libs/twig/FilterInterface.php rename to system/libs/Twig/FilterInterface.php diff --git a/system/libs/twig/Function.php b/system/libs/Twig/Function.php similarity index 100% rename from system/libs/twig/Function.php rename to system/libs/Twig/Function.php diff --git a/system/libs/twig/Function/Function.php b/system/libs/Twig/Function/Function.php similarity index 100% rename from system/libs/twig/Function/Function.php rename to system/libs/Twig/Function/Function.php diff --git a/system/libs/twig/Function/Method.php b/system/libs/Twig/Function/Method.php similarity index 100% rename from system/libs/twig/Function/Method.php rename to system/libs/Twig/Function/Method.php diff --git a/system/libs/twig/Function/Node.php b/system/libs/Twig/Function/Node.php similarity index 100% rename from system/libs/twig/Function/Node.php rename to system/libs/Twig/Function/Node.php diff --git a/system/libs/twig/FunctionCallableInterface.php b/system/libs/Twig/FunctionCallableInterface.php similarity index 100% rename from system/libs/twig/FunctionCallableInterface.php rename to system/libs/Twig/FunctionCallableInterface.php diff --git a/system/libs/twig/FunctionInterface.php b/system/libs/Twig/FunctionInterface.php similarity index 100% rename from system/libs/twig/FunctionInterface.php rename to system/libs/Twig/FunctionInterface.php diff --git a/system/libs/twig/Lexer.php b/system/libs/Twig/Lexer.php similarity index 100% rename from system/libs/twig/Lexer.php rename to system/libs/Twig/Lexer.php diff --git a/system/libs/twig/LexerInterface.php b/system/libs/Twig/LexerInterface.php similarity index 100% rename from system/libs/twig/LexerInterface.php rename to system/libs/Twig/LexerInterface.php diff --git a/system/libs/twig/Loader/Array.php b/system/libs/Twig/Loader/Array.php similarity index 100% rename from system/libs/twig/Loader/Array.php rename to system/libs/Twig/Loader/Array.php diff --git a/system/libs/twig/Loader/Chain.php b/system/libs/Twig/Loader/Chain.php similarity index 100% rename from system/libs/twig/Loader/Chain.php rename to system/libs/Twig/Loader/Chain.php diff --git a/system/libs/twig/Loader/Filesystem.php b/system/libs/Twig/Loader/Filesystem.php similarity index 100% rename from system/libs/twig/Loader/Filesystem.php rename to system/libs/Twig/Loader/Filesystem.php diff --git a/system/libs/twig/Loader/String.php b/system/libs/Twig/Loader/String.php similarity index 100% rename from system/libs/twig/Loader/String.php rename to system/libs/Twig/Loader/String.php diff --git a/system/libs/twig/LoaderInterface.php b/system/libs/Twig/LoaderInterface.php similarity index 100% rename from system/libs/twig/LoaderInterface.php rename to system/libs/Twig/LoaderInterface.php diff --git a/system/libs/twig/Markup.php b/system/libs/Twig/Markup.php similarity index 100% rename from system/libs/twig/Markup.php rename to system/libs/Twig/Markup.php diff --git a/system/libs/twig/Node.php b/system/libs/Twig/Node.php similarity index 100% rename from system/libs/twig/Node.php rename to system/libs/Twig/Node.php diff --git a/system/libs/twig/Node/AutoEscape.php b/system/libs/Twig/Node/AutoEscape.php similarity index 100% rename from system/libs/twig/Node/AutoEscape.php rename to system/libs/Twig/Node/AutoEscape.php diff --git a/system/libs/twig/Node/Block.php b/system/libs/Twig/Node/Block.php similarity index 100% rename from system/libs/twig/Node/Block.php rename to system/libs/Twig/Node/Block.php diff --git a/system/libs/twig/Node/BlockReference.php b/system/libs/Twig/Node/BlockReference.php similarity index 100% rename from system/libs/twig/Node/BlockReference.php rename to system/libs/Twig/Node/BlockReference.php diff --git a/system/libs/twig/Node/Body.php b/system/libs/Twig/Node/Body.php similarity index 100% rename from system/libs/twig/Node/Body.php rename to system/libs/Twig/Node/Body.php diff --git a/system/libs/twig/Node/CheckSecurity.php b/system/libs/Twig/Node/CheckSecurity.php similarity index 100% rename from system/libs/twig/Node/CheckSecurity.php rename to system/libs/Twig/Node/CheckSecurity.php diff --git a/system/libs/twig/Node/Do.php b/system/libs/Twig/Node/Do.php similarity index 100% rename from system/libs/twig/Node/Do.php rename to system/libs/Twig/Node/Do.php diff --git a/system/libs/twig/Node/Embed.php b/system/libs/Twig/Node/Embed.php similarity index 100% rename from system/libs/twig/Node/Embed.php rename to system/libs/Twig/Node/Embed.php diff --git a/system/libs/twig/Node/Expression.php b/system/libs/Twig/Node/Expression.php similarity index 100% rename from system/libs/twig/Node/Expression.php rename to system/libs/Twig/Node/Expression.php diff --git a/system/libs/twig/Node/Expression/Array.php b/system/libs/Twig/Node/Expression/Array.php similarity index 100% rename from system/libs/twig/Node/Expression/Array.php rename to system/libs/Twig/Node/Expression/Array.php diff --git a/system/libs/twig/Node/Expression/AssignName.php b/system/libs/Twig/Node/Expression/AssignName.php similarity index 100% rename from system/libs/twig/Node/Expression/AssignName.php rename to system/libs/Twig/Node/Expression/AssignName.php diff --git a/system/libs/twig/Node/Expression/Binary.php b/system/libs/Twig/Node/Expression/Binary.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary.php rename to system/libs/Twig/Node/Expression/Binary.php diff --git a/system/libs/twig/Node/Expression/Binary/Add.php b/system/libs/Twig/Node/Expression/Binary/Add.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Add.php rename to system/libs/Twig/Node/Expression/Binary/Add.php diff --git a/system/libs/twig/Node/Expression/Binary/And.php b/system/libs/Twig/Node/Expression/Binary/And.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/And.php rename to system/libs/Twig/Node/Expression/Binary/And.php diff --git a/system/libs/twig/Node/Expression/Binary/BitwiseAnd.php b/system/libs/Twig/Node/Expression/Binary/BitwiseAnd.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/BitwiseAnd.php rename to system/libs/Twig/Node/Expression/Binary/BitwiseAnd.php diff --git a/system/libs/twig/Node/Expression/Binary/BitwiseOr.php b/system/libs/Twig/Node/Expression/Binary/BitwiseOr.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/BitwiseOr.php rename to system/libs/Twig/Node/Expression/Binary/BitwiseOr.php diff --git a/system/libs/twig/Node/Expression/Binary/BitwiseXor.php b/system/libs/Twig/Node/Expression/Binary/BitwiseXor.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/BitwiseXor.php rename to system/libs/Twig/Node/Expression/Binary/BitwiseXor.php diff --git a/system/libs/twig/Node/Expression/Binary/Concat.php b/system/libs/Twig/Node/Expression/Binary/Concat.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Concat.php rename to system/libs/Twig/Node/Expression/Binary/Concat.php diff --git a/system/libs/twig/Node/Expression/Binary/Div.php b/system/libs/Twig/Node/Expression/Binary/Div.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Div.php rename to system/libs/Twig/Node/Expression/Binary/Div.php diff --git a/system/libs/twig/Node/Expression/Binary/EndsWith.php b/system/libs/Twig/Node/Expression/Binary/EndsWith.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/EndsWith.php rename to system/libs/Twig/Node/Expression/Binary/EndsWith.php diff --git a/system/libs/twig/Node/Expression/Binary/Equal.php b/system/libs/Twig/Node/Expression/Binary/Equal.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Equal.php rename to system/libs/Twig/Node/Expression/Binary/Equal.php diff --git a/system/libs/twig/Node/Expression/Binary/FloorDiv.php b/system/libs/Twig/Node/Expression/Binary/FloorDiv.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/FloorDiv.php rename to system/libs/Twig/Node/Expression/Binary/FloorDiv.php diff --git a/system/libs/twig/Node/Expression/Binary/Greater.php b/system/libs/Twig/Node/Expression/Binary/Greater.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Greater.php rename to system/libs/Twig/Node/Expression/Binary/Greater.php diff --git a/system/libs/twig/Node/Expression/Binary/GreaterEqual.php b/system/libs/Twig/Node/Expression/Binary/GreaterEqual.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/GreaterEqual.php rename to system/libs/Twig/Node/Expression/Binary/GreaterEqual.php diff --git a/system/libs/twig/Node/Expression/Binary/In.php b/system/libs/Twig/Node/Expression/Binary/In.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/In.php rename to system/libs/Twig/Node/Expression/Binary/In.php diff --git a/system/libs/twig/Node/Expression/Binary/Less.php b/system/libs/Twig/Node/Expression/Binary/Less.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Less.php rename to system/libs/Twig/Node/Expression/Binary/Less.php diff --git a/system/libs/twig/Node/Expression/Binary/LessEqual.php b/system/libs/Twig/Node/Expression/Binary/LessEqual.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/LessEqual.php rename to system/libs/Twig/Node/Expression/Binary/LessEqual.php diff --git a/system/libs/twig/Node/Expression/Binary/Matches.php b/system/libs/Twig/Node/Expression/Binary/Matches.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Matches.php rename to system/libs/Twig/Node/Expression/Binary/Matches.php diff --git a/system/libs/twig/Node/Expression/Binary/Mod.php b/system/libs/Twig/Node/Expression/Binary/Mod.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Mod.php rename to system/libs/Twig/Node/Expression/Binary/Mod.php diff --git a/system/libs/twig/Node/Expression/Binary/Mul.php b/system/libs/Twig/Node/Expression/Binary/Mul.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Mul.php rename to system/libs/Twig/Node/Expression/Binary/Mul.php diff --git a/system/libs/twig/Node/Expression/Binary/NotEqual.php b/system/libs/Twig/Node/Expression/Binary/NotEqual.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/NotEqual.php rename to system/libs/Twig/Node/Expression/Binary/NotEqual.php diff --git a/system/libs/twig/Node/Expression/Binary/NotIn.php b/system/libs/Twig/Node/Expression/Binary/NotIn.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/NotIn.php rename to system/libs/Twig/Node/Expression/Binary/NotIn.php diff --git a/system/libs/twig/Node/Expression/Binary/Or.php b/system/libs/Twig/Node/Expression/Binary/Or.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Or.php rename to system/libs/Twig/Node/Expression/Binary/Or.php diff --git a/system/libs/twig/Node/Expression/Binary/Power.php b/system/libs/Twig/Node/Expression/Binary/Power.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Power.php rename to system/libs/Twig/Node/Expression/Binary/Power.php diff --git a/system/libs/twig/Node/Expression/Binary/Range.php b/system/libs/Twig/Node/Expression/Binary/Range.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Range.php rename to system/libs/Twig/Node/Expression/Binary/Range.php diff --git a/system/libs/twig/Node/Expression/Binary/StartsWith.php b/system/libs/Twig/Node/Expression/Binary/StartsWith.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/StartsWith.php rename to system/libs/Twig/Node/Expression/Binary/StartsWith.php diff --git a/system/libs/twig/Node/Expression/Binary/Sub.php b/system/libs/Twig/Node/Expression/Binary/Sub.php similarity index 100% rename from system/libs/twig/Node/Expression/Binary/Sub.php rename to system/libs/Twig/Node/Expression/Binary/Sub.php diff --git a/system/libs/twig/Node/Expression/BlockReference.php b/system/libs/Twig/Node/Expression/BlockReference.php similarity index 100% rename from system/libs/twig/Node/Expression/BlockReference.php rename to system/libs/Twig/Node/Expression/BlockReference.php diff --git a/system/libs/twig/Node/Expression/Call.php b/system/libs/Twig/Node/Expression/Call.php similarity index 100% rename from system/libs/twig/Node/Expression/Call.php rename to system/libs/Twig/Node/Expression/Call.php diff --git a/system/libs/twig/Node/Expression/Conditional.php b/system/libs/Twig/Node/Expression/Conditional.php similarity index 100% rename from system/libs/twig/Node/Expression/Conditional.php rename to system/libs/Twig/Node/Expression/Conditional.php diff --git a/system/libs/twig/Node/Expression/Constant.php b/system/libs/Twig/Node/Expression/Constant.php similarity index 100% rename from system/libs/twig/Node/Expression/Constant.php rename to system/libs/Twig/Node/Expression/Constant.php diff --git a/system/libs/twig/Node/Expression/ExtensionReference.php b/system/libs/Twig/Node/Expression/ExtensionReference.php similarity index 100% rename from system/libs/twig/Node/Expression/ExtensionReference.php rename to system/libs/Twig/Node/Expression/ExtensionReference.php diff --git a/system/libs/twig/Node/Expression/Filter.php b/system/libs/Twig/Node/Expression/Filter.php similarity index 100% rename from system/libs/twig/Node/Expression/Filter.php rename to system/libs/Twig/Node/Expression/Filter.php diff --git a/system/libs/twig/Node/Expression/Filter/Default.php b/system/libs/Twig/Node/Expression/Filter/Default.php similarity index 100% rename from system/libs/twig/Node/Expression/Filter/Default.php rename to system/libs/Twig/Node/Expression/Filter/Default.php diff --git a/system/libs/twig/Node/Expression/Function.php b/system/libs/Twig/Node/Expression/Function.php similarity index 100% rename from system/libs/twig/Node/Expression/Function.php rename to system/libs/Twig/Node/Expression/Function.php diff --git a/system/libs/twig/Node/Expression/GetAttr.php b/system/libs/Twig/Node/Expression/GetAttr.php similarity index 100% rename from system/libs/twig/Node/Expression/GetAttr.php rename to system/libs/Twig/Node/Expression/GetAttr.php diff --git a/system/libs/twig/Node/Expression/MethodCall.php b/system/libs/Twig/Node/Expression/MethodCall.php similarity index 100% rename from system/libs/twig/Node/Expression/MethodCall.php rename to system/libs/Twig/Node/Expression/MethodCall.php diff --git a/system/libs/twig/Node/Expression/Name.php b/system/libs/Twig/Node/Expression/Name.php similarity index 100% rename from system/libs/twig/Node/Expression/Name.php rename to system/libs/Twig/Node/Expression/Name.php diff --git a/system/libs/twig/Node/Expression/Parent.php b/system/libs/Twig/Node/Expression/Parent.php similarity index 100% rename from system/libs/twig/Node/Expression/Parent.php rename to system/libs/Twig/Node/Expression/Parent.php diff --git a/system/libs/twig/Node/Expression/TempName.php b/system/libs/Twig/Node/Expression/TempName.php similarity index 100% rename from system/libs/twig/Node/Expression/TempName.php rename to system/libs/Twig/Node/Expression/TempName.php diff --git a/system/libs/twig/Node/Expression/Test.php b/system/libs/Twig/Node/Expression/Test.php similarity index 100% rename from system/libs/twig/Node/Expression/Test.php rename to system/libs/Twig/Node/Expression/Test.php diff --git a/system/libs/twig/Node/Expression/Test/Constant.php b/system/libs/Twig/Node/Expression/Test/Constant.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Constant.php rename to system/libs/Twig/Node/Expression/Test/Constant.php diff --git a/system/libs/twig/Node/Expression/Test/Defined.php b/system/libs/Twig/Node/Expression/Test/Defined.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Defined.php rename to system/libs/Twig/Node/Expression/Test/Defined.php diff --git a/system/libs/twig/Node/Expression/Test/Divisibleby.php b/system/libs/Twig/Node/Expression/Test/Divisibleby.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Divisibleby.php rename to system/libs/Twig/Node/Expression/Test/Divisibleby.php diff --git a/system/libs/twig/Node/Expression/Test/Even.php b/system/libs/Twig/Node/Expression/Test/Even.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Even.php rename to system/libs/Twig/Node/Expression/Test/Even.php diff --git a/system/libs/twig/Node/Expression/Test/Null.php b/system/libs/Twig/Node/Expression/Test/Null.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Null.php rename to system/libs/Twig/Node/Expression/Test/Null.php diff --git a/system/libs/twig/Node/Expression/Test/Odd.php b/system/libs/Twig/Node/Expression/Test/Odd.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Odd.php rename to system/libs/Twig/Node/Expression/Test/Odd.php diff --git a/system/libs/twig/Node/Expression/Test/Sameas.php b/system/libs/Twig/Node/Expression/Test/Sameas.php similarity index 100% rename from system/libs/twig/Node/Expression/Test/Sameas.php rename to system/libs/Twig/Node/Expression/Test/Sameas.php diff --git a/system/libs/twig/Node/Expression/Unary.php b/system/libs/Twig/Node/Expression/Unary.php similarity index 100% rename from system/libs/twig/Node/Expression/Unary.php rename to system/libs/Twig/Node/Expression/Unary.php diff --git a/system/libs/twig/Node/Expression/Unary/Neg.php b/system/libs/Twig/Node/Expression/Unary/Neg.php similarity index 100% rename from system/libs/twig/Node/Expression/Unary/Neg.php rename to system/libs/Twig/Node/Expression/Unary/Neg.php diff --git a/system/libs/twig/Node/Expression/Unary/Not.php b/system/libs/Twig/Node/Expression/Unary/Not.php similarity index 100% rename from system/libs/twig/Node/Expression/Unary/Not.php rename to system/libs/Twig/Node/Expression/Unary/Not.php diff --git a/system/libs/twig/Node/Expression/Unary/Pos.php b/system/libs/Twig/Node/Expression/Unary/Pos.php similarity index 100% rename from system/libs/twig/Node/Expression/Unary/Pos.php rename to system/libs/Twig/Node/Expression/Unary/Pos.php diff --git a/system/libs/twig/Node/Flush.php b/system/libs/Twig/Node/Flush.php similarity index 100% rename from system/libs/twig/Node/Flush.php rename to system/libs/Twig/Node/Flush.php diff --git a/system/libs/twig/Node/For.php b/system/libs/Twig/Node/For.php similarity index 100% rename from system/libs/twig/Node/For.php rename to system/libs/Twig/Node/For.php diff --git a/system/libs/twig/Node/ForLoop.php b/system/libs/Twig/Node/ForLoop.php similarity index 100% rename from system/libs/twig/Node/ForLoop.php rename to system/libs/Twig/Node/ForLoop.php diff --git a/system/libs/twig/Node/If.php b/system/libs/Twig/Node/If.php similarity index 100% rename from system/libs/twig/Node/If.php rename to system/libs/Twig/Node/If.php diff --git a/system/libs/twig/Node/Import.php b/system/libs/Twig/Node/Import.php similarity index 100% rename from system/libs/twig/Node/Import.php rename to system/libs/Twig/Node/Import.php diff --git a/system/libs/twig/Node/Include.php b/system/libs/Twig/Node/Include.php similarity index 100% rename from system/libs/twig/Node/Include.php rename to system/libs/Twig/Node/Include.php diff --git a/system/libs/twig/Node/Macro.php b/system/libs/Twig/Node/Macro.php similarity index 100% rename from system/libs/twig/Node/Macro.php rename to system/libs/Twig/Node/Macro.php diff --git a/system/libs/twig/Node/Module.php b/system/libs/Twig/Node/Module.php similarity index 100% rename from system/libs/twig/Node/Module.php rename to system/libs/Twig/Node/Module.php diff --git a/system/libs/twig/Node/Print.php b/system/libs/Twig/Node/Print.php similarity index 100% rename from system/libs/twig/Node/Print.php rename to system/libs/Twig/Node/Print.php diff --git a/system/libs/twig/Node/Sandbox.php b/system/libs/Twig/Node/Sandbox.php similarity index 100% rename from system/libs/twig/Node/Sandbox.php rename to system/libs/Twig/Node/Sandbox.php diff --git a/system/libs/twig/Node/SandboxedPrint.php b/system/libs/Twig/Node/SandboxedPrint.php similarity index 100% rename from system/libs/twig/Node/SandboxedPrint.php rename to system/libs/Twig/Node/SandboxedPrint.php diff --git a/system/libs/twig/Node/Set.php b/system/libs/Twig/Node/Set.php similarity index 100% rename from system/libs/twig/Node/Set.php rename to system/libs/Twig/Node/Set.php diff --git a/system/libs/twig/Node/SetTemp.php b/system/libs/Twig/Node/SetTemp.php similarity index 100% rename from system/libs/twig/Node/SetTemp.php rename to system/libs/Twig/Node/SetTemp.php diff --git a/system/libs/twig/Node/Spaceless.php b/system/libs/Twig/Node/Spaceless.php similarity index 100% rename from system/libs/twig/Node/Spaceless.php rename to system/libs/Twig/Node/Spaceless.php diff --git a/system/libs/twig/Node/Text.php b/system/libs/Twig/Node/Text.php similarity index 100% rename from system/libs/twig/Node/Text.php rename to system/libs/Twig/Node/Text.php diff --git a/system/libs/twig/NodeInterface.php b/system/libs/Twig/NodeInterface.php similarity index 100% rename from system/libs/twig/NodeInterface.php rename to system/libs/Twig/NodeInterface.php diff --git a/system/libs/twig/NodeOutputInterface.php b/system/libs/Twig/NodeOutputInterface.php similarity index 100% rename from system/libs/twig/NodeOutputInterface.php rename to system/libs/Twig/NodeOutputInterface.php diff --git a/system/libs/twig/NodeTraverser.php b/system/libs/Twig/NodeTraverser.php similarity index 100% rename from system/libs/twig/NodeTraverser.php rename to system/libs/Twig/NodeTraverser.php diff --git a/system/libs/twig/NodeVisitor/Escaper.php b/system/libs/Twig/NodeVisitor/Escaper.php similarity index 100% rename from system/libs/twig/NodeVisitor/Escaper.php rename to system/libs/Twig/NodeVisitor/Escaper.php diff --git a/system/libs/twig/NodeVisitor/Optimizer.php b/system/libs/Twig/NodeVisitor/Optimizer.php similarity index 100% rename from system/libs/twig/NodeVisitor/Optimizer.php rename to system/libs/Twig/NodeVisitor/Optimizer.php diff --git a/system/libs/twig/NodeVisitor/SafeAnalysis.php b/system/libs/Twig/NodeVisitor/SafeAnalysis.php similarity index 100% rename from system/libs/twig/NodeVisitor/SafeAnalysis.php rename to system/libs/Twig/NodeVisitor/SafeAnalysis.php diff --git a/system/libs/twig/NodeVisitor/Sandbox.php b/system/libs/Twig/NodeVisitor/Sandbox.php similarity index 100% rename from system/libs/twig/NodeVisitor/Sandbox.php rename to system/libs/Twig/NodeVisitor/Sandbox.php diff --git a/system/libs/twig/NodeVisitorInterface.php b/system/libs/Twig/NodeVisitorInterface.php similarity index 100% rename from system/libs/twig/NodeVisitorInterface.php rename to system/libs/Twig/NodeVisitorInterface.php diff --git a/system/libs/twig/Parser.php b/system/libs/Twig/Parser.php similarity index 100% rename from system/libs/twig/Parser.php rename to system/libs/Twig/Parser.php diff --git a/system/libs/twig/ParserInterface.php b/system/libs/Twig/ParserInterface.php similarity index 100% rename from system/libs/twig/ParserInterface.php rename to system/libs/Twig/ParserInterface.php diff --git a/system/libs/twig/Profiler/Dumper/Blackfire.php b/system/libs/Twig/Profiler/Dumper/Blackfire.php similarity index 100% rename from system/libs/twig/Profiler/Dumper/Blackfire.php rename to system/libs/Twig/Profiler/Dumper/Blackfire.php diff --git a/system/libs/twig/Profiler/Dumper/Html.php b/system/libs/Twig/Profiler/Dumper/Html.php similarity index 100% rename from system/libs/twig/Profiler/Dumper/Html.php rename to system/libs/Twig/Profiler/Dumper/Html.php diff --git a/system/libs/twig/Profiler/Dumper/Text.php b/system/libs/Twig/Profiler/Dumper/Text.php similarity index 100% rename from system/libs/twig/Profiler/Dumper/Text.php rename to system/libs/Twig/Profiler/Dumper/Text.php diff --git a/system/libs/twig/Profiler/Node/EnterProfile.php b/system/libs/Twig/Profiler/Node/EnterProfile.php similarity index 100% rename from system/libs/twig/Profiler/Node/EnterProfile.php rename to system/libs/Twig/Profiler/Node/EnterProfile.php diff --git a/system/libs/twig/Profiler/Node/LeaveProfile.php b/system/libs/Twig/Profiler/Node/LeaveProfile.php similarity index 100% rename from system/libs/twig/Profiler/Node/LeaveProfile.php rename to system/libs/Twig/Profiler/Node/LeaveProfile.php diff --git a/system/libs/twig/Profiler/NodeVisitor/Profiler.php b/system/libs/Twig/Profiler/NodeVisitor/Profiler.php similarity index 100% rename from system/libs/twig/Profiler/NodeVisitor/Profiler.php rename to system/libs/Twig/Profiler/NodeVisitor/Profiler.php diff --git a/system/libs/twig/Profiler/Profile.php b/system/libs/Twig/Profiler/Profile.php similarity index 100% rename from system/libs/twig/Profiler/Profile.php rename to system/libs/Twig/Profiler/Profile.php diff --git a/system/libs/twig/Sandbox/SecurityError.php b/system/libs/Twig/Sandbox/SecurityError.php similarity index 100% rename from system/libs/twig/Sandbox/SecurityError.php rename to system/libs/Twig/Sandbox/SecurityError.php diff --git a/system/libs/twig/Sandbox/SecurityNotAllowedFilterError.php b/system/libs/Twig/Sandbox/SecurityNotAllowedFilterError.php similarity index 100% rename from system/libs/twig/Sandbox/SecurityNotAllowedFilterError.php rename to system/libs/Twig/Sandbox/SecurityNotAllowedFilterError.php diff --git a/system/libs/twig/Sandbox/SecurityNotAllowedFunctionError.php b/system/libs/Twig/Sandbox/SecurityNotAllowedFunctionError.php similarity index 100% rename from system/libs/twig/Sandbox/SecurityNotAllowedFunctionError.php rename to system/libs/Twig/Sandbox/SecurityNotAllowedFunctionError.php diff --git a/system/libs/twig/Sandbox/SecurityNotAllowedTagError.php b/system/libs/Twig/Sandbox/SecurityNotAllowedTagError.php similarity index 100% rename from system/libs/twig/Sandbox/SecurityNotAllowedTagError.php rename to system/libs/Twig/Sandbox/SecurityNotAllowedTagError.php diff --git a/system/libs/twig/Sandbox/SecurityPolicy.php b/system/libs/Twig/Sandbox/SecurityPolicy.php similarity index 100% rename from system/libs/twig/Sandbox/SecurityPolicy.php rename to system/libs/Twig/Sandbox/SecurityPolicy.php diff --git a/system/libs/twig/Sandbox/SecurityPolicyInterface.php b/system/libs/Twig/Sandbox/SecurityPolicyInterface.php similarity index 100% rename from system/libs/twig/Sandbox/SecurityPolicyInterface.php rename to system/libs/Twig/Sandbox/SecurityPolicyInterface.php diff --git a/system/libs/twig/SimpleFilter.php b/system/libs/Twig/SimpleFilter.php similarity index 100% rename from system/libs/twig/SimpleFilter.php rename to system/libs/Twig/SimpleFilter.php diff --git a/system/libs/twig/SimpleFunction.php b/system/libs/Twig/SimpleFunction.php similarity index 100% rename from system/libs/twig/SimpleFunction.php rename to system/libs/Twig/SimpleFunction.php diff --git a/system/libs/twig/SimpleTest.php b/system/libs/Twig/SimpleTest.php similarity index 100% rename from system/libs/twig/SimpleTest.php rename to system/libs/Twig/SimpleTest.php diff --git a/system/libs/twig/Template.php b/system/libs/Twig/Template.php similarity index 100% rename from system/libs/twig/Template.php rename to system/libs/Twig/Template.php diff --git a/system/libs/twig/TemplateInterface.php b/system/libs/Twig/TemplateInterface.php similarity index 100% rename from system/libs/twig/TemplateInterface.php rename to system/libs/Twig/TemplateInterface.php diff --git a/system/libs/twig/Test.php b/system/libs/Twig/Test.php similarity index 100% rename from system/libs/twig/Test.php rename to system/libs/Twig/Test.php diff --git a/system/libs/twig/Test/Function.php b/system/libs/Twig/Test/Function.php similarity index 100% rename from system/libs/twig/Test/Function.php rename to system/libs/Twig/Test/Function.php diff --git a/system/libs/twig/Test/IntegrationTestCase.php b/system/libs/Twig/Test/IntegrationTestCase.php similarity index 100% rename from system/libs/twig/Test/IntegrationTestCase.php rename to system/libs/Twig/Test/IntegrationTestCase.php diff --git a/system/libs/twig/Test/Method.php b/system/libs/Twig/Test/Method.php similarity index 100% rename from system/libs/twig/Test/Method.php rename to system/libs/Twig/Test/Method.php diff --git a/system/libs/twig/Test/Node.php b/system/libs/Twig/Test/Node.php similarity index 100% rename from system/libs/twig/Test/Node.php rename to system/libs/Twig/Test/Node.php diff --git a/system/libs/twig/Test/NodeTestCase.php b/system/libs/Twig/Test/NodeTestCase.php similarity index 100% rename from system/libs/twig/Test/NodeTestCase.php rename to system/libs/Twig/Test/NodeTestCase.php diff --git a/system/libs/twig/TestCallableInterface.php b/system/libs/Twig/TestCallableInterface.php similarity index 100% rename from system/libs/twig/TestCallableInterface.php rename to system/libs/Twig/TestCallableInterface.php diff --git a/system/libs/twig/TestInterface.php b/system/libs/Twig/TestInterface.php similarity index 100% rename from system/libs/twig/TestInterface.php rename to system/libs/Twig/TestInterface.php diff --git a/system/libs/twig/Token.php b/system/libs/Twig/Token.php similarity index 100% rename from system/libs/twig/Token.php rename to system/libs/Twig/Token.php diff --git a/system/libs/twig/TokenParser.php b/system/libs/Twig/TokenParser.php similarity index 100% rename from system/libs/twig/TokenParser.php rename to system/libs/Twig/TokenParser.php diff --git a/system/libs/twig/TokenParser/AutoEscape.php b/system/libs/Twig/TokenParser/AutoEscape.php similarity index 100% rename from system/libs/twig/TokenParser/AutoEscape.php rename to system/libs/Twig/TokenParser/AutoEscape.php diff --git a/system/libs/twig/TokenParser/Block.php b/system/libs/Twig/TokenParser/Block.php similarity index 100% rename from system/libs/twig/TokenParser/Block.php rename to system/libs/Twig/TokenParser/Block.php diff --git a/system/libs/twig/TokenParser/Do.php b/system/libs/Twig/TokenParser/Do.php similarity index 100% rename from system/libs/twig/TokenParser/Do.php rename to system/libs/Twig/TokenParser/Do.php diff --git a/system/libs/twig/TokenParser/Embed.php b/system/libs/Twig/TokenParser/Embed.php similarity index 100% rename from system/libs/twig/TokenParser/Embed.php rename to system/libs/Twig/TokenParser/Embed.php diff --git a/system/libs/twig/TokenParser/Extends.php b/system/libs/Twig/TokenParser/Extends.php similarity index 100% rename from system/libs/twig/TokenParser/Extends.php rename to system/libs/Twig/TokenParser/Extends.php diff --git a/system/libs/twig/TokenParser/Filter.php b/system/libs/Twig/TokenParser/Filter.php similarity index 100% rename from system/libs/twig/TokenParser/Filter.php rename to system/libs/Twig/TokenParser/Filter.php diff --git a/system/libs/twig/TokenParser/Flush.php b/system/libs/Twig/TokenParser/Flush.php similarity index 100% rename from system/libs/twig/TokenParser/Flush.php rename to system/libs/Twig/TokenParser/Flush.php diff --git a/system/libs/twig/TokenParser/For.php b/system/libs/Twig/TokenParser/For.php similarity index 100% rename from system/libs/twig/TokenParser/For.php rename to system/libs/Twig/TokenParser/For.php diff --git a/system/libs/twig/TokenParser/From.php b/system/libs/Twig/TokenParser/From.php similarity index 100% rename from system/libs/twig/TokenParser/From.php rename to system/libs/Twig/TokenParser/From.php diff --git a/system/libs/twig/TokenParser/If.php b/system/libs/Twig/TokenParser/If.php similarity index 100% rename from system/libs/twig/TokenParser/If.php rename to system/libs/Twig/TokenParser/If.php diff --git a/system/libs/twig/TokenParser/Import.php b/system/libs/Twig/TokenParser/Import.php similarity index 100% rename from system/libs/twig/TokenParser/Import.php rename to system/libs/Twig/TokenParser/Import.php diff --git a/system/libs/twig/TokenParser/Include.php b/system/libs/Twig/TokenParser/Include.php similarity index 100% rename from system/libs/twig/TokenParser/Include.php rename to system/libs/Twig/TokenParser/Include.php diff --git a/system/libs/twig/TokenParser/Macro.php b/system/libs/Twig/TokenParser/Macro.php similarity index 100% rename from system/libs/twig/TokenParser/Macro.php rename to system/libs/Twig/TokenParser/Macro.php diff --git a/system/libs/twig/TokenParser/Sandbox.php b/system/libs/Twig/TokenParser/Sandbox.php similarity index 100% rename from system/libs/twig/TokenParser/Sandbox.php rename to system/libs/Twig/TokenParser/Sandbox.php diff --git a/system/libs/twig/TokenParser/Set.php b/system/libs/Twig/TokenParser/Set.php similarity index 100% rename from system/libs/twig/TokenParser/Set.php rename to system/libs/Twig/TokenParser/Set.php diff --git a/system/libs/twig/TokenParser/Spaceless.php b/system/libs/Twig/TokenParser/Spaceless.php similarity index 100% rename from system/libs/twig/TokenParser/Spaceless.php rename to system/libs/Twig/TokenParser/Spaceless.php diff --git a/system/libs/twig/TokenParser/Use.php b/system/libs/Twig/TokenParser/Use.php similarity index 100% rename from system/libs/twig/TokenParser/Use.php rename to system/libs/Twig/TokenParser/Use.php diff --git a/system/libs/twig/TokenParserBroker.php b/system/libs/Twig/TokenParserBroker.php similarity index 100% rename from system/libs/twig/TokenParserBroker.php rename to system/libs/Twig/TokenParserBroker.php diff --git a/system/libs/twig/TokenParserBrokerInterface.php b/system/libs/Twig/TokenParserBrokerInterface.php similarity index 100% rename from system/libs/twig/TokenParserBrokerInterface.php rename to system/libs/Twig/TokenParserBrokerInterface.php diff --git a/system/libs/twig/TokenParserInterface.php b/system/libs/Twig/TokenParserInterface.php similarity index 100% rename from system/libs/twig/TokenParserInterface.php rename to system/libs/Twig/TokenParserInterface.php diff --git a/system/libs/twig/TokenStream.php b/system/libs/Twig/TokenStream.php similarity index 100% rename from system/libs/twig/TokenStream.php rename to system/libs/Twig/TokenStream.php From 3a6a1c448a6409b2acfb8a7f4c30a61ddcda5c54 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 23:58:53 +0200 Subject: [PATCH 7/8] * log errors instead showing them to users with system directories * now it will print a notice, and aditionally log full path into system/logs/error.log * also, when it fails to load config.lua it will output error also to error.log * fix when $_SERVER['HTTP_ACCEPT_ENCODING'] is not set. --- system/functions.php | 9 ++++++--- system/init.php | 2 +- system/libs/pot/OTS_Group.php | 2 +- system/libs/pot/OTS_Groups_List.php | 16 +++++++++++++--- system/libs/pot/OTS_Player.php | 3 ++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/system/functions.php b/system/functions.php index fb2c0413..c3e5f91a 100644 --- a/system/functions.php +++ b/system/functions.php @@ -1202,7 +1202,7 @@ function convert_bytes($size) function log_append($file, $str) { $f = fopen(LOGS . $file, 'a'); - fwrite($f, $str . PHP_EOL); + fwrite($f, '[' . date(DateTime::RFC1123) . '] ' . $str . PHP_EOL); fclose($f); } @@ -1215,8 +1215,11 @@ function load_config_lua($filename) die('ERROR: Cannot find ' . $filename . ' file.'); $tempFile = @tempnam('/tmp', 'lua'); - $file = fopen($tempFile, 'w'); - if(!$file) die('Cannot load server config!'); + $file = @fopen($tempFile, 'w'); + if(!$file) { + log_append('error.log', '[functions.php] Cannot load config.lua file. Error: ' . print_r(error_get_last(), true)); + die('Cannot load server config! More info in system/logs/error.log file.'); + } // TODO: new parser that will also load dofile() includes diff --git a/system/init.php b/system/init.php index 7fef463a..2e21d52e 100644 --- a/system/init.php +++ b/system/init.php @@ -19,7 +19,7 @@ if($config['server_path'][strlen($config['server_path']) - 1] != '/') $config['server_path'] .= '/'; // enable gzip compression if supported by the browser -if($config['gzip_output'] && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) && function_exists('ob_gzhandler')) +if($config['gzip_output'] && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('ob_gzhandler')) ob_start('ob_gzhandler'); // cache diff --git a/system/libs/pot/OTS_Group.php b/system/libs/pot/OTS_Group.php index 45041978..bca4c793 100644 --- a/system/libs/pot/OTS_Group.php +++ b/system/libs/pot/OTS_Group.php @@ -47,7 +47,7 @@ class OTS_Group extends OTS_Row_DAO implements IteratorAggregate, Countable * * @param DOMElement $group Group info. */ - public function __construct($data) + public function __construct($data = array()) { $this->data = $data; } diff --git a/system/libs/pot/OTS_Groups_List.php b/system/libs/pot/OTS_Groups_List.php index b9829df0..6e32cb63 100644 --- a/system/libs/pot/OTS_Groups_List.php +++ b/system/libs/pot/OTS_Groups_List.php @@ -51,6 +51,12 @@ class OTS_Groups_List implements IteratorAggregate, Countable global $config; $file = $config['data_path'] . 'XML/groups.xml'; } + + if(!@file_exists($file)) { + error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). It doesnt exist.'); + return; + } global $cache; @@ -63,7 +69,9 @@ class OTS_Groups_List implements IteratorAggregate, Countable else { $groups = new DOMDocument(); - $groups->load($file); + error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + return; + } // loads groups foreach( $groups->getElementsByTagName('group') as $group) @@ -85,8 +93,10 @@ class OTS_Groups_List implements IteratorAggregate, Countable { // loads DOM document $groups = new DOMDocument(); - $groups->load($file); - + error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + return; + } + // loads groups foreach($groups->getElementsByTagName('group') as $group) { diff --git a/system/libs/pot/OTS_Player.php b/system/libs/pot/OTS_Player.php index cce07abd..3b8a79aa 100644 --- a/system/libs/pot/OTS_Player.php +++ b/system/libs/pot/OTS_Player.php @@ -644,7 +644,8 @@ class OTS_Player extends OTS_Row_DAO if($tmp) return $tmp; - echo 'error while loading group..'; + return new OTS_Group(); + // echo 'error while loading group..'; /* $_id = $this->data['group_id']; $tmpGroup = new OTS_Group; From b0f80137622312396b9d1e879db71132f24ca707 Mon Sep 17 00:00:00 2001 From: slawkens1 Date: Mon, 28 Aug 2017 23:59:04 +0200 Subject: [PATCH 8/8] * and this --- system/libs/pot/OTS_Groups_List.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/libs/pot/OTS_Groups_List.php b/system/libs/pot/OTS_Groups_List.php index 6e32cb63..b11d1abd 100644 --- a/system/libs/pot/OTS_Groups_List.php +++ b/system/libs/pot/OTS_Groups_List.php @@ -69,7 +69,9 @@ class OTS_Groups_List implements IteratorAggregate, Countable else { $groups = new DOMDocument(); + if(!@$groups->load($file)) { error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). Error: ' . print_r(error_get_last(), true)); return; } @@ -93,7 +95,9 @@ class OTS_Groups_List implements IteratorAggregate, Countable { // loads DOM document $groups = new DOMDocument(); + if(!@$groups->load($file)) { error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); + log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). Error: ' . print_r(error_get_last(), true)); return; }