Update CHANGELOG.md

* release 0.7.11
* Update CHANGELOG.md
2025-09-14 04:23:34 +02:00 · 2019-05-04 08:19:01 +02:00 · 2019-05-04 00:20:37 +02:00 · 2019-04-27 17:39:41 +02:00 · 2019-04-09 00:50:56 +02:00 · 2018-11-07 21:15:47 +01:00
403 changed files with 3648 additions and 7949 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,4 @@
 * text=auto
 .gitattributes export-ignore
 .gitignore export-ignore
 _config.yml export-ignore
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
 Thumbs.db
 .DS_Store
 .idea
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,63 @@
-[0.7.7 - 08.01.2018]
+# Changelog
 ## [0.7.11 - 04.05.2019]
 ### Added:
 * support for some old servers, where arrays are used in config.lua
 * an additional text to the install page informing that user can reinstall MyAAC by deleting config.local.php
 ### Fixed:
 * XSS in forum show_thread
 * guilds - "Add new rank" function
 * multiple mail recipients when using admin mailer function
 * Admin Panel - MyAAC logs not shown if servers logs directory doesn't exist (#47)
 * missing prefix for cache get() and delete() functions
 * add fatal error message when myaac tables in database do not exist
 * the mystical defect where "Create Account" button was not highlighted (on the account/manage page)
 * bug where server_config table does not exist (OTHire as an example)
 * database_name in Usage_Statistics
 * forgot to open <head> in install template
 ### Changed:
 * do not display software version
 ## [0.7.10 - 03.03.2018]
 ### Added:
 * new configurable: smtp_secure
 * robots.txt
 ### Fixed:
 * editing an existing page that had php enabled
 * chrome bug on save (when editing page) ERR_BLOCKED_BY_XSS_AUDITOR
 * showing IP and Port in admin panel (#44, by miqueiaspenha)
 * deleting plugin showing "You don't have rights to delete"
 * some bug with PHPMailer not finding its language file
 * default accounts.vote value
 * saving some really high long ip addresses
 ### Changed:
 * update config.highscores_ids_hidden on install when there are samples already in database
 * auto add z_polls table on install
 ### Internal:
 * changed mb_strtolower functions to strtolower()
 * added new function: $hooks->exist($type)
 ## [0.7.9 - 13.01.2018]
 	* removed 6mb of trash (some useless things)
 	* (fix) TFS 1.x not showing promoted vocations in highscores
 	* otserv 0.6.x: fixed some warning (on the characters page) and fatal mysql error (on the mango signature)
 	* fixed default stamina on otserv 0.6.x engine (and some others perhaps)
 	* install: change permission check to is_writable
 	* changed highscores_groups_hidden to 3 (for TFS 1.x)
 	* updated background-artwork (tibiacom template) to the latest version, removed other ones
 ## [0.7.8 - 12.01.2018]
 	* fixed installation error " call to undefined method OTS_DB_MySQL::hasColumn()"
 	* updated tinymce to the latest (4.7.4) version
 	* enabled emoticons plugin in tinymce :)
 	* some security fixes
 ## [0.7.7 - 08.01.2018]
 	* important fix for servers with promotion column (caused player.vocation to be resetted when saving player, for example: on change name, accept invite to guild, leave guild)
 	* immediately reload config.lua when there's change in config.server_path detected
 	* added new forum option: "Enable HTML" (only for moderators)
@@ -17,14 +76,14 @@
 	* don't add extra <br/> to the TinyMCE news forum posts
 	* (internal) using $player->getVocationName() where possible instead of older method
-[0.7.6 - 05.01.2017]
+## [0.7.6 - 05.01.2017]
 	* fixed othire account creating/installation
 	* fixed table name players -> players_online
 	* fixed unexpected error logging about email fail
 	* added max_execution_time to the install finish step
 	* some small fix regarding highscores vocation box
-[0.7.5 - 04.01.2017]
+## [0.7.5 - 04.01.2017]
 	* fixed bug on othire with config.account_premium_days
 	* fixed bug on TFS 1.x when online_afk is enabled
 	* warning about leaving news page with changes
@@ -37,7 +96,7 @@
 	* fixed template path finding
 	* fixed displaying article_text when it was empty saved
-[0.7.4 - 24.12.2017]
+## [0.7.4 - 24.12.2017]
 	* fixed mysql fatal error on tibiacom template - top 5 box
 	* fixed displaying of level percent bar on tibian signature
 	* inform user about Twig cache failure on installation, instead of http 500 error
@@ -45,7 +104,7 @@
 	* remember client version select and usage stats checkbox in session on install
 	* automatically update highscores_ids_hidden for users who installed myaac before (migration)
-[0.7.3 - 18.12.2017]
+## [0.7.3 - 18.12.2017]
 	* auto generate myaac cache & session prefix on install to be unique across installations
 	* fixed hiding shop system menu on tibiacom template when disabled in config
 	* prevent adding duplicated newses with installation
@@ -55,12 +114,12 @@
 	* fixed account.login redirect not working on tibiacom template
 	* installation: warn about wrong admin account name/id and password
 	* fixed last menu closing in tibiacom template
-	* updated polish locale (translation) on install 
+	* updated polish locale (translation) on install
 	* (internal) removed some duplicated code on install finish
 	* (internal) renamed installation step files to be in correct order
 	* added TODO file
-[0.7.1 - 13.12.2017]
+## [0.7.1 - 13.12.2017]
 	* added changelog menu item to kathrine template
 	* fixed some php short tag in changelogs page
 	* fixed guild change description back button
@@ -68,7 +127,7 @@
 	* changed some notice when version check is failed
 	* (internal) moved changelog to twig
-[0.7.0 - 20.11.2017]
+## [0.7.0 - 20.11.2017]
 	* moved template menus to database, they're now dynamically loaded
 	* added anonymous usage statistics reporting (only if user agrees, first usage report will be send after 7 days)
 	* you can edit them in Admin Panel under 'Menus' option
@@ -104,25 +163,25 @@
 	* (internal) added some compat functions that are used by shop system
 	* (internal) renamed constant TICKET -> TICKER
 	* (internal) shortened message functions
-	
+
-[0.6.6 - 22.10.2017]
+## [0.6.6 - 22.10.2017]
 	* fixed some php fatal error on spells page
 	* changed spells.vocations field in db size to 300
 	* please reload your spells after this update!
-[0.6.5 - 21.10.2017]
+## [0.6.5 - 21.10.2017]
 	* fixed displaying custom pages
 	* fixed adding new group forum board
-	
+
-[0.6.4 - 20.10.2017]
+## [0.6.4 - 20.10.2017]
 	* reverted OTS_Account::getLastLogin() cause its used by tibia11-login plugin
-	
+
-[0.6.3 - 20.10.2017]
+## [0.6.3 - 20.10.2017]
 	* fixed creating account
-	* fixed viewing thread without being logged 
+	* fixed viewing thread without being logged
 	* fixed showing premium account status
-	
+
-[0.6.2 - 20.10.2017]
+## [0.6.2 - 20.10.2017]
 	* added forums for guilds and groups
 	* added nice looking menu for my account page in default template
 	* new command line tool: install_plugin.php - can be used to install plugins from command line. Usage: "php install_plugin.php path_to_file"
@@ -154,8 +213,8 @@
 	* (internal) optimized Spells class
 	* (internal) new function: OTS_Guild::hasMember(OTS_Player $player)
 	* (internal) new function: Forum::hasAccess($board_id)
-	
+
-[0.6.1 - 17.10.2017]
+## [0.6.1 - 17.10.2017]
 	* fixed signatures loading
 	* new configurable: session_prefix, to allow more websites on one machine (must be unique for every website on your dedicated server!)
 	* better error handling for monsters and spells loader (save errors to system/logs/error.log)
@@ -165,7 +224,7 @@
 	* (internal) moved forum actions (pages) to forum/ directory
 	* (internal) moved forum.edit_post to twig templates
-[0.6.0 - 16.10.2017]
+## [0.6.0 - 16.10.2017]
 	* added faq management - add/edit/move/hide/delete from website
 	* new account.login view for tibiacom template
 	* monsters and spells are now being loaded at the installation of the AAC
@@ -188,7 +247,7 @@
 	* ajax requests returns now json instead of xml
 	* added 404 response when file is not found
-[0.5.1 - 11.10.2017]
+## [0.5.1 - 11.10.2017]
 	* fixed forum add/edit board
 	* new configurable: highscores_length, how much highscores to display
 	* fixed highscores links (ALL, previous and next page)
@@ -198,7 +257,7 @@
 	* check if plugin exist before uninstalling
 	* fixed some warning in OTS_Base_DB
-[0.5.0 - 10.10.2017]
+## [0.5.0 - 10.10.2017]
 	* moved .htaccess rules to plain php (index.php)
 	* updated tinymce to the latest (4.7.0) version, you can now embed code, for example youtube videos
 	* added option to uninstall plugin
@@ -217,7 +276,7 @@
 	* added new twig function getLink that convert link taking into account config.friendly_urls
 	* internalLayoutLink -> getLink
-[0.4.3 - 05.10.2017]
+## [0.4.3 - 05.10.2017]
 	* better config loader taken from latest gesior, you can now include files in your config by doing dofile('config.local.lua')
 	* fixed country detection in create account
 	* fixed showing of character deaths and frags
@@ -231,14 +290,14 @@
 	* added bugtracker to kathrine template
 	* added CREDITS file
-[0.4.2 - 14.09.2017]
+## [0.4.2 - 14.09.2017]
 	* updated version number
-[0.4.1 - 13.09.2017]
+## [0.4.1 - 13.09.2017]
 	* fixed log in to admin panel
 	* fixed File is not .zip plugin upload error
-[0.4.0 - 13.09.2017
+## [0.4.0 - 13.09.2017
 	* added option to add/edit/delete/hide/move forum boards
 	* moved some of HTML-in-PHP code to Twig templates
 	* added bug_report configurable which can enable/disable bug tracker
@@ -255,7 +314,7 @@
 	* some small improvements
 	* fixed some separators in kathrine template
-[0.3.0 - 28.08.2017]
+## [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
@@ -273,7 +332,7 @@
 	* moved news adding at installation from schema.sql to finish.php
 	* some optimizations
-[0.2.4 - 09.06.2017]
+## [0.2.4 - 09.06.2017]
 	* fixed invite to guild
 	* added id field on monsters, so you can delete them in phpmyadmin
 	* fixed adding some creatures with ' and "
@@ -282,7 +341,7 @@
 	* fixed typo loss_items => loss_containers
 	* more elegant way of showing message on reload creatures and spells
-[0.2.3 - 31.05.2017]
+## [0.2.3 - 31.05.2017]
 	* fixed guild management on OTHire 0.0.3
 	* set default skills to 10 when creating new character
 	* fixed displaying of "Create forum thread" in newses
@@ -294,15 +353,15 @@
 	* fixed Undefined variable (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444034)
 	* fixed Undefined offset (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444035)
-[0.2.2 - 22.05.2017]
+## [0.2.2 - 22.05.2017]
 	* added missing cache/signature directory
 	* fixed https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2443868
-[0.2.1 - 21.05.2017]
+## [0.2.1 - 21.05.2017]
 	* added Swedish translation by Sizaro
 	* fixed some bugs with installlation & characters & houses
-[0.2.0 - 21.05.2017]
+## [0.2.0 - 21.05.2017]
 	* added option to change character sex for premium points
 	* moved site_closed to database, now you can close your site through admin panel
 	* added option to admin panel: clear cache
@@ -322,10 +381,10 @@
 	* fixed movies unexpected comment
 	* added template_place_holder('center_top') to kathrine template
-[0.1.5 - 13.05.2017]
+## [0.1.5 - 13.05.2017]
 	* fixed bug with "Integrity constraint violation: 1048 Column 'ip' cannot be null"
-[0.1.4 - 13.05.2017]
+## [0.1.4 - 13.05.2017]
 	* added outfit shower, in characters, online, and highscores
 	* updated database to version 2
 	* fixed item images (now using item-images.ots.me host by default)
@@ -334,17 +393,17 @@
 	* removed some unused code from my old server
 	* added spells & monsters to kathrine template
-[0.1.3 - 11.05.2017]
+## [0.1.3 - 11.05.2017]
 	* this is just release to update version number
-[0.1.2 - 11.05.2017]
+## [0.1.2 - 11.05.2017]
 	* forgot to update CHANGELOG and MYAAC_VERSION
-[0.1.1 - 11.05.2017]
+## [0.1.1 - 11.05.2017]
 	* fixed updating myaac_config with database_version to 1
 	* fixed database updater
-[0.1.0 - 11.05.2017]
+## [0.1.0 - 11.05.2017]
 	* added new feature: change character name for premium points (disabled by default, you can enable it in config under account_change_character_name in config.php)
 	* added automatic database updater (data migrations)
 	* renamed events to hooks
@@ -368,13 +427,13 @@
 	* fixed signatures (many fixes)
 	* added missing gesior signature system
-[0.0.6 - 06.05.2017]
+## [0.0.6 - 06.05.2017]
 	* fixed bug while installing (https://otland.net/threads/myaac-v0-0-1.251454/page-3#post-2440543)
 	* fixed bug when creating character (not showing errors) (one more time)
 	* fixed support for TFS 0.2 series
 	* added FAQ link
-	
+
-[0.0.5 - 05.05.2017]
+## [0.0.5 - 05.05.2017]
 	* fixed bug when creating character (not showing errors)
 	* Fixed characters loading with names that has been created with other AAC
 	* fixed links to shop in default template
@@ -387,7 +446,7 @@
 	* fixes when $config['database_*'] is set
 	* added CHANGELOG
-[0.0.3 - 03.05.2017]
+## [0.0.3 - 03.05.2017]
 	* Full support for OTHire 0.0.3
 	* added support for otservers that doesn't use account.name field, instead just account number will be used
 	* fixed encryption detection on TFS 0.3
@@ -398,7 +457,7 @@
 	* fixed installation errors
 	* fixed config.lua loading with some weird comments
-[0.0.2 - 02.05.2017]
+## [0.0.2 - 02.05.2017]
 	* updated forum links to use friendly_urls
 	* some more info will be shown when cannot connect to database
 	* show more error infos when creating character
@@ -409,8 +468,8 @@
 	* fixed support for gesior pages and templates
 	* added function OTS_Acount:getGroupId()
-[0.0.1 - 01.05.2017]
+## [0.0.1 - 01.05.2017]
 	This is first official release of MyAAC.
 	Features are listed here
-	For more information, see the release announcement on OTLand: https://otland.net/threads/myaac-v0-0-1.251454/
+	For more information, see the release announcement on OTLand: https://otland.net/threads/myaac-v0-0-1.251454/
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Official website: https://my-aac.org
 ### REQUIREMENTS
-	- PHP 5.3.0 or later
+	- PHP 5.3.3 or later
 	- MySQL database
 	- PDO PHP Extension
 	- XML PHP Extension
@@ -28,6 +28,7 @@ Official website: https://my-aac.org
 			chmod 660 images/guilds
 			chmod 660 images/houses
 			chmod 660 images/gallery
 			chmod -R 770 system/cache
 	Visit http://your_domain/install (http://localhost/install) and follow instructions in the browser.
--- a/37
+++ b/37
@@ -2,42 +2,28 @@
 0.*
 	* support duplicated vocation names with different ids
-	* sandbox for plugins, don't install when requirements are not passed
+	* plugins: option to define custom requirements check in json file, to check if system meets the requirement
-	* add changelog management interface
+	* add support for defining max myaac version in plugin.json file
-	* plugins require:
+	* cache Menus in templates
-		* php extension
+	* don't show error indicators on first time load - createaccount page
-		* database table or column
+	* update Twig to the latest version from 1.x branch
-	* kathrine tickets - show/hide
+	* semantic versioning support for plugins (github.com/composer/semver)
-	* highscores - by balance
+	* add some notice to the user that installing step "Import Schema" will take some time
-	* admin panel Menus:
+	* check user IP on installing to prevent install by random user
 		* open in external window (_blank option)
 		* color of the link
 		* should the link blink?
 	* cache:
 		* hooks
 		* Menus in templates
 	* move highscores to twig
 	* migrations: option to downgrade the database
 	* hooks: login + logout
 	* create account: create character
 1.0:
 	* i18n support (issue #1 on github)
 	* New Admin Panel layout and interface
-		* most preferably: https://adminlte.io/
+	* add changelog management interface
 		* move all pages administration to this panel (like faq, forum, newses)
 	* remove tibiacom template, and include it as a plugin
 2.0
 	* remove gesior backward support
 	* remove compat functions
 	* remove $template['link_*']
 	* folder restructure:
 		* var/ (for logs, cache and data), config/, bin, public/ (for index and images and other public content), system/ (for php files and classess)
 	* rename templates to layouts as templates is meant to be used for twig templates
 	* change gifts_system to shop_system configurable
 	* move most used options in system/templates dir to separate directories (more transparent)
 	* move database fields to separate tables without modifing the OTServ schema (myaac_accounts, myaac_players)
 At any time between (version not specified):
 	* better news archive with search function (like on tibia.com)
@@ -45,8 +31,7 @@ At any time between (version not specified):
 	* update account.management page to be more realistic (like on tibia.com)
 	* update guilds page to be more realistic (like on tibia.com)
 	* possibility to add extra cache engines with plugins
 		* new cache engine - plain php, is good with pure php 7.0+ and opcache
 	* preferably configurable (enable/disable) forum TinyMCE editor
 	* new cache engine - plain php, is good with pure php 7.0+ and opcache
 	* OTAdmin support in Admin Panel
-	* database towns table support for TFS 1.3
+	* database towns table support for TFS 1.3
 	* two factor authentication for TFS 1.x
--- a/_config.yml
+++ b/_config.yml
@@ -1 +0,0 @@
 theme: jekyll-theme-slate
--- a/common.php
+++ b/common.php
@@ -26,8 +26,8 @@
 session_start();
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.8.0-dev');
+define('MYAAC_VERSION', '0.7.11');
-define('DATABASE_VERSION', 21);
+define('DATABASE_VERSION', 22);
 define('TABLE_PREFIX', 'myaac_');
 define('START_TIME', microtime(true));
 define('MYAAC_OS', (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'WINDOWS' : (strtoupper(PHP_OS) == 'DARWIN' ? 'MAC' : 'LINUX'));
@@ -46,7 +46,6 @@ define('FLAG_CONTENT_GALLERY', 512);
 define('FLAG_CONTENT_VIDEOS', 1024);
 define('FLAG_CONTENT_FAQ', 2048);
 define('FLAG_CONTENT_MENUS', 4096);
 define('FLAG_CONTENT_PLAYERS', 8192);
 // news
 define('NEWS', 1);
@@ -100,10 +99,10 @@ if(isset($_SERVER['HTTP_HOST'])) {
 		define('SERVER_URL', 'https://' . $_SERVER['HTTP_HOST']);
 	else
 		define('SERVER_URL', 'http://' . $_SERVER['HTTP_HOST']);
-	
+
 	define('BASE_URL', SERVER_URL . BASE_DIR . '/');
 	define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');
-	
+
 	//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
 }
 ?>
--- a/config.php
+++ b/config.php
@@ -46,6 +46,8 @@ $config = array(
 	// footer
 	'footer' => ''/*'<br/>Your Server &copy; 2016. All rights reserved.'*/,
 	'debug_level' => 0, // 0 - disabled, 1 - show load time, 2 - show db query counter, 3 - both, 4 - memory usage, 5 - load time & memory usage, 6 - queries & memory usage, 7 - all
 	'language' => 'en', // default language (currently only 'en' available)
 	'language_allow_change' => false,
@@ -54,7 +56,7 @@ $config = array(
 	'views_counter' => true,
 	// cache system. by default file cache is used
-	'cache_engine' => 'auto', // apc, apcu, eaccelerator, xcache, file, auto, or blank to disable.
+	'cache_engine' => 'auto', // apc, eaccelerator, xcache, file, auto, or blank to disable.
 	'cache_prefix' => 'myaac_', // have to be unique if running more MyAAC instances on the same server (except file system cache)
 	// database details (leave blank for auto detect from config.lua)
@@ -63,7 +65,6 @@ $config = array(
 	'database_user' => '',
 	'database_password' => '',
 	'database_name' => '',
 	'database_log' => false, // should database queries be logged and displayed in the page source? They will be included at the end of the .html source of the page
 	// multiworld system (only TFS 0.3)
 	'multiworld' => false, // use multiworld system?
@@ -97,7 +98,7 @@ $config = array(
 	'mail_address' => 'no-reply@your-server.org', // server e-mail address (from:)
 	'mail_admin' => 'your-address@your-server.org', // admin email address, where mails from contact form will be sent
 	'mail_signature' => array( // signature that will be included at the end of every message sent using _mail function
-		'plain' => ""/*"--\nMy Server,\nhttp://www.myserver.com"*/,
+		'plain' => ''/*'--\nMy Server,\nhttp://www.myserver.com'*/,
 		'html' => ''/*'<br/>My Server,\n<a href="http://www.myserver.com">myserver.com</a>'*/
 	),
 	'smtp_enabled' => false, // send by smtp or mail function (set false if use mail function)
@@ -106,6 +107,7 @@ $config = array(
 	'smtp_auth' => true, // need authorization?
 	'smtp_user' => 'admin@example.org',
 	'smtp_pass' => '',
 	'smtp_secure' => '', // What kind of encryption to use on the SMTP connection. Options: '', 'ssl' or 'tls', use 'ssl' for gmail
 	// reCAPTCHA (prevent spam bots)
 	'recaptcha_enabled' => false, // enable recaptcha verification code
@@ -184,7 +186,7 @@ $config = array(
 	'highscores_frags' => false, // show 'Frags' tab (best fraggers on the server)? Only 0.3
 	'highscores_outfit' => true, // show player outfit?
 	'highscores_country_box' => false, // doesnt work yet! (not implemented)
-	'highscores_groups_hidden' => 4, // this group id and higher won't be shown on the highscores
+	'highscores_groups_hidden' => 3, // this group id and higher won't be shown on the highscores
 	'highscores_ids_hidden' => array(0), // this ids of players will be hidden on the highscores (should be ids of samples)
 	'highscores_length' => 100, // how many records per page on highscores
--- a/images/icons/comment_add.png
+++ b/images/icons/comment_add.png
--- a/images/loading_spinner.gif
+++ b/images/loading_spinner.gif
--- a/index.php
+++ b/index.php
@@ -1,436 +1,436 @@
-<?php
+<?php
-/**
+/**
- * Project: MyAAC
+ * Project: MyAAC
- *     Automatic Account Creator for Open Tibia Servers
+ *     Automatic Account Creator for Open Tibia Servers
- * File: index.php
+ * File: index.php
- *
+ *
- * This is free software; you can redistribute it and/or
+ * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
+ * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
- *
+ *
- * This software is distributed in the hope that it will be useful,
+ * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
- *
+ *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ *
- * @package   MyAAC
+ * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
+ * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2017 MyAAC
+ * @copyright 2017 MyAAC
- * @link      http://my-aac.org
+ * @link      http://my-aac.org
- */
+ */
-
+
-// uncomment if your php.ini have display_errors disabled and you want to see errors
+// uncomment if your php.ini have display_errors disabled and you want to see errors
-// ini_set('display_errors', 1);
+// ini_set('display_errors', 1);
-// ini_set('display_startup_errors', 1);
+// ini_set('display_startup_errors', 1);
-// error_reporting(E_ALL);
+// error_reporting(E_ALL);
-
+
-require_once('common.php');
+require_once('common.php');
-require_once(SYSTEM . 'functions.php');
+require_once(SYSTEM . 'functions.php');
-
+
-$uri = $_SERVER['REQUEST_URI'];
+$uri = $_SERVER['REQUEST_URI'];
-
+
-$tmp = BASE_DIR;
+$tmp = BASE_DIR;
-if(!empty($tmp))
+if(!empty($tmp))
-	$uri = str_replace(BASE_DIR . '/', '', $uri);
+	$uri = str_replace(BASE_DIR . '/', '', $uri);
-else
+else
-	$uri = str_replace_first('/', '', $uri);
+	$uri = str_replace_first('/', '', $uri);
-
+
-$uri = str_replace(array('index.php/', '?'), '', $uri);
+$uri = str_replace(array('index.php/', '?'), '', $uri);
-define('URI', $uri);
+define('URI', $uri);
-
+
-if(preg_match("/^[A-Za-z0-9-_%\'+]+\.png$/i", $uri)) {
+if(preg_match("/^[A-Za-z0-9-_%\'+]+\.png$/i", $uri)) {
-	$tmp = explode('.', $uri);
+	$tmp = explode('.', $uri);
-	$_REQUEST['name'] = urldecode($tmp[0]);
+	$_REQUEST['name'] = urldecode($tmp[0]);
-	
+
-	chdir(TOOLS . 'signature');
+	chdir(TOOLS . 'signature');
-	include(TOOLS . 'signature/index.php');
+	include(TOOLS . 'signature/index.php');
-	exit();
+	exit();
-}
+}
-else if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz|ttf|woff|ico)$/i", $_SERVER['REQUEST_URI'])) {
+else if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz|ttf|woff|ico)$/i", $_SERVER['REQUEST_URI'])) {
-	header("HTTP/1.0 404 Not Found");
+	header("HTTP/1.0 404 Not Found");
-	exit;
+	exit;
-}
+}
-
+
-if(file_exists(BASE . 'config.local.php'))
+require_once(BASE . 'config.local.php');
-	require_once(BASE . 'config.local.php');
+if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
-
+{
-if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
+	header('Location: ' . BASE_URL . 'install/');
-{
+	die('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
-	header('Location: ' . BASE_URL . 'install/');
+}
-	die('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
+
-}
+$found = false;
-
+if(empty($uri) || isset($_REQUEST['template'])) {
-$found = false;
+	$_REQUEST['p'] = 'news';
-if(empty($uri) || isset($_REQUEST['template'])) {
+	$found = true;
-	$_REQUEST['p'] = 'news';
+}
-	$found = true;
+else {
-}
+	$tmp = strtolower($uri);
-else {
+	if(!preg_match('/[^A-z0-9_\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $tmp . '.php')) {
-	$tmp = strtolower($uri);
+		$_REQUEST['p'] = $uri;
-	if(!preg_match('/[^A-z0-9_\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $tmp . '.php')) {
+		$found = true;
-		$_REQUEST['p'] = $uri;
+	}
-		$found = true;
+	else {
-	}
+		$rules = array(
-	else {
+			'/^account\/manage\/?$/' => array('subtopic' => 'accountmanagement'),
-		$rules = array(
+			'/^account\/create\/?$/' => array('subtopic' => 'createaccount'),
-			'/^account\/manage\/?$/' => array('subtopic' => 'accountmanagement'),
+			'/^account\/lost\/?$/' => array('subtopic' => 'lostaccount'),
-			'/^account\/create\/?$/' => array('subtopic' => 'createaccount'),
+			'/^account\/logout\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'logout'),
-			'/^account\/lost\/?$/' => array('subtopic' => 'lostaccount'),
+			'/^account\/password\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_password'),
-			'/^account\/logout\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'logout'),
+			'/^account\/register\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register'),
-			'/^account\/password\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_password'),
+			'/^account\/register\/new\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register_new'),
-			'/^account\/register\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register'),
+			'/^account\/email\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_email'),
-			'/^account\/register\/new\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register_new'),
+			'/^account\/info\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_info'),
-			'/^account\/email\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_email'),
+			'/^account\/character\/create\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'create_character'),
-			'/^account\/info\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_info'),
+			'/^account\/character\/name\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_name'),
-			'/^account\/character\/create\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'create_character'),
+			'/^account\/character\/sex\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_sex'),
-			'/^account\/character\/name\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_name'),
+			'/^account\/character\/delete\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'delete_character'),
-			'/^account\/character\/sex\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_sex'),
+			'/^account\/character\/comment\/[A-Za-z0-9-_%+\']+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment', 'name' => '$3'),
-			'/^account\/character\/delete\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'delete_character'),
+			'/^account\/character\/comment\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment'),
-			'/^account\/character\/comment\/[A-Za-z0-9-_%+\']+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment', 'name' => '$3'),
+			'/^account\/confirm_email\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'confirm_email', 'v' => '$2'),
-			'/^account\/character\/comment\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment'),
+			'/^characters\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'characters', 'name' => '$1'),
-			'/^account\/confirm_email\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'confirm_email', 'v' => '$2'),
+			'/^changelog\/[0-9]+\/?$/' => array('subtopic' => 'changelog', 'page' => '$1'),
-			'/^characters\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'characters', 'name' => '$1'),
+			'/^commands\/add\/?$/' => array('subtopic' => 'commands', 'action' => 'add'),
-			'/^changelog\/[0-9]+\/?$/' => array('subtopic' => 'changelog', 'page' => '$1'),
+			'/^commands\/edit\/?$/' => array('subtopic' => 'commands', 'action' => 'edit'),
-			'/^commands\/add\/?$/' => array('subtopic' => 'commands', 'action' => 'add'),
+			'/^faq\/add\/?$/' => array('subtopic' => 'faq', 'action' => 'add'),
-			'/^commands\/edit\/?$/' => array('subtopic' => 'commands', 'action' => 'edit'),
+			'/^faq\/edit\/?$/' => array('subtopic' => 'faq', 'action' => 'edit'),
-			'/^faq\/add\/?$/' => array('subtopic' => 'faq', 'action' => 'add'),
+			'/^forum\/add_board\/?$/' => array('subtopic' => 'forum', 'action' => 'add_board'),#
-			'/^faq\/edit\/?$/' => array('subtopic' => 'faq', 'action' => 'edit'),
+			'/^forum\/edit_board\/?$/' => array('subtopic' => 'forum', 'action' => 'edit_board'),
-			'/^forum\/add_board\/?$/' => array('subtopic' => 'forum', 'action' => 'add_board'),#
+			'/^forum\/board\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2'),
-			'/^forum\/edit_board\/?$/' => array('subtopic' => 'forum', 'action' => 'edit_board'),
+			'/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2', 'page' => '$3'),
-			'/^forum\/board\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2'),
+			'/^forum\/thread\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2'),
-			'/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2', 'page' => '$3'),
+			'/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2', 'page' => '$3'),
-			'/^forum\/thread\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2'),
+			'/^gallery\/add\/?$/' => array('subtopic' => 'gallery', 'action' => 'add'),
-			'/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2', 'page' => '$3'),
+			'/^gallery\/edit\/?$/' => array('subtopic' => 'gallery', 'action' => 'edit'),
-			'/^gallery\/add\/?$/' => array('subtopic' => 'gallery', 'action' => 'add'),
+			'/^gallery\/[0-9]+\/?$/' => array('subtopic' => 'gallery', 'image' => '$1'),
-			'/^gallery\/edit\/?$/' => array('subtopic' => 'gallery', 'action' => 'edit'),
+			'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
-			'/^gallery\/[0-9]+\/?$/' => array('subtopic' => 'gallery', 'image' => '$1'),
+			'/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'),
-			'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+			'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2', 'page' => '$3'),
-			'/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'),
+			'/^highscores\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'page' => '$2'),
-			'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2', 'page' => '$3'),
+			'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2'),
-			'/^highscores\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'page' => '$2'),
+			'/^highscores\/[A-Za-z0-9-_\']+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1'),
-			'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2'),
+			'/^news\/add\/?$/' => array('subtopic' => 'news', 'action' => 'add'),
-			'/^highscores\/[A-Za-z0-9-_\']+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1'),
+			'/^news\/edit\/?$/' => array('subtopic' => 'news', 'action' => 'edit'),
-			'/^news\/add\/?$/' => array('subtopic' => 'news', 'action' => 'add'),
+			'/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'),
-			'/^news\/edit\/?$/' => array('subtopic' => 'news', 'action' => 'edit'),
+			'/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'),
-			'/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'),
+			'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1'),
-			'/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'),
+			'/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'spells', 'vocation' => '$1', 'order' => '$2'),
-			'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1'),
+			'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
-			'/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'spells', 'vocation' => '$1', 'order' => '$2'),
+		);
-			'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+
-		);
+		foreach($rules as $rule => $redirect) {
-		
+			if (preg_match($rule, $uri)) {
-		foreach($rules as $rule => $redirect) {
+				$tmp = explode('/', $uri);
-			if (preg_match($rule, $uri)) {
+				foreach($redirect as $key => $value) {
-				$tmp = explode('/', $uri);
+
-				foreach($redirect as $key => $value) {
+					if(strpos($value, '$') !== false) {
-					
+						$value = str_replace('$' . $value[1], $tmp[$value[1]], $value);
-					if(strpos($value, '$') !== false) {
+					}
-						$value = str_replace('$' . $value[1], $tmp[$value[1]], $value);
+
-					}
+					$_REQUEST[$key] = $value;
-					
+					$_GET[$key] = $value;
-					$_REQUEST[$key] = $value;
+				}
-					$_GET[$key] = $value;
+
-				}
+				$found = true;
-				
+				break;
-				$found = true;
+			}
-				break;
+		}
-			}
+	}
-		}
+}
-	}
+
-}
+// define page visited, so it can be used within events system
-
+$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_REQUEST['p']) ? $_REQUEST['p'] : '');
-// define page visited, so it can be used within events system
+if(empty($page) || !preg_match('/^[A-z0-9\_\-]+$/', $page)) {
-$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_REQUEST['p']) ? $_REQUEST['p'] : '');
+	$tmp = URI;
-if(empty($page) || !preg_match('/^[A-z0-9\_\-]+$/', $page)) {
+	if(!empty($tmp)) {
-	$tmp = URI;
+		$page = $tmp;
-	if(!empty($tmp)) {
+	}
-		$page = $tmp;
+	else {
-	}
+		if(!$found)
-	else {
+			$page = '404';
-		if(!$found)
+		else
-			$page = '404';
+			$page = 'news';
-		else
+	}
-			$page = 'news';
+}
-	}
+
-}
+$page = strtolower($page);
-
+define('PAGE', $page);
-$page = strtolower($page);
+
-define('PAGE', $page);
+$template_place_holders = array();
-
+
-$template_place_holders = array();
+require_once(SYSTEM . 'init.php');
-
+require_once(SYSTEM . 'template.php');
-require_once(SYSTEM . 'init.php');
+require_once(SYSTEM . 'login.php');
-require_once(SYSTEM . 'template.php');
+require_once(SYSTEM . 'status.php');
-require_once(SYSTEM . 'login.php');
+
-require_once(SYSTEM . 'status.php');
+$twig->addGlobal('config', $config);
-
+$twig->addGlobal('status', $status);
-$twig->addGlobal('config', $config);
+
-$twig->addGlobal('status', $status);
+// verify myaac tables exists in database
-
+if(!tableExist('myaac_account_actions')) {
-// database migrations
+	die('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
-$tmp = '';
+}
-if(fetchDatabaseConfig('database_version', $tmp)) { // we got version
+
-	$tmp = (int)$tmp;
+// database migrations
-	if($tmp < DATABASE_VERSION) { // import if older
+$tmp = '';
-		for($i = $tmp + 1; $i <= DATABASE_VERSION; $i++) {
+if(fetchDatabaseConfig('database_version', $tmp)) { // we got version
-			require(SYSTEM . 'migrations/' . $i . '.php');
+	$tmp = (int)$tmp;
-			updateDatabaseConfig('database_version', $i);
+	if($tmp < DATABASE_VERSION) { // import if older
-		}
+		for($i = $tmp + 1; $i <= DATABASE_VERSION; $i++) {
-	}
+			require(SYSTEM . 'migrations/' . $i . '.php');
-}
+			updateDatabaseConfig('database_version', $i);
-else { // register first version
+		}
-	registerDatabaseConfig('database_version', 0);
+	}
-	for($i = 1; $i <= DATABASE_VERSION; $i++) {
+}
-		require(SYSTEM . 'migrations/' . $i . '.php');
+else { // register first version
-		updateDatabaseConfig('database_version', $i);
+	registerDatabaseConfig('database_version', 0);
-	}
+	for($i = 1; $i <= DATABASE_VERSION; $i++) {
-}
+		require(SYSTEM . 'migrations/' . $i . '.php');
-
+		updateDatabaseConfig('database_version', $i);
-// event system
+	}
-require_once(SYSTEM . 'hooks.php');
+}
-$hooks = new Hooks();
+
-$hooks->load();
+// event system
-$hooks->trigger(HOOK_STARTUP);
+require_once(SYSTEM . 'hooks.php');
-
+$hooks = new Hooks();
-// anonymous usage statistics
+$hooks->load();
-// sent only when user agrees
+$hooks->trigger(HOOK_STARTUP);
-if(isset($config['anonymous_usage_statistics']) && $config['anonymous_usage_statistics']) {
+
-	$report_time = 30 * 24 * 60 * 60; // report one time per 30 days
+// anonymous usage statistics
-	$should_report = true;
+// sent only when user agrees
-	
+if(isset($config['anonymous_usage_statistics']) && $config['anonymous_usage_statistics']) {
-	$value = '';
+	$report_time = 30 * 24 * 60 * 60; // report one time per 30 days
-	if($cache->enabled() && $cache->fetch('last_usage_report', $value)) {
+	$should_report = true;
-		$should_report = time() > (int)$value + $report_time;
+
-	}
+	$value = '';
-	else {
+	if($cache->enabled() && $cache->fetch('last_usage_report', $value)) {
-		$value = '';
+		$should_report = time() > (int)$value + $report_time;
-		if(fetchDatabaseConfig('last_usage_report', $value)) {
+	}
-			$should_report = time() > (int)$value + $report_time;
+	else {
-			if($cache->enabled()) {
+		$value = '';
-				$cache->set('last_usage_report', $value);
+		if(fetchDatabaseConfig('last_usage_report', $value)) {
-			}
+			$should_report = time() > (int)$value + $report_time;
-		}
+			if($cache->enabled()) {
-		else {
+				$cache->set('last_usage_report', $value);
-			registerDatabaseConfig('last_usage_report', time() - ($report_time - (7 * 24 * 60 * 60))); // first report after a week
+			}
-			$should_report = false;
+		}
-		}
+		else {
-	}
+			registerDatabaseConfig('last_usage_report', time() - ($report_time - (7 * 24 * 60 * 60))); // first report after a week
-	
+			$should_report = false;
-	if($should_report) {
+		}
-		require_once(LIBS . 'usage_statistics.php');
+	}
-		Usage_Statistics::report();
+
-		
+	if($should_report) {
-		updateDatabaseConfig('last_usage_report', time());
+		require_once(LIBS . 'usage_statistics.php');
-		if($cache->enabled()) {
+		Usage_Statistics::report();
-			$cache->set('last_usage_report', time());
+
-		}
+		updateDatabaseConfig('last_usage_report', time());
-	}
+		if($cache->enabled()) {
-}
+			$cache->set('last_usage_report', time());
-
+		}
-if($config['views_counter'])
+	}
-	require_once(SYSTEM . 'counter.php');
+}
-
+
-if($config['visitors_counter'])
+if($config['views_counter'])
-{
+	require_once(SYSTEM . 'counter.php');
-	require_once(SYSTEM . 'libs/visitors.php');
+
-	$visitors = new Visitors($config['visitors_counter_ttl']);
+if($config['visitors_counter'])
-}
+{
-
+	require_once(SYSTEM . 'libs/visitors.php');
-// page content loading
+	$visitors = new Visitors($config['visitors_counter_ttl']);
-if(!isset($content[0]))
+}
-	$content = '';
+
-$load_it = true;
+// page content loading
-
+if(!isset($content[0]))
-// check if site has been closed
+	$content = '';
-$site_closed = false;
+$load_it = true;
-if(fetchDatabaseConfig('site_closed', $site_closed)) {
+
-	$site_closed = ($site_closed == 1);
+// check if site has been closed
-	if($site_closed) {
+$site_closed = false;
-		if(!admin())
+if(fetchDatabaseConfig('site_closed', $site_closed)) {
-		{
+	$site_closed = ($site_closed == 1);
-			$title = getDatabaseConfig('site_closed_title');
+	if($site_closed) {
-			$content .= '<p class="note">' . getDatabaseConfig('site_closed_message') . '</p><br/>';
+		if(!admin())
-			$load_it = false;
+		{
-		}
+			$title = getDatabaseConfig('site_closed_title');
-
+			$content .= '<p class="note">' . getDatabaseConfig('site_closed_message') . '</p><br/>';
-		if(!$logged)
+			$load_it = false;
-		{
+		}
-			ob_start();
+
-			require(SYSTEM . 'pages/accountmanagement.php');
+		if(!$logged)
-			$content .= ob_get_contents();
+		{
-			ob_end_clean();
+			ob_start();
-			$load_it = false;
+			require(SYSTEM . 'pages/accountmanagement.php');
-		}
+			$content .= ob_get_contents();
-	}
+			ob_end_clean();
-}
+			$load_it = false;
-define('SITE_CLOSED', $site_closed);
+		}
-
+	}
-// backward support for gesior
+}
-if($config['backward_support']) {
+define('SITE_CLOSED', $site_closed);
-	define('INITIALIZED', true);
+
-	$SQL = $db;
+// backward support for gesior
-	$layout_header = template_header();
+if($config['backward_support']) {
-	$layout_name = $template_path;
+	define('INITIALIZED', true);
-	$news_content = '';
+	$SQL = $db;
-	$tickers_content = '';
+	$layout_header = template_header();
-	$subtopic = PAGE;
+	$layout_name = $template_path;
-	$main_content = '';
+	$news_content = '';
-	
+	$tickers_content = '';
-	$config['access_admin_panel'] = 2;
+	$subtopic = PAGE;
-	$group_id_of_acc_logged = 0;
+	$main_content = '';
-	if($logged && $account_logged)
+
-		$group_id_of_acc_logged = $account_logged->getGroupId();
+	$config['access_admin_panel'] = 2;
-
+	$group_id_of_acc_logged = 0;
-	$config['site'] = &$config;
+	if($logged && $account_logged)
-	$config['server'] = &$config['lua'];
+		$group_id_of_acc_logged = $account_logged->getGroupId();
-	$config['site']['shop_system'] = $config['gifts_system'];
+
-
+	$config['site'] = &$config;
-	if(!isset($config['vdarkborder']))
+	$config['server'] = &$config['lua'];
-		$config['vdarkborder'] = '#505050';
+	$config['site']['shop_system'] = $config['gifts_system'];
-	if(!isset($config['darkborder']))
+
-		$config['darkborder'] = '#D4C0A1';
+	if(!isset($config['vdarkborder']))
-	if(!isset($config['lightborder']))
+		$config['vdarkborder'] = '#505050';
-		$config['lightborder'] = '#F1E0C6';
+	if(!isset($config['darkborder']))
-
+		$config['darkborder'] = '#D4C0A1';
-	$config['site']['download_page'] = true;
+	if(!isset($config['lightborder']))
-	$config['site']['serverinfo_page'] = true;
+		$config['lightborder'] = '#F1E0C6';
-	$config['site']['screenshot_page'] = true;
+
-	
+	$config['site']['download_page'] = true;
-	if($config['forum'] != '')
+	$config['site']['serverinfo_page'] = true;
-		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? getLink('forum') : $config['forum']);
+	$config['site']['screenshot_page'] = true;
-
+
-	foreach($status as $key => $value)
+	if($config['forum'] != '')
-		$config['status']['serverStatus_' . $key] = $value;
+		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? getLink('forum') : $config['forum']);
-}
+
-
+	foreach($status as $key => $value)
-if($load_it)
+		$config['status']['serverStatus_' . $key] = $value;
-{
+}
-	if(SITE_CLOSED && admin())
+
-		$content .= '<p class="note">Site is under maintenance (closed mode). Only privileged users can see it.</p>';
+if($load_it)
-
+{
-	if($config['backward_support'])
+	if(SITE_CLOSED && admin())
-		require(SYSTEM . 'compat_pages.php');
+		$content .= '<p class="note">Site is under maintenance (closed mode). Only privileged users can see it.</p>';
-
+
-	$ignore = false;
+	if($config['backward_support'])
-
+		require(SYSTEM . 'compat_pages.php');
-	$logged_access = 1;
+
-	if($logged && $account_logged && $account_logged->isLoaded()) {
+	$ignore = false;
-		$logged_access = $account_logged->getAccess();
+
-	}
+	$logged_access = 1;
-
+	if($logged && $account_logged && $account_logged->isLoaded()) {
-	$query =
+		$logged_access = $account_logged->getAccess();
-		$db->query(
+	}
-			'SELECT `id`, `title`, `body`, `php`, `hidden`' .
+
-			' FROM `' . TABLE_PREFIX . 'pages`' .
+	$query =
-			' WHERE `name` LIKE ' . $db->quote($page) . ' AND `hidden` != 1 AND `access` <= ' . $db->quote($logged_access));
+		$db->query(
-	if($query->rowCount() > 0) // found page
+			'SELECT `id`, `title`, `body`, `php`, `hidden`' .
-	{
+			' FROM `' . TABLE_PREFIX . 'pages`' .
-		$ignore = true;
+			' WHERE `name` LIKE ' . $db->quote($page) . ' AND `hidden` != 1 AND `access` <= ' . $db->quote($logged_access));
-		$query = $query->fetch();
+	if($query->rowCount() > 0) // found page
-		$title = $query['title'];
+	{
-
+		$ignore = true;
-		if($query['php'] == '1') // execute it as php code
+		$query = $query->fetch();
-		{
+		$title = $query['title'];
-			$tmp = substr($query['body'], 0, 10);
+
-			if(($pos = strpos($tmp, '<?php')) !== false) {
+		if($query['php'] == '1') // execute it as php code
-				$tmp = preg_replace('/<\?php/', '', $query['body'], 1);
+		{
-			}
+			$tmp = substr($query['body'], 0, 10);
-			else if(($pos = strpos($tmp, '<?')) !== false) {
+			if(($pos = strpos($tmp, '<?php')) !== false) {
-				$tmp = preg_replace('/<\?/', '', $query['body'], 1);
+				$tmp = preg_replace('/<\?php/', '', $query['body'], 1);
-			}
+			}
-			else
+			else if(($pos = strpos($tmp, '<?')) !== false) {
-				$tmp = $query['body'];
+				$tmp = preg_replace('/<\?/', '', $query['body'], 1);
-
+			}
-			$php_errors = array();
+			else
-			function error_handler($errno, $errstr) {
+				$tmp = $query['body'];
-				global $php_errors;
+
-				$php_errors[] = array('errno' => $errno, 'errstr' => $errstr);
+			$php_errors = array();
-			}
+			function error_handler($errno, $errstr) {
-			set_error_handler('error_handler');
+				global $php_errors;
-
+				$php_errors[] = array('errno' => $errno, 'errstr' => $errstr);
-			ob_start();
+			}
-			eval($tmp);
+			set_error_handler('error_handler');
-			$content .= ob_get_contents();
+
-			ob_end_clean();
+			ob_start();
-
+			eval($tmp);
-			restore_error_handler();
+			$content .= ob_get_contents();
-			if(isset($php_errors[0]) && superAdmin()) {
+			ob_end_clean();
-				var_dump($php_errors);
+
-			}
+			restore_error_handler();
-		}
+			if(isset($php_errors[0]) && superAdmin()) {
-		else
+				var_dump($php_errors);
-			$content .= $query['body']; // plain html
+			}
-		
+		}
-		if(hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
+		else
-			$content = $twig->render('admin.pages.links.html.twig', array(
+			$content .= $query['body']; // plain html
-				'page' => array('id' => $query['id'], 'hidden' => $query['hidden'])
+
-			)) . $content;
+		if(hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
-		}
+			$content = $twig->render('admin.pages.links.html.twig', array(
-	}
+				'page' => array('id' => $query['id'], 'hidden' => $query['hidden'])
-	else
+			)) . $content;
-	{
+		}
-		$file = SYSTEM . 'pages/' . $page . '.php';
+	}
-		if(!@file_exists($file))
+	else
-		{
+	{
-			$page = '404';
+		$file = SYSTEM . 'pages/' . $page . '.php';
-			$file = SYSTEM . 'pages/404.php';
+		if(!@file_exists($file))
-		}
+		{
-	}
+			$page = '404';
-
+			$file = SYSTEM . 'pages/404.php';
-	ob_start();
+		}
-	if($hooks->trigger(HOOK_BEFORE_PAGE)) {
+	}
-		if(!$ignore)
+
-			require($file);
+	ob_start();
-	}
+	if($hooks->trigger(HOOK_BEFORE_PAGE)) {
-
+		if(!$ignore)
-	if($config['backward_support'] && isset($main_content[0]))
+			require($file);
-		$content .= $main_content;
+	}
-
+
-	$content .= ob_get_contents();
+	if($config['backward_support'] && isset($main_content[0]))
-	ob_end_clean();
+		$content .= $main_content;
-	$hooks->trigger(HOOK_AFTER_PAGE);
+
-}
+	$content .= ob_get_contents();
-
+	ob_end_clean();
-if($config['backward_support']) {
+	$hooks->trigger(HOOK_AFTER_PAGE);
-	$main_content = $content;
+}
-	if(!isset($title))
+
-		$title = ucfirst($page);
+if($config['backward_support']) {
-
+	$main_content = $content;
-	$topic = $title;
+	if(!isset($title))
-}
+		$title = ucfirst($page);
-
+
-$title_full =  (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName'];
+	$topic = $title;
-if(file_exists($template_path . '/index.php'))
+}
-	require($template_path . '/index.php');
+
-else if(file_exists($template_path . '/template.php')) // deprecated
+$title_full =  (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName'];
-	require($template_path . '/template.php');
+if(file_exists($template_path . '/index.php'))
-else if($config['backward_support'] && file_exists($template_path . '/layout.php'))
+	require($template_path . '/index.php');
-{
+else if(file_exists($template_path . '/template.php')) // deprecated
-	require($template_path . '/layout.php');
+	require($template_path . '/template.php');
-}
+else if($config['backward_support'] && file_exists($template_path . '/layout.php'))
-else
+{
-{
+	require($template_path . '/layout.php');
-	// TODO: save more info to log file
+}
-	die('ERROR: Cannot load template.');
+else
-}
+{
-
+	// TODO: save more info to log file
-echo '<!-- MyAAC ' . MYAAC_VERSION . ' :: http://www.my-aac.org/ -->' . "\n";
+	die('ERROR: Cannot load template.');
-if(superAdmin()) {
+}
-	echo '<!-- Generated in: ' . round(microtime(true) - START_TIME, 4) . 'ms -->';
+
-	echo PHP_EOL . '<!-- Queries done: ' . $db->queries() . ' -->';
+echo base64_decode('PCEtLSBQb3dlcmVkIGJ5IE15QUFDIDo6IGh0dHBzOi8vd3d3Lm15LWFhYy5vcmcvIC0tPg==') . PHP_EOL;
-	if(function_exists('memory_get_peak_usage')) {
+if(($config['debug_level'] & 1) == 1)
-		echo PHP_EOL . '<!-- Peak memory usage: ' . convert_bytes(memory_get_peak_usage(true)) . ' -->';
+	echo '<!-- Generated in :: ' . round(microtime(true) - START_TIME, 4) . ' -->';
-	}
+
-	
+if(($config['debug_level'] & 2) == 2)
-	if($config['database_log']) {
+	echo "\n" . '<!-- Queries done :: ' . $db->queries() . ' -->';
-		echo PHP_EOL . '<!-- Database Queries Done by MyAAC:' . PHP_EOL . $db->getLog() . '-->';
+
-	}
+if(($config['debug_level'] & 4) == 4 && function_exists('memory_get_peak_usage'))
-}
+	echo "\n" . '<!-- Peak memory usage: ' . convert_bytes(memory_get_peak_usage(true)) . ' -->';
-
+
-$hooks->trigger(HOOK_FINISH);
+$hooks->trigger(HOOK_FINISH);
-?>
+?>
--- a/install/includes/config.php
+++ b/install/includes/config.php
@@ -6,36 +6,36 @@ if(!isset($_SESSION['var_server_path'])) {
 	$error = true;
 }
-$config['server_path'] = $_SESSION['var_server_path'];
+	$config['server_path'] = $_SESSION['var_server_path'];
-// take care of trailing slash at the end
+	// take care of trailing slash at the end
-if($config['server_path'][strlen($config['server_path']) - 1] != '/')
+	if($config['server_path'][strlen($config['server_path']) - 1] != '/')
-	$config['server_path'] .= '/';
+		$config['server_path'] .= '/';
 if((!isset($error) || !$error) && !file_exists($config['server_path'] . 'config.lua')) {
-	error($locale['step_database_error_config']);
+		error($locale['step_database_error_config']);
-	$error = true;
+		$error = true;
-}
+	}
 if(!isset($error) || !$error) {
 	$config['lua'] = load_config_lua($config['server_path'] . 'config.lua');
 	if(isset($config['lua']['sqlType'])) // tfs 0.3
 		$config['database_type'] = $config['lua']['sqlType'];
 	else if(isset($config['lua']['mysqlHost'])) // tfs 0.2/1.0
 		$config['database_type'] = 'mysql';
 	else if(isset($config['lua']['database_type'])) // otserv
 		$config['database_type'] = $config['lua']['database_type'];
 	else if(isset($config['lua']['sql_type'])) // otserv
 		$config['database_type'] = $config['lua']['sql_type'];
-	$config['database_type'] = strtolower($config['database_type']);
+	if(!isset($error) || !$error) {
-	if(empty($config['database_type'])) {
+		$config['lua'] = load_config_lua($config['server_path'] . 'config.lua');
-		error($locale['step_database_error_database_empty']);
+		if(isset($config['lua']['sqlType'])) // tfs 0.3
-		$error = true;
+			$config['database_type'] = $config['lua']['sqlType'];
 		else if(isset($config['lua']['mysqlHost'])) // tfs 0.2/1.0
 			$config['database_type'] = 'mysql';
 		else if(isset($config['lua']['database_type'])) // otserv
 			$config['database_type'] = $config['lua']['database_type'];
 		else if(isset($config['lua']['sql_type'])) // otserv
 			$config['database_type'] = $config['lua']['sql_type'];
 		$config['database_type'] = strtolower($config['database_type']);
 		if(empty($config['database_type'])) {
 			error($locale['step_database_error_database_empty']);
 			$error = true;
 		}
 		else if($config['database_type'] != 'mysql') {
 			$locale['step_database_error_only_mysql'] = str_replace('$DATABASE_TYPE$', '<b>' . $config['database_type'] . '</b>', $locale['step_database_error_only_mysql']);
 			error($locale['step_database_error_only_mysql']);
 			$error = true;
 		}
 	}
 	else if($config['database_type'] != 'mysql') {
 		$locale['step_database_error_only_mysql'] = str_replace('$DATABASE_TYPE$', '<b>' . $config['database_type'] . '</b>', $locale['step_database_error_only_mysql']);
 		error($locale['step_database_error_only_mysql']);
 		$error = true;
 	}
 }
 ?>
--- a/install/includes/database.php
+++ b/install/includes/database.php
@@ -5,8 +5,8 @@ require(SYSTEM . 'libs/pot/OTS.php');
 $ots = POT::getInstance();
 require(SYSTEM . 'database.php');
-if($db->hasTable('accounts'))
+if(tableExist('accounts'))
-	define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
+	define('USE_ACCOUNT_NAME', fieldExist('name', 'accounts'));
 else
 	define('USE_ACCOUNT_NAME', false);
 ?>
--- a/install/includes/schema.sql
+++ b/install/includes/schema.sql
@@ -1,7 +1,7 @@
 CREATE TABLE `myaac_account_actions`
 (
 	`account_id` INT(11) NOT NULL,
-	`ip` INT(11) NOT NULL DEFAULT 0,
+	`ip` INT(10) UNSIGNED NOT NULL DEFAULT 0,
 	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
 	`date` INT(11) NOT NULL DEFAULT 0,
 	`action` VARCHAR(255) NOT NULL DEFAULT '',
--- a/install/index.php
+++ b/install/index.php
@@ -5,10 +5,7 @@ require('../common.php');
 require(SYSTEM . 'functions.php');
 require(BASE . 'install/includes/functions.php');
 require(BASE . 'install/includes/locale.php');
-require(SYSTEM . 'clients.conf.php');
+require(BASE . 'config.local.php');
 if(file_exists(BASE . 'config.local.php'))
 	require(BASE . 'config.local.php');
 // twig
 require_once LIBS . 'Twig/Autoloader.php';
@@ -20,100 +17,45 @@ $twig = new Twig_Environment($twig_loader, array(
 	'auto_reload' => true
 ));
 // load installation status
 $step = isset($_POST['step']) ? $_POST['step'] : 'welcome';
 $install_status = array();
 if(file_exists(CACHE . 'install.txt')) {
 	$install_status = unserialize(file_get_contents(CACHE . 'install.txt'));
 	if(!isset($_POST['step'])) {
 		$step = isset($install_status['step']) ? $install_status['step'] : '';
 	}
 }
 if(isset($_POST['vars']))
 {
-	foreach($_POST['vars'] as $key => $value) {
+	foreach($_POST['vars'] as $key => $value)
 		$_SESSION['var_' . $key] = $value;
 		$install_status[$key] = $value;
 	}
 }
 else {
 	foreach($install_status as $key => $value) {
 		$_SESSION['var_' . $key] = $value;
 	}
 }
-if($step == 'finish' && (!isset($config['installed']) || !$config['installed'])) {
+// step
-	$step = 'welcome';
+$step = isset($_POST['step']) ? $_POST['step'] : 'welcome';
 }
 // step verify
 $steps = array(1 => 'welcome', 2 => 'license', 3 => 'requirements', 4 => 'config', 5 => 'database', 6 => 'admin', 7 => 'finish');
 if(!in_array($step, $steps)) // check if step is valid
 	die('ERROR: Unknown step.');
 $install_status['step'] = $step;
 $errors = array();
-
+if($step == 'database')
-if($step == 'database') {
+{
-	foreach($_SESSION as $key => $value) {
+	foreach($_POST['vars'] as $key => $value)
-		if(strpos($key, 'var_') === false || strpos($key, 'account') !== false || strpos($key, 'password') !== false) {
+	{
-			continue;
+		if($key != 'usage' && empty($value))
-		}
+		{
 		$key = str_replace('var_', '', $key);
 		if($key != 'usage' && empty($value)) {
 			$errors[] = $locale['please_fill_all'];
 			break;
 		}
-		else if($key == 'server_path') {
+		else if($key == 'mail_admin' && !Validator::email($value))
-			$config['server_path'] = $value;
+		{
 			// take care of trailing slash at the end
 			if($config['server_path'][strlen($config['server_path']) - 1] != '/') {
 				$config['server_path'] .= '/';
 			}
 			if(!file_exists($config['server_path'] . 'config.lua')) {
 				$errors[] = $locale['step_database_error_config'];
 				break;
 			}
 		}
 		else if($key == 'mail_admin' && !Validator::email($value)) {
 			$errors[] = $locale['step_config_mail_admin_error'];
 			break;
 		}
-		else if($key == 'mail_address' && !Validator::email($value)) {
+		else if($key == 'mail_address' && !Validator::email($value))
 		{
 			$errors[] = $locale['step_config_mail_address_error'];
 			break;
 		}
 		else if($key == 'timezone' && !in_array($value, DateTimeZone::listIdentifiers())) {
 			$errors[] = $locale['step_config_timezone_error'];
 			break;
 		}
 		else if($key == 'client' && !in_array($value, $config['clients'])) {
 			$errors[] = $locale['step_config_client_error'];
 			break;
 		}
 	}
 	if(!empty($errors)) {
 		$step = 'config';
 	}
 }
 else if($step == 'admin') {
 	$config_failed = true;
 	if(file_exists(BASE . 'config.local.php') && isset($config['installed']) && $config['installed'] && isset($_SESSION['saved'])) {
 		$config_failed = false;
 	}
 	if($config_failed) {
 		$step = 'database';
 	}
 }
 else if($step == 'finish') {
 	// password
 	$password = $_SESSION['var_password'];
@@ -147,43 +89,16 @@ else if($step == 'finish') {
 	}
 }
 if(empty($errors)) {
 	file_put_contents(CACHE . 'install.txt', serialize($install_status));
 }
 $error = false;
 clearstatcache();
 if(is_writable(CACHE) && (MYAAC_OS != 'WINDOWS' || win_is_writable(CACHE))) {
-	if(!file_exists(BASE . 'install/ip.txt')) {
+	ob_start();
 		$content = warning('AAC installation is disabled. To enable it make file <b>ip.txt</b> in install/ directory and put there your IP.<br/>
 		Your IP is:<br /><b>' . $_SERVER['REMOTE_ADDR'] . '</b>', true);
 	}
 	else {
 		$file_content = trim(file_get_contents(BASE . 'install/ip.txt'));
 		$allow = false;
 		$listIP = preg_split('/\s+/', $file_content);
 		foreach($listIP as $ip) {
 			if($_SERVER['REMOTE_ADDR'] == $ip) {
 				$allow = true;
 			}
 		}
 		if(!$allow)
 		{
 			$content = warning('In file <b>install/ip.txt</b> must be your IP!<br/>
 			In file is:<br /><b>' . nl2br($file_content) . '</b><br/>
 			Your IP is:<br /><b>' . $_SERVER['REMOTE_ADDR'] . '</b>', true);
 		}
 		else {
 			ob_start();
-			$step_id = array_search($step, $steps);
+	$step_id = array_search($step, $steps);
-			require('steps/' . $step_id . '-' . $step . '.php');
+	require('steps/' . $step_id . '-' . $step . '.php');
-			$content = ob_get_contents();
+	$content = ob_get_contents();
-			ob_end_clean();
+	ob_end_clean();
 		}
 	}
 }
 else {
 	$content = error(file_get_contents(BASE . 'install/includes/twig_error.html'), true);
--- a/install/ip.txt
+++ b/install/ip.txt
@@ -1,3 +0,0 @@
 127.0.0.1
 127.0.0.2
 ::1
--- a/install/steps/3-requirements.php
+++ b/install/steps/3-requirements.php
@@ -22,11 +22,11 @@ function version_check($name, $ok, $info = '', $warning = false)
 $failed = false;
 // start validating
-version_check($locale['step_requirements_php_version'], (PHP_VERSION_ID >= 50300), PHP_VERSION);
+version_check($locale['step_requirements_php_version'], (PHP_VERSION_ID >= 50303), PHP_VERSION);
-foreach(array('images/guilds', 'images/houses', 'images/gallery') as $value)
+foreach(array('config.local.php', 'images/guilds', 'images/houses', 'images/gallery') as $value)
 {
-	$perms = (int) substr(decoct(fileperms(BASE . $value)), 2);
+	$is_writable = is_writable(BASE . $value);
-	version_check($locale['step_requirements_write_perms'] . ': ' . $value, $perms >= 660);
+	version_check($locale['step_requirements_write_perms'] . ': ' . $value, $is_writable);
 }
 $ini_register_globals = ini_get_bool('register_globals');
--- a/install/steps/4-config.php
+++ b/install/steps/4-config.php
@@ -1,8 +1,74 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
 $clients_list = array(
 	710,
 	740,
 	750,
 	760,
 	770,
 	772,
 	780,
 	7920,
 	800,
 	810,
 	821,
 	822,
 	831,
 	840,
 	841,
 	842,
 	850,
 	852,
 	853,
 	854,
 	855,
 	857,
 	860,
 	870,
 	900,
 	910,
 	920,
 	930,
 	940,
 	942,
 	944,
 	946,
 	950,
 	952,
 	953,
 	954,
 	960,
 	970,
 	980,
 	1000,
 	1010,
 	1021,
 	1031,
 	1034,
 	1041,
 	1050,
 	1053,
 	1054,
 	1058,
 	1075,
 	1077,
 	1079,
 	1080,
 	1090,
 	1093,
 	1094,
 	1095,
 	1096,
 	1097,
 	1098,
 	1100,
 );
 $clients = array();
-foreach($config['clients'] as $client) {
+foreach($clients_list as $client) {
 	$client_version = (string)($client / 100);
 	if(strpos($client_version, '.') == false)
 		$client_version .= '.0';
@@ -12,7 +78,6 @@ foreach($config['clients'] as $client) {
 echo $twig->render('install.config.html.twig', array(
 	'clients' => $clients,
 	'timezones' => DateTimeZone::listIdentifiers(),
 	'locale' => $locale,
 	'session' => $_SESSION,
 	'errors' => isset($errors) ? $errors : null,
--- a/install/steps/5-database.php
+++ b/install/steps/5-database.php
@@ -13,12 +13,6 @@ if(!isset($_SESSION['var_server_path'])) {
 if(!$error) {
 	$content = "<?php";
 	$content .= PHP_EOL;
 	$content .= '// place for your configuration directives, so you can later easily update myaac';
 	$content .= PHP_EOL;
 	$content .= '$config[\'installed\'] = true;';
 	$content .= PHP_EOL;
 	$content .= '$config[\'mail_enabled\'] = true;';
 	$content .= PHP_EOL;
 	foreach($_SESSION as $key => $value)
 	{
 		if(strpos($key, 'var_') !== false)
@@ -27,14 +21,14 @@ if(!$error) {
 			{
 				$value = str_replace("\\", "/", $value);
 				if($value[strlen($value) - 1] != '/')
-					$value .= '/';
+					$value .= "/";
 			}
 			if($key == 'var_usage') {
 				$content .= '$config[\'anonymous_usage_statistics\'] = ' . ((int)$value == 1 ? 'true' : 'false') . ';';
 				$content .= PHP_EOL;
 			}
-			else if($key != 'var_account' && $key != 'var_account_id' && $key != 'var_password' && $key != 'var_step') {
+			else if($key != 'var_account' && $key != 'var_account_id' && $key != 'var_password') {
 				$content .= '$config[\'' . str_replace('var_', '', $key) . '\'] = \'' . $value . '\';';
 				$content .= PHP_EOL;
 			}
@@ -47,12 +41,208 @@ if(!$error) {
 		success($locale['step_database_importing']);
 		require(BASE . 'install/includes/database.php');
-		echo $twig->render('install.installer.html.twig', array(
+		if(!tableExist('accounts')) {
-			'url' => 'tools/5-database.php',
+			$locale['step_database_error_table'] = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
-			'message' => $locale['loading_spinner']
+			error($locale['step_database_error_table']);
-		));
+			$error = true;
 		}
 		else if(!tableExist('players')) {
 			$locale['step_database_error_table'] = str_replace('$TABLE$', 'players', $locale['step_database_error_table']);
 			error($locale['step_database_error_table']);
 			$error = true;
 		}
 		else if(!tableExist('guilds')) {
 			$locale['step_database_error_table'] = str_replace('$TABLE$', 'guilds', $locale['step_database_error_table']);
 			error($locale['step_database_error_table']);
 			$error = true;
 		}
 		if(tableExist(TABLE_PREFIX . 'account_actions')) {
 			$locale['step_database_error_table_exist'] = str_replace('$TABLE$', TABLE_PREFIX . 'account_actions', $locale['step_database_error_table_exist']);
 			warning($locale['step_database_error_table_exist']);
 		}
 		else if(!$error) {
 			// import schema
 			try {
 				$db->query(file_get_contents(BASE . 'install/includes/schema.sql'));
 			}
 			catch(PDOException $error_) {
 				error($locale['step_database_error_schema'] . ' ' . $error_);
 				$error = true;
 			}
 			if(!$error) {
 				registerDatabaseConfig('database_version', DATABASE_VERSION);
 				$locale['step_database_success_schema'] = str_replace('$PREFIX$', TABLE_PREFIX, $locale['step_database_success_schema']);
 				success($locale['step_database_success_schema']);
 			}
 		}
 		if(!$error) {
 			if(fieldExist('key', 'accounts')) {
 				if(query("ALTER TABLE `accounts` MODIFY `key` VARCHAR(64) NOT NULL DEFAULT '';"))
 					success($locale['step_database_modifying_field'] . ' accounts.key...');
 			}
 			else {
 				if(query("ALTER TABLE `accounts` ADD `key` VARCHAR(64) NOT NULL DEFAULT '' AFTER `email`;"))
 					success($locale['step_database_adding_field'] . ' accounts.key...');
 			}
 			if(!fieldExist('blocked', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `blocked` TINYINT(1) NOT NULL DEFAULT FALSE COMMENT 'internal usage' AFTER `key`;"))
 					success($locale['step_database_adding_field'] . ' accounts.blocked...');
 			}
 			if(!fieldExist('created', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `created` INT(11) NOT NULL DEFAULT 0 AFTER `" . (fieldExist('group_id', 'accounts') ? 'group_id' : 'blocked') . "`;"))
 					success($locale['step_database_adding_field'] . ' accounts.created...');
 			}
 			if(!fieldExist('rlname', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `rlname` VARCHAR(255) NOT NULL DEFAULT '' AFTER `created`;"))
 					success($locale['step_database_adding_field'] . ' accounts.rlname...');
 			}
 			if(!fieldExist('location', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `location` VARCHAR(255) NOT NULL DEFAULT '' AFTER `rlname`;"))
 					success($locale['step_database_adding_field'] . ' accounts.location...');
 			}
 			if(!fieldExist('country', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `country` VARCHAR(3) NOT NULL DEFAULT '' AFTER `location`;"))
 					success($locale['step_database_adding_field'] . ' accounts.country...');
 			}
 			if(fieldExist('page_lastday', 'accounts')) {
 				if(query("ALTER TABLE `accounts` CHANGE `page_lastday` `web_lastlogin` INT(11) NOT NULL DEFAULT 0;")) {
 					$tmp = str_replace('$FIELD$', 'accounts.page_lastday', $locale['step_database_changing_field']);
 					$tmp = str_replace('$FIELD_NEW$', 'accounts.web_lastlogin', $tmp);
 					success($tmp);
 				}
 			}
 			else if(!fieldExist('web_lastlogin', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `web_lastlogin` INT(11) NOT NULL DEFAULT 0 AFTER `country`;"))
 					success($locale['step_database_adding_field'] . ' accounts.web_lastlogin...');
 			}
 			if(!fieldExist('web_flags', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `web_flags` INT(11) NOT NULL DEFAULT 0 AFTER `web_lastlogin`;"))
 					success($locale['step_database_adding_field'] . ' accounts.web_flags...');
 			}
 			if(!fieldExist('email_hash', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `email_hash` VARCHAR(32) NOT NULL DEFAULT '' AFTER `web_flags`;"))
 					success($locale['step_database_adding_field'] . ' accounts.email_hash...');
 			}
 			if(!fieldExist('email_verified', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `email_verified` TINYINT(1) NOT NULL DEFAULT 0 AFTER `email_hash`;"))
 					success($locale['step_database_adding_field'] . ' accounts.email_verified...');
 			}
 			if(!fieldExist('email_new', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `email_new` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email_hash`;"))
 					success($locale['step_database_adding_field'] . ' accounts.email_new...');
 			}
 			if(!fieldExist('email_new_time', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `email_new_time` INT(11) NOT NULL DEFAULT 0 AFTER `email_new`;"))
 					success($locale['step_database_adding_field'] . ' accounts.email_new_time...');
 			}
 			if(!fieldExist('email_code', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `email_code` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email_new_time`;"))
 					success($locale['step_database_adding_field'] . ' accounts.email_code...');
 			}
 			if(fieldExist('next_email', 'accounts')) {
 				if(!fieldExist('email_next', 'accounts')) {
 					if(query("ALTER TABLE `accounts` CHANGE `next_email` `email_next` INT(11) NOT NULL DEFAULT 0;")) {
 						$tmp = str_replace('$FIELD$', 'accounts.next_email', $locale['step_database_changing_field']);
 						$tmp = str_replace('$FIELD_NEW$', 'accounts.email_next', $tmp);
 						success($tmp);
 					}
 				}
 			}
 			else if(!fieldExist('email_next', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `email_next` INT(11) NOT NULL DEFAULT 0 AFTER `email_code`;"))
 					success($locale['step_database_adding_field'] . ' accounts.email_next...');
 			}
 			if(!fieldExist('premium_points', 'accounts')) {
 				if(query("ALTER TABLE `accounts` ADD `premium_points` INT(11) NOT NULL DEFAULT 0 AFTER `email_next`;"))
 					success($locale['step_database_adding_field'] . ' accounts.premium_points...');
 			}
 			if(fieldExist('motd', 'guilds')) {
 				if(query("ALTER TABLE `guilds` MODIFY `motd` VARCHAR(255) NOT NULL DEFAULT '';"))
 					success($locale['step_database_modifying_field'] . ' guilds.motd...');
 			}
 			if(!fieldExist('description', 'guilds')) {
 				if(query("ALTER TABLE `guilds` ADD `description` TEXT NOT NULL;"))
 					success($locale['step_database_adding_field'] . ' guilds.description...');
 			}
 			if(fieldExist('logo_gfx_name', 'guilds')) {
 				if(query("ALTER TABLE `guilds` CHANGE `logo_gfx_name` `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';")) {
 					$tmp = str_replace('$FIELD$', 'guilds.logo_gfx_name', $locale['step_database_changing_field']);
 					$tmp = str_replace('$FIELD_NEW$', 'guilds.logo_name', $tmp);
 					success($tmp);
 				}
 			}
 			else if(!fieldExist('logo_name', 'guilds')) {
 				if(query("ALTER TABLE `guilds` ADD `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';"))
 					success($locale['step_database_adding_field'] . ' guilds.logo_name...');
 			}
 			if(!fieldExist('created', 'players')) {
 				if(query("ALTER TABLE `players` ADD `created` INT(11) NOT NULL DEFAULT 0;"))
 					success($locale['step_database_adding_field'] . ' players.created...');
 			}
 			if(!fieldExist('deleted', 'players') && !fieldExist('deletion', 'players')) {
 				if(query("ALTER TABLE `players` ADD `deleted` TINYINT(1) NOT NULL DEFAULT 0;"))
 					success($locale['step_database_adding_field'] . ' players.comment...');
 			}
 			if(fieldExist('hide_char', 'players')) {
 				if(!fieldExist('hidden', 'players')) {
 					if(query("ALTER TABLE `players` CHANGE `hide_char` `hidden` TINYINT(1) NOT NULL DEFAULT 0;")) {
 						$tmp = str_replace('$FIELD$', 'players.hide_char', $locale['step_database_changing_field']);
 						$tmp = str_replace('$FIELD_NEW$', 'players.hidden', $tmp);
 						success($tmp);
 					}
 				}
 			}
 			else if(!fieldExist('hidden', 'players')) {
 				if(query("ALTER TABLE `players` ADD `hidden` TINYINT(1) NOT NULL DEFAULT 0;"))
 					success($locale['step_database_adding_field'] . ' players.hidden...');
 			}
 			if(!fieldExist('comment', 'players')) {
 				if(query("ALTER TABLE `players` ADD `comment` TEXT NOT NULL;"))
 					success($locale['step_database_adding_field'] . ' players.comment...');
 			}
 			if(fieldExist('rank_id', 'players')) {
 				if(query("ALTER TABLE players MODIFY `rank_id` INT(11) NOT NULL DEFAULT 0;"))
 					success($locale['step_database_modifying_field'] . ' players.rank_id...');
 				if(fieldExist('guildnick', 'players')) {
 					if(query("ALTER TABLE players MODIFY `guildnick` VARCHAR(255) NOT NULL DEFAULT '';")) {
 						success($locale['step_database_modifying_field'] . ' players.guildnick...');
 					}
 				}
 			}
 		}
 		if(!$error && (!isset($_SESSION['saved']))) {
 			$content .= '$config[\'installed\'] = true;';
 			$content .= PHP_EOL;
 			$content .= '$config[\'mail_enabled\'] = true;';
 			$content .= PHP_EOL;
 			if(!Validator::email($_SESSION['var_mail_admin'])) {
 				error($locale['step_config_mail_admin_error']);
 				$error = true;
@@ -69,21 +259,16 @@ if(!$error) {
 			$content .= '$config[\'session_prefix\'] = \'myaac_' . generateRandomString(8, true, false, true, false) . '_\';';
 			$content .= PHP_EOL;
 			$content .= '$config[\'cache_prefix\'] = \'myaac_' . generateRandomString(8, true, false, true, false) . '_\';';
-
+			$content .= PHP_EOL;
 			$saved = true;
 			if(!$error) {
 				$saved = file_put_contents(BASE . 'config.local.php', $content);
 			}
-			if($saved) {
+			$file = fopen(BASE . 'config.local.php', 'a+');
 			if($file) {
 				if(!$error) {
 					fwrite($file, $content);
 					$_SESSION['saved'] = true;
 				}
 			}
 			else {
 				$_SESSION['config_content'] = $content;
 				unset($_SESSION['saved']);
 				$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.local.php</b>', $locale['step_database_error_file']);
 				warning($locale['step_database_error_file'] . '<br/>
 					<textarea cols="70" rows="10">' . $content . '</textarea>');
--- a/install/steps/7-finish.php
+++ b/install/steps/7-finish.php
@@ -15,7 +15,7 @@ else {
 		$password = $_SESSION['var_password'];
-		$config_salt_enabled = $db->hasColumn('accounts', 'salt');
+		$config_salt_enabled = fieldExist('salt', 'accounts');
 		if($config_salt_enabled)
 		{
 			$salt = generateRandomString(10, false, true, true);
@@ -77,9 +77,9 @@ else {
 		$account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
 		$account_used->setCustomField('country', 'us');
-		if($db->hasColumn('accounts', 'group_id'))
+		if(fieldExist('group_id', 'accounts'))
 			$account_used->setCustomField('group_id', $groups->getHighestId());
-		if($db->hasColumn('accounts', 'type'))
+		if(fieldExist('type', 'accounts'))
 			$account_used->setCustomField('type', 5);
 		if(!$player_db->isLoaded())
@@ -114,11 +114,87 @@ else {
 				success($locale['step_database_created_news']);
 			}
 		}
 		$deleted = 'deleted';
 		if(fieldExist('deletion', 'players'))
 			$deleted = 'deletion';
 		$insert_into_players = "INSERT INTO `players` (`id`, `name`, `group_id`, `account_id`, `level`, `vocation`, `health`, `healthmax`, `experience`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `maglevel`, `mana`, `manamax`, `manaspent`, `soul`, `town_id`, `posx`, `posy`, `posz`, `conditions`, `cap`, `sex`, `lastlogin`, `lastip`, `save`, `lastlogout`, `balance`, `$deleted`, `created`, `hidden`, `comment`) VALUES ";
 		$success = true;
 		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Rook Sample'));
 		if($query->rowCount() == 0) {
 			if(!query($insert_into_players . "(null, 'Rook Sample', 1, " . getSession('account') . ", 1, 0, 150, 150, 4200, 118, 114, 38, 57, 130, 0, 0, 0, 0, 100, 1, 1000, 1000, 7, '', 400, 1, 1255179613, 2453925456, 1, 1255179614, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
 				$success = false;
 		}
 		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Sorcerer Sample'));
 		if($query->rowCount() == 0) {
 			if(!query($insert_into_players . "(null, 'Sorcerer Sample', 1, " . getSession('account') . ", 8, 1, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 1, 1000, 1000, 7, '', 470, 1, 1255179571, 2453925456, 1, 1255179612, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
 				$success = false;
 		}
 		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Druid Sample'));
 		if($query->rowCount() == 0) {
 			if(!query($insert_into_players . "(null, 'Druid Sample', 1, " . getSession('account') . ", 8, 2, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 1, 1000, 1000, 7, '', 470, 1, 1255179655, 2453925456, 1, 1255179658, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
 				$success = false;
 		}
 		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Paladin Sample'));
 		if($query->rowCount() == 0) {
 			if(!query($insert_into_players . "(null, 'Paladin Sample', 1, " . getSession('account') . ", 8, 3, 185, 185, 4200, 118, 114, 38, 57, 129, 0, 35, 35, 0, 100, 1, 1000, 1000, 7, '', 470, 1, 1255179854, 2453925456, 1, 1255179858, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
 				$success = false;
 		}
 		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Knight Sample'));
 		if($query->rowCount() == 0) {
 			if(!query($insert_into_players . "(null, 'Knight Sample', 1, " . getSession('account') . ", 8, 4, 185, 185, 4200, 118, 114, 38, 57, 131, 0, 35, 35, 0, 100, 1, 1000, 1000, 7, '', 470, 1, 1255179620, 2453925456, 1, 1255179654, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
 				$success = false;
 		}
 		if($success) {
 			success($locale['step_database_imported_players']);
 		}
-		echo $twig->render('install.installer.html.twig', array(
+		require(LIBS . 'creatures.php');
-			'url' => 'tools/7-finish.php',
+		if(Creatures::loadFromXML()) {
-			'message' => $locale['importing_spinner']
+			success($locale['step_database_loaded_monsters']);
-		));
+			
 			if(Creatures::getMonstersList()->hasErrors()) {
 				$locale['step_database_error_monsters'] = str_replace('$LOG$', 'system/logs/error.log', $locale['step_database_error_monsters']);
 				warning($locale['step_database_error_monsters']);
 			}
 		}
 		else {
 			error(Creatures::getLastError());
 		}
 		require(LIBS . 'spells.php');
 		if(Spells::loadFromXML()) {
 			success($locale['step_database_loaded_spells']);
 		}
 		else {
 			error(Spells::getLastError());
 		}
 		// update config.highscores_ids_hidden
 		$database_migration_20 = true;
 		require_once(SYSTEM . 'migrations/20.php');
 		$content = '';
 		if(!databaseMigration20($content)) {
 			$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.local.php</b>', $locale['step_database_error_file']);
 			warning($locale['step_database_error_file'] . '<br/>
 						<textarea cols="70" rows="10">' . $content . '</textarea>');
 		}
 		// add z_polls tables
 		require_once(SYSTEM . 'migrations/22.php');
 		$locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(ADMIN_URL, $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
 		$locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(BASE_URL, $locale['step_finish_homepage'], true), $locale['step_finish_desc']);
 		$locale['step_finish_desc'] = str_replace('$LINK$', generateLink('http://my-aac.org', 'http://my-aac.org', true), $locale['step_finish_desc']);
 		success($locale['step_finish_desc']);
 		if(!isset($_SESSION['installed'])) {
 			file_get_contents('http://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL));
@@ -130,9 +206,6 @@ else {
 				unset($_SESSION[$key]);
 		}
 		unset($_SESSION['saved']);
 		if(file_exists(CACHE . 'install.txt')) {
 			unlink(CACHE . 'install.txt');
 		}
 	}
 }
 ?>
--- a/install/template/template.php
+++ b/install/template/template.php
@@ -1,16 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="<?php echo $locale['direction']; ?>" lang="<?php echo $locale['lang']; ?>" xml:lang="<?php echo $locale['lang']; ?>">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $locale['encoding']; ?>" />
 	<title>MyAAC - <?php echo $locale['installation']; ?></title>
 	<link rel="stylesheet" type="text/css" href="template/style.css" />
 	<script type="text/javascript" src="<?php echo BASE_URL; ?>tools/jquery.js"></script>
 </head>
 <body>
 	<div id="wrapper">
 		<!--div class="buffer"-->
 			<div id="header">
-				<h1>MyAAC v<?php echo MYAAC_VERSION . ' ' . $locale['installation']; ?></h1>
+				<h1>MyAAC <?php echo $locale['installation']; ?></h1>
 			</div>
 			<div id="body">
--- a/install/tools/5-database.php
+++ b/install/tools/5-database.php
@@ -1,208 +0,0 @@
 <?php
 require_once('../../common.php');
 require(SYSTEM . 'functions.php');
 require(BASE . 'install/includes/functions.php');
 require(BASE . 'install/includes/locale.php');
 $error = false;
 require(BASE . 'install/includes/config.php');
 ini_set('max_execution_time', 300);
 ob_implicit_flush();
 ob_end_flush();
 if(!$error) {
 	require(BASE . 'install/includes/database.php');
 }
 if(!$db->hasTable('accounts')) {
 	$locale['step_database_error_table'] = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
 	error($locale['step_database_error_table']);
 	$error = true;
 }
 else if(!$db->hasTable('players')) {
 	$locale['step_database_error_table'] = str_replace('$TABLE$', 'players', $locale['step_database_error_table']);
 	error($locale['step_database_error_table']);
 	$error = true;
 }
 else if(!$db->hasTable('guilds')) {
 	$locale['step_database_error_table'] = str_replace('$TABLE$', 'guilds', $locale['step_database_error_table']);
 	error($locale['step_database_error_table']);
 	$error = true;
 }
 if($db->hasTable(TABLE_PREFIX . 'account_actions')) {
 	$locale['step_database_error_table_exist'] = str_replace('$TABLE$', TABLE_PREFIX . 'account_actions', $locale['step_database_error_table_exist']);
 	warning($locale['step_database_error_table_exist']);
 }
 else if(!$error) {
 	// import schema
 	try {
 		$db->query(file_get_contents(BASE . 'install/includes/schema.sql'));
 		registerDatabaseConfig('database_version', DATABASE_VERSION);
 		$locale['step_database_success_schema'] = str_replace('$PREFIX$', TABLE_PREFIX, $locale['step_database_success_schema']);
 		success($locale['step_database_success_schema']);
 	}
 	catch(PDOException $error_) {
 		error($locale['step_database_error_schema'] . ' ' . $error_);
 		$error = true;
 	}
 }
 if($error) {
 	return;
 }
 if($db->hasColumn('accounts', 'key')) {
 	if(query("ALTER TABLE `accounts` MODIFY `key` VARCHAR(64) NOT NULL DEFAULT '';"))
 		success($locale['step_database_modifying_field'] . ' accounts.key...');
 }
 else {
 	if(query("ALTER TABLE `accounts` ADD `key` VARCHAR(64) NOT NULL DEFAULT '' AFTER `email`;"))
 		success($locale['step_database_adding_field'] . ' accounts.key...');
 }
 if(!$db->hasColumn('accounts', 'blocked')) {
 	if(query("ALTER TABLE `accounts` ADD `blocked` TINYINT(1) NOT NULL DEFAULT FALSE COMMENT 'internal usage' AFTER `key`;"))
 		success($locale['step_database_adding_field'] . ' accounts.blocked...');
 }
 if(!$db->hasColumn('accounts', 'created')) {
 	if(query("ALTER TABLE `accounts` ADD `created` INT(11) NOT NULL DEFAULT 0 AFTER `" . ($db->hasColumn('accounts', 'group_id') ? 'group_id' : 'blocked') . "`;"))
 		success($locale['step_database_adding_field'] . ' accounts.created...');
 }
 if(!$db->hasColumn('accounts', 'rlname')) {
 	if(query("ALTER TABLE `accounts` ADD `rlname` VARCHAR(255) NOT NULL DEFAULT '' AFTER `created`;"))
 		success($locale['step_database_adding_field'] . ' accounts.rlname...');
 }
 if(!$db->hasColumn('accounts', 'location')) {
 	if(query("ALTER TABLE `accounts` ADD `location` VARCHAR(255) NOT NULL DEFAULT '' AFTER `rlname`;"))
 		success($locale['step_database_adding_field'] . ' accounts.location...');
 }
 if(!$db->hasColumn('accounts', 'country')) {
 	if(query("ALTER TABLE `accounts` ADD `country` VARCHAR(3) NOT NULL DEFAULT '' AFTER `location`;"))
 		success($locale['step_database_adding_field'] . ' accounts.country...');
 }
 if($db->hasColumn('accounts', 'page_lastday')) {
 	if(query("ALTER TABLE `accounts` CHANGE `page_lastday` `web_lastlogin` INT(11) NOT NULL DEFAULT 0;")) {
 		$tmp = str_replace('$FIELD$', 'accounts.page_lastday', $locale['step_database_changing_field']);
 		$tmp = str_replace('$FIELD_NEW$', 'accounts.web_lastlogin', $tmp);
 		success($tmp);
 	}
 }
 else if(!$db->hasColumn('accounts', 'web_lastlogin')) {
 	if(query("ALTER TABLE `accounts` ADD `web_lastlogin` INT(11) NOT NULL DEFAULT 0 AFTER `country`;"))
 		success($locale['step_database_adding_field'] . ' accounts.web_lastlogin...');
 }
 if(!$db->hasColumn('accounts', 'web_flags')) {
 	if(query("ALTER TABLE `accounts` ADD `web_flags` INT(11) NOT NULL DEFAULT 0 AFTER `web_lastlogin`;"))
 		success($locale['step_database_adding_field'] . ' accounts.web_flags...');
 }
 if(!$db->hasColumn('accounts', 'email_hash')) {
 	if(query("ALTER TABLE `accounts` ADD `email_hash` VARCHAR(32) NOT NULL DEFAULT '' AFTER `web_flags`;"))
 		success($locale['step_database_adding_field'] . ' accounts.email_hash...');
 }
 if(!$db->hasColumn('accounts', 'email_verified')) {
 	if(query("ALTER TABLE `accounts` ADD `email_verified` TINYINT(1) NOT NULL DEFAULT 0 AFTER `email_hash`;"))
 		success($locale['step_database_adding_field'] . ' accounts.email_verified...');
 }
 if(!$db->hasColumn('accounts', 'email_new')) {
 	if(query("ALTER TABLE `accounts` ADD `email_new` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email_hash`;"))
 		success($locale['step_database_adding_field'] . ' accounts.email_new...');
 }
 if(!$db->hasColumn('accounts', 'email_new_time')) {
 	if(query("ALTER TABLE `accounts` ADD `email_new_time` INT(11) NOT NULL DEFAULT 0 AFTER `email_new`;"))
 		success($locale['step_database_adding_field'] . ' accounts.email_new_time...');
 }
 if(!$db->hasColumn('accounts', 'email_code')) {
 	if(query("ALTER TABLE `accounts` ADD `email_code` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email_new_time`;"))
 		success($locale['step_database_adding_field'] . ' accounts.email_code...');
 }
 if($db->hasColumn('accounts', 'next_email')) {
 	if(!$db->hasColumn('accounts', 'email_next')) {
 		if(query("ALTER TABLE `accounts` CHANGE `next_email` `email_next` INT(11) NOT NULL DEFAULT 0;")) {
 			$tmp = str_replace('$FIELD$', 'accounts.next_email', $locale['step_database_changing_field']);
 			$tmp = str_replace('$FIELD_NEW$', 'accounts.email_next', $tmp);
 			success($tmp);
 		}
 	}
 }
 else if(!$db->hasColumn('accounts', 'email_next')) {
 	if(query("ALTER TABLE `accounts` ADD `email_next` INT(11) NOT NULL DEFAULT 0 AFTER `email_code`;"))
 		success($locale['step_database_adding_field'] . ' accounts.email_next...');
 }
 if(!$db->hasColumn('accounts', 'premium_points')) {
 	if(query("ALTER TABLE `accounts` ADD `premium_points` INT(11) NOT NULL DEFAULT 0 AFTER `email_next`;"))
 		success($locale['step_database_adding_field'] . ' accounts.premium_points...');
 }
 if(!$db->hasColumn('guilds', 'description')) {
 	if(query("ALTER TABLE `guilds` ADD `description` TEXT NOT NULL;"))
 		success($locale['step_database_adding_field'] . ' guilds.description...');
 }
 if($db->hasColumn('guilds', 'logo_gfx_name')) {
 	if(query("ALTER TABLE `guilds` CHANGE `logo_gfx_name` `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';")) {
 		$tmp = str_replace('$FIELD$', 'guilds.logo_gfx_name', $locale['step_database_changing_field']);
 		$tmp = str_replace('$FIELD_NEW$', 'guilds.logo_name', $tmp);
 		success($tmp);
 	}
 }
 else if(!$db->hasColumn('guilds', 'logo_name')) {
 	if(query("ALTER TABLE `guilds` ADD `logo_name` VARCHAR( 255 ) NOT NULL DEFAULT 'default.gif';"))
 		success($locale['step_database_adding_field'] . ' guilds.logo_name...');
 }
 if(!$db->hasColumn('players', 'created')) {
 	if(query("ALTER TABLE `players` ADD `created` INT(11) NOT NULL DEFAULT 0;"))
 		success($locale['step_database_adding_field'] . ' players.created...');
 }
 if(!$db->hasColumn('players', 'deleted') && !$db->hasColumn('players', 'deletion')) {
 	if(query("ALTER TABLE `players` ADD `deleted` TINYINT(1) NOT NULL DEFAULT 0;"))
 		success($locale['step_database_adding_field'] . ' players.comment...');
 }
 if($db->hasColumn('players', 'hide_char')) {
 	if(!$db->hasColumn('players', 'hidden')) {
 		if(query("ALTER TABLE `players` CHANGE `hide_char` `hidden` TINYINT(1) NOT NULL DEFAULT 0;")) {
 			$tmp = str_replace('$FIELD$', 'players.hide_char', $locale['step_database_changing_field']);
 			$tmp = str_replace('$FIELD_NEW$', 'players.hidden', $tmp);
 			success($tmp);
 		}
 	}
 }
 else if(!$db->hasColumn('players', 'hidden')) {
 	if(query("ALTER TABLE `players` ADD `hidden` TINYINT(1) NOT NULL DEFAULT 0;"))
 		success($locale['step_database_adding_field'] . ' players.hidden...');
 }
 if(!$db->hasColumn('players', 'comment')) {
 	if(query("ALTER TABLE `players` ADD `comment` TEXT NOT NULL;"))
 		success($locale['step_database_adding_field'] . ' players.comment...');
 }
 if($db->hasColumn('players', 'rank_id')) {
 	if(query("ALTER TABLE players MODIFY `rank_id` INT(11) NOT NULL DEFAULT 0;"))
 		success($locale['step_database_modifying_field'] . ' players.rank_id...');
 	if($db->hasColumn('players', 'guildnick')) {
 		if(query("ALTER TABLE players MODIFY `guildnick` VARCHAR(255) NOT NULL DEFAULT '';")) {
 			success($locale['step_database_modifying_field'] . ' players.guildnick...');
 		}
 	}
 }
--- a/install/tools/7-finish.php
+++ b/install/tools/7-finish.php
@@ -1,92 +0,0 @@
 <?php
 require_once('../../common.php');
 require(SYSTEM . 'functions.php');
 require(BASE . 'install/includes/functions.php');
 require(BASE . 'install/includes/locale.php');
 ini_set('max_execution_time', 300);
 ob_implicit_flush();
 ob_end_flush();
 if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
 	warning($locale['already_installed']);
 	return;
 }
 require(SYSTEM . 'init.php');
 $deleted = 'deleted';
 if($db->hasColumn('players', 'deletion'))
 	$deleted = 'deletion';
 $time = time();
 function insert_sample_if_not_exist($p) {
 	global $db, $success, $deleted, $time;
 	$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote($p['name']));
 	if($query->rowCount() == 0) {
 		if(!query("INSERT INTO `players` (`id`, `name`, `group_id`, `account_id`, `level`, `vocation`, `health`, `healthmax`, `experience`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `maglevel`, `mana`, `manamax`, `manaspent`, `soul`, `town_id`, `posx`, `posy`, `posz`, `conditions`, `cap`, `sex`, `lastlogin`, `lastip`, `save`, `lastlogout`, `balance`, `$deleted`, `created`, `hidden`, `comment`) VALUES (null, " . $db->quote($p['name']) . ", 1, " . getSession('account') . ", " . $p['level'] . ", " . $p['vocation_id'] . ", " . $p['health'] . ", " . $p['healthmax'] . ", " . $p['experience'] . ", 118, 114, 38, 57, " . $p['looktype'] . ", 0, " . $p['mana'] . ", " . $p['manamax'] . ", 0, " . $p['soul'] . ", 1, 1000, 1000, 7, '', " . $p['cap'] . ", 1, " . $time . ", 2130706433, 1, " . $time . ", 0, 0, " . $time . ", 1, '');"))
 			$success = false;
 	}
 }
 $success = true;
 insert_sample_if_not_exist(array('name' => 'Rook Sample', 'level' => 1, 'vocation_id' => 0, 'health' => 150, 'healthmax' => 150, 'experience' => 0, 'looktype' => 130, 'mana' => 0, 'manamax' => 0, 'soul' => 100, 'cap' => 400));
 insert_sample_if_not_exist(array('name' => 'Sorcerer Sample', 'level' => 8, 'vocation_id' => 1, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 130, 'mana' => 35, 'manamax' => 35, 'soul' => 100, 'cap' => 470));
 insert_sample_if_not_exist(array('name' => 'Druid Sample', 'level' => 8, 'vocation_id' => 2, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 130, 'mana' => 35, 'manamax' => 35, 'soul' => 100, 'cap' => 470));
 insert_sample_if_not_exist(array('name' => 'Paladin Sample', 'level' => 8, 'vocation_id' => 3, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 129, 'mana' => 35, 'manamax' => 35, 'soul' => 100, 'cap' => 470));
 insert_sample_if_not_exist(array('name' => 'Knight Sample', 'level' => 8, 'vocation_id' => 4, 'health' => 185, 'healthmax' => 185, 'experience' => 4200, 'looktype' => 131, 'mana' => 35, 'manamax' => 35, 'soul' => 100, 'cap' => 470));
 if($success) {
 	success($locale['step_database_imported_players']);
 }
 require(LIBS . 'items.php');
 if(Items::loadFromXML())
 	success($locale['step_database_loaded_items']);
 else
 	error(Items::getError());
 require(LIBS . 'weapons.php');
 if(Weapons::loadFromXML())
 	success($locale['step_database_loaded_weapons']);
 else
 	error(Weapons::getError());
 require(LIBS . 'creatures.php');
 if(Creatures::loadFromXML()) {
 	success($locale['step_database_loaded_monsters']);
 	if(Creatures::getMonstersList()->hasErrors()) {
 		$locale['step_database_error_monsters'] = str_replace('$LOG$', 'system/logs/error.log', $locale['step_database_error_monsters']);
 		warning($locale['step_database_error_monsters']);
 	}
 }
 else {
 	error(Creatures::getLastError());
 }
 require(LIBS . 'spells.php');
 if(Spells::loadFromXML()) {
 	success($locale['step_database_loaded_spells']);
 }
 else {
 	error(Spells::getLastError());
 }
 // update config.highscores_ids_hidden
 require_once(SYSTEM . 'migrations/20.php');
 $database_migration_20 = true;
 $content = '';
 if(!databaseMigration20($content)) {
 	$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.local.php</b>', $locale['step_database_error_file']);
 	warning($locale['step_database_error_file'] . '<br/>
 				<textarea cols="70" rows="10">' . $content . '</textarea>');
 }
 $locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
 $locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']);
 $locale['step_finish_desc'] = str_replace('$LINK$', generateLink('http://my-aac.org', 'http://my-aac.org', true), $locale['step_finish_desc']);
 success($locale['step_finish_desc']);
--- a/install/tools/installer.js
+++ b/install/tools/installer.js
@@ -1,40 +0,0 @@
 function performInstall(url) {
 	var lastResponseLength = false;
 	var lastId = 1;
 	var ajaxRequest = $.ajax({
 		type: 'get',
 		url: url,
 		data: {},
 		dataType: 'html',
 		processData: false,
 		xhrFields: {
 			// Getting on progress streaming response
 			onprogress: function (e) {
 				var progressResponse;
 				var response = e.currentTarget.response;
 				progressResponse = response;
 				if (lastResponseLength === false) {
 					progressResponse = response;
 					lastResponseLength = response.length;
 				}
 				else {
 					progressResponse = response.substring(lastResponseLength);
 					lastResponseLength = response.length;
 				}
 				$('<div id="success-' + (lastId + 1) + '">' + progressResponse + '</div>').insertAfter("#success-" + lastId);
 				lastId = lastId + 1;
 			}
 		}
 	});
 	// On completed
 	ajaxRequest.done(function(data) {
 		$('#spinner').hide();
 	});
 	// On failed
 	ajaxRequest.fail(function(error){
 		console.log('Error: ', error);
 		$('<span class="error">Error while doing AJAX request. Please refresh the page.</span>').insertAfter("#success-" + lastId);
 	});
 }
--- a/plugins/example.json
+++ b/plugins/example.json
@@ -6,21 +6,13 @@
 	"contact": "nobody@example.org",
 	"require": {
 		"myaac": "0.4.3",
-		"myaac_": ">=0.7,<1.0", // support for defining versions like in composer (since 0.8.0)
+		"php": "5.2.0"
 		"php": "5.2.0",
 		"php_": ">5.4,<7.0", // support for defining versions like in composer (since 0.8.0)
 		"database": "21"
 	},
 	"install": "plugins/example/install.php",
 	"uninstall": [
 		"plugins/example.json",
-		"plugins/example-directory",
+		"plugins/example/install.php",
-		"templates/other-directory"
+		"plugins/example/before.php"
 		/***
 		 this is example of multi line comment
 		 	1. list example
 		 	2. something
 		 ****/
 	],
 	"hooks": {
 		"Example Hook": {
--- a/robots.txt
+++ b/robots.txt
@@ -0,0 +1,2 @@
 User-agent: *
 Disallow:
--- a/system/bin/install_plugin.php
+++ b/system/bin/install_plugin.php
@@ -29,7 +29,7 @@ if(Plugins::install($path_to_file)) {
 		echo 'WARNING: ' . $warning;
 	}
-	$info = Plugins::getPlugin();
+	$info = Plugins::getPluginInfo();
 	echo (isset($info['name']) ? $info['name'] . ' p' : 'P') . 'lugin has been successfully installed.';
 }
 else
--- a/system/clients.conf.php
+++ b/system/clients.conf.php
@@ -1,78 +0,0 @@
 <?php
 /**
 * List of clients
 *
 * @package   MyAAC
 * @author    Slawkens <slawkens@gmail.com>
 * @copyright 2017 MyAAC
 * @link      http://my-aac.org
 */
 defined('MYAAC') or die('Direct access not allowed!');
 $config['clients'] = array(
 	710,
 	740,
 	750,
 	760,
 	770,
 	772,
 	780,
 	792,
 	800,
 	810,
 	821,
 	822,
 	831,
 	840,
 	841,
 	842,
 	850,
 	852,
 	853,
 	854,
 	855,
 	857,
 	860,
 	870,
 	900,
 	910,
 	920,
 	930,
 	940,
 	942,
 	944,
 	946,
 	950,
 	952,
 	953,
 	954,
 	960,
 	970,
 	980,
 	1000,
 	1010,
 	1021,
 	1031,
 	1034,
 	1041,
 	1050,
 	1053,
 	1054,
 	1058,
 	1075,
 	1077,
 	1079,
 	1080,
 	1090,
 	1093,
 	1094,
 	1095,
 	1096,
 	1097,
 	1098,
 	1100,
 );
 ?>
--- a/system/compat.php
+++ b/system/compat.php
@@ -60,16 +60,4 @@ function check_guild_name($name, &$errors = '') {
 function news_place() {
 	return tickers();
 }
 function tableExist($table)
 {
 	global $db;
 	return $db->hasTable($table);
 }
 function fieldExist($field, $table)
 {
 	global $db;
 	return $db->hasColumn($table, $field);
 }
 ?>
--- a/system/database.php
+++ b/system/database.php
@@ -76,17 +76,13 @@ defined('MYAAC') or die('Direct access not allowed!');
 	if(isset($config['lua']['useMD5Passwords']) && getBoolean($config['lua']['useMD5Passwords']))
 		$config['database_encryption'] = 'md5';
 	if(!isset($config['database_log'])) {
 		$config['database_log'] = false;
 	}
 	try {
-		$ots->connect(array(
+		$ots->connect(POT::DB_MYSQL,
 			array(
 				'host' => $config['database_host'],
 				'user' => $config['database_user'],
 				'password' => $config['database_password'],
-				'database' => $config['database_name'],
+				'database' => $config['database_name']
 				'log' => $config['database_log']
 			)
 		);
 	}
--- a/system/functions.php
+++ b/system/functions.php
@@ -69,7 +69,7 @@ function getPlayerLink($name, $generate = true)
 	if(is_numeric($name))
 	{
-		$player = new OTS_Player();
+		$player = $ots->createObject('Player');
 		$player->load(intval($name));
 		if($player->isLoaded())
 			$name = $player->getName();
@@ -308,6 +308,22 @@ function encrypt($str)
 	return $str;
 }
 function tableExist($table)
 {
 	global $db, $config;
 	$query = $db->query("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = " . $db->quote($config['database_name']) . " AND `TABLE_NAME` = " . $db->quote($table) . ";");
 	return $query->rowCount() > 0;
 }
 function fieldExist($field, $table)
 {
 	global $db;
 	if(count($db->query("SHOW COLUMNS FROM `" . $table . "` LIKE '" . $field . "'")->fetchAll()))
 		return true;
 	return false;
 }
 //delete player with name
 function delete_player($name)
 {
@@ -366,9 +382,9 @@ function delete_guild($id)
 		global $db, $ots;
 		foreach($rank_list as $rank_in_guild) {
-			if($db->hasTable('guild_members'))
+			if(tableExist('guild_members'))
 				$players_with_rank = $db->query('SELECT `players`.`id` as `id`, `guild_members`.`rank_id` as `rank_id` FROM `players`, `guild_members` WHERE `guild_members`.`rank_id` = ' . $rank_in_guild->getId() . ' AND `players`.`id` = `guild_members`.`player_id` ORDER BY `name`;');
-			else if($db->hasTable('guild_membership'))
+			else if(tableExist('guild_membership'))
 				$players_with_rank = $db->query('SELECT `players`.`id` as `id`, `guild_membership`.`rank_id` as `rank_id` FROM `players`, `guild_membership` WHERE `guild_membership`.`rank_id` = ' . $rank_in_guild->getId() . ' AND `players`.`id` = `guild_membership`.`player_id` ORDER BY `name`;');
 			else
 				$players_with_rank = $db->query('SELECT `id`, `rank_id` FROM `players` WHERE `rank_id` = ' . $rank_in_guild->getId() . ' AND `deleted` = 0;');
@@ -376,7 +392,7 @@ function delete_guild($id)
 			$players_with_rank_number = $players_with_rank->rowCount();
 			if($players_with_rank_number > 0) {
 				foreach($players_with_rank as $result) {
-					$player = new OTS_Player();
+					$player = $ots->createObject('Player');
 					$player->load($result['id']);
 					if(!$player->isLoaded())
 						continue;
@@ -457,7 +473,7 @@ function template_header($is_admin = false)
 	$ret .= '
 	<meta name="description" content="' . $config['meta_description'] . '" />
 	<meta name="keywords" content="' . $config['meta_keywords'] . ', myaac, wodzaac" />
-	<meta name="generator" content="MyAAC ' . MYAAC_VERSION . '" />
+	<meta name="generator" content="MyAAC" />
 	<link rel="stylesheet" type="text/css" href="' . BASE_URL . 'tools/messages.css" />
 	<script type="text/javascript" src="' . BASE_URL . 'tools/jquery.js"></script>
 	<noscript>
@@ -553,7 +569,7 @@ function getCreatureName($killer, $showStatus = false, $extendedInfo = false)
 	if(is_numeric($killer))
 	{
-		$player = new OTS_Player();
+		$player = $ots->createObject('Player');
 		$player->load($killer);
 		if($player->isLoaded())
 		{
@@ -794,11 +810,16 @@ function getWorldName($id)
 */
 function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 {
 	/** @var PHPMailer $mailer */
 	global $mailer, $config;
 	if(!$mailer)
 	{
 		require(SYSTEM . 'libs/phpmailer/PHPMailerAutoload.php');
 		$mailer = new PHPMailer();
 		$mailer->setLanguage('en', LIBS . 'phpmailer/language/');
 	}
 	else {
 		$mailer->clearAllRecipients();
 	}
 	$signature_html = '';
@@ -806,9 +827,9 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 		$signature_html = $config['mail_signature']['html'];
 	if($add_html_tags && isset($body[0]))
-		$tmp_body = '<html><head></head><body>' . $body . '<br/><br/>' . $signature_html . '</body></html>';
+		$body = '<html><head></head><body>' . $body . '<br/><br/>' . $signature_html . '</body></html>';
 	else
-		$tmp_body .= '<br/><br/>' . $signature_html;
+		$body .= '<br/><br/>' . $signature_html;
 	if($config['smtp_enabled'])
 	{
@@ -818,6 +839,7 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 		$mailer->SMTPAuth = $config['smtp_auth'];
 		$mailer->Username = $config['smtp_user'];
 		$mailer->Password = $config['smtp_pass'];
 		$mailer->SMTPSecure = isset($config['smtp_secure']) ? $config['smtp_secure'] : '';
 	}
 	else
 		$mailer->IsMail();
@@ -829,7 +851,7 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 	$mailer->FromName = $config['lua']['serverName'];
 	$mailer->Subject = $subject;
 	$mailer->AddAddress($to);
-	$mailer->Body = $tmp_body;
+	$mailer->Body = $body;
 	$signature_plain = '';
 	if(isset($config['mail_signature']['plain']))
@@ -837,9 +859,6 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 	if(isset($altBody[0]))
 		$mailer->AltBody = $altBody . $signature_plain;
 	else { // automatically generate plain html
 		$mailer->AltBody = strip_tags(preg_replace('/<a(.*)href="([^"]*)"(.*)>/','$2', $body)) . "\n" . $signature_plain;
 	}
 	return $mailer->Send();
 }
@@ -902,6 +921,10 @@ function load_config_lua($filename)
 						$result[$key] = (string) substr(substr($value, 1), 0, -1);
 					elseif(in_array($value, array('true', 'false')))
 						$result[$key] = ($value == 'true') ? true : false;
 					elseif(substr($value, 0 , 1) == '{' && substr($value, -1 , 1) == '}') {
 						// arrays are not supported yet
 						// just ignore the error
 					}
 					else
 					{
 						foreach($result as $tmp_key => $tmp_value) // load values definied by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
@@ -961,10 +984,10 @@ function getTopPlayers($limit = 5) {
 	if($fetch_from_db)
 	{
 		$deleted = 'deleted';
-		if($db->hasColumn('players', 'deletion'))
+		if(fieldExist('deletion', 'players'))
 			$deleted = 'deletion';
-		$is_tfs10 = $db->hasTable('players_online');
+		$is_tfs10 = tableExist('players_online');
 		$players = $db->query('SELECT `id`, `name`, `level`, `experience`' . ($is_tfs10 ? '' : ', `online`') . ' FROM `players` WHERE `group_id` < ' . $config['highscores_groups_hidden'] . ' AND `id` NOT IN (' . implode(', ', $config['highscores_ids_hidden']) . ') AND `' . $deleted . '` = 0 AND `account_id` != 1 ORDER BY `experience` DESC LIMIT ' . (int)$limit)->fetchAll();
 		if($is_tfs10) {
--- a/system/hooks.php
+++ b/system/hooks.php
@@ -42,12 +42,12 @@ class Hook
 			$ret = $tmp($params);
 		}*/
-		global $db, $config, $template_path, $ots, $content;
+		global $db, $config, $template_path, $ots, $content, $twig;
 		if(file_exists(BASE . $this->_file)) {
-			require(BASE . $this->_file);
+			$ret = require(BASE . $this->_file);
 		}
-		return true;
+		return $ret === null || $ret == 1 || $ret;
 	}
 	public function name() {return $this->_name;}
@@ -71,11 +71,17 @@ class Hooks
 		if(isset(self::$_hooks[$type]))
 		{
 			foreach(self::$_hooks[$type] as $name => $hook)
-				$ret = $hook->execute($params);
+				if(!$hook->execute($params)) {
 					$ret = false;
 				}
 		}
 		return $ret;
 	}
 	public function exist($type) {
 		return isset(self::$_hooks[$type]);
 	}
 	public function load()
 	{
--- a/system/init.php
+++ b/system/init.php
@@ -38,8 +38,7 @@ Twig_Autoloader::register();
 $twig_loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');
 $twig = new Twig_Environment($twig_loader, array(
 	'cache' => CACHE . 'twig/',
-	'auto_reload' => true,
+	'auto_reload' => true
 	//'debug' => true
 ));
 $function = new Twig_SimpleFunction('getStyle', function ($i) {
@@ -164,7 +163,7 @@ require_once(SYSTEM . 'libs/pot/OTS.php');
 $ots = POT::getInstance();
 require_once(SYSTEM . 'database.php');
-define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
+define('USE_ACCOUNT_NAME', fieldExist('name', 'accounts'));
 // load vocation names
 $tmp = '';
 if($cache->enabled() && $cache->fetch('vocations', $tmp)) {
--- a/system/libs/Twig/Autoloader.php
+++ b/system/libs/Twig/Autoloader.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -13,15 +13,13 @@
 * Autoloads Twig classes.
 *
 * @author Fabien Potencier <fabien@symfony.com>
 *
 * @deprecated since 1.21 and will be removed in 2.0. Use Composer instead. 2.0.
 */
 class Twig_Autoloader
 {
    /**
     * Registers Twig_Autoloader as an SPL autoloader.
     *
-     * @param bool $prepend whether to prepend the autoloader or not
+     * @param bool $prepend Whether to prepend the autoloader or not.
     */
    public static function register($prepend = false)
    {
@@ -35,7 +33,7 @@ class Twig_Autoloader
    /**
     * Handles autoloading of classes.
     *
-     * @param string $class a class name
+     * @param string $class A class name.
     */
    public static function autoload($class)
    {
--- a/system/libs/Twig/BaseNodeVisitor.php
+++ b/system/libs/Twig/BaseNodeVisitor.php
@@ -16,6 +16,9 @@
 */
 abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
 {
    /**
     * {@inheritdoc}
     */
    final public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
    {
        if (!$node instanceof Twig_Node) {
@@ -25,6 +28,9 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
        return $this->doEnterNode($node, $env);
    }
    /**
     * {@inheritdoc}
     */
    final public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
    {
        if (!$node instanceof Twig_Node) {
@@ -37,6 +43,9 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
    /**
     * Called before child nodes are visited.
     *
     * @param Twig_Node         $node The node to visit
     * @param Twig_Environment  $env  The Twig environment instance
     *
     * @return Twig_Node The modified node
     */
    abstract protected function doEnterNode(Twig_Node $node, Twig_Environment $env);
@@ -44,11 +53,10 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
    /**
     * Called after child nodes are visited.
     *
     * @param Twig_Node        $node The node to visit
     * @param Twig_Environment $env  The Twig environment instance
     *
     * @return Twig_Node|false The modified node or false if the node must be removed
     */
    abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
 }
 class_alias('Twig_BaseNodeVisitor', 'Twig\NodeVisitor\AbstractNodeVisitor', false);
 class_exists('Twig_Environment');
 class_exists('Twig_Node');
--- a/system/libs/Twig/Cache/Filesystem.php
+++ b/system/libs/Twig/Cache/Filesystem.php
@@ -1,93 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * Implements a cache on the filesystem.
 *
 * @author Andrew Tch <andrew@noop.lv>
 */
 class Twig_Cache_Filesystem implements Twig_CacheInterface
 {
    const FORCE_BYTECODE_INVALIDATION = 1;
    private $directory;
    private $options;
    /**
     * @param $directory string The root cache directory
     * @param $options   int    A set of options
     */
    public function __construct($directory, $options = 0)
    {
        $this->directory = rtrim($directory, '\/').'/';
        $this->options = $options;
    }
    public function generateKey($name, $className)
    {
        $hash = hash('sha256', $className);
        return $this->directory.$hash[0].$hash[1].'/'.$hash.'.php';
    }
    public function load($key)
    {
        if (file_exists($key)) {
            @include_once $key;
        }
    }
    public function write($key, $content)
    {
        $dir = dirname($key);
        if (!is_dir($dir)) {
            if (false === @mkdir($dir, 0777, true)) {
                if (PHP_VERSION_ID >= 50300) {
                    clearstatcache(true, $dir);
                }
                if (!is_dir($dir)) {
                    throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
                }
            }
        } elseif (!is_writable($dir)) {
            throw new RuntimeException(sprintf('Unable to write in the cache directory (%s).', $dir));
        }
        $tmpFile = tempnam($dir, basename($key));
        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $key)) {
            @chmod($key, 0666 & ~umask());
            if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
                // Compile cached file into bytecode cache
                if (function_exists('opcache_invalidate')) {
                    opcache_invalidate($key, true);
                } elseif (function_exists('apc_compile_file')) {
                    apc_compile_file($key);
                }
            }
            return;
        }
        throw new RuntimeException(sprintf('Failed to write cache file "%s".', $key));
    }
    public function getTimestamp($key)
    {
        if (!file_exists($key)) {
            return 0;
        }
        return (int) @filemtime($key);
    }
 }
 class_alias('Twig_Cache_Filesystem', 'Twig\Cache\FilesystemCache', false);
--- a/system/libs/Twig/Cache/Null.php
+++ b/system/libs/Twig/Cache/Null.php
@@ -1,40 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * Implements a no-cache strategy.
 *
 * @final
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
 class Twig_Cache_Null implements Twig_CacheInterface
 {
    public function generateKey($name, $className)
    {
        return '';
    }
    public function write($key, $content)
    {
    }
    public function load($key)
    {
    }
    public function getTimestamp($key)
    {
        return 0;
    }
 }
 class_alias('Twig_Cache_Null', 'Twig\Cache\NullCache', false);
--- a/system/libs/Twig/CacheInterface.php
+++ b/system/libs/Twig/CacheInterface.php
@@ -1,58 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * Interface implemented by cache classes.
 *
 * It is highly recommended to always store templates on the filesystem to
 * benefit from the PHP opcode cache. This interface is mostly useful if you
 * need to implement a custom strategy for storing templates on the filesystem.
 *
 * @author Andrew Tch <andrew@noop.lv>
 */
 interface Twig_CacheInterface
 {
    /**
     * Generates a cache key for the given template class name.
     *
     * @param string $name      The template name
     * @param string $className The template class name
     *
     * @return string
     */
    public function generateKey($name, $className);
    /**
     * Writes the compiled template to cache.
     *
     * @param string $key     The cache key
     * @param string $content The template representation as a PHP class
     */
    public function write($key, $content);
    /**
     * Loads a template from the cache.
     *
     * @param string $key The cache key
     */
    public function load($key);
    /**
     * Returns the modification timestamp of a key.
     *
     * @param string $key The cache key
     *
     * @return int
     */
    public function getTimestamp($key);
 }
 class_alias('Twig_CacheInterface', 'Twig\Cache\CacheInterface', false);
--- a/system/libs/Twig/Compiler.php
+++ b/system/libs/Twig/Compiler.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -21,30 +21,31 @@ class Twig_Compiler implements Twig_CompilerInterface
    protected $source;
    protected $indentation;
    protected $env;
-    protected $debugInfo = array();
+    protected $debugInfo;
    protected $sourceOffset;
    protected $sourceLine;
    protected $filename;
    /**
     * Constructor.
     *
     * @param Twig_Environment $env The twig environment instance
     */
    public function __construct(Twig_Environment $env)
    {
        $this->env = $env;
        $this->debugInfo = array();
    }
    /**
     * @deprecated since 1.25 (to be removed in 2.0)
     */
    public function getFilename()
    {
        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
        return $this->filename;
    }
    /**
     * Returns the environment instance related to this compiler.
     *
-     * @return Twig_Environment
+     * @return Twig_Environment The environment instance
     */
    public function getEnvironment()
    {
@@ -67,7 +68,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     * @param Twig_NodeInterface $node        The node to compile
     * @param int                $indentation The current indentation
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     */
    public function compile(Twig_NodeInterface $node, $indentation = 0)
    {
@@ -80,8 +81,7 @@ class Twig_Compiler implements Twig_CompilerInterface
        $this->indentation = $indentation;
        if ($node instanceof Twig_Node_Module) {
-            // to be removed in 2.0
+            $this->filename = $node->getAttribute('filename');
            $this->filename = $node->getTemplateName();
        }
        $node->compile($this);
@@ -92,7 +92,7 @@ class Twig_Compiler implements Twig_CompilerInterface
    public function subcompile(Twig_NodeInterface $node, $raw = true)
    {
        if (false === $raw) {
-            $this->source .= str_repeat(' ', $this->indentation * 4);
+            $this->addIndentation();
        }
        $node->compile($this);
@@ -105,7 +105,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     *
     * @param string $string The string
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     */
    public function raw($string)
    {
@@ -117,13 +117,14 @@ class Twig_Compiler implements Twig_CompilerInterface
    /**
     * Writes a string to the compiled code by adding indentation.
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     */
    public function write()
    {
        $strings = func_get_args();
        foreach ($strings as $string) {
-            $this->source .= str_repeat(' ', $this->indentation * 4).$string;
+            $this->addIndentation();
            $this->source .= $string;
        }
        return $this;
@@ -132,14 +133,10 @@ class Twig_Compiler implements Twig_CompilerInterface
    /**
     * Appends an indentation to the current PHP code after compilation.
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     *
     * @deprecated since 1.27 (to be removed in 2.0).
     */
    public function addIndentation()
    {
        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use write(\'\') instead.', E_USER_DEPRECATED);
        $this->source .= str_repeat(' ', $this->indentation * 4);
        return $this;
@@ -150,7 +147,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     *
     * @param string $value The string
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     */
    public function string($value)
    {
@@ -164,12 +161,12 @@ class Twig_Compiler implements Twig_CompilerInterface
     *
     * @param mixed $value The value to convert
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     */
    public function repr($value)
    {
        if (is_int($value) || is_float($value)) {
-            if (false !== $locale = setlocale(LC_NUMERIC, '0')) {
+            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
                setlocale(LC_NUMERIC, 'C');
            }
@@ -205,28 +202,28 @@ class Twig_Compiler implements Twig_CompilerInterface
    /**
     * Adds debugging information.
     *
-     * @return $this
+     * @param Twig_NodeInterface $node The related twig node
     *
     * @return Twig_Compiler The current compiler instance
     */
    public function addDebugInfo(Twig_NodeInterface $node)
    {
-        if ($node->getTemplateLine() != $this->lastLine) {
+        if ($node->getLine() != $this->lastLine) {
-            $this->write(sprintf("// line %d\n", $node->getTemplateLine()));
+            $this->write(sprintf("// line %d\n", $node->getLine()));
            // when mbstring.func_overload is set to 2
            // mb_substr_count() replaces substr_count()
            // but they have different signatures!
            if (((int) ini_get('mbstring.func_overload')) & 2) {
                @trigger_error('Support for having "mbstring.func_overload" different from 0 is deprecated version 1.29 and will be removed in 2.0.', E_USER_DEPRECATED);
                // this is much slower than the "right" version
                $this->sourceLine += mb_substr_count(mb_substr($this->source, $this->sourceOffset), "\n");
            } else {
                $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
            }
            $this->sourceOffset = strlen($this->source);
-            $this->debugInfo[$this->sourceLine] = $node->getTemplateLine();
+            $this->debugInfo[$this->sourceLine] = $node->getLine();
-            $this->lastLine = $node->getTemplateLine();
+            $this->lastLine = $node->getLine();
        }
        return $this;
@@ -244,7 +241,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     *
     * @param int $step The number of indentation to add
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     */
    public function indent($step = 1)
    {
@@ -258,7 +255,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     *
     * @param int $step The number of indentation to remove
     *
-     * @return $this
+     * @return Twig_Compiler The current compiler instance
     *
     * @throws LogicException When trying to outdent too much so the indentation would become negative
     */
@@ -266,7 +263,7 @@ class Twig_Compiler implements Twig_CompilerInterface
    {
        // can't outdent by more steps than the current indentation level
        if ($this->indentation < $step) {
-            throw new LogicException('Unable to call outdent() as the indentation would become negative.');
+            throw new LogicException('Unable to call outdent() as the indentation would become negative');
        }
        $this->indentation -= $step;
@@ -279,6 +276,3 @@ class Twig_Compiler implements Twig_CompilerInterface
        return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
    }
 }
 class_alias('Twig_Compiler', 'Twig\Compiler', false);
 class_exists('Twig_Node');
--- a/system/libs/Twig/CompilerInterface.php
+++ b/system/libs/Twig/CompilerInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -21,7 +21,9 @@ interface Twig_CompilerInterface
    /**
     * Compiles a node.
     *
-     * @return $this
+     * @param Twig_NodeInterface $node The node to compile
     *
     * @return Twig_CompilerInterface The current compiler instance
     */
    public function compile(Twig_NodeInterface $node);
--- a/system/libs/Twig/ContainerRuntimeLoader.php
+++ b/system/libs/Twig/ContainerRuntimeLoader.php
@@ -1,39 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 use Psr\Container\ContainerInterface;
 /**
 * Lazily loads Twig runtime implementations from a PSR-11 container.
 *
 * Note that the runtime services MUST use their class names as identifiers.
 *
 * @author Fabien Potencier <fabien@symfony.com>
 * @author Robin Chalas <robin.chalas@gmail.com>
 */
 class Twig_ContainerRuntimeLoader implements Twig_RuntimeLoaderInterface
 {
    private $container;
    public function __construct(ContainerInterface $container)
    {
        $this->container = $container;
    }
    public function load($class)
    {
        if ($this->container->has($class)) {
            return $this->container->get($class);
        }
    }
 }
 class_alias('Twig_ContainerRuntimeLoader', 'Twig\RuntimeLoader\ContainerRuntimeLoader', false);
--- a/system/libs/Twig/Environment.php
+++ b/system/libs/Twig/Environment.php
--- a/system/libs/Twig/Error.php
+++ b/system/libs/Twig/Error.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -25,8 +25,8 @@
 * and line number) yourself by passing them to the constructor. If some or all
 * these information are not available from where you throw the exception, then
 * this class will guess them automatically (when the line number is set to -1
- * and/or the name is set to null). As this is a costly operation, this
+ * and/or the filename is set to null). As this is a costly operation, this
- * can be disabled by passing false for both the name and the line number
+ * can be disabled by passing false for both the filename and the line number
 * when creating a new instance of this class.
 *
 * @author Fabien Potencier <fabien@symfony.com>
@@ -34,43 +34,29 @@
 class Twig_Error extends Exception
 {
    protected $lineno;
    // to be renamed to name in 2.0
    protected $filename;
    protected $rawMessage;
    protected $previous;
    private $sourcePath;
    private $sourceCode;
    /**
     * Constructor.
     *
-     * Set both the line number and the name to false to
+     * Set both the line number and the filename to false to
     * disable automatic guessing of the original template name
     * and line number.
     *
     * Set the line number to -1 to enable its automatic guessing.
-     * Set the name to null to enable its automatic guessing.
+     * Set the filename to null to enable its automatic guessing.
     *
     * By default, automatic guessing is enabled.
     *
-     * @param string                  $message  The error message
+     * @param string    $message  The error message
-     * @param int                     $lineno   The template line where the error occurred
+     * @param int       $lineno   The template line where the error occurred
-     * @param Twig_Source|string|null $source   The source context where the error occurred
+     * @param string    $filename The template file name where the error occurred
-     * @param Exception               $previous The previous exception
+     * @param Exception $previous The previous exception
     */
-    public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
+    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
    {
        if (null === $source) {
            $name = null;
        } elseif (!$source instanceof Twig_Source) {
            // for compat with the Twig C ext., passing the template name as string is accepted
            $name = $source;
        } else {
            $name = $source->getName();
            $this->sourceCode = $source->getCode();
            $this->sourcePath = $source->getPath();
        }
        if (PHP_VERSION_ID < 50300) {
            $this->previous = $previous;
            parent::__construct('');
@@ -79,9 +65,9 @@ class Twig_Error extends Exception
        }
        $this->lineno = $lineno;
-        $this->filename = $name;
+        $this->filename = $filename;
-        if (-1 === $lineno || null === $name || null === $this->sourcePath) {
+        if (-1 === $this->lineno || null === $this->filename) {
            $this->guessTemplateInfo();
        }
@@ -101,62 +87,23 @@ class Twig_Error extends Exception
    }
    /**
-     * Gets the logical name where the error occurred.
+     * Gets the filename where the error occurred.
     *
-     * @return string The name
+     * @return string The filename
     *
     * @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead.
     */
    public function getTemplateFile()
    {
        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
        return $this->filename;
    }
    /**
-     * Sets the logical name where the error occurred.
+     * Sets the filename where the error occurred.
     *
-     * @param string $name The name
+     * @param string $filename The filename
     *
     * @deprecated since 1.27 (to be removed in 2.0). Use setSourceContext() instead.
     */
-    public function setTemplateFile($name)
+    public function setTemplateFile($filename)
    {
-        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use setSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+        $this->filename = $filename;
        $this->filename = $name;
        $this->updateRepr();
    }
    /**
     * Gets the logical name where the error occurred.
     *
     * @return string The name
     *
     * @deprecated since 1.29 (to be removed in 2.0). Use getSourceContext() instead.
     */
    public function getTemplateName()
    {
        @trigger_error(sprintf('The "%s" method is deprecated since version 1.29 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
        return $this->filename;
    }
    /**
     * Sets the logical name where the error occurred.
     *
     * @param string $name The name
     *
     * @deprecated since 1.29 (to be removed in 2.0). Use setSourceContext() instead.
     */
    public function setTemplateName($name)
    {
        @trigger_error(sprintf('The "%s" method is deprecated since version 1.29 and will be removed in 2.0. Use setSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
        $this->filename = $name;
        $this->sourceCode = $this->sourcePath = null;
        $this->updateRepr();
    }
@@ -183,32 +130,6 @@ class Twig_Error extends Exception
        $this->updateRepr();
    }
    /**
     * Gets the source context of the Twig template where the error occurred.
     *
     * @return Twig_Source|null
     */
    public function getSourceContext()
    {
        return $this->filename ? new Twig_Source($this->sourceCode, $this->filename, $this->sourcePath) : null;
    }
    /**
     * Sets the source context of the Twig template where the error occurred.
     */
    public function setSourceContext(Twig_Source $source = null)
    {
        if (null === $source) {
            $this->sourceCode = $this->filename = $this->sourcePath = null;
        } else {
            $this->sourceCode = $source->getCode();
            $this->filename = $source->getName();
            $this->sourcePath = $source->getPath();
        }
        $this->updateRepr();
    }
    public function guess()
    {
        $this->guessTemplateInfo();
@@ -234,45 +155,23 @@ class Twig_Error extends Exception
        throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
    }
    public function appendMessage($rawMessage)
    {
        $this->rawMessage .= $rawMessage;
        $this->updateRepr();
    }
    /**
     * @internal
     */
    protected function updateRepr()
    {
        $this->message = $this->rawMessage;
        if ($this->sourcePath && $this->lineno > 0) {
            $this->file = $this->sourcePath;
            $this->line = $this->lineno;
            return;
        }
        $dot = false;
        if ('.' === substr($this->message, -1)) {
            $this->message = substr($this->message, 0, -1);
            $dot = true;
        }
        $questionMark = false;
        if ('?' === substr($this->message, -1)) {
            $this->message = substr($this->message, 0, -1);
            $questionMark = true;
        }
        if ($this->filename) {
            if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
-                $name = sprintf('"%s"', $this->filename);
+                $filename = sprintf('"%s"', $this->filename);
            } else {
-                $name = json_encode($this->filename);
+                $filename = json_encode($this->filename);
            }
-            $this->message .= sprintf(' in %s', $name);
+            $this->message .= sprintf(' in %s', $filename);
        }
        if ($this->lineno && $this->lineno >= 0) {
@@ -282,15 +181,8 @@ class Twig_Error extends Exception
        if ($dot) {
            $this->message .= '.';
        }
        if ($questionMark) {
            $this->message .= '?';
        }
    }
    /**
     * @internal
     */
    protected function guessTemplateInfo()
    {
        $template = null;
@@ -313,18 +205,11 @@ class Twig_Error extends Exception
            }
        }
-        // update template name
+        // update template filename
        if (null !== $template && null === $this->filename) {
            $this->filename = $template->getTemplateName();
        }
        // update template path if any
        if (null !== $template && null === $this->sourcePath) {
            $src = $template->getSourceContext();
            $this->sourceCode = $src->getCode();
            $this->sourcePath = $src->getPath();
        }
        if (null === $template || $this->lineno > -1) {
            return;
        }
@@ -332,6 +217,11 @@ class Twig_Error extends Exception
        $r = new ReflectionObject($template);
        $file = $r->getFileName();
        // hhvm has a bug where eval'ed files comes out as the current directory
        if (is_dir($file)) {
            $file = '';
        }
        $exceptions = array($e = $this);
        while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
            $exceptions[] = $e;
@@ -358,6 +248,3 @@ class Twig_Error extends Exception
        }
    }
 }
 class_alias('Twig_Error', 'Twig\Error\Error', false);
 class_exists('Twig_Source');
--- a/system/libs/Twig/Error/Loader.php
+++ b/system/libs/Twig/Error/Loader.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2010 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -24,17 +24,8 @@
 */
 class Twig_Error_Loader extends Twig_Error
 {
-    public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
+    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
    {
-        if (PHP_VERSION_ID < 50300) {
+        parent::__construct($message, false, false, $previous);
            $this->previous = $previous;
            Exception::__construct('');
        } else {
            Exception::__construct('', 0, $previous);
        }
        $this->appendMessage($message);
        $this->setTemplateLine(false);
    }
 }
 class_alias('Twig_Error_Loader', 'Twig\Error\LoaderError', false);
--- a/system/libs/Twig/Error/Runtime.php
+++ b/system/libs/Twig/Error/Runtime.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -18,5 +18,3 @@
 class Twig_Error_Runtime extends Twig_Error
 {
 }
 class_alias('Twig_Error_Runtime', 'Twig\Error\RuntimeError', false);
--- a/system/libs/Twig/Error/Syntax.php
+++ b/system/libs/Twig/Error/Syntax.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -17,39 +17,4 @@
 */
 class Twig_Error_Syntax extends Twig_Error
 {
    /**
     * Tweaks the error message to include suggestions.
     *
     * @param string $name  The original name of the item that does not exist
     * @param array  $items An array of possible items
     */
    public function addSuggestions($name, array $items)
    {
        if (!$alternatives = self::computeAlternatives($name, $items)) {
            return;
        }
        $this->appendMessage(sprintf(' Did you mean "%s"?', implode('", "', $alternatives)));
    }
    /**
     * @internal
     *
     * To be merged with the addSuggestions() method in 2.0.
     */
    public static function computeAlternatives($name, $items)
    {
        $alternatives = array();
        foreach ($items as $item) {
            $lev = levenshtein($name, $item);
            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
                $alternatives[$item] = $lev;
            }
        }
        asort($alternatives);
        return array_keys($alternatives);
    }
 }
 class_alias('Twig_Error_Syntax', 'Twig\Error\SyntaxError', false);
--- a/system/libs/Twig/ExistsLoaderInterface.php
+++ b/system/libs/Twig/ExistsLoaderInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -27,5 +27,3 @@ interface Twig_ExistsLoaderInterface
     */
    public function exists($name);
 }
 class_alias('Twig_ExistsLoaderInterface', 'Twig\Loader\ExistsLoaderInterface', false);
--- a/system/libs/Twig/ExpressionParser.php
+++ b/system/libs/Twig/ExpressionParser.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -19,8 +19,6 @@
 * @see http://en.wikipedia.org/wiki/Operator-precedence_parser
 *
 * @author Fabien Potencier <fabien@symfony.com>
 *
 * @internal
 */
 class Twig_ExpressionParser
 {
@@ -31,23 +29,11 @@ class Twig_ExpressionParser
    protected $unaryOperators;
    protected $binaryOperators;
-    private $env;
+    public function __construct(Twig_Parser $parser, array $unaryOperators, array $binaryOperators)
    public function __construct(Twig_Parser $parser, $env = null)
    {
        $this->parser = $parser;
-
+        $this->unaryOperators = $unaryOperators;
-        if ($env instanceof Twig_Environment) {
+        $this->binaryOperators = $binaryOperators;
            $this->env = $env;
            $this->unaryOperators = $env->getUnaryOperators();
            $this->binaryOperators = $env->getBinaryOperators();
        } else {
            @trigger_error('Passing the operators as constructor arguments to '.__METHOD__.' is deprecated since version 1.27. Pass the environment instead.', E_USER_DEPRECATED);
            $this->env = $parser->getEnvironment();
            $this->unaryOperators = func_get_arg(1);
            $this->binaryOperators = func_get_arg(2);
        }
    }
    public function parseExpression($precedence = 0)
@@ -58,11 +44,7 @@ class Twig_ExpressionParser
            $op = $this->binaryOperators[$token->getValue()];
            $this->parser->getStream()->next();
-            if ('is not' === $token->getValue()) {
+            if (isset($op['callable'])) {
                $expr = $this->parseNotTestExpression($expr);
            } elseif ('is' === $token->getValue()) {
                $expr = $this->parseTestExpression($expr);
            } elseif (isset($op['callable'])) {
                $expr = call_user_func($op['callable'], $this->parser, $expr);
            } else {
                $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
@@ -189,7 +171,7 @@ class Twig_ExpressionParser
                    $negClass = 'Twig_Node_Expression_Unary_Neg';
                    $posClass = 'Twig_Node_Expression_Unary_Pos';
                    if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
-                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
+                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s"', $token->getValue()), $token->getLine(), $this->parser->getFilename());
                    }
                    $this->parser->getStream()->next();
@@ -205,7 +187,7 @@ class Twig_ExpressionParser
                } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
                    $node = $this->parseHashExpression();
                } else {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
+                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getFilename());
                }
        }
@@ -234,7 +216,7 @@ class Twig_ExpressionParser
        $expr = array_shift($nodes);
        foreach ($nodes as $node) {
-            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getTemplateLine());
+            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getLine());
        }
        return $expr;
@@ -296,7 +278,7 @@ class Twig_ExpressionParser
            } else {
                $current = $stream->getCurrent();
-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getSourceContext());
+                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $this->parser->getFilename());
            }
            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -335,25 +317,20 @@ class Twig_ExpressionParser
            case 'parent':
                $this->parseArguments();
                if (!count($this->parser->getBlockStack())) {
-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getSourceContext());
+                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line, $this->parser->getFilename());
                }
                if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getSourceContext());
+                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden', $line, $this->parser->getFilename());
                }
                return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
            case 'block':
-                $args = $this->parseArguments();
+                return new Twig_Node_Expression_BlockReference($this->parseArguments()->getNode(0), false, $line);
                if (count($args) < 1) {
                    throw new Twig_Error_Syntax('The "block" function takes one argument (the block name).', $line, $this->parser->getStream()->getSourceContext());
                }
                return new Twig_Node_Expression_BlockReference($args->getNode(0), count($args) > 1 ? $args->getNode(1) : null, $line);
            case 'attribute':
                $args = $this->parseArguments();
                if (count($args) < 2) {
-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getSourceContext());
+                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes)', $line, $this->parser->getFilename());
                }
                return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);
@@ -396,24 +373,24 @@ class Twig_ExpressionParser
                $arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                    $type = Twig_Template::METHOD_CALL;
+                    $type = Twig_TemplateInterface::METHOD_CALL;
                    foreach ($this->parseArguments() as $n) {
                        $arguments->addElement($n);
                    }
                }
            } else {
-                throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getSourceContext());
+                throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
            }
            if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
                if (!$arg instanceof Twig_Node_Expression_Constant) {
-                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext());
+                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s")', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
                }
                $name = $arg->getAttribute('value');
                if ($this->parser->isReservedMacroName($name)) {
-                    throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext());
+                    throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword', $name), $token->getLine(), $this->parser->getFilename());
                }
                $node = new Twig_Node_Expression_MethodCall($node, 'get'.$name, $arguments, $lineno);
@@ -523,7 +500,7 @@ class Twig_ExpressionParser
            $name = null;
            if ($namedArguments && $token = $stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
                if (!$value instanceof Twig_Node_Expression_Name) {
-                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getSourceContext());
+                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given', get_class($value)), $token->getLine(), $this->parser->getFilename());
                }
                $name = $value->getAttribute('name');
@@ -531,7 +508,7 @@ class Twig_ExpressionParser
                    $value = $this->parsePrimaryExpression();
                    if (!$this->checkConstantExpression($value)) {
-                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext());
+                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $this->parser->getFilename());
                    }
                } else {
                    $value = $this->parseExpression();
@@ -559,17 +536,15 @@ class Twig_ExpressionParser
    public function parseAssignmentExpression()
    {
        $stream = $this->parser->getStream();
        $targets = array();
        while (true) {
-            $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
+            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
-            $value = $token->getValue();
+            if (in_array($token->getValue(), array('true', 'false', 'none'))) {
-            if (in_array(strtolower($value), array('true', 'false', 'none', 'null'))) {
+                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s"', $token->getValue()), $token->getLine(), $this->parser->getFilename());
                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
            }
-            $targets[] = new Twig_Node_Expression_AssignName($value, $token->getLine());
+            $targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
-            if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
+            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
                break;
            }
        }
@@ -590,96 +565,17 @@ class Twig_ExpressionParser
        return new Twig_Node($targets);
    }
    private function parseNotTestExpression(Twig_NodeInterface $node)
    {
        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($node), $this->parser->getCurrentToken()->getLine());
    }
    private function parseTestExpression(Twig_NodeInterface $node)
    {
        $stream = $this->parser->getStream();
        list($name, $test) = $this->getTest($node->getTemplateLine());
        $class = $this->getTestNodeClass($test);
        $arguments = null;
        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
            $arguments = $this->parser->getExpressionParser()->parseArguments(true);
        }
        return new $class($node, $name, $arguments, $this->parser->getCurrentToken()->getLine());
    }
    private function getTest($line)
    {
        $stream = $this->parser->getStream();
        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
        if ($test = $this->env->getTest($name)) {
            return array($name, $test);
        }
        if ($stream->test(Twig_Token::NAME_TYPE)) {
            // try 2-words tests
            $name = $name.' '.$this->parser->getCurrentToken()->getValue();
            if ($test = $this->env->getTest($name)) {
                $stream->next();
                return array($name, $test);
            }
        }
        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getSourceContext());
        $e->addSuggestions($name, array_keys($this->env->getTests()));
        throw $e;
    }
    private function getTestNodeClass($test)
    {
        if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
            $stream = $this->parser->getStream();
            $message = sprintf('Twig Test "%s" is deprecated', $test->getName());
            if (!is_bool($test->getDeprecatedVersion())) {
                $message .= sprintf(' since version %s', $test->getDeprecatedVersion());
            }
            if ($test->getAlternative()) {
                $message .= sprintf('. Use "%s" instead', $test->getAlternative());
            }
            $src = $stream->getSourceContext();
            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $stream->getCurrent()->getLine());
            @trigger_error($message, E_USER_DEPRECATED);
        }
        if ($test instanceof Twig_SimpleTest) {
            return $test->getNodeClass();
        }
        return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
    }
    protected function getFunctionNodeClass($name, $line)
    {
-        if (false === $function = $this->env->getFunction($name)) {
+        $env = $this->parser->getEnvironment();
            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getSourceContext());
            $e->addSuggestions($name, array_keys($this->env->getFunctions()));
-            throw $e;
+        if (false === $function = $env->getFunction($name)) {
-        }
+            $message = sprintf('The function "%s" does not exist', $name);
-
+            if ($alternatives = $env->computeAlternatives($name, array_keys($env->getFunctions()))) {
-        if ($function instanceof Twig_SimpleFunction && $function->isDeprecated()) {
+                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
            $message = sprintf('Twig Function "%s" is deprecated', $function->getName());
            if (!is_bool($function->getDeprecatedVersion())) {
                $message .= sprintf(' since version %s', $function->getDeprecatedVersion());
            }
            if ($function->getAlternative()) {
                $message .= sprintf('. Use "%s" instead', $function->getAlternative());
            }
            $src = $this->parser->getStream()->getSourceContext();
            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $line);
-            @trigger_error($message, E_USER_DEPRECATED);
+            throw new Twig_Error_Syntax($message, $line, $this->parser->getFilename());
        }
        if ($function instanceof Twig_SimpleFunction) {
@@ -691,25 +587,15 @@ class Twig_ExpressionParser
    protected function getFilterNodeClass($name, $line)
    {
-        if (false === $filter = $this->env->getFilter($name)) {
+        $env = $this->parser->getEnvironment();
            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getSourceContext());
            $e->addSuggestions($name, array_keys($this->env->getFilters()));
-            throw $e;
+        if (false === $filter = $env->getFilter($name)) {
-        }
+            $message = sprintf('The filter "%s" does not exist', $name);
-
+            if ($alternatives = $env->computeAlternatives($name, array_keys($env->getFilters()))) {
-        if ($filter instanceof Twig_SimpleFilter && $filter->isDeprecated()) {
+                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
            $message = sprintf('Twig Filter "%s" is deprecated', $filter->getName());
            if (!is_bool($filter->getDeprecatedVersion())) {
                $message .= sprintf(' since version %s', $filter->getDeprecatedVersion());
            }
            if ($filter->getAlternative()) {
                $message .= sprintf('. Use "%s" instead', $filter->getAlternative());
            }
            $src = $this->parser->getStream()->getSourceContext();
            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $line);
-            @trigger_error($message, E_USER_DEPRECATED);
+            throw new Twig_Error_Syntax($message, $line, $this->parser->getFilename());
        }
        if ($filter instanceof Twig_SimpleFilter) {
@@ -737,5 +623,3 @@ class Twig_ExpressionParser
        return true;
    }
 }
 class_alias('Twig_ExpressionParser', 'Twig\ExpressionParser', false);
--- a/system/libs/Twig/Extension.php
+++ b/system/libs/Twig/Extension.php
@@ -3,67 +3,91 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 abstract class Twig_Extension implements Twig_ExtensionInterface
 {
    /**
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
+     * Initializes the runtime environment.
     *
     * This is where you can load some file that contains filter functions for instance.
     *
     * @param Twig_Environment $environment The current Twig_Environment instance
     */
    public function initRuntime(Twig_Environment $environment)
    {
    }
    /**
     * Returns the token parser instances to add to the existing list.
     *
     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
     */
    public function getTokenParsers()
    {
        return array();
    }
    /**
     * Returns the node visitor instances to add to the existing list.
     *
     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
     */
    public function getNodeVisitors()
    {
        return array();
    }
    /**
     * Returns a list of filters to add to the existing list.
     *
     * @return array An array of filters
     */
    public function getFilters()
    {
        return array();
    }
    /**
     * Returns a list of tests to add to the existing list.
     *
     * @return array An array of tests
     */
    public function getTests()
    {
        return array();
    }
    /**
     * Returns a list of functions to add to the existing list.
     *
     * @return array An array of functions
     */
    public function getFunctions()
    {
        return array();
    }
    /**
     * Returns a list of operators to add to the existing list.
     *
     * @return array An array of operators
     */
    public function getOperators()
    {
        return array();
    }
    /**
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
+     * Returns a list of global variables to add to the existing list.
     *
     * @return array An array of global variables
     */
    public function getGlobals()
    {
        return array();
    }
    /**
     * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
     */
    public function getName()
    {
        return get_class($this);
    }
 }
 class_alias('Twig_Extension', 'Twig\Extension\AbstractExtension', false);
 class_exists('Twig_Environment');
--- a/system/libs/Twig/Extension/Core.php
+++ b/system/libs/Twig/Extension/Core.php
--- a/system/libs/Twig/Extension/Debug.php
+++ b/system/libs/Twig/Extension/Debug.php
@@ -3,17 +3,18 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2011 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * @final
 */
 class Twig_Extension_Debug extends Twig_Extension
 {
    /**
     * Returns a list of global functions to add to the existing list.
     *
     * @return array An array of global functions
     */
    public function getFunctions()
    {
        // dump is safe if var_dump is overridden by xdebug
@@ -23,7 +24,7 @@ class Twig_Extension_Debug extends Twig_Extension
            // false means that it was not set (and the default is on) or it explicitly enabled
            // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
            && (false === ini_get('html_errors') || ini_get('html_errors'))
-            || 'cli' === PHP_SAPI
+            || 'cli' === php_sapi_name()
        ;
        return array(
@@ -31,6 +32,11 @@ class Twig_Extension_Debug extends Twig_Extension
        );
    }
    /**
     * Returns the name of the extension.
     *
     * @return string The extension name
     */
    public function getName()
    {
        return 'debug';
@@ -63,5 +69,3 @@ function twig_var_dump(Twig_Environment $env, $context)
    return ob_get_clean();
 }
 class_alias('Twig_Extension_Debug', 'Twig\Extension\DebugExtension', false);
--- a/system/libs/Twig/Extension/Escaper.php
+++ b/system/libs/Twig/Extension/Escaper.php
@@ -3,39 +3,45 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * @final
 */
 class Twig_Extension_Escaper extends Twig_Extension
 {
    protected $defaultStrategy;
    /**
     * @param string|false|callable $defaultStrategy An escaping strategy
     *
     * @see setDefaultStrategy()
     */
    public function __construct($defaultStrategy = 'html')
    {
        $this->setDefaultStrategy($defaultStrategy);
    }
    /**
     * Returns the token parser instances to add to the existing list.
     *
     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
     */
    public function getTokenParsers()
    {
        return array(new Twig_TokenParser_AutoEscape());
    }
    /**
     * Returns the node visitor instances to add to the existing list.
     *
     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
     */
    public function getNodeVisitors()
    {
        return array(new Twig_NodeVisitor_Escaper());
    }
    /**
     * Returns a list of filters to add to the existing list.
     *
     * @return array An array of filters
     */
    public function getFilters()
    {
        return array(
@@ -47,26 +53,18 @@ class Twig_Extension_Escaper extends Twig_Extension
     * Sets the default strategy to use when not defined by the user.
     *
     * The strategy can be a valid PHP callback that takes the template
-     * name as an argument and returns the strategy to use.
+     * "filename" as an argument and returns the strategy to use.
     *
-     * @param string|false|callable $defaultStrategy An escaping strategy
+     * @param mixed $defaultStrategy An escaping strategy
     */
    public function setDefaultStrategy($defaultStrategy)
    {
        // for BC
        if (true === $defaultStrategy) {
            @trigger_error('Using "true" as the default strategy is deprecated since version 1.21. Use "html" instead.', E_USER_DEPRECATED);
            $defaultStrategy = 'html';
        }
        if ('filename' === $defaultStrategy) {
            @trigger_error('Using "filename" as the default strategy is deprecated since version 1.27. Use "name" instead.', E_USER_DEPRECATED);
            $defaultStrategy = 'name';
        }
        if ('name' === $defaultStrategy) {
            $defaultStrategy = array('Twig_FileExtensionEscapingStrategy', 'guess');
        }
@@ -76,21 +74,26 @@ class Twig_Extension_Escaper extends Twig_Extension
    /**
     * Gets the default strategy to use when not defined by the user.
     *
-     * @param string $name The template name
+     * @param string $filename The template "filename"
     *
-     * @return string|false The default strategy to use for the template
+     * @return string The default strategy to use for the template
     */
-    public function getDefaultStrategy($name)
+    public function getDefaultStrategy($filename)
    {
        // disable string callables to avoid calling a function named html or js,
        // or any other upcoming escaping strategy
-        if (!is_string($this->defaultStrategy) && false !== $this->defaultStrategy) {
+        if (!is_string($this->defaultStrategy) && is_callable($this->defaultStrategy)) {
-            return call_user_func($this->defaultStrategy, $name);
+            return call_user_func($this->defaultStrategy, $filename);
        }
        return $this->defaultStrategy;
    }
    /**
     * Returns the name of the extension.
     *
     * @return string The extension name
     */
    public function getName()
    {
        return 'escaper';
@@ -108,5 +111,3 @@ function twig_raw_filter($string)
 {
    return $string;
 }
 class_alias('Twig_Extension_Escaper', 'Twig\Extension\EscaperExtension', false);
--- a/system/libs/Twig/Extension/GlobalsInterface.php
+++ b/system/libs/Twig/Extension/GlobalsInterface.php
@@ -1,24 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * Enables usage of the deprecated Twig_Extension::getGlobals() method.
 *
 * Explicitly implement this interface if you really need to implement the
 * deprecated getGlobals() method in your extensions.
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
 interface Twig_Extension_GlobalsInterface
 {
 }
 class_alias('Twig_Extension_GlobalsInterface', 'Twig\Extension\GlobalsInterface', false);
--- a/system/libs/Twig/Extension/InitRuntimeInterface.php
+++ b/system/libs/Twig/Extension/InitRuntimeInterface.php
@@ -1,24 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * Enables usage of the deprecated Twig_Extension::initRuntime() method.
 *
 * Explicitly implement this interface if you really need to implement the
 * deprecated initRuntime() method in your extensions.
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
 interface Twig_Extension_InitRuntimeInterface
 {
 }
 class_alias('Twig_Extension_InitRuntimeInterface', 'Twig\Extension\InitRuntimeInterface', false);
--- a/system/libs/Twig/Extension/Optimizer.php
+++ b/system/libs/Twig/Extension/Optimizer.php
@@ -3,15 +3,11 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2010 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * @final
 */
 class Twig_Extension_Optimizer extends Twig_Extension
 {
    protected $optimizers;
@@ -21,15 +17,19 @@ class Twig_Extension_Optimizer extends Twig_Extension
        $this->optimizers = $optimizers;
    }
    /**
     * {@inheritdoc}
     */
    public function getNodeVisitors()
    {
        return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
    }
    /**
     * {@inheritdoc}
     */
    public function getName()
    {
        return 'optimizer';
    }
 }
 class_alias('Twig_Extension_Optimizer', 'Twig\Extension\OptimizerExtension', false);
--- a/system/libs/Twig/Extension/Profiler.php
+++ b/system/libs/Twig/Extension/Profiler.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2015 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -11,11 +11,11 @@
 class Twig_Extension_Profiler extends Twig_Extension
 {
-    private $actives = array();
+    private $actives;
    public function __construct(Twig_Profiler_Profile $profile)
    {
-        $this->actives[] = $profile;
+        $this->actives = array($profile);
    }
    public function enter(Twig_Profiler_Profile $profile)
@@ -34,16 +34,19 @@ class Twig_Extension_Profiler extends Twig_Extension
        }
    }
    /**
     * {@inheritdoc}
     */
    public function getNodeVisitors()
    {
-        return array(new Twig_Profiler_NodeVisitor_Profiler(get_class($this)));
+        return array(new Twig_Profiler_NodeVisitor_Profiler($this->getName()));
    }
    /**
     * {@inheritdoc}
     */
    public function getName()
    {
        return 'profiler';
    }
 }
 class_alias('Twig_Extension_Profiler', 'Twig\Extension\ProfilerExtension', false);
 class_exists('Twig_Profiler_Profile');
--- a/system/libs/Twig/Extension/Sandbox.php
+++ b/system/libs/Twig/Extension/Sandbox.php
@@ -3,15 +3,11 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * @final
 */
 class Twig_Extension_Sandbox extends Twig_Extension
 {
    protected $sandboxedGlobally;
@@ -24,11 +20,21 @@ class Twig_Extension_Sandbox extends Twig_Extension
        $this->sandboxedGlobally = $sandboxed;
    }
    /**
     * Returns the token parser instances to add to the existing list.
     *
     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
     */
    public function getTokenParsers()
    {
        return array(new Twig_TokenParser_Sandbox());
    }
    /**
     * Returns the node visitor instances to add to the existing list.
     *
     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
     */
    public function getNodeVisitors()
    {
        return array(new Twig_NodeVisitor_Sandbox());
@@ -94,10 +100,13 @@ class Twig_Extension_Sandbox extends Twig_Extension
        return $obj;
    }
    /**
     * Returns the name of the extension.
     *
     * @return string The extension name
     */
    public function getName()
    {
        return 'sandbox';
    }
 }
 class_alias('Twig_Extension_Sandbox', 'Twig\Extension\SandboxExtension', false);
--- a/system/libs/Twig/Extension/Staging.php
+++ b/system/libs/Twig/Extension/Staging.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2012 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -15,8 +15,6 @@
 * This class is used by Twig_Environment as a staging area and must not be used directly.
 *
 * @author Fabien Potencier <fabien@symfony.com>
 *
 * @internal
 */
 class Twig_Extension_Staging extends Twig_Extension
 {
@@ -29,13 +27,12 @@ class Twig_Extension_Staging extends Twig_Extension
    public function addFunction($name, $function)
    {
        if (isset($this->functions[$name])) {
            @trigger_error(sprintf('Overriding function "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
        }
        $this->functions[$name] = $function;
    }
    /**
     * {@inheritdoc}
     */
    public function getFunctions()
    {
        return $this->functions;
@@ -43,13 +40,12 @@ class Twig_Extension_Staging extends Twig_Extension
    public function addFilter($name, $filter)
    {
        if (isset($this->filters[$name])) {
            @trigger_error(sprintf('Overriding filter "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
        }
        $this->filters[$name] = $filter;
    }
    /**
     * {@inheritdoc}
     */
    public function getFilters()
    {
        return $this->filters;
@@ -60,6 +56,9 @@ class Twig_Extension_Staging extends Twig_Extension
        $this->visitors[] = $visitor;
    }
    /**
     * {@inheritdoc}
     */
    public function getNodeVisitors()
    {
        return $this->visitors;
@@ -67,13 +66,12 @@ class Twig_Extension_Staging extends Twig_Extension
    public function addTokenParser(Twig_TokenParserInterface $parser)
    {
-        if (isset($this->tokenParsers[$parser->getTag()])) {
+        $this->tokenParsers[] = $parser;
            @trigger_error(sprintf('Overriding tag "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $parser->getTag()), E_USER_DEPRECATED);
        }
        $this->tokenParsers[$parser->getTag()] = $parser;
    }
    /**
     * {@inheritdoc}
     */
    public function getTokenParsers()
    {
        return $this->tokenParsers;
@@ -84,6 +82,9 @@ class Twig_Extension_Staging extends Twig_Extension
        $this->globals[$name] = $value;
    }
    /**
     * {@inheritdoc}
     */
    public function getGlobals()
    {
        return $this->globals;
@@ -91,22 +92,22 @@ class Twig_Extension_Staging extends Twig_Extension
    public function addTest($name, $test)
    {
        if (isset($this->tests[$name])) {
            @trigger_error(sprintf('Overriding test "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
        }
        $this->tests[$name] = $test;
    }
    /**
     * {@inheritdoc}
     */
    public function getTests()
    {
        return $this->tests;
    }
    /**
     * {@inheritdoc}
     */
    public function getName()
    {
        return 'staging';
    }
 }
 class_alias('Twig_Extension_Staging', 'Twig\Extension\StagingExtension', false);
--- a/system/libs/Twig/Extension/StringLoader.php
+++ b/system/libs/Twig/Extension/StringLoader.php
@@ -3,17 +3,16 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2012 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * @final
 */
 class Twig_Extension_StringLoader extends Twig_Extension
 {
    /**
     * {@inheritdoc}
     */
    public function getFunctions()
    {
        return array(
@@ -21,6 +20,9 @@ class Twig_Extension_StringLoader extends Twig_Extension
        );
    }
    /**
     * {@inheritdoc}
     */
    public function getName()
    {
        return 'string_loader';
@@ -35,13 +37,11 @@ class Twig_Extension_StringLoader extends Twig_Extension
 * </pre>
 *
 * @param Twig_Environment $env      A Twig_Environment instance
- * @param string           $template A template as a string or object implementing __toString()
+ * @param string           $template A template as a string
 *
- * @return Twig_Template
+ * @return Twig_Template A Twig_Template instance
 */
 function twig_template_from_string(Twig_Environment $env, $template)
 {
-    return $env->createTemplate((string) $template);
+    return $env->createTemplate($template);
 }
 class_alias('Twig_Extension_StringLoader', 'Twig\Extension\StringLoaderExtension', false);
--- a/system/libs/Twig/ExtensionInterface.php
+++ b/system/libs/Twig/ExtensionInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -21,49 +21,49 @@ interface Twig_ExtensionInterface
     *
     * This is where you can load some file that contains filter functions for instance.
     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
+     * @param Twig_Environment $environment The current Twig_Environment instance
     */
    public function initRuntime(Twig_Environment $environment);
    /**
     * Returns the token parser instances to add to the existing list.
     *
-     * @return Twig_TokenParserInterface[]
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
     */
    public function getTokenParsers();
    /**
     * Returns the node visitor instances to add to the existing list.
     *
-     * @return Twig_NodeVisitorInterface[]
+     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
     */
    public function getNodeVisitors();
    /**
     * Returns a list of filters to add to the existing list.
     *
-     * @return Twig_SimpleFilter[]
+     * @return array An array of filters
     */
    public function getFilters();
    /**
     * Returns a list of tests to add to the existing list.
     *
-     * @return Twig_SimpleTest[]
+     * @return array An array of tests
     */
    public function getTests();
    /**
     * Returns a list of functions to add to the existing list.
     *
-     * @return Twig_SimpleFunction[]
+     * @return array An array of functions
     */
    public function getFunctions();
    /**
     * Returns a list of operators to add to the existing list.
     *
-     * @return array<array> First array of unary operators, second array of binary operators
+     * @return array An array of operators
     */
    public function getOperators();
@@ -71,8 +71,6 @@ interface Twig_ExtensionInterface
     * Returns a list of global variables to add to the existing list.
     *
     * @return array An array of global variables
     *
     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
     */
    public function getGlobals();
@@ -80,11 +78,6 @@ interface Twig_ExtensionInterface
     * Returns the name of the extension.
     *
     * @return string The extension name
     *
     * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
     */
    public function getName();
 }
 class_alias('Twig_ExtensionInterface', 'Twig\Extension\ExtensionInterface', false);
 class_exists('Twig_Environment');
--- a/system/libs/Twig/FactoryRuntimeLoader.php
+++ b/system/libs/Twig/FactoryRuntimeLoader.php
@@ -1,39 +0,0 @@
 <?php
 /*
 * This file is part of Twig.
 *
 * (c) Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
 /**
 * Lazy loads the runtime implementations for a Twig element.
 *
 * @author Robin Chalas <robin.chalas@gmail.com>
 */
 class Twig_FactoryRuntimeLoader implements Twig_RuntimeLoaderInterface
 {
    private $map;
    /**
     * @param array $map An array where keys are class names and values factory callables
     */
    public function __construct($map = array())
    {
        $this->map = $map;
    }
    public function load($class)
    {
        if (isset($this->map[$class])) {
            $runtimeFactory = $this->map[$class];
            return $runtimeFactory();
        }
    }
 }
 class_alias('Twig_FactoryRuntimeLoader', 'Twig\RuntimeLoader\FactoryRuntimeLoader', false);
--- a/system/libs/Twig/FileExtensionEscapingStrategy.php
+++ b/system/libs/Twig/FileExtensionEscapingStrategy.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2015 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -13,7 +13,7 @@
 * Default autoescaping strategy based on file names.
 *
 * This strategy sets the HTML as the default autoescaping strategy,
- * but changes it based on the template name.
+ * but changes it based on the filename.
 *
 * Note that there is no runtime performance impact as the
 * default autoescaping strategy is set at compilation time.
@@ -25,23 +25,17 @@ class Twig_FileExtensionEscapingStrategy
    /**
     * Guesses the best autoescaping strategy based on the file name.
     *
-     * @param string $name The template name
+     * @param string $filename The template file name
     *
-     * @return string|false The escaping strategy name to use or false to disable
+     * @return string The escaping strategy name to use
     */
-    public static function guess($name)
+    public static function guess($filename)
    {
-        if (in_array(substr($name, -1), array('/', '\\'))) {
+        if (!preg_match('{\.(js|css|txt)(?:\.[^/\\\\]+)?$}', $filename, $match)) {
-            return 'html'; // return html for directories
+            return 'html';
        }
-        if ('.twig' === substr($name, -5)) {
+        switch ($match[1]) {
            $name = substr($name, 0, -5);
        }
        $extension = pathinfo($name, PATHINFO_EXTENSION);
        switch ($extension) {
            case 'js':
                return 'js';
@@ -50,11 +44,6 @@ class Twig_FileExtensionEscapingStrategy
            case 'txt':
                return false;
            default:
                return 'html';
        }
    }
 }
 class_alias('Twig_FileExtensionEscapingStrategy', 'Twig\FileExtensionEscapingStrategy', false);
--- a/system/libs/Twig/Filter.php
+++ b/system/libs/Twig/Filter.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Filter class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
 /**
 * Represents a template filter.
 *
--- a/system/libs/Twig/Filter/Function.php
+++ b/system/libs/Twig/Filter/Function.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Filter_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
 /**
 * Represents a function template filter.
 *
--- a/system/libs/Twig/Filter/Method.php
+++ b/system/libs/Twig/Filter/Method.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Filter_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
 /**
 * Represents a method template filter.
 *
@@ -37,6 +35,6 @@ class Twig_Filter_Method extends Twig_Filter
    public function compile()
    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
+        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
    }
 }
--- a/system/libs/Twig/Filter/Node.php
+++ b/system/libs/Twig/Filter/Node.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2011 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Filter_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
 /**
 * Represents a template filter as a node.
 *
--- a/system/libs/Twig/FilterCallableInterface.php
+++ b/system/libs/Twig/FilterCallableInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2012 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/system/libs/Twig/FilterInterface.php
+++ b/system/libs/Twig/FilterInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2010 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/system/libs/Twig/Function.php
+++ b/system/libs/Twig/Function.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2010 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
 /**
 * Represents a template function.
 *
--- a/system/libs/Twig/Function/Function.php
+++ b/system/libs/Twig/Function/Function.php
@@ -3,15 +3,13 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Arnaud Le Blanc
+ * (c) 2010 Arnaud Le Blanc
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Function_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
 /**
 * Represents a function template function.
 *
--- a/system/libs/Twig/Function/Method.php
+++ b/system/libs/Twig/Function/Method.php
@@ -3,15 +3,13 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Arnaud Le Blanc
+ * (c) 2010 Arnaud Le Blanc
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Function_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
 /**
 * Represents a method template function.
 *
@@ -38,6 +36,6 @@ class Twig_Function_Method extends Twig_Function
    public function compile()
    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
+        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
    }
 }
--- a/system/libs/Twig/Function/Node.php
+++ b/system/libs/Twig/Function/Node.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2011 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Function_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
 /**
 * Represents a template function as a node.
 *
--- a/system/libs/Twig/FunctionCallableInterface.php
+++ b/system/libs/Twig/FunctionCallableInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2012 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/system/libs/Twig/FunctionInterface.php
+++ b/system/libs/Twig/FunctionInterface.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2010 Fabien Potencier
- * (c) Arnaud Le Blanc
+ * (c) 2010 Arnaud Le Blanc
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/system/libs/Twig/Lexer.php
+++ b/system/libs/Twig/Lexer.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -26,7 +26,6 @@ class Twig_Lexer implements Twig_LexerInterface
    protected $states;
    protected $brackets;
    protected $env;
    // to be renamed to $name in 2.0 (where it is private)
    protected $filename;
    protected $options;
    protected $regexes;
@@ -34,8 +33,6 @@ class Twig_Lexer implements Twig_LexerInterface
    protected $positions;
    protected $currentVarBlockLine;
    private $source;
    const STATE_DATA = 0;
    const STATE_BLOCK = 1;
    const STATE_VAR = 2;
@@ -75,19 +72,11 @@ class Twig_Lexer implements Twig_LexerInterface
        );
    }
-    public function tokenize($code, $name = null)
+    /**
     * {@inheritdoc}
     */
    public function tokenize($code, $filename = null)
    {
        if (!$code instanceof Twig_Source) {
            @trigger_error(sprintf('Passing a string as the $code argument of %s() is deprecated since version 1.27 and will be removed in 2.0. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
            $this->source = new Twig_Source($code, $name);
        } else {
            $this->source = $code;
        }
        if (((int) ini_get('mbstring.func_overload')) & 2) {
            @trigger_error('Support for having "mbstring.func_overload" different from 0 is deprecated version 1.29 and will be removed in 2.0.', E_USER_DEPRECATED);
        }
        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
            $mbEncoding = mb_internal_encoding();
            mb_internal_encoding('ASCII');
@@ -95,8 +84,8 @@ class Twig_Lexer implements Twig_LexerInterface
            $mbEncoding = null;
        }
-        $this->code = str_replace(array("\r\n", "\r"), "\n", $this->source->getCode());
+        $this->code = str_replace(array("\r\n", "\r"), "\n", $code);
-        $this->filename = $this->source->getName();
+        $this->filename = $filename;
        $this->cursor = 0;
        $this->lineno = 1;
        $this->end = strlen($this->code);
@@ -140,14 +129,14 @@ class Twig_Lexer implements Twig_LexerInterface
        if (!empty($this->brackets)) {
            list($expect, $lineno) = array_pop($this->brackets);
-            throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
+            throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
        }
        if ($mbEncoding) {
            mb_internal_encoding($mbEncoding);
        }
-        return new Twig_TokenStream($this->tokens, $this->source);
+        return new Twig_TokenStream($this->tokens, $this->filename);
    }
    protected function lexData()
@@ -235,7 +224,7 @@ class Twig_Lexer implements Twig_LexerInterface
            $this->moveCursor($match[0]);
            if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->source);
+                throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->filename);
            }
        }
@@ -267,12 +256,12 @@ class Twig_Lexer implements Twig_LexerInterface
            // closing bracket
            elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
                if (empty($this->brackets)) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
+                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s"', $this->code[$this->cursor]), $this->lineno, $this->filename);
                }
                list($expect, $lineno) = array_pop($this->brackets);
                if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
+                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
                }
            }
@@ -292,18 +281,14 @@ class Twig_Lexer implements Twig_LexerInterface
        }
        // unlexable
        else {
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
+            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s"', $this->code[$this->cursor]), $this->lineno, $this->filename);
        }
    }
    protected function lexRawData($tag)
    {
        if ('raw' === $tag) {
            @trigger_error(sprintf('Twig Tag "raw" is deprecated since version 1.21. Use "verbatim" instead in %s at line %d.', $this->filename, $this->lineno), E_USER_DEPRECATED);
        }
        if (!preg_match(str_replace('%s', $tag, $this->regexes['lex_raw_data']), $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block.', $tag), $this->lineno, $this->source);
+            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block', $tag), $this->lineno, $this->filename);
        }
        $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
@@ -319,7 +304,7 @@ class Twig_Lexer implements Twig_LexerInterface
    protected function lexComment()
    {
        if (!preg_match($this->regexes['lex_comment'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->source);
+            throw new Twig_Error_Syntax('Unclosed comment', $this->lineno, $this->filename);
        }
        $this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
@@ -338,7 +323,7 @@ class Twig_Lexer implements Twig_LexerInterface
        } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
            list($expect, $lineno) = array_pop($this->brackets);
            if ($this->code[$this->cursor] != '"') {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
+                throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
            }
            $this->popState();
@@ -414,11 +399,9 @@ class Twig_Lexer implements Twig_LexerInterface
    protected function popState()
    {
        if (0 === count($this->states)) {
-            throw new Exception('Cannot pop state without a previous state.');
+            throw new Exception('Cannot pop state without a previous state');
        }
        $this->state = array_pop($this->states);
    }
 }
 class_alias('Twig_Lexer', 'Twig\Lexer', false);
--- a/system/libs/Twig/LexerInterface.php
+++ b/system/libs/Twig/LexerInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -21,12 +21,12 @@ interface Twig_LexerInterface
    /**
     * Tokenizes a source code.
     *
-     * @param string|Twig_Source $code The source code
+     * @param string $code     The source code
-     * @param string             $name A unique identifier for the source code
+     * @param string $filename A unique identifier for the source code
     *
-     * @return Twig_TokenStream
+     * @return Twig_TokenStream A token stream instance
     *
     * @throws Twig_Error_Syntax When the code is syntactically wrong
     */
-    public function tokenize($code, $name = null);
+    public function tokenize($code, $filename = null);
 }
--- a/system/libs/Twig/Loader/Array.php
+++ b/system/libs/Twig/Loader/Array.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -19,18 +19,20 @@
 *
 * This loader should only be used for unit testing.
 *
 * @final
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
-class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
+class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {
    protected $templates = array();
    /**
     * Constructor.
     *
     * @param array $templates An array of templates (keys are the names, and values are the source code)
     *
     * @see Twig_Loader
     */
-    public function __construct(array $templates = array())
+    public function __construct(array $templates)
    {
        $this->templates = $templates;
    }
@@ -46,10 +48,11 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
        $this->templates[(string) $name] = $template;
    }
    /**
     * {@inheritdoc}
     */
    public function getSource($name)
    {
        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
        $name = (string) $name;
        if (!isset($this->templates[$name])) {
            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
@@ -58,21 +61,17 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
        return $this->templates[$name];
    }
-    public function getSourceContext($name)
+    /**
-    {
+     * {@inheritdoc}
-        $name = (string) $name;
+     */
        if (!isset($this->templates[$name])) {
            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
        }
        return new Twig_Source($this->templates[$name], $name);
    }
    public function exists($name)
    {
        return isset($this->templates[(string) $name]);
    }
    /**
     * {@inheritdoc}
     */
    public function getCacheKey($name)
    {
        $name = (string) $name;
@@ -80,9 +79,12 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
        }
-        return $name.':'.$this->templates[$name];
+        return $this->templates[$name];
    }
    /**
     * {@inheritdoc}
     */
    public function isFresh($name, $time)
    {
        $name = (string) $name;
@@ -93,5 +95,3 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
        return true;
    }
 }
 class_alias('Twig_Loader_Array', 'Twig\Loader\ArrayLoader', false);
--- a/system/libs/Twig/Loader/Chain.php
+++ b/system/libs/Twig/Loader/Chain.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2011 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -12,17 +12,17 @@
 /**
 * Loads templates from other loaders.
 *
 * @final
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
-class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
+class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {
    private $hasSourceCache = array();
    protected $loaders = array();
    /**
-     * @param Twig_LoaderInterface[] $loaders
+     * Constructor.
     *
     * @param Twig_LoaderInterface[] $loaders An array of loader instances
     */
    public function __construct(array $loaders = array())
    {
@@ -31,16 +31,22 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
        }
    }
    /**
     * Adds a loader instance.
     *
     * @param Twig_LoaderInterface $loader A Loader instance
     */
    public function addLoader(Twig_LoaderInterface $loader)
    {
        $this->loaders[] = $loader;
        $this->hasSourceCache = array();
    }
    /**
     * {@inheritdoc}
     */
    public function getSource($name)
    {
        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
        $exceptions = array();
        foreach ($this->loaders as $loader) {
            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
@@ -54,31 +60,12 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
            }
        }
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined (%s).', $name, implode(', ', $exceptions)));
    }
    public function getSourceContext($name)
    {
        $exceptions = array();
        foreach ($this->loaders as $loader) {
            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
                continue;
            }
            try {
                if ($loader instanceof Twig_SourceContextLoaderInterface) {
                    return $loader->getSourceContext($name);
                }
                return new Twig_Source($loader->getSource($name), $name);
            } catch (Twig_Error_Loader $e) {
                $exceptions[] = $e->getMessage();
            }
        }
        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
    }
    /**
     * {@inheritdoc}
     */
    public function exists($name)
    {
        $name = (string) $name;
@@ -97,11 +84,7 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
            }
            try {
-                if ($loader instanceof Twig_SourceContextLoaderInterface) {
+                $loader->getSource($name);
                    $loader->getSourceContext($name);
                } else {
                    $loader->getSource($name);
                }
                return $this->hasSourceCache[$name] = true;
            } catch (Twig_Error_Loader $e) {
@@ -111,6 +94,9 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
        return $this->hasSourceCache[$name] = false;
    }
    /**
     * {@inheritdoc}
     */
    public function getCacheKey($name)
    {
        $exceptions = array();
@@ -126,9 +112,12 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
            }
        }
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined (%s).', $name, implode(' ', $exceptions)));
    }
    /**
     * {@inheritdoc}
     */
    public function isFresh($name, $time)
    {
        $exceptions = array();
@@ -144,8 +133,6 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
            }
        }
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined (%s).', $name, implode(' ', $exceptions)));
    }
 }
 class_alias('Twig_Loader_Chain', 'Twig\Loader\ChainLoader', false);
--- a/system/libs/Twig/Loader/Filesystem.php
+++ b/system/libs/Twig/Loader/Filesystem.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -14,28 +14,21 @@
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
-class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
+class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {
    /** Identifier of the main namespace. */
    const MAIN_NAMESPACE = '__main__';
    protected $paths = array();
    protected $cache = array();
    protected $errorCache = array();
    private $rootPath;
    /**
-     * @param string|array $paths    A path or an array of paths where to look for templates
+     * Constructor.
-     * @param string|null  $rootPath The root path common to all relative paths (null for getcwd())
+     *
     * @param string|array $paths A path or an array of paths where to look for templates
     */
-    public function __construct($paths = array(), $rootPath = null)
+    public function __construct($paths = array())
    {
        $this->rootPath = (null === $rootPath ? getcwd() : $rootPath).DIRECTORY_SEPARATOR;
        if (false !== $realPath = realpath($rootPath)) {
            $this->rootPath = $realPath.DIRECTORY_SEPARATOR;
        }
        if ($paths) {
            $this->setPaths($paths);
        }
@@ -87,18 +80,17 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
     * Adds a path where templates are stored.
     *
     * @param string $path      A path where to look for templates
-     * @param string $namespace A path namespace
+     * @param string $namespace A path name
     *
     * @throws Twig_Error_Loader
     */
    public function addPath($path, $namespace = self::MAIN_NAMESPACE)
    {
        // invalidate the cache
-        $this->cache = $this->errorCache = array();
+        $this->cache = array();
-        $checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
+        if (!is_dir($path)) {
-        if (!is_dir($checkPath)) {
+            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist ("%s").', $path, $checkPath));
        }
        $this->paths[$namespace][] = rtrim($path, '/\\');
@@ -108,18 +100,17 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
     * Prepends a path where templates are stored.
     *
     * @param string $path      A path where to look for templates
-     * @param string $namespace A path namespace
+     * @param string $namespace A path name
     *
     * @throws Twig_Error_Loader
     */
    public function prependPath($path, $namespace = self::MAIN_NAMESPACE)
    {
        // invalidate the cache
-        $this->cache = $this->errorCache = array();
+        $this->cache = array();
-        $checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
+        if (!is_dir($path)) {
-        if (!is_dir($checkPath)) {
+            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist ("%s").', $path, $checkPath));
        }
        $path = rtrim($path, '/\\');
@@ -131,31 +122,25 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
        }
    }
    /**
     * {@inheritdoc}
     */
    public function getSource($name)
    {
        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
        return file_get_contents($this->findTemplate($name));
    }
-    public function getSourceContext($name)
+    /**
-    {
+     * {@inheritdoc}
-        $path = $this->findTemplate($name);
+     */
        return new Twig_Source(file_get_contents($path), $name, $path);
    }
    public function getCacheKey($name)
    {
-        $path = $this->findTemplate($name);
+        return $this->findTemplate($name);
        $len = strlen($this->rootPath);
        if (0 === strncmp($this->rootPath, $path, $len)) {
            return substr($path, $len);
        }
        return $path;
    }
    /**
     * {@inheritdoc}
     */
    public function exists($name)
    {
        $name = $this->normalizeName($name);
@@ -165,14 +150,17 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
        }
        try {
-            return false !== $this->findTemplate($name, false);
+            $this->findTemplate($name);
        } catch (Twig_Error_Loader $exception) {
            @trigger_error(sprintf('In %s::findTemplate(), you must accept a second argument that when set to "false" returns "false" instead of throwing an exception. Not supporting this argument is deprecated since version 1.27.', get_class($this)), E_USER_DEPRECATED);
            return true;
        } catch (Twig_Error_Loader $exception) {
            return false;
        }
    }
    /**
     * {@inheritdoc}
     */
    public function isFresh($name, $time)
    {
        return filemtime($this->findTemplate($name)) <= $time;
@@ -180,40 +168,21 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
    protected function findTemplate($name)
    {
        $throw = func_num_args() > 1 ? func_get_arg(1) : true;
        $name = $this->normalizeName($name);
        if (isset($this->cache[$name])) {
            return $this->cache[$name];
        }
        if (isset($this->errorCache[$name])) {
            if (!$throw) {
                return false;
            }
            throw new Twig_Error_Loader($this->errorCache[$name]);
        }
        $this->validateName($name);
        list($namespace, $shortname) = $this->parseName($name);
        if (!isset($this->paths[$namespace])) {
-            $this->errorCache[$name] = sprintf('There are no registered paths for namespace "%s".', $namespace);
+            throw new Twig_Error_Loader(sprintf('There are no registered paths for namespace "%s".', $namespace));
            if (!$throw) {
                return false;
            }
            throw new Twig_Error_Loader($this->errorCache[$name]);
        }
        foreach ($this->paths[$namespace] as $path) {
            if (!$this->isAbsolutePath($path)) {
                $path = $this->rootPath.'/'.$path;
            }
            if (is_file($path.'/'.$shortname)) {
                if (false !== $realpath = realpath($path.'/'.$shortname)) {
                    return $this->cache[$name] = $realpath;
@@ -223,13 +192,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
            }
        }
-        $this->errorCache[$name] = sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]));
+        throw new Twig_Error_Loader(sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace])));
        if (!$throw) {
            return false;
        }
        throw new Twig_Error_Loader($this->errorCache[$name]);
    }
    protected function parseName($name, $default = self::MAIN_NAMESPACE)
@@ -250,7 +213,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
    protected function normalizeName($name)
    {
-        return preg_replace('#/{2,}#', '/', str_replace('\\', '/', (string) $name));
+        return preg_replace('#/{2,}#', '/', strtr((string) $name, '\\', '/'));
    }
    protected function validateName($name)
@@ -274,17 +237,4 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
            }
        }
    }
    private function isAbsolutePath($file)
    {
        return strspn($file, '/\\', 0, 1)
            || (strlen($file) > 3 && ctype_alpha($file[0])
                && substr($file, 1, 1) === ':'
                && strspn($file, '/\\', 2, 1)
            )
            || null !== parse_url($file, PHP_URL_SCHEME)
        ;
    }
 }
 class_alias('Twig_Loader_Filesystem', 'Twig\Loader\FilesystemLoader', false);
--- a/system/libs/Twig/Loader/String.php
+++ b/system/libs/Twig/Loader/String.php
@@ -3,14 +3,12 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
@trigger_error('The Twig_Loader_String class is deprecated since version 1.18.1 and will be removed in 2.0. Use Twig_Loader_Array instead or Twig_Environment::createTemplate().', E_USER_DEPRECATED);
 /**
 * Loads a template from a string.
 *
@@ -23,34 +21,37 @@
 *
 * @deprecated since 1.18.1 (to be removed in 2.0)
 *
 * @internal
 *
 * @author Fabien Potencier <fabien@symfony.com>
 */
-class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
+class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
 {
    /**
     * {@inheritdoc}
     */
    public function getSource($name)
    {
        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
        return $name;
    }
-    public function getSourceContext($name)
+    /**
-    {
+     * {@inheritdoc}
-        return new Twig_Source($name, $name);
+     */
    }
    public function exists($name)
    {
        return true;
    }
    /**
     * {@inheritdoc}
     */
    public function getCacheKey($name)
    {
        return $name;
    }
    /**
     * {@inheritdoc}
     */
    public function isFresh($name, $time)
    {
        return true;
--- a/system/libs/Twig/LoaderInterface.php
+++ b/system/libs/Twig/LoaderInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -24,8 +24,6 @@ interface Twig_LoaderInterface
     * @return string The template source code
     *
     * @throws Twig_Error_Loader When $name is not found
     *
     * @deprecated since 1.27 (to be removed in 2.0), implement Twig_SourceContextLoaderInterface
     */
    public function getSource($name);
@@ -53,5 +51,3 @@ interface Twig_LoaderInterface
     */
    public function isFresh($name, $time);
 }
 class_alias('Twig_LoaderInterface', 'Twig\Loader\LoaderInterface', false);
--- a/system/libs/Twig/Markup.php
+++ b/system/libs/Twig/Markup.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2010 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -35,5 +35,3 @@ class Twig_Markup implements Countable
        return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
    }
 }
 class_alias('Twig_Markup', 'Twig\Markup', false);
--- a/system/libs/Twig/Node.php
+++ b/system/libs/Twig/Node.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -22,8 +22,6 @@ class Twig_Node implements Twig_NodeInterface
    protected $lineno;
    protected $tag;
    private $name;
    /**
     * Constructor.
     *
@@ -37,11 +35,6 @@ class Twig_Node implements Twig_NodeInterface
     */
    public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
    {
        foreach ($nodes as $name => $node) {
            if (!$node instanceof Twig_NodeInterface) {
                @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
            }
        }
        $this->nodes = $nodes;
        $this->attributes = $attributes;
        $this->lineno = $lineno;
@@ -81,8 +74,6 @@ class Twig_Node implements Twig_NodeInterface
     */
    public function toXml($asDom = false)
    {
        @trigger_error(sprintf('%s is deprecated since version 1.16.1 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
        $dom = new DOMDocument('1.0', 'UTF-8');
        $dom->formatOutput = true;
        $dom->appendChild($xml = $dom->createElement('twig'));
@@ -108,7 +99,7 @@ class Twig_Node implements Twig_NodeInterface
            $node->appendChild($child);
        }
-        return $asDom ? $dom : $dom->saveXML();
+        return $asDom ? $dom : $dom->saveXml();
    }
    public function compile(Twig_Compiler $compiler)
@@ -118,18 +109,8 @@ class Twig_Node implements Twig_NodeInterface
        }
    }
    public function getTemplateLine()
    {
        return $this->lineno;
    }
    /**
     * @deprecated since 1.27 (to be removed in 2.0)
     */
    public function getLine()
    {
        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateLine() instead.', E_USER_DEPRECATED);
        return $this->lineno;
    }
@@ -139,7 +120,11 @@ class Twig_Node implements Twig_NodeInterface
    }
    /**
-     * @return bool
+     * Returns true if the attribute is defined.
     *
     * @param string $name The attribute name
     *
     * @return bool true if the attribute is defined, false otherwise
     */
    public function hasAttribute($name)
    {
@@ -147,6 +132,10 @@ class Twig_Node implements Twig_NodeInterface
    }
    /**
     * Gets an attribute value by name.
     *
     * @param string $name
     *
     * @return mixed
     */
    public function getAttribute($name)
@@ -159,6 +148,8 @@ class Twig_Node implements Twig_NodeInterface
    }
    /**
     * Sets an attribute by name to a value.
     *
     * @param string $name
     * @param mixed  $value
     */
@@ -167,12 +158,21 @@ class Twig_Node implements Twig_NodeInterface
        $this->attributes[$name] = $value;
    }
    /**
     * Removes an attribute by name.
     *
     * @param string $name
     */
    public function removeAttribute($name)
    {
        unset($this->attributes[$name]);
    }
    /**
     * Returns true if the node with the given name exists.
     *
     * @param string $name
     *
     * @return bool
     */
    public function hasNode($name)
@@ -181,6 +181,10 @@ class Twig_Node implements Twig_NodeInterface
    }
    /**
     * Gets a node by name.
     *
     * @param string $name
     *
     * @return Twig_Node
     */
    public function getNode($name)
@@ -192,15 +196,22 @@ class Twig_Node implements Twig_NodeInterface
        return $this->nodes[$name];
    }
    /**
     * Sets a node.
     *
     * @param string    $name
     * @param Twig_Node $node
     */
    public function setNode($name, $node = null)
    {
        if (!$node instanceof Twig_NodeInterface) {
            @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
        }
        $this->nodes[$name] = $node;
    }
    /**
     * Removes a node by name.
     *
     * @param string $name
     */
    public function removeNode($name)
    {
        unset($this->nodes[$name]);
@@ -215,42 +226,4 @@ class Twig_Node implements Twig_NodeInterface
    {
        return new ArrayIterator($this->nodes);
    }
    public function setTemplateName($name)
    {
        $this->name = $name;
        foreach ($this->nodes as $node) {
            if (null !== $node) {
                $node->setTemplateName($name);
            }
        }
    }
    public function getTemplateName()
    {
        return $this->name;
    }
    /**
     * @deprecated since 1.27 (to be removed in 2.0)
     */
    public function setFilename($name)
    {
        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use setTemplateName() instead.', E_USER_DEPRECATED);
        $this->setTemplateName($name);
    }
    /**
     * @deprecated since 1.27 (to be removed in 2.0)
     */
    public function getFilename()
    {
        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', E_USER_DEPRECATED);
        return $this->name;
    }
 }
 class_alias('Twig_Node', 'Twig\Node\Node', false);
 class_exists('Twig_Compiler');
--- a/system/libs/Twig/Node/AutoEscape.php
+++ b/system/libs/Twig/Node/AutoEscape.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -27,10 +27,13 @@ class Twig_Node_AutoEscape extends Twig_Node
        parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
    }
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler->subcompile($this->getNode('body'));
    }
 }
 class_alias('Twig_Node_AutoEscape', 'Twig\Node\AutoEscapeNode', false);
--- a/system/libs/Twig/Node/Block.php
+++ b/system/libs/Twig/Node/Block.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -22,6 +22,11 @@ class Twig_Node_Block extends Twig_Node
        parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
    }
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler
@@ -37,5 +42,3 @@ class Twig_Node_Block extends Twig_Node
        ;
    }
 }
 class_alias('Twig_Node_Block', 'Twig\Node\BlockNode', false);
--- a/system/libs/Twig/Node/BlockReference.php
+++ b/system/libs/Twig/Node/BlockReference.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -22,6 +22,11 @@ class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInter
        parent::__construct(array(), array('name' => $name), $lineno, $tag);
    }
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler
@@ -30,5 +35,3 @@ class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInter
        ;
    }
 }
 class_alias('Twig_Node_BlockReference', 'Twig\Node\BlockReferenceNode', false);
--- a/system/libs/Twig/Node/Body.php
+++ b/system/libs/Twig/Node/Body.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2011 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -17,5 +17,3 @@
 class Twig_Node_Body extends Twig_Node
 {
 }
 class_alias('Twig_Node_Body', 'Twig\Node\BodyNode', false);
--- a/system/libs/Twig/Node/CheckSecurity.php
+++ b/system/libs/Twig/Node/CheckSecurity.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2015 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -33,7 +33,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
        foreach (array('tags', 'filters', 'functions') as $type) {
            foreach ($this->{'used'.ucfirst($type)} as $name => $node) {
                if ($node instanceof Twig_Node) {
-                    ${$type}[$name] = $node->getTemplateLine();
+                    ${$type}[$name] = $node->getLine();
                } else {
                    ${$type}[$node] = null;
                }
@@ -46,7 +46,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
            ->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n")
            ->write("try {\n")
            ->indent()
-            ->write("\$this->env->getExtension('Twig_Extension_Sandbox')->checkSecurity(\n")
+            ->write("\$this->env->getExtension('sandbox')->checkSecurity(\n")
            ->indent()
            ->write(!$tags ? "array(),\n" : "array('".implode("', '", array_keys($tags))."'),\n")
            ->write(!$filters ? "array(),\n" : "array('".implode("', '", array_keys($filters))."'),\n")
@@ -56,7 +56,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
            ->outdent()
            ->write("} catch (Twig_Sandbox_SecurityError \$e) {\n")
            ->indent()
-            ->write("\$e->setSourceContext(\$this->getSourceContext());\n\n")
+            ->write("\$e->setTemplateFile(\$this->getTemplateName());\n\n")
            ->write("if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {\n")
            ->indent()
            ->write("\$e->setTemplateLine(\$tags[\$e->getTagName()]);\n")
@@ -76,5 +76,3 @@ class Twig_Node_CheckSecurity extends Twig_Node
        ;
    }
 }
 class_alias('Twig_Node_CheckSecurity', 'Twig\Node\CheckSecurityNode', false);
--- a/system/libs/Twig/Node/Do.php
+++ b/system/libs/Twig/Node/Do.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2011 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -21,6 +21,11 @@ class Twig_Node_Do extends Twig_Node
        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
    }
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler
@@ -31,5 +36,3 @@ class Twig_Node_Do extends Twig_Node
        ;
    }
 }
 class_alias('Twig_Node_Do', 'Twig\Node\DoNode', false);
--- a/system/libs/Twig/Node/Embed.php
+++ b/system/libs/Twig/Node/Embed.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2012 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -17,13 +17,11 @@
 class Twig_Node_Embed extends Twig_Node_Include
 {
    // we don't inject the module to avoid node visitors to traverse it twice (as it will be already visited in the main module)
-    public function __construct($name, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
+    public function __construct($filename, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
    {
        parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
-        $this->setAttribute('name', $name);
+        $this->setAttribute('filename', $filename);
        // to be removed in 2.0, used name instead
        $this->setAttribute('filename', $name);
        $this->setAttribute('index', $index);
    }
@@ -31,16 +29,14 @@ class Twig_Node_Embed extends Twig_Node_Include
    {
        $compiler
            ->write('$this->loadTemplate(')
-            ->string($this->getAttribute('name'))
+            ->string($this->getAttribute('filename'))
            ->raw(', ')
-            ->repr($this->getTemplateName())
+            ->repr($compiler->getFilename())
            ->raw(', ')
-            ->repr($this->getTemplateLine())
+            ->repr($this->getLine())
            ->raw(', ')
            ->string($this->getAttribute('index'))
            ->raw(')')
        ;
    }
 }
 class_alias('Twig_Node_Embed', 'Twig\Node\EmbedNode', false);
--- a/system/libs/Twig/Node/Expression.php
+++ b/system/libs/Twig/Node/Expression.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -18,5 +18,3 @@
 abstract class Twig_Node_Expression extends Twig_Node
 {
 }
 class_alias('Twig_Node_Expression', 'Twig\Node\Expression\AbstractExpression', false);
--- a/system/libs/Twig/Node/Expression/Array.php
+++ b/system/libs/Twig/Node/Expression/Array.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -43,7 +43,7 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
        foreach ($this->getKeyValuePairs() as $pair) {
            // we compare the string representation of the keys
            // to avoid comparing the line numbers which are not relevant here.
-            if ((string) $key === (string) $pair['key']) {
+            if ((string) $key == (string) $pair['key']) {
                return true;
            }
        }
@@ -54,12 +54,17 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
    public function addElement(Twig_Node_Expression $value, Twig_Node_Expression $key = null)
    {
        if (null === $key) {
-            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getTemplateLine());
+            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getLine());
        }
        array_push($this->nodes, $key, $value);
    }
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler->raw('array(');
@@ -79,5 +84,3 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
        $compiler->raw(')');
    }
 }
 class_alias('Twig_Node_Expression_Array', 'Twig\Node\Expression\ArrayExpression', false);
--- a/system/libs/Twig/Node/Expression/AssignName.php
+++ b/system/libs/Twig/Node/Expression/AssignName.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -12,6 +12,11 @@
 class Twig_Node_Expression_AssignName extends Twig_Node_Expression_Name
 {
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler
@@ -21,5 +26,3 @@ class Twig_Node_Expression_AssignName extends Twig_Node_Expression_Name
        ;
    }
 }
 class_alias('Twig_Node_Expression_AssignName', 'Twig\Node\Expression\AssignNameExpression', false);
--- a/system/libs/Twig/Node/Expression/Binary.php
+++ b/system/libs/Twig/Node/Expression/Binary.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,6 +16,11 @@ abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
        parent::__construct(array('left' => $left, 'right' => $right), array(), $lineno);
    }
    /**
     * Compiles the node to PHP.
     *
     * @param Twig_Compiler $compiler A Twig_Compiler instance
     */
    public function compile(Twig_Compiler $compiler)
    {
        $compiler
@@ -33,5 +38,3 @@ abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
    abstract public function operator(Twig_Compiler $compiler);
 }
 class_alias('Twig_Node_Expression_Binary', 'Twig\Node\Expression\Binary\AbstractBinary', false);
--- a/system/libs/Twig/Node/Expression/Binary/Add.php
+++ b/system/libs/Twig/Node/Expression/Binary/Add.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,5 +16,3 @@ class Twig_Node_Expression_Binary_Add extends Twig_Node_Expression_Binary
        return $compiler->raw('+');
    }
 }
 class_alias('Twig_Node_Expression_Binary_Add', 'Twig\Node\Expression\Binary\AddBinary', false);
--- a/system/libs/Twig/Node/Expression/Binary/And.php
+++ b/system/libs/Twig/Node/Expression/Binary/And.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,5 +16,3 @@ class Twig_Node_Expression_Binary_And extends Twig_Node_Expression_Binary
        return $compiler->raw('&&');
    }
 }
 class_alias('Twig_Node_Expression_Binary_And', 'Twig\Node\Expression\Binary\AndBinary', false);
--- a/system/libs/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ b/system/libs/Twig/Node/Expression/Binary/BitwiseAnd.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,5 +16,3 @@ class Twig_Node_Expression_Binary_BitwiseAnd extends Twig_Node_Expression_Binary
        return $compiler->raw('&');
    }
 }
 class_alias('Twig_Node_Expression_Binary_BitwiseAnd', 'Twig\Node\Expression\Binary\BitwiseAndBinary', false);
--- a/system/libs/Twig/Node/Expression/Binary/BitwiseOr.php
+++ b/system/libs/Twig/Node/Expression/Binary/BitwiseOr.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,5 +16,3 @@ class Twig_Node_Expression_Binary_BitwiseOr extends Twig_Node_Expression_Binary
        return $compiler->raw('|');
    }
 }
 class_alias('Twig_Node_Expression_Binary_BitwiseOr', 'Twig\Node\Expression\Binary\BitwiseOrBinary', false);
--- a/system/libs/Twig/Node/Expression/Binary/BitwiseXor.php
+++ b/system/libs/Twig/Node/Expression/Binary/BitwiseXor.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,5 +16,3 @@ class Twig_Node_Expression_Binary_BitwiseXor extends Twig_Node_Expression_Binary
        return $compiler->raw('^');
    }
 }
 class_alias('Twig_Node_Expression_Binary_BitwiseXor', 'Twig\Node\Expression\Binary\BitwiseXorBinary', false);
--- a/system/libs/Twig/Node/Expression/Binary/Concat.php
+++ b/system/libs/Twig/Node/Expression/Binary/Concat.php
@@ -3,8 +3,8 @@
 /*
 * This file is part of Twig.
 *
- * (c) Fabien Potencier
+ * (c) 2009 Fabien Potencier
- * (c) Armin Ronacher
+ * (c) 2009 Armin Ronacher
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -16,5 +16,3 @@ class Twig_Node_Expression_Binary_Concat extends Twig_Node_Expression_Binary
        return $compiler->raw('.');
    }
 }
 class_alias('Twig_Node_Expression_Binary_Concat', 'Twig\Node\Expression\Binary\ConcatBinary', false);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
slawkens	8af9186098	Update CHANGELOG.md	2019-05-04 08:19:01 +02:00
slawkens	2d427601ee	* release 0.7.11	2019-05-04 00:20:37 +02:00
slawkens	454d4b088d	* Update CHANGELOG.md	2019-04-27 17:39:41 +02:00
slawkens	738bfbfa5c	Fixed guilds "Add new rank function" Exception thrown in OTS_GuildRank::__toString() method https://otland.net/threads/myaac-bug-guild-new-rank.263953/ (cherry picked from commit `4d56650`)	2019-04-09 00:50:56 +02:00
slawkens	03223c1c30	Fix something that Open Tibia developers don't think about	2018-11-07 21:15:47 +01:00
slawkens	3c6f44d6ee	Fix database_name in Usage_Statistics	2018-10-31 07:46:35 +01:00
slawkens	dacc5b9dab	Fix bug where server_config table does not exist (OTHire as an example) Happened in Usage_Statistics class Thanks for reporting the OtLand user - Olddies	2018-10-31 07:45:50 +01:00
slawkens	a4bccbaa34	* change config.lua.ownerEmail to config.mail_address	2018-10-22 09:27:46 +02:00
slawkens	174054237b	* fixed the mystical defect where "Create Account" button was not highlighted (on the account/manage page)	2018-10-22 09:16:53 +02:00
slawkens	bcc81fa34f	(Nothing important) just remove a minus in a word "re-install" (cherry picked from commit `a81824a`)	2018-10-18 08:25:20 +02:00
slawkens	ba1c5e9b2e	* add fatal error message when myaac tables in database do not exist	2018-10-18 08:22:37 +02:00
slawkens	0129c79580	* add an additional text to the install page informing that user can reinstall MyAAC by deleting config.local.php	2018-10-18 08:20:13 +02:00
slawkens	c863ad460a	* fixed multiple mail recipients when using admin mailer function It resulted in mail being sent to all users multiple times..	2018-06-08 21:08:31 +02:00
slawkens	cb08e53103	* fix XSS in forum show_thread	2018-06-01 20:27:34 +02:00
slawkens	d5cc2a1090	* Fixed missing prefix for cache get() and delete() functions Cause those functions to not work correctly.. (cherry picked from commit `b3625df`)	2018-06-01 15:06:30 +02:00
slawkens	6ba8d2c9cb	* forgot to open <head> in install template (cherry picked from commit `050f596`)	2018-05-29 20:33:15 +02:00
slawkens	668e4688c4	* remove whitespaces (IDE formatting)	2018-05-29 20:18:19 +02:00
slawkens	bd19b8665a	* do not display software version	2018-05-29 20:17:39 +02:00
slawkens	c5980f2350	* add .gitattributes (cherry picked from commit `15da31d`)	2018-05-29 20:05:21 +02:00
slawkens1	6c03984f53	* support for some old servers, where arrays are used in config.lua	2018-04-16 20:52:50 +02:00
slawkens1	ecd865f275	* fix #47	2018-03-24 01:25:24 +01:00
Sławek	5f1392e9f4	Updated CHANGELOG.md (format)	2018-03-03 11:35:34 +01:00
slawkens1	d6c10d277d	* add .md extension to CHANGELOG	2018-03-03 11:31:51 +01:00
slawkens1	815b1f9b5b	* update to 0.7.10	2018-03-03 11:31:01 +01:00
slawkens1	66568fbaf1	* fixed saving long ip addresses (unsigned)	2018-02-06 03:55:34 +01:00
slawkens1	18b6404e75	* added robots.txt	2018-02-05 21:32:53 +01:00
slawkens1	17b1f9a391	* fixed default accounts.vote value	2018-02-05 08:21:24 +01:00
Sławek	14137221fd	* minimum PHP is now 5.3.3 * added command to change permissions of system/cache directory	2018-02-05 00:01:11 +01:00
slawkens1	ed4a166d6c	* fixed chrome bug on save ERR_BLOCKED_BY_XSS_AUDITOR	2018-02-04 23:39:56 +01:00
slawkens1	8df12e3d9c	* fixed edit page with php enabled	2018-02-04 23:39:32 +01:00
slawkens1	e2a625efd2	* new configurable: smtp_secure * as described in #43 by miqueiaspenha	2018-01-29 23:12:07 +01:00
Sławek	5b3237770b	Merge pull request #44 from miqueiaspenha/patch-1 Update admin.dashboard.html.twig (GH-44)	2018-01-29 22:58:56 +01:00
slawkens1	4ffb6cf8eb	* fixed #42 * changed mb_strtolower functions to strtolower() - was useless in this case * attemp to fix some bug with PHPMailer not finding its language file * added .idea (phpstorm) to .gitignore	2018-01-26 08:09:55 +01:00
slawkens	2c12ef93aa	* twig requires php 5.3.3	2018-01-23 10:51:19 +01:00
slawkens1	d17c18cabc	* auto add z_polls table on install	2018-01-14 09:45:16 +01:00
slawkens1	eeb09ddce6	* forgot closing curly brace	2018-01-14 09:30:56 +01:00
slawkens1	28683d66ee	* update from master branch * update config.highscores_ids_hidden on install when there are samples already in database	2018-01-14 09:29:41 +01:00
slawkens1	7d2e522d2b	* fixed plugin "You don't have rights to delete"	2018-01-14 09:16:24 +01:00
slawkens1	3fc2bef7c9	* added some names links to the account.management page	2018-01-14 09:00:48 +01:00
slawkens1	fade78efc1	* fixed hooks return value * (internal) added new function: $hooks->exist($type)	2018-01-14 09:00:39 +01:00
slawkens1	d04f2b7965	* update to 0.7.10-dev	2018-01-13 22:07:08 +01:00
slawkens1	a9f205f047	* fixed installation (damn me..)	2018-01-13 22:03:28 +01:00
slawkens1	956f631750	* update to 0.7.9	2018-01-13 21:55:47 +01:00
slawkens1	f01428da48	* deleted more useless files	2018-01-13 21:44:06 +01:00
slawkens1	7351ab4436	* changed highscores_groups_hidden to 3 (for TFS 1.x)	2018-01-13 21:19:23 +01:00
slawkens1	d9510b01ba	* fixed default stamina on otserv 0.6.x engine	2018-01-13 19:57:55 +01:00
slawkens1	79589ed1f4	* install: change permission check to is_writable	2018-01-13 19:43:23 +01:00
slawkens1	67590e13a6	* fixes to the latest commit (removed some files) * otserv 0.6.3: fixed some warning (on the characters page) and fatal mysql error (on the mango signature)	2018-01-13 19:43:08 +01:00
slawkens1	1e3aef211e	* removed Thumbs.db	2018-01-13 19:20:46 +01:00
slawkens1	cda8191f79	* removed 6mb of trash (some useless things) * updated background-artwork to the latest version, removed other ones * removed signature background.PSD (instead of an empty background.jpg is provided - almost the same) * removed arial.ttf font, instead arialbd.ttf is used for mango template * added .gitignore file	2018-01-13 19:14:45 +01:00
slawkens1	b91d3e70cc	* (fix) TFS 1.x not showing promoted vocations in highscores	2018-01-12 18:16:50 +01:00
slawkens1	94e4ff313c	* update to 0.7.8	2018-01-12 01:42:14 +01:00
slawkens1	2295d270f5	* fixed installation error " call to undefined method OTS_DB_MySQL::hasColumn()"	2018-01-12 01:26:48 +01:00
slawkens1	a4a829a7c2	* enabled emoticons plugin in tinymce :)	2018-01-08 20:02:50 +01:00
slawkens	f5aae3361f	* uninstall: do not allow directories outside BASE * uninstall: do not allow absolute paths	2018-01-08 17:26:29 +01:00
slawkens	736ec61f85	* some fixes regarding migrations	2018-01-08 14:02:49 +01:00
slawkens	1385189838	* updated tinymce to the latest (4.7.4) version	2018-01-08 13:10:59 +01:00
slawkens	bfa563285a	* some typos in CHANGELOG	2018-01-08 11:51:12 +01:00
slawkens	d0f6670e98	* added some notice to the CHANGELOG	2018-01-08 11:50:34 +01:00
slawkens	ac701696d3	* update CHANGELOG	2018-01-08 11:47:28 +01:00
slawkens	702e29a5cb	* fixed PHP warning about country not existing on online and characteres pages	2018-01-08 11:47:02 +01:00
slawkens	f26c334d47	* fixed characters page - config.characters.frags "Notice: Use of undefined constant"	2018-01-08 11:40:24 +01:00
slawkens	75e55bfaee	* update to 0.7.7	2018-01-08 11:23:21 +01:00
slawkens	0d85b63d5d	* fixed displaying special outfits (GM, CM) in online page	2018-01-08 11:22:46 +01:00
slawkens	14920a7193	* use Forum::isModerator() function	2018-01-08 11:00:11 +01:00
slawkens	5547fd7895	* added new forum option: "Enable HTML" * will be by default enabled for newses * fixed bbcode parsing	2018-01-08 10:41:33 +01:00
slawkens1	34cb1b1ffa	* fixed tr bgcolor (#38 )	2018-01-08 08:11:35 +01:00
slawkens1	4ffe4ab9b7	* update to 0.7.7-dev	2018-01-08 01:10:17 +01:00
slawkens1	bcf054104c	* applied changes from master * important fix for servers with promotion column * caused player.vocation to be resetted when saving player, for example: on change name, accept invite to guild, leave guild * fixed empty success message on leave guild * (internal) using $player->getVocationName() where possible instead of older method * fixed some warning in guild show	2018-01-08 01:05:19 +01:00
slawkens1	9fafa110bb	* nothing important	2018-01-08 00:19:41 +01:00
slawkens1	35acec1be5	* fixed displaying Premium Account days v2	2018-01-08 00:18:11 +01:00
slawkens1	f157402fa3	* fixed displaying premium account days * function OTS_Account:getPremDays will now return -1 if there's freePremium configurable enabled on the server	2018-01-08 00:08:49 +01:00
slawkens1	513e8f4b30	* fixed getBoolean function when boolean is passed	2018-01-08 00:01:32 +01:00
slawkens1	35a5aafbb5	* fixed othire default column value (#26 )	2018-01-07 23:21:41 +01:00
slawkens1	73a5e13006	* fixed warning in highscores when vocation doesn't exist	2018-01-07 12:06:26 +01:00
slawkens1	bcb0feea1a	* fixed saving custom vocations in admin panel (#36 )	2018-01-07 11:58:09 +01:00
slawkens1	774e789c8a	* immediately reload config.lua when there's change in config.server_path detected	2018-01-06 03:08:27 +01:00
slawkens1	db25d38f4b	* some fixes regarding latest commit	2018-01-05 23:43:15 +01:00
slawkens1	4b81213662	* dont add extra <br/> to the TinyMCE news forum posts	2018-01-05 21:45:38 +01:00
slawkens	a860c95975	* update to 0.7.6	2018-01-05 12:02:49 +01:00
slawkens	e2de0b1440	* fixed othire account creating/installation * fixed unexpected error logging about email fail * added max_execution_time to the install finish step	2018-01-05 09:31:11 +01:00
slawkens1	8b2ad2cf2f	* fixed table name players -> players_online	2018-01-05 00:36:30 +01:00
slawkens1	88a320530c	* some small fix regarding highscores vocation box	2018-01-04 00:28:16 +01:00
slawkens1	6e221fe469	* update to 0.7.5	2018-01-04 00:17:57 +01:00
slawkens1	679e08ec11	* fixed displaying article_text when it was empty saved	2018-01-04 00:09:35 +01:00
slawkens1	603495ca97	* small fix related to warning about news * fixed template path finding * fixed news adding when type != ARTICLE	2018-01-03 23:56:07 +01:00
slawkens1	4c6af13574	* save detected country on create account in session * warning about leaving news page with changes	2018-01-03 22:04:33 +01:00
slawkens1	3fcbd42445	* added player status to tibiacom top 5 highscores box * fix when there are no changelogs or highscores yet	2018-01-03 21:28:31 +01:00
slawkens1	e6d2e363d5	* fiedx bug on othire with config.account_premium_days * fixed getPremDays and isPremium functions (newest 11.x engines are bugged when it comes to PACC, its not fault of MyAAC)	2018-01-03 21:04:05 +01:00
slawkens1	0a067577a3	* fixed bug on TFS 1.x when online_afk is enabled	2018-01-03 01:11:34 +01:00
slawkens	a5b599088a	* small fix regarding getTopPlayers function which was ignoring $limit variable	2018-01-02 10:32:08 +01:00
slawkens1	51ba514d2a	* update to 0.7.5-dev * fixed faq containing html code * update item_images_url config to 1092 * added ttf, woff and ico to the list of ignored files * fixed infinite loop in init.php	2017-12-29 11:07:43 +01:00
-.0.0.1
-.0.0.2
-::1