* update to 0.6.3

* fixed showing premium account status

.htaccess.dist

@@ -1,33 +1,7 @@
 Options -Indexes -MultiViews
 
 RewriteEngine On
-#RewriteBase /
 
-# Page parser
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^([A-Za-z0-9-_+']+)\.png/?$ tools/signature/index.php?name=$1 [L]
-RewriteRule ^characters/([A-Za-z0-9-_+']+)$ index.php?subtopic=characters&name=$1
-RewriteRule ^guilds/([A-Za-z0-9-_+']+)$ index.php?subtopic=guilds&action=show&guild=$1
-RewriteRule ^forum/board/([0-9]+)$ index.php?subtopic=forum&action=show_board&id=$1
-RewriteRule ^forum/board/([0-9]+)/([0-9]+)$ index.php?subtopic=forum&action=show_board&id=$1&page=$2
-RewriteRule ^forum/thread/([0-9]+)$ index.php?subtopic=forum&action=show_thread&id=$1
-RewriteRule ^forum/thread/([0-9]+)/([0-9]+)$ index.php?subtopic=forum&action=show_thread&id=$1&page=$2
-RewriteRule ^forum/board/([0-9]+)/([0-9]+)$ index.php?subtopic=forum&action=show_thread&id=$1&page=$2
-RewriteRule ^account/manage$ index.php?subtopic=accountmanagement
-RewriteRule ^account/create$ index.php?subtopic=createaccount
-RewriteRule ^account/lost$ index.php?subtopic=lostaccount
-RewriteRule ^account/logout$ index.php?subtopic=accountmanagement&action=logout
-RewriteRule ^news/archive/([0-9]+)$ index.php?subtopic=newsarchive&id=$1
-RewriteRule ^news/archive$ index.php?subtopic=newsarchive
-RewriteRule ^highscores/([A-Za-z0-9-_]+)/([A-Za-z0-9-_]+)?$ index.php?subtopic=highscores&list=$1&vocation=$2
-RewriteRule ^highscores/([A-Za-z0-9-_']+)$ index.php?subtopic=highscores&list=$1
-RewriteRule ^polls/([0-9]+)$ index.php?subtopic=polls&id=$1
-RewriteRule ^admin/$ admin/index.php
-RewriteRule ^install/$ install/index.php
-
-# temp solution >.>
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^([A-Za-z0-9-_]+)/?$ index.php?p=$1  [L]
-RewriteRule ^([A-Za-z0-9-_]+)/([A-Za-z0-9-_]+)?$ index.php?p=$1&action=$2  [L]
+RewriteRule ^.*$ index.php [L]

CHANGELOG

@@ -1,3 +1,141 @@
+[0.6.3 - 20.10.2017]
+	- fixed creating account
+	- fixed viewing thread without being logged 
+	- fixed showing premium account status
+	
+[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"
+	- added new tooltip to view characters equipment item name and monster loot
+	- added items.xml loader class and weapons.xml loader class
+	- minimum PHP version to install AAC is now 5.3.0 cause of Anonymous functions used by Twig
+	- Added 'Are you sure?' popup when uninstalling plugin
+	- added some warnings when plugin json file is incomplete
+	- fixed showing in characters ban expires when is unlimited
+	- fixed displaying monster loot when item.name in loot is used instead of item.id
+	- load also runes into spells table
+	- display plugin uninstall option only if its possible
+	- after changing template you will be redirected to latest viewed page
+	- display gallery add image form only on main gallery page
+	- (internal) moved most of guilds html-in-php code to twig
+	- (internal) moved spells page to twig template
+	- (internal) removed useless spells.spell column that was duplicate of spells.words
+	- (internal) save monster loot in database in json format instead loading it every time from xml file
+	- (internal) store monster voices and immunities in json format
+	- (internal) moved buttons to separate template
+	- (internal) moved online search form to twig
+	- (internal) added new function getItemNameById($id)
+	- (internal) Moved plugin install logic to a new class: Plugins
+	- (internal) changed spells.vocations database field to store json data instead of comma separated
+	- (internal) removed $hook_types array, using defined() and constant() functions now
+	- (internal) removed useless monsters.gfx_name field from database
+	- (internal) renamed database field monsters.hide_creature to hidden
+	- (internal) renamed existing Items class to Items_Images
+	- (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]
+	- 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)
+	- check if file exist before loading (monsters and spells)
+	- (internal) Account::getAccess() = Account::getGroupId()
+	- (internal) moved account actions (pages) to account/ directory
+	- (internal) moved forum actions (pages) to forum/ directory
+	- (internal) moved forum.edit_post to twig templates
+
+[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
+	- fix for php versions under 5.5 where empty() function supported only variables
+	- added missing change email and change info buttons to account.management default template
+	- added new indicator icons for create account, create character and change character name
+	- fixed config loader when some inline comments are present
+	- fixed editing page in admin panel that contains some html code
+	- fixed forum new post on mac os and some specific mysql versions
+	- attempt to fix incorrect views counter behavior (its resetting to 0 in some cases)
+	- enabled cache http headers for signatures
+	- check if monster file exist before loading it
+	- fixed if plugin zip file name contains dot (.)
+	- renamed screenshots to gallery and movies to videos
+	- moved install pages to twig
+	- fixed Account::getGuildAccess function
+	- removed never used library from sources - dwoo
+	- moved check_* functions to class Validator
+	- from now all validators ajax requests will fire onblur instead of onkeyup
+	- ajax requests returns now json instead of xml
+	- added 404 response when file is not found
+
+[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)
+	- update templates cache when installing/uninstalling plugin
+	- moved character deaths and frags table generation to twig
+	- fixed some bug when you uninstall plugin and then try to install again on the same page
+	- check if plugin exist before uninstalling
+	- fixed some warning in OTS_Base_DB
+
+[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
+	- added option to require specified myaac, php or database version for plugins, without that plugin won't be installed
+	- change accountmanagement links to use friendly_urls
+	- fixed creating new forum thread
+	- sample characters are now assigned to admin account and have group_id 4 to not be shown on highscores
+	- added links loaded from database to admin panel - for future plugins
+	- print some info to error.log when can't find config.lua
+	- some fixes in account changecomment action
+	- show info when account name/number or password is empty on login
+	- fixed showing account login errors
+	- added few characters hooks
+	- fixed some kathrine template js bug when shop is disabled
+	- you can now use slash '/' in custom pages loaded from database
+	- added new twig function getLink that convert link taking into account config.friendly_urls
+	- internalLayoutLink -> getLink
+
+[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
+	- fixed https://otland.net/threads/myaac-v0-0-1.251454/page-13#post-2466303
+	- fixed https://otland.net/threads/myaac-v0-0-1.251454/page-13#post-2466313
+	- fixed rook sample, which will now have level 1, 150 health, 0 mana, and 400 cap.
+	- fixed samples being deleted by tfs 1.0+ cause of 'deletion' field set to 1
+	- pages loaded from database have higher priority than normal .php pages, so they will be loaded first if they exist
+	- moved many pages to twig templates
+	- change download client links from clients.halfaway.net to tibia-clients.com
+	- added bugtracker to kathrine template
+	- added CREDITS file
+
+[0.4.2 - 14.09.2017]
+	- updated version number
+
+[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
+	- 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
+	- log errors instead of showing them to users with system directories
+	- fix when $_SERVER['HTTP_ACCEPT_ENCODING'] is not set
+	- when it fails to load config.lua it will output error also to error.log
+	- automatically detect json file in .zip instead of basing on filename (admin panel - plugins)
+	- hopefully fixed the error with "The file you are trying to upload is not a .zip file. Please try again."
+	- fixed wrong name of table in bugtracker
+	- fixed some bugs in bugtracker
+	- added report bug link in templates
+	- fixed some rare error when user is logged in for longer than 15 minutes and tries to login again
+	- fixed some grammar errors
+	- some small improvements
+	- fixed some separators in kathrine template
+
 [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

CREDITS

@@ -0,0 +1,2 @@
+* Gesior.pl (2007 - 2008)
+* Slawkens (2009 - 2017)

README.md

@@ -1,11 +1,11 @@
 # myaac
-MyAAC is a free and open-source Automatic Account Creator (AAC) written in PHP. It is a fork of the [Gesior](https://github.com/gesior/Gesior2012) project. It supports only MySQL databases.
+MyAAC is a free and open-source Automatic Account Creator (AAC) and Content Management System (CMS) written in PHP. It is a fork of the [Gesior](https://github.com/gesior/Gesior2012) project. It supports only MySQL databases.
 
-Official website: http://my-aac.org
+Official website: https://my-aac.org
 
 ### REQUIREMENTS
 
-	- PHP 5.2.0 or later
+	- PHP 5.3.0 or later
 	- MySQL database
 	- PDO PHP Extension
 	- XML PHP Extension
@@ -27,7 +27,7 @@ Official website: http://my-aac.org
 			chmod 660 config.local.php
 			chmod 660 images/guilds
 			chmod 660 images/houses
-			chmod 660 images/screenshots
+			chmod 660 images/gallery
 
 	Visit http://your_domain/install (http://localhost/install) and follow instructions in the browser.
 

admin/index.php

@@ -9,6 +9,8 @@ if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['i
 	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!');
 }
 
+define('ADMIN_PANEL', true);
+
 $content = '';
 
 // validate page
@@ -25,6 +27,9 @@ require(SYSTEM . 'status.php');
 require(SYSTEM . 'login.php');
 require(ADMIN . 'includes/functions.php');
 
+$twig->addGlobal('config', $config);
+$twig->addGlobal('status', $status);
+
 // if we're not logged in - show login box
 if(!$logged || !admin()) {
 	$page = 'login';

admin/template/style.css

@@ -28,7 +28,7 @@ h1, h2, h3, h4, h5, h6 {color: #313334; font-weight: bold;}
 	margin-left:5px;
 }
 
-.button { background:#eee url(images/button.gif) repeat-x 0 0; border:solid 1px #b1a874; color:#7f7f7f; font-size:11px; padding:2px 6px 2px 6px; cursor:pointer; line-height:14px !important; }
+.button { background:#eee repeat-x 0 0; border:solid 1px #b1a874; color:#7f7f7f; font-size:11px; padding:2px 6px 2px 6px; cursor:pointer; line-height:14px !important; }
 .button:hover { color:#333; border-color:#857b42; }
 
 .field, .button { -moz-border-radius:4px; -webkit-border-radius:4px; }
@@ -126,7 +126,7 @@ a.ico:hover { color:#333;}
 	font-size: 12px;
 }
 #status .success {
-  margin: 0px:
+  margin: 0px;
 }
 #version {
 	position: absolute; top: 10px; right: 10px;

admin/template/template.php

@@ -26,7 +26,7 @@
 				<a href="<?php echo BASE_URL; ?>" target="_blank">Preview</a> <span class="separator">|</span> <a href="?action=logout">Log out<img src="<?php echo BASE_URL; ?>images/icons/logout.png" alt="" title="Log out" /></a>
 			</div>
 			<?php endif; ?>
-			<h1><?php echo $config['lua']['serverName'] . ' - ' . $title; ?> - Admin Panel</h1>
+			<h1><?php echo $config['lua']['serverName'] . (isset($title) ? ' - ' . $title : ''); ?> - Admin Panel</h1>
 		</div>
 		<div id="wrapper">
 			<?php
@@ -43,6 +43,7 @@
 						'Statistics' => 'statistics',
 						'Visitors' => 'visitors',
 						'Players' => 'players',
+						'Items' => 'items',
 						'Tools' => array(
 							'phpinfo' => 'phpinfo'
 						),
@@ -78,6 +79,19 @@
 						}
 						echo '</li>';
 					}
+				
+					$query = $db->query('SELECT `name`, `page`, `flags` FROM `' . TABLE_PREFIX . 'admin_menu` ORDER BY `ordering`');
+					$menu_db = $query->fetchAll();
+					foreach($menu_db as $item) {
+						if($item['flags'] == 0 || hasFlag($item['flags'])) {
+							echo '<li><h3>
+							<a href="?p=' . $item['page'] . '">';
+							if($page == $item['page']) echo '<u>';
+							echo $item['name'];
+							if($page == $item['page']) echo '</u>';
+							echo '</a></h3></li>';
+						}
+					}
 				?>
 				</ul>
 			</div>

common.php

@@ -21,14 +21,14 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 session_start();
 
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.3.0');
-define('DATABASE_VERSION', 7);
+define('MYAAC_VERSION', '0.6.3');
+define('DATABASE_VERSION', 15);
 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'));
@@ -43,8 +43,9 @@ define('FLAG_CONTENT_FORUM', 32);
 define('FLAG_CONTENT_COMMANDS', 64);
 define('FLAG_CONTENT_SPELLS', 128);
 define('FLAG_CONTENT_MONSTERS', 256);
-define('FLAG_CONTENT_SCREENSHOTS', 512);
-define('FLAG_CONTENT_MOVIES', 1024);
+define('FLAG_CONTENT_GALLERY', 512);
+define('FLAG_CONTENT_VIDEOS', 1024);
+define('FLAG_CONTENT_FAQ', 2048);
 
 // news
 define('NEWS', 1);
@@ -59,6 +60,7 @@ define('CACHE', SYSTEM . 'cache/');
 define('LOCALE', SYSTEM . 'locale/');
 define('LIBS', SYSTEM . 'libs/');
 define('LOGS', SYSTEM . 'logs/');
+define('PAGES', SYSTEM . 'pages/');
 define('PLUGINS', BASE . 'plugins/');
 define('TEMPLATES', BASE . 'templates/');
 define('TOOLS', BASE . 'tools/');
@@ -84,12 +86,15 @@ $basedir = str_replace('/admin', '', $basedir);
 $basedir = str_replace('/install', '', $basedir);
 define('BASE_DIR', $basedir);
 
-if(isset($_SERVER['HTTPS'][0]) && $_SERVER['HTTPS'] == 'on')
-	define('SERVER_URL', 'https://' . $_SERVER['HTTP_HOST']);
-else
-	define('SERVER_URL', 'http://' . $_SERVER['HTTP_HOST']);
+if(isset($_SERVER['HTTP_HOST'])) {
+	if (isset($_SERVER['HTTPS'][0]) && $_SERVER['HTTPS'] == 'on')
+		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']);
+	define('BASE_URL', SERVER_URL . BASE_DIR . '/');
+	define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');
+	
+	//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
+}
 ?>

config.php

@@ -13,7 +13,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 
@@ -30,11 +30,13 @@ $config = array(
 	// used for the Downloads page and some templates aswell
 	'client' => 1098, // 954 = client 9.54
 
+	'session_prefix' => 'myaac_', // must be unique for every site on your server
 	'friendly_urls' => false, // mod_rewrite is required for this, it makes links looks more elegant to eye, and also are SEO friendly (example: http://my-aac.org/guilds/Testing instead of http://my-aac.org/?subtopic=guilds&name=Testing). Remember to rename .htaccess.dist to .htaccess
 	'gzip_output' => false, // gzip page content before sending it to the browser, uses less bandwidth but more cpu cycles
 
 	// gesior backward support (templates & pages)
 	// allows using gesior templates and pages with myaac
+	// might bring some performance when disabled
 	'backward_support' => true,
 
 	// head options (html)
@@ -45,7 +47,7 @@ $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 & load time, 6 - queries & memory usage, 7 - all
+	'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,
@@ -65,7 +67,7 @@ $config = array(
 	'database_password' => '',
 	'database_name' => '',
 
-	// multiworld system
+	// multiworld system (only TFS 0.3)
 	'multiworld' => false, // use multiworld system?
 	'worlds' => array( // list of worlds
 		//'1' => 'Your World Name',
@@ -157,7 +159,8 @@ $config = array(
 
 	'signature_enabled' => true,
 	'signature_type' => 'tibian', // signature engine to use: tibian, mango, gesior
-	'signature_cache_time' => 5, // how long to store cached file (in minutes)
+	'signature_cache_time' => 5, // how long to store cached file (in minutes), default 5 minutes
+	'signature_browser_cache' => 60, // how long to cache by browser (in minutes), default 1 hour
 
 	// online page
 	'online_record' => true, // display players record?
@@ -184,6 +187,7 @@ $config = array(
 	'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_length' => 100, // how many records per page on highscores
 
 	// characters page
 	'characters' => array( // what things to display on character view page (true/false in each option)
@@ -201,14 +205,17 @@ $config = array(
 	),
 
 	// news page
-	'news_limit' => 5, // limit of news on latest news page
+	'news_limit' => 5, // limit of news on the latest news page
 	'news_ticker_limit' => 5, // limit of news in tickers (mini news) (0 to disable)
 	'news_date_format' => 'j.n.Y', // check php manual date() function for more info about this
-	'news_author' => true,
+	'news_author' => true, // show author of the news
 
 	// gifts/shop system
 	'gifts_system' => false,
 	
+	// support/system
+	'bug_report' => true,
+
 	// forum
 	'forum' => 'site', // link to the server forum, set to "site" if you want to use build in forum system, otherwise leave empty if you aren't going to use any forum
 	'forum_level_required' => 0, // level required to post, 0 to disable
@@ -228,6 +235,7 @@ $config = array(
 	'google_analytics_id' => '', // e.g.: UA-XXXXXXX-X
 	'experiencetable_columns' => 5, // how many columns to display in experience table page. * experiencetable_rows, 5 = 500 (will show up to 500 level)
 	'experiencetable_rows' => 100, // till how many levels in one column
+	'date_timezone' => 'Europe/Berlin', // more info at http://php.net/manual/en/timezones.php
 	
 	'monsters' => array(),
 	'npc' => array()

index.php

@@ -21,7 +21,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 
@@ -30,6 +30,11 @@
 // ini_set('display_startup_errors', 1);
 // error_reporting(E_ALL);
 
+if(preg_match("/^(.*)\.(gif|jpg|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz)$/i", $_SERVER['REQUEST_URI'])) {
+	header("HTTP/1.0 404 Not Found");
+	exit;
+}
+
 require_once('common.php');
 require_once(BASE . 'config.local.php');
 
@@ -39,21 +44,123 @@ if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['i
 	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!');
 }
 
+require_once(SYSTEM . 'functions.php');
+
+$uri = $_SERVER['REQUEST_URI'];
+
+$tmp = BASE_DIR;
+if(!empty($tmp))
+	$uri = str_replace(BASE_DIR . '/', '', $uri);
+else
+	$uri = str_replace_first('/', '', $uri);
+
+$uri = str_replace(array('index.php/', '?'), '', $uri);
+
+$found = false;
+if(empty($uri) || isset($_REQUEST['template'])) {
+	$_REQUEST['p'] = 'news';
+	$found = true;
+}
+else if(preg_match("/^[A-Za-z0-9-_%\'+]+\.png$/i", $uri)) {
+	$tmp = explode('.', $uri);
+	$_REQUEST['name'] = urldecode($tmp[0]);
+	
+	chdir(TOOLS . 'signature');
+	include(TOOLS . 'signature/index.php');
+	exit();
+}
+else if(!preg_match('/[^A-z0-9_\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $uri . '.php')) {
+	$_REQUEST['p'] = $uri;
+	$found = true;
+}
+else {
+	$rules = array(
+		'/^account\/manage\/?$/' => array('subtopic' => 'accountmanagement'),
+		'/^account\/create\/?$/' => array('subtopic' => 'createaccount'),
+		'/^account\/lost\/?$/' => array('subtopic' => 'lostaccount'),
+		'/^account\/logout\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'logout'),
+		'/^account\/password\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_password'),
+		'/^account\/register\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register'),
+		'/^account\/register\/new\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register_new'),
+		'/^account\/email\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_email'),
+		'/^account\/info\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_info'),
+		'/^account\/character\/create\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'create_character'),
+		'/^account\/character\/name\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_name'),
+		'/^account\/character\/sex\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_sex'),
+		'/^account\/character\/delete\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'delete_character'),
+		'/^account\/character\/comment\/[A-Za-z]+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment', 'name' => '$3'),
+		'/^account\/character\/comment\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment'),
+		'/^characters\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'characters', 'name' => '$1'),
+		'/^commands\/add\/?$/' => array('subtopic' => 'commands', 'action' => 'add'),
+		'/^commands\/edit\/?$/' => array('subtopic' => 'commands', 'action' => 'edit'),
+		'/^faq\/add\/?$/' => array('subtopic' => 'faq', 'action' => 'add'),
+		'/^faq\/edit\/?$/' => array('subtopic' => 'faq', 'action' => 'edit'),
+		'/^forum\/add_board\/?$/' => array('subtopic' => 'forum', 'action' => 'add_board'),#
+		'/^forum\/edit_board\/?$/' => array('subtopic' => 'forum', 'action' => 'edit_board'),
+		'/^forum\/board\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2'),
+		'/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2', 'page' => '$3'),
+		'/^forum\/thread\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2'),
+		'/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2', 'page' => '$3'),
+		'/^gallery\/add\/?$/' => array('subtopic' => 'gallery', 'action' => 'add'),
+		'/^gallery\/edit\/?$/' => array('subtopic' => 'gallery', 'action' => 'edit'),
+		'/^gallery\/[0-9]+\/?$/' => array('subtopic' => 'gallery', 'image' => '$1'),
+		'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+		'/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'),
+		'/^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-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'page' => '$2'),
+		'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2'),
+		'/^highscores\/[A-Za-z0-9-_\']+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1'),
+		'/^news\/add\/?$/' => array('subtopic' => 'news', 'action' => 'add'),
+		'/^news\/edit\/?$/' => array('subtopic' => 'news', 'action' => 'edit'),
+		'/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'),
+		'/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'),
+		'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1'),
+		'/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'spells', 'vocation' => '$1', 'order' => '$2'),
+	);
+	
+	foreach($rules as $rule => $redirect) {
+		if (preg_match($rule, $uri)) {
+			$tmp = explode('/', $uri);
+			foreach($redirect as $key => $value) {
+				
+				if(strpos($value, '$') !== false) {
+					$value = str_replace('$' . $value[1], $tmp[$value[1]], $value);
+				}
+				
+				$_REQUEST[$key] = $value;
+				$_GET[$key] = $value;
+			}
+			
+			$found = true;
+			break;
+		}
+	}
+	
+	if(!$found)
+		$_REQUEST['p'] = $uri;
+}
+
 // define page visited, so it can be used within events system
-$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_GET['p']) ? $_GET['p'] : '');
-if(empty($page) || preg_match('/[^A-z0-9_\-]/', $page))
-	$page = 'news';
+$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_REQUEST['p']) ? $_REQUEST['p'] : '');
+if(empty($page) || preg_match('/[^A-z0-9\/_\-]/', $page)) {
+	if(!$found)
+		$page = '404';
+	else
+		$page = 'news';
+}
 
 $page = strtolower($page);
 define('PAGE', $page);
 
 $template_place_holders = array();
 
-require_once(SYSTEM . 'functions.php');
 require_once(SYSTEM . 'init.php');
+require_once(SYSTEM . 'template.php');
 require_once(SYSTEM . 'login.php');
 require_once(SYSTEM . 'status.php');
-require_once(SYSTEM . 'template.php');
+
+$twig->addGlobal('config', $config);
+$twig->addGlobal('status', $status);
 
 // database migrations
 $tmp = '';
@@ -153,7 +260,7 @@ if($config['backward_support']) {
 	$config['site']['screenshot_page'] = true;
 	
 	if($config['forum'] != '')
-		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? internalLayoutLink('forum') : $config['forum']);
+		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? getLink('forum') : $config['forum']);
 
 	foreach($status as $key => $value)
 		$config['status']['serverStatus_' . $key] = $value;
@@ -168,58 +275,59 @@ if($load_it)
 		require(SYSTEM . 'compat_pages.php');
 
 	$ignore = false;
-	$file = SYSTEM . 'pages/' . $page . '.php';
-	if(!@file_exists($file))
+
+	$logged_access = 0;
+	if($logged && $account_logged && $account_logged->isLoaded()) {
+		$logged_access = $account_logged->getAccess();
+	}
+
+	$query =
+		$db->query(
+			'SELECT `title`, `body`, `php`' .
+			' FROM `' . TABLE_PREFIX . 'pages`' .
+			' WHERE `name` LIKE ' . $db->quote($page) . ' AND `hidden` != 1 AND `access` <= ' . $db->quote($logged_access));
+	if($query->rowCount() > 0) // found page
 	{
-		$logged_access = 0;
-		if($logged && $account_logged && $account_logged->isLoaded()) {
-			$logged_access = $account_logged->getAccess();
-		}
+		$ignore = true;
+		$query = $query->fetch();
+		$title = $query['title'];
 
-		$query =
-			$db->query(
-				'SELECT `title`, `body`, `php`' .
-				' FROM `' . TABLE_PREFIX . 'pages`' .
-				' WHERE `name` LIKE ' . $db->quote($page) . ' AND `hidden` != 1 AND `access` <= ' . $db->quote($logged_access));
-		if($query->rowCount() > 0) // found page
+		if($query['php'] == '1') // execute it as php code
 		{
-			$ignore = true;
-			$query = $query->fetch();
-			$title = $query['title'];
-
-			if($query['php'] == '1') // execute it as php code
-			{
-				$tmp = substr($query['body'], 0, 10);
-				if(($pos = strpos($tmp, '<?php')) !== false) {
-					$tmp = preg_replace('/<\?php/', '', $query['body'], 1);
-				}
-				else if(($pos = strpos($tmp, '<?')) !== false) {
-					$tmp = preg_replace('/<\?/', '', $query['body'], 1);
-				}
-				else
-					$tmp = $query['body'];
-
-				$php_errors = array();
-				function error_handler($errno, $errstr) {
-					global $php_errors;
-					$php_errors[] = array('errno' => $errno, 'errstr' => $errstr);
-				}
-				set_error_handler('error_handler');
-
-				ob_start();
-				eval($tmp);
-				$content .= ob_get_contents();
-				ob_end_clean();
-
-				restore_error_handler();
-				if(isset($php_errors[0]) && superAdmin()) {
-					var_dump($php_errors);
-				}
+			$tmp = substr($query['body'], 0, 10);
+			if(($pos = strpos($tmp, '<?php')) !== false) {
+				$tmp = preg_replace('/<\?php/', '', $query['body'], 1);
+			}
+			else if(($pos = strpos($tmp, '<?')) !== false) {
+				$tmp = preg_replace('/<\?/', '', $query['body'], 1);
 			}
 			else
-				$content .= $query['body']; // plain html
+				$tmp = $query['body'];
+
+			$php_errors = array();
+			function error_handler($errno, $errstr) {
+				global $php_errors;
+				$php_errors[] = array('errno' => $errno, 'errstr' => $errstr);
+			}
+			set_error_handler('error_handler');
+
+			ob_start();
+			eval($tmp);
+			$content .= ob_get_contents();
+			ob_end_clean();
+
+			restore_error_handler();
+			if(isset($php_errors[0]) && superAdmin()) {
+				var_dump($php_errors);
+			}
 		}
 		else
+			$content .= $query['body']; // plain html
+	}
+	else
+	{
+		$file = SYSTEM . 'pages/' . $page . '.php';
+		if(!@file_exists($file) && !$found)
 		{
 			$page = '404';
 			$file = SYSTEM . 'pages/404.php';

install/includes/functions.php

@@ -62,9 +62,9 @@ function next_buttons($previous = true, $next = true)
 		$ret .= '<input class="button" type="submit" onclick="document.getElementById(\'step\').value=\'' . $steps[$i + 1] . '\';" value="' . $locale['next'] . '" />';
 */
 	if($previous)
-		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i - 1] . '\'; this.form.submit();" value="' . $locale['previous'] . '" />';
+		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i - 1] . '\'; this.form.submit();" value="&laquo; ' . $locale['previous'] . '" />';
 	if($next)
-		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i + 1] . '\'; this.form.submit();" value="' . $locale['next'] . '" />';
+		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i + 1] . '\'; this.form.submit(); " value="' . $locale['next'] . ' &raquo;" />';
 
 	$ret .= '</div>';
 	return $ret;

install/includes/schema.sql

@@ -1,26 +1,37 @@
 CREATE TABLE `myaac_account_actions`
 (
-  `account_id` INT(11) NOT NULL,
-  `ip` INT(11) NOT NULL DEFAULT 0,
-  `ipv6` BINARY(16) NOT NULL DEFAULT 0,
-  `date` INT(11) NOT NULL DEFAULT 0,
-  `action` VARCHAR(255) NOT NULL DEFAULT '',
-  KEY (`account_id`)
+	`account_id` INT(11) NOT NULL,
+	`ip` INT(11) NOT NULL DEFAULT 0,
+	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
+	`action` VARCHAR(255) NOT NULL DEFAULT '',
+	KEY (`account_id`)
+) ENGINE = MyISAM;
+
+CREATE TABLE `myaac_admin_menu`
+(
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`page` VARCHAR(255) NOT NULL DEFAULT '',
+	`ordering` INT(11) NOT NULL DEFAULT 0,
+	`flags` INT(11) NOT NULL DEFAULT 0,
+	`enabled` INT(1) NOT NULL DEFAULT 1,
+	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_bugtracker`
 (
 	`account` VARCHAR(255) NOT NULL,
-	`type` INT(11) NOT NULL,
-	`status` INT(11) NOT NULL,
+	`type` INT(11) NOT NULL DEFAULT 0,
+	`status` INT(11) NOT NULL DEFAULT 0,
 	`text` text NOT NULL,
-	`id` INT(11) NOT NULL,
-	`subject` VARCHAR(255) NOT NULL,
-	`reply` INT(11) NOT NULL,
-	`who` INT(11) NOT NULL,
+	`id` INT(11) NOT NULL DEFAULT 0,
+	`subject` VARCHAR(255) NOT NULL DEFAULT '',
+	`reply` INT(11) NOT NULL DEFAULT 0,
+	`who` INT(11) NOT NULL DEFAULT 0,
 	`uid` INT(11) NOT NULL AUTO_INCREMENT,
-	`tag` INT(11) NOT NULL,
-	PRIMARY KEY  (`uid`)
+	`tag` INT(11) NOT NULL DEFAULT 0,
+	PRIMARY KEY (`uid`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_changelog`
@@ -67,21 +78,23 @@ CREATE TABLE `myaac_faq`
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-CREATE TABLE `myaac_forum_sections`
+CREATE TABLE `myaac_forum_boards`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`name` VARCHAR(32) NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`ordering` INT(11) NOT NULL DEFAULT 0,
 	`closed` TINYINT(1) NOT NULL DEFAULT 0,
+	`guild` INT(11) NOT NULL DEFAULT 0,
+	`access` INT(11) NOT NULL DEFAULT 0,
 	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`, `closed`) VALUES (NULL, 'News', 'News commenting', 1);
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Trade', 'Trade offers.');
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Quests', 'Quest making.');
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Pictures', 'Your pictures.');
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Bug Report', 'Report bugs there.');
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Trade', 'Trade offers.', 1);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Quests', 'Quest making.', 2);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Pictures', 'Your pictures.', 3);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Bug Report', 'Report bugs there.', 4);
 
 CREATE TABLE `myaac_forum`
 (
@@ -112,30 +125,40 @@ CREATE TABLE `myaac_hooks`
 	`name` VARCHAR(30) NOT NULL DEFAULT '',
 	`type` INT(2) NOT NULL DEFAULT 0,
 	`file` VARCHAR(100) NOT NULL,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
 	`enabled` INT(1) NOT NULL DEFAULT 1,
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
+CREATE TABLE `myaac_items`
+(
+	`id` INT(11) NOT NULL,
+	`article` VARCHAR(5) NOT NULL DEFAULT '',
+	`name` VARCHAR(50) NOT NULL DEFAULT '',
+	`plural` VARCHAR(50) NOT NULL DEFAULT '',
+	`attributes` VARCHAR(500) NOT NULL DEFAULT '',
+	PRIMARY KEY (`id`)
+) ENGINE = MyISAM;
+
 CREATE TABLE `myaac_monsters` (
 	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`hide_creature` tinyint(1) NOT NULL default '0',
+	`hidden` tinyint(1) NOT NULL default 0,
 	`name` varchar(255) NOT NULL,
-	`mana` int(11) NOT NULL,
+	`mana` int(11) NOT NULL DEFAULT 0,
 	`exp` int(11) NOT NULL,
 	`health` int(11) NOT NULL,
-	`speed_lvl` int(11) NOT NULL default '1',
+	`speed_lvl` int(11) NOT NULL default 1,
 	`use_haste` tinyint(1) NOT NULL,
 	`voices` text NOT NULL,
 	`immunities` varchar(255) NOT NULL,
 	`summonable` tinyint(1) NOT NULL,
 	`convinceable` tinyint(1) NOT NULL,
 	`race` varchar(255) NOT NULL,
-	`gfx_name` varchar(255) NOT NULL,
-	`file_path` varchar(255) NOT NULL,
+	`loot` varchar(500) NOT NULL,
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-CREATE TABLE `myaac_movies`
+CREATE TABLE `myaac_videos`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`title` VARCHAR(100) NOT NULL DEFAULT '',
@@ -202,7 +225,7 @@ CREATE TABLE `myaac_pages`
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-CREATE TABLE `myaac_screenshots`
+CREATE TABLE `myaac_gallery`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`comment` VARCHAR(255) NOT NULL DEFAULT '',
@@ -214,7 +237,7 @@ CREATE TABLE `myaac_screenshots`
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-INSERT INTO `myaac_screenshots` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/screenshots/demon.jpg', 'images/screenshots/demon_thumb.gif', 'MyAAC');
+INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/gallery/demon.jpg', 'images/gallery/demon_thumb.gif', 'MyAAC');
 
 CREATE TABLE `myaac_spells`
 (
@@ -223,17 +246,18 @@ CREATE TABLE `myaac_spells`
 	`name` VARCHAR(255) NOT NULL,
 	`words` VARCHAR(255) NOT NULL,
 	`category` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - attack, 2 - healing, 3 - summon, 4 - supply, 5 - support',
-	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - rune',
+	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - conjure, 3 - rune',
 	`level` INT(11) NOT NULL DEFAULT 0,
 	`maglevel` INT(11) NOT NULL DEFAULT 0,
 	`mana` INT(11) NOT NULL DEFAULT 0,
 	`soul` TINYINT(3) NOT NULL DEFAULT 0,
 	`conjure_count` TINYINT(3) NOT NULL DEFAULT 0,
+	`item_id` INT(11) NOT NULL DEFAULT 0,
 	`premium` TINYINT(1) NOT NULL DEFAULT 0,
-	`vocations` VARCHAR(32) NOT NULL,
+	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
 	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
-	UNIQUE (`spell`)
+	UNIQUE (`name`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_visitors`
@@ -243,3 +267,12 @@ CREATE TABLE `myaac_visitors`
 	`page` VARCHAR(100) NOT NULL,
 	UNIQUE (`ip`)
 ) ENGINE = MyISAM;
+
+CREATE TABLE `myaac_weapons`
+(
+	`id` INT(11) NOT NULL,
+	`level` INT(11) NOT NULL DEFAULT 0,
+	`maglevel` INT(11) NOT NULL DEFAULT 0,
+	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
+	PRIMARY KEY (`id`)
+) ENGINE = MyISAM;

install/index.php

@@ -10,6 +10,16 @@ require(BASE . 'install/includes/functions.php');
 require(BASE . 'install/includes/locale.php');
 require(BASE . 'config.local.php');
 
+// twig
+require_once LIBS . 'Twig/Autoloader.php';
+Twig_Autoloader::register();
+
+$twig_loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');
+$twig = new Twig_Environment($twig_loader, array(
+	'cache' => CACHE . 'twig/',
+	'auto_reload' => true
+));
+
 if(isset($_POST['vars']))
 {
 	foreach($_POST['vars'] as $key => $value)

install/steps/admin.php

@@ -1,32 +1,14 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
 
-?>
-<form action="<?php echo BASE_URL; ?>install/" method="post" autocomplete="off">
-	<input type="hidden" name="step" id="step" value="finish" />
-	<table>
-<?php
 require(BASE . 'install/includes/config.php');
 if(!$error) {
 	require(BASE . 'install/includes/database.php');
 	
-	foreach(array(USE_ACCOUNT_NAME ? 'account' : 'account_id', 'password') as $value)
-		echo '
-	<tr>
-		<td>
-			<label for="vars_' . $value . '">
-				<span>' . $locale['step_admin_' . $value] . '</span>
-			</label>
-			<br>
-			<input type="text" name="vars[' . $value . ']" id="vars_' . $value . '"' . (isset($_SESSION['var_' . $value]) ? ' value="' . $_SESSION['var_' . $value] . '"' : '') . '/>
-		</td>
-		<td>
-			<em>' . $locale['step_admin_' . $value . '_desc'] . '</em>
-		</td>
-	</tr>';
+	echo $twig->render('install.admin.html.twig', array(
+		'locale' => $locale,
+		'session' => $_SESSION,
+		'buttons' => next_buttons(true, $error ? false : true)
+	));
 }
-	?>
-	</table>
-	<?php echo next_buttons(true, $error ? false : true);
-	?>
-</form>
+?>

install/steps/config.php

@@ -1,7 +1,7 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
 
-$clients = array(
+$clients_list = array(
 	710,
 	740,
 	750,
@@ -63,53 +63,22 @@ $clients = array(
 	1096,
 	1097,
 	1098,
+	1100,
 );
 
-?>
-<form action="<?php echo BASE_URL; ?>install/" method="post" autocomplete="off">
-	<input type="hidden" name="step" id="step" value="database" />
-	<table>
-<?php
-	foreach(array('server_path', 'mail_admin', 'mail_address') as $value)
-		echo '
-	<tr>
-		<td>
-			<label for="vars_' . $value . '">
-				<span>' . $locale['step_config_' . $value] . '</span>
-			</label>
-			<br>
-			<input type="text" name="vars[' . $value . ']" id="vars_' . $value . '"' . (isset($_SESSION['var_' . $value]) ? ' value="' . $_SESSION['var_' . $value] . '"' : '') . '/>
-		</td>
-		<td>
-			<em>' . $locale['step_config_' . $value . '_desc'] . '</em>
-		</td>
-	</tr>';
+$clients = array();
+foreach($clients_list as $client) {
+	$client_version = (string)($client / 100);
+	if(strpos($client_version, '.') == false)
+		$client_version .= '.0';
 	
-echo '
-	<tr>
-		<td>
-			<label for="vars_client">
-				<span>' . $locale['step_config_client'] . '</span>
-			</label>
-			<br>
-			<select name="vars[client]" id="vars_client">';
-				//$i = 0;
-				foreach($clients as $client) {
-					$client_version = (string)($client / 100);
-					if(strpos($client_version, '.') == false)
-						$client_version .= '.0';
-					echo '<option value="' . $client . '">' . $client_version . '</option>';
-				}
+	$clients[$client] = $client_version;
+}
 
-		echo '
-		</td>
-		<td>
-			<em>' . $locale['step_config_client_desc'] . '</em>
-		</td>
-	</tr>';
-	?>
-	</table>
-<?php
-	echo next_buttons(true, true);
+echo $twig->render('install.config.html.twig', array(
+	'clients' => $clients,
+	'locale' => $locale,
+	'session' => $_SESSION,
+	'buttons' => next_buttons()
+));
 ?>
-</form>

install/steps/database.php

@@ -1,5 +1,6 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
+
 //ini_set('display_errors', false);
 ini_set('max_execution_time', 300);
 $error = false;
@@ -221,18 +222,18 @@ if(!$error) {
 
 			$content .= '$config[\'mail_enabled\'] = true;';
 			$content .= PHP_EOL;
-			if(!check_mail($_SESSION['var_mail_admin'])) {
+			if(!Validator::email($_SESSION['var_mail_admin'])) {
 				error($locale['step_config_mail_admin_error']);
 				$error = true;
 			}
-			if(!check_mail($_SESSION['var_mail_address'])) {
+			if(!Validator::email($_SESSION['var_mail_address'])) {
 				error($locale['step_config_mail_address_error']);
 				$error = true;
 			}
 			
-			$content .= '$config[\'client_download\'] = \'http://clients.halfaway.net/windows.php?tibia=\'. $config[\'client\'];';
+			$content .= '$config[\'client_download\'] = \'http://tibia-clients.com/clients/download/\'. $config[\'client\'] . \'/exe/windows\';';
 			$content .= PHP_EOL;
-			$content .= '$config[\'client_download_linux\'] = \'http://clients.halfaway.net/linux.php?tibia=\'. $config[\'client\'];';
+			$content .= '$config[\'client_download_linux\'] = \'http://tibia-clients.com/clients/download/\'. $config[\'client\'] . \'/tar/linux\';';
 			$content .= PHP_EOL;
 			$content .= '// place for your configuration directives, so you can later easily update myaac';
 			$content .= PHP_EOL;

install/steps/finish.php

@@ -6,14 +6,11 @@ if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['save
 }
 else {
 	require(SYSTEM . 'init.php');
-	//require(BASE . 'install/includes/config.php');
 	if(!$error) {
-		//require(BASE . 'install/includes/database.php');
-
 		if(USE_ACCOUNT_NAME)
-			$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : NULL;
+			$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : null;
 		else
-			$account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : NULL;
+			$account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : null;
 
 		$password = $_SESSION['var_password'];
 		
@@ -23,7 +20,7 @@ else {
 			$salt = generateRandomString(10, false, true, true);
 			$password = $salt . $password;
 		}
-
+/*
 		$account_db = new OTS_Account();
 		$account_db->load(1);
 		if($account_db->isLoaded()) {
@@ -38,12 +35,12 @@ else {
 			if(USE_ACCOUNT_NAME)
 				$new_account->create('dummy_account', 1);
 			else
-				$new_account->create(NULL, 1);
+				$new_account->create(null, 1);
 
 			$new_account->setPassword('for sample characters. ' . generateRandomString(10));
 			$new_account->save();
 		}
-			
+*/
 		$account_db = new OTS_Account();
 		if(isset($account))
 			$account_db->find($account);
@@ -81,7 +78,7 @@ else {
 			else
 				$player_db->setAccountId($account_db->getId());
 			
-			$_SESSION['account'] = $account_db->getId();
+			setSession('account', $account_db->getId());
 		}
 		else {
 			$new_account = new OTS_Account();
@@ -111,12 +108,12 @@ else {
 			else
 				$player_db->setAccountId($new_account->getId());
 			
-			$_SESSION['account'] = $new_account->getId();
+			setSession('account', $new_account->getId());
 		}
 
 		success($locale['step_database_created_account']);
-		$_SESSION['password'] = encrypt($password);
-		$_SESSION['remember_me'] = true;
+		setSession('password', encrypt($password));
+		setSession('remember_me', true);
 
 		if($player_db->isLoaded()) {
 			$player_db->save();
@@ -146,31 +143,31 @@ INSERT INTO `myaac_news` (`id`, `type`, `date`, `category`, `title`, `body`, `pl
 
 		$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, 1, 8, 0, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179613, 2453925456, 1, 1255179614, 0, 1, UNIX_TIMESTAMP(), 1, '');"))
+			if(!query($insert_into_players . "(null, 'Rook Sample', 4, " . getSession('account') . ", 1, 0, 150, 150, 4200, 118, 114, 38, 57, 130, 0, 0, 0, 0, 100, 11, 2200, 1298, 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, 1, 8, 1, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179571, 2453925456, 1, 1255179612, 0, 1, UNIX_TIMESTAMP(), 1, '');"))
+			if(!query($insert_into_players . "(null, 'Sorcerer Sample', 4, " . getSession('account') . ", 8, 1, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 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, 1, 8, 2, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179655, 2453925456, 1, 1255179658, 0, 1, UNIX_TIMESTAMP(), 1, '');"))
+			if(!query($insert_into_players . "(null, 'Druid Sample', 4, " . getSession('account') . ", 8, 2, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 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, 1, 8, 3, 185, 185, 4200, 118, 114, 38, 57, 129, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179854, 2453925456, 1, 1255179858, 0, 1, UNIX_TIMESTAMP(), 1, '');"))
+			if(!query($insert_into_players . "(null, 'Paladin Sample', 4, " . getSession('account') . ", 8, 3, 185, 185, 4200, 118, 114, 38, 57, 129, 0, 35, 35, 0, 100, 11, 2200, 1298, 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, 1, 8, 4, 185, 185, 4200, 118, 114, 38, 57, 131, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179620, 2453925456, 1, 1255179654, 0, 1, UNIX_TIMESTAMP(), 1, '');"))
+			if(!query($insert_into_players . "(null, 'Knight Sample', 4, " . getSession('account') . ", 8, 4, 185, 185, 4200, 118, 114, 38, 57, 131, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179620, 2453925456, 1, 1255179654, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
 				$success = false;
 		}
 
@@ -178,6 +175,27 @@ INSERT INTO `myaac_news` (`id`, `type`, `date`, `category`, `title`, `body`, `pl
 			success($locale['step_database_imported_players']);
 		}
 		
+		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());
+		}
+
 		$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']);

install/steps/license.php

@@ -1,10 +1,8 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
-?>
-<form action="<?php echo BASE_URL; ?>install/" method="post">
-	<input type="hidden" name="step" id="step" value="requirements" />
-	<textarea rows="10" cols="80" readonly="1"><?php echo file_get_contents(BASE . 'LICENSE'); ?></textarea>
 
-	<?php echo next_buttons();
-	?>
-</form>
+echo $twig->render('install.license.html.twig', array(
+	'license' => file_get_contents(BASE . 'LICENSE'),
+	'buttons' => next_buttons()
+));
+?>

install/steps/requirements.php

@@ -22,8 +22,8 @@ function version_check($name, $ok, $info = '', $warning = false)
 $failed = false;
 
 // start validating
-version_check($locale['step_requirements_php_version'], (PHP_VERSION_ID >= 50200), PHP_VERSION);
-foreach(array('config.local.php', 'images/guilds', 'images/houses', 'images/screenshots') as $value)
+version_check($locale['step_requirements_php_version'], (PHP_VERSION_ID >= 50300), PHP_VERSION);
+foreach(array('config.local.php', 'images/guilds', 'images/houses', 'images/gallery') as $value)
 {
 	$perms = (int) substr(decoct(fileperms(BASE . $value)), 2);
 	version_check($locale['step_requirements_write_perms'] . ': ' . $value, $perms >= 660);

install/steps/welcome.php

@@ -5,29 +5,23 @@ if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['save
 }
 else {
 	unset($_SESSION['saved']);
-?>
-<form action="<?php echo BASE_URL; ?>install/" method="post">
-	<input type="hidden" name="step" id="step" value="license" />
-	<div class="input"><p><?php echo $locale['step_welcome_desc']; ?></p>
-		<select name="lang">
-			<?php
-				foreach(get_locales() as $tmp_locale)
-				{
-					$lang_file_main = LOCALE . $tmp_locale . '/main.php';
-					$lang_file_install = LOCALE . $tmp_locale . '/install.php';
-					if(@file_exists($lang_file_main)
-						&& @file_exists($lang_file_install))
-					{
-						require($lang_file_main);
-						echo '<option value="' . $tmp_locale . '">' . $locale['name'] . '</option>';
-					}
-				}
-			?>
-		</select>
-	</div>
 	
-	<?php echo next_buttons(false, true); ?>
-</form>
-<?php
+	$locales = array();
+	foreach(get_locales() as $tmp_locale)
+	{
+		$lang_file_main = LOCALE . $tmp_locale . '/main.php';
+		$lang_file_install = LOCALE . $tmp_locale . '/install.php';
+		if(@file_exists($lang_file_main)
+			&& @file_exists($lang_file_install))
+		{
+			require($lang_file_main);
+			$locales[] = array('id' => $tmp_locale, 'name' => $locale['name']);
+		}
+	}
+	echo $twig->render('install.welcome.html.twig', array(
+		'locales' => $locales,
+		'locale' => $locale,
+		'buttons' => next_buttons(false, true)
+	));
 }
 ?>

plugins/example.json

@@ -1,11 +1,20 @@
 {
-     "name": "Example Plugin",
-	 "description": "This is just an example of a Plugin for MyAAC.",
-     "version": "1.0",
-	 "author": "nobody",
-	 "contact": "nobody@example.org",
-	 "install": "plugins/example/install.php",
-	 "hooks": {
+	"name": "Example Plugin",
+	"description": "This is just an example of a Plugin for MyAAC.",
+	"version": "1.0",
+	"author": "nobody",
+	"contact": "nobody@example.org",
+	"require": {
+		"myaac": "0.4.3",
+		"php": "5.2.0"
+	},
+	"install": "plugins/example/install.php",
+	"uninstall": [
+		"plugins/example.json",
+		"plugins/example/install.php",
+		"plugins/example/before.php"
+	],
+	"hooks": {
 		"Example Hook": {
 			"type": "BEFORE_PAGE",
 			"file": "plugins/example/before.php"

system/bin/install_plugin.php

@@ -0,0 +1,38 @@
+<?php
+
+if(php_sapi_name() != "cli") {
+	die('This script can be run only in command line mode.');
+}
+
+require_once('../../common.php');
+require_once(SYSTEM . 'functions.php');
+require_once(SYSTEM . 'init.php');
+require_once(LIBS . 'plugins.php');
+
+if($argc != 2) {
+	exit('This command expects one parameter: zip file name (plugin)' . PHP_EOL);
+}
+
+$path_to_file = $argv[1];
+$ext = strtolower(pathinfo($path_to_file, PATHINFO_EXTENSION));
+if($ext != 'zip') {// check if it is zipped/compressed file
+	exit('Please install only .zip files.' . PHP_EOL);
+}
+
+if(!file_exists($path_to_file)) {
+	exit('ERROR: File ' . $path_to_file . ' does not exist' . PHP_EOL);
+}
+
+if(Plugins::install($path_to_file)) {
+	foreach(Plugins::getWarnings() as $warning) {
+		echo 'WARNING: ' . $warning;
+	}
+	
+	$info = Plugins::getPluginInfo();
+	echo (isset($info['name']) ? $info['name'] . ' p' : 'P') . 'lugin has been successfully installed.';
+}
+else
+	echo 'ERROR: ' . Plugins::getError();
+
+echo PHP_EOL;
+?>

system/compat_pages.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/counter.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -15,19 +15,20 @@ $views_counter = 1; // default value, must be here!
 if($cache->enabled())
 {
 	$value = 0;
-	if(!$cache->fetch('views_counter', $value))
+	if(!$cache->fetch('views_counter', $value) || $value <= 1)
 	{
 		$value = 0;
 		if(fetchDatabaseConfig('views_counter', $value))
 			$views_counter = $value;
 		else
-			registerDatabaseConfig('views_counter', 1); // save in the database
+			registerDatabaseConfig('views_counter', 2); // save in the database
 	}
-	else
+	else {
 		$views_counter = $value;
+	}
 
 	$cache->set('views_counter', ++$views_counter, 60 * 60);
-	if(($views_counter % COUNTER_SYNC) == 0) // sync with database
+	if($views_counter > 1 && ($views_counter % COUNTER_SYNC) == 0) // sync with database
 		updateDatabaseConfig('views_counter', $views_counter);
 /*
 	{

system/countries.conf.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/functions.php

@@ -5,17 +5,26 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-function success($message) {
+function success($message, $return = false) {
+	if($return)
+		return '<p class="success">' . $message . '</p>';
+	
 	echo '<p class="success">' . $message . '</p>';
 }
-function warning($message) {
+function warning($message, $return = false) {
+	if($return)
+		return '<p class="warning">' . $message . '</p>';
+	
 	echo '<p class="warning">' . $message . '</p>';
 }
-function error($message) {
+function error($message, $return = false) {
+	if($return)
+		return '<p class="error">' . $message . '</p>';
+	
 	echo '<p class="error">' . $message . '</p>';
 }
 
@@ -29,46 +38,27 @@ function generateLink($url, $name, $blank = false) {
 	return '<a href="' . $url . '"' . ($blank ? ' target="_blank"' : '') . '>' . $name . '</a>';
 }
 
-function getLink($page, $name, $blank = false) {
-	return generateLink(getPageLink($page), $name, $blank);
+function getFullLink($page, $name, $blank = false) {
+	return generateLink(getLink($page), $name, $blank);
 }
 
-function getPageLink($page, $action = null)
+function getLink($page, $action = null)
 {
 	global $config;
-
-	// TODO: tibiacom template is not working correctly with this
-	if($config['friendly_urls'])
-		return BASE_URL . $page . ($action ? '/' . $action : '');
-
-	return BASE_URL . '?subtopic=' . $page . ($action ? '&action=' . $action : '');
+	return BASE_URL . ($config['friendly_urls'] ? '' : '?') . $page . ($action ? '/' . $action : '');
 }
-function internalLayoutLink($page, $action = null) {return getPageLink($page, $action);}
+function internalLayoutLink($page, $action = null) {return getLink($page, $action);}
 
 function getForumThreadLink($thread_id, $page = NULL)
 {
 	global $config;
-
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'forum/thread/' . (int)$thread_id . (isset($page) ? '/' . $page : '');
-	else
-		$url = BASE_URL . '?subtopic=forum&action=show_thread&id=' . (int)$thread_id . (isset($page) ? '&page=' . $page : '');
-
-	return $url;
+	return BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'forum/thread/' . (int)$thread_id . (isset($page) ? '/' . $page : '');
 }
 
 function getForumBoardLink($board_id, $page = NULL)
 {
 	global $config;
-
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'forum/board/' . (int)$board_id . (isset($page) ? '/' . $page : '');
-	else
-		$url = BASE_URL . '?subtopic=forum&action=show_board&id=' . (int)$board_id . (isset($page) ? '&page=' . $page : '');
-
-	return $url;
+	return BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'forum/board/' . (int)$board_id . (isset($page) ? '/' . $page : '');
 }
 
 function getPlayerLink($name, $generate = true)
@@ -83,11 +73,7 @@ function getPlayerLink($name, $generate = true)
 			$name = $player->getName();
 	}
 	
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'characters/' . urlencode($name);
-	else
-		$url = BASE_URL . '?subtopic=characters&name=' . urlencode($name);
+	$url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'characters/' . urlencode($name);
 
 	if(!$generate) return $url;
 	return generateLink($url, $name);
@@ -107,11 +93,7 @@ function getHouseLink($name, $generate = true)
 			$name = $house->fetchColumn();
 	}
 	
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'houses/' . urlencode($name);
-	else
-		$url = BASE_URL . '?subtopic=houses&page=view&house=' . urlencode($name);
+	$url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'houses/' . urlencode($name);
 	
 	if(!$generate) return $url;
 	return generateLink($url, $name);
@@ -124,31 +106,43 @@ function getGuildLink($name, $generate = true)
 	if(is_numeric($name))
 	{
 		$guild = $db->query(
-			'SELECT ' . $db->fieldName('name') .
-			' FROM ' . $db->tableName('guilds') .
-			' WHERE ' . $db->fieldName('id') . ' = ' . (int)$name);
+			'SELECT `name` FROM `guilds` WHERE `id` = ' . (int)$name);
 		if($guild->rowCount() > 0)
 			$name = $guild->fetchColumn();
 	}
 
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'guilds/' . urlencode($name);
-	else
-		$url = BASE_URL . '?subtopic=guilds&action=show&guild=' . urlencode($name);
+	$url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'guilds/' . urlencode($name);
 
 	if(!$generate) return $url;
 	return generateLink($url, $name);
 }
 
+function getItemNameById($id) {
+	global $db;
+	$query = $db->query('SELECT `name` FROM `' . TABLE_PREFIX . 'items` WHERE `id` = ' . $db->quote($id) . ' LIMIT 1;');
+	if($query->rowCount() == 1) {
+		$item = $query->fetch();
+		return $item['name'];
+	}
+	
+	return '';
+}
+
 function getItemImage($id, $count = 1)
 {
+	$tooltip = '';
+	
+	$name = getItemNameById($id);
+	if(!empty($name)) {
+		$tooltip = ' class="tooltip" title="' . $name . '"';
+	}
+
 	$file_name = $id;
 	if($count > 1)
 		$file_name .= '-' . $count;
 
 	global $config;
-	return '<img src="' . $config['item_images_url'] . $file_name . '.gif" width="32" height="32" border="0" alt=" ' .$id . '" />';
+	return '<img src="' . $config['item_images_url'] . $file_name . '.gif"' . $tooltip . ' width="32" height="32" border="0" alt=" ' .$id . '" />';
 }
 
 function getFlagImage($country)
@@ -218,10 +212,11 @@ function generateRandomString($length, $lowCase = true, $upCase = false, $numeri
  *
  * @return array Forum sections.
  */
-function getForumSections()
+function getForumBoards()
 {
-	global $db;
-	$sections = $db->query('SELECT `id`, `name`, `description`, `closed` FROM ' . TABLE_PREFIX . 'forum_sections WHERE hidden != 1 ORDER BY `ordering`;');
+	global $db, $canEdit;
+	$sections = $db->query('SELECT `id`, `name`, `description`, `closed`, `guild`, `access`' . ($canEdit ? ', `hidden`, `ordering`' : '') . ' FROM `' . TABLE_PREFIX . 'forum_boards` ' . (!$canEdit ? ' WHERE `hidden` != 1' : '') .
+		' ORDER BY `ordering`;');
 	if($sections)
 		return $sections->fetchAll();
 	
@@ -255,7 +250,7 @@ function fetchDatabaseConfig($name, &$value)
  */
 function getDatabaseConfig($name)
 {
-	$value = NULL;
+	$value = null;
 	fetchDatabaseConfig($name, $value);
 	return $value;
 }
@@ -406,303 +401,6 @@ function delete_guild($id)
 	return true;
 }
 
-/**
- * Validate character name.
- * Name lenght must be 3-25 chars
- *
- * @param  string $name Name to check
- * @param  string $error Error description will be placed here
- * @return bool Is name valid?
- */
-function check_name($name, &$error = '')
-{
-	if(!isset($name[0]))
-	{
-		$error = 'Please enter character name.';
-		return false;
-	}
-
-	$length = strlen($name);
-	if($length < 3)
-	{
-		$error = 'Character name is too short. Min. lenght <b>3</b> characters.';
-		return false;
-	}
-
-	if($length > 25)
-	{
-		$error = 'Character name is too long. Max. lenght <b>25</b> characters.';
-		return false;
-	}
-
-	if(strspn($name, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM- [ ] '") != $length)
-	{
-		$error = 'Invalid name format. Use only A-Z.';
-		return false;
-	}
-
-	return preg_match("/[A-z ']{1,25}/", $name);
-}
-
-/**
- * Validate account id
- * Id lenght must be 6-10 chars
- *
- * @param string $name Account name to check
- * @param string $error Error description will be placed here
- * @return bool Is account name valid?
- */
-function check_account_id($id, &$error = '')
-{
-	if(!isset($id[0]))
-	{
-		$error = 'Please enter an account.';
-		return false;
-	}
-
-	if(!check_number($id)) {
-		$error = 'Invalid account name format. Use only numbers 0-9.';
-		return false;
-	}
-
-	$length = strlen($id);
-	if($length < 6)
-	{
-		$error = 'Account is too short (min. 6 chars).';
-		return false;
-	}
-
-	if($length > 10)
-	{
-		$error = 'Account is too long (max. 10 chars).';
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * Validate account name
- * Name lenght must be 3-32 chars
- *
- * @param string $name Account name to check
- * @param string $error Error description will be placed here
- * @return bool Is account name valid?
- */
-function check_account_name($name, &$error = '')
-{
-	if(!isset($name[0]))
-	{
-		$error = 'Please enter an account name.';
-		return false;
-	}
-
-	$length = strlen($name);
-	if($length < 3)
-	{
-		$error = 'Account name is too short (min. 3 chars).';
-		return false;
-	}
-
-	if($length > 32)
-	{
-		$error = 'Account name is too long (max. 32 chars).';
-		return false;
-	}
-
-	if(strspn($name, "QWERTYUIOPASDFGHJKLZXCVBNM0123456789") != $length)
-	{
-		$error = 'Invalid account name format. Use only A-Z and numbers 0-9.';
-		return false;
-	}
-
-	return preg_match("/[A-Z0-9]/", $name);
-}
-
-//is it valid nick for new char?
-function check_name_new_char($name, &$error = '')
-{
-	global $db, $config;
-
-	$name_lower = strtolower($name);
-
-	$first_words_blocked = array('admin ', 'administrator ', 'gm ', 'cm ', 'god ','tutor ', "'", '-');
-	foreach($first_words_blocked as $word)
-	{
-		if($word == substr($name_lower, 0, strlen($word))) {
-			$error = 'Your name contains blocked words.';
-			return false;
-		}
-	}
-
-	if(substr($name_lower, -1) == "'" || substr($name_lower, -1) == "-") {
-		$error = 'Your name contains illegal characters.';
-		return false;
-	}
-
-	if(substr($name_lower, 1, 1) == ' ') {
-		$error = 'Your name contains illegal space.';
-		return false;
-	}
-
-	if(substr($name_lower, -2, 1) == " ") {
-		$error = 'Your name contains illegal space.';
-		return false;
-	}
-
-	if(strtolower($config['lua']['serverName']) == $name_lower) {
-		$error = 'Your name cannot be same as server name.';
-		return false;
-	}
-
-	$names_blocked = array('admin', 'administrator', 'gm', 'cm', 'god', 'tutor');
-	foreach($names_blocked as $word)
-	{
-		if($word == $name_lower) {
-			$error = 'Your name contains blocked words.';
-			return false;
-		}
-	}
-
-	$words_blocked = array('admin', 'administrator', 'gamemaster', 'game master', 'game-master', "game'master", '--', "''","' ", " '", '- ', ' -', "-'", "'-", 'fuck', 'sux', 'suck', 'noob', 'tutor');
-	foreach($words_blocked as $word)
-	{
-		if(!(strpos($name_lower, $word) === false)) {
-			$error = 'Your name contains illegal words.';
-			return false;
-		}
-	}
-
-	$name_length = strlen($name_lower);
-	for($i = 0; $i < $name_length; $i++)
-	{
-		if(isset($name_lower[$i]) && isset($name_lower[$i + 1]) && $name_lower[$i] == $name_lower[$i + 1] && isset($name_lower[$i + 2]) && $name_lower[$i] == $name_lower[$i + 2]) {
-			$error = 'Your name is invalid.';
-			return false;
-		}
-	}
-
-	for($i = 0; $i < $name_length; $i++)
-	{
-		if(isset($name_lower[$i - 1]) && $name_lower[$i - 1] == ' ' && isset($name_lower[$i + 1]) && $name_lower[$i + 1] == ' ') {
-			$error = 'Your name contains too many spaces.';
-			return false;
-		}
-	}
-
-	if(isset($config['monsters']))
-	{
-		if(in_array($name_lower, $config['monsters'])) {
-			$error = 'Your name cannot contains monster name.';
-			return false;
-		}
-	}
-
-	$player = new OTS_Player();
-	$player->find($name);
-	if($player->isLoaded()) {
-		$error = 'Player with this name already exist.';
-		return false;
-	}
-
-	//check if was namelocked previously
-	if(tableExist('player_namelocks') && fieldExist('name', 'player_namelocks')) {
-		$namelock = $db->query('SELECT `player_id` FROM `player_namelocks` WHERE `name` = ' . $db->quote($name));
-		if($namelock->rowCount() > 0) {
-			$error =  'Character with this name has been namelocked.';
-			return false;
-		}
-	}
-			
-	$monsters = $db->query(
-			'SELECT ' . $db->fieldName('name') .
-			' FROM ' . $db->tableName(TABLE_PREFIX . 'monsters') .
-			' WHERE ' . $db->fieldName('name') . ' LIKE ' . $db->quote($name_lower));
-	if($monsters->rowCount() > 0) {
-		$error = 'Your name cannot contains monster name.';
-		return false;
-	}
-
-	$spells_name = $db->query(
-			'SELECT ' . $db->fieldName('name') .
-			' FROM ' . $db->tableName(TABLE_PREFIX . 'spells') .
-			' WHERE ' . $db->fieldName('name') . ' LIKE ' . $db->quote($name_lower));
-	if($spells_name->rowCount() > 0) {
-		$error = 'Your name cannot contains spell name.';
-		return false;
-	}
-	
-	$spells_words = $db->query(
-			'SELECT ' . $db->fieldName('words') .
-			' FROM ' . $db->tableName(TABLE_PREFIX . 'spells') .
-			' WHERE ' . $db->fieldName('words') . ' = ' . $db->quote($name_lower));
-	if($spells_words->rowCount() > 0) {
-		$error = 'Your name cannot contains spell name.';
-		return false;
-	}
-
-	if(isset($config['npc']))
-	{
-		if(in_array($name_lower, $config['npc'])) {
-			$error = 'Your name cannot contains NPC name.';
-			return false;
-		}
-	}
-
-	if(strspn($name, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM- '") != $name_length) {
-		$error = 'This name contains invalid letters, words or format. Please use only a-Z, - , \' and space.';
-		return false;
-	}
-
-	if($name_length < 3 || $name_length  > 28) {
-		$error = 'Your name cannot be shorter than 3 characters and longer than 28 characters.';
-		return false;
-	}
-	
-	
-	if(!preg_match("/[A-z ']{3,28}/", $name)) {
-		$error = 'Your name containst illegal characters.';
-		return false;
-	}
-
-	return true;
-}
-
-function check_rank_name($name)
-{
-	if(strspn($name, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM0123456789-[ ] ") != strlen($name))
-		return false;
-
-	return preg_match("/[A-z ]{1,32}/", $name);
-}
-
-function check_guild_name($name)
-{
-	if(strspn($name, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM0123456789- ") != strlen($name))
-		return false;
-
-	return preg_match("/[A-z ]{3,32}/", $name);
-}
-
-function check_password($pass)
-{
-	if(strspn($pass, "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890") != strlen($pass))
-		return false;
-
-	return preg_match("/[A-z0-9]/", $pass);
-}
-
-function check_mail($email)
-{
-	return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[A-z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $email);
-	//return preg_match("/[A-z0-9._-]+@[A-z0-9-]+\.[A-z]{2,4}/", $email);
-}
-
-function check_number($number)
-{
-	return preg_match ("/^([0-9]+)$/", $number);
-}
-
 //################### DISPLAY FUNCTIONS #####################
 //return shorter text (news ticker)
 function short_text($text, $limit)
@@ -751,28 +449,6 @@ function news_place()
 	return $news;
 }
 
-function output_errors($errors)
-{
-	global $template_path;
-?>
-	<div class="SmallBox" >
-		<div class="MessageContainer" >
-		<div class="BoxFrameHorizontal" style="background-image:url(<?php echo $template_path; ?>/images/content/box-frame-horizontal.gif);" /></div>
-		<div class="BoxFrameEdgeLeftTop" style="background-image:url(<?php echo $template_path; ?>/images/content/box-frame-edge.gif);" /></div>
-		<div class="BoxFrameEdgeRightTop" style="background-image:url(<?php echo $template_path; ?>/images/content/box-frame-edge.gif);" /></div>
-		<div class="ErrorMessage" >
-			<div class="BoxFrameVerticalLeft" style="background-image:url(<?php echo $template_path; ?>/images/content/box-frame-vertical.gif);" />
-		</div>
-			<div class="BoxFrameVerticalRight" style="background-image:url(<?php echo $template_path; ?>/images/content/box-frame-vertical.gif);" /></div>
-			<div class="AttentionSign" style="background-image:url(<?php echo $template_path; ?>/images/content/attentionsign.gif);" />
-			</div><b>The Following Errors Have Occurred:</b><br/>
-	<?php
-	foreach($errors as $field => $message)
-		echo $message . '<br/>';
-
-	echo '</div>    <div class="BoxFrameHorizontal" style="background-image:url('.$template_path.'/images/content/box-frame-horizontal.gif);" /></div>    <div class="BoxFrameEdgeRightBottom" style="background-image:url('.$template_path.'/images/content/box-frame-edge.gif);" /></div>    <div class="BoxFrameEdgeLeftBottom" style="background-image:url('.$template_path.'/images/content/box-frame-edge.gif);" /></div>  </div></div><br/>';
-}
-
 /**
  * Template place holder
  *
@@ -823,11 +499,7 @@ function template_header($is_admin = false)
 			Please turn it on, or be aware that some features on this website will not work correctly.</div>
 	</noscript>
 ';
-	if(admin())
-		$ret .= '<!--script type="text/javascript" src="' . BASE_URL . 'tools/tiny_mce/tiny_mce.js"></script>
-	<script type="text/javascript" src="' . BASE_URL . 'tools/jquery.qtip.js" ></script>
-	<script type="text/javascript" src="' . BASE_URL . 'tools/admin.js"></script-->
-';
+	
 	if($config['recaptcha_enabled'])
 		$ret .= "<script src='https://www.google.com/recaptcha/api.js'></script>";
 	return $ret;
@@ -838,13 +510,14 @@ function template_header($is_admin = false)
  */
 function template_footer()
 {
-	global $visitors, $config, $views_counter;
+	global $config, $views_counter;
 	$ret = '';
 	if(admin())
 		$ret .= generateLink(ADMIN_URL, 'Admin Panel', true);
 
 	if($config['visitors_counter'])
 	{
+		global $visitors;
 		$amount = $visitors->getAmountVisitors();
 		$ret .= '<br/>Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
 	}
@@ -864,21 +537,11 @@ function template_footer()
 
 function template_ga_code()
 {
-	global $config;
+	global $config, $twig;
 	if(!isset($config['google_analytics_id'][0]))
 		return '';
 
-	return "
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', '" . $config['google_analytics_id'] . "', 'auto');
-  ga('send', 'pageview');
-
-</script>";
+	return $twig->render('google_analytics.html.twig');
 }
 
 function template_form()
@@ -920,6 +583,8 @@ function getCreatureName($killer, $showStatus = false, $extendedInfo = false)
 {
 	global $vowels, $ots, $config;
 	$str = "";
+	$players_rows = '';
+	
 	if(is_numeric($killer))
 	{
 		$player = $ots->createObject('Player');
@@ -1029,7 +694,7 @@ function getSkillName($skillId, $suffix = true)
  */
 function hasFlag($flag) {
 	global $logged, $logged_flags;
-	return $logged && ($logged_flags & $flag) == $flag;
+	return ($logged && ($logged_flags & $flag) == $flag);
 }
 /**
  * Check if current logged user have got admin flag set.
@@ -1122,14 +787,31 @@ function get_templates()
 	return $ret;
 }
 
+/**
+ * Generates list of installed plugins
+ * @return array $plugins
+ */
+function get_plugins()
+{
+	$ret = array();
+	
+	$path = PLUGINS;
+	foreach(scandir($path) as $file) {
+		$file_ext = pathinfo($file, PATHINFO_EXTENSION);
+		$file_name = pathinfo($file, PATHINFO_FILENAME);
+		if ($file == '.' || $file == '..' || $file == 'disabled' || $file == 'example.json' || is_dir($path . $file) || $file_ext != 'json')
+			continue;
+		
+		$ret[] = str_replace('.json', '', $file_name);
+	}
+	
+	return $ret;
+}
 function getWorldName($id)
 {
 	global $config;
-	foreach($config['worlds'] as $_id => $details)
-	{
-		if($id == $_id)
-			return $details['name'];
-	}
+	if(isset($config['worlds'][$id]))
+		return $config['worlds'][$id];
 	
 	return $config['lua']['serverName'];
 }
@@ -1202,7 +884,7 @@ function convert_bytes($size)
 function log_append($file, $str)
 {
 	$f = fopen(LOGS . $file, 'a');
-	fwrite($f, $str . PHP_EOL);
+	fwrite($f, '[' . date(DateTime::RFC1123) . '] ' . $str . PHP_EOL);
 	fclose($f);
 }
 
@@ -1212,20 +894,86 @@ function load_config_lua($filename)
 	
 	$config_file = $filename;
 	if(!@file_exists($config_file))
-		die('ERROR: Cannot find ' . $filename . ' file.');
+	{
+		log_append('error.log', '[load_config_file] Fatal error: Cannot load config.lua (' . $filename . '). Error: ' . print_r(error_get_last(), true));
+		die('ERROR: Cannot find ' . $filename . ' file. More info in system/logs/error.log');
+	}
 
-	$tempFile = @tempnam('/tmp', 'lua');
-	$file = fopen($tempFile, 'w');
-	if(!$file) die('Cannot load server config!');
+	$result = array();
+	$config_string = file_get_contents($filename);
+	$config_string = str_replace("\r\n", "\n", $config_string);
+	$config_string = str_replace("\r", "\n", $config_string);
+	$lines = explode("\n", $config_string);
+	if(count($lines) > 0)
+		foreach($lines as $ln => $line)
+		{
+			$tmp_exp = explode('=', $line, 2);
+			if(strpos($line, 'dofile') !== false)
+			{
+				$delimiter = '"';
+				if(strpos($line, $delimiter) === false)
+					$delimiter = "'";
 				
-	// TODO: new parser that will also load dofile() includes
+				$tmp = explode($delimiter, $line);
+				$result = array_merge($result, load_config_lua($config['server_path'] . $tmp[1]));
+			}
+			else if(count($tmp_exp) >= 2)
+			{
+				$key = trim($tmp_exp[0]);
+				if(substr($key, 0, 2) != '--')
+				{
+					$value = trim($tmp_exp[1]);
+					if(strpos($value, '--') !== false) {// found some deep comment
+						$value = preg_replace('/--.*$/i', '', $value);
+					}
 					
-	// strip lua comments to prevent parsing errors
-	fwrite($file, preg_replace('/(-)(-)(.*)/', '', file_get_contents($config_file)));
-	fclose($file);
+					if(is_numeric($value))
+						$result[$key] = (float) $value;
+					elseif(in_array(substr($value, 0 , 1), array("'", '"')) && in_array(substr($value, -1 , 1), array("'", '"')))
+						$result[$key] = (string) substr(substr($value, 1), 0, -1);
+					elseif(in_array($value, array('true', 'false')))
+						$result[$key] = ($value == 'true') ? true : false;
+					else
+					{
+						foreach($result as $tmp_key => $tmp_value) // load values definied by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
+							$value = str_replace($tmp_key, $tmp_value, $value);
+						$ret = @eval("return $value;");
+						if((string) $ret == '') // = parser error
+						{
+							die('ERROR: Loading config.lua file. Line <b>' . ($ln + 1) . '</b> of LUA config file is not valid [key: <b>' . $key . '</b>]');
+						}
+						$result[$key] = $ret;
+					}
+				}
+			}
+		}
 	
-	$result = array_merge(parse_ini_file($tempFile, true), isset($config['lua']) ? $config['lua'] : array());
-	@unlink($tempFile);
+
+	$result = array_merge($result, isset($config['lua']) ? $config['lua'] : array());
 	return $result;
 }
+
+function str_replace_first($search, $replace, $subject) {
+	$pos = strpos($subject, $search);
+	if ($pos !== false) {
+		return substr_replace($subject, $replace, $pos, strlen($search));
+	}
+	return $subject;
+}
+
+function setSession($key, $data) {
+	global $config;
+	$_SESSION[$config['session_prefix'] . $key] = $data;
+}
+function getSession($key) {
+	global $config;
+	return (isset($_SESSION[$config['session_prefix'] . $key])) ? $_SESSION[$config['session_prefix'] . $key] : false;
+}
+function unsetSession($key) {
+	global $config;
+	unset($_SESSION[$config['session_prefix'] . $key]);
+}
+
+// validator functions
+require_once(LIBS . 'validator.php');
 ?>

system/hooks.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -16,17 +16,14 @@ define('HOOK_AFTER_PAGE', 3);
 define('HOOK_FINISH', 4);
 define('HOOK_TIBIACOM_ARTICLE', 5);
 define('HOOK_TIBIACOM_BORDER_3', 6);
+define('HOOK_CHARACTERS_BEFORE_INFORMATIONS', 7);
+define('HOOK_CHARACTERS_AFTER_INFORMATIONS', 8);
+define('HOOK_CHARACTERS_BEFORE_SIGNATURE', 9);
+define('HOOK_CHARACTERS_AFTER_SIGNATURE', 10);
+define('HOOK_CHARACTERS_AFTER_ACCOUNT', 11);
+define('HOOK_CHARACTERS_AFTER_CHARACTERS', 12);
 define('HOOK_FIRST', HOOK_STARTUP);
-define('HOOK_LAST', HOOK_TIBIACOM_BORDER_3);
-
-$hook_types = array(
-	'STARTUP' => HOOK_STARTUP,
-	'BEFORE_PAGE' => HOOK_BEFORE_PAGE,
-	'AFTER_PAGE' => HOOK_AFTER_PAGE,
-	'FINISH' => HOOK_FINISH,
-	'TIBIACOM_ARTICLE' => HOOK_TIBIACOM_ARTICLE,
-	'TIBIACOM_BORDER_3' => HOOK_TIBIACOM_BORDER_3
-);
+define('HOOK_LAST', HOOK_CHARACTERS_AFTER_CHARACTERS);
 
 class Hook
 {
@@ -46,7 +43,7 @@ class Hook
 			$ret = $tmp($params);
 		}*/
 		
-		global $db, $config, $template_path, $ots;
+		global $db, $config, $template_path, $ots, $content;
 		if(file_exists(BASE . $this->_file)) {
 			require(BASE . $this->_file);
 		}
@@ -84,7 +81,7 @@ class Hooks
 	public function load()
 	{
 		global $db;
-		$hooks = $db->query('SELECT `name`, `type`, `file` FROM `' . TABLE_PREFIX . 'hooks` WHERE `enabled` = 1;');
+		$hooks = $db->query('SELECT `name`, `type`, `file` FROM `' . TABLE_PREFIX . 'hooks` WHERE `enabled` = 1 ORDER BY `ordering`;');
 		foreach($hooks as $hook)
 			$this->register($hook['name'], $hook['type'], $hook['file']);
 	}

system/init.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -14,12 +14,18 @@ require_once(BASE . 'config.php');
 if(file_exists(BASE . 'config.local.php')) // user customizations
 	require(BASE . 'config.local.php');
 
+if(!isset($config['installed']) || !$config['installed']) {
+	header('Location: ' . BASE_URL);
+	die('AAC has not been installed yet or there was error during installation. Please install again.');
+}
+
+date_default_timezone_set($config['date_timezone']);
 // take care of trailing slash at the end
 if($config['server_path'][strlen($config['server_path']) - 1] != '/')
 	$config['server_path'] .= '/';
 
 // enable gzip compression if supported by the browser
-if($config['gzip_output'] && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) && function_exists('ob_gzhandler'))
+if($config['gzip_output'] && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('ob_gzhandler'))
 	ob_start('ob_gzhandler');
 
 // cache
@@ -27,12 +33,13 @@ require_once(SYSTEM . 'libs/cache.php');
 $cache = Cache::getInstance($config['cache_engine'], $config['cache_prefix']);
 
 // twig
-require_once LIBS . 'twig/Autoloader.php';
+require_once(LIBS . 'Twig/Autoloader.php');
 Twig_Autoloader::register();
 
-$loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');
-$twig = new Twig_Environment($loader, array(
+$twig_loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');
+$twig = new Twig_Environment($twig_loader, array(
 	'cache' => CACHE . 'twig/',
+	'auto_reload' => true
 ));
 
 $function = new Twig_SimpleFunction('getStyle', function ($i) {
@@ -40,6 +47,21 @@ $function = new Twig_SimpleFunction('getStyle', function ($i) {
 });
 $twig->addFunction($function);
 
+$function = new Twig_SimpleFunction('getLink', function ($s) {
+	global $config;
+	if($config['friendly_urls'])
+		return $s;
+	
+	return '?' . $s;
+});
+$twig->addFunction($function);
+
+$function = new Twig_SimpleFunction('hook', function ($hook) {
+	global $hooks;
+	$hooks->trigger($hook);
+});
+$twig->addFunction($function);
+
 // trim values we receive
 if(isset($_POST))
 {
@@ -86,10 +108,12 @@ unset($tmp);
 if(isset($config['lua']['servername']))
 	$config['lua']['serverName'] = $config['lua']['servername'];
 
-
 if(isset($config['lua']['houserentperiod']))
 	$config['lua']['houseRentPeriod'] = $config['lua']['houserentperiod'];
 
+if($config['item_images_url'][strlen($config['item_images_url']) - 1] != '/')
+	$config['item_images_url'] .= '/';
+
 // localize data/ directory
 if(isset($config['lua']['dataDirectory'][0]))
 {

system/item.php

@@ -5,21 +5,21 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.3.0
+ * @version   0.6.3
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-require_once(SYSTEM . 'libs/items.php');
+require_once(SYSTEM . 'libs/items_images.php');
 
-Items::$files = array(
+Items_Images::$files = array(
 	'otb' => SYSTEM . 'data/items.otb',
 	'spr' => SYSTEM . 'data/Tibia.spr',
 	'dat' => SYSTEM . 'data/Tibia.dat'
 );
-Items::$outputDir = BASE . 'images/items/';
+Items_Images::$outputDir = BASE . 'images/items/';
 
 function generateItem($id = 100, $count = 1) {
-	Items::generate($id, $count);
+	Items_Images::generate($id, $count);
 }
 
 function itemImageExists($id, $count = 1)
@@ -31,7 +31,7 @@ function itemImageExists($id, $count = 1)
 	if($count > 1)
 		$file_name .= '-' . $count;
 
-	$file_name = Items::$outputDir . $file_name . '.gif';
+	$file_name = Items_Images::$outputDir . $file_name . '.gif';
 	return file_exists($file_name);
 }
 
@@ -43,7 +43,7 @@ function outputItem($id = 100, $count = 1)
 	if(!itemImageExists($id, $count))
 	{
 		//echo 'plik istnieje';
-		Items::generate($id, $count);
+		Items_Images::generate($id, $count);
 	}
 
 	$expires = 60 * 60 * 24 * 30; // 30 days
@@ -56,7 +56,7 @@ function outputItem($id = 100, $count = 1)
 	if($count > 1)
 		$file_name .= '-' . $count;
 
-	$file_name = Items::$outputDir . $file_name . '.gif';
+	$file_name = Items_Images::$outputDir . $file_name . '.gif';
 	readfile($file_name);
 }
 ?>