* update to 0.6.1

* fixed forum move thread

.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 ^.*$ index.php [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]

CHANGELOG

@@ -1,3 +1,142 @@
+[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)
+
 [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

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.2.0 or later
 	- MySQL database
 	- PDO PHP Extension
 	- XML PHP Extension
@@ -27,7 +27,7 @@ Official website: http://my-aac.org
 			chmod 660 config.local.php
 			chmod 660 images/guilds
 			chmod 660 images/houses
-			chmod 660 images/screenshots
+			chmod 660 images/gallery
 
 	Visit http://your_domain/install (http://localhost/install) and follow instructions in the browser.
 

admin/index.php

@@ -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/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
@@ -78,6 +78,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 +100,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,17 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.2
+ * @version   0.6.1
  * @link      http://my-aac.org
  */
 session_start();
 
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.2.2');
+define('MYAAC_VERSION', '0.6.1');
-define('DATABASE_VERSION', 3);
+define('DATABASE_VERSION', 11);
 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,6 +43,9 @@ define('FLAG_CONTENT_FORUM', 32);
 define('FLAG_CONTENT_COMMANDS', 64);
 define('FLAG_CONTENT_SPELLS', 128);
 define('FLAG_CONTENT_MONSTERS', 256);
+define('FLAG_CONTENT_GALLERY', 512);
+define('FLAG_CONTENT_VIDEOS', 1024);
+define('FLAG_CONTENT_FAQ', 2048);
 
 // news
 define('NEWS', 1);
@@ -57,8 +60,10 @@ 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/');
 
 // otserv versions
 define('OTSERV', 1);

config.php

@@ -13,7 +13,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.2.2
+ * @version   0.6.1
  * @link      http://my-aac.org
  */
 
@@ -24,15 +24,19 @@ $config = array(
 	'template' => 'kathrine', // template used by website (kathrine, tibiacom)
 	'template_allow_change' => true, // allow users to choose their own template while browsing website?
 
+	'vocations_amount' => 4, // how much basic vocations your server got (without promotion)
+
 	// what client version are you using on this OT?
 	// 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)
@@ -43,7 +47,7 @@ $config = array(
 	// footer
 	'footer' => ''/*'<br/>Your Server &copy; 2016. All rights reserved.'*/,
 
-	'debug_level' => 0, // 0 - disabled, 1 - show load time, 2 - show db query counter, 3 - both, 4 - memory usage, 5 - load time & load time, 6 - queries & memory usage, 7 - all
+	'debug_level' => 0, // 0 - disabled, 1 - show load time, 2 - show db query counter, 3 - both, 4 - memory usage, 5 - load time & memory usage, 6 - queries & memory usage, 7 - all
 
 	'language' => 'en', // default language (currently only 'en' available)
 	'language_allow_change' => false,
@@ -54,7 +58,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' => '',
@@ -63,7 +67,7 @@ $config = array(
 	'database_password' => '',
 	'database_name' => '',
 
-	// multiworld system
+	// multiworld system (only TFS 0.3)
 	'multiworld' => false, // use multiworld system?
 	'worlds' => array( // list of worlds
 		//'1' => 'Your World Name',
@@ -83,6 +87,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?
@@ -116,6 +121,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',
@@ -148,7 +159,8 @@ $config = array(
 
 	'signature_enabled' => true,
 	'signature_type' => 'tibian', // signature engine to use: tibian, mango, gesior
-	'signature_cache_time' => 5, // how long to store cached file (in minutes)
+	'signature_cache_time' => 5, // how long to store cached file (in minutes), default 5 minutes
+	'signature_browser_cache' => 60, // how long to cache by browser (in minutes), default 1 hour
 
 	// online page
 	'online_record' => true, // display players record?
@@ -175,6 +187,7 @@ $config = array(
 	'highscores_outfit' => true, // show player outfit?
 	'highscores_country_box' => false, // doesnt work yet! (not implemented)
 	'highscores_groups_hidden' => 4, // this group id and higher won't be shown on the highscores
+	'highscores_length' => 100, // how many records per page on highscores
 
 	// characters page
 	'characters' => array( // what things to display on character view page (true/false in each option)
@@ -192,14 +205,17 @@ $config = array(
 	),
 
 	// news page
-	'news_limit' => 5, // limit of news on latest news page
+	'news_limit' => 5, // limit of news on the latest news page
 	'news_ticker_limit' => 5, // limit of news in tickers (mini news) (0 to disable)
 	'news_date_format' => 'j.n.Y', // check php manual date() function for more info about this
-	'news_author' => true,
+	'news_author' => true, // show author of the news
 
 	// gifts/shop system
 	'gifts_system' => false,
 	
+	// support/system
+	'bug_report' => true,
+
 	// forum
 	'forum' => 'site', // link to the server forum, set to "site" if you want to use build in forum system, otherwise leave empty if you aren't going to use any forum
 	'forum_level_required' => 0, // level required to post, 0 to disable
@@ -219,6 +235,7 @@ $config = array(
 	'google_analytics_id' => '', // e.g.: UA-XXXXXXX-X
 	'experiencetable_columns' => 5, // how many columns to display in experience table page. * experiencetable_rows, 5 = 500 (will show up to 500 level)
 	'experiencetable_rows' => 100, // till how many levels in one column
+	'date_timezone' => 'Europe/Berlin', // more info at http://php.net/manual/en/timezones.php
 	
 	'monsters' => array(),
 	'npc' => array()

index.php

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

install/includes/functions.php

@@ -28,17 +28,17 @@ function ini_get_bool($a)
 
 	switch (strtolower($b))
 	{
-	case 'on':
+		case 'on':
-	case 'yes':
+		case 'yes':
-	case 'true':
+		case 'true':
-		return 'assert.active' !== $a;
+			return 'assert.active' !== $a;
 
-	case 'stdout':
+		case 'stdout':
-	case 'stderr':
+		case 'stderr':
-		return 'display_errors' === $a;
+			return 'display_errors' === $a;
 
-	default:
+		default:
-		return (bool) (int) $b;
+			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;

install/includes/schema.sql

@@ -1,26 +1,37 @@
 CREATE TABLE `myaac_account_actions`
 (
-  `account_id` INT(11) NOT NULL,
+	`account_id` INT(11) NOT NULL,
-  `ip` INT(11) NOT NULL DEFAULT 0,
+	`ip` INT(11) NOT NULL DEFAULT 0,
-  `ipv6` BINARY(16) NOT NULL DEFAULT 0,
+	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
-  `date` INT(11) NOT NULL DEFAULT 0,
+	`date` INT(11) NOT NULL DEFAULT 0,
-  `action` VARCHAR(255) NOT NULL DEFAULT '',
+	`action` VARCHAR(255) NOT NULL DEFAULT '',
-  KEY (`account_id`)
+	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,
+	`type` INT(11) NOT NULL DEFAULT 0,
-	`status` INT(11) NOT NULL,
+	`status` INT(11) NOT NULL DEFAULT 0,
 	`text` text NOT NULL,
-	`id` INT(11) NOT NULL,
+	`id` INT(11) NOT NULL DEFAULT 0,
-	`subject` VARCHAR(255) NOT NULL,
+	`subject` VARCHAR(255) NOT NULL DEFAULT '',
-	`reply` INT(11) NOT NULL,
+	`reply` INT(11) NOT NULL DEFAULT 0,
-	`who` INT(11) NOT NULL,
+	`who` INT(11) NOT NULL DEFAULT 0,
 	`uid` INT(11) NOT NULL AUTO_INCREMENT,
-	`tag` INT(11) NOT NULL,
+	`tag` INT(11) NOT NULL DEFAULT 0,
-	PRIMARY KEY  (`uid`)
+	PRIMARY KEY (`uid`)
 ) ENGINE = MyISAM;
 
 CREATE TABLE `myaac_changelog`
@@ -67,7 +78,7 @@ 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,
@@ -77,11 +88,11 @@ CREATE TABLE `myaac_forum_sections`
 	`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_boards` (`id`, `name`, `description`, `ordering`, `closed`) VALUES (NULL, 'News', 'News commenting', 0, 1);
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Trade', 'Trade offers.');
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Trade', 'Trade offers.', 1);
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Quests', 'Quest making.');
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Quests', 'Quest making.', 2);
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Pictures', 'Your pictures.');
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Pictures', 'Your pictures.', 3);
-INSERT INTO `myaac_forum_sections` (`id`, `name`, `description`) VALUES (NULL, 'Bug Report', 'Report bugs there.');
+INSERT INTO `myaac_forum_boards` (`id`, `name`, `description`, `ordering`) VALUES (NULL, 'Bug Report', 'Report bugs there.', 4);
 
 CREATE TABLE `myaac_forum`
 (
@@ -112,10 +123,13 @@ 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_monsters` (
+	`id` int(11) NOT NULL AUTO_INCREMENT,
 	`hide_creature` tinyint(1) NOT NULL default '0',
 	`name` varchar(255) NOT NULL,
 	`mana` int(11) NOT NULL,
@@ -129,10 +143,11 @@ CREATE TABLE `myaac_monsters` (
 	`convinceable` tinyint(1) NOT NULL,
 	`race` varchar(255) NOT NULL,
 	`gfx_name` varchar(255) NOT NULL,
-	`file_path` varchar(255) NOT NULL
+	`file_path` varchar(255) 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 '',
@@ -174,15 +189,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 +214,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 +226,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`
 (
@@ -231,7 +243,6 @@ CREATE TABLE `myaac_spells`
 	`conjure_count` TINYINT(3) NOT NULL DEFAULT 0,
 	`premium` TINYINT(1) NOT NULL DEFAULT 0,
 	`vocations` VARCHAR(32) NOT NULL,
-	`cities` VARCHAR(32) NOT NULL,
 	`hidden` TINYINT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`id`),
 	UNIQUE (`spell`)

install/index.php

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

install/steps/admin.php

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

install/steps/config.php

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

install/steps/database.php

@@ -1,5 +1,6 @@
 <?php
 defined('MYAAC') or die('Direct access not allowed!');
+
 //ini_set('display_errors', false);
 ini_set('max_execution_time', 300);
 $error = false;
@@ -169,7 +170,7 @@ if(!$error) {
 			}
 
 			if(!fieldExist('description', 'guilds')) {
-				if(query("ALTER TABLE `guilds` ADD `description` TEXT NOT NULL DEFAULT '';"))
+				if(query("ALTER TABLE `guilds` ADD `description` TEXT NOT NULL;"))
 					success($locale['step_database_adding_field'] . ' guilds.description...');
 			}
 			
@@ -210,7 +211,7 @@ if(!$error) {
 			}
 			
 			if(!fieldExist('comment', 'players')) {
-				if(query("ALTER TABLE `players` ADD `comment` TEXT NOT NULL DEFAULT '';"))
+				if(query("ALTER TABLE `players` ADD `comment` TEXT NOT NULL;"))
 					success($locale['step_database_adding_field'] . ' players.comment...');
 			}
 		}
@@ -218,25 +219,21 @@ if(!$error) {
 		if(!$error && (!isset($_SESSION['saved']))) {
 			$content .= '$config[\'installed\'] = true;';
 			$content .= PHP_EOL;
-		//	if(strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) {
-		//		$content .= '$config[\'friendly_urls\'] = true;';
-		//		$content .= PHP_EOL;
-		//	}
 
 			$content .= '$config[\'mail_enabled\'] = true;';
 			$content .= PHP_EOL;
-			if(!check_mail($_SESSION['var_mail_admin'])) {
+			if(!Validator::email($_SESSION['var_mail_admin'])) {
 				error($locale['step_config_mail_admin_error']);
 				$error = true;
 			}
-			if(!check_mail($_SESSION['var_mail_address'])) {
+			if(!Validator::email($_SESSION['var_mail_address'])) {
 				error($locale['step_config_mail_address_error']);
 				$error = true;
 			}
 			
-			$content .= '$config[\'client_download\'] = \'http://clients.halfaway.net/windows.php?tibia=\'. $config[\'client\'];';
+			$content .= '$config[\'client_download\'] = \'http://tibia-clients.com/clients/download/\'. $config[\'client\'] . \'/exe/windows\';';
 			$content .= PHP_EOL;
-			$content .= '$config[\'client_download_linux\'] = \'http://clients.halfaway.net/linux.php?tibia=\'. $config[\'client\'];';
+			$content .= '$config[\'client_download_linux\'] = \'http://tibia-clients.com/clients/download/\'. $config[\'client\'] . \'/tar/linux\';';
 			$content .= PHP_EOL;
 			$content .= '// place for your configuration directives, so you can later easily update myaac';
 			$content .= PHP_EOL;

install/steps/finish.php

@@ -2,18 +2,15 @@
 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>';
+	warning($locale['already_installed']);
 }
 else {
 	require(SYSTEM . 'init.php');
-	//require(BASE . 'install/includes/config.php');
 	if(!$error) {
-		//require(BASE . 'install/includes/database.php');
-
 		if(USE_ACCOUNT_NAME)
-			$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : NULL;
+			$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : null;
 		else
-			$account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : NULL;
+			$account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : null;
 
 		$password = $_SESSION['var_password'];
 		
@@ -23,7 +20,7 @@ else {
 			$salt = generateRandomString(10, false, true, true);
 			$password = $salt . $password;
 		}
-
+/*
 		$account_db = new OTS_Account();
 		$account_db->load(1);
 		if($account_db->isLoaded()) {
@@ -38,24 +35,24 @@ else {
 			if(USE_ACCOUNT_NAME)
 				$new_account->create('dummy_account', 1);
 			else
-				$new_account->create(NULL, 1);
+				$new_account->create(null, 1);
 
 			$new_account->setPassword('for sample characters. ' . generateRandomString(10));
 			$new_account->save();
 		}
-			
+*/
 		$account_db = new OTS_Account();
 		if(isset($account))
 			$account_db->find($account);
 		else
 			$account_db->load($account_id);
 
-		$player_db = $ots->createObject('Player');
+		$player_db = new OTS_Player();
 		$player_db->find('Admin');
 		$groups = new OTS_Groups_List();
 		if(!$player_db->isLoaded())
 		{
-			$player = $ots->createObject('Player');
+			$player = new OTS_Player();
 			$player->setName('Admin');
 			
 			$player->setGroupId($groups->getHighestId());
@@ -81,10 +78,10 @@ else {
 			else
 				$player_db->setAccountId($account_db->getId());
 			
-			$_SESSION['account'] = $account_db->getId();
+			setSession('account', $account_db->getId());
 		}
 		else {
-			$new_account = $ots->createObject('Account');
+			$new_account = new OTS_Account();
 			$new_account->create($account);
 			
 			$new_account->setPassword(encrypt($password));
@@ -111,39 +108,99 @@ else {
 			else
 				$player_db->setAccountId($new_account->getId());
 			
-			$_SESSION['account'] = $new_account->getId();
+			setSession('account', $new_account->getId());
 		}
 
-		if($player_db->isLoaded())
-			$player_db->save();
-		else
-			$player->save();
-
 		success($locale['step_database_created_account']);
-		$_SESSION['password'] = encrypt($password);
+		setSession('password', encrypt($password));
-		$_SESSION['remember_me'] = true;
+		setSession('remember_me', true);
+
+		if($player_db->isLoaded()) {
+			$player_db->save();
+		}
+		else {
+			$player->save();
+		}
+
+		$player_id = 0;
+		$query = $db->query("SELECT `id` FROM `players` WHERE `name` = " . $db->quote('Admin') . ";");
+		if($query->rowCount() == 1) {
+			$query = $query->fetch();
+			$player_id = $query['id'];
+		}
+
+		if(query("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!', " . $player_id . ", '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', " . $player_id . ", '', '0');")) {
+			success($locale['step_database_created_news']);
+		}
 
 		$deleted = 'deleted';
 		if(fieldExist('deletion', 'players'))
 			$deleted = 'deletion';
 
-		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Rook Sample') . ' OR `name` = ' . $db->quote('Sorcerer Sample') . ' OR `name` = ' . $db->quote('Druid Sample') . ' OR `name` = ' . $db->quote('Paladin Sample') . ' OR `name` = ' . $db->quote('Knight Sample'));
+		$insert_into_players = "INSERT INTO `players` (`id`, `name`, `group_id`, `account_id`, `level`, `vocation`, `health`, `healthmax`, `experience`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `maglevel`, `mana`, `manamax`, `manaspent`, `soul`, `town_id`, `posx`, `posy`, `posz`, `conditions`, `cap`, `sex`, `lastlogin`, `lastip`, `save`, `lastlogout`, `balance`, `$deleted`, `created`, `hidden`, `comment`) VALUES ";
+		$success = true;
+
+		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Rook Sample'));
 		if($query->rowCount() == 0) {
-			if(query("INSERT INTO `players` (`id`, `name`, `group_id`, `account_id`, `level`, `vocation`, `health`, `healthmax`, `experience`, `lookbody`, `lookfeet`, `lookhead`, `looklegs`, `looktype`, `maglevel`, `mana`, `manamax`, `manaspent`, `soul`, `town_id`, `posx`, `posy`, `posz`, `conditions`, `cap`, `sex`, `lastlogin`, `lastip`, `save`, `lastlogout`, `balance`, `$deleted`, `created`, `hidden`, `comment`) VALUES
+			if(!query($insert_into_players . "(null, 'Rook Sample', 4, " . getSession('account') . ", 1, 0, 150, 150, 4200, 118, 114, 38, 57, 130, 0, 0, 0, 0, 100, 11, 2200, 1298, 7, '', 400, 1, 1255179613, 2453925456, 1, 1255179614, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
-	(null, 'Rook Sample', 1, 1, 8, 0, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179613, 2453925456, 1, 1255179614, 0, 1, UNIX_TIMESTAMP(), 1, ''),
+				$success = false;
-	(null, 'Sorcerer Sample', 1, 1, 8, 1, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179571, 2453925456, 1, 1255179612, 0, 1, UNIX_TIMESTAMP(), 1, ''),
+		}
-	(null, 'Druid Sample', 1, 1, 8, 2, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179655, 2453925456, 1, 1255179658, 0, 1, UNIX_TIMESTAMP(), 1, ''),
+
-	(null, 'Paladin Sample', 1, 1, 8, 3, 185, 185, 4200, 118, 114, 38, 57, 129, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179854, 2453925456, 1, 1255179858, 0, 1, UNIX_TIMESTAMP(), 1, ''),
+		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Sorcerer Sample'));
-	(null, 'Knight Sample', 1, 1, 8, 4, 185, 185, 4200, 118, 114, 38, 57, 131, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179620, 2453925456, 1, 1255179654, 0, 1, UNIX_TIMESTAMP(), 1, '');"))
+		if($query->rowCount() == 0) {
-				success($locale['step_database_imported_players']);
+			if(!query($insert_into_players . "(null, 'Sorcerer Sample', 4, " . getSession('account') . ", 8, 1, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179571, 2453925456, 1, 1255179612, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
+				$success = false;
+		}
+
+		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Druid Sample'));
+		if($query->rowCount() == 0) {
+			if(!query($insert_into_players . "(null, 'Druid Sample', 4, " . getSession('account') . ", 8, 2, 185, 185, 4200, 118, 114, 38, 57, 130, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179655, 2453925456, 1, 1255179658, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
+				$success = false;
+		}
+
+		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Paladin Sample'));
+		if($query->rowCount() == 0) {
+			if(!query($insert_into_players . "(null, 'Paladin Sample', 4, " . getSession('account') . ", 8, 3, 185, 185, 4200, 118, 114, 38, 57, 129, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179854, 2453925456, 1, 1255179858, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
+				$success = false;
+		}
+
+		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote('Knight Sample'));
+		if($query->rowCount() == 0) {
+			if(!query($insert_into_players . "(null, 'Knight Sample', 4, " . getSession('account') . ", 8, 4, 185, 185, 4200, 118, 114, 38, 57, 131, 0, 35, 35, 0, 100, 11, 2200, 1298, 7, '', 470, 1, 1255179620, 2453925456, 1, 1255179654, 0, 0, UNIX_TIMESTAMP(), 1, '');"))
+				$success = false;
+		}
+
+		if($success) {
+			success($locale['step_database_imported_players']);
+		}
+		
+		require(LIBS . 'creatures.php');
+		if(Creatures::loadFromXML()) {
+			success($locale['step_database_loaded_monsters']);
+			
+			if(Creatures::getMonstersList()->hasErrors()) {
+				$locale['step_database_error_monsters'] = str_replace('$LOG$', 'system/logs/error.log', $locale['step_database_error_monsters']);
+				warning($locale['step_database_error_monsters']);
+			}
+		}
+		else {
+			error(Creatures::getLastError());
+		}
+		
+		require(LIBS . 'spells.php');
+		if(Spells::loadFromXML()) {
+			success($locale['step_database_loaded_spells']);
+		}
+		else {
+			error(Spells::getLastError());
 		}
 
 		$locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(ADMIN_URL, $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
 		$locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(BASE_URL, $locale['step_finish_homepage'], true), $locale['step_finish_desc']);
 		$locale['step_finish_desc'] = str_replace('$LINK$', generateLink('http://my-aac.org', 'http://my-aac.org', true), $locale['step_finish_desc']);
-		?>
+
-		<p class="success"><?php echo $locale['step_finish_desc']; ?></p>
+		success($locale['step_finish_desc']);
-	<?php
 
 		if(!isset($_SESSION['installed'])) {
 			file_get_contents('http://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL));

install/steps/license.php

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

install/steps/requirements.php

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