* updated changelog

* fixed some bug when you uninstall and then try to install again on the same page
* moved some characters.frags code to twig template

CHANGELOG

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

common.php

@@ -21,13 +21,13 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 session_start();
 
 define('MYAAC', true);
-define('MYAAC_VERSION', '0.5.0');
+define('MYAAC_VERSION', '0.5.1');
 define('DATABASE_VERSION', 10);
 define('TABLE_PREFIX', 'myaac_');
 define('START_TIME', microtime(true));

config.php

@@ -13,7 +13,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 
@@ -185,6 +185,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)

index.php

@@ -21,7 +21,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 
@@ -84,11 +84,15 @@ else {
 		'/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'),
 		'/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'),
 		'/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'),
+		'/^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'),
 		'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+		'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/[0-9]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2', 'page' => '$3'),
+		'/^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'),
 		'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1')

system/compat_pages.php

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

system/counter.php

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

system/countries.conf.php

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

system/functions.php

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

system/hooks.php

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

system/init.php

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

system/item.php

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

system/libs/cache.php

@@ -6,7 +6,7 @@
  * @author    Slawkens <slawkens@gmail.com>
  * @author    Mark Samman (Talaturen) <marksamman@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/libs/cache_apc.php

@@ -6,7 +6,7 @@
  * @author    Slawkens <slawkens@gmail.com>
  * @author    Mark Samman (Talaturen) <marksamman@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/libs/cache_eaccelerator.php

@@ -6,7 +6,7 @@
  * @author    Slawkens <slawkens@gmail.com>
  * @author    Mark Samman (Talaturen) <marksamman@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/libs/cache_file.php

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

system/libs/cache_xcache.php

@@ -6,7 +6,7 @@
  * @author    Slawkens <slawkens@gmail.com>
  * @author    Mark Samman (Talaturen) <marksamman@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/libs/data.php

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

system/libs/items.php

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

system/libs/pot/OTS_Base_DB.php

@@ -28,7 +28,7 @@ abstract class OTS_Base_DB extends PDO implements IOTS_DB
  * 
  * @var string
  */
-    private $prefix = '';
+    protected $prefix = '';
 
 /**
  * Query counter

system/libs/timer.php

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

system/libs/validator.php

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

system/libs/visitors.php

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

system/login.php

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

system/pages/404.php

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

system/pages/account.php

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

system/pages/accountmanagement.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -537,7 +537,7 @@ if($action == "changeemail") {
 		
 		if($player_name != null) {
 			if (check_name($player_name)) {
-				$player = $ots->createObject('Player');
+				$player = new OTS_Player();
 				$player->find($player_name);
 				if ($player->isLoaded()) {
 					$player_account = $player->getAccount();
@@ -573,8 +573,7 @@ if($action == "changeemail") {
 			
 			if(isset($player)) {
 				echo $twig->render('account.change_comment.html.twig', array(
-					'player' => $player,
+					'player' => $player
-					'player_name' => $player_name
 				));
 			}
 		}

system/pages/admin/changelog.php

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

system/pages/admin/dashboard.php

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

system/pages/admin/login.php

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

system/pages/admin/logs.php

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

system/pages/admin/mailer.php

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

system/pages/admin/notepad.php

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

system/pages/admin/pages.php

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

system/pages/admin/phpinfo.php

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

system/pages/admin/players.php

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

system/pages/admin/plugins.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -40,25 +40,34 @@ function deleteDirectory($dir) {
 if(isset($_REQUEST['uninstall'])){
 	$uninstall = $_REQUEST['uninstall'];
 	
-	$string = file_get_contents(BASE . 'plugins/' . $uninstall . '.json');
+	$filename = BASE . 'plugins/' . $uninstall . '.json';
-	$plugin_info = json_decode($string, true);
+	if(!file_exists($filename)) {
-	if($plugin_info == false) {
+		error('Plugin ' . $uninstall . ' does not exist.');
-		warning('Cannot load plugin info ' . $uninstall . '.json');
 	}
 	else {
-		$success = true;
+		$string = file_get_contents($filename);
-		foreach($plugin_info['uninstall'] as $file) {
+		$plugin_info = json_decode($string, true);
-			$file = BASE . $file;
+		if($plugin_info == false) {
-			if(!deleteDirectory($file)) {
+			warning('Cannot load plugin info ' . $uninstall . '.json');
-				$success = false;
-			}
-		}
-		
-		if($success) {
-			success('Successfully uninstalled plugin ' . $uninstall);
 		}
 		else {
-			error('Error while uninstalling plugin ' . $uninstall . ': ' . error_get_last());
+			$success = true;
+			foreach($plugin_info['uninstall'] as $file) {
+				$file = BASE . $file;
+				if(!deleteDirectory($file)) {
+					$success = false;
+				}
+			}
+			
+			if($success) {
+				if($cache->enabled()) {
+					$cache->delete('templates');
+				}
+				success('Successfully uninstalled plugin ' . $uninstall);
+			}
+			else {
+				error('Error while uninstalling plugin ' . $uninstall . ': ' . error_get_last());
+			}
 		}
 	}
 }
@@ -179,6 +188,10 @@ else if(isset($_FILES["plugin"]["name"]))
 													warning('Unknown event type: ' . $info['type']);
 											}
 										}
+										
+										if($cache->enabled()) {
+											$cache->delete('templates');
+										}
 										success('<strong>' . $plugin['name'] . '</strong> plugin has been successfully installed.');
 									}
 								}

system/pages/admin/statistics.php

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

system/pages/admin/tools.php

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

system/pages/admin/version.php

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

system/pages/admin/visitors.php

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

system/pages/bans.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/bugtracker.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/changelog.php

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

system/pages/characters.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -229,22 +229,19 @@ if($player->isLoaded() && !$player->isDeleted())
 	}
 
 	$dead_add_content = '';
+	$deaths = array();
 	if(tableExist('killers')) {
 		$player_deaths = $db->query('SELECT `id`, `date`, `level` FROM `player_deaths` WHERE `player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,10;');
 		if(count($player_deaths))
 		{
-			$dead_add_content = '<br/><table border=0 cellspacing=1 cellpadding=4 width=100%><tr bgcolor='.$config['vdarkborder'].'><td colspan=2 class="white"><b>Character Deaths</b></td></tr>';
-			
 			$number_of_rows = 0;
 			foreach($player_deaths as $death)
 			{
-				$dead_add_content .= '<tr bgcolor="'.getStyle($number_of_rows++).'">
-					<td width="20%" align="center">'.date("j M Y, H:i", $death['date']).'</td>
-					<td> ';
 				$killers = $db->query("SELECT environment_killers.name AS monster_name, players.name AS player_name, players.deleted AS player_exists FROM killers LEFT JOIN environment_killers ON killers.id = environment_killers.kill_id
 LEFT JOIN player_killers ON killers.id = player_killers.kill_id LEFT JOIN players ON players.id = player_killers.player_id
 WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, killers.id ASC")->fetchAll();
 				
+				$description = '';
 				$i = 0;
 				$count = count($killers);
 				foreach($killers as $killer)
@@ -253,41 +250,36 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 					if($killer['player_name'] != "")
 					{
 						if($i == 1)
-							$dead_add_content .= "Killed at level <b>".$death['level']."</b>";
+							$description .= "Killed at level <b>".$death['level']."</b>";
 						else if($i == $count)
-							$dead_add_content .= " and";
+							$description .= " and";
 						else
-							$dead_add_content .= ",";
+							$description .= ",";
 						
-						$dead_add_content .= " by ";
+						$description .= " by ";
 						if($killer['monster_name'] != "")
-							$dead_add_content .= $killer['monster_name']." summoned by ";
+							$description .= $killer['monster_name']." summoned by ";
 						
 						if($killer['player_exists'] == 0)
-							$dead_add_content .= getPlayerLink($killer['player_name']);
+							$description .= getPlayerLink($killer['player_name']);
 						else
-							$dead_add_content .= $killer['player_name'];
+							$description .= $killer['player_name'];
 					}
 					else
 					{
 						if($i == 1)
-							$dead_add_content .= "Died at level <b>".$death['level']."</b>";
+							$description .= "Died at level <b>".$death['level']."</b>";
 						else if($i == $count)
-							$dead_add_content .= " and";
+							$description .= " and";
 						else
-							$dead_add_content .= ",";
+							$description .= ",";
 						
-						$dead_add_content .= " by ".$killer['monster_name'];
+						$description .= " by ".$killer['monster_name'];
 					}
 				}
 				
-				$dead_add_content .= ".</td></tr>";
+				$deaths[] = array('time' => $death['date'], 'description' => $description . '.');
 			}
-			
-			if($number_of_rows > 0)
-				$dead_add_content .= '</table>';
-			else
-				$dead_add_content = '';
 		}
 	}
 	else {
@@ -301,45 +293,35 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 		
 		if(count($deaths_db))
 		{
-			$dead_add_content = '<br/><table border=0 cellspacing=1 cellpadding=4 width=100%><tr bgcolor="'.$config['vdarkborder'].'"><td colspan="2" class="white"><b>Character Deaths</b></td></tr>';
-			
 			$number_of_rows = 0;
 			foreach($deaths_db as $death)
 			{
-				$dead_add_content .= '<tr bgcolor="'.getStyle($number_of_rows++).'">
-					<td width="20%" align="center">'.date("j M Y, H:i", $death['time']).'</td>
-					<td> ';
-				
 				$lasthit = ($death['is_player']) ? getPlayerLink($death['killed_by']) : $death['killed_by'];
-				$dead_add_content .=  'Killed at level ' . $death['level'] . ' by ' . $lasthit;
+				$description =  'Killed at level ' . $death['level'] . ' by ' . $lasthit;
 				if($death['unjustified']) {
-					$dead_add_content .=  " <font color='red' style='font-style: italic;'>(unjustified)</font>";
+					$description .=  " <font color='red' style='font-style: italic;'>(unjustified)</font>";
 				}
 				
 				$mostdmg = ($death['mostdamage_by'] !== $death['killed_by']) ? true : false;
 				if($mostdmg)
 				{
 					$mostdmg = ($death['mostdamage_is_player']) ? getPlayerLink($death['mostdamage_by']) : $death['mostdamage_by'];
-					$dead_add_content .=  ' and by ' . $mostdmg;
+					$description .=  ' and by ' . $mostdmg;
 					
 					if ($death['mostdamage_unjustified']) {
-						$dead_add_content .=  " <font color='red' style='font-style: italic;'>(unjustified)</font>";
+						$description .=  " <font color='red' style='font-style: italic;'>(unjustified)</font>";
 					}
 				}
 				else {
-					$dead_add_content .=  " <b>(soloed)</b>";
+					$description .=  " <b>(soloed)</b>";
 				}
 				
-				$dead_add_content .= ".</td></tr>";
+				$deaths[] = array('time' => $death['time'], 'description' => $description);
 			}
-			
-			if($number_of_rows > 0)
-				$dead_add_content .= '</table>';
-			else
-				$dead_add_content = '';
 		}
 	}
 	
+	$frags = array();
 	$frag_add_content = '';
 	if($config['characters']['frags'])
 	{
@@ -349,22 +331,12 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 		$player_frags = $db->query('SELECT `player_deaths`.*, `players`.`name`, `killers`.`unjustified` FROM `player_deaths` LEFT JOIN `killers` ON `killers`.`death_id` = `player_deaths`.`id` LEFT JOIN `player_killers` ON `player_killers`.`kill_id` = `killers`.`id` LEFT JOIN `players` ON `players`.`id` = `player_deaths`.`player_id` WHERE `player_killers`.`player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,'.$frags_limit.';');
 		if(count($player_frags))
 		{
-			$frags = 0;
+			$row_count = 0;
-			$frag_add_content .= '<TABLE BORDER=0 CELLSPACING=1 CELLPADDING=4 WIDTH=100%><br><TR BGCOLOR='.$config['vdarkborder'].'><TD COLSPAN=2 CLASS=white><B>Victims</B></TD></TR>';
 			foreach($player_frags as $frag)
 			{
-				$frags++;
+				$description = 'Fragged <a href="' . getPlayerLink($frag[name], false) . '">' . $frag[name] . '</a> at level ' . $frag[level];
-				$frag_add_content .= '<tr bgcolor="' . getStyle($frags) . '">
+				$frags[] = array('time' => $frag['date'], 'description' => $description, 'unjustified' => $frag['unjustified'] != 0);
-					<td width="20%" align="center">' . date("j M Y, H:i", $frag['date']) . '</td>
-					<td>Fragged <a href="' . getPlayerLink($frag[name], false) . '">' . $frag[name] . '</a> at level ' . $frag[level];
-				
-				$frag_add_content .= ". (".(($frag['unjustified'] == 0) ? "<font size=\"1\" color=\"green\">Justified</font>" : "<font size=\"1\" color=\"red\">Unjustified</font>").")</td></tr>";
 			}
-			
-			if($frags > 0)
-				$frag_add_content .= '</table>';
-			else
-				$frag_add_content = '';
 		}
 	}
 	
@@ -423,8 +395,8 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 		'quests' => isset($quests) ? $quests : null,
 		'equipment' => isset($equipment) ? $equipment : null,
 		'skull' => $player->getSkullTime() > 0 && ($player->getSkull() == 4 || $player->getSkull() == 5) ? $skulls[$player->getSkull()] : null,
-		'deaths' => $dead_add_content,
+		'deaths' => $deaths,
-		'frags' => $frag_add_content,
+		'frags' => $frags,
 		'signature_url' => isset($signature_url) ? $signature_url : null,
 		'player_link' => getPlayerLink($player->getName(), false),
 		'hidden' => $hidden,

system/pages/commands.php

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

system/pages/createaccount.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/creatures.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/downloads.php

@@ -5,7 +5,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 $title = 'Downloads';

system/pages/experiencestages.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/experiencetable.php

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

system/pages/faq.php

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

system/pages/forum.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/guilds.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/highscores.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
@@ -109,7 +109,7 @@ if($config['highscores_outfit']) {
 	}
 }
 
-$offset = $_page * 100;
+$offset = $_page * $config['highscores_length'];
 if($skill <= POT::SKILL_LAST) { // skills
 	if(fieldExist('skill_fist', 'players')) {// tfs 1.0
 		$skill_ids = array(
@@ -186,7 +186,7 @@ foreach($skills as $player)
 		$player['online'] = $query->rowCount() > 0;
 	}
 
-	if(++$i <= 100)
+	if(++$i <= $config['highscores_length'])
 	{
 		if($skill == POT::SKILL__MAGIC)
 			$player['value'] = $player['maglevel'];
@@ -238,11 +238,11 @@ if(!$i)
 <?php
 //link to previous page if actual page is not first
 if($_page > 0)
-	echo '<TR><TD WIDTH=100% ALIGN=right VALIGN=bottom><A HREF="?subtopic=highscores&list='.$list.'&page='.($_page - 1).'" CLASS="size_xxs">Previous Page</A></TD></TR>';
+	echo '<TR><TD WIDTH=100% ALIGN=right VALIGN=bottom><A HREF="' . getLink('highscores') . '/' . $list . (isset($vocation) ? '/' . $vocation : '') . '/' . ($_page - 1) . '" CLASS="size_xxs">Previous Page</A></TD></TR>';
 
 //link to next page if any result will be on next page
 if($show_link_to_next_page)
-	echo '<TR><TD WIDTH=100% ALIGN=right VALIGN=bottom><A HREF="?subtopic=highscores&list='.$list.'&page='.($_page + 1).'" CLASS="size_xxs">Next Page</A></TD></TR>';
+	echo '<TR><TD WIDTH=100% ALIGN=right VALIGN=bottom><A HREF="' . getLink('highscores') . '/' . $list . (isset($vocation) ? '/' . $vocation : '') . '/' . ($_page + 1) . '" CLASS="size_xxs">Next Page</A></TD></TR>';
 
 //end of page
 echo '</TABLE>
@@ -307,8 +307,8 @@ if($config['highscores_vocation_box'])
 		</tr>
 		<tr bgcolor="'.$config['lightborder'].'">
 			<td>
-				<a href="' . getLink('highscores') . ($config['friendly_urls'] ? '/' : '&list=') . $list . '" class="size_xs">[ALL]</A><BR>';
+				<a href="' . getLink('highscores') . '/' . $list . '" class="size_xs">[ALL]</A><BR>';
-				for($i = 1; $i < count($config_vocations) / 2; $i++) {
+				for($i = 1; $i <= $config['vocations_amount']; $i++) {
 					echo '<a href="' . getLink('highscores') . '/' . $list . '/' . strtolower($config_vocations[$i]) . '" class="size_xs">' . $config_vocations[$i] . '</a><br/>';
 				}
 		echo '

system/pages/houses.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/lastkills.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/lostaccount.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/movies.php

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

system/pages/news.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/newsarchive.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 $_GET['archive'] = true;

system/pages/online.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/polls.php

@@ -6,7 +6,7 @@
  * @author    Averatec <pervera.pl & otland.net>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/records.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/rules.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/screenshots.php

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

system/pages/serverinfo.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/spells.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/pages/team.php

@@ -6,7 +6,7 @@
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');

system/status.php

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

system/template.php

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

system/templates/account.change_comment.html.twig

@@ -30,7 +30,7 @@ If you do not want to specify a certain field, just leave it blank.<br/><br/>
 											<table class="TableContent" width="100%">
 												<tr>
 													<td class="LabelV">Name:</td>
-													<td style="width:80%;" >{{ player_name }}</td>
+													<td style="width:80%;" >{{ player.getName() }}</td>
 												</tr>
 												<tr>
 													<td class="LabelV" >Hide Account:</td>

system/templates/admin.plugins.form.html.twig

@@ -1,4 +1,4 @@
-<form enctype="multipart/form-data" method="post">
+<form enctype="multipart/form-data" method="post" action="{{ constant('ADMIN_URL') }}?p=plugins">
 	<input type="hidden" name="upload_plugin" />
 	<table cellspacing="3" border="0">
 		<tr>

system/templates/characters.html.twig

@@ -216,8 +216,37 @@
 			</tr>
 		</table>
 
-		{{ deaths|raw }}
+		{% if deaths|length > 0 %}
-		{{ frags|raw }}
+		<br/>
+		<table border="0" cellspacing="1" cellpadding="4" width="100%">
+			<tr bgcolor="{{ config.vdarkborder }}">
+				<td colspan="2" class="white"><b>Character Deaths</b></td>
+			</tr>
+			{% set i = 0 %}
+			{% for death in deaths %}
+			<tr bgcolor="'{{ getStyle(i) }}">
+				<td width="20%" align="center">{{ death.time|date("j M Y, H:i") }}</td>
+				<td>{{ death.description }}</td>
+			</tr>
+
+			{% set i = i + 1 %}
+			{% endfor %}
+		{% endif %}
+		{% if frags|length > 0 %}
+		<br/>
+		<table border="0" cellspacing="1" cellpadding="4" width="100%">
+			<tr bgcolor="{{ config.vdarkborder }}">
+				<td colspan="2" class="white"><b>Victims</b></td>
+			</tr>
+			{% set i = 0 %}
+			{% for frag in frags %}
+			<tr bgcolor="'{{ getStyle(i) }}">
+				<td width="20%" align="center">{{ frag.time|date("j M Y, H:i") }}</td>
+				<td>{{ frag.description }}({% if frag.unjustified %}<font size="1" color="red">Unjustified</font>{% else %}<font size="1" color="green">Justified</font>{% endif %})</td>
+			</tr>
+			{% endfor %}
+		</table>
+		{% endif %}
 
 		{{ hook(constant('HOOK_CHARACTERS_BEFORE_SIGNATURE')) }}
 
@@ -300,7 +329,7 @@
 			{% set rows = rows + 1 %}
 			<tr bgcolor="{{ getStyle(rows) }}">
 			<td width="20%">Created:</td>
-			<td>{{ account.getCustomField("created")|date("j F Y, g:i a") ~bannedUntil }}</td>
+			<td>{{ account.getCustomField("created")|date("j F Y, g:i a") ~ bannedUntil|raw }}</td>
 		</tr>
 		</table>
 		{{ hook(constant('HOOK_CHARACTERS_AFTER_ACCOUNT')) }}

system/templates/news.archive.html.twig

@@ -1,21 +1,21 @@
 <table border="0" cellspacing="1" cellpadding="4" width="100%">
-    <tr bgcolor="{{ config.vdarkborder }}">
+	<tr bgcolor="{{ config.vdarkborder }}">
-        <td colspan="3" class="white"><b>News archive</b></td>
+		<td colspan="3" class="white"><b>News archive</b></td>
-    </tr>
+	</tr>
 
-    {% set i = 0 %}
+	{% set i = 0 %}
-    {% for news in newses %}
+	{% for news in newses %}
-    {% set i = i + 1 %}
+	{% set i = i + 1 %}
-    <tr bgcolor="{{ getStyle(i) }}">
+	<tr bgcolor="{{ getStyle(i) }}">
-        <td width=4%>
+		<td width=4%>
-            <center>
+			<center>
-                <img src="{{ template_path }}/images/news/icon_{{ news.icon_id }}_small.gif"/>
+				<img src="{{ template_path }}/images/news/icon_{{ news.icon_id }}_small.gif"/>
-            </center>
+			</center>
-        </td>
+		</td>
-        <td>{{ news.date|date('j.n.Y') }}</td>
+		<td>{{ news.date|date('j.n.Y') }}</td>
-        <td>
+		<td>
-            <b><a href="{{ news.link }}">{{ news.title }}</a></b>
+			<b><a href="{{ news.link }}">{{ news.title }}</a></b>
-        </td>
+		</td>
-    </tr>
+	</tr>
-    {% endfor %}
+	{% endfor %}
 </table>

tools/validate.php

@@ -6,7 +6,7 @@
  * @package   MyAAC
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2017 MyAAC
- * @version   0.5.0
+ * @version   0.5.1
  * @link      http://my-aac.org
  */