* update to 0.7.5

* fixed template path finding
* fixed news adding when type != ARTICLE

.htaccess.dist

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

CHANGELOG

@@ -1,129 +1,387 @@
+[0.7.5 - 04.01.2017]
+	* fixed bug on othire with config.account_premium_days
+	* fixed bug on TFS 1.x when online_afk is enabled
+	* warning about leaving news page with changes
+	* added player status to tibiacom top 5 highscores box
+	* save detected country on create account in session
+	* fixed getPremDays and isPremium functions (newest 11.x engines are bugged when it comes to PACC, its not fault of MyAAC)
+	* fix when there are no changelogs or highscores yet
+	* small fix regarding getTopPlayers function which was ignoring $limit variable
+	* fixed news adding when type != ARTICLE
+	* fixed template path finding
+	* fixed displaying article_text when it was empty saved
+
+[0.7.4 - 24.12.2017]
+	* fixed mysql fatal error on tibiacom template - top 5 box
+	* fixed displaying of level percent bar on tibian signature
+	* inform user about Twig cache failure on installation, instead of http 500 error
+	* when dir system/cache is not writable by the webserver, then show some nice notice to the user about it instead of http 500 error
+	* remember client version select and usage stats checkbox in session on install
+	* automatically update highscores_ids_hidden for users who installed myaac before (migration)
+
+[0.7.3 - 18.12.2017]
+	* auto generate myaac cache & session prefix on install to be unique across installations
+	* fixed hiding shop system menu on tibiacom template when disabled in config
+	* prevent adding duplicated newses with installation
+	* some changes to sample characters: chanced town_id to 1, posx: 1000, posy: 1000, posz: 1000 and default group_id to 1 so you can change in-game outfits and they will be used
+	* added version 772 constant to install client choose (OTHire)
+	* better solution for hidding samples (configurable) - highscores_ids_hidden
+	* fixed account.login redirect not working on tibiacom template
+	* installation: warn about wrong admin account name/id and password
+	* fixed last menu closing in tibiacom template
+	* updated polish locale (translation) on install 
+	* (internal) removed some duplicated code on install finish
+	* (internal) renamed installation step files to be in correct order
+	* added TODO file
+
+[0.7.1 - 13.12.2017]
+	* added changelog menu item to kathrine template
+	* fixed some php short tag in changelogs page
+	* fixed guild change description back button
+	* removed duplicated "Support List" menu item from tibiacom template
+	* changed some notice when version check is failed
+	* (internal) moved changelog to twig
+
+[0.7.0 - 20.11.2017]
+	* moved template menus to database, they're now dynamically loaded
+	* added anonymous usage statistics reporting (only if user agrees, first usage report will be send after 7 days)
+	* you can edit them in Admin Panel under 'Menus' option
+	* you can also add custom links, like http://google.pl
+	* added networks (facebook and twitter) and highscores (top 5) boxes to tibiacom template, configurable in templates/tibiacom/config.php
+	* added news ticker for kathrine template
+	* added featured article to tibiacom template (you can add them with add news button)
+	* added tinymce editor to 'Pages' in admin panel
+	* added links to edit/delete/hide custom page directly from page
+	* update forum post after editing news (when forum post has been created)
+	* enabled code plugin for tinymce which enabled raw html code editing
+	* removed videos pages, as it can be easily added using custom Menus and Pages with insert Media
+	* removed bug_report configurable, its now enabled by default
+	* log some error info when mail cannot be send on account create
+	* twig getLink function will now return with full url (BASE_URL included)
+	* verify install post values directly on config page and display error
+	* updated tinymce to version 4.7.2 (from 4.7.0)
+	* updated phpmailer to version 5.2.26 (from 5.2.23)
+	* (#30) (fix) recovering account on servers that doesn't support salts
+	* (fix) account email confirm function
+	* (fix) showing changelog with urls in Admin Panel
+	* (fix) uninstalling plugin
+	* (fix) polls box in tibiacom template
+	* (fix) remove hooks from db on plugin deinstall
+	* (fix) some weird include possibilities with forum and account actions (verify action name)
+	* (fix) loading hooks from plugin installed from command line
+	* (fix) some changelog PHP Notice warning
+	* (internal) moved uninstall logic to Plugins class
+	* (internal) moved tibiacom boxes to separate directory
+	* (internal) moved news tickers to twig template
+	* (internal) moved Forum class to separate file
+	* (internal) moved deprecated functions to compat.php
+	* (internal) added some compat functions that are used by shop system
+	* (internal) renamed constant TICKET -> TICKER
+	* (internal) shortened message functions
+	
+[0.6.6 - 22.10.2017]
+	* fixed some php fatal error on spells page
+	* changed spells.vocations field in db size to 300
+	* please reload your spells after this update!
+
+[0.6.5 - 21.10.2017]
+	* fixed displaying custom pages
+	* fixed adding new group forum board
+	
+[0.6.4 - 20.10.2017]
+	* reverted OTS_Account::getLastLogin() cause its used by tibia11-login plugin
+	
+[0.6.3 - 20.10.2017]
+	* fixed creating account
+	* fixed viewing thread without being logged 
+	* fixed showing premium account status
+	
+[0.6.2 - 20.10.2017]
+	* added forums for guilds and groups
+	* added nice looking menu for my account page in default template
+	* new command line tool: install_plugin.php - can be used to install plugins from command line. Usage: "php install_plugin.php path_to_file"
+	* added new tooltip to view characters equipment item name and monster loot
+	* added items.xml loader class and weapons.xml loader class
+	* minimum PHP version to install AAC is now 5.3.0 cause of Anonymous functions used by Twig
+	* Added 'Are you sure?' popup when uninstalling plugin
+	* added some warnings when plugin json file is incomplete
+	* fixed showing in characters ban expires when is unlimited
+	* fixed displaying monster loot when item.name in loot is used instead of item.id
+	* load also runes into spells table
+	* display plugin uninstall option only if its possible
+	* after changing template you will be redirected to latest viewed page
+	* display gallery add image form only on main gallery page
+	* (internal) moved most of guilds html-in-php code to twig
+	* (internal) moved spells page to twig template
+	* (internal) removed useless spells.spell column that was duplicate of spells.words
+	* (internal) save monster loot in database in json format instead loading it every time from xml file
+	* (internal) store monster voices and immunities in json format
+	* (internal) moved buttons to separate template
+	* (internal) moved online search form to twig
+	* (internal) added new function getItemNameById($id)
+	* (internal) Moved plugin install logic to a new class: Plugins
+	* (internal) changed spells.vocations database field to store json data instead of comma separated
+	* (internal) removed $hook_types array, using defined() and constant() functions now
+	* (internal) removed useless monsters.gfx_name field from database
+	* (internal) renamed database field monsters.hide_creature to hidden
+	* (internal) renamed existing Items class to Items_Images
+	* (internal) optimized Spells class
+	* (internal) new function: OTS_Guild::hasMember(OTS_Player $player)
+	* (internal) new function: Forum::hasAccess($board_id)
+	
+[0.6.1 - 17.10.2017]
+	* fixed signatures loading
+	* new configurable: session_prefix, to allow more websites on one machine (must be unique for every website on your dedicated server!)
+	* better error handling for monsters and spells loader (save errors to system/logs/error.log)
+	* check if file exist before loading (monsters and spells)
+	* (internal) Account::getAccess() = Account::getGroupId()
+	* (internal) moved account actions (pages) to account/ directory
+	* (internal) moved forum actions (pages) to forum/ directory
+	* (internal) moved forum.edit_post to twig templates
+
+[0.6.0 - 16.10.2017]
+	* added faq management - add/edit/move/hide/delete from website
+	* new account.login view for tibiacom template
+	* monsters and spells are now being loaded at the installation of the AAC
+	* fix for php versions under 5.5 where empty() function supported only variables
+	* added missing change email and change info buttons to account.management default template
+	* added new indicator icons for create account, create character and change character name
+	* fixed config loader when some inline comments are present
+	* fixed editing page in admin panel that contains some html code
+	* fixed forum new post on mac os and some specific mysql versions
+	* attempt to fix incorrect views counter behavior (its resetting to 0 in some cases)
+	* enabled cache http headers for signatures
+	* check if monster file exist before loading it
+	* fixed if plugin zip file name contains dot (.)
+	* renamed screenshots to gallery and movies to videos
+	* moved install pages to twig
+	* fixed Account::getGuildAccess function
+	* removed never used library from sources - dwoo
+	* moved check_* functions to class Validator
+	* from now all validators ajax requests will fire onblur instead of onkeyup
+	* ajax requests returns now json instead of xml
+	* added 404 response when file is not found
+
+[0.5.1 - 11.10.2017]
+	* fixed forum add/edit board
+	* new configurable: highscores_length, how much highscores to display
+	* fixed highscores links (ALL, previous and next page)
+	* update templates cache when installing/uninstalling plugin
+	* moved character deaths and frags table generation to twig
+	* fixed some bug when you uninstall plugin and then try to install again on the same page
+	* check if plugin exist before uninstalling
+	* fixed some warning in OTS_Base_DB
+
+[0.5.0 - 10.10.2017]
+	* moved .htaccess rules to plain php (index.php)
+	* updated tinymce to the latest (4.7.0) version, you can now embed code, for example youtube videos
+	* added option to uninstall plugin
+	* added option to require specified myaac, php or database version for plugins, without that plugin won't be installed
+	* change accountmanagement links to use friendly_urls
+	* fixed creating new forum thread
+	* sample characters are now assigned to admin account and have group_id 4 to not be shown on highscores
+	* added links loaded from database to admin panel - for future plugins
+	* print some info to error.log when can't find config.lua
+	* some fixes in account changecomment action
+	* show info when account name/number or password is empty on login
+	* fixed showing account login errors
+	* added few characters hooks
+	* fixed some kathrine template js bug when shop is disabled
+	* you can now use slash '/' in custom pages loaded from database
+	* added new twig function getLink that convert link taking into account config.friendly_urls
+	* internalLayoutLink -> getLink
+
+[0.4.3 - 05.10.2017]
+	* better config loader taken from latest gesior, you can now include files in your config by doing dofile('config.local.lua')
+	* fixed country detection in create account
+	* fixed showing of character deaths and frags
+	* fixed https://otland.net/threads/myaac-v0-0-1.251454/page-13#post-2466303
+	* fixed https://otland.net/threads/myaac-v0-0-1.251454/page-13#post-2466313
+	* fixed rook sample, which will now have level 1, 150 health, 0 mana, and 400 cap.
+	* fixed samples being deleted by tfs 1.0+ cause of 'deletion' field set to 1
+	* pages loaded from database have higher priority than normal .php pages, so they will be loaded first if they exist
+	* moved many pages to twig templates
+	* change download client links from clients.halfaway.net to tibia-clients.com
+	* added bugtracker to kathrine template
+	* added CREDITS file
+
+[0.4.2 - 14.09.2017]
+	* updated version number
+
+[0.4.1 - 13.09.2017]
+	* fixed log in to admin panel
+	* fixed File is not .zip plugin upload error
+
+[0.4.0 - 13.09.2017
+	* added option to add/edit/delete/hide/move forum boards
+	* moved some of HTML-in-PHP code to Twig templates
+	* added bug_report configurable which can enable/disable bug tracker
+	* log errors instead of showing them to users with system directories
+	* fix when $_SERVER['HTTP_ACCEPT_ENCODING'] is not set
+	* when it fails to load config.lua it will output error also to error.log
+	* automatically detect json file in .zip instead of basing on filename (admin panel - plugins)
+	* hopefully fixed the error with "The file you are trying to upload is not a .zip file. Please try again."
+	* fixed wrong name of table in bugtracker
+	* fixed some bugs in bugtracker
+	* added report bug link in templates
+	* fixed some rare error when user is logged in for longer than 15 minutes and tries to login again
+	* fixed some grammar errors
+	* some small improvements
+	* fixed some separators in kathrine template
+
+[0.3.0 - 28.08.2017]
+	* added administration panel for screenshots management with auto thumbnail generator and image auto-resizing
+	* added Twig template engine and moved some html-in-php code to it
+	* automatically detect player country based on user location (IP) on create account
+	* player sex (gender) is now configurable at $config['genders']
+	* fixed recovering account and changing password when salt is enabled
+	* fixed installing samples when for example Rook Sample already exist and other samples not
+	* fixed some mysql error when character you trying to create already exist
+	* fixed some warning when you select nonexistent country
+	* password change minimal/maximal length notice is now more precise
+	* added 'enabled' field in myaac_hooks table, which can enable or disable specified hook
+	* removed DEFAULT '' for TEXT field. It didn't worked under some systems like MAC OS X.
+	* minimum PHP version to install the MyAAC is now 5.2.0 cause of pathinfo (extension) function
+	* removed unused admin stylish template
+	* removed some unused cities field from myaac_spells table
+	* moved news adding at installation from schema.sql to finish.php
+	* some optimizations
+
+[0.2.4 - 09.06.2017]
+	* fixed invite to guild
+	* added id field on monsters, so you can delete them in phpmyadmin
+	* fixed adding some creatures with ' and "
+	* fixed when there are spaces at beginning of the file (creatures)
+	* fixed when file is unable to parse (creatures)
+	* fixed typo loss_items => loss_containers
+	* more elegant way of showing message on reload creatures and spells
+
 [0.2.3 - 31.05.2017]
-	- fixed guild management on OTHire 0.0.3
-	- set default skills to 10 when creating new character
-	- fixed displaying of "Create forum thread" in newses
-	- fixed deleting guild on servers that use players.rank_id field
-	- fixed phpmailer class loading (https://otland.net/threads/myaac-v0-0-1.251454/page-8#post-2445222)
-	- fixed displaying vocation amount on online page
-	- better support for custom vocations, you just need to set in config vocations_amount to yours.
-	- fixed huge space in player name (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444328)
-	- fixed Undefined variable (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444034)
-	- fixed Undefined offset (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444035)
+	* fixed guild management on OTHire 0.0.3
+	* set default skills to 10 when creating new character
+	* fixed displaying of "Create forum thread" in newses
+	* fixed deleting guild on servers that use players.rank_id field
+	* fixed phpmailer class loading (https://otland.net/threads/myaac-v0-0-1.251454/page-8#post-2445222)
+	* fixed displaying vocation amount on online page
+	* better support for custom vocations, you just need to set in config vocations_amount to yours.
+	* fixed huge space in player name (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444328)
+	* fixed Undefined variable (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444034)
+	* fixed Undefined offset (https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2444035)
 
 [0.2.2 - 22.05.2017]
-	- added missing cache/signature directory
-	- fixed https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2443868
+	* added missing cache/signature directory
+	* fixed https://otland.net/threads/myaac-v0-0-1.251454/page-7#post-2443868
 
 [0.2.1 - 21.05.2017]
-	- added Swedish translation by Sizaro
-	- fixed some bugs with installlation & characters & houses
+	* added Swedish translation by Sizaro
+	* fixed some bugs with installlation & characters & houses
 
 [0.2.0 - 21.05.2017]
-	- added option to change character sex for premium points
-	- moved site_closed to database, now you can close your site through admin panel
-	- added option to admin panel: clear cache
-	- added experiencetable_rows configurable
-	- optimized OTS_Account->getGroupId(), now its using like 20 queries less
-	- optimized OTS_Player->load($id) function, should be much faster now
-	- fixed displaying on highscores special outfits
-	- fixed skull images displaying
-	- fixed displaying unlimited premium account
-	- fixed bug where players.lookaddons doesn't exist (OTHire etc.) (https://otland.net/threads/myaac-v0-0-1.251454/page-6#post-2442407)
-	- fixed signature tibian for OTHire and other servers that doesnt use accounts.premdays field
-	- fixed when player name in signature containst space
-	- don't show "Create forum thread" when editing
-	- fixed red color table after create account
-	- updated download links, as clients.halfaway.net isn't working anymore
-	- fixed some bugs while installing when field `email_next` or `hidden` already exist
-	- fixed movies unexpected comment
-	- added template_place_holder('center_top') to kathrine template
+	* added option to change character sex for premium points
+	* moved site_closed to database, now you can close your site through admin panel
+	* added option to admin panel: clear cache
+	* added experiencetable_rows configurable
+	* optimized OTS_Account->getGroupId(), now its using like 20 queries less
+	* optimized OTS_Player->load($id) function, should be much faster now
+	* fixed displaying on highscores special outfits
+	* fixed skull images displaying
+	* fixed displaying unlimited premium account
+	* fixed bug where players.lookaddons doesn't exist (OTHire etc.) (https://otland.net/threads/myaac-v0-0-1.251454/page-6#post-2442407)
+	* fixed signature tibian for OTHire and other servers that doesnt use accounts.premdays field
+	* fixed when player name in signature containst space
+	* don't show "Create forum thread" when editing
+	* fixed red color table after create account
+	* updated download links, as clients.halfaway.net isn't working anymore
+	* fixed some bugs while installing when field `email_next` or `hidden` already exist
+	* fixed movies unexpected comment
+	* added template_place_holder('center_top') to kathrine template
 
 [0.1.5 - 13.05.2017]
-	- fixed bug with "Integrity constraint violation: 1048 Column 'ip' cannot be null"
+	* fixed bug with "Integrity constraint violation: 1048 Column 'ip' cannot be null"
 
 [0.1.4 - 13.05.2017]
-	- added outfit shower, in characters, online, and highscores
-	- updated database to version 2
-	- fixed item images (now using item-images.ots.me host by default)
-	- fixed news ticket and posting long newses (https://otland.net/threads/myaac-v0-0-1.251454/page-5#post-2442026)
-	- news body limit increased to 65535 (mysql text field)
-	- removed some unused code from my old server
-	- added spells & monsters to kathrine template
+	* added outfit shower, in characters, online, and highscores
+	* updated database to version 2
+	* fixed item images (now using item-images.ots.me host by default)
+	* fixed news ticket and posting long newses (https://otland.net/threads/myaac-v0-0-1.251454/page-5#post-2442026)
+	* news body limit increased to 65535 (mysql text field)
+	* removed some unused code from my old server
+	* added spells & monsters to kathrine template
 
 [0.1.3 - 11.05.2017]
-	- this is just release to update version number
+	* this is just release to update version number
 
 [0.1.2 - 11.05.2017]
-	- forgot to update CHANGELOG and MYAAC_VERSION
+	* forgot to update CHANGELOG and MYAAC_VERSION
 
 [0.1.1 - 11.05.2017]
-	- fixed updating myaac_config with database_version to 1
-	- fixed database updater
+	* fixed updating myaac_config with database_version to 1
+	* fixed database updater
 
 [0.1.0 - 11.05.2017]
-	- added new feature: change character name for premium points (disabled by default, you can enable it in config under account_change_character_name in config.php)
-	- added automatic database updater (data migrations)
-	- renamed events to hooks
-	- moved hooks to database
-	- now you can use hooks in plugins
-	- set account.type field to 5 on install, if TFS 1.0+
-	- added example plugin
-	- new, latest google analytics code
-	- fixed bug with loading account.name that has numbers in it
-	- fixed many bugs in player editor in admin panel
-	- added error handling to plugin manager and some more verification in
-	- file has been correctly unpacked/uploaded
-	- fixed Statistics page in admin panel when using account.number
-	- fixed bug when creating/recovering account on servers with
-	- account.salt field (TFS 0.3 for example)
-	- fixed forum showing thread with html tags (added from news manager)
-	- new, latest code for youtube videos in movies page
-	- fixed showing vocation images when using $config['online_vocations_images']
-	- many fixes in polls (also importing proper schema)
-	- fixed hovering on buttons in kathrine template (on accountmanagement page)
-	- fixed signatures (many fixes)
-	- added missing gesior signature system
+	* added new feature: change character name for premium points (disabled by default, you can enable it in config under account_change_character_name in config.php)
+	* added automatic database updater (data migrations)
+	* renamed events to hooks
+	* moved hooks to database
+	* now you can use hooks in plugins
+	* set account.type field to 5 on install, if TFS 1.0+
+	* added example plugin
+	* new, latest google analytics code
+	* fixed bug with loading account.name that has numbers in it
+	* fixed many bugs in player editor in admin panel
+	* added error handling to plugin manager and some more verification in
+	* file has been correctly unpacked/uploaded
+	* fixed Statistics page in admin panel when using account.number
+	* fixed bug when creating/recovering account on servers with
+	* account.salt field (TFS 0.3 for example)
+	* fixed forum showing thread with html tags (added from news manager)
+	* new, latest code for youtube videos in movies page
+	* fixed showing vocation images when using $config['online_vocations_images']
+	* many fixes in polls (also importing proper schema)
+	* fixed hovering on buttons in kathrine template (on accountmanagement page)
+	* fixed signatures (many fixes)
+	* added missing gesior signature system
 
 [0.0.6 - 06.05.2017]
-	- fixed bug while installing (https://otland.net/threads/myaac-v0-0-1.251454/page-3#post-2440543)
-	- fixed bug when creating character (not showing errors) (one more time)
-	- fixed support for TFS 0.2 series
-	- added FAQ link
+	* fixed bug while installing (https://otland.net/threads/myaac-v0-0-1.251454/page-3#post-2440543)
+	* fixed bug when creating character (not showing errors) (one more time)
+	* fixed support for TFS 0.2 series
+	* added FAQ link
 	
 [0.0.5 - 05.05.2017]
-	- fixed bug when creating character (not showing errors)
-	- Fixed characters loading with names that has been created with other AAC
-	- fixed links to shop in default template
-	- fixed some weird PHP 7.1 warnings/notices
-	- Fixed config loading with some weird comments
-	- fixed bug with status info utf8 encoding (https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440259)
-	- fixed when ip in log_action is NULL (https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440357)
-	- fixed bug when guild doesn't exist on characters page (https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440320)
-	- disabled friendly_urls by default
-	- fixes when $config['database_*'] is set
-	- added CHANGELOG
+	* fixed bug when creating character (not showing errors)
+	* Fixed characters loading with names that has been created with other AAC
+	* fixed links to shop in default template
+	* fixed some weird PHP 7.1 warnings/notices
+	* Fixed config loading with some weird comments
+	* fixed bug with status info utf8 encoding (https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440259)
+	* fixed when ip in log_action is NULL (https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440357)
+	* fixed bug when guild doesn't exist on characters page (https://otland.net/threads/myaac-v0-0-1.251454/page-2#post-2440320)
+	* disabled friendly_urls by default
+	* fixes when $config['database_*'] is set
+	* added CHANGELOG
 
 [0.0.3 - 03.05.2017]
-	- Full support for OTHire 0.0.3
-	- added support for otservers that doesn't use account.name field, instead just account number will be used
-	- fixed encryption detection on TFS 0.3
-	- fixed bug when server_config table doesn't exist
-	- (install) moved admin account creation to new step
-	- fixed news comment link
-	- by default, the installer creates now the Admin player, for admin account
-	- fixed installation errors
-	- fixed config.lua loading with some weird comments
+	* Full support for OTHire 0.0.3
+	* added support for otservers that doesn't use account.name field, instead just account number will be used
+	* fixed encryption detection on TFS 0.3
+	* fixed bug when server_config table doesn't exist
+	* (install) moved admin account creation to new step
+	* fixed news comment link
+	* by default, the installer creates now the Admin player, for admin account
+	* fixed installation errors
+	* fixed config.lua loading with some weird comments
 
 [0.0.2 - 02.05.2017]
-	- updated forum links to use friendly_urls
-	- some more info will be shown when cannot connect to database
-	- show more error infos when creating character
-	- fixed forum link on newses
-	- fixed spells loading when there's vocation name instead of id
-	- fixed bug when you have changed template but it doesn't exist anymore
-	- fixed vocations with promotion loading
-	- fixed support for gesior pages and templates
-	- added function OTS_Acount:getGroupId()
+	* updated forum links to use friendly_urls
+	* some more info will be shown when cannot connect to database
+	* show more error infos when creating character
+	* fixed forum link on newses
+	* fixed spells loading when there's vocation name instead of id
+	* fixed bug when you have changed template but it doesn't exist anymore
+	* fixed vocations with promotion loading
+	* fixed support for gesior pages and templates
+	* added function OTS_Acount:getGroupId()
 
 [0.0.1 - 01.05.2017]
 	This is first official release of MyAAC.

CREDITS

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

README.md

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

TODO

@@ -0,0 +1,37 @@
+// MyAAC TODO
+
+0.*
+	* support duplicated vocation names with different ids
+	* plugins: option to define custom requirements check in json file, to check if system meets the requirement
+	* add support for defining max myaac version in plugin.json file
+	* cache Menus in templates
+	* don't show error indicators on first time load - createaccount page
+	* update Twig to the latest version from 1.x branch
+	* semantic versioning support for plugins (github.com/composer/semver)
+	* add some notice to the user that installing step "Import Schema" will take some time
+	* check user IP on installing to prevent install by random user
+
+1.0:
+	* i18n support (issue #1 on github)
+	* New Admin Panel layout and interface
+	* add changelog management interface
+	* remove tibiacom template, and include it as a plugin
+
+2.0
+	* remove compat functions
+	* folder restructure:
+		* var/ (for logs, cache and data), config/, bin, public/ (for index and images and other public content), system/ (for php files and classess)
+	* rename templates to layouts as templates is meant to be used for twig templates
+	* change gifts_system to shop_system configurable
+	* move most used options in system/templates dir to separate directories (more transparent)
+
+At any time between (version not specified):
+	* better news archive with search function (like on tibia.com)
+	* guild wars management (issue #13 on github)
+	* update account.management page to be more realistic (like on tibia.com)
+	* update guilds page to be more realistic (like on tibia.com)
+	* possibility to add extra cache engines with plugins
+	* preferably configurable (enable/disable) forum TinyMCE editor
+	* new cache engine - plain php, is good with pure php 7.0+ and opcache
+	* OTAdmin support in Admin Panel
+	* database towns table support for TFS 1.3

admin/index.php

@@ -1 +1,54 @@
-<?php
+<?php
+// few things we'll need
+require('../common.php');
+require_once(BASE . 'config.local.php');
+
+if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
+{
+	header('Location: ' . BASE_URL . 'install/');
+	die('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
+}
+
+define('ADMIN_PANEL', true);
+
+$content = '';
+
+// validate page
+$page = isset($_GET['p']) ? $_GET['p'] : '';
+if(empty($page) || preg_match("/[^a-zA-Z0-9_\-]/", $page))
+	$page = 'dashboard';
+
+$page = strtolower($page);
+define('PAGE', $page);
+
+require(SYSTEM . 'functions.php');
+require(SYSTEM . 'init.php');
+require(SYSTEM . 'status.php');
+require(SYSTEM . 'login.php');
+require(ADMIN . 'includes/functions.php');
+
+$twig->addGlobal('config', $config);
+$twig->addGlobal('status', $status);
+
+// if we're not logged in - show login box
+if(!$logged || !admin()) {
+	$page = 'login';
+}
+
+// include our page 
+$file = SYSTEM . 'pages/admin/' . $page . '.php';
+if(!@file_exists($file)) {
+	$page = '404';
+	$file = SYSTEM . 'pages/404.php';
+}
+
+ob_start();
+include($file);
+
+$content .= ob_get_contents();
+ob_end_clean();
+
+// template
+$template_path = 'template/';
+require(ADMIN . $template_path . 'template.php');
+?>

admin/template/style.css

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

admin/template/template.php

@@ -26,7 +26,7 @@
 				<a href="<?php echo BASE_URL; ?>" target="_blank">Preview</a> <span class="separator">|</span> <a href="?action=logout">Log out<img src="<?php echo BASE_URL; ?>images/icons/logout.png" alt="" title="Log out" /></a>
 			</div>
 			<?php endif; ?>
-			<h1><?php echo $config['lua']['serverName'] . ' - ' . $title; ?> - Admin Panel</h1>
+			<h1><?php echo $config['lua']['serverName'] . (isset($title) ? ' - ' . $title : ''); ?> - Admin Panel</h1>
 		</div>
 		<div id="wrapper">
 			<?php
@@ -39,10 +39,12 @@
 						'Dashboard' => 'dashboard',
 						'Mailer' => 'mailer',
 						'Pages' => 'pages',
+						'Menus' => 'menus',
 						'Plugins' => 'plugins',
 						'Statistics' => 'statistics',
 						'Visitors' => 'visitors',
 						'Players' => 'players',
+						'Items' => 'items',
 						'Tools' => array(
 							'phpinfo' => 'phpinfo'
 						),
@@ -78,6 +80,19 @@
 						}
 						echo '</li>';
 					}
+				
+					$query = $db->query('SELECT `name`, `page`, `flags` FROM `' . TABLE_PREFIX . 'admin_menu` ORDER BY `ordering`');
+					$menu_db = $query->fetchAll();
+					foreach($menu_db as $item) {
+						if($item['flags'] == 0 || hasFlag($item['flags'])) {
+							echo '<li><h3>
+							<a href="?p=' . $item['page'] . '">';
+							if($page == $item['page']) echo '<u>';
+							echo $item['name'];
+							if($page == $item['page']) echo '</u>';
+							echo '</a></h3></li>';
+						}
+					}
 				?>
 				</ul>
 			</div>
@@ -87,7 +102,7 @@
 			<div id="content"><?php echo $content; ?></div>
 		</div>
 		<div id="footer">
-			Powered by <a href="http://my-aac.org" target="_blank">MyAAC</a>
+			<?php echo base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4='); ?>
 		</div>
 	</div>
 <?php endif; ?>

admin/templates/stylish/Kopia index.html

@@ -1,281 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Dashboard - Admin Template</title>
-<link rel="stylesheet" type="text/css" href="css/theme2.css" />
-<link rel="stylesheet" type="text/css" href="css/style.css" />
-<script>
-   var StyleFile = "theme" + document.cookie.charAt(6) + ".css";
-   document.writeln('<link rel="stylesheet" type="text/css" href="css/' + StyleFile + '">');
-</script>
-<!--[if IE]>
-<link rel="stylesheet" type="text/css" href="css/ie-sucks.css" />
-<![endif]-->
-</head>
-
-<body>
-	<div id="container">
-    	<div id="header">
-        	<h2>My eCommerce Admin area</h2>
-    <div id="topmenu">
-            	<ul>
-                	<li class="current"><a href="index.html">Dashboard</a></li>
-                    <li><a href="#">Orders</a></li>
-                	<li><a href="users.html">Users</a></li>
-                    <li><a href="#">Manage</a></li>
-                    <li><a href="#">CMS</a></li>
-                    <li><a href="#">Statistics</a></li>
-                    <li><a href="#">Settings</a></li>
-              </ul>
-          </div>
-      </div>
-        <div id="top-panel">
-            <div id="panel">
-                <ul>
-                    <li><a href="#" class="report">Sales Report</a></li>
-                    <li><a href="#" class="report_seo">SEO Report</a></li>
-                    <li><a href="#" class="search">Search</a></li>
-                    <li><a href="#" class="feed">RSS Feed</a></li>
-                </ul>
-            </div>
-      </div>
-        <div id="wrapper">
-            <div id="content">
-       			<div id="rightnow">
-                    <h3 class="reallynow">
-                        <span>Right Now</span>
-                        <a href="#" class="add">Add New Product</a>
-                        <a href="#" class="app_add">Some Action</a>
-                        <br />
-                    </h3>
-				    <p class="youhave">You have <a href="#">19 new orders</a>, <a href="#">12 new users</a> and <a href="#">5 new reviews</a>, today you made <a href="#">$1523.63 in sales</a> and a total of <strong>$328.24 profit </strong>
-                    </p>
-			  </div>
-              <div id="infowrap">
-              <div id="infobox">
-                    <h3>Sales for July</h3>
-                    <p><img src="img/graph.jpg" width="360" height="266" /></p>            
-                  </div>
-                  <div id="infobox" class="margin-left">
-                    <h3>Traffic for July</h3> 
-                    <p><img src="img/graph2.jpg" alt="a" width="359" height="266" /></p>
-                  </div>
-                  <div id="infobox">
-                    <h3>Last 5 Orders</h3>
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Customer</th>
-                                <th>Items</th>
-                                <th>Grand Total</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Jennifer Kyrnin</a></td>
-                                <td>1</td>
-                                <td>14.95 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td>2</td>
-                                <td>34.27 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td>2</td>
-                                <td>61.39 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td>5</td>
-                                <td>1472.56 €</td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td>1</td>
-                                <td>9.95 €</td>
-                            </tr>
-						</tbody>
-					</table>            
-                  </div>
-                  <div id="infobox" class="margin-left">
-                    <h3>Bestsellers</h3> 
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Product Name</th>
-                                <th>Price</th>
-                                <th>Orders</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Apple iPhone 3G 8GB</a></td>
-                                <td>199.00 €</td>
-                                <td>24</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Fuji FinePix S5800</a></td>
-                            	<td>365.24 €</td>
-                                <td>19</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Canon PIXMA MP140</a></td>
-                                <td>59.50 €</td>
-                                <td>12</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Apple iPhone 3G 16GB</a></td>
-                                <td>199.00 €</td>
-                                <td>10</td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
-                                <td>499.00 €</td>
-                                <td>6</td>
-                            </tr>
-						</tbody>
-					</table>
-                  </div>
-                  <div id="infobox">
-                    <h3>New Customers</h3>
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Customer</th>
-                                <th>Orders</th>
-                                <th>Average</th>
-                                <th>Total</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Jennifer Kyrnin</a></td>
-                                <td>1</td>
-                                <td>5.6€</td>
-                                <td>14.95 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td>2</td>
-                                <td>14.97€</td>
-                                <td>34.27 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td>2</td>
-                                <td>15.31€</td>
-                                <td>61.39 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td>5</td>
-                                <td>502.61€</td>
-                                <td>1472.56 €</td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td>1</td>
-                                <td>5.1€</td>
-                                <td>9.95 €</td>
-                            </tr>
-						</tbody>
-					</table>                 
-                  </div>
-                  <div id="infobox" class="margin-left">
-                    <h3>Last 5 Reviews</h3> 
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Reviewer</th>
-                                <th>Product</th>
-                                <th>Action</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Jennifer Kyrnin</a></td>
-                                <td><a href="#">Apple iPhone 3G 8GB</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td><a href="#">Fuji FinePix S5800</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td><a href="#">Canon PIXMA MP140</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-						</tbody>
-					</table>
-                  </div>
-              </div>
-            </div>
-            <div id="sidebar">
-  				<ul>
-                	<li><h3><a href="#" class="house">Dashboard</a></h3>
-                        <ul>
-                        	<li><a href="#" class="report">Sales Report</a></li>
-                    		<li><a href="#" class="report_seo">SEO Report</a></li>
-                            <li><a href="#" class="search">Search</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="folder_table">Orders</a></h3>
-          				<ul>
-                        	<li><a href="#" class="addorder">New order</a></li>
-                          <li><a href="#" class="shipping">Shipments</a></li>
-                            <li><a href="#" class="invoices">Invoices</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="manage">Manage</a></h3>
-          				<ul>
-                            <li><a href="#" class="manage_page">Pages</a></li>
-                            <li><a href="#" class="cart">Products</a></li>
-                            <li><a href="#" class="folder">Product categories</a></li>
-            				<li><a href="#" class="promotions">Promotions</a></li>
-                        </ul>
-                    </li>
-                  <li><h3><a href="#" class="user">Users</a></h3>
-          				<ul>
-                            <li><a href="#" class="useradd">Add user</a></li>
-                            <li><a href="#" class="group">User groups</a></li>
-            				<li><a href="#" class="search">Find user</a></li>
-                            <li><a href="#" class="online">Users online</a></li>
-                        </ul>
-                    </li>
-				</ul>       
-          </div>
-      </div>
-        <div id="footer">
-        <div id="credits">
-   		Template by <a href="http://www.bloganje.com">Bloganje</a>
-        </div>
-        <div id="styleswitcher">
-            <ul>
-                <li><a href="javascript: document.cookie='theme='; window.location.reload();" title="Default" id="defswitch">d</a></li>
-                <li><a href="javascript: document.cookie='theme=1'; window.location.reload();" title="Blue" id="blueswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=2'; window.location.reload();" title="Green" id="greenswitch">g</a></li>
-                <li><a href="javascript: document.cookie='theme=3'; window.location.reload();" title="Brown" id="brownswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=4'; window.location.reload();" title="Mix" id="mixswitch">m</a></li>
-                <li><a href="javascript: document.cookie='theme=5'; window.location.reload();" title="Mix" id="defswitch">m</a></li>
-            </ul>
-        </div><br />
-
-        </div>
-</div>
-</body>
-</html>

admin/templates/stylish/blank.html

@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Dashboard - Admin Template</title>
-<link rel="stylesheet" type="text/css" href="css/theme.css" />
-<link rel="stylesheet" type="text/css" href="css/style.css" />
-<script>
-   var StyleFile = "theme" + document.cookie.charAt(6) + ".css";
-   document.writeln('<link rel="stylesheet" type="text/css" href="css/' + StyleFile + '">');
-</script>
-<!--[if IE]>
-<link rel="stylesheet" type="text/css" href="css/ie-sucks.css" />
-<![endif]-->
-</head>
-
-<body>
-	<div id="container">
-    	<div id="header">
-        	<h2>My eCommerce Admin area</h2>
-    <div id="topmenu">
-            	<ul>
-                	<li class="current"><a href="index.html">Dashboard</a></li>
-                    <li><a href="#">Orders</a></li>
-                	<li><a href="users.html">Users</a></li>
-                    <li><a href="#">Manage</a></li>
-                    <li><a href="#">CMS</a></li>
-                    <li><a href="#">Statistics</a></li>
-                    <li><a href="#">Settings</a></li>
-              </ul>
-          </div>
-      </div>
-        <div id="top-panel">
-            <div id="panel">
-                <ul>
-                    <li><a href="#" class="report">Sales Report</a></li>
-                    <li><a href="#" class="report_seo">SEO Report</a></li>
-                    <li><a href="#" class="search">Search</a></li>
-                    <li><a href="#" class="feed">RSS Feed</a></li>
-                </ul>
-            </div>
-      </div>
-        <div id="wrapper">
-            <div id="content">
-                <p>&nbsp;</p>
-                <p>&nbsp;</p>
-            </div>
-            <div id="sidebar">
-  				<ul>
-                	<li><h3><a href="#" class="house">Dashboard</a></h3>
-                        <ul>
-                        	<li><a href="#" class="report">Sales Report</a></li>
-                    		<li><a href="#" class="report_seo">SEO Report</a></li>
-                            <li><a href="#" class="search">Search</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="folder_table">Orders</a></h3>
-          				<ul>
-                        	<li><a href="#" class="addorder">New order</a></li>
-                          <li><a href="#" class="shipping">Shipments</a></li>
-                            <li><a href="#" class="invoices">Invoices</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="manage">Manage</a></h3>
-          				<ul>
-                            <li><a href="#" class="manage_page">Pages</a></li>
-                            <li><a href="#" class="cart">Products</a></li>
-                            <li><a href="#" class="folder">Product categories</a></li>
-            				<li><a href="#" class="promotions">Promotions</a></li>
-                        </ul>
-                    </li>
-                  <li><h3><a href="#" class="user">Users</a></h3>
-          				<ul>
-                            <li><a href="#" class="useradd">Add user</a></li>
-                            <li><a href="#" class="group">User groups</a></li>
-            				<li><a href="#" class="search">Find user</a></li>
-                            <li><a href="#" class="online">Users online</a></li>
-                        </ul>
-                    </li>
-				</ul>       
-          </div>
-      </div>
-        <div id="footer">
-        <div id="credits">
-   		Template by <a href="http://www.bloganje.com">Bloganje</a>
-        </div>
-        <div id="styleswitcher">
-            <ul>
-                <li><a href="javascript: document.cookie='theme='; window.location.reload();" title="Default" id="defswitch">d</a></li>
-                <li><a href="javascript: document.cookie='theme=1'; window.location.reload();" title="Blue" id="blueswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=2'; window.location.reload();" title="Green" id="greenswitch">g</a></li>
-                <li><a href="javascript: document.cookie='theme=3'; window.location.reload();" title="Brown" id="brownswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=4'; window.location.reload();" title="Mix" id="mixswitch">m</a></li>
-            </ul>
-        </div><br />
-
-        </div>
-</div>
-</body>
-</html>

admin/templates/stylish/css/Copy of theme.css

@@ -1,121 +0,0 @@
-body{
-	background:#f7f6f0 url(../img/bg.jpg) repeat-x top;
-	color: #202020;
-}
-a, a:visited{
-	color:#993300;
-}
-input{
-	border:1px solid #e8e7e1;
-}
-select{
-	border:1px solid #e8e7e1;
-}
-#header h2{
-	color:#FFF;
-}
-#content{
-	background:#FFF;
-}
-#sidebar{
-	background:#FFF;
-}
-#sidebar h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-}
-#topmenu a,#topmenu a:visited{
-	color:#f7f6f0;
-	background:#cc3300;
-}
-#topmenu a:hover{
-	color: #FFF;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	color:#993400;
-	background: #FFF url(../img/bg_menu_red.jpg) repeat-x top;
-	border-left: #FFF 1px solid;
-	border-right: #FFF 1px solid;
-}
-#top-panel{
-	background:#FFF;
-}
-table{
-	background:none;
-}
-td, th{
-	border:1px solid #e8e7e1;
-} 
-thead{
-	background:#f7f6f0;
-}
-#styleswitcher{
-	background:#FFFFFF;
-}
-#footer{
-	background:#FFF;
-}
-#box{
-	border:1px solid #e8e7e1;
-}
-#box h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-	color:#993300;
-}
-/***************
-	  Forms
-***************/
-form#form fieldset {
-	border:1px solid #e8e7e1;
-}
-form#form legend {
-	border:1px solid #e8e7e1;
-	background:#fff url(../img/form_red.gif) repeat-x center left;
-	color:#993300;
-}
-form#form input {
-	border:1px solid #e8e7e1;
-	background:#fff url(../img/form_red.gif) repeat-x top left;
-}
-form#form textarea {
-	border:1px solid #e8e7e1;
-	background:#fff url(../img/form_red.gif) repeat-x bottom left;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup {
-	background:#e8e7e1;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	color:#c00;
-}
-form#form #button1:hover, form#form #button2:hover {
-	color:#000;
-}
-/***************
-	Home
-***************/
-#infobox{
-	border:1px solid #e8e7e1;
-}
-#infobox h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-	color:#993300;
-}
-#rightnow {
-	border:1px solid #e8e7e1;
-}
-#rightnow .reallynow {
-	background:#f7f6f0;
-	color:#993300;
-}
-#rightnow h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-}

admin/templates/stylish/css/ie-sucks.css

@@ -1,21 +0,0 @@
-#content{
-	width:740px;
-}
-#topmenu{
-	margin-top:26px;
-}
-#sidebar{
-	width:160px;
-}
-#sidebar ul{
-	width:150px;
-}
-#sidebar ul li ul{
-	width:140px;
-}
-#sidebar h3{
-	margin-bottom:5px;
-}
-#rightnow .reallynow a {
-	padding:0 0 0 10px;
-}

admin/templates/stylish/css/iepngfix.htc

@@ -1,68 +0,0 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-
-// This must be a path to a blank image. That's all the configuration you need.
-if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
-
-
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;
-
- if (tagName == 'IMG')
- {
-  if ((/\.png$/i).test(src))
-  {
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   filt(src, 'scale');
-   src = blankImg;
-  }
-  else if (src.indexOf(blankImg) < 0) filt();
- }
- else if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, 'crop');
-   // IE link fix.
-   for (var n = 0; n < childNodes.length; n++)
-    if (childNodes[n].style) childNodes[n].style.position = 'relative';
-  }
-  else filt();
- }
-}
-
-doFix();
-
-</script>
-</public:component>

admin/templates/stylish/css/style.css

@@ -1,397 +0,0 @@
-/*********************
-	HTML Elements
-*********************/
-*{
-	margin:0;
-	padding:0;
-}
-img, div,a { behavior: url(css/iepngfix.htc) }
-body{
-	font-size: 12px;
-	font-family: Arial, Tahoma, Verdana;
-}
-a, a:visited{
-	text-decoration:none;
-}
-img{
-	border:0;
-	margin:1px;
-}
-p{
-	padding:3px;
-}
-h2{
-
-}
-input{
-	padding:2px;
-}
-select{
-	padding:2px;
-}
-/*********************
-	Status
-*********************/
-#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;
-}
-/*********************
-	Structure
-*********************/
-#container{
-	width:960px;
-	margin-left:auto;
-	margin-right:auto;
-}
-#header{
-	width:960px;
-}
-#header h2{
-	margin-top:20px;
-}
-#content{
-	width:740px;
-	float:left;
-	margin:10px 0 10px 0;
-	padding:10px;
-}
-#sidebar{
-	background:#FFF;
-	width:170px;
-	float:right;
-	margin:10px 0 10px 0;
-	padding:10px;
-}
-#footer{
-	clear:both;
-	padding:5px;
-	margin-top:10px;
-}
-#box h3{
-	padding:5px;
-	font-size:14px;
-}
-/*********************
-	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;
-}
-/*********************
-  TopMenu, Top-Panel
-*********************/
-#topmenu{
-	margin-top:33px;
-	width:700px;
-	float:left;
-	voice-family:inherit;
-}
-#topmenu ul{
-	list-style:none;
-	line-height:25px;
-}
-#topmenu li{
-	display:inline;
-}
-#topmenu a,#topmenu a:visited{
-	padding:5px 12px 5px 12px;
-	text-decoration:none;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	padding:5px 12px 5px 12px;
-	font-weight:bold;
-	
-}
-#top-panel{
-	background:#FFF;
-	padding:5px;
-	height:20px;
-	float:left;
-	width:950px;
-}
-#top-panel ul{
-	list-style:none;
-}
-#top-panel ul li{
-	display:inline;
-	line-height:20px;
-}
-#top-panel ul li a{
-	padding-left:19px;
-	text-decoration:none;
-	margin:0 3px;
-	display:inline-block;
-}
-#top-panel a:hover{
-	text-decoration:underline;
-}
-/*********************
-		Other
-*********************/
-.a-right{text-align:right;}
-.a-left{text-align:left;}
-.a-center{text-align:center;}
-#pager{
-	margin:5px;
-	height:25px;
-}
-#styleswitcher{
-	float:right;
-}
-#styleswitcher ul{
-	list-style:none;
-	line-height:10px;
-}
-#styleswitcher li{
-	height:12px;
-	display:inline;
-}
-#footer ul {
-	list-style:none;
-}
-#footer li {
-	display:inline;
-}
-a#defswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#bd3f09;
-	font-size: 8px;
-	color:#bd3f09;
-	display:inline-block;
-}
-a#blueswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#375b91;
-	font-size: 8px;
-	color:#375b91;
-	display:inline-block;
-}
-a#greenswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#d0e0b8;
-	font-size: 8px;
-	color:#d0e0b8;
-	display:inline-block;
-}
-a#brownswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#654322;
-	font-size: 8px;
-	color:#654322;
-	display:inline-block;
-}
-a#mixswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#294145;
-	font-size: 8px;
-	color:#294145;
-	display:inline-block;
-}
-#credits{
-	clear:both;
-	width:250px;
-	float:left;
-}
-/*********************
-		Tables
-*********************/
-table{
-	margin:5px;
-	border-collapse: collapse;
-	table-layout:automatic;
-	width:98%;
-}
-td, th{
-	padding: 2px;
-} 
-thead{
-
-}
-/*********************
-		Home
-*********************/
-#infowrap li{
-	display:inline:
-}
-#infobox{
-	width:365px;
-	float:left;
-	margin-top:10px;
-}
-#infobox h3{
-	padding:5px;
-	font-size:14px;
-}
-.margin-left{
-	margin-left:5px;
-}
-#rightnow .reallynow {
-	padding: 5px;
-	font-size:14px;
-}
-#rightnow h3{
-	padding:2px;
-	padding: 0 10px;
-	font-size:14px;
-}
-#rightnow .reallynow span {
-	display: block;
-	text-align: left;
-	float: left;
-	padding:0 2px;
-	font-size:14px
-}
-#rightnow .reallynow a {
-	text-decoration:none;
-	display: block;
-	text-align: right;
-	float: right;
-	padding:0 0 0 18px;
-	margin-left:4px;
-	font-weight:normal;
-	font-size:12px;
-}
-#rightnow .reallynow a:hover{
-	text-decoration:underline;
-}
-#rightnow .youhave {
-	font-size:  12px;
-	padding: 10px;
-}
-#rightnow a {
-	font-weight: bold;
-}
-/*********************
-		Forms
-*********************/
-form{
-	padding:10px;
-	margin:0 auto;
-}
-form#form fieldset {
-	display:block;
-	padding:5px 10px 5px 10px;
-	line-height:20px;
-	margin-bottom:10px;
-}
-form#form legend {
-	font-size:12px;
-	font-weight:bold;
-	margin-bottom:5px;
-	padding:3px;
-	width:254px;
-}
-form#form label {
-	clear:left;
-	display:block;
-	float:left;
-	width:100px;
-	text-align:right;
-	padding-right:10px;
-	margin-bottom:5px;
-}
-form#form input {
-	padding:3px;
-	margin-bottom:5px;
-}
-form#form select {
-	margin-left:5px;
-}
-form#form textarea {
-	width:410px;
-	height:200px;
-	padding:5px;
-	overflow:auto;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	padding-right:5px;
-	cursor:pointer;
-	width:205px;
-	margin-left:8px;
-	font-weight:bold;
-}
-form#form #button1:hover, form#form #button2:hover {
-	background-position:center left;
-}
-
-/*********************
-	Icons
-*********************/
-.icon{
-	padding-left:19px;
-	text-decoration:none;
-	height:20px;
-	font-size:12x;
-	margin:0 3px;
-	display:inline-block;
-	line-height:20px;
-}
-.user{background:transparent url(../img/icons/user.png) no-repeat left;}
-.useradd{background:transparent url(../img/icons/user_add.png) no-repeat left;}
-.group{background:transparent url(../img/icons/group.png) no-repeat left;}
-.search{background:transparent url(../img/icons/magnifier.png) no-repeat left;}
-.online{background:transparent url(../img/icons/world.png) no-repeat left;}
-.pagenew{background:transparent url(../img/icons/page_add.png) no-repeat left;}
-.rss{background:transparent url(../img/icons/rss.png) no-repeat left;}
-.feed{background:transparent url(../img/icons/feed.png) no-repeat left;}
-.report{background:transparent url(../img/icons/report.png) no-repeat left;}
-.house{background:transparent url(../img/icons/house.png) no-repeat left;}
-.manage{background:transparent url(../img/icons/cog.png) no-repeat left;}
-.manage_page{background:transparent url(../img/icons/page_gear.png) no-repeat left;}
-.folder{background:transparent url(../img/icons/folder.png) no-repeat left;}
-.promotions{background:transparent url(../img/icons/coins.png) no-repeat left;}
-.cart{background:transparent url(../img/icons/cart.png) no-repeat left;}
-.folder_table{background:transparent url(../img/icons/folder_page.png) no-repeat left;}
-.shipping{background:transparent url(../img/icons/car.png) no-repeat left;}
-.invoices{background:transparent url(../img/icons/page_white_text_width.png) no-repeat left;}
-.addorder{background:transparent url(../img/icons/folder_page_add.png) no-repeat left;}
-.add{background:transparent url(../img/icons/add.png) no-repeat left;}
-.app_add{background:transparent url(../img/icons/application_add.png) no-repeat left;}
-.report_seo{background:transparent url(../img/icons/report_link.png) no-repeat left;}
-.modules{background:transparent url(../img/icons/bricks.png) no-repeat left;}
-.modules_manage{background:transparent url(../img/icons/bricks_gear.png) no-repeat left;}

admin/templates/stylish/css/switch.css

@@ -1,51 +0,0 @@
-#footer ul {
-	list-style:none;
-}
-#footer li {
-	display:inline;
-}
-a#defswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#bd3f09;
-	font-size: 8px;
-	color:#bd3f09;
-	display:inline-block;
-}
-a#blueswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#375b91;
-	font-size: 8px;
-	color:#375b91;
-	display:inline-block;
-}
-a#greenswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#d0e0b8;
-	font-size: 8px;
-	color:#d0e0b8;
-	display:inline-block;
-}
-a#brownswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#654322;
-	font-size: 8px;
-	color:#654322;
-	display:inline-block;
-}
-a#mixswitch {
-	width:15px;
-	height:10px;
-	margin: 3px 0 3px 0;
-	background-color:#294145;
-	font-size: 8px;
-	color:#294145;
-	display:inline-block;
-}

admin/templates/stylish/css/theme.css

@@ -1,121 +0,0 @@
-body{
-	background:#f7f6f0 url(../img/bg.jpg) repeat-x top;
-	color: #202020;
-}
-a, a:visited{
-	color:#a43708;
-}
-input{
-	border:1px solid #e8e7e1;
-}
-select{
-	border:1px solid #e8e7e1;
-}
-#header h2{
-	color:#FFF;
-}
-#content{
-	background:#FFF;
-}
-#sidebar{
-	background:#FFF;
-}
-#sidebar h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-}
-#topmenu a,#topmenu a:visited{
-	color:#f7f6f0;
-	background:#bd3f09;
-}
-#topmenu a:hover{
-	color: #FFF;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	color:#993400;
-	background: #FFF url(../img/bg_menu_red.jpg) repeat-x top;
-	border-left: #FFF 1px solid;
-	border-right: #FFF 1px solid;
-}
-#top-panel{
-	background:#FFF;
-}
-table{
-	background:none;
-}
-td, th{
-	border:1px solid #e8e7e1;
-} 
-thead{
-	background:#f7f6f0;
-}
-#styleswitcher{
-	background:#FFFFFF;
-}
-#footer{
-	background:#FFF;
-}
-#box{
-	border:1px solid #e8e7e1;
-}
-#box h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-	color:#a43708;
-}
-/***************
-	  Forms
-***************/
-form#form fieldset {
-	border:1px solid #e8e7e1;
-}
-form#form legend {
-	border:1px solid #e8e7e1;
-	background:#fff url(../img/form_red.gif) repeat-x center left;
-	color:#a43708;
-}
-form#form input {
-	border:1px solid #e8e7e1;
-	background:#fff url(../img/form_red.gif) repeat-x top left;
-}
-form#form textarea {
-	border:1px solid #e8e7e1;
-	background:#fff url(../img/form_red.gif) repeat-x bottom left;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup {
-	background:#e8e7e1;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	color:#c00;
-}
-form#form #button1:hover, form#form #button2:hover {
-	color:#000;
-}
-/***************
-	Home
-***************/
-#infobox{
-	border:1px solid #e8e7e1;
-}
-#infobox h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-	color:#a43708;
-}
-#rightnow {
-	border:1px solid #e8e7e1;
-}
-#rightnow .reallynow {
-	background:#f7f6f0;
-	color:#a43708;
-}
-#rightnow h3{
-	background:#f7f6f0;
-	border-bottom:1px solid #e8e7e1;
-}

admin/templates/stylish/css/theme1.css

@@ -1,121 +0,0 @@
-body{
-	background:#f3f9ff url(../img/bg_blue.jpg) repeat-x top;
-	color: #202020;
-}
-a, a:visited{
-	color:#375b91;
-}
-input{
-	border:1px solid #d9e6f0;
-}
-select{
-	border:1px solid #d9e6f0;
-}
-#header h2{
-	color:#FFF;
-}
-#content{
-	background:#FFF;
-}
-#sidebar{
-	background:#FFF;
-}
-#sidebar h3{
-	background:#f3f9ff;
-	border-bottom:1px solid #d9e6f0;
-}
-#topmenu a,#topmenu a:visited{
-	color:#FFF;
-	background:#7e9dcc;
-}
-#topmenu a:hover{
-	color: #FFF;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	color:#375b91;
-	background: #FFF url(../img/bg_menu_blue.jpg) repeat-x top;
-	border-left: #FFF 1px solid;
-	border-right: #FFF 1px solid;
-}
-#top-panel{
-	background:#FFF;
-}
-table{
-	background:none;
-}
-td, th{
-	border:1px solid #d9e6f0;
-} 
-thead{
-	background:#f3f9ff;
-}
-#styleswitcher{
-	background:#FFFFFF;
-}
-#footer{
-	background:#FFF;
-}
-#box{
-	border:1px solid #d9e6f0;
-}
-#box h3{
-	background:#f3f9ff;
-	border-bottom:1px solid #d9e6f0;
-	color:#375b91;
-}
-/***************
-	  Forms
-***************/
-form#form fieldset {
-	border:1px solid #d9e6f0;
-}
-form#form legend {
-	border:1px solid #d9e6f0;
-	background:#fff url(../img/form_blue.gif) repeat-x center left;
-	color:#375b91;
-}
-form#form input {
-	border:1px solid #d9e6f0;
-	background:#fff url(../img/form_blue.gif) repeat-x top left;
-}
-form#form textarea {
-	border:1px solid #d9e6f0;
-	background:#fff url(../img/form_blue.gif) repeat-x bottom left;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup {
-	background:#d9e6f0;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	color:#375b91;
-}
-form#form #button1:hover, form#form #button2:hover {
-	color:#000;
-}
-/***************
-	Home
-***************/
-#infobox{
-	border:1px solid #d9e6f0;
-}
-#infobox h3{
-	background:#f3f9ff;
-	border-bottom:1px solid #d9e6f0;
-	color:#375b91;
-}
-#rightnow {
-	border:1px solid #d9e6f0;
-}
-#rightnow .reallynow {
-	background:#f3f9ff;
-	color:#375b91;
-}
-#rightnow h3{
-	background:#f3f9ff;
-	border-bottom:1px solid #d9e6f0;
-}

admin/templates/stylish/css/theme2.css

@@ -1,121 +0,0 @@
-body{
-	background:#f0f7e8 url(../img/bg_light_green.jpg) repeat-x top;
-	color: #202020;
-}
-a, a:visited{
-	color:#93ad7e;
-}
-input{
-	border:1px solid #e7eedf;
-}
-select{
-	border:1px solid #e7eedf;
-}
-#header h2{
-	color:#FFF;
-}
-#content{
-	background:#FFF;
-}
-#sidebar{
-	background:#FFF;
-}
-#sidebar h3{
-	background:#f0f7e8;
-	border-bottom:1px solid #e7eedf;
-}
-#topmenu a,#topmenu a:visited{
-	color:#93ad7e;
-	background:#e7eedc;
-}
-#topmenu a:hover{
-	color: #93ad7e;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	color:#93ad7e;
-	background: #FFF url(../img/bg_menu_green.jpg) repeat-x top;
-	border-left: #FFF 1px solid;
-	border-right: #FFF 1px solid;
-}
-#top-panel{
-	background:#FFF;
-}
-table{
-	background:none;
-}
-td, th{
-	border:1px solid #e7eedf;
-} 
-thead{
-	background:#f0f7e8;
-}
-#styleswitcher{
-	background:#FFFFFF;
-}
-#footer{
-	background:#FFF;
-}
-#box{
-	border:1px solid #e7eedf;
-}
-#box h3{
-	background:#f0f7e8;
-	border-bottom:1px solid #e7eedf;
-	color:#93ad7e;
-}
-/***************
-	  Forms
-***************/
-form#form fieldset {
-	border:1px solid #e7eedf;
-}
-form#form legend {
-	border:1px solid #e7eedf;
-	background:#fff url(../img/form_green.gif) repeat-x center left;
-	color:#93ad7e;
-}
-form#form input {
-	border:1px solid #e7eedf;
-	background:#fff url(../img/form_green.gif) repeat-x top left;
-}
-form#form textarea {
-	border:1px solid #e7eedf;
-	background:#fff url(../img/form_green.gif) repeat-x bottom left;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup {
-	background:#e7eedf;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	color:#93ad7e;
-}
-form#form #button1:hover, form#form #button2:hover {
-	color:#000;
-}
-/***************
-	Home
-***************/
-#infobox{
-	border:1px solid #e7eedf;
-}
-#infobox h3{
-	background:#f0f7e8;
-	border-bottom:1px solid #e7eedf;
-	color:#93ad7e;
-}
-#rightnow {
-	border:1px solid #e7eedf;
-}
-#rightnow .reallynow {
-	background:#f0f7e8;
-	color:#93ad7e;
-}
-#rightnow h3{
-	background:#f0f7e8;
-	border-bottom:1px solid #e7eedf;
-}

admin/templates/stylish/css/theme3.css

@@ -1,121 +0,0 @@
-body{
-	background:#f7f6f1 url(../img/bg_brown.jpg) repeat-x top;
-	color: #202020;
-}
-a, a:visited{
-	color:#654322;
-}
-input{
-	border:1px solid #e9e8e3;
-}
-select{
-	border:1px solid #e9e8e3;
-}
-#header h2{
-	color:#FFF;
-}
-#content{
-	background:#FFF;
-}
-#sidebar{
-	background:#FFF;
-}
-#sidebar h3{
-	background:#f7f6f1;
-	border-bottom:1px solid #e9e8e3;
-}
-#topmenu a,#topmenu a:visited{
-	color:#FFF;
-	background:#8f6831;
-}
-#topmenu a:hover{
-	color: #654322;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	color:#654322;
-	background: #FFF url(../img/bg_menu_brown.jpg) repeat-x top;
-	border-left: #FFF 1px solid;
-	border-right: #FFF 1px solid;
-}
-#top-panel{
-	background:#FFF;
-}
-table{
-	background:none;
-}
-td, th{
-	border:1px solid #e9e8e3;
-} 
-thead{
-	background:#f7f6f1;
-}
-#styleswitcher{
-	background:#FFFFFF;
-}
-#footer{
-	background:#FFF;
-}
-#box{
-	border:1px solid #e9e8e3;
-}
-#box h3{
-	background:#f7f6f1;
-	border-bottom:1px solid #e9e8e3;
-	color:#654322;
-}
-/***************
-	  Forms
-***************/
-form#form fieldset {
-	border:1px solid #e9e8e3;
-}
-form#form legend {
-	border:1px solid #e9e8e3;
-	background:#fff url(../img/form_brown.gif) repeat-x center left;
-	color:#654322;
-}
-form#form input {
-	border:1px solid #e9e8e3;
-	background:#fff url(../img/form_brown.gif) repeat-x top left;
-}
-form#form textarea {
-	border:1px solid #e9e8e3;
-	background:#fff url(../img/form_brown.gif) repeat-x bottom left;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup {
-	background:#e9e8e3;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	color:#654322;
-}
-form#form #button1:hover, form#form #button2:hover {
-	color:#000;
-}
-/***************
-	Home
-***************/
-#infobox{
-	border:1px solid #e9e8e3;
-}
-#infobox h3{
-	background:#f7f6f1;
-	border-bottom:1px solid #e9e8e3;
-	color:#654322;
-}
-#rightnow {
-	border:1px solid #e9e8e3;
-}
-#rightnow .reallynow {
-	background:#f7f6f1;
-	color:#654322;
-}
-#rightnow h3{
-	background:#f7f6f1;
-	border-bottom:1px solid #e9e8e3;
-}

admin/templates/stylish/css/theme4.css

@@ -1,122 +0,0 @@
-body{
-	background:#d9eaed url(../img/bg_mix.jpg) repeat-x top;
-	color: #202020;
-}
-a, a:visited{
-	color:#294145;
-	text-decoration:underline;
-}
-input{
-	border:1px solid #c3d7db;
-}
-select{
-	border:1px solid #c3d7db;
-}
-#header h2{
-	color:#FFF;
-}
-#content{
-	background:#FFF;
-}
-#sidebar{
-	background:#FFF;
-}
-#sidebar h3{
-	background:#d9eaed;
-	border-bottom:1px solid #c3d7db;
-}
-#topmenu a,#topmenu a:visited{
-	color:#FFF;
-	background:#5d99a3;
-}
-#topmenu a:hover{
-	color: #294145;
-}
-#topmenu .current a, #topmenu .current a:hover, #topmenu .current a:visited{
-	color:#294145;
-	background: #FFF url(../img/bg_menu_mix.jpg) repeat-x top;
-	border-left: #FFF 1px solid;
-	border-right: #FFF 1px solid;
-}
-#top-panel{
-	background:#FFF;
-}
-table{
-	background:none;
-}
-td, th{
-	border:1px solid #c3d7db;
-} 
-thead{
-	background:#d9eaed;
-}
-#styleswitcher{
-	background:#FFFFFF;
-}
-#footer{
-	background:#FFF;
-}
-#box{
-	border:1px solid #c3d7db;
-}
-#box h3{
-	background:#d9eaed;
-	border-bottom:1px solid #c3d7db;
-	color:#294145;
-}
-/***************
-	  Forms
-***************/
-form#form fieldset {
-	border:1px solid #c3d7db;
-}
-form#form legend {
-	border:1px solid #c3d7db;
-	background:#fff url(../img/form_mix.gif) repeat-x center left;
-	color:#294145;
-}
-form#form input {
-	border:1px solid #c3d7db;
-	background:#fff url(../img/form_mix.gif) repeat-x top left;
-}
-form#form textarea {
-	border:1px solid #c3d7db;
-	background:#fff url(../img/form_mix.gif) repeat-x bottom left;
-}
-form#form option {
-	background:#FFF;
-}
-form#form optgroup {
-	background:#c3d7db;
-}
-form#form optgroup option {
-
-}
-form#form #button1, form#form #button2 {
-	color:#294145;
-}
-form#form #button1:hover, form#form #button2:hover {
-	color:#000;
-}
-/***************
-	Home
-***************/
-#infobox{
-	border:1px solid #c3d7db;
-}
-#infobox h3{
-	background:#d9eaed;
-	border-bottom:1px solid #c3d7db;
-	color:#294145;
-}
-#rightnow {
-	border:1px solid #c3d7db;
-}
-#rightnow .reallynow {
-	background:#d9eaed;
-	color:#294145;
-}
-#rightnow h3{
-	background:#d9eaed;
-	border-bottom:1px solid #c3d7db;
-}

admin/templates/stylish/template.php

@@ -1,296 +0,0 @@
-<?php defined('MYAAC') or die('Direct access not allowed!'); ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<?php echo template_header(true); ?>
-	<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; ?>css/theme2.css" />
-	<link rel="stylesheet" type="text/css" href="<?php echo $template_path; ?>css/style.css" />
-<script>
-   var StyleFile = "theme" + document.cookie.charAt(6) + ".css";
-   document.writeln('<link rel="stylesheet" type="text/css" href="<?php echo $template_path; ?>css/' + StyleFile + '">');
-</script>
-<!--[if IE]>
-<link rel="stylesheet" type="text/css" href="css/ie-sucks.css" />
-<![endif]-->
-</head>
-
-<body>
-	<div id="container">
-    	<div id="header">
-			<?php if($logged): ?>
-			<div id="status">
-				<?php if($status['online']): ?>
-				<p class="success" style="width: 120px; text-align: center;">Status: Online<br/>
-					<?php echo $status['uptimeReadable'] . ', ' . $status['players'] . '/' . $status['playersMax']; ?><br/>
-					<?php echo $config['lua']['ip'] . ' : ' . $config['lua']['loginPort']; ?>
-				</p>
-				<?php else: ?>
-				<p class="error" style="width: 120px; text-align: center;">Status: Offline</p>
-				<?php endif; ?>
-			</div>
-			<div id="version">Version: <?php echo MYAAC_VERSION; ?> (<a id="update" href="#">Check for updates</a>)<br/>
-				<a href="http://<?php echo $_SERVER['HTTP_HOST']; ?>" target="_blank">Preview</a> <span class="separator">|</span> <a href="?action=logout">Logout<img src="images/logout.png" alt="" title="Logout" /></a>
-			</div>
-			<?php endif; ?>
-        	<h2><?php echo $config['lua']['serverName']; ?> - Admin Panel</h2>
-    <div id="topmenu">
-            	<ul>
-                	<li class="current"><a href="index.html">Dashboard</a></li>
-                    <li><a href="#">Orders</a></li>
-                	<li><a href="users.html">Users</a></li>
-                    <li><a href="#">Manage</a></li>
-                    <li><a href="#">CMS</a></li>
-                    <li><a href="#">Statistics</a></li>
-                    <li><a href="#">Settings</a></li>
-              </ul>
-          </div>
-      </div>
-        <div id="top-panel">
-            <div id="panel">
-                <ul>
-                    <li><a href="#" class="report">Sales Report</a></li>
-                    <li><a href="#" class="report_seo">SEO Report</a></li>
-                    <li><a href="#" class="search">Search</a></li>
-                    <li><a href="#" class="feed">RSS Feed</a></li>
-                </ul>
-            </div>
-      </div>
-        <div id="wrapper">
-            <div id="content">
-       			<div id="rightnow">
-                    <h3 class="reallynow">
-                        <span>Right Now</span>
-                        <a href="#" class="add">Add New Product</a>
-                        <a href="#" class="app_add">Some Action</a>
-                        <br />
-                    </h3>
-				    <p class="youhave">You have <a href="#">19 new orders</a>, <a href="#">12 new users</a> and <a href="#">5 new reviews</a>, today you made <a href="#">$1523.63 in sales</a> and a total of <strong>$328.24 profit </strong>
-                    </p>
-			  </div>
-              <div id="infowrap">
-              <div id="infobox">
-                    <h3>Sales for July</h3>
-                    <p><img src="img/graph.jpg" width="360" height="266" /></p>
-                  </div>
-                  <div id="infobox" class="margin-left">
-                    <h3>Traffic for July</h3>
-                    <p><img src="img/graph2.jpg" alt="a" width="359" height="266" /></p>
-                  </div>
-                  <div id="infobox">
-                    <h3>Last 5 Orders</h3>
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Customer</th>
-                                <th>Items</th>
-                                <th>Grand Total</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Jennifer Kyrnin</a></td>
-                                <td>1</td>
-                                <td>14.95 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td>2</td>
-                                <td>34.27 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td>2</td>
-                                <td>61.39 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td>5</td>
-                                <td>1472.56 €</td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td>1</td>
-                                <td>9.95 €</td>
-                            </tr>
-						</tbody>
-					</table>
-                  </div>
-                  <div id="infobox" class="margin-left">
-                    <h3>Bestsellers</h3>
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Product Name</th>
-                                <th>Price</th>
-                                <th>Orders</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Apple iPhone 3G 8GB</a></td>
-                                <td>199.00 €</td>
-                                <td>24</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Fuji FinePix S5800</a></td>
-                            	<td>365.24 €</td>
-                                <td>19</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Canon PIXMA MP140</a></td>
-                                <td>59.50 €</td>
-                                <td>12</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Apple iPhone 3G 16GB</a></td>
-                                <td>199.00 €</td>
-                                <td>10</td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
-                                <td>499.00 €</td>
-                                <td>6</td>
-                            </tr>
-						</tbody>
-					</table>
-                  </div>
-                  <div id="infobox">
-                    <h3>New Customers</h3>
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Customer</th>
-                                <th>Orders</th>
-                                <th>Average</th>
-                                <th>Total</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Jennifer Kyrnin</a></td>
-                                <td>1</td>
-                                <td>5.6€</td>
-                                <td>14.95 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td>2</td>
-                                <td>14.97€</td>
-                                <td>34.27 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td>2</td>
-                                <td>15.31€</td>
-                                <td>61.39 €</td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td>5</td>
-                                <td>502.61€</td>
-                                <td>1472.56 €</td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td>1</td>
-                                <td>5.1€</td>
-                                <td>9.95 €</td>
-                            </tr>
-						</tbody>
-					</table>
-                  </div>
-                  <div id="infobox" class="margin-left">
-                    <h3>Last 5 Reviews</h3>
-                    <table>
-						<thead>
-							<tr>
-                            	<th>Reviewer</th>
-                                <th>Product</th>
-                                <th>Action</th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td><a href="#">Jennifer Kyrnin</a></td>
-                                <td><a href="#">Apple iPhone 3G 8GB</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td><a href="#">Fuji FinePix S5800</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-							<tr>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td><a href="#">Canon PIXMA MP140</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-                            <tr>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
-                                <td><a href="#"><img src="img/icons/page_white_link.png" /></a><a href="#"><img src="img/icons/page_white_edit.png" /></a><a href="#"><img src="img/icons/page_white_delete.png" /></a></td>
-                            </tr>
-						</tbody>
-					</table>
-                  </div>
-              </div>
-            </div>
-            <div id="sidebar">
-  				<ul>
-                	<li><h3><a href="#" class="house">Dashboard</a></h3>
-                        <ul>
-                        	<li><a href="#" class="report">Sales Report</a></li>
-                    		<li><a href="#" class="report_seo">SEO Report</a></li>
-                            <li><a href="#" class="search">Search</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="folder_table">Orders</a></h3>
-          				<ul>
-                        	<li><a href="#" class="addorder">New order</a></li>
-                          <li><a href="#" class="shipping">Shipments</a></li>
-                            <li><a href="#" class="invoices">Invoices</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="manage">Manage</a></h3>
-          				<ul>
-                            <li><a href="#" class="manage_page">Pages</a></li>
-                            <li><a href="#" class="cart">Products</a></li>
-                            <li><a href="#" class="folder">Product categories</a></li>
-            				<li><a href="#" class="promotions">Promotions</a></li>
-                        </ul>
-                    </li>
-                  <li><h3><a href="#" class="user">Players</a></h3>
-          				<ul>
-                            <li><a href="#" class="useradd">Add user</a></li>
-                            <li><a href="#" class="group">Groups</a></li>
-            				<li><a href="#" class="search">Find&nbsp; player</a></li>
-                        </ul>
-                    </li>
-				</ul>
-          </div>
-      </div>
-        <div id="footer">
-        <div id="credits">
-		Powered by <a href="http://my-aac.org" target="_blank">MyAAC</a>, template by <a href="http://www.bloganje.com">Bloganje</a>
-        </div>
-        <div id="styleswitcher">
-            <ul>
-                <li><a href="javascript: document.cookie='theme='; window.location.reload();" title="Default" id="defswitch">d</a></li>
-                <li><a href="javascript: document.cookie='theme=1'; window.location.reload();" title="Blue" id="blueswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=2'; window.location.reload();" title="Green" id="greenswitch">g</a></li>
-                <li><a href="javascript: document.cookie='theme=3'; window.location.reload();" title="Brown" id="brownswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=4'; window.location.reload();" title="Mix" id="mixswitch">m</a></li>
-                <li><a href="javascript: document.cookie='theme=5'; window.location.reload();" title="Mix" id="defswitch">m</a></li>
-            </ul>
-        </div><br />
-
-        </div>
-</div>
-</body>
-</html>

admin/templates/stylish/users.html

@@ -1,309 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Users - Admin Template</title>
-<link rel="stylesheet" type="text/css" href="css/theme.css" />
-<link rel="stylesheet" type="text/css" href="css/style.css" />
-<script>
-   var StyleFile = "theme" + document.cookie.charAt(6) + ".css";
-   document.writeln('<link rel="stylesheet" type="text/css" href="css/' + StyleFile + '">');
-</script>
-<!--[if IE]>
-<link rel="stylesheet" type="text/css" href="css/ie-sucks.css" />
-<![endif]-->
-</head>
-
-<body>
-	<div id="container">
-    	<div id="header">
-        	<h2>My eCommerce Admin area</h2>
-    <div id="topmenu">
-            	<ul>
-                	<li><a href="index.html">Dashboard</a></li>
-                    <li><a href="#">Orders</a></li>
-                	<li class="current"><a href="#">Users</a></li>
-                    <li><a href="#">Manage</a></li>
-                    <li><a href="#">CMS</a></li>
-                    <li><a href="#">Statistics</a></li>
-                    <li><a href="#">Settings</a></li>
-              </ul>
-          </div>
-      </div>
-        <div id="top-panel">
-            <div id="panel">
-                <ul>
-					<li><a href="#adduser" class="useradd">Add user</a></li>
-                    <li><a href="#" class="group">User groups</a></li>
-            		<li><a href="#" class="search">Find user</a></li>
-                    <li><a href="#" class="online">Users online</a></li>
-                </ul>
-            </div>
-      </div>
-        <div id="wrapper">
-            <div id="content">
-                <div id="box">
-                	<h3>Users</h3>
-                	<table width="100%">
-						<thead>
-							<tr>
-                            	<th width="40px"><a href="#">ID<img src="img/icons/arrow_down_mini.gif" width="16" height="16" align="absmiddle" /></a></th>
-                            	<th><a href="#">Full Name</a></th>
-                                <th><a href="#">Email</a></th>
-                                <th width="70px"><a href="#">Group</a></th>
-                                <th width="50px"><a href="#">ZIP</a></th>
-                                <th width="90px"><a href="#">Registered</a></th>
-                                <th width="60px"><a href="#">Action</a></th>
-                            </tr>
-						</thead>
-						<tbody>
-							<tr>
-                            	<td class="a-center">232</td>
-                            	<td><a href="#">Jennifer Hodes</a></td>
-                                <td>jennifer.hodes@gmail.com</td>
-                                <td>General</td>
-                                <td>1000</td>
-                                <td>July 2, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-							<tr>
-                            	<td class="a-center">231</td>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td>mark.kyrnin@hotmail.com</td>
-                                <td>Affiliate</td>
-                                <td>8310</td>
-                                <td>June 17, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-							<tr>
-                            	<td class="a-center">230</td>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td>virgilio@somecompany.cz</td>
-                                <td>General</td>
-                                <td>6200</td>
-                                <td>June 31, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-							<tr>
-                            	<td class="a-center">229</td>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td>todd.simonides@gmail.com</td>
-                                <td>Wholesale</td>
-                                <td>2010</td>
-                                <td>June 5, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-                            <tr>
-                            	<td class="a-center">228</td>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td>carol@herbusiness.com</td>
-                                <td>General</td>
-                                <td>3120</td>
-                                <td>May 23, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-                            <tr>
-                            	<td class="a-center">232</td>
-                            	<td><a href="#">Jennifer Hodes</a></td>
-                                <td>jennifer.hodes@gmail.com</td>
-                                <td>General</td>
-                                <td>1000</td>
-                                <td>July 2, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-							<tr>
-                            	<td class="a-center">231</td>
-                            	<td><a href="#">Mark Kyrnin</a></td>
-                            	<td>mark.kyrnin@hotmail.com</td>
-                                <td>Affiliate</td>
-                                <td>8310</td>
-                                <td>June 17, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-							<tr>
-                            	<td class="a-center">230</td>
-                            	<td><a href="#">Virgílio Cezar</a></td>
-                                <td>virgilio@somecompany.cz</td>
-                                <td>General</td>
-                                <td>6200</td>
-                                <td>June 31, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-							<tr>
-                            	<td class="a-center">229</td>
-                            	<td><a href="#">Todd Simonides</a></td>
-                                <td>todd.simonides@gmail.com</td>
-                                <td>Wholesale</td>
-                                <td>2010</td>
-                                <td>June 5, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-                            <tr>
-                            	<td class="a-center">228</td>
-                            	<td><a href="#">Carol Elihu</a></td>
-                                <td>carol@herbusiness.com</td>
-                                <td>General</td>
-                                <td>3120</td>
-                                <td>May 23, 2008</td>
-                                <td><a href="#"><img src="img/icons/user.png" title="Show profile" width="16" height="16" /></a><a href="#"><img src="img/icons/user_edit.png" title="Edit user" width="16" height="16" /></a><a href="#"><img src="img/icons/user_delete.png" title="Delete user" width="16" height="16" /></a></td>
-                            </tr>
-						</tbody>
-					</table>
-                    <div id="pager">
-                    	Page <a href="#"><img src="img/icons/arrow_left.gif" width="16" height="16" /></a> 
-                    	<input size="1" value="1" type="text" name="page" id="page" /> 
-                    	<a href="#"><img src="img/icons/arrow_right.gif" width="16" height="16" /></a>of 42
-                    pages | View <select name="view">
-                    				<option>10</option>
-                                    <option>20</option>
-                                    <option>50</option>
-                                    <option>100</option>
-                    			</select> 
-                    per page | Total <strong>420</strong> records found
-                    </div>
-                </div>
-                <br />
-                <div id="box">
-                	<h3 id="adduser">Add user</h3>
-                    <form id="form" action="..." method="post">
-                      <fieldset id="personal">
-                        <legend>PERSONAL INFORMATION</legend>
-                        <label for="lastname">Last name : </label> 
-                        <input name="lastname" id="lastname" type="text" tabindex="1" />
-                        <br />
-                        <label for="firstname">First name : </label>
-                        <input name="firstname" id="firstname" type="text" 
-                        tabindex="2" />
-                        <br />
-                        <label for="email">Email : </label>
-                        <input name="email" id="email" type="text" 
-                        tabindex="2" />
-                        <br />
-                        <p>Send auto generated password 
-                            <input name="generatepass" id="yes" type="checkbox" 
-                        value="yes" tabindex="35" /></p>
-                        <label for="pass">Password : </label>
-                        <input name="pass" id="pass" type="password" 
-                        tabindex="2" />
-                        <br />
-                        <label for="pass-2">Password : </label>
-                        <input name="pass-2" id="pass-2" type="password" 
-                        tabindex="2" />
-                        <br />
-                      </fieldset>
-                      <fieldset id="address">
-                        <legend>Address</legend>
-                        <label for="street">Street address : </label> 
-                        <input name="street" id="street" type="text" 
-                        tabindex="1" />
-                        <br />
-                        <label for="city">City : </label>
-                        <input name="city" id="city" type="text" 
-                        tabindex="2" />
-                        <br />
-                        <label for="country">Country : </label> 
-                        <input name="country" id="country" type="text" 
-                        tabindex="1" />
-                        <br />
-                        <label for="state">State/Province : </label>
-                        <input name="state" id="state" type="text" 
-                        tabindex="2" />
-                        <br />
-                        <label for="zip">Zip/Postal Code : </label>
-                        <input name="zip" id="zip" type="text" 
-                        tabindex="2" />
-                        <br />
-                        <label for="tel">Telephone : </label>
-                        <input name="tel" id="tel" type="text" 
-                        tabindex="2" />
-                      </fieldset>
-                      <fieldset id="opt">
-                        <legend>OPTIONS</legend>
-                        <label for="choice">Group : </label>
-                        <select name="choice">
-                          <option selected="selected" label="none" value="none">
-                          General
-                          </option>
-                          <optgroup label="Group 1">
-                            <option label="cg1a" value="val_1a">Selection group 1a
-                            </option>
-                            <option label="cg1b" value="val_1b">Selection group 1b
-                            </option>
-                            <option label="cg1c" value="val_1c">Selection group 1c
-                            </option>
-                          </optgroup>
-                          <optgroup label="Group 2">
-                            <option label="cg2a" value="val_2a">Selection group 2a
-                            </option>
-                            <option label="cg2b" value="val_2a">Selection group 2b
-                            </option>
-                          </optgroup>
-                          <optgroup label="Group 3">
-                            <option label="cg3a" value="val_3a">Selection group 3a
-                            </option>
-                            <option label="cg3a" value="val_3a">Selection group 3b
-                            </option>
-                          </optgroup>
-                        </select>
-                      </fieldset>
-                      <div align="center">
-                      <input id="button1" type="submit" value="Send" /> 
-                      <input id="button2" type="reset" />
-                      </div>
-                    </form>
-
-                </div>
-            </div>
-            <div id="sidebar">
-  				<ul>
-                	<li><h3><a href="#" class="house">Dashboard</a></h3>
-                        <ul>
-                        	<li><a href="#" class="report">Sales Report</a></li>
-                    		<li><a href="#" class="report_seo">SEO Report</a></li>
-                            <li><a href="#" class="search">Search</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="folder_table">Orders</a></h3>
-          				<ul>
-                        	<li><a href="#" class="addorder">New order</a></li>
-                          <li><a href="#" class="shipping">Shipments</a></li>
-                            <li><a href="#" class="invoices">Invoices</a></li>
-                        </ul>
-                    </li>
-                    <li><h3><a href="#" class="manage">Manage</a></h3>
-          				<ul>
-                            <li><a href="#" class="manage_page">Pages</a></li>
-                            <li><a href="#" class="cart">Products</a></li>
-                            <li><a href="#" class="folder">Product categories</a></li>
-            				<li><a href="#" class="promotions">Promotions</a></li>
-                        </ul>
-                    </li>
-                  <li><h3><a href="#" class="user">Users</a></h3>
-          				<ul>
-                            <li><a href="#" class="useradd">Add user</a></li>
-                            <li><a href="#" class="group">User groups</a></li>
-            				<li><a href="#" class="search">Find user</a></li>
-                            <li><a href="#" class="online">Users online</a></li>
-                        </ul>
-                    </li>
-				</ul>       
-          </div>
-      </div>
-        <div id="footer">
-        <div id="credits">
-   		Template by <a href="http://www.bloganje.com">Bloganje</a>
-        </div>
-        <div id="styleswitcher">
-            <ul>
-                <li><a href="javascript: document.cookie='theme='; window.location.reload();" title="Default" id="defswitch">d</a></li>
-                <li><a href="javascript: document.cookie='theme=1'; window.location.reload();" title="Blue" id="blueswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=2'; window.location.reload();" title="Green" id="greenswitch">g</a></li>
-                <li><a href="javascript: document.cookie='theme=3'; window.location.reload();" title="Brown" id="brownswitch">b</a></li>
-                <li><a href="javascript: document.cookie='theme=4'; window.location.reload();" title="Mix" id="mixswitch">m</a></li>
-            </ul>
-        </div><br />
-
-        </div>
-</div>
-</body>
-</html>

common.php

@@ -21,17 +21,16 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.3
  * @link      http://my-aac.org
  */
 session_start();
 
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.2.3');
-define('DATABASE_VERSION', 3);
+define('MYAAC_VERSION', '0.7.5');
+define('DATABASE_VERSION', 20);
 define('TABLE_PREFIX', 'myaac_');
 define('START_TIME', microtime(true));
-define('MYAAC_OS', (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'WINDOWS' : 'LINUX');
+define('MYAAC_OS', (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'WINDOWS' : (strtoupper(PHP_OS) == 'DARWIN' ? 'MAC' : 'LINUX'));
 
 // account flags
 define('FLAG_ADMIN', 1);
@@ -43,10 +42,14 @@ define('FLAG_CONTENT_FORUM', 32);
 define('FLAG_CONTENT_COMMANDS', 64);
 define('FLAG_CONTENT_SPELLS', 128);
 define('FLAG_CONTENT_MONSTERS', 256);
+define('FLAG_CONTENT_GALLERY', 512);
+define('FLAG_CONTENT_VIDEOS', 1024);
+define('FLAG_CONTENT_FAQ', 2048);
+define('FLAG_CONTENT_MENUS', 4096);
 
 // news
 define('NEWS', 1);
-define('TICKET', 2);
+define('TICKER', 2);
 define('ARTICLE', 3);
 
 // directories
@@ -57,8 +60,18 @@ define('CACHE', SYSTEM . 'cache/');
 define('LOCALE', SYSTEM . 'locale/');
 define('LIBS', SYSTEM . 'libs/');
 define('LOGS', SYSTEM . 'logs/');
+define('PAGES', SYSTEM . 'pages/');
 define('PLUGINS', BASE . 'plugins/');
 define('TEMPLATES', BASE . 'templates/');
+define('TOOLS', BASE . 'tools/');
+
+// menu categories
+define('MENU_CATEGORY_NEWS', 1);
+define('MENU_CATEGORY_ACCOUNT', 2);
+define('MENU_CATEGORY_COMMUNITY', 3);
+define('MENU_CATEGORY_FORUM', 4);
+define('MENU_CATEGORY_LIBRARY', 5);
+define('MENU_CATEGORY_SHOP', 6);
 
 // otserv versions
 define('OTSERV', 1);
@@ -81,12 +94,15 @@ $basedir = str_replace('/admin', '', $basedir);
 $basedir = str_replace('/install', '', $basedir);
 define('BASE_DIR', $basedir);
 
-if(isset($_SERVER['HTTPS'][0]) && $_SERVER['HTTPS'] == 'on')
-	define('SERVER_URL', 'https://' . $_SERVER['HTTP_HOST']);
-else
-	define('SERVER_URL', 'http://' . $_SERVER['HTTP_HOST']);
-
-define('BASE_URL', SERVER_URL . BASE_DIR . '/');
-define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');
-//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
+if(isset($_SERVER['HTTP_HOST'])) {
+	if (isset($_SERVER['HTTPS'][0]) && $_SERVER['HTTPS'] == 'on')
+		define('SERVER_URL', 'https://' . $_SERVER['HTTP_HOST']);
+	else
+		define('SERVER_URL', 'http://' . $_SERVER['HTTP_HOST']);
+	
+	define('BASE_URL', SERVER_URL . BASE_DIR . '/');
+	define('ADMIN_URL', SERVER_URL . BASE_DIR . '/admin/');
+	
+	//define('CURRENT_URL', BASE_URL . $_SERVER['REQUEST_URI']);
+}
 ?>

config.php

@@ -13,7 +13,6 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.3
  * @link      http://my-aac.org
  */
 
@@ -30,11 +29,13 @@ $config = array(
 	// used for the Downloads page and some templates aswell
 	'client' => 1098, // 954 = client 9.54
 
+	'session_prefix' => 'myaac_', // must be unique for every site on your server
 	'friendly_urls' => false, // mod_rewrite is required for this, it makes links looks more elegant to eye, and also are SEO friendly (example: http://my-aac.org/guilds/Testing instead of http://my-aac.org/?subtopic=guilds&name=Testing). Remember to rename .htaccess.dist to .htaccess
 	'gzip_output' => false, // gzip page content before sending it to the browser, uses less bandwidth but more cpu cycles
 
 	// gesior backward support (templates & pages)
 	// allows using gesior templates and pages with myaac
+	// might bring some performance when disabled
 	'backward_support' => true,
 
 	// head options (html)
@@ -45,7 +46,7 @@ $config = array(
 	// footer
 	'footer' => ''/*'<br/>Your Server &copy; 2016. All rights reserved.'*/,
 
-	'debug_level' => 0, // 0 - disabled, 1 - show load time, 2 - show db query counter, 3 - both, 4 - memory usage, 5 - load time & load time, 6 - queries & memory usage, 7 - all
+	'debug_level' => 0, // 0 - disabled, 1 - show load time, 2 - show db query counter, 3 - both, 4 - memory usage, 5 - load time & memory usage, 6 - queries & memory usage, 7 - all
 
 	'language' => 'en', // default language (currently only 'en' available)
 	'language_allow_change' => false,
@@ -56,7 +57,7 @@ $config = array(
 
 	// cache system. by default file cache is used
 	'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
+	'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)
 	'database_host' => '',
@@ -65,16 +66,16 @@ $config = array(
 	'database_password' => '',
 	'database_name' => '',
 
-	// multiworld system
+	// multiworld system (only TFS 0.3)
 	'multiworld' => false, // use multiworld system?
 	'worlds' => array( // list of worlds
 		//'1' => 'Your World Name',
 		//'2' => 'Your Second World Name'
 	),
 
-	// items
+	// images
 	'outfit_images_url' => 'http://outfit-images.ots.me/outfit.php', // set to animoutfit.php for animated outfit
-	'item_images_url' => 'http://item-images.ots.me/960/', // 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)
@@ -85,6 +86,7 @@ $config = array(
 	'account_welcome_mail' => true, // send welcome email when user registers
 	'account_mail_change' => 2, // how many days user need to change email to account - block hackers
 	'account_country' => true, // user will be able to set country of origin when registering account, this information will be viewable in others places aswell
+	'account_country_recognize' => true, // should country of user be automatically recognized by his IP? This makes an external API call to http://ipinfo.io
 	'account_change_character_name' => false, // can user change their character name for premium points?
 	'account_change_character_name_points' => 30, // cost of name change
 	'account_change_character_sex' => false, // can user change their character sex for premium points?
@@ -108,7 +110,7 @@ $config = array(
 
 	// reCAPTCHA (prevent spam bots)
 	'recaptcha_enabled' => false, // enable recaptcha verification code
-	'recaptcha_site_key' => '', // get your own public and private keys at https://www.google.com/recaptcha
+	'recaptcha_site_key' => '', // get your own site and secret keys at https://www.google.com/recaptcha
 	'recaptcha_secret_key' => '',
 	'recaptcha_theme' => 'light', // light, dark
 
@@ -118,6 +120,12 @@ $config = array(
 	'send_mail_when_change_password' => true,	// send e-mail with new password when change password to account
 	'send_mail_when_generate_reckey' => true,	// send e-mail with rec key (key is displayed on page anyway when generate)
 
+	// genders (aka sex)
+	'genders' => array(
+		0 => 'Female',
+		1 => 'Male'
+	),
+	
 	// new character config
 	'character_samples' => array( // vocations, format: ID_of_vocation => 'Name of Character to copy'
 		//0 => 'Rook Sample',
@@ -150,7 +158,8 @@ $config = array(
 
 	'signature_enabled' => true,
 	'signature_type' => 'tibian', // signature engine to use: tibian, mango, gesior
-	'signature_cache_time' => 5, // how long to store cached file (in minutes)
+	'signature_cache_time' => 5, // how long to store cached file (in minutes), default 5 minutes
+	'signature_browser_cache' => 60, // how long to cache by browser (in minutes), default 1 hour
 
 	// online page
 	'online_record' => true, // display players record?
@@ -177,6 +186,8 @@ $config = array(
 	'highscores_outfit' => true, // show player outfit?
 	'highscores_country_box' => false, // doesnt work yet! (not implemented)
 	'highscores_groups_hidden' => 4, // this group id and higher won't be shown on the highscores
+	'highscores_ids_hidden' => array(0), // this ids of players will be hidden on the highscores (should be ids of samples)
+	'highscores_length' => 100, // how many records per page on highscores
 
 	// characters page
 	'characters' => array( // what things to display on character view page (true/false in each option)
@@ -194,14 +205,17 @@ $config = array(
 	),
 
 	// news page
-	'news_limit' => 5, // limit of news on latest news page
+	'news_limit' => 5, // limit of news on the latest news page
 	'news_ticker_limit' => 5, // limit of news in tickers (mini news) (0 to disable)
 	'news_date_format' => 'j.n.Y', // check php manual date() function for more info about this
-	'news_author' => true,
+	'news_author' => true, // show author of the news
 
 	// gifts/shop system
 	'gifts_system' => false,
-
+	
+	// support/system
+	'bug_report' => true, // this configurable has no effect, its always enabled
+	
 	// forum
 	'forum' => 'site', // link to the server forum, set to "site" if you want to use build in forum system, otherwise leave empty if you aren't going to use any forum
 	'forum_level_required' => 0, // level required to post, 0 to disable
@@ -217,11 +231,13 @@ $config = array(
 	'status_port' => '',
 
 	// 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' => 5, // how many columns to display in experience table page. * experiencetable_rows, 5 = 500 (will show up to 500 level)
 	'experiencetable_rows' => 100, // till how many levels in one column
-
+	'date_timezone' => 'Europe/Berlin', // more info at http://php.net/manual/en/timezones.php
+	
 	'monsters' => array(),
 	'npc' => array()
 );

index.php

@@ -21,7 +21,6 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.3
  * @link      http://my-aac.org
  */
 
@@ -31,29 +30,145 @@
 // error_reporting(E_ALL);
 
 require_once('common.php');
-require_once(BASE . 'config.local.php');
+require_once(SYSTEM . 'functions.php');
 
+$uri = $_SERVER['REQUEST_URI'];
+
+$tmp = BASE_DIR;
+if(!empty($tmp))
+	$uri = str_replace(BASE_DIR . '/', '', $uri);
+else
+	$uri = str_replace_first('/', '', $uri);
+
+$uri = str_replace(array('index.php/', '?'), '', $uri);
+define('URI', $uri);
+
+if(preg_match("/^[A-Za-z0-9-_%\'+]+\.png$/i", $uri)) {
+	$tmp = explode('.', $uri);
+	$_REQUEST['name'] = urldecode($tmp[0]);
+	
+	chdir(TOOLS . 'signature');
+	include(TOOLS . 'signature/index.php');
+	exit();
+}
+else if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|php|zip|rar|gz|ttf|woff|ico)$/i", $_SERVER['REQUEST_URI'])) {
+	header("HTTP/1.0 404 Not Found");
+	exit;
+}
+
+require_once(BASE . 'config.local.php');
 if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
 {
 	header('Location: ' . BASE_URL . 'install/');
 	die('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
 }
 
+$found = false;
+if(empty($uri) || isset($_REQUEST['template'])) {
+	$_REQUEST['p'] = 'news';
+	$found = true;
+}
+else {
+	$tmp = strtolower($uri);
+	if(!preg_match('/[^A-z0-9_\-]/', $uri) && file_exists(SYSTEM . 'pages/' . $tmp . '.php')) {
+		$_REQUEST['p'] = $uri;
+		$found = true;
+	}
+	else {
+		$rules = array(
+			'/^account\/manage\/?$/' => array('subtopic' => 'accountmanagement'),
+			'/^account\/create\/?$/' => array('subtopic' => 'createaccount'),
+			'/^account\/lost\/?$/' => array('subtopic' => 'lostaccount'),
+			'/^account\/logout\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'logout'),
+			'/^account\/password\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_password'),
+			'/^account\/register\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register'),
+			'/^account\/register\/new\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'register_new'),
+			'/^account\/email\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_email'),
+			'/^account\/info\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_info'),
+			'/^account\/character\/create\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'create_character'),
+			'/^account\/character\/name\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_name'),
+			'/^account\/character\/sex\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_sex'),
+			'/^account\/character\/delete\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'delete_character'),
+			'/^account\/character\/comment\/[A-Za-z0-9-_%+\']+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment', 'name' => '$3'),
+			'/^account\/character\/comment\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'change_comment'),
+			'/^account\/confirm_email\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'confirm_email', 'v' => '$2'),
+			'/^characters\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'characters', 'name' => '$1'),
+			'/^changelog\/[0-9]+\/?$/' => array('subtopic' => 'changelog', 'page' => '$1'),
+			'/^commands\/add\/?$/' => array('subtopic' => 'commands', 'action' => 'add'),
+			'/^commands\/edit\/?$/' => array('subtopic' => 'commands', 'action' => 'edit'),
+			'/^faq\/add\/?$/' => array('subtopic' => 'faq', 'action' => 'add'),
+			'/^faq\/edit\/?$/' => array('subtopic' => 'faq', 'action' => 'edit'),
+			'/^forum\/add_board\/?$/' => array('subtopic' => 'forum', 'action' => 'add_board'),#
+			'/^forum\/edit_board\/?$/' => array('subtopic' => 'forum', 'action' => 'edit_board'),
+			'/^forum\/board\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2'),
+			'/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2', 'page' => '$3'),
+			'/^forum\/thread\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2'),
+			'/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2', 'page' => '$3'),
+			'/^gallery\/add\/?$/' => array('subtopic' => 'gallery', 'action' => 'add'),
+			'/^gallery\/edit\/?$/' => array('subtopic' => 'gallery', 'action' => 'edit'),
+			'/^gallery\/[0-9]+\/?$/' => array('subtopic' => 'gallery', 'image' => '$1'),
+			'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+			'/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'),
+			'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2', 'page' => '$3'),
+			'/^highscores\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'page' => '$2'),
+			'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2'),
+			'/^highscores\/[A-Za-z0-9-_\']+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1'),
+			'/^news\/add\/?$/' => array('subtopic' => 'news', 'action' => 'add'),
+			'/^news\/edit\/?$/' => array('subtopic' => 'news', 'action' => 'edit'),
+			'/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'),
+			'/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'),
+			'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1'),
+			'/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'spells', 'vocation' => '$1', 'order' => '$2'),
+			'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+		);
+		
+		foreach($rules as $rule => $redirect) {
+			if (preg_match($rule, $uri)) {
+				$tmp = explode('/', $uri);
+				foreach($redirect as $key => $value) {
+					
+					if(strpos($value, '$') !== false) {
+						$value = str_replace('$' . $value[1], $tmp[$value[1]], $value);
+					}
+					
+					$_REQUEST[$key] = $value;
+					$_GET[$key] = $value;
+				}
+				
+				$found = true;
+				break;
+			}
+		}
+	}
+}
+
 // define page visited, so it can be used within events system
-$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_GET['p']) ? $_GET['p'] : '');
-if(empty($page) || preg_match('/[^A-z0-9_\-]/', $page))
-	$page = 'news';
+$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_REQUEST['p']) ? $_REQUEST['p'] : '');
+if(empty($page) || !preg_match('/^[A-z0-9\_\-]+$/', $page)) {
+	$tmp = URI;
+	if(!empty($tmp)) {
+		$page = $tmp;
+	}
+	else {
+		if(!$found)
+			$page = '404';
+		else
+			$page = 'news';
+	}
+}
 
 $page = strtolower($page);
 define('PAGE', $page);
 
 $template_place_holders = array();
 
-require_once(SYSTEM . 'functions.php');
 require_once(SYSTEM . 'init.php');
+require_once(SYSTEM . 'template.php');
 require_once(SYSTEM . 'login.php');
 require_once(SYSTEM . 'status.php');
-require_once(SYSTEM . 'template.php');
+
+$twig->addGlobal('config', $config);
+$twig->addGlobal('status', $status);
 
 // database migrations
 $tmp = '';
@@ -61,7 +176,10 @@ if(fetchDatabaseConfig('database_version', $tmp)) { // we got version
 	$tmp = (int)$tmp;
 	if($tmp < DATABASE_VERSION) { // import if older
 		for($i = $tmp + 1; $i <= DATABASE_VERSION; $i++) {
-			require(SYSTEM . 'migrations/' . $i . '.php');
+			$file = SYSTEM . 'migrations/' . $i . '.php';
+			if(file_exists($file)) {
+				require($file);
+			}
 		}
 		
 		updateDatabaseConfig('database_version', DATABASE_VERSION);
@@ -81,6 +199,41 @@ $hooks = new Hooks();
 $hooks->load();
 $hooks->trigger(HOOK_STARTUP);
 
+// anonymous usage statistics
+// sent only when user agrees
+if(isset($config['anonymous_usage_statistics']) && $config['anonymous_usage_statistics']) {
+	$report_time = 30 * 24 * 60 * 60; // report one time per 30 days
+	$should_report = true;
+	
+	$value = '';
+	if($cache->enabled() && $cache->fetch('last_usage_report', $value)) {
+		$should_report = time() > (int)$value + $report_time;
+	}
+	else {
+		$value = '';
+		if(fetchDatabaseConfig('last_usage_report', $value)) {
+			$should_report = time() > (int)$value + $report_time;
+			if($cache->enabled()) {
+				$cache->set('last_usage_report', $value);
+			}
+		}
+		else {
+			registerDatabaseConfig('last_usage_report', time() - ($report_time - (7 * 24 * 60 * 60))); // first report after a week
+			$should_report = false;
+		}
+	}
+	
+	if($should_report) {
+		require_once(LIBS . 'usage_statistics.php');
+		Usage_Statistics::report();
+		
+		updateDatabaseConfig('last_usage_report', time());
+		if($cache->enabled()) {
+			$cache->set('last_usage_report', time());
+		}
+	}
+}
+
 if($config['views_counter'])
 	require_once(SYSTEM . 'counter.php');
 
@@ -126,6 +279,7 @@ if($config['backward_support']) {
 	$layout_header = template_header();
 	$layout_name = $template_path;
 	$news_content = '';
+	$tickers_content = '';
 	$subtopic = PAGE;
 	$main_content = '';
 	
@@ -150,7 +304,7 @@ if($config['backward_support']) {
 	$config['site']['screenshot_page'] = true;
 	
 	if($config['forum'] != '')
-		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? internalLayoutLink('forum') : $config['forum']);
+		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? getLink('forum') : $config['forum']);
 
 	foreach($status as $key => $value)
 		$config['status']['serverStatus_' . $key] = $value;
@@ -165,58 +319,65 @@ if($load_it)
 		require(SYSTEM . 'compat_pages.php');
 
 	$ignore = false;
-	$file = SYSTEM . 'pages/' . $page . '.php';
-	if(!@file_exists($file))
+
+	$logged_access = 1;
+	if($logged && $account_logged && $account_logged->isLoaded()) {
+		$logged_access = $account_logged->getAccess();
+	}
+
+	$query =
+		$db->query(
+			'SELECT `id`, `title`, `body`, `php`, `hidden`' .
+			' FROM `' . TABLE_PREFIX . 'pages`' .
+			' WHERE `name` LIKE ' . $db->quote($page) . ' AND `hidden` != 1 AND `access` <= ' . $db->quote($logged_access));
+	if($query->rowCount() > 0) // found page
 	{
-		$logged_access = 0;
-		if($logged && $account_logged && $account_logged->isLoaded()) {
-			$logged_access = $account_logged->getAccess();
-		}
+		$ignore = true;
+		$query = $query->fetch();
+		$title = $query['title'];
 
-		$query =
-			$db->query(
-				'SELECT `title`, `body`, `php`' .
-				' FROM `' . TABLE_PREFIX . 'pages`' .
-				' WHERE `name` LIKE ' . $db->quote($page) . ' AND `hidden` != 1 AND `access` <= ' . $db->quote($logged_access));
-		if($query->rowCount() > 0) // found page
+		if($query['php'] == '1') // execute it as php code
 		{
-			$ignore = true;
-			$query = $query->fetch();
-			$title = $query['title'];
-
-			if($query['php'] == '1') // execute it as php code
-			{
-				$tmp = substr($query['body'], 0, 10);
-				if(($pos = strpos($tmp, '<?php')) !== false) {
-					$tmp = preg_replace('/<\?php/', '', $query['body'], 1);
-				}
-				else if(($pos = strpos($tmp, '<?')) !== false) {
-					$tmp = preg_replace('/<\?/', '', $query['body'], 1);
-				}
-				else
-					$tmp = $query['body'];
-
-				$php_errors = array();
-				function error_handler($errno, $errstr) {
-					global $php_errors;
-					$php_errors[] = array('errno' => $errno, 'errstr' => $errstr);
-				}
-				set_error_handler('error_handler');
-
-				ob_start();
-				eval($tmp);
-				$content .= ob_get_contents();
-				ob_end_clean();
-
-				restore_error_handler();
-				if(isset($php_errors[0]) && superAdmin()) {
-					var_dump($php_errors);
-				}
+			$tmp = substr($query['body'], 0, 10);
+			if(($pos = strpos($tmp, '<?php')) !== false) {
+				$tmp = preg_replace('/<\?php/', '', $query['body'], 1);
+			}
+			else if(($pos = strpos($tmp, '<?')) !== false) {
+				$tmp = preg_replace('/<\?/', '', $query['body'], 1);
 			}
 			else
-				$content .= $query['body']; // plain html
+				$tmp = $query['body'];
+
+			$php_errors = array();
+			function error_handler($errno, $errstr) {
+				global $php_errors;
+				$php_errors[] = array('errno' => $errno, 'errstr' => $errstr);
+			}
+			set_error_handler('error_handler');
+
+			ob_start();
+			eval($tmp);
+			$content .= ob_get_contents();
+			ob_end_clean();
+
+			restore_error_handler();
+			if(isset($php_errors[0]) && superAdmin()) {
+				var_dump($php_errors);
+			}
 		}
 		else
+			$content .= $query['body']; // plain html
+		
+		if(hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
+			$content = $twig->render('admin.pages.links.html.twig', array(
+				'page' => array('id' => $query['id'], 'hidden' => $query['hidden'])
+			)) . $content;
+		}
+	}
+	else
+	{
+		$file = SYSTEM . 'pages/' . $page . '.php';
+		if(!@file_exists($file))
 		{
 			$page = '404';
 			$file = SYSTEM . 'pages/404.php';

install/includes/config.php

@@ -1,12 +1,17 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
 
+if(!isset($_SESSION['var_server_path'])) {
+	error($locale['step_database_error_config']);
+	$error = true;
+}
+
 	$config['server_path'] = $_SESSION['var_server_path'];
 	// take care of trailing slash at the end
 	if($config['server_path'][strlen($config['server_path']) - 1] != '/')
 		$config['server_path'] .= '/';
 
-	if(!file_exists($config['server_path'] . 'config.lua')) {
+if((!isset($error) || !$error) && !file_exists($config['server_path'] . 'config.lua')) {
 		error($locale['step_database_error_config']);
 		$error = true;
 	}

install/includes/functions.php

@@ -28,17 +28,17 @@ function ini_get_bool($a)
 
 	switch (strtolower($b))
 	{
-	case 'on':
-	case 'yes':
-	case 'true':
-		return 'assert.active' !== $a;
+		case 'on':
+		case 'yes':
+		case 'true':
+			return 'assert.active' !== $a;
 
-	case 'stdout':
-	case 'stderr':
-		return 'display_errors' === $a;
+		case 'stdout':
+		case 'stderr':
+			return 'display_errors' === $a;
 
-	default:
-		return (bool) (int) $b;
+		default:
+			return (bool) (int) $b;
 	}
 }
 
@@ -62,9 +62,9 @@ function next_buttons($previous = true, $next = true)
 		$ret .= '<input class="button" type="submit" onclick="document.getElementById(\'step\').value=\'' . $steps[$i + 1] . '\';" value="' . $locale['next'] . '" />';
 */
 	if($previous)
-		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i - 1] . '\'; this.form.submit();" value="' . $locale['previous'] . '" />';
+		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i - 1] . '\'; this.form.submit();" value="&laquo; ' . $locale['previous'] . '" />';
 	if($next)
-		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i + 1] . '\'; this.form.submit();" value="' . $locale['next'] . '" />';
+		$ret .= '<input type="button" class="button" onclick="document.getElementById(\'step\').value=\'' . $steps[$i + 1] . '\'; this.form.submit(); " value="' . $locale['next'] . ' &raquo;" />';
 
 	$ret .= '</div>';
 	return $ret;
@@ -78,4 +78,23 @@ function next_form($previous = true, $next = true)
 	<input type="hidden" name="step" id="step" value="' . $step . '" />' . next_buttons($previous, $next) . '
 </form>';
 }
-?>
+
+function win_is_writable($path) {
+	if($path[strlen( $path ) - 1] == '/') { // if it looks like a directory, check a random file within the directory
+		return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
+	} elseif(is_dir( $path )) { // If it's a directory (and not a file) check a random file within the directory
+		return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+	}
+
+	// check tmp file for read/write capabilities
+	$should_delete_tmp_file = !file_exists( $path );
+	$f = @fopen( $path, 'a' );
+	if ( $f === false )
+		return false;
+
+	fclose( $f );
+	if($should_delete_tmp_file)
+		unlink($path);
+
+	return true;
+}

install/includes/schema.sql

@@ -1,26 +1,37 @@
 CREATE TABLE `myaac_account_actions`
 (
-  `account_id` INT(11) NOT NULL,
-  `ip` INT(11) NOT NULL DEFAULT 0,
-  `ipv6` BINARY(16) NOT NULL DEFAULT 0,
-  `date` INT(11) NOT NULL DEFAULT 0,
-  `action` VARCHAR(255) NOT NULL DEFAULT '',
-  KEY (`account_id`)
+	`account_id` INT(11) NOT NULL,
+	`ip` INT(11) NOT NULL DEFAULT 0,
+	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
+	`action` VARCHAR(255) NOT NULL DEFAULT '',
+	KEY (`account_id`)
+) ENGINE = MyISAM;
+
+CREATE TABLE `myaac_admin_menu`
+(
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`page` VARCHAR(255) NOT NULL DEFAULT '',
+	`ordering` INT(11) NOT NULL DEFAULT 0,
+	`flags` INT(11) NOT NULL DEFAULT 0,
+	`enabled` INT(1) NOT NULL DEFAULT 1,
+	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_bugtracker`
 (
 	`account` VARCHAR(255) NOT NULL,
-	`type` INT(11) NOT NULL,
-	`status` INT(11) NOT NULL,
+	`type` INT(11) NOT NULL DEFAULT 0,
+	`status` INT(11) NOT NULL DEFAULT 0,
 	`text` text NOT NULL,
-	`id` INT(11) NOT NULL,
-	`subject` VARCHAR(255) NOT NULL,
-	`reply` INT(11) NOT NULL,
-	`who` INT(11) NOT NULL,
+	`id` INT(11) NOT NULL DEFAULT 0,
+	`subject` VARCHAR(255) NOT NULL DEFAULT '',
+	`reply` INT(11) NOT NULL DEFAULT 0,
+	`who` INT(11) NOT NULL DEFAULT 0,
 	`uid` INT(11) NOT NULL AUTO_INCREMENT,
-	`tag` INT(11) NOT NULL,
-	PRIMARY KEY  (`uid`)
+	`tag` INT(11) NOT NULL DEFAULT 0,
+	PRIMARY KEY (`uid`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_changelog`
@@ -67,21 +78,23 @@ CREATE TABLE `myaac_faq`
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-CREATE TABLE `myaac_forum_sections`
+CREATE TABLE `myaac_forum_boards`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`name` VARCHAR(32) NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`ordering` INT(11) NOT NULL DEFAULT 0,
+	`guild` INT(11) NOT NULL DEFAULT 0,
+	`access` INT(11) NOT NULL DEFAULT 0,
 	`closed` TINYINT(1) NOT NULL DEFAULT 0,
 	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`, `closed`) VALUES (NULL, 'News', 'News commenting', 1);
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Trade', 'Trade offers.');
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Quests', 'Quest making.');
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Pictures', 'Your pictures.');
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Bug Report', 'Report bugs there.');
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Trade', 'Trade offers.', 1);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Quests', 'Quest making.', 2);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Pictures', 'Your pictures.', 3);
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Bug Report', 'Report bugs there.', 4);
 
 CREATE TABLE `myaac_forum`
 (
@@ -94,7 +107,7 @@ CREATE TABLE `myaac_forum`
 	`author_aid` int(20) NOT NULL default '0',
 	`author_guid` int(20) NOT NULL default '0',
 	`post_text` text NOT NULL,
-	`post_topic` varchar(255) NOT NULL,
+	`post_topic` varchar(255) NOT NULL DEFAULT '',
 	`post_smile` tinyint(1) NOT NULL default '0',
 	`post_date` int(20) NOT NULL default '0',
 	`last_edit_aid` int(20) NOT NULL default '0',
@@ -112,27 +125,121 @@ CREATE TABLE `myaac_hooks`
 	`name` VARCHAR(30) NOT NULL DEFAULT '',
 	`type` INT(2) NOT NULL DEFAULT 0,
 	`file` VARCHAR(100) NOT NULL,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
+	`enabled` INT(1) NOT NULL DEFAULT 1,
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
+CREATE TABLE `myaac_items`
+(
+	`id` INT(11) NOT NULL,
+	`article` VARCHAR(5) NOT NULL DEFAULT '',
+	`name` VARCHAR(50) NOT NULL DEFAULT '',
+	`plural` VARCHAR(50) NOT NULL DEFAULT '',
+	`attributes` VARCHAR(500) NOT NULL DEFAULT '',
+	PRIMARY KEY (`id`)
+) ENGINE = MyISAM;
+
+CREATE TABLE `myaac_menu`
+(
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`template` VARCHAR(255) NOT NULL,
+	`name` VARCHAR(255) NOT NULL,
+	`link` VARCHAR(255) NOT NULL,
+	`category` INT(11) NOT NULL DEFAULT 1,
+	`ordering` INT(11) NOT NULL DEFAULT 0,
+	`enabled` INT(1) NOT NULL DEFAULT 1,
+	PRIMARY KEY (`id`)
+) ENGINE = MyISAM;
+
+/* MENU_CATEGORY_NEWS kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Latest News', 'news', 1, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'News Archive', 'news/archive', 1, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Changelog', 'changelog', 1, 2);
+/* MENU_CATEGORY_ACCOUNT kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Account Management', 'account/manage', 2, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Create Account', 'account/create', 2, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Lost Account?', 'account/lost', 2, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Server Rules', 'rules', 2, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Downloads', 'downloads', 5, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Report Bug', 'bugtracker', 2, 5);
+/* MENU_CATEGORY_COMMUNITY kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Who is Online?', 'online', 3, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Characters', 'characters', 3, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Guilds', 'guilds', 3, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Highscores', 'highscores', 3, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Last Deaths', 'lastkills', 3, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Houses', 'houses', 3, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Bans', 'bans', 3, 6);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Forum', 'forum', 3, 7);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Team', 'team', 3, 8);
+/* MENU_CATEGORY_LIBRARY kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Monsters', 'creatures', 5, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Spells', 'spells', 5, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Server Info', 'serverInfo', 5, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Commands', 'commands', 5, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Gallery', 'gallery', 5, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Experience Table', 'experienceTable', 5, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'FAQ', 'faq', 5, 6);
+/* MENU_CATEGORY_SHOP kathrine */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Buy Points', 'points', 6, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Shop Offer', 'gifts', 6, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('kathrine', 'Shop History', 'gifts/history', 6, 2);
+/* MENU_CATEGORY_NEWS tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Latest News', 'news', 1, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'News Archive', 'news/archive', 1, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Changelog', 'changelog', 1, 2);
+/* MENU_CATEGORY_ACCOUNT tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Account Management', 'account/manage', 2, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Create Account', 'account/create', 2, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Lost Account?', 'account/lost', 2, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Server Rules', 'rules', 2, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Downloads', 'downloads', 2, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Report Bug', 'bugtracker', 2, 5);
+/* MENU_CATEGORY_COMMUNITY tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Characters', 'characters', 3, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Who Is Online?', 'online', 3, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Highscores', 'highscores', 3, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Last Kills', 'lastkills', 3, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Houses', 'houses', 3, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Guilds', 'guilds', 3, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Polls', 'polls', 3, 6);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Bans', 'bans', 3, 7);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Support List', 'team', 3, 8);
+/* MENU_CATEGORY_FORUM tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Forum', 'forum', 4, 0);
+/* MENU_CATEGORY_LIBRARY tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Creatures', 'creatures', 5, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Spells', 'spells', 5, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Commands', 'commands', 5, 2);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Exp Stages', 'experienceStages', 5, 3);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Gallery', 'gallery', 5, 4);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Server Info', 'serverInfo', 5, 5);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Experience Table', 'experienceTable', 5, 6);
+/* MENU_CATEGORY_SHOP tibiacom */
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Buy Points', 'points', 6, 0);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Shop Offer', 'gifts', 6, 1);
+INSERT INTO `myaac_menu` (`template`, `name`, `link`, `category`, `ordering`) VALUES ('tibiacom', 'Shop History', 'gifts/history', 6, 2);
+
 CREATE TABLE `myaac_monsters` (
-	`hide_creature` tinyint(1) NOT NULL default '0',
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`hidden` tinyint(1) NOT NULL default 0,
 	`name` varchar(255) NOT NULL,
-	`mana` int(11) NOT NULL,
+	`mana` int(11) NOT NULL DEFAULT 0,
 	`exp` int(11) NOT NULL,
 	`health` int(11) NOT NULL,
-	`speed_lvl` int(11) NOT NULL default '1',
+	`speed_lvl` int(11) NOT NULL default 1,
 	`use_haste` tinyint(1) NOT NULL,
 	`voices` text NOT NULL,
 	`immunities` varchar(255) NOT NULL,
 	`summonable` tinyint(1) NOT NULL,
 	`convinceable` tinyint(1) NOT NULL,
 	`race` varchar(255) NOT NULL,
-	`gfx_name` varchar(255) NOT NULL,
-	`file_path` varchar(255) NOT NULL
+	`loot` varchar(500) NOT NULL,
+	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-CREATE TABLE `myaac_movies`
+CREATE TABLE `myaac_videos`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`title` VARCHAR(100) NOT NULL DEFAULT '',
@@ -148,13 +255,15 @@ CREATE TABLE `myaac_news`
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`title` VARCHAR(100) NOT NULL,
 	`body` TEXT NOT NULL,
-	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - news, 2 - ticket, 3 - article',
+	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - news, 2 - ticker, 3 - article',
 	`date` INT(11) NOT NULL DEFAULT 0,
 	`category` TINYINT(1) NOT NULL DEFAULT 0,
 	`player_id` INT(11) NOT NULL DEFAULT 0,
 	`last_modified_by` INT(11) NOT NULL DEFAULT 0,
 	`last_modified_date` INT(11) NOT NULL DEFAULT 0,
-	`comments` VARCHAR(50) NOT NULL,
+	`comments` VARCHAR(50) NOT NULL DEFAULT '',
+	`article_text` VARCHAR(300) NOT NULL DEFAULT '',
+	`article_image` VARCHAR(100) NOT NULL DEFAULT '',
 	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
@@ -174,15 +283,13 @@ INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 1);
 INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 2);
 INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 3);
 INSERT INTO `myaac_news_categories` (`id`, `icon_id`) VALUES (NULL, 4);
-INSERT INTO `myaac_news` (`id`, `type`, `date`, `category`, `title`, `body`, `player_id`, `comments`, `hidden`) VALUES (NULL, '1', UNIX_TIMESTAMP(), '2', 'Hello!', 'MyAAC is just READY to use!', 'slawkens', 'http://my-aac.org', '0');
-INSERT INTO `myaac_news` (`id`, `type`, `date`, `category`, `title`, `body`, `player_id`, `comments`, `hidden`) VALUES (NULL, '2', UNIX_TIMESTAMP(), '4', 'Hello tickets!', 'http://my-aac.org', 'slawkens', '', '0');
 
 CREATE TABLE `myaac_notepad`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`account_id` INT(11) NOT NULL,
 	/*`name` VARCHAR(30) NOT NULL,*/
-	`content` TEXT NOT NULL DEFAULT '',
+	`content` TEXT NOT NULL,
 	/*`public` TINYINT(1) NOT NULL DEFAULT 0*/
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
@@ -201,10 +308,9 @@ CREATE TABLE `myaac_pages`
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-CREATE TABLE `myaac_screenshots`
+CREATE TABLE `myaac_gallery`
 (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`name` VARCHAR(30) NOT NULL,
 	`comment` VARCHAR(255) NOT NULL DEFAULT '',
 	`image` VARCHAR(255) NOT NULL,
 	`thumb` VARCHAR(255) NOT NULL,
@@ -214,7 +320,7 @@ CREATE TABLE `myaac_screenshots`
 	PRIMARY KEY (`id`)
 ) ENGINE = MyISAM;
 
-INSERT INTO `myaac_screenshots` (`id`, `ordering`, `name`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'Demon', 'images/screenshots/demon.jpg', 'images/screenshots/demon_thumb.gif', 'MyAAC');
+INSERT INTO `myaac_gallery` (`id`, `ordering`, `comment`, `image`, `thumb`, `author`) VALUES (NULL, 1, 'Demon', 'images/gallery/demon.jpg', 'images/gallery/demon_thumb.gif', 'MyAAC');
 
 CREATE TABLE `myaac_spells`
 (
@@ -223,18 +329,18 @@ CREATE TABLE `myaac_spells`
 	`name` VARCHAR(255) NOT NULL,
 	`words` VARCHAR(255) NOT NULL,
 	`category` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - attack, 2 - healing, 3 - summon, 4 - supply, 5 - support',
-	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - rune',
+	`type` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 - instant, 2 - conjure, 3 - rune',
 	`level` INT(11) NOT NULL DEFAULT 0,
 	`maglevel` INT(11) NOT NULL DEFAULT 0,
 	`mana` INT(11) NOT NULL DEFAULT 0,
 	`soul` TINYINT(3) NOT NULL DEFAULT 0,
 	`conjure_count` TINYINT(3) NOT NULL DEFAULT 0,
+	`item_id` INT(11) NOT NULL DEFAULT 0,
 	`premium` TINYINT(1) NOT NULL DEFAULT 0,
-	`vocations` VARCHAR(32) NOT NULL,
-	`cities` VARCHAR(32) NOT NULL,
+	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
 	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
-	UNIQUE (`spell`)
+	UNIQUE (`name`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_visitors`
@@ -243,4 +349,13 @@ CREATE TABLE `myaac_visitors`
 	`lastvisit` INT(11) NOT NULL DEFAULT 0,
 	`page` VARCHAR(100) NOT NULL,
 	UNIQUE (`ip`)
-) ENGINE = MyISAM;
+) ENGINE = MyISAM;
+
+CREATE TABLE `myaac_weapons`
+(
+	`id` INT(11) NOT NULL,
+	`level` INT(11) NOT NULL DEFAULT 0,
+	`maglevel` INT(11) NOT NULL DEFAULT 0,
+	`vocations` VARCHAR(100) NOT NULL DEFAULT '',
+	PRIMARY KEY (`id`)
+) ENGINE = MyISAM;

install/includes/twig_error.html

@@ -0,0 +1,11 @@
+We have detected that you don't have access to write to the system/cache directory. Under linux you can fix it by using this two command, where first one should be enough (for apache):<br/><br/><span class="console">chown -R www-data.www-data /var/www/*</span><br/><span class="console">chmod -R 660 system/cache</span>
+
+<style type="text/css">
+.console {
+	font-family:Courier;
+	color: #CCCCCC;
+	background: #000000;
+	border: 3px double #CCCCCC;
+	padding: 0px;
+}
+</style>

install/index.php

@@ -1,48 +1,109 @@
 <?php
 require('../common.php');
 
-// step
-$step = isset($_POST['step']) ? $_POST['step'] : 'welcome';
-
 // includes
 require(SYSTEM . 'functions.php');
 require(BASE . 'install/includes/functions.php');
 require(BASE . 'install/includes/locale.php');
 require(BASE . 'config.local.php');
 
+// twig
+require_once LIBS . 'Twig/Autoloader.php';
+Twig_Autoloader::register();
+
+$twig_loader = new Twig_Loader_Filesystem(SYSTEM . 'templates');
+$twig = new Twig_Environment($twig_loader, array(
+	'cache' => CACHE . 'twig/',
+	'auto_reload' => true
+));
+
 if(isset($_POST['vars']))
 {
 	foreach($_POST['vars'] as $key => $value)
 		$_SESSION['var_' . $key] = $value;
 }
 
+// step
+$step = isset($_POST['step']) ? $_POST['step'] : 'welcome';
+
 $steps = array(1 => 'welcome', 2 => 'license', 3 => 'requirements', 4 => 'config', 5 => 'database', 6 => 'admin', 7 => 'finish');
 if(!in_array($step, $steps)) // check if step is valid
 	die('ERROR: Unknown step.');
 
+$errors = array();
 if($step == 'database')
 {
 	foreach($_POST['vars'] as $key => $value)
 	{
-		if(empty($value))
+		if($key != 'usage' && empty($value))
 		{
-			$step = 'config';
-			$errors = '<p class="error">' . $locale['please_fill_all'] . '</p>';
+			$errors[] = $locale['please_fill_all'];
 			break;
 		}
+		else if($key == 'mail_admin' && !Validator::email($value))
+		{
+			$errors[] = $locale['step_config_mail_admin_error'];
+			break;
+		}
+		else if($key == 'mail_address' && !Validator::email($value))
+		{
+			$errors[] = $locale['step_config_mail_address_error'];
+			break;
+		}
+	}
+
+	if(!empty($errors)) {
+		$step = 'config';
+	}
+}
+else if($step == 'finish') {
+	// password
+	$password = $_SESSION['var_password'];
+
+	if(isset($_SESSION['var_account'])) {
+		if(!Validator::accountName($_SESSION['var_account'])) {
+			$errors[] = $locale['step_admin_account_error_format'];
+		}
+		else if(strtoupper($_SESSION['var_account']) == strtoupper($password)) {
+			$errors[] = $locale['step_admin_account_error_same'];
+		}
+	}
+	else if(isset($_SESSION['var_account_id'])) {
+		if(!Validator::accountId($_SESSION['var_account_id'])) {
+			$errors[] = $locale['step_admin_account_id_error_format'];
+		}
+		else if($_SESSION['var_account_id'] == $password) {
+			$errors[] = $locale['step_admin_account_id_error_same'];
+		}
+	}
+
+	if(empty($password)) {
+		$errors[] = $locale['step_admin_password_error_empty'];
+	}
+	else if(!Validator::password($password)) {
+		$errors[] = $locale['step_admin_password_error_format'];
+	}
+
+	if(!empty($errors)) {
+		$step = 'admin';
 	}
 }
 
 $error = false;
 
-// step include
-ob_start();
-require('steps/' . $step . '.php');
-$content = ob_get_contents();
-ob_end_clean();
+clearstatcache();
+if(is_writable(CACHE) && (MYAAC_OS != 'WINDOWS' || win_is_writable(CACHE))) {
+	ob_start();
+
+	$step_id = array_search($step, $steps);
+	require('steps/' . $step_id . '-' . $step . '.php');
+	$content = ob_get_contents();
+	ob_end_clean();
+}
+else {
+	$content = error(file_get_contents(BASE . 'install/includes/twig_error.html'), true);
+}
 
 // render
 require('template/template.php');
-//$_SESSION['laststep'] = $step;
-
-?>
+//$_SESSION['laststep'] = $step;

install/steps/1-welcome.php

@@ -0,0 +1,27 @@
+<?php
+defined('MYAAC') or die('Direct access not allowed!');
+if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
+	echo '<p class="warning">' . $locale['already_installed'] . '</p>';
+}
+else {
+	unset($_SESSION['saved']);
+	
+	$locales = array();
+	foreach(get_locales() as $tmp_locale)
+	{
+		$lang_file_main = LOCALE . $tmp_locale . '/main.php';
+		$lang_file_install = LOCALE . $tmp_locale . '/install.php';
+		if(@file_exists($lang_file_main)
+			&& @file_exists($lang_file_install))
+		{
+			require($lang_file_main);
+			$locales[] = array('id' => $tmp_locale, 'name' => $locale['name']);
+		}
+	}
+	echo $twig->render('install.welcome.html.twig', array(
+		'locales' => $locales,
+		'locale' => $locale,
+		'buttons' => next_buttons(false, true)
+	));
+}
+?>

install/steps/2-license.php

@@ -0,0 +1,8 @@
+<?php
+defined('MYAAC') or die('Direct access not allowed!');
+
+echo $twig->render('install.license.html.twig', array(
+	'license' => file_get_contents(BASE . 'LICENSE'),
+	'buttons' => next_buttons()
+));
+?>