add mostdamage killer

Also change version to 0.7.13-dev

.editorconfig

@@ -1,14 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# with a newline ending every file
-[*]
-indent_style = tab
-indent_size = 4
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-indent_style = tab

.gitattributes

@@ -1,11 +1,4 @@
 * text=auto
 .gitattributes export-ignore
 .gitignore export-ignore
-.github export-ignore
-.editorconfig export-ignore
-.travis.yml export-ignore
 _config.yml export-ignore
-release.sh export-ignore
-
-*.sh text eol=lf
-VERSION text eol=lf

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: paypal.me/slawkens # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE.md

@@ -1,29 +0,0 @@
-<!--
-Please use this issue tracker only for reporting MyAAC bugs.
-
-If you need support, please use the discord server:
-
-- https://discord.gg/2J39Wus (we have an own channel named #my-aac there)
-
-or use otland support boards:
-
-- https://otland.net/forums/support.16/
-
--->
-
-### Server configuration
-- Operating System: 
-- Web Server (+ version): 
-- PHP Version: 
-- Server name and version (for example: TFS 0.3): 
-- MyAAC Version: 
-
-### Client configuration (Your Computer)
-
-- Browser: 
-- Operating System: 
-
-### Description:
-
-
-### Steps To Reproduce:

.gitignore

@@ -1,19 +1,13 @@
 Thumbs.db
 .DS_Store
 .idea
-
-# composer
-composer.lock
-vendor
-
-# npm
 node_modules
+vendor
+composer.lock
 
-# created by release.sh
 releases
-tmp
-
 config.local.php
+PERSONAL_NOTES
 
 # all custom templates
 templates/*
@@ -29,20 +23,11 @@ system/cache/*
 !system/cache/index.html
 !system/cache/twig/index.html
 !system/cache/signatures/index.html
-!system/cache/plugins/index.html
-
-# php sessions
-system/php_sessions/*
-!system/php_sessions//index.html
 
 # logs
 system/logs/*
 !system/logs/index.html
 
-# data
-system/data/*
-!system/data/index.html
-
 # plugins
 plugins/*
 !plugins/.htaccess
@@ -50,6 +35,3 @@ plugins/*
 !plugins/account-create-hint.json
 !plugins/account-create-hint
 landing
-
-# others/rest
-system/pages/downloads.php

.htaccess

@@ -1,19 +0,0 @@
-<IfModule mod_autoindex.c>
-	Options -Indexes
-</IfModule>
-
-<IfModule mod_negotiation.c>
-	Options -MultiViews
-</IfModule>
-
-<IfModule mod_rewrite.c>
-	RewriteEngine On
-
-	# you can put here your myaac root folder
-	# path relative to web root
-    #RewriteBase /myaac/
-
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^.*$ index.php [L]
-</IfModule>

.htaccess.dist

@@ -0,0 +1,7 @@
+Options -Indexes -MultiViews
+
+RewriteEngine On
+
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^.*$ index.php [L]

.travis.yml

@@ -1,20 +0,0 @@
-
-language: php
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-  - 8.0
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-before_script:
-  - composer require php-parallel-lint/php-parallel-lint --no-suggest --no-progress --no-interaction --no-ansi --quiet --optimize-autoloader
-
-script:
-  - php vendor/bin/parallel-lint --no-progress --no-colors --exclude vendor --exclude "system/libs/pot/OTS_DB_PDOQuery_PHP71.php" .

CHANGELOG.md

@@ -1,298 +1,21 @@
 # Changelog
 
-## [0.8.7 - 31.08.2022]
+## [0.7.13 - not-release-yet]
+
+### Fixed
+* Ignore arrays in config.lua (fixes experienceStages loading)
+
+## [0.7.12 - 18.02.2020]
+### Fixed
+* change guild nick function causing crash on TFS 1.x because of invalid characters being accepted
+* PHP Mailer autoload function on newer PHP
+* gesior signature guild rank loading
+* leaking database password when cannot connect
+* config.last_kills_limit being ignored
+* monster.loot being cutted off cause of too short column (changed to TEXT)
 
 ### Added
-* login.php for client 12.x is now part of official repo
+* nginx-sample.conf
-* browsehappy code
-* config use character sample skill (#201, @gpedro)
-* custom words blocked (#190, @gpedro)
-
-### Changed
-* save php sessions in myaac dir
-* don't count deleted players when creating new character
-
-### Fixed
-* patch vulnerability in change_rank.php (#194, @gesior, @thatmichaelguy)
-* fix guild invite page (#196, @worthdavi)
-* players not showing on highscores page (#195)
-* highscores page bug with high pages
-* $player->getStorage() does not work at all (#169, @gesior)
-* copying sample character when it have items with quotes (#200, @gpedro)
-* IPv6 issue when env is set to dev (#171)
-* admin page changed feet to match body colour (#174, @silic0nalph4)
-* exception being thrown when creating duplicated character name (#191)
-* rules page formatting (#177, @silic0nalph4)
-* account character create if auto_login is enabled
-* undefined variable notice on database_log enabled
-* removed VERSION file
-
-## [0.8.6 - 10.07.2021]
-This update contains very important security fix.
-
-Please update your MyAAC instances to this version.
-
-## [0.8.5 - 08.06.2021]
-
-### Changed
-* bcmath module is not required anymore
-* Gratis premium account fixes (#156, by @czbadaro)
-* Update 404 response (#163, by @anyeor)
-
-### Fixed
-* compatibility with PHP 7.0 and lower
-* deleting ranks in guilds (#158, by @Misztrz)
-* guild back buttons (change logo & motd)
-* forum table style (boards & thread view)
-* guild list description new lines `<br>` being ignored (Thanks @anyeor for reporting)
-
-
-## [0.8.4 - 18.02.2021]
-
-### Added
-* support for accounts.premium_ends_at (Latest TFS 1.x)
-* more clients to clients.conf.php
-
-### Changed
-* minimum PHP 5.6 is now required
-* password can now contain any characters
-* add SSL on external image requests of items and outfits (@fernandomatos)
-* Use local storage for saving menu items (tibiacom template) - fixes bug with some websites like wykop.pl (browser freeze)
-* increase size of myaac_visitors.page column to 2048 (Thanks to OtLand user kaleuui)
-
-### Fixed
-* compatibility with PHP 8.0 (latest XAMPP)
-* displaying PHP errors on env = "prod"
-* the Guildnick not showing in the guild pages (@leesneaks)
-* you cannot delete character more than twice (Thanks Okke)
-* ignore arrays in config.lua (fixes experienceStages loading)
-* parsing empty strings in config.lua (with comments)
-* headling.php cannot find font
-
-## [0.8.3 - 27.10.2020]
-
-### Added
-* pdo_mysql as required extension
-* some notice about Email validation in create account
-
-### Changed
-* Move register DATABASE_VERSION into schema.sql
-    * Caused migrations being fired when user manually imported database
-
-### Fixed
-* creating very uncommon (bugged) account names
-* XSS in character search
-* Admin menu news editing warning when leaving page without touching the inputs
-* Guild Invite not working on otservbr-global
-* two boxes being show on email_change_cancel
-* when adding poll = template tibiacom broken
-* houses: Unknown column 'guild' in 'where clause (https://github.com/slawkens/myaac/issues/131)
-* account create when account_mail_verify is enabled
-* CloudFlare IP detection
-* network_twitter link in tibiacom template
-
-## [0.8.2 - 03.06.2020]
-
-### Added
-* Log query time in database_log (can be used for benchmarking)
-* new PHP constant: IS_CLI
-* $_SERVER['REQUEST_URI'] to database.log
-* outfit to highscores box in tibiacom template
-* system/data to .gitignore
-* error_reporting in admin panel (when in dev mode), so it shows php notices and warnings
-* example quests in config.php
-
-### Changed
-* account_login input type from password to text
-
-### Fixed
-* Guild Invite not working on otservbr-global (#123)
-* news not updating after adding in admin panel
-* wrong mana of character samples (#125)
-* missing rules page on clean install
-* double space character name creation (@Lee, #121)
-* creatures page: Max count and chance not shown on hovered items
-* exception being thrown when characters.frags enabled on TFS 1.x
-* TFS 0.4 guilds creation (Where guilds.checkdata and motd doesn't have default value)
-* ERR_TOO_MANY_REDIRECTS browser error on template change
-* updating template menus on template change
-* Account change info when config.account_country is disabled
-* cancel change email request
-* config.character_name_min/max_length being ignored in change_name.php
-* some rare bugs when database is no up-to-date and someone enters admin panel
-* extra line that is added when using a newer version than official release (@Lee)
-* admin links in featured article
-* some PHP Notice when HTTP_HOST is not set (Can happen on some old versions of HTTP protocol)
-* Show character indicator in check_name.js
-* Houses list View button was wrong (was from bootstrap)
-* OTS_House __construct - not loading by houseid parameter
-* message() function when executed in CLI
-
-### Removed
-* unused myaac_commands table from schema
-* MyISAM engine from migration scripts (#128)
-
-## [0.8.1 - 10.03.2020]
-
-### Added
-* Support for Nostalrius OTS
-
-### Changed
-* Move TODO to wiki
-* .tooltip css class to .item_image (bootstrap conflict)
-
-### Fixed
-* Reloading of creatures/monsters throwing an exception
-* Loading custom pages with old Gesior variables [#108](https://github.com/slawkens/myaac/issues/107)
-* Some weird behaviour with installation of plugins
-* CHANGELOG.md loading in Admin Panel
-* spells displaying when level = 0
-* Some PHP warnings and notices
-
-## [0.8.0 - 19.02.2020]
-
-### Added:
-* new Awesome Bootstrap Admin Panel by Lee (@Leesneaks)
-	* using Bootstrap 3
-	* all existing pages were adjusted 
-	* new editor: Accounts
-	* improved editor: Players
-	* new Reports View page
-	* Modules directory, which can be added using Plugins (@Leesneaks, @whiteblXK)
-	* move News Management here (@whiteblXK)
-	* interactive player outfit chooser (@tobi132)
-* added Highscores by balance
-* possibility to define colors and "Open in New Tab" on Template Menus (needs to be supported by Template)
-* support for database persistent and socket connections (performance boost)
-* Team page - display outfits of the players (configurable)
-* added clear_cache.php, send_email.php bin commands (@slawkens, @tobi132)
-* added locale pt_br (@ivenspontes)
-* added load time into items & weapons loading admin page
-* new, beautiful exception handler
-* added travisci to prevent mistype (@gpedro, #89)
-* added showing database name into installation script (@tobi132)
-* compatibility with old z_ gesior table (@tobi132, #46)
-* added nginx-sample.conf, .editorconfig, VERSION
-* database towns table support for TFS 1.3 (@tobi132)
-* added enable_tinymce option to Pages editor
-
-### Fixed:
-* account login redirect with special chars (like '&' and '?')
-* black skull info at serverInfo (@tornadia)
-* set correct limit at lastkills page from config (anyeor from OtLand)
-* myaac_monsters table column loot problem (#79)
-* players column deleted install description (@gpedro, #91)
-* experience table being to wide and buggy on some templates (@tobi132, #90)
-* fix errors with .htaccess files
-* added index.html to prevent indexing the folder by mod_index
-
-### Changed:
-* Environment is now configurable by env setting (Significantly better load times with 'prod')
-* replace spells, monsters tables with JavaScript Sortable Tables - DataTables (@Leesneaks)
-* change default MySQL Storage Engine to InnoDB and Default Character Set to utf8
-* updated OTS_House class to support latest TFS 1.x (new columns)
-* updated monster images to the original ones from tibia.com
-* increased the minimum length (3 -> 4) and decreased the maximum length (25 -> 21) of the New Character Name (by @vankk)
-* use $db->exec instead of $db->query optimisation
-* move items from database to Cache_PHP (Much more faster load time)
-* allow simultaneous loading of config.ini and config.php in templates
-* updated copyright year and SSL link (@EPuncker, #88)
-* move commands, rules and downloads pages into database (@tobi132)
-* better view of guilds (new buttons, table look and feel) (@tobi132)
-* remove stupid alerts on account create
-* remove .dist extension from .htaccess
-
-### New Configurables (config.php)
-* env (Environment)
-* account_create_auto_login (Auto Login after Create Account - Registration)
-* account_create_character_create (Create Character directly on Create Account page) (@tobi132)
-* footer_show_load_time (display load time of the page in the footer)
-* database_socket (Connection via Unix Socket)
-* database_persistent (Database Persistent Connection)
-* database_log (Logging of Database Queries)
-* admin_panel_modules (Modules displayed in Admin Panel Dashboard)
-* status_timeout, status_interval
-* smtp_debug (More info about SMTP errors in error.log)
-* team_display_outfit (Display outfit of the team members on teams page)
-* highscores_balance (Display highscores by balance)
-* character_name_min/max_length (Minimum and maximum length of character name)
-* characters.deleted (display deleted characters on characters page)
-
-### Forum:
-* show image in full screen on click
-* show user avatar (outfit) in posts
-* replaced forum actions links (move, remove, edit, quote) with images
-* redirect directly to the thread on user login (on new reply)
-
-### Installer:
-* AJAX loader for the important stuff
-* create admin account: ask for e-mail + character name
-* load items & weapons
-* check user IP on install to prevent install by random user
-* remember status of the installation
-* remember language on first step (welcome)
-* ask user for timezone
-* auto detected browser language in select language
-
-### Plugins
-* sandbox for plugins, don't install when requirements are not satisfied
-* allow comments inside plugin json file (php style)
-* new require options for plugins: (look into example.json)
-	* require database version, table or column of the MyAAC schema
-	* require php-extension
-	* require semantic-version (like in composer.json)
-* new hooks: LOGIN, LOGIN_ATTEMPT, LOGOUT, HOOK_ACCOUNT_CREATE_*
-
-### Cache
-* php 7.x APCu cache support (faster cache engine)
-* new cache engine: plain PHP (is good with pure php 7.0+ and opcache)
-* cache lastkills.php, $db->hasTable, $db->hasColumn, hooks and template menus
-* stop using global $cache variable, use Singleton pattern instead
-
-### Twig
-* move pages to Twig templates: team, lastkills, serverinfo, houses, guilds.list, guild.view, admin.logs, admin.reports (@whiteblXK, @tobi132)
-* replace "$twig->render()" with "$this->display"
-* move Twig functions to separate file
-* move tibiacom boxes to Twig templates
-* allow Pages to be loaded as Twig template (this allows using Twig variables in Pages) (@tobi132)
-* allow string to be passed to hook twig function
-
-### Functions
-* config($key), configLua($key)
-* clearCache()
-* OTS_Account:
-	* getCountry()
-	* setLastLogin($lastlogin) (@Leesneaks)
-	* setWebFlags(webflags) (@Leesneaks)
-* OTS_Player:
-	* getAccountId()
-	* countBlessings() (@Leesneaks)
-	* checkBlessings($count) (@Leesneaks)
-* is_sub_dir (in system/libs/plugins.php)
-* Twig:
-	* getPlayerLink($name, $generate = true)
-* removed SQLquote and SQLquery from OTS_Base_DB
-* Add optional $params param into log_append (will log arrays) (@tobi132)
-
-### Internal
-* moved clients list to the new file (clients.conf.php)
-* changed tableExist and fieldExist to $db->hasTable(table) + $db->hasColumn(table, column)
-* changed deprecated $ots->createObject() functions with their OTS_ equivalents
-* add global helper config($key) function + twig binding
-	* use config() instead of global $config
-* remove unnecessary parentheses in include/require PHP functions
-* use __DIR__ instead of dirname(__FILE__) - since PHP 5.3.0
-* change intval() function to (int) casting (up to 6x faster)
-* add release.sh script (for GitHub releases)
-* use curl as alternative option for reporting install
-
-### Libraries
-* updated Twig to version v1.35.0
-* updated TinyMCE to version v4.7.4
-
-### Deprecations
-* change deprecated HTML <center> tag to <div style="text-align:center">
-* replace deprecated HTML <font> tag with <span>
 
 ## [0.7.11 - 04.05.2019]
 ### Added:

CREDITS

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

README.md

@@ -1,24 +1,24 @@
-# [MyAAC](https://my-aac.org)
+# PLEASE DO NOT USE THIS BRANCH/VERSION
+## It is discontinued and won't receive any updates
+## Switch to master branch instead
+## It's keept only for archival purposes
 
-[![Build Status Master](https://img.shields.io/travis/slawkens/myaac/master)](https://travis-ci.org/github/slawkens/myaac)
+# myaac
-[![License: GPL-3.0](https://img.shields.io/github/license/slawkens/myaac)](https://opensource.org/licenses/gpl-license)
-[![Downloads Count](https://img.shields.io/github/downloads/slawkens/myaac/total)](https://github.com/slawkens/myaac/releases)
-[![PHP Versions](https://img.shields.io/travis/php-v/slawkens/myaac/master)](https://github.com/slawkens/myaac/blob/d8b3b4135827ee17e3c6d41f08a925e718c587ed/.travis.yml#L3)
-[![OpenTibia Discord](https://img.shields.io/discord/288399552581468162)](https://discord.gg/2J39Wus)
-[![Closed Issues](https://img.shields.io/github/issues-closed-raw/slawkens/myaac)](https://github.com/slawkens/myaac/issues?q=is%3Aissue+is%3Aclosed)
 
-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.
 
-### Requirements
+Official website: https://my-aac.org
 
-	- PHP 5.6 or later
+### REQUIREMENTS
+
+	- PHP 5.3.3 or later
 	- MySQL database
 	- PDO PHP Extension
 	- XML PHP Extension
 	- ZIP PHP Extension
 	- (optional) mod_rewrite to use friendly_urls
 
-### Installation
+### INSTALLATION AND CONFIGURATION
 
 	Just decompress and untar the source (which you should have done by now,
 	if you're reading this), into your webserver's document root.
@@ -38,39 +38,15 @@ MyAAC is a free and open-source Automatic Account Creator (AAC) written in PHP.
 
 	Visit http://your_domain/install (http://localhost/install) and follow instructions in the browser.
 
-### Configuration
+### KNOWN PROBLEMS
 
-Check *config.php* to get more informations.
+	- none -
-Use *config.local.php* for your local configuration changes.
 
-### Branches
+### OTHER NOTES
 
-This repository follows the Git Flow Workflow.
+	If you have a great idea or want contribute to the project - visit our website at http://www.my-aac.org
-Cheatsheet: [Git-Flow-Cheetsheet](https://danielkummer.github.io/git-flow-cheatsheet)
 
-That means, we use:
+### LICENSING
-* master branch, for current stable release
-* develop branch, for development version (next release)
-* feature branches, for features etc.
 
-### Known Problems
+	This program and all associated files are released under the GNU Public
-
+	License, see LICENSE for details.
-- Some compatibility issues with some exotical distibutions.
-
-
-### Contributing
-
-Contributions are more than welcome. 
-
-Pull requests should be made to the Dev branch as that is the working branch, master is for release code.  
-
-Look: [Contributing](https://github.com/otsoft/myaac/wiki/Contributing) in our wiki.
-
-### Other Notes
-
-If you have a great idea or want contribute to the project - visit our website at https://www.my-aac.org
-
-### License
-
-This program and all associated files are released under the GNU Public License.  
-See [LICENSE](https://github.com/slawkens/myaac/blob/master/LICENSE) for details.

_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-slate

admin/index.php

@@ -1,15 +1,12 @@
 <?php
 // few things we'll need
-require '../common.php';
+require('../common.php');
-
+require_once(BASE . 'config.local.php');
-if(file_exists(BASE . 'config.local.php')) {
-	require_once BASE . 'config.local.php';
-}
 
 if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
 {
 	header('Location: ' . BASE_URL . 'install/');
-	throw new RuntimeException('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!');
+	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);
@@ -24,24 +21,11 @@ if(empty($page) || preg_match("/[^a-zA-Z0-9_\-]/", $page))
 $page = strtolower($page);
 define('PAGE', $page);
 
-require SYSTEM . 'functions.php';
+require(SYSTEM . 'functions.php');
-require SYSTEM . 'init.php';
+require(SYSTEM . 'init.php');
-
+require(SYSTEM . 'status.php');
-if(config('env') === 'dev') {
+require(SYSTEM . 'login.php');
-	ini_set('display_errors', 1);
+require(ADMIN . 'includes/functions.php');
-	ini_set('display_startup_errors', 1);
-	error_reporting(E_ALL);
-}
-
-// event system
-require_once SYSTEM . 'hooks.php';
-$hooks = new Hooks();
-$hooks->load();
-
-require SYSTEM . 'status.php';
-require SYSTEM . 'login.php';
-require SYSTEM . 'migrate.php';
-require ADMIN . 'includes/functions.php';
 
 $twig->addGlobal('config', $config);
 $twig->addGlobal('status', $status);
@@ -52,7 +36,7 @@ if(!$logged || !admin()) {
 }
 
 // include our page 
-$file = ADMIN . 'pages/' . $page . '.php';
+$file = SYSTEM . 'pages/admin/' . $page . '.php';
 if(!@file_exists($file)) {
 	$page = '404';
 	$file = SYSTEM . 'pages/404.php';
@@ -66,5 +50,5 @@ ob_end_clean();
 
 // template
 $template_path = 'template/';
-require ADMIN . $template_path . 'template.php';
+require(ADMIN . $template_path . 'template.php');
 ?>

admin/pages/accounts.php

@@ -1,484 +0,0 @@
-<?php
-/**
- * Account editor
- *
- * @package   MyAAC
- * @author    Lee
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-
-$title = 'Account editor';
-$base = BASE_URL . 'admin/?p=accounts';
-
-if ($config['account_country'])
-	require SYSTEM . 'countries.conf.php';
-
-function echo_success($message)
-{
-	echo '<p class="success">' . $message . '</p>';
-}
-
-function echo_error($message)
-{
-	global $error;
-	echo '<p class="error">' . $message . '</p>';
-	$error = true;
-}
-
-function verify_number($number, $name, $max_length)
-{
-	if (!Validator::number($number))
-		echo_error($name . ' can contain only numbers.');
-
-	$number_length = strlen($number);
-	if ($number_length <= 0 || $number_length > $max_length)
-		echo_error($name . ' cannot be longer than ' . $max_length . ' digits.');
-}
-
-$hasSecretColumn = $db->hasColumn('accounts', 'secret');
-$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
-$hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
-$hasTypeColumn = $db->hasColumn('accounts', 'type');
-$hasGroupColumn = $db->hasColumn('accounts', 'group_id');
-
-if ($config['account_country']) {
-	$countries = array();
-	foreach (array('pl', 'se', 'br', 'us', 'gb') as $c)
-		$countries[$c] = $config['countries'][$c];
-
-	$countries['--'] = '----------';
-	foreach ($config['countries'] as $code => $c)
-		$countries[$code] = $c;
-}
-?>
-
-<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/css/jquery.datetimepicker.css"/ >
-<script src="<?php echo BASE_URL; ?>tools/js/jquery.datetimepicker.js"></script>
-
-<?php
-$id = 0;
-if (isset($_REQUEST['id']))
-	$id = (int)$_REQUEST['id'];
-else if (isset($_REQUEST['search_name'])) {
-	if (strlen($_REQUEST['search_name']) < 3 && !Validator::number($_REQUEST['search_name'])) {
-		echo 'Player name is too short.';
-	} else {
-		if (Validator::number($_REQUEST['search_name']))
-			$id = $_REQUEST['search_name'];
-		else {
-			$query = $db->query('SELECT `id` FROM `accounts` WHERE `name` = ' . $db->quote($_REQUEST['search_name']));
-			if ($query->rowCount() == 1) {
-				$query = $query->fetch();
-				$id = $query['id'];
-			} else {
-				$query = $db->query('SELECT `id`, `name` FROM `accounts` WHERE `name` LIKE ' . $db->quote('%' . $_REQUEST['search_name'] . '%'));
-				if ($query->rowCount() > 0 && $query->rowCount() <= 10) {
-					echo 'Do you mean?<ul>';
-					foreach ($query as $row)
-						echo '<li><a href="' . $base . '&id=' . $row['id'] . '">' . $row['name'] . '</a></li>';
-					echo '</ul>';
-				} else if ($query->rowCount() > 10)
-					echo 'Specified name resulted with too many accounts.';
-			}
-		}
-	}
-}
-$groups = new OTS_Groups_List();
-if ($id > 0) {
-	$account = new OTS_Account();
-	$account->load($id);
-
-	if (isset($account, $_POST['save']) && $account->isLoaded()) {// we want to save
-		$error = false;
-
-		$_error = '';
-		$account_db = new OTS_Account();
-		if(USE_ACCOUNT_NAME) {
-			$name = $_POST['name'];
-
-			$account_db->find($name);
-			if ($account_db->isLoaded() && $account->getName() != $name)
-				echo_error('This name is already used. Please choose another name!');
-		}
-
-		$account_db->load($id);
-		if (!$account_db->isLoaded())
-			echo_error('Account with this id doesn\'t exist.');
-
-		//type/group
-		if($hasTypeColumn || $hasGroupColumn) {
-			$group = $_POST['group'];
-		}
-
-		$password = ((!empty($_POST["pass"]) ? $_POST['pass'] : null));
-		if (!Validator::password($password)) {
-			$errors['password'] = Validator::getLastError();
-		}
-
-		//secret
-		if($hasSecretColumn) {
-			$secret = $_POST['secret'];
-		}
-
-		//key
-		$key = $_POST['key'];
-		$email = $_POST['email'];
-		if (!Validator::email($email))
-			$errors['email'] = Validator::getLastError();
-
-		//tibia coins
-		if ($hasCoinsColumn) {
-			$t_coins = $_POST['t_coins'];
-			verify_number($t_coins, 'Tibia coins', 12);
-		}
-		// prem days
-		$p_days = (int)$_POST['p_days'];
-		verify_number($p_days, 'Prem days', 11);
-
-		//prem points
-		$p_points = $_POST['p_points'];
-		verify_number($p_points, 'Prem Points', 11);
-
-		//rl name
-		$rl_name = $_POST['rl_name'];
-
-		//location
-		$rl_loca = $_POST['rl_loca'];
-
-		//country
-		$rl_country = $_POST['rl_country'];
-
-		$web_flags = $_POST['web_flags'];
-		verify_number($web_flags, 'Web Flags', 1);
-
-		//created
-		$created = $_POST['created'];
-		verify_number($created, 'Created', 11);
-
-		//web last login
-		$web_lastlogin = $_POST['web_lastlogin'];
-		verify_number($web_lastlogin, 'Web Last logout', 11);
-
-		if (!$error) {
-			if(USE_ACCOUNT_NAME) {
-				$account->setName($name);
-			}
-
-			if ($hasTypeColumn) {
-				$account->setCustomField('type', $group);
-			} elseif ($hasGroupColumn) {
-				$account->setCustomField('group_id', $group);
-			}
-
-			if($hasSecretColumn) {
-				$account->setCustomField('secret', $secret);
-			}
-			$account->setCustomField('key', $key);
-			$account->setEMail($email);
-			if ($hasCoinsColumn) {
-				$account->setCustomField('coins', $t_coins);
-			}
-
-			$lastDay = 0;
-			if($p_days != 0 && $p_days != OTS_Account::GRATIS_PREMIUM_DAYS) {
-				$lastDay = time();
-			} else if ($lastDay != 0) {
-				$lastDay = 0;
-			}
-
-			$account->setPremDays($p_days);
-			$account->setLastLogin($lastDay);
-			if ($hasPointsColumn) {
-				$account->setCustomField('premium_points', $p_points);
-			}
-			$account->setRLName($rl_name);
-			$account->setLocation($rl_loca);
-			$account->setCountry($rl_country);
-			$account->setCustomField('created', $created);
-			$account->setWebFlags($web_flags);
-			$account->setCustomField('web_lastlogin', $web_lastlogin);
-
-			if (isset($password)) {
-				$config_salt_enabled = $db->hasColumn('accounts', 'salt');
-				if ($config_salt_enabled) {
-					$salt = generateRandomString(10, false, true, true);
-					$password = $salt . $password;
-					$account_logged->setCustomField('salt', $salt);
-				}
-
-				$password = encrypt($password);
-				$account->setPassword($password);
-
-				if ($config_salt_enabled)
-					$account->setCustomField('salt', $salt);
-			}
-
-			$account->save();
-			echo_success('Account saved at: ' . date('G:i'));
-		}
-	}
-}
-
-$search_account = '';
-if (isset($_REQUEST['search_name']))
-	$search_account = $_REQUEST['search_name'];
-else if (isset($_REQUEST['search_account']))
-	$search_account = $_REQUEST['search_account'];
-else if ($id > 0 && isset($account) && $account->isLoaded()) {
-	if(USE_ACCOUNT_NAME) {
-		$search_account = $account->getName();
-	}
-	else {
-		$search_account = $account->getId();
-	}
-}
-
-?>
-<div class="row">
-	<?php if (isset($account) && $account->isLoaded()) { ?>
-
-	<form action="<?php echo $base . ((isset($id) && $id > 0) ? '&id=' . $id : ''); ?>" method="post"
-		  class="form-horizontal">
-		<div class="col-md-8">
-			<div class="box box-primary">
-				<div class="box-body">
-					<div class="row">
-						<?php if(USE_ACCOUNT_NAME): ?>
-						<div class="col-xs-4">
-							<label for="name" class="control-label">Account Name:</label>
-							<input type="text" class="form-control" id="name" name="name"
-								   autocomplete="off" style="cursor: auto;"
-								   value="<?php echo $account->getName(); ?>"/>
-						</div>
-						<?php endif; ?>
-						<div class="col-xs-5">
-							<label for="c_pass" class="control-label">Password: (check to change)</label>
-							<div class="input-group">
-                            <span class="input-group-addon">
-                              <input type="checkbox"
-									 name="c_pass"
-									 id="c_pass"
-									 value="false"
-									 class="input_control"/>
-                            </span>
-								<input type="text" class="form-control" id="pass" name="pass"
-									   autocomplete="off" maxlength="20"
-									   value=""/>
-							</div>
-						</div>
-						<div class="col-xs-3">
-							<label for="account_id" class="control-label">Account ID:</label>
-							<input type="text" class="form-control" id="account_id" name="account_id"
-								   autocomplete="off" style="cursor: auto;" size="8" maxlength="11" disabled
-								   value="<?php echo $account->getId(); ?>"/>
-						</div>
-					</div>
-					<div class="row">
-						<?php
-						$acc_group = $account->getAccGroupId();
-						if ($hasTypeColumn) {
-							$acc_type = array("Normal", "Tutor", "Senior Tutor", "Gamemaster", "God"); ?>
-							<div class="col-xs-6">
-								<label for="group" class="control-label">Account Type:</label>
-								<select name="group" id="group" class="form-control">
-									<?php foreach ($acc_type as $id => $a_type): ?>
-										<option value="<?php echo($id + 1); ?>" <?php echo($acc_group == ($id + 1) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
-									<?php endforeach; ?>
-								</select>
-							</div>
-							<?php
-						} elseif ($hasGroupColumn) {
-							?>
-							<div class="col-xs-6">
-								<label for="group" class="control-label">Account Type:</label>
-								<select name="group" id="group" class="form-control">
-									<?php
-									foreach ($groups->getGroups() as $id => $group): ?>
-										<option value="<?php echo $id; ?>" <?php echo($acc_group == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
-									<?php endforeach; ?>
-								</select>
-							</div>
-						<?php } ?>
-						<div class="col-xs-6">
-							<label for="web_flags" class="control-label">Website Access:</label>
-							<select name="web_flags" id="web_flags" class="form-control">
-								<?php $web_acc = array("None", "Admin", "Super Admin", "(Admin + Super Admin)");
-								foreach ($web_acc as $id => $a_type): ?>
-									<option value="<?php echo($id); ?>" <?php echo($account->getWebFlags() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
-								<?php endforeach; ?>
-							</select>
-						</div>
-					</div>
-					<div class="row">
-						<?php if($hasSecretColumn): ?>
-						<div class="col-xs-6">
-							<label for="secret" class="control-label">Secret:</label>
-							<input type="text" class="form-control" id="secret" name="secret"
-								   autocomplete="off" style="cursor: auto;" size="8" maxlength="11"
-								   value="<?php echo $account->getCustomField('secret'); ?>"/>
-						</div>
-						<?php endif; ?>
-						<div class="col-xs-6">
-							<label for="key" class="control-label">Key:</label>
-							<input type="text" class="form-control" id="key" name="key"
-								   autocomplete="off" style="cursor: auto;" size="8" maxlength="11"
-								   value="<?php echo $account->getCustomField('key'); ?>"/>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-xs-6">
-							<label for="email" class="control-label">Email:</label>
-							<input type="text" class="form-control" id="email" name="email"
-								   autocomplete="off" maxlength="20"
-								   value="<?php echo $account->getEMail(); ?>"/>
-						</div>
-						<?php if ($hasCoinsColumn): ?>
-							<div class="col-xs-6">
-								<label for="t_coins" class="control-label">Tibia Coins:</label>
-								<input type="text" class="form-control" id="t_coins" name="t_coins"
-									   autocomplete="off" maxlength="8"
-									   value="<?php echo $account->getCustomField('coins') ?>"/>
-							</div>
-						<?php endif; ?>
-						<div class="col-xs-6">
-							<label for="p_days" class="control-label">Premium Days:</label>
-							<input type="text" class="form-control" id="p_days" name="p_days"
-								   autocomplete="off" maxlength="11"
-								   value="<?php echo $account->getPremDays(); ?>"/>
-						</div>
-						<?php if ($hasPointsColumn): ?>
-							<div class="col-xs-6">
-								<label for="p_points" class="control-label">Premium Points:</label>
-								<input type="text" class="form-control" id="p_points" name="p_points"
-									   autocomplete="off" maxlength="8"
-									   value="<?php echo $account->getCustomField('premium_points') ?>"/>
-							</div>
-						<?php endif; ?>
-					</div>
-					<div class="row">
-						<div class="col-xs-4">
-							<label for="rl_name" class="control-label">RL Name:</label>
-							<input type="text" class="form-control" id="rl_name" name="rl_name"
-								   autocomplete="off" maxlength="20"
-								   value="<?php echo $account->getRLName(); ?>"/>
-						</div>
-						<div class="col-xs-4">
-							<label for="rl_loca" class="control-label">Location:</label>
-							<input type="text" class="form-control" id="rl_loca" name="rl_loca"
-								   autocomplete="off" maxlength="20"
-								   value="<?php echo $account->getLocation(); ?>"/>
-						</div>
-						<div class="col-xs-4">
-							<label for="rl_country" class="control-label">Country:</label>
-							<select name="rl_country" id="rl_country" class="form-control">
-								<?php foreach ($countries as $id => $a_type): ?>
-									<option value="<?php echo($id); ?>" <?php echo($account->getCountry() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
-								<?php endforeach; ?>
-							</select>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-xs-4">
-							<label for="created" class="control-label">Created:</label>
-							<input type="text" class="form-control" id="created" name="created"
-								   autocomplete="off" maxlength="20"
-								   value="<?php echo $account->getCustomField('created'); ?>"/>
-						</div>
-						<div class="col-xs-4">
-							<label for="web_lastlogin" class="control-label">Web Last Login:</label>
-							<input type="text" class="form-control" id="web_lastlogin" name="web_lastlogin"
-								   autocomplete="off" maxlength="20"
-								   value="<?php echo $account->getCustomField('web_lastlogin'); ?>"/>
-						</div>
-					</div>
-
-					<input type="hidden" name="save" value="yes"/>
-					<div class="box-footer">
-						<a href="<?php echo ADMIN_URL; ?>?p=accounts"><span class="btn btn-danger">Cancel</span></a>
-						<div class="pull-right">
-							<input type="submit" class="btn btn-primary" value="Update">
-						</div>
-					</div>
-
-				</div>
-			</div>
-	</form>
-</div>
-<?php } ?>
-<div class="col-md-4">
-	<div class="box box-primary">
-		<div class="box-header with-border">
-			<h3 class="box-title">Search Account:</h3>
-			<div class="box-tools pull-right">
-				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
-				</button>
-			</div>
-		</div>
-
-		<div class="box-body">
-			<form action="<?php echo $base; ?>" method="post">
-				<div class="input-group input-group-sm">
-					<input type="text" class="form-control" name="search_name" value="<?php echo $search_account; ?>"
-						   maxlength="32" size="32">
-					<span class="input-group-btn">
-                          <button type="submit" type="button" class="btn btn-info btn-flat">Search</button>
-                        </span>
-				</div>
-			</form>
-		</div>
-	</div>
-	<?php
-	if (isset($account) && $account->isLoaded()) {
-		$account_players = array();
-		$query = $db->query('SELECT `name`,`level`,`vocation`  FROM `players` WHERE `account_id` = ' . $account->getId() . ' ORDER BY `name`')->fetchAll();
-		if (isset($query)) {
-			?>
-			<div class="box">
-				<div class="box-header">
-					<h3 class="box-title">Character List:</h3>
-				</div>
-				<div class="box-body no-padding">
-					<table class="table table-striped">
-						<tbody>
-						<tr>
-							<th style="width: 10px">#</th>
-							<th>Name</th>
-							<th>Level</th>
-							<th style="width: 40px">Edit</th>
-						</tr>
-						<?php
-						$i = 1;
-						foreach ($query as $p) {
-							$account_players[] = $p;
-							echo '<tr>
-                            <td>' . $i . '.</td>
-                            <td>' . $p['name'] . '</td>
-                            <td>' . $p['level'] . '</td>
-                            <td><a href="?p=players&search_name=' . $p['name'] . '"><span class="btn btn-success btn-sm edit btn-flat"><i class="fa fa-edit"></i></span></a></span></td>
-                        </tr>';
-							$i++;
-						} ?>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
-			<?php
-		};
-	};
-	?>
-</div>
-
-<script type="text/javascript">
-	$('#lastlogout').datetimepicker({format: 'unixtime'});
-	$('#created').datetimepicker({format: 'unixtime'});
-	$('#web_lastlogin').datetimepicker({format: 'unixtime'});
-	$(document).ready(function () {
-		$('.input_control').change(function () {
-			$('input[name=pass]')[0].disabled = !this.checked;
-			$('input[name=pass]')[0].value = '';
-		}).change();
-	});
-</script>

admin/pages/changelog.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * CHANGELOG viewer
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'MyAAC Changelog';
-
-if (!file_exists(BASE . 'CHANGELOG.md')) {
-	echo 'File CHANGELOG.md doesn\'t exist.';
-	return;
-}
-
-require LIBS . 'Parsedown.php';
-
-$changelog = file_get_contents(BASE . 'CHANGELOG.md');
-
-$Parsedown = new Parsedown();
-
-$changelog = $Parsedown->text($changelog); # prints: <p>Hello <em>Parsedown</em>!</p>
-
-echo '<div>' . $changelog . '</div>';

admin/pages/dashboard.php

@@ -1,91 +0,0 @@
-<?php
-/**
- * Dashboard
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Dashboard';
-
-if (isset($_GET['clear_cache'])) {
-	if (clearCache()) {
-		success('Cache cleared.');
-	} else {
-		error('Error while clearing cache.');
-	}
-}
-
-if (isset($_GET['maintenance'])) {
-	$_status = (int)$_POST['status'];
-	$message = $_POST['message'];
-	if (empty($message)) {
-		error('Message cannot be empty.');
-	} else if (strlen($message) > 255) {
-		error('Message is too long. Maximum length allowed is 255 chars.');
-	} else {
-		$tmp = '';
-		if (fetchDatabaseConfig('site_closed', $tmp))
-			updateDatabaseConfig('site_closed', $_status);
-		else
-			registerDatabaseConfig('site_closed', $_status);
-
-		if (fetchDatabaseConfig('site_closed_message', $tmp))
-			updateDatabaseConfig('site_closed_message', $message);
-		else
-			registerDatabaseConfig('site_closed_message', $message);
-	}
-}
-$is_closed = getDatabaseConfig('site_closed') == '1';
-
-$closed_message = 'Server is under maintenance, please visit later.';
-$tmp = '';
-if (fetchDatabaseConfig('site_closed_message', $tmp))
-	$closed_message = $tmp;
-
-$query = $db->query('SELECT count(*) as `how_much` FROM `accounts`;');
-$query = $query->fetch();
-$total_accounts = $query['how_much'];
-
-$query = $db->query('SELECT count(*) as `how_much` FROM `players`;');
-$query = $query->fetch();
-$total_players = $query['how_much'];
-
-$query = $db->query('SELECT count(*) as `how_much` FROM `guilds`;');
-$query = $query->fetch();
-$total_guilds = $query['how_much'];
-
-$query = $db->query('SELECT count(*) as `how_much` FROM `houses`;');
-$query = $query->fetch();
-$total_houses = $query['how_much'];
-
-$twig->display('admin.statistics.html.twig', array(
-	'total_accounts' => $total_accounts,
-	'total_players' => $total_players,
-	'total_guilds' => $total_guilds,
-	'total_houses' => $total_houses
-));
-
-$twig->display('admin.dashboard.html.twig', array(
-	'is_closed' => $is_closed,
-	'closed_message' => $closed_message,
-	'status' => $status,
-	'account_type' => USE_ACCOUNT_NAME ? 'name' : 'number'
-));
-
-echo '<div class="row">';
-
-$configAdminPanelModules = config('admin_panel_modules');
-if(isset($configAdminPanelModules))
-	$configAdminPanelModules = explode(',', $configAdminPanelModules);
-
-$twig_loader->prependPath(__DIR__ . '/modules/templates');
-foreach($configAdminPanelModules as $box) {
-	$file = __DIR__ . '/modules/' . $box . '.php';
-	if(file_exists($file)) {
-		include($file);
-	}
-}
-echo '</div>';

admin/pages/items.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * Load items.xml
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Load items.xml';
-
-require LIBS . 'items.php';
-require LIBS . 'weapons.php';
-
-$twig->display('admin.items.html.twig');
-
-$reload = isset($_REQUEST['reload']) && (int)$_REQUEST['reload'] === 1;
-if ($reload) {
-	$items_start_time = microtime(true);
-	if (Items::loadFromXML(true)) {
-		success('Successfully loaded items (in ' . round(microtime(true) - $items_start_time, 4) . ' seconds).');
-	}
-	else {
-		error(Items::getError());
-	}
-
-	$weapons_start_time = microtime(true);
-	if (Weapons::loadFromXML(true)) {
-		success('Successfully loaded weapons (in ' . round(microtime(true) - $weapons_start_time, 4) . ' seconds).');
-	}
-	else {
-		error(Weapons::getError());
-	}
-}

admin/pages/login.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * Login
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Login';
-$logout = '';
-if ($action == 'logout') {
-	$logout = "You have  been logged out!";
-}
-
-if (isset($errors)) {
-	foreach ($errors as $error) {
-		error($error);
-	}
-}
-
-$twig->display('admin.login.html.twig', array(
-	'logout' => $logout,
-	'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number',
-));

admin/pages/logs.php

@@ -1,81 +0,0 @@
-<?php
-/**
- * Logs
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Logs Viewer';
-
-$files = array();
-$aac_path_logs = BASE . 'system/logs/';
-foreach (scandir($aac_path_logs, SCANDIR_SORT_ASCENDING) as $f) {
-    if ($f[0] === '.' || is_dir($aac_path_logs . $f)) {
-	    continue;
-    }
-
-    $files[] = array($f, $aac_path_logs);
-}
-
-$server_path_logs = $config['server_path'] . 'logs/';
-if (!file_exists($server_path_logs)) {
-    $server_path_logs = $config['data_path'] . 'logs/';
-}
-
-if (file_exists($server_path_logs)) {
-    foreach (scandir($server_path_logs, SCANDIR_SORT_ASCENDING) as $f) {
-        if ($f[0] === '.') {
-	        continue;
-        }
-
-        if (is_dir($server_path_logs . $f)) {
-            foreach (scandir($server_path_logs . $f, SCANDIR_SORT_ASCENDING) as $f2) {
-                if ($f2[0] === '.') {
-	                continue;
-                }
-
-                $files[] = array($f . '/' . $f2, $server_path_logs);
-            }
-
-            continue;
-        }
-
-        $files[] = array($f, $server_path_logs);
-    }
-}
-
-foreach ($files as &$f) {
-    $f['mtime'] = filemtime($f[1] . $f[0]);
-    $f['name'] = $f[0];
-}
-unset($f);
-
-$twig->display('admin.logs.html.twig', array('files' => $files));
-
-define('EXIST_NONE', 0);
-define('EXIST_SERVER_LOG', 1);
-define('EXIST_AAC_LOG', 2);
-
-$exist = EXIST_NONE;
-$file = isset($_GET['file']) ? $_GET['file'] : null;
-if (!empty($file)) {
-	if (!preg_match('/[^A-z0-9\' _\/\-\.]/', $file)) {
-		if (file_exists($aac_path_logs . $file)) {
-			$exist = EXIST_AAC_LOG;
-		} else if (file_exists($server_path_logs . $file)) {
-			$exist = EXIST_SERVER_LOG;
-		} else {
-			echo 'Specified file does not exist.';
-		}
-
-		if ($exist !== EXIST_NONE) {
-			$content = nl2br(file_get_contents(($exist === EXIST_SERVER_LOG ? $server_path_logs : $aac_path_logs) . $file));
-			$twig->display('admin.logs.view.html.twig', array('file' => $file, 'content' => $content));
-		}
-	} else {
-		echo 'Invalid file name specified.';
-	}
-}

admin/pages/menus.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * Menus
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Menus';
-
-if (!hasFlag(FLAG_CONTENT_MENUS) && !superAdmin()) {
-	echo 'Access denied.';
-	return;
-}
-
-if (isset($_REQUEST['template'])) {
-	$template = $_REQUEST['template'];
-
-	if (isset($_REQUEST['menu'])) {
-		$post_menu = $_REQUEST['menu'];
-		$post_menu_link = $_REQUEST['menu_link'];
-		$post_menu_blank = $_REQUEST['menu_blank'];
-		$post_menu_color = $_REQUEST['menu_color'];
-		if (count($post_menu) != count($post_menu_link)) {
-			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
-			return;
-		}
-
-		$db->query('DELETE FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($template));
-		foreach ($post_menu as $category => $menus) {
-			foreach ($menus as $i => $menu) {
-				if (empty($menu)) // don't save empty menu item
-					continue;
-
-				try {
-					$db->insert(TABLE_PREFIX . 'menu', array('template' => $template, 'name' => $menu, 'link' => $post_menu_link[$category][$i], 'blank' => $post_menu_blank[$category][$i] == 'on' ? 1 : 0, 'color' => str_replace('#', '', $post_menu_color[$category][$i]), 'category' => $category, 'ordering' => $i));
-				} catch (PDOException $error) {
-					warning('Error while adding menu item (' . $menu . '): ' . $error->getMessage());
-				}
-			}
-		}
-
-		$cache = Cache::getInstance();
-		if ($cache->enabled()) {
-			$cache->delete('template_menus');
-		}
-
-		success('Saved at ' . date('H:i'));
-	}
-
-	$file = TEMPLATES . $template . '/config.php';
-	if (file_exists($file)) {
-		require_once $file;
-	} else {
-		echo 'Cannot find template config.php file.';
-		return;
-	}
-
-	if (!isset($config['menu_categories'])) {
-		echo "No menu categories set in template config.php.<br/>This template doesn't support dynamic menus.";
-		return;
-	}
-
-	echo 'Hint: You can drag menu items.<br/>
-	Hint: Add links to external sites using: <b>http://</b> or <b>https://</b> prefix.<br/>
-	Not all templates support blank and colorful links.<br/><br/>
-    <div class="row">';
-	$menus = array();
-	$menus_db = $db->query('SELECT `name`, `link`, `blank`, `color`, `category`, `ordering` FROM `' . TABLE_PREFIX . 'menu` WHERE `enabled` = 1 AND `template` = ' . $db->quote($template) . ' ORDER BY `ordering` ASC;')->fetchAll();
-	foreach ($menus_db as $menu) {
-		$menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link'], 'blank' => $menu['blank'], 'color' => $menu['color'], 'ordering' => $menu['ordering']);
-	}
-
-	$last_id = array();
-	echo '<form method="post" id="menus-form" action="?p=menus">';
-	echo '<input type="hidden" name="template" value="' . $template . '"/>';
-	foreach ($config['menu_categories'] as $id => $cat) {
-		echo '        <div class="col-md-12 col-lg-6">
-            <div class="box box-danger">
-                <div class="box-header with-border">
-                    <h3 class="box-title">' . $cat['name'] . ' <img class="add-button" id="add-button-' . $id . '" src="' . BASE_URL . 'images/plus.png" width="16" height="16"/></h3>
-                </div>
-                <div class="box-body">';
-
-
-		echo '<ul class="sortable" id="sortable-' . $id . '">';
-		if (isset($menus[$id])) {
-			$i = 0;
-			foreach ($menus[$id] as $menu) {
-				echo '<li class="ui-state-default" id="list-' . $id . '-' . $i . '"><label>Name:</label><input type="text" name="menu[' . $id . '][]" value="' . $menu['name'] . '"/>
-				<label>Link:</label><input type="text" name="menu_link[' . $id . '][]" value="' . $menu['link'] . '"/>
-				<input type="hidden" name="menu_blank[' . $id . '][]" value="0" />
-				<label><input class="blank-checkbox" type="checkbox" ' . ($menu['blank'] == 1 ? 'checked' : '') . '/><span title="Open in New Window">Open in New Window</span></label>
-				
-				<input class="color-picker" type="text" name="menu_color[' . $id . '][]" value="#' . $menu['color'] . '" />
-				
-				<a class="remove-button" id="remove-button-' . $id . '-' . $i . '"><img src="' . BASE_URL . 'images/del.png"/></a></li>';
-
-				$i++;
-				$last_id[$id] = $i;
-			}
-		}
-
-		echo '</ul>';
-		echo '                </div>
-            </div>
-        </div>
-';
-	}
-	echo ' </div><div class="row"><div class="col-md-6">';
-	echo '<input type="submit" class="btn btn-info" value="Save">';
-	echo '<input type="button" class="btn btn-default pull-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus&template=' . $template . '\';">';
-	echo '</div></div>';
-	echo '</form>';
-
-	$twig->display('admin.menus.js.html.twig', array(
-		'menus' => $menus,
-		'last_id' => $last_id
-	));
-	?>
-
-	<?php
-} else {
-	$templates = $db->query('SELECT `template` FROM `' . TABLE_PREFIX . 'menu` GROUP BY `template`;')->fetchAll();
-	foreach ($templates as $key => $value) {
-		$file = TEMPLATES . $value['template'] . '/config.php';
-		if (!file_exists($file)) {
-			unset($templates[$key]);
-		}
-	}
-
-	$twig->display('admin.menus.form.html.twig', array(
-		'templates' => $templates
-	));
-}

admin/pages/modules/coins.php

@@ -1,11 +0,0 @@
-<?php
-
-if ($db->hasColumn('accounts', 'coins')) {
-	$coins = $db->query('SELECT `coins`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `coins` DESC LIMIT 10;');
-} else {
-	$coins = 0;
-}
-
-$twig->display('coins.html.twig', array(
-	'coins' => $coins
-));

admin/pages/modules/lastlogin.php

@@ -1,11 +0,0 @@
-<?php
-
-if ($db->hasColumn('players', 'lastlogin')) {
-	$players = $db->query('SELECT name, level, lastlogin FROM players ORDER BY lastlogin DESC LIMIT 10;');
-} else {
-	$players = 0;
-}
-
-$twig->display('lastlogin.html.twig', array(
-	'players' => $players,
-));

admin/pages/modules/points.php

@@ -1,10 +0,0 @@
-<?php
-if ($db->hasColumn('accounts', 'premium_points')) {
-	$points = $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;');
-} else {
-	$points = 0;
-}
-
-$twig->display('points.html.twig', array(
-	'points' => $points,
-));

admin/pages/modules/templates/coins.html.twig

@@ -1,29 +0,0 @@
-{% if coins is iterable %}
-	<div class="col-md-3">
-		<div class="box">
-			<div class="box-header">
-				<h3 class="box-title">Top 10 - Most coins</h3>
-			</div>
-			<div class="box-body no-padding">
-				<table class="table table-condensed">
-					<tbody>
-					<tr>
-						<th>#</th>
-						<th>Account {{ account_type }}</th>
-						<th>Tibia coins</th>
-					</tr>
-					{% set i = 0 %}
-					{% for result in coins %}
-						{% set i = i + 1 %}
-						<tr>
-							<td>{{ i }}</td>
-							<td>{{ result.name }}</td>
-							<td>{{ result.coins }}</td>
-						</tr>
-					{% endfor %}
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-{% endif %}

admin/pages/modules/templates/lastlogin.html.twig

@@ -1,29 +0,0 @@
-{% if players is iterable %}
-	<div class="col-md-3">
-		<div class="box">
-			<div class="box-header">
-				<h3 class="box-title">Last 10 Logins</h3>
-			</div>
-			<div class="box-body no-padding">
-				<table class="table table-condensed">
-					<tbody>
-					<tr>
-						<th>#</th>
-						<th>Player</th>
-						<th>Login Date</th>
-					</tr>
-					{% set i = 0 %}
-					{% for result in players %}
-						{% set i = i + 1 %}
-						<tr>
-							<td>{{ i }}</td>
-							<td>{{ result.name }}</td>
-							<td>{{ result.lastlogin|date("M d Y, H:i:s") }}</td>
-						</tr>
-					{% endfor %}
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-{% endif %}

admin/pages/modules/templates/points.html.twig

@@ -1,29 +0,0 @@
-{% if points is iterable %}
-	<div class="col-md-3">
-		<div class="box">
-			<div class="box-header">
-				<h3 class="box-title">Top 10 - Most premium points</h3>
-			</div>
-			<div class="box-body no-padding">
-				<table class="table table-condensed">
-					<tbody>
-					<tr>
-						<th>#</th>
-						<th>Account {{ account_type }}</th>
-						<th>Premium points</th>
-					</tr>
-					{% set i = 0 %}
-					{% for result in points %}
-						{% set i = i + 1 %}
-						<tr>
-							<td>{{ i }}</td>
-							<td>{{ result.name }}</td>
-							<td>{{ result.premium_points }}</td>
-						</tr>
-					{% endfor %}
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-{% endif %}

admin/pages/news.php

@@ -1,154 +0,0 @@
-<?php
-/**
- * Pages
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-
-require_once LIBS . 'forum.php';
-require_once LIBS . 'news.php';
-
-$title = 'News Panel';
-
-if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
-	echo 'Access denied.';
-	return;
-}
-
-header('X-XSS-Protection:0');
-
-// some constants, used mainly by database (cannot by modified without schema changes)
-define('TITLE_LIMIT', 100);
-define('BODY_LIMIT', 65535); // maximum news body length
-define('ARTICLE_TEXT_LIMIT', 300);
-define('ARTICLE_IMAGE_LIMIT', 100);
-
-$name = $p_title = '';
-if(!empty($action))
-{
-	$id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
-	$p_title = isset($_REQUEST['title']) ? $_REQUEST['title'] : null;
-	$body = isset($_REQUEST['body']) ? stripslashes($_REQUEST['body']) : null;
-	$comments = isset($_REQUEST['comments']) ? $_REQUEST['comments'] : null;
-	$type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : null;
-	$category = isset($_REQUEST['category']) ? (int)$_REQUEST['category'] : null;
-	$player_id = isset($_REQUEST['player_id']) ? (int)$_REQUEST['player_id'] : null;
-	$article_text = isset($_REQUEST['article_text']) ? $_REQUEST['article_text'] : null;
-	$article_image = isset($_REQUEST['article_image']) ? $_REQUEST['article_image'] : null;
-	$forum_section = isset($_REQUEST['forum_section']) ? $_REQUEST['forum_section'] : null;
-	$errors = array();
-
-	if($action == 'add') {
-		if(isset($forum_section) && $forum_section != '-1') {
-			$forum_add = Forum::add_thread($p_title, $body, $forum_section, $player_id, $account_logged->getId(), $errors);
-		}
-
-		if(News::add($p_title, $body, $type, $category, $player_id, isset($forum_add) && $forum_add != 0 ? $forum_add : 0, $article_text, $article_image, $errors)) {
-			$p_title = $body = $comments = $article_text = $article_image = '';
-			$type = $category = $player_id = 0;
-
-			success("Added successful.");
-		}
-	}
-	else if($action == 'delete') {
-		News::delete($id, $errors);
-		success("Deleted successful.");
-	}
-	else if($action == 'edit')
-	{
-		if(isset($id) && !isset($p_title)) {
-			$news = News::get($id);
-			$p_title = $news['title'];
-			$body = $news['body'];
-			$comments = $news['comments'];
-			$type = $news['type'];
-			$category = $news['category'];
-			$player_id = $news['player_id'];
-			$article_text = $news['article_text'];
-			$article_image = $news['article_image'];
-		}
-		else {
-			if(News::update($id, $p_title, $body, $type, $category, $player_id, $forum_section, $article_text, $article_image, $errors)) {
-				// update forum thread if exists
-				if(isset($forum_section) && Validator::number($forum_section)) {
-					$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `author_guid` = ".(int) $player_id.", `post_text` = ".$db->quote($body).", `post_topic` = ".$db->quote($p_title).", `edit_date` = " . time() . " WHERE `id` = " . $db->quote($forum_section));
-				}
-
-				$action = $p_title = $body = $comments = $article_text = $article_image = '';
-				$type = $category = $player_id = 0;
-
-				success("Updated successful.");
-			}
-		}
-	}
-	else if($action == 'hide') {
-		News::toggleHidden($id, $errors, $status);
-		success(($status == 1 ? 'Show' : 'Hide') . " successful.");
-	}
-
-	if(!empty($errors))
-		error(implode(", ", $errors));
-}
-
-$categories = array();
-foreach($db->query('SELECT `id`, `name`, `icon_id` FROM `' . TABLE_PREFIX . 'news_categories` WHERE `hidden` != 1') as $cat)
-{
-	$categories[$cat['id']] = array(
-		'name' => $cat['name'],
-		'icon_id' => $cat['icon_id']
-	);
-}
-
-if($action == 'edit' || $action == 'new') {
-	if($action == 'edit') {
-		$player = new OTS_Player();
-		$player->load($player_id);
-	}
-
-	$account_players = $account_logged->getPlayersList();
-	$account_players->orderBy('group_id', POT::ORDER_DESC);
-	$twig->display('admin.news.form.html.twig', array(
-		'action' => $action,
-		'news_link' => getLink(PAGE),
-		'news_link_form' => '?p=news&action=' . ($action == 'edit' ? 'edit' : 'add'),
-		'news_id' => isset($id) ? $id : null,
-		'title' => isset($p_title) ? $p_title : '',
-		'body' => isset($body) ? htmlentities($body, ENT_COMPAT, 'UTF-8') : '',
-		'type' => isset($type) ? $type : null,
-		'player' => isset($player) && $player->isLoaded() ? $player : null,
-		'player_id' => isset($player_id) ? $player_id : null,
-		'account_players' => $account_players,
-		'category' => isset($category) ? $category : 0,
-		'categories' => $categories,
-		'forum_boards' => getForumBoards(),
-		'forum_section' => isset($forum_section) ? $forum_section : null,
-		'comments' => isset($comments) ? $comments : null,
-		'article_text' => isset($article_text) ? $article_text : null,
-		'article_image' => isset($article_image) ? $article_image : null
-	));
-}
-
-$query = $db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'news'));
-$newses = array();
-foreach ($query as $_news) {
-	$_player = new OTS_Player();
-	$_player->load($_news['player_id']);
-
-	$newses[$_news['type']][] = array(
-		'id' => $_news['id'],
-		'hidden' => $_news['hidden'],
-		'archive_link' => getLink('news') . '/archive/' . $_news['id'],
-		'title' => $_news['title'],
-		'date' => $_news['date'],
-		'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '',
-		'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '',
-	);
-}
-
-$twig->display('admin.news.html.twig', array(
-	'newses' => $newses
-));

admin/pages/phpinfo.php

@@ -1,19 +0,0 @@
-<?php
-/**
- * PHP Info
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'PHP Info';
-
-if (!function_exists('phpinfo')) { ?>
-	<b>phpinfo()</b> function is disabled in your webserver config.<br/>
-	You can enable it by editing <b>php.ini</b> file.
-	<?php return;
-}
-?>
-<iframe src="<?php echo BASE_URL; ?>admin/tools/phpinfo.php" width="1024" height="550"/>

admin/pages/players.php

@@ -1,897 +0,0 @@
-<?php
-/**
- * Players editor
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-
-$title = 'Player editor';
-$base = BASE_URL . 'admin/?p=players';
-
-function echo_success($message)
-{
-	echo '<p class="success">' . $message . '</p>';
-}
-
-function echo_error($message)
-{
-	global $error;
-	echo '<p class="error">' . $message . '</p>';
-	$error = true;
-}
-
-function verify_number($number, $name, $max_length)
-{
-	if (!Validator::number($number))
-		echo_error($name . ' can contain only numbers.');
-
-	$number_length = strlen($number);
-	if ($number_length <= 0 || $number_length > $max_length)
-		echo_error($name . ' cannot be longer than ' . $max_length . ' digits.');
-}
-
-$skills = array(
-	POT::SKILL_FIST => array('Fist fighting', 'fist'),
-	POT::SKILL_CLUB => array('Club fighting', 'club'),
-	POT::SKILL_SWORD => array('Sword fighting', 'sword'),
-	POT::SKILL_AXE => array('Axe fighting', 'axe'),
-	POT::SKILL_DIST => array('Distance fighting', 'dist'),
-	POT::SKILL_SHIELD => array('Shielding', 'shield'),
-	POT::SKILL_FISH => array('Fishing', 'fish')
-);
-
-
-$hasBlessingsColumn = $db->hasColumn('players', 'blessings');
-$hasBlessingColumn = $db->hasColumn('players', 'blessings1');
-$hasLookAddons = $db->hasColumn('players', 'lookaddons');
-?>
-
-<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>tools/css/jquery.datetimepicker.css"/ >
-<script src="<?php echo BASE_URL; ?>tools/js/jquery.datetimepicker.js"></script>
-
-<?php
-$id = 0;
-if (isset($_REQUEST['id']))
-	$id = (int)$_REQUEST['id'];
-else if (isset($_REQUEST['search_name'])) {
-	if (strlen($_REQUEST['search_name']) < 3 && !Validator::number($_REQUEST['search_name'])) {
-		echo 'Player name is too short.';
-	} else {
-		if (Validator::number($_REQUEST['search_name']))
-			$id = $_REQUEST['search_name'];
-		else {
-			$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote($_REQUEST['search_name']));
-			if ($query->rowCount() == 1) {
-				$query = $query->fetch();
-				$id = $query['id'];
-			} else {
-				$query = $db->query('SELECT `id`, `name` FROM `players` WHERE `name` LIKE ' . $db->quote('%' . $_REQUEST['search_name'] . '%'));
-				if ($query->rowCount() > 0 && $query->rowCount() <= 10) {
-					echo 'Do you mean?<ul>';
-					foreach ($query as $row)
-						echo '<li><a href="' . $base . '&id=' . $row['id'] . '">' . $row['name'] . '</a></li>';
-					echo '</ul>';
-				} else if ($query->rowCount() > 10)
-					echo 'Specified name resulted with too many players.';
-			}
-		}
-	}
-}
-
-$groups = new OTS_Groups_List();
-if ($id > 0) {
-	$player = new OTS_Player();
-	$player->load($id);
-
-	if (isset($player) && $player->isLoaded() && isset($_POST['save'])) {// we want to save
-		$error = false;
-
-		if ($player->isOnline())
-			echo_error('This player is actually online. You can\'t edit online players.');
-
-		$name = $_POST['name'];
-		$_error = '';
-		if (!Validator::characterName($name))
-			echo_error(Validator::getLastError());
-
-		//if(!Validator::newCharacterName($name)
-		//	echo_error(Validator::getLastError());
-
-		$player_db = new OTS_Player();
-		$player_db->find($name);
-		if ($player_db->isLoaded() && $player->getName() != $name)
-			echo_error('This name is already used. Please choose another name!');
-
-		$account_id = $_POST['account_id'];
-		verify_number($account_id, 'Account id', 11);
-
-		$account_db = new OTS_Account();
-		$account_db->load($account_id);
-		if (!$account_db->isLoaded())
-			echo_error('Account with this id doesn\'t exist.');
-
-		$group = $_POST['group'];
-		if ($groups->getGroup($group) == false)
-			echo_error('Group with this id doesn\'t exist');
-
-		$level = $_POST['level'];
-		verify_number($level, 'Level', 11);
-
-		$experience = $_POST['experience'];
-		verify_number($experience, 'Experience', 20);
-
-		$vocation = $_POST['vocation'];
-		verify_number($vocation, 'Vocation id', 11);
-
-		if (!isset($config['vocations'][$vocation])) {
-			echo_error("Vocation with this id doesn't exist.");
-		}
-
-		// health
-		$health = $_POST['health'];
-		verify_number($health, 'Health', 11);
-		$health_max = $_POST['health_max'];
-		verify_number($health_max, 'Health max', 11);
-
-		// mana
-		$magic_level = $_POST['magic_level'];
-		verify_number($magic_level, 'Magic_level', 11);
-		$mana = $_POST['mana'];
-		verify_number($mana, 'Mana', 11);
-		$mana_max = $_POST['mana_max'];
-		verify_number($mana_max, 'Mana max', 11);
-		$mana_spent = $_POST['mana_spent'];
-		verify_number($mana_spent, 'Mana spent', 11);
-
-		// look
-		$look_body = $_POST['look_body'];
-		verify_number($look_body, 'Look body', 11);
-		$look_feet = $_POST['look_feet'];
-		verify_number($look_feet, 'Look feet', 11);
-		$look_head = $_POST['look_head'];
-		verify_number($look_head, 'Look head', 11);
-		$look_legs = $_POST['look_legs'];
-		verify_number($look_legs, 'Look legs', 11);
-		$look_type = $_POST['look_type'];
-		verify_number($look_type, 'Look type', 11);
-		if ($hasLookAddons) {
-			$look_addons = $_POST['look_addons'];
-			verify_number($look_addons, 'Look addons', 11);
-		}
-
-		// pos
-		$pos_x = $_POST['pos_x'];
-		verify_number($pos_x, 'Position x', 11);
-		$pos_y = $_POST['pos_y'];
-		verify_number($pos_y, 'Position y', 11);
-		$pos_z = $_POST['pos_z'];
-		verify_number($pos_z, 'Position z', 11);
-
-		$soul = $_POST['soul'];
-		verify_number($soul, 'Soul', 10);
-		$town = $_POST['town'];
-		verify_number($town, 'Town', 11);
-
-		$capacity = $_POST['capacity'];
-		verify_number($capacity, 'Capacity', 11);
-		$sex = $_POST['sex'];
-		verify_number($sex, 'Sex', 1);
-
-		$lastlogin = $_POST['lastlogin'];
-		verify_number($lastlogin, 'Last login', 20);
-		$lastlogout = $_POST['lastlogout'];
-		verify_number($lastlogout, 'Last logout', 20);
-
-		$skull = $_POST['skull'];
-		verify_number($skull, 'Skull', 1);
-		$skull_time = $_POST['skull_time'];
-		verify_number($skull_time, 'Skull time', 11);
-
-		if ($db->hasColumn('players', 'loss_experience')) {
-			$loss_experience = $_POST['loss_experience'];
-			verify_number($loss_experience, 'Loss experience', 11);
-			$loss_mana = $_POST['loss_mana'];
-			verify_number($loss_mana, 'Loss mana', 11);
-			$loss_skills = $_POST['loss_skills'];
-			verify_number($loss_skills, 'Loss skills', 11);
-			$loss_containers = $_POST['loss_containers'];
-			verify_number($loss_containers, 'Loss loss_containers', 11);
-			$loss_items = $_POST['loss_items'];
-			verify_number($loss_items, 'Loss items', 11);
-		}
-		if ($db->hasColumn('players', 'offlinetraining_time')) {
-			$offlinetraining = $_POST['offlinetraining'];
-			verify_number($offlinetraining, 'Offline Training time', 11);
-		}
-
-		if ($hasBlessingsColumn) {
-			$blessings = $_POST['blessings'];
-			verify_number($blessings, 'Blessings', 2);
-		}
-
-		$balance = $_POST['balance'];
-		verify_number($balance, 'Balance', 20);
-		if ($db->hasColumn('players', 'stamina')) {
-			$stamina = $_POST['stamina'];
-			verify_number($stamina, 'Stamina', 20);
-		}
-
-		$deleted = (isset($_POST['deleted']) && $_POST['deleted'] == 'true');
-		$hidden = (isset($_POST['hidden']) && $_POST['hidden'] == 'true');
-
-		$created = $_POST['created'];
-		verify_number($created, 'Created', 11);
-
-		$comment = isset($_POST['comment']) ? htmlspecialchars(stripslashes(substr($_POST['comment'], 0, 2000))) : NULL;
-
-		foreach ($_POST['skills'] as $skill => $value)
-			verify_number($value, $skills[$skill][0], 10);
-		foreach ($_POST['skills_tries'] as $skill => $value)
-			verify_number($value, $skills[$skill][0] . ' tries', 10);
-
-		if ($hasBlessingColumn) {
-		$bless_count = $_POST['blesscount'];
-			for ($i = 1; $i <= $bless_count; $i++) {
-				$a = 'blessing' . $i;
-				${'blessing' . $i} = (isset($_POST[$a]) && $_POST[$a] == 'true');
-			}
-		}
-
-		if (!$error) {
-			$player->setName($name);
-			$player->setAccount($account_db);
-			$player->setGroup($groups->getGroup($group));
-			$player->setLevel($level);
-			$player->setExperience($experience);
-			$player->setVocation($vocation);
-			$player->setHealth($health);
-			$player->setHealthMax($health_max);
-			$player->setMagLevel($magic_level);
-			$player->setMana($mana);
-			$player->setManaMax($mana_max);
-			$player->setManaSpent($mana_spent);
-			$player->setLookBody($look_body);
-			$player->setLookFeet($look_feet);
-			$player->setLookHead($look_head);
-			$player->setLookLegs($look_legs);
-			$player->setLookType($look_type);
-			if ($hasLookAddons)
-				$player->setLookAddons($look_addons);
-			if ($db->hasColumn('players', 'offlinetraining_time'))
-				$player->setCustomField('offlinetraining_time', $offlinetraining);
-			$player->setPosX($pos_x);
-			$player->setPosY($pos_y);
-			$player->setPosZ($pos_z);
-			$player->setSoul($soul);
-			$player->setTownId($town);
-			$player->setCap($capacity);
-			$player->setSex($sex);
-			$player->setLastLogin($lastlogin);
-			$player->setLastLogout($lastlogout);
-			//$player->setLastIP(ip2long($lastip));
-			$player->setSkull($skull);
-			$player->setSkullTime($skull_time);
-			if ($db->hasColumn('players', 'loss_experience')) {
-				$player->setLossExperience($loss_experience);
-				$player->setLossMana($loss_mana);
-				$player->setLossSkills($loss_skills);
-				$player->setLossContainers($loss_containers);
-				$player->setLossItems($loss_items);
-			}
-			if ($db->hasColumn('players', 'blessings'))
-				$player->setBlessings($blessings);
-
-			if ($hasBlessingColumn) {
-				for ($i = 1; $i <= $bless_count; $i++) {
-					$a = 'blessing' . $i;
-					$player->setCustomField('blessings' . $i, ${'blessing' . $i} ? '1' : '0');
-				}
-			}
-			$player->setBalance($balance);
-			if ($db->hasColumn('players', 'stamina'))
-				$player->setStamina($stamina);
-			if ($db->hasColumn('players', 'deletion'))
-				$player->setCustomField('deletion', $deleted ? '1' : '0');
-			else
-				$player->setCustomField('deleted', $deleted ? '1' : '0');
-			$player->setCustomField('hidden', $hidden ? '1' : '0');
-			$player->setCustomField('created', $created);
-			if (isset($comment))
-				$player->setCustomField('comment', $comment);
-
-			foreach ($_POST['skills'] as $skill => $value) {
-				$player->setSkill($skill, $value);
-			}
-			foreach ($_POST['skills_tries'] as $skill => $value) {
-				$player->setSkillTries($skill, $value);
-			}
-			$player->save();
-			echo_success('Player saved at: ' . date('G:i'));
-		}
-	}
-}
-
-$search_name = '';
-if (isset($_REQUEST['search_name']))
-	$search_name = $_REQUEST['search_name'];
-else if ($id > 0 && isset($player) && $player->isLoaded())
-	$search_name = $player->getName();
-
-?>
-<div class="row">
-
-	<?php
-	if (isset($player) && $player->isLoaded()) {
-		$account = $player->getAccount();
-		?>
-
-		<form action="<?php echo $base . ((isset($id) && $id > 0) ? '&id=' . $id : ''); ?>" method="post"
-			  class="form-horizontal">
-			<div class="col-md-8">
-				<div class="box box-primary">
-					<div class="box-body">
-						<div class="nav-tabs-custom">
-							<ul class="nav nav-tabs">
-								<li class="active"><a href="#tab_1" data-toggle="tab" aria-expanded="true">Player</a>
-								</li>
-								<li class=""><a href="#tab_2" data-toggle="tab" aria-expanded="false">Stats</a></li>
-								<li class=""><a href="#tab_3" data-toggle="tab" aria-expanded="false">Skills</a></li>
-								<li class=""><a href="#tab_4" data-toggle="tab" aria-expanded="false">Pos/Look</a></li>
-								<li class=""><a href="#tab_5" data-toggle="tab" aria-expanded="false">Misc</a></li>
-								<li class="pull-right"><a
-											href="<?php echo ADMIN_URL; ?>?p=accounts&search_name=<?php echo $account->getId(); ?>"
-											class="text-muted"><i class="fa fa-gear" title="Edit Account"></i></a></li>
-							</ul>
-							<div class="tab-content">
-								<div class="tab-pane active" id="tab_1">
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="name" class="control-label">Name</label>
-											<input type="text" class="form-control" id="name" name="name"
-												   autocomplete="off" style="cursor: auto;"
-												   value="<?php echo $player->getName(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="account_id" class="control-label">Account id:</label>
-											<input type="text" class="form-control" id="account_id" name="account_id"
-												   autocomplete="off" style="cursor: auto;" size="8" maxlength="11"
-												   value="<?php echo $account->getId(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6 ">
-											<label for="group" class="control-label">Group:</label>
-											<select name="group" id="group" class="form-control">
-												<?php foreach ($groups->getGroups() as $id => $group): ?>
-													<option value="<?php echo $id; ?>" <?php echo($player->getGroup()->getId() == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
-												<?php endforeach; ?>
-											</select>
-										</div>
-										<div class="col-xs-6">
-											<label for="vocation" class="control-label">Vocation</label>
-											<select name="vocation" id="vocation" class="form-control">
-												<?php
-												foreach ($config['vocations'] as $id => $name) {
-													echo '<option value=' . $id . ($id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
-												}
-												?>
-											</select>
-										</div>
-									</div>
-
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="sex" class="control-label">Sex:</label>
-											<select name="sex" id="sex" class="form-control">>
-												<?php foreach ($config['genders'] as $id => $sex): ?>
-													<option value="<?php echo $id; ?>" <?php echo($player->getSex() == $id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
-												<?php endforeach; ?>
-											</select>
-										</div>
-										<div class="col-xs-6">
-											<label for="town" class="control-label">Town:</label>
-											<select name="town" id="town" class="form-control">
-												<?php foreach ($config['towns'] as $id => $town): ?>
-													<option value="<?php echo $id; ?>" <?php echo($player->getTownId() == $id ? 'selected' : ''); ?>><?php echo $town; ?></option>
-												<?php endforeach; ?>
-											</select>
-										</div>
-									</div>
-
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="skull" class="control-label">Skull:</label>
-											<select name="skull" id="skull" class="form-control">
-												<?php
-												$skull_type = array("None", "Yellow", "Green", "White", "Red", "Black", "Orange");
-												foreach ($skull_type as $id => $s_name) {
-													echo '<option value=' . $id . ($id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
-												}
-												?>
-											</select>
-										</div>
-										<div class="col-xs-6">
-											<label for="skull_time" class="control-label">Skull time:</label>
-											<input type="text" class="form-control" id="skull_time" name="skull_time"
-												   autocomplete="off" maxlength="11"
-												   value="<?php echo $player->getSkullTime(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<?php if ($hasBlessingColumn):
-											$blesscount = $player->countBlessings();
-											$bless = $player->checkBlessings($blesscount);
-											?>
-											<input type="hidden" name="blesscount" value="<?php echo $blesscount; ?>"/>
-											<div class="col-xs-6">
-												<label for="blessings" class="control-label">Blessings:</label>
-												<div class="checkbox">
-													<?php
-													for ($i = 1; $i <= $blesscount; $i++) {
-														echo '<label><input style="margin-left: -16px;" type="checkbox" name="blessing' . $i . '" id="blessing' . $i . '"
-																  value="true" ' . (($bless[$i - 1] == 1) ? ' checked' : '') . '/>' . $i . '</label>';
-													}
-													?>
-												</div>
-											</div>
-										<?php endif; ?>
-										<?php if ($hasBlessingsColumn): ?>
-											<div class="col-xs-6">
-												<label for="blessings" class="control-label">Blessings:</label>
-												<input type="text" class="form-control" id="blessings" name="blessings"
-													   autocomplete="off" maxlength="11"
-													   value="<?php echo $player->getBlessings(); ?>"/>
-											</div>
-										<?php endif; ?>
-
-										<div class="col-xs-6">
-											<label for="balance" class="control-label">Bank Balance:</label>
-											<input type="text" class="form-control" id="balance" name="balance"
-												   autocomplete="off" maxlength="20"
-												   value="<?php echo $player->getBalance(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="deleted" class="control-label">Deleted:</label>
-											<input type="checkbox" name="deleted" id="deleted"
-												   value="true" <?php echo($player->getCustomField($db->hasColumn('players', 'deletion') ? 'deletion' : 'deleted') == '1' ? ' checked' : ''); ?>/>
-										</div>
-										<div class="col-xs-6">
-											<label for="hidden" class="control-label">Hidden:</label>
-											<input type="checkbox" name="hidden" id="hidden"
-												   value="true" <?php echo($player->isHidden() ? ' checked' : ''); ?>/>
-										</div>
-
-									</div>
-								</div>
-								<div class="tab-pane" id="tab_2">
-									<div class="row">
-										<div class="col-xs-6 ">
-											<label for="level" class="control-label">Level:</label>
-
-											<input type="text" class="form-control" id="level" name="level"
-												   autocomplete="off"
-												   style="cursor: auto;" value="<?php echo $player->getLevel(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="magic_level" class="control-label">Magic level:</label>
-											<input type="text" class="form-control" id="magic_level" name="magic_level"
-												   autocomplete="off" size="8" maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getMagLevel(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6 ">
-											<label for="experience" class="control-label">Experience:</label>
-											<input type="text" class="form-control" id="experience" name="experience"
-												   autocomplete="off"
-												   style="cursor: auto;"
-												   value="<?php echo $player->getExperience(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="mana_spent" class="control-label">Mana spent:</label>
-											<input type="text" class="form-control" id="mana_spent" name="mana_spent"
-												   autocomplete="off"
-												   size="3" maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getManaSpent(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6 ">
-											<label for="health" class="control-label">Health:</label>
-											<input type="text" class="form-control" id="health" name="health"
-												   autocomplete="off"
-												   size="5" maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getHealth(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="health_max" class="control-label">Health max:</label>
-											<input type="text" class="form-control" id="health_max" name="health_max"
-												   autocomplete="off"
-												   size="5" maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getHealthMax(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6 ">
-											<label for="mana" class="control-label">Mana:</label>
-											<input type="text" class="form-control" id="mana" name="mana"
-												   autocomplete="off" size="3"
-												   maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getMana(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="mana_max" class="control-label">Mana max:</label>
-											<input type="text" class="form-control" id="mana_max" name="mana_max"
-												   autocomplete="off"
-												   size="3" maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getManaMax(); ?>"/>
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="capacity" class="control-label">Capacity:</label>
-											<input type="text" class="form-control" id="capacity" name="capacity"
-												   autocomplete="off"
-												   size="3" maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getCap(); ?>"/>
-										</div>
-										<div class="col-xs-6 ">
-											<label for="soul" class="control-label">Soul:</label>
-											<input type="text" class="form-control" id="soul" name="soul"
-												   autocomplete="off" size="3"
-												   maxlength="10" style="cursor: auto;"
-												   value="<?php echo $player->getSoul(); ?>"/>
-										</div>
-										<?php if ($db->hasColumn('players', 'stamina')): ?>
-											<div class="col-xs-6">
-												<label for="stamina" class="control-label">Stamina:</label>
-												<input type="text" class="form-control" id="stamina" name="stamina"
-													   autocomplete="off"
-													   maxlength="20" style="cursor: auto;"
-													   value="<?php echo $player->getStamina(); ?>"/>
-
-											</div>
-										<?php endif; ?>
-										<?php if ($db->hasColumn('players', 'offlinetraining_time')): ?>
-											<div class="col-xs-6">
-												<label for="offlinetraining" class="control-label">Offline Training
-													Time:</label>
-												<input type="text" class="form-control" id="offlinetraining"
-													   name="offlinetraining" autocomplete="off"
-													   maxlength="11"
-													   value="<?php echo $player->getCustomField('offlinetraining_time'); ?>"/>
-											</div>
-										<?php endif; ?>
-									</div>
-								</div>
-								<div class="tab-pane" id="tab_3">
-									<?php
-									$i = 0;
-									foreach ($skills as $id => $info) {
-										if ($i == 0 || $i++ == 2) {
-											$i = 0;
-										}
-										echo '
-                <div class="row">
-                    <div class="col-xs-6 ">
-                        <label for="skills[' . $id . ']" class="control-label">' . $info[0] . '</label>
-                        <input type="text" class="form-control" id="skills[' . $id . ']" name="skills[' . $id . ']" maxlength="10" autocomplete="off" style="cursor: auto;" value="' . $player->getSkill($id) . '"/>
-                    </div>
-                    <div class="col-xs-6">
-                      <label for="skills_tries[' . $id . ']" class="control-label">' . $info[0] . ' tries</label>
-                        <input type="text" class="form-control" id="skills_tries[' . $id . ']" name="skills_tries[' . $id . ']" maxlength="10" autocomplete="off" style="cursor: auto;" value="' . $player->getSkillTries($id) . '"/>
-                    </div>
-                </div>';
-										if ($i == 0)
-											echo '';
-									}
-									?>
-								</div>
-								<div class="tab-pane" id="tab_4">
-									<?php $outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . ($hasLookAddons ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet(); ?>
-									<div id="imgchar"
-										 style="width:64px;height:64px;position:absolute; top:30px; right:30px"><img id="player_outfit"
-												style="margin-left:0;margin-top:0px;width:64px;height:64px;"
-												src="<?php echo $outfit; ?>"
-												alt="player outfit"/></div>
-									<?php ?>
-									<td>Position:</td>
-									<div class="row">
-										<div class="col-xs-4">
-											<label for="pos_x" class="control-label">X:</label>
-											<input type="text" class="form-control" id="pos_x" name="pos_x"
-												   autocomplete="off"
-												   maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getPosX(); ?>"/>
-										</div>
-										<div class="col-xs-4">
-											<label for="pos_y" class="control-label">Y:</label>
-											<input type="text" class="form-control" id="pos_y" name="pos_y"
-												   autocomplete="off"
-												   maxlength="11" value="<?php echo $player->getPosY(); ?>"/>
-										</div>
-										<div class="col-xs-4">
-											<label for="pos_z" class="control-label">Z:</label>
-											<input type="text" class="form-control" id="pos_z" name="pos_z"
-												   autocomplete="off"
-												   maxlength="11" value="<?php echo $player->getPosZ(); ?>"/>
-										</div>
-									</div>
-									<td>Look:</td>
-									<div class="row">
-										<div class="col-xs-3">
-											<label for="look_head" class="control-label">Head: <span
-														id="look_head_val"></span></label>
-											<input type="range" min="0" max="132"
-												   value="<?php echo $player->getLookHead(); ?>"
-												   class="slider form-control" id="look_head" name="look_head">
-										</div>
-										<div class="col-xs-3">
-											<label for="look_body" class="control-label">Body: <span
-														id="look_body_val"></span></label>
-											<input type="range" min="0" max="132"
-												   value="<?php echo $player->getLookBody(); ?>"
-												   class="slider form-control" id="look_body" name="look_body">
-										</div>
-										<div class="col-xs-3">
-											<label for="look_legs" class="control-label">Legs: <span
-														id="look_legs_val"></span></label>
-											<input type="range" min="0" max="132"
-												   value="<?php echo $player->getLookLegs(); ?>"
-												   class="slider form-control" id="look_legs" name="look_legs">
-										</div>
-										<div class="col-xs-3">
-											<label for="look_feet" class="control-label">Feet: <span
-														id="look_feet_val"></span></label>
-											<input type="range" min="0" max="132"
-												   value="<?php echo $player->getLookFeet(); ?>"
-												   class="slider form-control" id="look_feet" name="look_feet">
-										</div>
-									</div>
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="look_type" class="control-label">Type:</label>
-											<input type="text" class="form-control" id="look_type" name="look_type"
-												   autocomplete="off"
-												   maxlength="11" style="cursor: auto;"
-												   value="<?php echo $player->getLookType(); ?>"/>
-										</div>
-										<?php if ($hasLookAddons): ?>
-											<div class="col-xs-6">
-												<label for="look_addons" class="control-label">Addons:</label>
-												<input type="text" class="form-control" id="look_addons"
-													   name="look_addons" autocomplete="off"
-													   maxlength="11" value="<?php echo $player->getLookAddons(); ?>"/>
-											</div>
-										<?php endif; ?>
-									</div>
-								</div>
-								<div class="tab-pane" id="tab_5">
-									<div class="row">
-										<div class="col-xs-6">
-											<label for="created" class="control-label">Created:</label>
-											<input type="text" class="form-control" id="created" name="created"
-												   autocomplete="off"
-												   maxlength="10"
-												   value="<?php echo $player->getCustomField('created'); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="lastlogin" class="control-label">Last login:</label>
-											<input type="text" class="form-control" id="lastlogin" name="lastlogin"
-												   autocomplete="off"
-												   maxlength="20" value="<?php echo $player->getLastLogin(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="lastlogout" class="control-label">Last logout:</label>
-											<input type="text" class="form-control" id="lastlogout" name="lastlogout"
-												   autocomplete="off"
-												   maxlength="20" value="<?php echo $player->getLastLogout(); ?>"/>
-										</div>
-										<div class="col-xs-6">
-											<label for="lastip" class="control-label">Last IP:</label>
-											<input type="text" class="form-control" id="lastip" name="lastip"
-												   autocomplete="off"
-												   maxlength="10" value="<?php echo longToIp($player->getLastIP()); ?>"
-												   readonly/>
-										</div>
-									</div>
-									<?php if ($db->hasColumn('players', 'loss_experience')): ?>
-										<div class="row">
-											<div class="col-xs-6">
-												<label for="loss_experience" class="control-label">Experience
-													Loss:</label>
-												<input type="text" class="form-control" id="loss_experience"
-													   name="loss_experience" autocomplete="off"
-													   maxlength="11"
-													   value="<?php echo $player->getLossExperience(); ?>"/>
-											</div>
-											<div class="col-xs-6">
-												<label for="loss_mana" class="control-label">Mana Loss:</label>
-												<input type="text" class="form-control" id="loss_mana"
-													   name="loss_mana" autocomplete="off"
-													   maxlength="11" value="<?php echo $player->getLossMana(); ?>"/>
-											</div>
-											<div class="col-xs-6">
-												<label for="loss_skills" class="control-label">Skills Loss:</label>
-												<input type="text" class="form-control" id="loss_skills"
-													   name="loss_skills" autocomplete="off"
-													   maxlength="11" value="<?php echo $player->getLossSkills(); ?>"/>
-											</div>
-											<div class="col-xs-6">
-												<label for="loss_containers" class="control-label">Containers
-													Loss:</label>
-												<input type="text" class="form-control" id="loss_containers"
-													   name="loss_containers" autocomplete="off"
-													   maxlength="11"
-													   value="<?php echo $player->getLossContainers(); ?>"/>
-											</div>
-											<div class="col-xs-6">
-												<label for="loss_items" class="control-label">Items Loss:</label>
-												<input type="text" class="form-control" id="loss_items"
-													   name="loss_items" autocomplete="off"
-													   maxlength="11" value="<?php echo $player->getLossItems(); ?>"/>
-											</div>
-										</div>
-									<?php endif; ?>
-									<div class="row">
-										<div class="col-xs-12">
-											<label for="comment" class="control-label">Comment:</label>
-											<textarea class="form-control" name="comment" rows="10" cols="50"
-													  wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
-											<small>[max.
-												length: 2000 chars, 50 lines (ENTERs)]
-											</small>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<input type="hidden" name="save" value="yes"/>
-					<div class="box-footer">
-						<a href="<?php echo ADMIN_URL; ?>?p=players"><span class="btn btn-danger">Cancel</span></a>
-						<div class="pull-right">
-							<input type="submit" class="btn btn-primary" value="Update">
-						</div>
-					</div>
-				</div>
-			</div>
-		</form>
-	<?php } ?>
-	<div class="col-md-4">
-		<div class="box box-primary">
-			<div class="box-header with-border">
-				<h3 class="box-title">Search Player:</h3>
-				<div class="box-tools pull-right">
-					<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
-					</button>
-				</div>
-			</div>
-
-			<div class="box-body">
-				<form action="<?php echo $base; ?>" method="post">
-					<div class="input-group input-group-sm">
-						<input type="text" class="form-control" name="search_name" value="<?php echo $search_name; ?>"
-							   maxlength="32" size="32">
-						<span class="input-group-btn">
-                          <button type="submit" type="button" class="btn btn-info btn-flat">Search</button>
-                        </span>
-					</div>
-				</form>
-			</div>
-		</div>
-		<?php
-		if (isset($account) && $account->isLoaded()) {
-			$account_players = array();
-			$query = $db->query('SELECT `name`,`level`,`vocation`  FROM `players` WHERE `account_id` = ' . $account->getId() . ' ORDER BY `name`')->fetchAll();
-			if (isset($query)) {
-				?>
-				<div class="box">
-					<div class="box-header">
-						<h3 class="box-title">Character List:</h3>
-					</div>
-					<div class="box-body no-padding">
-						<table class="table table-striped">
-							<tbody>
-							<tr>
-								<th style="width: 10px">#</th>
-								<th>Name</th>
-								<th>Level</th>
-								<th style="width: 40px">Edit</th>
-							</tr>
-							<?php
-							$i = 1;
-							foreach ($query as $p) {
-								$account_players[] = $p;
-								echo '<tr>
-                            <td>' . $i . '.</td>
-                            <td>' . $p['name'] . '</td>
-                            <td>' . $p['level'] . '</td>
-                            <td><a href="?p=players&search_name=' . $p['name'] . '"><span class="btn btn-success btn-sm edit btn-flat"><i class="fa fa-edit"></i></span></a></span></td>
-                        </tr>';
-								$i++;
-							} ?>
-							</tbody>
-						</table>
-					</div>
-				</div>
-				<?php
-			};
-		};
-		?>
-	</div>
-
-
-	<script type="text/javascript">
-		$('#lastlogin').datetimepicker({
-			format: 'unixtime'
-		});
-		$('#lastlogout').datetimepicker({
-			format: 'unixtime'
-		});
-		$('#created').datetimepicker({
-			format: 'unixtime'
-		});
-
-		var slider_head = document.getElementById("look_head");
-		var output_head = document.getElementById("look_head_val");
-
-		var slider_body = document.getElementById("look_body");
-		var output_body = document.getElementById("look_body_val");
-
-		var slider_legs = document.getElementById("look_legs");
-		var output_legs = document.getElementById("look_legs_val");
-
-		var slider_feet = document.getElementById("look_feet");
-		var output_feet = document.getElementById("look_feet_val");
-		output_head.innerHTML = slider_head.value;
-		output_body.innerHTML = slider_body.value;
-		output_legs.innerHTML = slider_legs.value;
-		output_feet.innerHTML = slider_feet.value;
-
-		slider_head.oninput = function () {
-			output_head.innerHTML = this.value;
-		}
-		slider_body.oninput = function () {
-			output_body.innerHTML = this.value;
-		}
-		slider_legs.oninput = function () {
-			output_legs.innerHTML = this.value;
-		}
-		slider_feet.oninput = function () {
-			output_feet.innerHTML = this.value;
-		}
-
-        $('#look_head').change(function() {updateOutfit()});
-        $('#look_body').change(function() {updateOutfit()});
-        $('#look_legs').change(function() {updateOutfit()});
-        $('#look_feet').change(function() {updateOutfit()});
-        $('#look_type').change(function() {updateOutfit()});
-		<?php if($hasLookAddons): ?>
-        $('#look_addons').change(function() {updateOutfit()});
-		<?php endif; ?>
-
-        function updateOutfit()
-        {
-            var look_head = $('#look_head').val();
-            var look_body = $('#look_body').val();
-            var look_legs = $('#look_legs').val();
-            var look_feet = $('#look_feet').val();
-            var look_type = $('#look_type').val();
-
-            var look_addons = '';
-            <?php if($hasLookAddons): ?>
-                look_addons = '&addons=' + $('#look_addons').val();
-	        <?php endif; ?>
-
-            new_outfit = '<?= $config['outfit_images_url']; ?>?id=' + look_type + look_addons + '&head=' + look_head + '&body=' + look_body + '&legs=' + look_legs + '&feet=' + look_feet;
-            $("#player_outfit").attr("src", new_outfit);
-            console.log(new_outfit);
-        }
-	</script>

admin/pages/reports.php

@@ -1,61 +0,0 @@
-<?php
-/**
- * Reports
- *
- * @package   MyAAC
- * @author    Lee
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Report Viewer';
-
-$files = array();
-$server_path_reports = $config['data_path'] . 'reports/';
-
-if (file_exists($server_path_reports)) {
-    foreach (scandir($server_path_reports, SCANDIR_SORT_ASCENDING) as $f) {
-        if ($f[0] === '.') {
-	        continue;
-        }
-
-        if (is_dir($server_path_reports . $f)) {
-            foreach (scandir($server_path_reports . $f, SCANDIR_SORT_ASCENDING) as $f2) {
-                if ($f2[0] === '.') {
-	                continue;
-                }
-
-                $files[] = array($f . '/' . $f2, $server_path_reports);
-            }
-
-            continue;
-        }
-
-        $files[] = array($f, $server_path_reports);
-    }
-}
-
-foreach ($files as &$f) {
-	$f['mtime'] = filemtime($f[1] . $f[0]);
-	$f['name'] = $f[0];
-}
-
-unset($f);
-
-$twig->display('admin.reports.html.twig', array('files' => $files));
-
-
-$file = isset($_GET['file']) ? $_GET['file'] : NULL;
-if (!empty($file)) {
-	if (!preg_match('/[^A-z0-9\' _\/\-\.]/', $file)) {
-		if (file_exists($server_path_reports . $file)) {
-			$content = nl2br(file_get_contents($server_path_reports . $file));
-
-			$twig->display('admin.logs.view.html.twig', array('file' => $file, 'content' => $content));
-		} else {
-			echo 'Specified file does not exist.';
-		}
-	} else {
-		echo 'Invalid file name specified.';
-	}
-}

admin/template/style.css

@@ -1,44 +1,147 @@
-.slidecontainer {
+*{
-	width: 100%;
+	margin:0;
+	padding:0;
+}
+body {
+	font-family: Helvetica;
+	color: #313334;
+	background: /*#f9f9f9 #EEEEEE*/#F7F6F1;
 }
 
-.slider {
+img {border: none;}
-	-webkit-appearance: none;
-	width: 100%;
 
-	outline: none;
+a:link		{color: #000; text-decoration: none;}
-	opacity: 0.7;
+a:visited	{color: #000; text-decoration: none;}
-	-webkit-transition: .2s;
+a:focus		{color: #000; text-decoration: none;}
-	transition: opacity .2s;
+a:active	{color: #000; text-decoration: underline;}
+a:hover		{color: #000; text-decoration: underline;}
+a.current	{font-weight: bold;}
+
+h5.blue		{color: #6b7b95;}
+h5.red		{color: #c17878;}
+h5.green	{color: #78ba91;}
+h5.purple	{color: #a87aad;}
+
+h1, h2, h3, h4, h5, h6 {color: #313334; font-weight: bold;}
+.separator {color:#BCE}
+.margin-left{
+	margin-left:5px;
 }
 
-.slider:hover {
+.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; }
-	opacity: 1;
+.button:hover { color:#333; border-color:#857b42; }
+
+.field, .button { -moz-border-radius:4px; -webkit-border-radius:4px; }
+.small-field, .button, .pagging a { -moz-border-radius:3px; -webkit-border-radius:3px; }
+
+.table th {
+    background-color: #4CAF50;
+    color: white;
+	text-align: left;
 }
 
-.slider::-webkit-slider-thumb {
+.table, .table td, .table th{
-	-webkit-appearance: none;
+	border: 1px solid #ddd;
-	appearance: none;
-	width: 15px;
-	height: 25px;
-	background: #3c8dbc;
-	cursor: pointer;
 }
 
-.slider::-moz-range-thumb {
+.table th a:link {color: white; text-decoration: none;}
-	width: 25px;
+.table th a:link		{color: white; text-decoration: none;}
-	height: 25px;
+.table th a:visited	{color: white; text-decoration: none;}
-	background: #3c8dbc;
+.table th a:focus		{color: white; text-decoration: none;}
-	cursor: pointer;
+.table th a:active	{color: white; text-decoration: underline;}
-}
+.table th a:hover		{color: white; text-decoration: underline;}
 
-td.details-control {
+.table tr:nth-child(odd) {background-color: #d1d1d1}
+
+a.ico { color:#9d9c9a; font-size:10px; text-decoration: none; padding:0 0 0 14px; background-repeat:no-repeat; background-position:0 0; }
+a.ico:hover { color:#333;}
+
+#container{
+	width:960px;
+	margin-left:auto;
+	margin-right:auto;
+}
+#header {
+	/*width: 960px;*/
+	padding-left: auto;
+	padding-right: auto;
+	border-bottom: 1px dotted black;
+	margin-top: 40px;
+}
+#header h1 {
+	margin: 0;
+	padding-top: 20px;
 	text-align: center;
-	color: forestgreen;
-	cursor: pointer;
 }
-
+#sidebar{
-tr.shown td.details-control {
+	background: #FFF;
+	width: 170px;
+	float: left;
+	margin: 10px 0 10px 0;
+	padding: 10px;
+	border: 1px solid #CCC;
+}
+#content {
+	width: 740px;
+	float: right;
+	margin: 20px 0 10px 0;
+	padding: 10px;
+}
+#footer {
+	margin-top: 20px;
+	border-top: 1px dotted black;
 	text-align: center;
-	color: red;
+	clear: both;
+}
+/*********************
+	Sidebar
+*********************/
+#sidebar ul{
+	list-style:none;
+	line-height:22px;
+}
+#sidebar ul li a,#sidebar ul li a:visited{
+	padding-left:19px;
+	text-decoration:none;
+	margin:0 3px;
+	display:block;
+}
+#sidebar ul li a:hover{
+	text-decoration:underline;
+}
+#sidebar ul li ul{
+	margin-left:10px;
+}
+#sidebar h3{
+	padding:2px;
+	font-size:14px;
+}
+/*********************
+	Status & version boxes
+*********************/
+#status {
+	position: absolute; top: 10px; left: 10px;
+	margin: 0px;
+	float: right;
+	font-size: 12px;
+}
+#status .success {
+  margin: 0px;
+}
+#version {
+	position: absolute; top: 10px; right: 10px;
+	float: right;
+	text-align: right;
+	font-size: 12px;
+}
+/*********************
+	Infobox
+*********************/
+#infobox{
+	border:1px solid #e9e8e3;
+}
+#infobox h3{
+	background:#f7f6f1;
+	border-bottom:1px solid #e9e8e3;
+	color:#654322;
 }

admin/template/template.php

@@ -1,229 +1,110 @@
 <?php defined('MYAAC') or die('Direct access not allowed!'); ?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-	<?php echo template_header(true);
+	<?php echo template_header(true); ?>
-	$title_full =  (isset($title) ? $title . $config['title_separator'] : '') . $config['lua']['serverName'];
+	<title><?php echo $title . $config['title_separator'] . $config['lua']['serverName']; ?> - Powered by MyAAC</title>
-	?>
+	<link rel="stylesheet" type="text/css" href="<?php echo $template_path; ?>style.css" />
-
-	<title><?php echo $title_full ?></title>
-	<link rel="shortcut icon" href="<?php echo BASE_URL; ?>images/favicon.ico" type="image/x-icon" />
-	<link rel="icon" href="<?php echo BASE_URL; ?>images/favicon.ico" type="image/x-icon" />
-	<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/bootstrap.min.css">
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/AdminLTE.min.css">
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/skins/skin-blue.min.css">
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/font-awesome.min.css">
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/ionicons.min.css">
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/jquery.dataTables.min.css">
-	<link rel="stylesheet" type="text/css" href="<?php echo $template_path; ?>style.css"/>
-	<!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-	<![endif]-->
-	<link rel="stylesheet"
-		  href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
 </head>
-<body class="hold-transition skin-blue sidebar-mini">
+<body>
-<div class="wrapper">
+<?php if($page != 'tools'): ?>
-	<?php
+	<div id="container">
-	if ($logged && admin()) {
+		<div id="header">
-	?>
+			<?php if($logged && admin()): ?>
-	<header class="main-header">
+			<div id="status">
-		<a href="." class="logo">
+				<?php if($status['online']): ?>
-			<span class="logo-mini"><b>M</b>A</span>
+				<p class="success" style="width: 120px; text-align: center;">Status: Online<br/>
-			<span class="logo-lg"><b>My</b>AAC</span>
+					<?php echo $status['uptimeReadable'] . ', ' . $status['players'] . '/' . $status['playersMax']; ?><br/>
-		</a>
+					<?php echo $config['lua']['ip'] . ' : ' . $config['lua']['loginPort']; ?>
-
+				</p>
-		<nav class="navbar navbar-static-top" role="navigation">
+				<?php else: ?>
-			<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
+				<p class="error" style="width: 120px; text-align: center;">Status: Offline</p>
-				<span class="sr-only">Toggle navigation</span>
+				<?php endif; ?>
-			</a>
-			<div class="navbar-custom-menu">
-				<ul class="nav navbar-nav">
-					<li>
-						<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
-					</li>
-				</ul>
 			</div>
-		</nav>
+			<div id="version">Version: <?php echo MYAAC_VERSION; ?> (<a id="update" href="?p=version">Check for updates</a>)<br/>
-	</header>
+				Logged in as: <b><?php echo (USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()); ?></b><br/>
-	<aside class="main-sidebar">
+				<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>
-		<section class="sidebar">
+			</div>
-			<ul class="sidebar-menu" data-widget="tree">
+			<?php endif; ?>
-				<li class="header">MyAAC</li>
+			<h1><?php echo $config['lua']['serverName'] . (isset($title) ? ' - ' . $title : ''); ?> - Admin Panel</h1>
-
+		</div>
+		<div id="wrapper">
+			<?php
+			if($logged && admin()) {
+			?>
+			<div id="sidebar">
+				<ul>
 				<?php
-				$icons_a = array(
-                    'dashboard','newspaper-o', 'envelope',
-                    'book', 'list',
-                    'plug', 'user',
-                    'edit', 'gavel',
-                    'wrench', 'edit', 'book', 'book',
-                );
-
 					$menus = array(
 						'Dashboard' => 'dashboard',
-					'News' => 'news',
 						'Mailer' => 'mailer',
 						'Pages' => 'pages',
 						'Menus' => 'menus',
 						'Plugins' => 'plugins',
+						'Statistics' => 'statistics',
 						'Visitors' => 'visitors',
-					'Editor' => array(
-						'Accounts' => 'accounts',
 						'Players' => 'players',
-					),
 						'Items' => 'items',
 						'Tools' => array(
+							'phpinfo' => 'phpinfo'
+						),
 						'Notepad' => 'notepad',
-						'phpinfo' => 'phpinfo',
+						'Logs' => 'logs'
-					),
-					'Logs' => array(
-						'Logs' => 'logs',
-						'Reports' => 'reports',
-					),
 					);
 
 					$i = 0;
-				foreach ($menus as $_name => $_page) {
+					foreach($menus as $_name => $_page) {
+						//echo '<a ' . ($page == $_page ? ' class="current"' : '') . 'href="?p=' . $_page . '">' . $_name . '</a>';
+						echo '<li><h3>';
 						$has_child = is_array($_page);
-					if (!$has_child) {
+						if(!$has_child) {
-						echo '<li ';
+							echo '<a href="?p=' . $_page . '">';
-						if ($page == $_page) echo ' class="active"';
+							if($page == $_page) echo '<u>';
-						echo ">";
+								echo $_name;
-						echo '<a href="?p=' . $_page . '"><i class="fa fa-' . (isset($icons_a[$i]) ? $icons_a[$i] : 'link') . '"></i> <span>' . $_name . '</span></a></li>';
+							if($page == $_page) echo '</u>';
+							echo '</a>';
 						}
+						else
+							echo $_name;
 
-					if ($has_child) {
+						echo '</h3>';
-						$used_menu = "";
+						if($has_child) {
-						$nav_construct = '';
+							echo '<ul>';
-						foreach ($_page as $__name => $__page) {
+							foreach($_page as $__name => $__page)
-							$nav_construct = $nav_construct . '<li';
+								echo '<li><a href="?p=' . $__page . '">';
-
+								if($page == $__page) echo '<u>';
-							if ($page == $__page) {
+									echo $__name;
-								$nav_construct = $nav_construct . ' class="active"';
+								if($page == $__page) echo '</u>';
-								$used_menu = true;
+								echo '</a></li>';
+							echo '</ul>';
 						}
-							$nav_construct = $nav_construct . '><a href="?p=' . $__page . '"><i class="fa fa-circle-o"></i> ' . $__name . '</a></li>';
+						echo '</li>';
-						}
-
-						echo '<li class="treeview' . (($used_menu) ? ' menu-open' : '') . '">
-                                      <a href="#"><i class="fa fa-' . (isset($icons_a[$i]) ? $icons_a[$i] : 'link') . '"></i> <span>' . $_name . '</span>
-						              <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a>
-						              <ul class="treeview-menu" style="' . (($used_menu) ? '  display: block' : ' display: none') . '">';
-						echo $nav_construct;
-						echo '</ul>
-                                </li>';
-					}
-					$i++;
 					}
 				
 					$query = $db->query('SELECT `name`, `page`, `flags` FROM `' . TABLE_PREFIX . 'admin_menu` ORDER BY `ordering`');
 					$menu_db = $query->fetchAll();
-				foreach ($menu_db as $item) {
+					foreach($menu_db as $item) {
-					if ($item['flags'] == 0 || hasFlag($item['flags'])) {
+						if($item['flags'] == 0 || hasFlag($item['flags'])) {
-						echo '<li ';
+							echo '<li><h3>
-						if ($page == $item['page']) echo ' class="active"';
+							<a href="?p=' . $item['page'] . '">';
-						echo ">";
+							if($page == $item['page']) echo '<u>';
-						echo '<a href="?p=' . $item['page'] . '"><i class="fa fa-link"></i> <span>' . $item['name'] . '</span></a></li>';
+							echo $item['name'];
+							if($page == $item['page']) echo '</u>';
+							echo '</a></h3></li>';
 						}
 					}
 				?>
 				</ul>
-		</section>
-	</aside>
-
-	<div class="content-wrapper">
-		<section class="content-header">
-			<h1><?php echo(isset($title) ? $title : ''); ?>
-				<small> - Admin Panel</small>
-				<div class="pull-right">
-					<span class="label label-<?php echo(($status['online']) ? 'success' : 'danger'); ?>"><?php echo $config['lua']['serverName'] ?></span>
-				</div>
-			</h1>
-		</section>
-		<section class="content">
-			<?php echo $content; ?>
-		</section>
-
-	</div>
-
-	<footer class="main-footer">
-
-		<div class="pull-right hidden-xs">
-			<div id="status">
-				<?php if ($status['online']): ?>
-					<p class="success" style="width: 120px; text-align: center;">Server Online</p>
-				<?php else: ?>
-					<p class="error" style="width: 120px; text-align: center;">Server Offline</p>
-				<?php endif; ?>
 			</div>
+			<?php
+			}
+			?>
+			<div id="content"><?php echo $content; ?></div>
 		</div>
+		<div id="footer">
 			<?php echo base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4='); ?>
-	</footer>
-
-	<aside class="control-sidebar control-sidebar-dark">
-		<ul class="nav nav-tabs nav-justified control-sidebar-tabs">
-			<li class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i class="fa fa-home"></i></a></li>
-			<li><a href="#control-sidebar-settings-tab" data-toggle="tab"><i class="fa fa-gears"></i></a></li>
-		</ul>
-		<div class="tab-content">
-			<div class="tab-pane active" id="control-sidebar-home-tab">
-				<h3 class="control-sidebar-heading">Account</h3>
-				<ul class="control-sidebar-menu">
-					<li>
-						<a href="?action=logout">
-							<i class="menu-icon fa  fa-sign-out bg-red"></i>
-							<div class="menu-info">
-								<h4 class="control-sidebar-subheading">Log out</h4>
-								<p>This will log you out
-									of <?php echo(USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()); ?></p>
-							</div>
-						</a>
-					</li>
-				</ul>
-				<h3 class="control-sidebar-heading">Site</h3>
-				<ul class="control-sidebar-menu">
-					<li>
-						<a href="<?php echo BASE_URL; ?>" target="_blank">
-							<i class="menu-icon fa  fa-eye bg-blue"></i>
-							<div class="menu-info">
-								<h4 class="control-sidebar-subheading">Preview</h4>
-								<p>This will open a new tab</p>
-							</div>
-						</a>
-					</li>
-				</ul>
-			</div>
-			<div class="tab-pane" id="control-sidebar-settings-tab">
-				<form method="post">
-					<h3 class="control-sidebar-heading">Version</h3>
-
-					<div class="form-group">
-						<label class="control-sidebar-subheading">
-							<?php echo MYAAC_VERSION; ?> (<a href="?p=version">Check for updates</a>)<br/>
-						</label>
-						<label class="control-sidebar-subheading">
-							<p><a href="https://github.com/slawkens/myaac" target="_blank">Github</a></p>
-					</div>
-				</form>
 		</div>
 	</div>
-	</aside>
+<?php endif; ?>
-	<div class="control-sidebar-bg"></div>
-</div>
-
-<?php }
-if (!$logged && !admin()) {
-	echo $content;
-}
-?>
-
-<script src="<?php echo BASE_URL; ?>tools/js/bootstrap.min.js"></script>
-<script src="<?php echo BASE_URL; ?>tools/js/jquery-ui.min.js"></script>
-<script src="<?php echo BASE_URL; ?>tools/js/jquery.dataTables.min.js"></script>
-<script src="<?php echo BASE_URL; ?>tools/js/adminlte.min.js"></script>
 </body>
 </html>

admin/tools/phpinfo.php

@@ -1,8 +1,8 @@
 <?php
-require '../../common.php';
+require('../../common.php');
-require SYSTEM . 'functions.php';
+require(SYSTEM . 'functions.php');
-require SYSTEM . 'init.php';
+require(SYSTEM . 'init.php');
-require SYSTEM . 'login.php';
+require(SYSTEM . 'login.php');
 
 if(!admin())
 	die('Access denied.');

admin/tools/status.php

@@ -1,9 +1,9 @@
 <?php
-require '../../common.php';
+require('../../common.php');
-require SYSTEM . 'init.php';
+require(SYSTEM . 'init.php');
-require SYSTEM . 'functions.php';
+require(SYSTEM . 'functions.php');
-require SYSTEM . 'status.php';
+require(SYSTEM . 'status.php');
-require SYSTEM . 'login.php';
+require(SYSTEM . 'login.php');
 
 if(!admin())
 	die('Access denied.');

common.php

@@ -20,18 +20,17 @@
  *
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
+ * @copyright 2017 MyAAC
- * @link      https://my-aac.org
+ * @link      http://my-aac.org
  */
-if (version_compare(phpversion(), '5.6', '<')) die('PHP version 5.6 or higher is required.');
+session_start();
 
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.8.7');
+define('MYAAC_VERSION', '0.7.13-dev');
-define('DATABASE_VERSION', 33);
+define('DATABASE_VERSION', 22);
 define('TABLE_PREFIX', 'myaac_');
 define('START_TIME', microtime(true));
-define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX'));
+define('MYAAC_OS', (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'WINDOWS' : (strtoupper(PHP_OS) == 'DARWIN' ? 'MAC' : 'LINUX'));
-define('IS_CLI', in_array(php_sapi_name(), ['cli', 'phpdb']));
 
 // account flags
 define('FLAG_ADMIN', 1);
@@ -47,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);
@@ -55,7 +53,7 @@ define('TICKER', 2);
 define('ARTICLE', 3);
 
 // directories
-define('BASE', __DIR__ . '/');
+define('BASE', dirname(__FILE__) . '/');
 define('ADMIN', BASE . 'admin/');
 define('SYSTEM', BASE . 'system/');
 define('CACHE', SYSTEM . 'cache/');
@@ -85,36 +83,26 @@ define('TFS_03', 4);
 define('TFS_FIRST', TFS_02);
 define('TFS_LAST', TFS_03);
 
-session_save_path(SYSTEM . 'php_sessions');
-session_start();
-
 // basedir
 $basedir = '';
 $tmp = explode('/', $_SERVER['SCRIPT_NAME']);
-$size = count($tmp) - 1;
+$size = sizeof($tmp) - 1;
 for($i = 1; $i < $size; $i++)
 	$basedir .= '/' . $tmp[$i];
 
-$basedir = str_replace(array('/admin', '/install'), '', $basedir);
+$basedir = str_replace('/admin', '', $basedir);
+$basedir = str_replace('/install', '', $basedir);
 define('BASE_DIR', $basedir);
 
-if(!IS_CLI) {
+if(isset($_SERVER['HTTP_HOST'])) {
-	if (isset($_SERVER['HTTP_HOST'][0])) {
+	if (isset($_SERVER['HTTPS'][0]) && $_SERVER['HTTPS'] == 'on')
-		$baseHost = $_SERVER['HTTP_HOST'];
+		define('SERVER_URL', 'https://' . $_SERVER['HTTP_HOST']);
-	} else {
+	else
-		if (isset($_SERVER['SERVER_NAME'][0])) {
+		define('SERVER_URL', 'http://' . $_SERVER['HTTP_HOST']);
-			$baseHost = $_SERVER['SERVER_NAME'];
-		} else {
-			$baseHost = $_SERVER['SERVER_ADDR'];
-		}
-	}
 
-	define('SERVER_URL', 'http' . (isset($_SERVER['HTTPS'][0]) && strtolower($_SERVER['HTTPS']) === 'on' ? 's' : '') . '://' . $baseHost);
 	define('BASE_URL', SERVER_URL . BASE_DIR . '/');
 	define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');
 
 	//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
-
-	require SYSTEM . 'exception.php';
 }
-require SYSTEM . 'autoload.php';
+?>

config.local.php

@@ -0,0 +1,3 @@
+<?php
+	// place for your configuration directives, so you can later easily update myaac
+?>

config.php

@@ -12,25 +12,14 @@
  *
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
+ * @copyright 2017 MyAAC
- * @link      https://my-aac.org
+ * @link      http://my-aac.org
  */
 
 $config = array(
 	// directories & files
 	'server_path' => '', // path to the server directory (same directory where config file is located)
 
-	/**
-	 * Environment Setting
-	 *
-	 * if you use this script on your live server - set to 'prod' (production)
-	 * if you want to test and debug the script locally, or develop plugins, set to 'dev' (development)
-	 * WARNING: on 'dev' cache is disabled, so site will be significantly slower !!!
-	 * WARNING2: on 'dev' all PHP errors/warnings are displayed
-	 * Recommended: 'prod' cause of speed (page load time is better)
-	 */
-	'env' => 'prod', // 'prod' for production and 'dev' for development
-
 	'template' => 'kathrine', // template used by website (kathrine, tibiacom)
 	'template_allow_change' => true, // allow users to choose their own template while browsing website?
 
@@ -41,7 +30,7 @@ $config = array(
 	'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: https://my-aac.org/guilds/Testing instead of https://my-aac.org/?subtopic=guilds&name=Testing). Remember to rename .htaccess.dist to .htaccess
+	'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)
@@ -57,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,
 
@@ -65,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)
@@ -74,9 +65,6 @@ $config = array(
 	'database_user' => '',
 	'database_password' => '',
 	'database_name' => '',
-	'database_log' => false, // should database queries be logged and and saved into system/logs/database.log?
-	'database_socket' => '', // set if you want to connect to database through socket (example: /var/run/mysqld/mysqld.sock)
-	'database_persistent' => false, // use database permanent connection (like server), may speed up your site
 
 	// multiworld system (only TFS 0.3)
 	'multiworld' => false, // use multiworld system?
@@ -86,13 +74,11 @@ $config = array(
 	),
 
 	// images
-	'outfit_images_url' => 'https://outfit-images.ots.me/outfit.php', // set to animoutfit.php for animated outfit
+	'outfit_images_url' => 'http://outfit-images.ots.me/outfit.php', // set to animoutfit.php for animated outfit
-	'item_images_url' => 'https://item-images.ots.me/1092/', // set to images/items if you host your own items in images folder
+	'item_images_url' => 'http://item-images.ots.me/1092/', // set to images/items if you host your own items in images folder
 
 	// account
 	'account_management' => true, // disable if you're using other method to manage users (fe. tfs account manager)
-	'account_create_auto_login' => false, // auto login after creating account?
-	'account_create_character_create' => true, // allow directly to create character on create account page?
 	'account_mail_verify' => false, // force users to confirm their email addresses when registering account
 	'account_mail_unique' => true, // email addresses cannot be duplicated? (one account = one email)
 	'account_premium_days' => 0, // default premium days on new account
@@ -112,17 +98,16 @@ $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, set to true if you use GMail or Microsoft Outlook)
+	'smtp_enabled' => false, // send by smtp or mail function (set false if use mail function)
-	'smtp_host' => '', // mail host. smtp.gmail.com for GMail / smtp-mail.outlook.com for Microsoft Outlook
+	'smtp_host' => '', // mail host
-	'smtp_port' => 25, // 25 (default) / 465 (ssl, GMail) / 587 (tls, Microsoft Outlook)
+	'smtp_port' => 25, // 25 (default) / 465 (ssl, e.g. gmail)
 	'smtp_auth' => true, // need authorization?
-	'smtp_user' => 'admin@example.org', // here your email username
+	'smtp_user' => 'admin@example.org',
 	'smtp_pass' => '',
-	'smtp_secure' => '', // What kind of encryption to use on the SMTP connection. Options: '', 'ssl' (GMail) or 'tls' (Microsoft Outlook)
+	'smtp_secure' => '', // What kind of encryption to use on the SMTP connection. Options: '', 'ssl' or 'tls', use 'ssl' for gmail
-	'smtp_debug' => false, // set true to debug (you will see more info in error.log)
 
 	// reCAPTCHA (prevent spam bots)
 	'recaptcha_enabled' => false, // enable recaptcha verification code
@@ -151,22 +136,11 @@ $config = array(
 		4 => 'Knight Sample'
 	),
 
-	'use_character_sample_skills' => false,
-
-	// it must show limited number of players after using search in character page
-	'characters_search_limit' => 15,
-
 	// town list used when creating character
 	// won't be displayed if there is only one item (rookgaard for example)
 	'character_towns' => array(1),
 
-	// characters length
-	// This is the minimum and the maximum length that a player can create a character. It is highly recommend the maximum length to be 21.
-	'character_name_min_length' => 4,
-	'character_name_max_length' => 21,
-
 	// list of towns
-	// if you use TFS 1.3 with support for 'towns' table in database, then you can ignore this - it will be configured automatically (generated from your .OTBM map)
 	'towns' => array(
 		0 => 'No town',
 		1 => 'Sample town'
@@ -181,6 +155,13 @@ $config = array(
 	'guild_description_lines_limit' => 6, // limit of lines, if description has more lines it will be showed as long text, without 'enters'
 	'guild_motd_chars_limit' => 150, // limit of MOTD (message of the day) that is shown later in the game on the guild channel
 
+	'quests' => array(), // quests list (displayed in character view), name => storage
+
+	'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), 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?
 	'online_vocations' => false, // display vocation statistics?
@@ -194,7 +175,6 @@ $config = array(
 	'team_display_status' => true,
 	'team_display_lastlogin' => true,
 	'team_display_world' => false,
-	'team_display_outfit' => true,
 
 	// bans page
 	'bans_limit' => 50,
@@ -204,7 +184,6 @@ $config = array(
 	'highscores_vocation_box' => true, // show 'Choose a vocation' box on the highscores (allowing peoples to sort highscores by vocation)?
 	'highscores_vocation' => true, // show player vocation under his nickname?
 	'highscores_frags' => false, // show 'Frags' tab (best fraggers on the server)? Only 0.3
-	'highscores_balance' => false, // show 'Balance' tab (richest players on the server)
 	'highscores_outfit' => true, // show player outfit?
 	'highscores_country_box' => false, // doesnt work yet! (not implemented)
 	'highscores_groups_hidden' => 3, // this group id and higher won't be shown on the highscores
@@ -223,17 +202,8 @@ $config = array(
 		'quests' => true,
 		'skills' => true,
 		'equipment' => true,
-		'frags' => false,
+		'frags' => false
-		'deleted' => false, // should deleted characters from same account be still listed on the list of characters? When enabled it will show that character is "[DELETED]"
 	),
-	'quests' => array(
-		//'Some Quest' => 123,
-		//'Some Quest Two' => 456,
-	), // quests list (displayed in character view), name => storage
-	'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), default 5 minutes
-	'signature_browser_cache' => 60, // how long to cache by browser (in minutes), default 1 hour
 
 	// news page
 	'news_limit' => 5, // limit of news on the latest news page
@@ -253,8 +223,6 @@ $config = array(
 	'forum_post_interval' => 30, // in seconds
 	'forum_posts_per_page' => 20,
 	'forum_threads_per_page' => 20,
-	// uncomment to force use table for forum
-	//'forum_table_prefix' => 'z_', // what forum mysql table to use, z_ (for gesior old forum) or myaac_ (for myaac)
 
 	// last kills
 	'last_kills_limit' => 50, // max. number of deaths shown on the last kills page
@@ -262,32 +230,21 @@ $config = array(
 	// status, took automatically from config file if empty
 	'status_ip' => '',
 	'status_port' => '',
-	'status_timeout' => 2, // how long to wait for the initial response from the server (default: 2 seconds)
-
-	// how often to connect to server and update status (default: every minute)
-	// if your status timeout in config.lua is bigger, that it will be used instead
-	// when server is offline, it will be checked every time web refreshes, ignoring this variable
-	'status_interval' => 60,
-
-	// admin panel
-	'admin_panel_modules' => 'lastlogin,points,coins',
 
 	// other
 	'anonymous_usage_statistics' => true,
 	'email_lai_sec_interval' => 60, // time in seconds between e-mails to one account from lost account interface, block spam
 	'google_analytics_id' => '', // e.g.: UA-XXXXXXX-X
-	'experiencetable_columns' => 3, // how many columns to display in experience table page. * experiencetable_rows, 5 = 500 (will show up to 500 level)
+	'experiencetable_columns' => 5, // how many columns to display in experience table page. * experiencetable_rows, 5 = 500 (will show up to 500 level)
-	'experiencetable_rows' => 200, // till how many levels in one column
+	'experiencetable_rows' => 100, // till how many levels in one column
 	'date_timezone' => 'Europe/Berlin', // more info at http://php.net/manual/en/timezones.php
-	'footer_show_load_time' => true, // display load time of the page in the footer
-
-	'npc' => array(),
-	
-	// character name blocked
-	'character_name_blocked' => array(
-		'prefix' => array(),
-		'names' => array(),
-		'words' => array(),
-	),
 	
+	'monsters' => array(),
+	'npc' => array()
 );
+
+// download link to client.
+$config['client_download'] = 'http://tibia-clients.com/clients/download/'. $config['client'] .'/exe/windows';
+$config['client_download_linux'] = 'http://tibia-clients.com/clients/download/'. $config['client'] .'/tar/linux';
+
+?>