Merge branch 'develop' into feature/docker

system/database.php

@@ -127,6 +127,7 @@ try {
 	}
 
 	if(defined('MYAAC_INSTALL')) {
+		$error = $e->getMessage();
 		return; // installer will take care of this
 	}
 

system/functions.php

@@ -87,18 +87,29 @@ function getForumBoardLink($board_id, $page = NULL): string {
 	return BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . 'forum/board/' . (int)$board_id . (isset($page) ? '/' . $page : '');
 }
 
-function getPlayerLink($name, $generate = true): string
+function getPlayerLink($name, $generate = true, bool $colored = false): string
 {
-	if(is_numeric($name))
-	{
-		$player = new OTS_Player();
+	$player = new OTS_Player();
+
+	if(is_numeric($name)) {
 		$player->load((int)$name);
-		if($player->isLoaded())
-			$name = $player->getName();
+	}
+	else {
+		$player->find($name);
 	}
 
+	if (!$player->isLoaded()) {
+		return '(error)';
+	}
+
+	$name = $player->getName();
+
 	$url = BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . 'characters/' . urlencode($name);
 
+	if ($colored) {
+		$name = '<span style="color: ' . ($player->isOnline() ? 'green' : 'red') . ';">' . $name . '</span>';
+	}
+
 	if(!$generate) return $url;
 	return generateLink($url, $name);
 }
@@ -1623,7 +1634,7 @@ function removeIfFirstSlash(&$text) {
 };
 
 function escapeHtml($html) {
-	return htmlentities($html, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+	return htmlspecialchars($html);
 }
 
 function getGuildNameById($id)

system/init.php

@@ -134,10 +134,6 @@ $ots = POT::getInstance();
 $eloquentConnection = null;
 require_once SYSTEM . 'database.php';
 
-if ($config_lua_reload) {
-	clearCache();
-}
-
 // verify myaac tables exists in database
 if(!defined('MYAAC_INSTALL') && !$db->hasTable('myaac_account_actions')) {
 	throw new RuntimeException('Seems that the table myaac_account_actions of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting ' . BASE_URL . 'install');
@@ -163,8 +159,8 @@ date_default_timezone_set(setting('core.date_timezone'));
 
 setting(
 	[
-		'core.account_create_character_create',
-		setting('core.account_create_character_create') && (!setting('core.mail_enabled') || !setting('core.account_mail_verify'))
+		'core.account_mail_verify',
+		setting('core.account_mail_verify') && setting('core.mail_enabled')
 	]
 );
 

system/libs/pot/OTS_Base_DAO.php

@@ -15,15 +15,15 @@
 
 /**
  * Basic data access object routines.
- * 
+ *
  * <p>
  * This class defines basic mechanisms for all classes that will represent database accessors. However no coding logic is defined here - only connection handling and PHP core-related stuff to enable variouse operations with objects.
  * </p>
- * 
+ *
  * <p>
  * This class is mostly usefull when you create own extensions for POT code.
  * </p>
- * 
+ *
  * @package POT
  * @version 0.1.0
  */
@@ -31,14 +31,14 @@ abstract class OTS_Base_DAO implements IOTS_DAO
 {
 /**
  * Database connection.
- * 
+ *
  * @var PDO
  */
     protected $db;
 
 /**
  * Sets database connection handler.
- * 
+ *
  * @version 0.1.0
  */
     public function __construct()
@@ -48,11 +48,11 @@ abstract class OTS_Base_DAO implements IOTS_DAO
 
 /**
  * Magic PHP5 method.
- * 
+ *
  * <p>
  * Allows object serialisation.
  * </p>
- * 
+ *
  * @return array List of properties that should be saved.
  */
     public function __sleep()
@@ -62,7 +62,7 @@ abstract class OTS_Base_DAO implements IOTS_DAO
 
 /**
  * Magic PHP5 method.
- * 
+ *
  * <p>
  * Allows object unserialisation.
  * </p>
@@ -74,7 +74,7 @@ abstract class OTS_Base_DAO implements IOTS_DAO
 
 /**
  * Creates clone of object.
- * 
+ *
  * <p>
  * Copy of object needs to have different ID.
  * </p>
@@ -83,38 +83,4 @@ abstract class OTS_Base_DAO implements IOTS_DAO
     {
         unset($this->data['id']);
     }
-
-/**
- * Magic PHP5 method.
- * 
- * <p>
- * Allows object importing from {@link http://www.php.net/manual/en/function.var-export.php var_export()}.
- * </p>
- * 
- * @version 0.1.0
- * @param array $properties List of object properties.
- */
-    public static function __set_state($properties)
-    {
-        // deletes database handle
-        if( isset($properties['db']) )
-        {
-            unset($properties['db']);
-        }
-
-        // initializes new object with current database connection
-        $object = new self();
-
-        // loads properties
-        foreach($properties as $name => $value)
-        {
-            $object->$name = $value;
-        }
-
-        return $object;
-    }
 }
-
-/**#@-*/
-
-?>

system/libs/pot/OTS_Buffer.php

@@ -15,15 +15,15 @@
 
 /**
  * Binary buffer container.
- * 
+ *
  * <p>
  * This is generic class for classes that uses buffer-baser read-write operations (it can also emulate C-like pointers).
  * <p>
- * 
+ *
  * <p>
  * Note that unlike <var>NetworkMessage</var> class from OTServ C++ source code, in this one reading and writing positions are separated so you can pararelly read and write it's content like for example using object of this class as stack.
  * </p>
- * 
+ *
  * @package POT
  * @version 0.1.3
  * @property string $buffer Properties binary string.
@@ -39,381 +39,391 @@ class OTS_Buffer
 {
 /**
  * Node properties stream.
- * 
+ *
  * @var string
  */
-    protected $buffer;
+	protected $buffer;
 /**
  * Properties stream pointer.
- * 
+ *
  * @var int
  */
-    protected $pos;
+	protected $pos;
 
 /**
  * Initializes new buffered reader.
- * 
+ *
  * @param string $buffer Buffer content.
  */
-    public function __construct($buffer = '')
-    {
-        $this->buffer = $buffer;
-        $this->pos = 0;
-    }
+	public function __construct($buffer = '')
+	{
+		$this->buffer = $buffer;
+		$this->pos = 0;
+	}
 
 /**
  * Magic PHP5 method.
- * 
+ *
  * <p>
  * Allows object importing from {@link http://www.php.net/manual/en/function.var-export.php var_export()}.
  * </p>
- * 
+ *
  * @param array $properties List of object properties.
  */
-    public static function __set_state($properties)
-    {
-        $object = new self();
+	public static function __set_state($properties)
+	{
+		$object = new self();
 
-        // loads properties
-        foreach($properties as $name => $value)
-        {
-            $object->$name = $value;
-        }
+		// loads properties
+		foreach($properties as $name => $value)
+		{
+			$object->$name = $value;
+		}
 
-        return $object;
-    }
+		return $object;
+	}
 
 /**
  * Returs properties stream.
- * 
+ *
  * @return string Properties stream.
  */
-    public function getBuffer()
-    {
-        return $this->buffer;
-    }
+	public function getBuffer()
+	{
+		return $this->buffer;
+	}
 
 /**
  * Sets properties stream.
- * 
+ *
  * @param string Properties stream.
  */
-    public function setBuffer($buffer)
-    {
-        $this->buffer = $buffer;
-        $this->pos = 0;
-    }
+	public function setBuffer($buffer)
+	{
+		$this->buffer = $buffer;
+		$this->pos = 0;
+	}
 
 /**
  * Checks if there is anything left in stream.
- * 
+ *
  * @return bool False if pointer is at the end of stream.
  */
-    public function isValid()
-    {
-        return $this->pos < strlen($this->buffer);
-    }
+	public function isValid()
+	{
+		return $this->pos < strlen($this->buffer);
+	}
 
 /**
  * Checks stream end state.
- * 
+ *
  * @param int $size Amount of bytes that are going to be read.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    protected function check($size = 1)
-    {
-        if( strlen($this->buffer) < $this->pos + $size)
-        {
-            throw new E_OTS_OutOfBuffer();
-        }
-    }
+	protected function check($size = 1)
+	{
+		if( strlen($this->buffer) < $this->pos + $size)
+		{
+			throw new E_OTS_OutOfBuffer();
+		}
+	}
 
 /**
  * Returns single byte.
- * 
+ *
  * @return int Byte (char) value.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    public function getChar()
-    {
-        // checks buffer size
-        $this->check();
+	public function getChar()
+	{
+		// checks buffer size
+		$this->check();
 
-        $value = ord($this->buffer[$this->pos]);
-        $this->pos++;
-        return $value;
-    }
+		$value = ord($this->buffer[$this->pos]);
+		$this->pos++;
+		return $value;
+	}
 
 /**
  * Appends single byte to buffer.
- * 
+ *
  * @param int $char Byte (char) value.
  */
-    public function putChar($char)
-    {
-        $this->buffer .= chr($char);
-    }
+	public function putChar($char)
+	{
+		$this->buffer .= chr($char);
+	}
 
 /**
  * Returns double byte.
- * 
+ *
  * @return int Word (short) value.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    public function getShort()
-    {
-        // checks buffer size
-        $this->check(2);
+	public function getShort()
+	{
+		// checks buffer size
+		$this->check(2);
 
-        $value = unpack('v', substr($this->buffer, $this->pos, 2) );
-        $this->pos += 2;
-        return $value[1];
-    }
+		$value = unpack('v', substr($this->buffer, $this->pos, 2) );
+		$this->pos += 2;
+		return $value[1];
+	}
 
 /**
  * Appends double byte to buffer.
- * 
+ *
  * @param int $short Word (short) value.
  */
-    public function putShort($short)
-    {
-        $this->buffer .= pack('v', $short);
-    }
+	public function putShort($short)
+	{
+		$this->buffer .= pack('v', $short);
+	}
 
 /**
  * Returns quater byte.
- * 
+ *
  * @return int Double word (long) value.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    public function getLong()
-    {
-        // checks buffer size
-        $this->check(4);
+	public function getLong()
+	{
+		// checks buffer size
+		$this->check(4);
 
-        $value = unpack('V', substr($this->buffer, $this->pos, 4) );
-        $this->pos += 4;
-        return $value[1];
-    }
+		$value = unpack('V', substr($this->buffer, $this->pos, 4) );
+		$this->pos += 4;
+		return $value[1];
+	}
+
+	public function getLongLong()
+	{
+		// checks buffer size
+		$this->check(8);
+
+		$value = unpack('P', substr($this->buffer, $this->pos, 8) );
+		$this->pos += 8;
+		return $value[1];
+	}
 
 /**
  * Appends quater byte to buffer.
- * 
+ *
  * @param int $long Double word (long) value.
  */
-    public function putLong($long)
-    {
-        $this->buffer .= pack('V', $long);
-    }
+	public function putLong($long)
+	{
+		$this->buffer .= pack('V', $long);
+	}
 
 /**
  * Returns string from buffer.
- * 
+ *
  * <p>
  * If length is not given then treats first short value from current buffer as string length.
  * </p>
- * 
+ *
  * @param int|bool $length String length.
  * @return string First substring.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    public function getString($length = false)
-    {
-        // reads string length if not given
-        if($length === false)
-        {
-            $length = $this->getShort();
-        }
+	public function getString($length = false)
+	{
+		// reads string length if not given
+		if($length === false)
+		{
+			$length = $this->getShort();
+		}
 
-        // checks buffer size
-        $this->check($length);
+		// checks buffer size
+		$this->check($length);
 
-        // copies substring
-        $value = substr($this->buffer, $this->pos, $length);
-        $this->pos += $length;
-        return $value;
-    }
+		// copies substring
+		$value = substr($this->buffer, $this->pos, $length);
+		$this->pos += $length;
+		return $value;
+	}
 
 /**
  * Appends string to buffer.
- * 
+ *
  * @param string $string Binary length.
  * @param bool $dynamic Whether if string length is fixed or not (if it is dynamic then length will be inserted as short before string chunk).
  */
-    public function putString($string, $dynamic = true)
-    {
-        // appends string length if requires
-        if($dynamic)
-        {
-            $this->putShort( strlen($string) );
-        }
+	public function putString($string, $dynamic = true)
+	{
+		// appends string length if requires
+		if($dynamic)
+		{
+			$this->putShort( strlen($string) );
+		}
 
-        $this->buffer .= $string;
-    }
+		$this->buffer .= $string;
+	}
 
 /**
  * Empties buffer.
  */
-    public function reset()
-    {
-        $this->__construct();
-    }
+	public function reset()
+	{
+		$this->__construct();
+	}
 
 /**
  * Returns current read position.
- * 
+ *
  * @return int Read position.
  */
-    public function getPos()
-    {
-        return $this->pos;
-    }
+	public function getPos()
+	{
+		return $this->pos;
+	}
 
 /**
  * Seeks current reading position.
- * 
+ *
  * @param int $pos Read position.
  */
-    public function setPos($pos)
-    {
-        $this->pos = $pos;
-    }
+	public function setPos($pos)
+	{
+		$this->pos = $pos;
+	}
 
 /**
  * Returns buffer size.
- * 
+ *
  * @return int Buffer length.
  */
-    public function getSize()
-    {
-        return strlen($this->buffer);
-    }
+	public function getSize()
+	{
+		return strlen($this->buffer);
+	}
 
 /**
  * Skips given amount of bytes.
- * 
+ *
  * @param int $n Bytes to skip.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    public function skip($n)
-    {
-        $this->check($n);
-        $this->pos += $n;
-    }
+	public function skip($n)
+	{
+		$this->check($n);
+		$this->pos += $n;
+	}
 
 /**
  * Magic PHP5 method.
- * 
+ *
  * @param string $name Property name.
  * @return mixed Property value.
  * @throws OutOfBoundsException For non-supported properties.
  * @throws E_OTS_OutOfBuffer When there is read attemp after end of stream.
  */
-    public function __get($name)
-    {
-        switch($name)
-        {
-            // simple properties
-            case 'buffer':
-                return $this->buffer;
+	public function __get($name)
+	{
+		switch($name)
+		{
+			// simple properties
+			case 'buffer':
+				return $this->buffer;
 
-            // isValid() wrapper
-            case 'valid':
-                return $this->isValid();
+			// isValid() wrapper
+			case 'valid':
+				return $this->isValid();
 
-            // getChar() wrapper
-            case 'char':
-                return $this->getChar();
+			// getChar() wrapper
+			case 'char':
+				return $this->getChar();
 
-            // getShort() wrapper
-            case 'short':
-                return $this->getShort();
+			// getShort() wrapper
+			case 'short':
+				return $this->getShort();
 
-            // getLong() wrapper
-            case 'long':
-                return $this->getLong();
+			// getLong() wrapper
+			case 'long':
+				return $this->getLong();
 
-            // getString() wrapper
-            case 'string':
-                return $this->getString();
+			// getString() wrapper
+			case 'string':
+				return $this->getString();
 
-            // getPos() wrapper
-            case 'pos':
-                return $this->getPos();
+			// getPos() wrapper
+			case 'pos':
+				return $this->getPos();
 
-            // getSize() wrapper
-            case 'size':
-                return $this->getSize();
+			// getSize() wrapper
+			case 'size':
+				return $this->getSize();
 
-            default:
-                throw new OutOfBoundsException();
-        }
-    }
+			default:
+				throw new OutOfBoundsException();
+		}
+	}
 
 /**
  * Magic PHP5 method.
- * 
+ *
  * @version 0.1.3
  * @param string $name Property name.
  * @param mixed $value Property value.
  * @throws OutOfBoundsException For non-supported properties.
  */
-    public function __set($name, $value)
-    {
-        switch($name)
-        {
-            // buffer needs to be reset
-            case 'buffer':
-                $this->setBuffer($value);
-                break;
+	public function __set($name, $value)
+	{
+		switch($name)
+		{
+			// buffer needs to be reset
+			case 'buffer':
+				$this->setBuffer($value);
+				break;
 
-            // putChar() wrapper
-            case 'char':
-                $this->putChar($value);
-                break;
+			// putChar() wrapper
+			case 'char':
+				$this->putChar($value);
+				break;
 
-            // putShort() wrapper
-            case 'short':
-                $this->putShort($value);
-                break;
+			// putShort() wrapper
+			case 'short':
+				$this->putShort($value);
+				break;
 
-            // putLong() wrapper
-            case 'long':
-                $this->putLong($value);
-                break;
+			// putLong() wrapper
+			case 'long':
+				$this->putLong($value);
+				break;
 
-            // putString() wrapper
-            case 'string':
-                $this->putString($value);
-                break;
+			// putString() wrapper
+			case 'string':
+				$this->putString($value);
+				break;
 
-            // setPos() wrapper
-            case 'pos':
-                $this->setPos($value);
-                break;
+			// setPos() wrapper
+			case 'pos':
+				$this->setPos($value);
+				break;
 
-            default:
-                throw new OutOfBoundsException();
-        }
-    }
+			default:
+				throw new OutOfBoundsException();
+		}
+	}
 
 /**
  * Returns string representation of buffer object.
- * 
+ *
  * @return string Object's buffer.
  */
-    public function __toString()
-    {
-        return $this->buffer;
-    }
+	public function __toString()
+	{
+		return $this->buffer;
+	}
 
 /**
  * Resets pointer of cloned object.
  */
-    public function __clone()
-    {
-        $this->pos = 0;
-    }
+	public function __clone()
+	{
+		$this->pos = 0;
+	}
 }
 
 /**#@-*/

system/libs/pot/OTS_Monster.php

@@ -57,10 +57,10 @@ class OTS_Monster extends DOMDocument
  * @return string Name.
  * @throws DOMException On DOM operation error.
  */
-    public function getName()
-    {
-        return $this->documentElement->getAttribute('name');
-    }
+	public function getName()
+	{
+		return $this->documentElement->getAttribute('name');
+	}
 
 /**
  * Returns monster race.
@@ -68,10 +68,10 @@ class OTS_Monster extends DOMDocument
  * @return string Race.
  * @throws DOMException On DOM operation error.
  */
-    public function getRace()
-    {
-        return $this->documentElement->getAttribute('race');
-    }
+	public function getRace()
+	{
+		return $this->documentElement->getAttribute('race');
+	}
 
 /**
  * Returns amount of experience for killing this monster.
@@ -79,10 +79,10 @@ class OTS_Monster extends DOMDocument
  * @return int Experience points.
  * @throws DOMException On DOM operation error.
  */
-    public function getExperience()
-    {
-        return (int) $this->documentElement->getAttribute('experience');
-    }
+	public function getExperience()
+	{
+		return (int) $this->documentElement->getAttribute('experience');
+	}
 
 /**
  * Returns monster speed.
@@ -90,10 +90,10 @@ class OTS_Monster extends DOMDocument
  * @return int Speed.
  * @throws DOMException On DOM operation error.
  */
-    public function getSpeed()
-    {
-        return (int) $this->documentElement->getAttribute('speed');
-    }
+	public function getSpeed()
+	{
+		return (int) $this->documentElement->getAttribute('speed');
+	}
 
 /**
  * Returns amount of mana required to summon this monster.
@@ -101,18 +101,18 @@ class OTS_Monster extends DOMDocument
  * @return int|bool Mana required (false if not possible).
  * @throws DOMException On DOM operation error.
  */
-    public function getManaCost()
-    {
-        // check if it is possible to summon this monster
-        if( $this->documentElement->hasAttribute('manacost') )
-        {
-            return (int) $this->documentElement->getAttribute('manacost');
-        }
-        else
-        {
-            return false;
-        }
-    }
+	public function getManaCost()
+	{
+		// check if it is possible to summon this monster
+		if( $this->documentElement->hasAttribute('manacost') )
+		{
+			return (int) $this->documentElement->getAttribute('manacost');
+		}
+		else
+		{
+			return false;
+		}
+	}
 
 /**
  * Returns monster HP.
@@ -120,10 +120,10 @@ class OTS_Monster extends DOMDocument
  * @return int Hit points.
  * @throws DOMException On DOM operation error.
  */
-    public function getHealth()
-    {
-        return (int) $this->documentElement->getElementsByTagName('health')->item(0)->getAttribute('max');
-    }
+	public function getHealth()
+	{
+		return (int) $this->documentElement->getElementsByTagName('health')->item(0)->getAttribute('max');
+	}
 
 /**
  * Returns all monster flags (in format flagname => value).
@@ -131,20 +131,21 @@ class OTS_Monster extends DOMDocument
  * @return array Flags.
  * @throws DOMException On DOM operation error.
  */
-    public function getFlags()
-    {
-        $flags = array();
+	public function getFlags()
+	{
+		$flags = array();
 
-        // read all flags
-        foreach( $this->documentElement->getElementsByTagName('flags')->item(0)->getElementsByTagName('flag') as $flag)
-        {
-            $flag = $flag->attributes->item(0);
+		if ($this->documentElement->getElementsByTagName('flags')->item(0)) {
+			foreach( $this->documentElement->getElementsByTagName('flags')->item(0)->getElementsByTagName('flag') as $flag)
+			{
+				$flag = $flag->attributes->item(0);
 
-            $flags[$flag->nodeName] = (int) $flag->nodeValue;
-        }
+				$flags[$flag->nodeName] = (int) $flag->nodeValue;
+			}
+		}
 
-        return $flags;
-    }
+		return $flags;
+	}
 
 /**
  * Returns specified flag value.
@@ -153,21 +154,21 @@ class OTS_Monster extends DOMDocument
  * @return int|bool Flag value (false if not set).
  * @throws DOMException On DOM operation error.
  */
-    public function getFlag($flag)
-    {
-        // searches for flag
-        foreach( $this->documentElement->getElementsByTagName('flags')->item(0)->getElementsByTagName('flag') as $flag)
-        {
-            // found
-            if( $flag->hasAttribute($flag) )
-            {
-                return (int) $flag->getAttribute($flag);
-            }
-        }
+	public function getFlag($flag)
+	{
+		// searches for flag
+		foreach( $this->documentElement->getElementsByTagName('flags')->item(0)->getElementsByTagName('flag') as $flag)
+		{
+			// found
+			if( $flag->hasAttribute($flag) )
+			{
+				return (int) $flag->getAttribute($flag);
+			}
+		}
 
-        // not found
-        return false;
-    }
+		// not found
+		return false;
+	}
 
 /**
  * Returns voices that monster can sound.
@@ -175,64 +176,64 @@ class OTS_Monster extends DOMDocument
  * @return array List of voices.
  * @throws DOMException On DOM operation error.
  */
-    public function getVoices()
-    {
-        $voices = array();
+	public function getVoices()
+	{
+		$voices = array();
 
-        $element = $this->documentElement->getElementsByTagName('voices')->item(0);
+		$element = $this->documentElement->getElementsByTagName('voices')->item(0);
 
-        // checks if it has any voices
-        if( isset($element) )
-        {
-            // loads all voices
-            foreach( $element->getElementsByTagName('voice') as $voice)
-            {
-                $voices[] = $voice->getAttribute('sentence');
-            }
-        }
+		// checks if it has any voices
+		if( isset($element) )
+		{
+			// loads all voices
+			foreach( $element->getElementsByTagName('voice') as $voice)
+			{
+				$voices[] = $voice->getAttribute('sentence');
+			}
+		}
 
-        return $voices;
-    }
+		return $voices;
+	}
 
 /**
  * @return array List of item IDs.
  */
-    public function getLoot()
-    {
-        $loot = array();
+	public function getLoot()
+	{
+		$loot = array();
 
-        $element = $this->documentElement->getElementsByTagName('loot')->item(0);
+		$element = $this->documentElement->getElementsByTagName('loot')->item(0);
 
-        // checks if it has any loot
-        if( isset($element) )
-        {
-            // adds all items
-            foreach( $element->getElementsByTagName('item') as $item)
-            {
-	            $chance = $item->getAttribute('chance');
-	            if(empty($chance)) {
-		            $chance = $item->getAttribute('chance1');
-		            if(empty($chance)) {
-		                $chance = 100000;
-                    }
-                }
+		// checks if it has any loot
+		if( isset($element) )
+		{
+			// adds all items
+			foreach( $element->getElementsByTagName('item') as $item)
+			{
+				$chance = $item->getAttribute('chance');
+				if(empty($chance)) {
+					$chance = $item->getAttribute('chance1');
+					if(empty($chance)) {
+						$chance = 100000;
+					}
+				}
 
-                $count = $item->getAttribute('countmax');
-	            if(empty($count)) {
-	                $count = 1;
-                }
+				$count = $item->getAttribute('countmax');
+				if(empty($count)) {
+					$count = 1;
+				}
 
-                $id = $item->getAttribute('id');
-                if(empty($id)) {
-                    $id = $item->getAttribute('name');
-                }
+				$id = $item->getAttribute('id');
+				if(empty($id)) {
+					$id = $item->getAttribute('name');
+				}
 
-                $loot[] = array('id' => $id, 'count' => $count, 'chance' => $chance);
-            }
-        }
+				$loot[] = array('id' => $id, 'count' => $count, 'chance' => $chance);
+			}
+		}
 
-        return $loot;
-    }
+		return $loot;
+	}
 
 /**
  * Returns all possible loot.
@@ -247,33 +248,33 @@ class OTS_Monster extends DOMDocument
  * @throws E_OTS_NotLoaded When there is no items list available in global POT instance.
  * @throws DOMException On DOM operation error.
  */
-    public function getItems()
-    {
-        $loot = array();
-        $keys = array();
-        $items = POT::getInstance()->getItemsList();
+	public function getItems()
+	{
+		$loot = array();
+		$keys = array();
+		$items = POT::getInstance()->getItemsList();
 
-        $element = $this->documentElement->getElementsByTagName('loot')->item(0);
+		$element = $this->documentElement->getElementsByTagName('loot')->item(0);
 
-        // checks if it has any loot
-        if( isset($element) )
-        {
-            // adds all items
-            foreach( $element->getElementsByTagName('item') as $item)
-            {
-                $id = $item->getAttribute('id');
+		// checks if it has any loot
+		if( isset($element) )
+		{
+			// adds all items
+			foreach( $element->getElementsByTagName('item') as $item)
+			{
+				$id = $item->getAttribute('id');
 
-                // avoid redundancy
-                if( !in_array($id, $keys) )
-                {
-                    $keys[] = $id;
-                    $loot[] = $items->getItemType($id);
-                }
-            }
-        }
+				// avoid redundancy
+				if( !in_array($id, $keys) )
+				{
+					$keys[] = $id;
+					$loot[] = $items->getItemType($id);
+				}
+			}
+		}
 
-        return $loot;
-    }
+		return $loot;
+	}
 
 /**
  * Returns look of the monster.
@@ -281,27 +282,27 @@ class OTS_Monster extends DOMDocument
  * @return array Look with all the attributes of the look.
  * @throws DOMException On DOM operation error.
  */
-    public function getLook()
-    {
-        $look = array();
+	public function getLook()
+	{
+		$look = array();
 
-        $element = $this->documentElement->getElementsByTagName('look')->item(0);
+		$element = $this->documentElement->getElementsByTagName('look')->item(0);
 
-        if (!$element) {
-            return $look;
-        }
+		if (!$element) {
+			return $look;
+		}
 
-        $look['type'] = $element->getAttribute('type');
-        $look['typeex'] = $element->getAttribute('typeex');
-        $look['head'] = $element->getAttribute('head');
-        $look['body'] = $element->getAttribute('body');
-        $look['legs'] = $element->getAttribute('legs');
-        $look['feet'] = $element->getAttribute('feet');
-        $look['addons'] = $element->getAttribute('addons');
-        $look['corpse'] = $element->getAttribute('corpse');
+		$look['type'] = $element->getAttribute('type');
+		$look['typeex'] = $element->getAttribute('typeex');
+		$look['head'] = $element->getAttribute('head');
+		$look['body'] = $element->getAttribute('body');
+		$look['legs'] = $element->getAttribute('legs');
+		$look['feet'] = $element->getAttribute('feet');
+		$look['addons'] = $element->getAttribute('addons');
+		$look['corpse'] = $element->getAttribute('corpse');
 
-        return $look;
-    }
+		return $look;
+	}
 
 /**
  * Returns all monster summons.
@@ -311,24 +312,24 @@ class OTS_Monster extends DOMDocument
  */
 
 	public function getSummons()
-    {
-        $summons = array();
+	{
+		$summons = array();
 
-        $element = $this->documentElement->getElementsByTagName('summons')->item(0);
+		$element = $this->documentElement->getElementsByTagName('summons')->item(0);
 
-        // checks if it has any Summons
-        if( isset($element) )
-        {
-            // adds all summons
-            foreach( $element->getElementsByTagName('summon') as $item)
-            {
-	            $chance = $item->getAttribute('chance');
-                $id = $item->getAttribute('name');
-                $summons[] = array('name' => $id, 'chance' => $chance);
-            }
-        }
-        return $summons;
-    }
+		// checks if it has any Summons
+		if( isset($element) )
+		{
+			// adds all summons
+			foreach( $element->getElementsByTagName('summon') as $item)
+			{
+				$chance = $item->getAttribute('chance');
+				$id = $item->getAttribute('name');
+				$summons[] = array('name' => $id, 'chance' => $chance);
+			}
+		}
+		return $summons;
+	}
 
 /**
  * Returns all monster elements.
@@ -336,30 +337,30 @@ class OTS_Monster extends DOMDocument
  * @return array elements.
  * @throws DOMException On DOM operation error.
  */
-    public function getElements()
-    {
-        $elements = array();
+	public function getElements()
+	{
+		$elements = array();
 
-        $element = $this->documentElement->getElementsByTagName('elements')->item(0);
+		$element = $this->documentElement->getElementsByTagName('elements')->item(0);
 
-        // checks if it has any elements
-        if( isset($element) )
-        {
-            // read all elements
-            foreach( $element->getElementsByTagName('element') as $elementv)
-            {
-                $elementv = $elementv->attributes->item(0);
+		// checks if it has any elements
+		if( isset($element) )
+		{
+			// read all elements
+			foreach( $element->getElementsByTagName('element') as $elementv)
+			{
+				$elementv = $elementv->attributes->item(0);
 
-                // checks if element is set
-                if($elementv->nodeValue > 0)
-                {
+				// checks if element is set
+				if($elementv->nodeValue > 0)
+				{
 					 $elements[] = array('name' => ucfirst(str_replace('Percent', '', $elementv->nodeName)), 'percent' => $elementv->nodeValue);
-                }
-            }
-        }
+				}
+			}
+		}
 
-        return $elements;
-    }
+		return $elements;
+	}
 
 /**
  * Checks if monster has given element.
@@ -368,26 +369,26 @@ class OTS_Monster extends DOMDocument
  * @return bool element state.
  * @throws DOMException On DOM operation error.
  */
-    public function hasElement($name)
-    {
-        $element = $this->documentElement->getElementsByTagName('elements')->item(0);
+	public function hasElement($name)
+	{
+		$element = $this->documentElement->getElementsByTagName('elements')->item(0);
 
-        // if doesn't have any elements obviously doesn't have this one too
-        if( isset($element) )
-        {
-            // read all elements
-            foreach( $element->getElementsByTagName('element') as $element)
-            {
-                // checks if this is what we are searching for
-                if( $element->hasAttribute($name) )
-                {
-                    return $element->getAttribute($name) > 0;
-                }
-            }
-        }
+		// if doesn't have any elements obviously doesn't have this one too
+		if( isset($element) )
+		{
+			// read all elements
+			foreach( $element->getElementsByTagName('element') as $element)
+			{
+				// checks if this is what we are searching for
+				if( $element->hasAttribute($name) )
+				{
+					return $element->getAttribute($name) > 0;
+				}
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 /**
  * Returns all monster immunities.
@@ -395,30 +396,30 @@ class OTS_Monster extends DOMDocument
  * @return array Immunities.
  * @throws DOMException On DOM operation error.
  */
-    public function getImmunities()
-    {
-        $immunities = array();
+	public function getImmunities()
+	{
+		$immunities = array();
 
-        $element = $this->documentElement->getElementsByTagName('immunities')->item(0);
+		$element = $this->documentElement->getElementsByTagName('immunities')->item(0);
 
-        // checks if it has any immunities
-        if( isset($element) )
-        {
-            // read all immunities
-            foreach( $element->getElementsByTagName('immunity') as $immunity)
-            {
-                $immunity = $immunity->attributes->item(0);
+		// checks if it has any immunities
+		if( isset($element) )
+		{
+			// read all immunities
+			foreach( $element->getElementsByTagName('immunity') as $immunity)
+			{
+				$immunity = $immunity->attributes->item(0);
 
-                // checks if immunity is set
-                if($immunity->nodeValue > 0)
-                {
-                    $immunities[] = $immunity->nodeName;
-                }
-            }
-        }
+				// checks if immunity is set
+				if($immunity->nodeValue > 0)
+				{
+					$immunities[] = $immunity->nodeName;
+				}
+			}
+		}
 
-        return $immunities;
-    }
+		return $immunities;
+	}
 
 /**
  * Checks if monster has given immunity.
@@ -427,26 +428,26 @@ class OTS_Monster extends DOMDocument
  * @return bool Immunity state.
  * @throws DOMException On DOM operation error.
  */
-    public function hasImmunity($name)
-    {
-        $element = $this->documentElement->getElementsByTagName('immunities')->item(0);
+	public function hasImmunity($name)
+	{
+		$element = $this->documentElement->getElementsByTagName('immunities')->item(0);
 
-        // if doesn't have any immunities obviously doesn't have this one too
-        if( isset($element) )
-        {
-            // read all immunities
-            foreach( $element->getElementsByTagName('immunity') as $immunity)
-            {
-                // checks if this is what we are searching for
-                if( $immunity->hasAttribute($name) )
-                {
-                    return $immunity->getAttribute($name) > 0;
-                }
-            }
-        }
+		// if doesn't have any immunities obviously doesn't have this one too
+		if( isset($element) )
+		{
+			// read all immunities
+			foreach( $element->getElementsByTagName('immunity') as $immunity)
+			{
+				// checks if this is what we are searching for
+				if( $immunity->hasAttribute($name) )
+				{
+					return $immunity->getAttribute($name) > 0;
+				}
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 /**
  * Returns monster defense rate.
@@ -454,18 +455,18 @@ class OTS_Monster extends DOMDocument
  * @return int Defense rate.
  * @throws DOMException On DOM operation error.
  */
-    public function getDefense()
-    {
-        $element = $this->documentElement->getElementsByTagName('defenses')->item(0);
+	public function getDefense()
+	{
+		$element = $this->documentElement->getElementsByTagName('defenses')->item(0);
 
-        // checks if defenses element is set
-        if( isset($element) )
-        {
-            return (int) $element->getAttribute('defense');
-        }
+		// checks if defenses element is set
+		if( isset($element) )
+		{
+			return (int) $element->getAttribute('defense');
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
 /**
  * Returns monster armor.
@@ -473,18 +474,18 @@ class OTS_Monster extends DOMDocument
  * @return int Armor rate.
  * @throws DOMException On DOM operation error.
  */
-    public function getArmor()
-    {
-        $element = $this->documentElement->getElementsByTagName('defenses')->item(0);
+	public function getArmor()
+	{
+		$element = $this->documentElement->getElementsByTagName('defenses')->item(0);
 
-        // checks if defenses element is set
-        if( isset($element) )
-        {
-            return (int) $element->getAttribute('armor');
-        }
+		// checks if defenses element is set
+		if( isset($element) )
+		{
+			return (int) $element->getAttribute('armor');
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
 /**
  * Returns list of special defenses.
@@ -492,23 +493,23 @@ class OTS_Monster extends DOMDocument
  * @return array List of defense effects.
  * @throws DOMException On DOM operation error.
  */
-    public function getDefenses()
-    {
-        $defenses = array();
+	public function getDefenses()
+	{
+		$defenses = array();
 
-        $element = $this->documentElement->getElementsByTagName('defenses')->item(0);
+		$element = $this->documentElement->getElementsByTagName('defenses')->item(0);
 
-        // checks if it has any defenses
-        if( isset($element) )
-        {
-            foreach( $element->getElementsByTagName('defense') as $defense)
-            {
-                $defenses[] = $defense->getAttribute('name');
-            }
-        }
+		// checks if it has any defenses
+		if( isset($element) )
+		{
+			foreach( $element->getElementsByTagName('defense') as $defense)
+			{
+				$defenses[] = $defense->getAttribute('name');
+			}
+		}
 
-        return $defenses;
-    }
+		return $defenses;
+	}
 
 /**
  * Returns list of monster attacks.
@@ -516,23 +517,23 @@ class OTS_Monster extends DOMDocument
  * @return array List of attafck effects.
  * @throws DOMException On DOM operation error.
  */
-    public function getAttacks()
-    {
-        $attacks = array();
+	public function getAttacks()
+	{
+		$attacks = array();
 
-        $element = $this->documentElement->getElementsByTagName('attacks')->item(0);
+		$element = $this->documentElement->getElementsByTagName('attacks')->item(0);
 
-        // checks if it has any defenses
-        if( isset($element) )
-        {
-            foreach( $element->getElementsByTagName('attack') as $attack)
-            {
-                $attacks[] = $attack->getAttribute('name');
-            }
-        }
+		// checks if it has any defenses
+		if( isset($element) )
+		{
+			foreach( $element->getElementsByTagName('attack') as $attack)
+			{
+				$attacks[] = $attack->getAttribute('name');
+			}
+		}
 
-        return $attacks;
-    }
+		return $attacks;
+	}
 
 /**
  * Magic PHP5 method.
@@ -544,59 +545,59 @@ class OTS_Monster extends DOMDocument
  * @throws OutOfBoundsException For non-supported properties.
  * @throws DOMException On DOM operation error.
  */
-    public function __get($name)
-    {
-        switch($name)
-        {
-            case 'name':
-                return $this->getName();
+	public function __get($name)
+	{
+		switch($name)
+		{
+			case 'name':
+				return $this->getName();
 
-            case 'race':
-                return $this->getRace();
+			case 'race':
+				return $this->getRace();
 
-            case 'experience':
-                return $this->getExperience();
+			case 'experience':
+				return $this->getExperience();
 
-            case 'speed':
-                return $this->getSpeed();
+			case 'speed':
+				return $this->getSpeed();
 
-            case 'manaCost':
-                return $this->getManaCost();
+			case 'manaCost':
+				return $this->getManaCost();
 
-            case 'health':
-                return $this->getHealth();
+			case 'health':
+				return $this->getHealth();
 
-            case 'flags':
-                return $this->getFlags();
+			case 'flags':
+				return $this->getFlags();
 
-            case 'voices':
-                return $this->getVoices();
+			case 'voices':
+				return $this->getVoices();
 
-            case 'items':
-                return $this->getItems();
+			case 'items':
+				return $this->getItems();
 
-            case 'immunities':
-                return $this->getImmunities();
+			case 'immunities':
+				return $this->getImmunities();
 
-            case 'defense':
-                return $this->getDefense();
+			case 'defense':
+				return $this->getDefense();
 
-            case 'armor':
-                return $this->getArmor();
+			case 'armor':
+				return $this->getArmor();
 
-            case 'defenses':
-                return $this->getDefenses();
+			case 'defenses':
+				return $this->getDefenses();
 
-            case 'attacks':
-                return $this->getAttacks();
+			case 'attacks':
+				return $this->getAttacks();
 
-            case 'look':
-                return $this->getLook();
+			case 'look':
+				return $this->getLook();
 
-            default:
-                throw new OutOfBoundsException();
-        }
-    }
+			default:
+				throw new OutOfBoundsException();
+		}
+	}
 
 /**
  * Returns string representation of XML.
@@ -609,18 +610,18 @@ class OTS_Monster extends DOMDocument
  * @since 0.1.0
  * @return string String representation of object.
  */
-    public function __toString()
-    {
-        $ots = POT::getInstance();
+	public function __toString()
+	{
+		$ots = POT::getInstance();
 
-        // checks if display driver is loaded
-        if( $ots->isDataDisplayDriverLoaded() )
-        {
-            return $ots->getDataDisplayDriver()->displayMonster($this);
-        }
+		// checks if display driver is loaded
+		if( $ots->isDataDisplayDriverLoaded() )
+		{
+			return $ots->getDataDisplayDriver()->displayMonster($this);
+		}
 
-        return $this->saveXML();
-    }
+		return $this->saveXML();
+	}
 }
 
 /**#@-*/

system/libs/pot/OTS_Player.php

@@ -90,7 +90,7 @@ class OTS_Player extends OTS_Row_DAO
  * @version 0.1.2
  * @var array
  */
-    private $data = array('sex' => 0, 'vocation' => 0, 'experience' => 0, 'level' => 1, 'maglevel' => 0, 'health' => 100, 'healthmax' => 100, 'mana' => 100, 'manamax' => 100, 'manaspent' => 0, 'soul' => 0, 'lookbody' => 10, 'lookfeet' => 10, 'lookhead' => 10, 'looklegs' => 10, 'looktype' => 136, 'lookaddons' => 0, 'posx' => 0, 'posy' => 0, 'posz' => 0, 'cap' => 0, 'lastlogin' => 0, 'lastip' => 0, 'save' => true, 'skulltime' => 0, 'skull' => 0, 'balance' => 0, 'lastlogout' => 0, 'blessings' => 0, 'stamina' => 0, 'online' => 0, 'comment' => '', 'created' => 0, 'hide' => 0);
+    private $data = array('group_id' => 1, 'sex' => 0, 'vocation' => 0, 'experience' => 0, 'level' => 1, 'maglevel' => 0, 'health' => 100, 'healthmax' => 100, 'mana' => 100, 'manamax' => 100, 'manaspent' => 0, 'soul' => 0, 'lookbody' => 10, 'lookfeet' => 10, 'lookhead' => 10, 'looklegs' => 10, 'looktype' => 136, 'lookaddons' => 0, 'posx' => 0, 'posy' => 0, 'posz' => 0, 'cap' => 0, 'lastlogin' => 0, 'lastip' => 0, 'save' => true, 'skulltime' => 0, 'skull' => 0, 'balance' => 0, 'lastlogout' => 0, 'blessings' => 0, 'stamina' => 0, 'online' => 0, 'comment' => '', 'created' => 0, 'hide' => 0);
 
 /**
  * Player skills.
@@ -1229,6 +1229,13 @@ class OTS_Player extends OTS_Row_DAO
         $this->data['direction'] = (int) $direction;
     }
 
+	public function getOutfit(): string
+	{
+		$hasLookAddons = $this->db->hasColumn('players', 'lookaddons');
+
+		return setting('core.outfit_images_url') . '?id=' . $this->getLookType() . ($hasLookAddons ? '&addons=' . $this->getLookAddons() : '') . '&head=' . $this->getLookHead() . '&body=' . $this->getLookBody() . '&legs=' . $this->getLookLegs() . '&feet=' . $this->getLookFeet();
+	}
+
 /**
  * Body color.
  *

system/locale/de/install.php

@@ -36,6 +36,10 @@ $locale['step_requirements'] = 'Anforderungen';
 $locale['step_requirements_title'] = 'Anforderungen überprüfen';
 $locale['step_requirements_php_version'] = 'PHP Version';
 $locale['step_requirements_write_perms'] = 'Schreibberechtigungen';
+$locale['step_requirements_folder_exists'] = 'Ordner ist vorhanden';
+$locale['step_requirements_folder_not_exists_tools_ext'] = 'NPM Package Manager wird verwendet für externe JavaScript/CSS Bibliotheken.'
+	. ' Es sollte via Command Line installiert werden: <a href="https://docs.npmjs.com/downloading-and-installing-node-js-and-npm">https://docs.npmjs.com/downloading-and-installing-node-js-and-npm</a>'
+	. ' Nachdem das Tool installiert wurde, folgende Befehl sollte ausgeführt in dem Hauptordner des MyAACs: "npm install".';
 $locale['step_requirements_failed'] = 'Die Installation wird deaktiviert, bis diese Anforderungen erfüllt sind.</b><br/>Für weitere Informationen siehe <b>README</b> Datei.';
 $locale['step_requirements_extension'] = '$EXTENSION$ PHP Erweiterung';
 

system/locale/en/install.php

@@ -36,6 +36,10 @@ $locale['step_requirements'] = 'Requirements';
 $locale['step_requirements_title'] = 'Requirements check';
 $locale['step_requirements_php_version'] = 'PHP Version';
 $locale['step_requirements_write_perms'] = 'Write permissions';
+$locale['step_requirements_folder_exists'] = 'Directory exists';
+$locale['step_requirements_folder_not_exists_tools_ext'] = 'NPM Package Manager is used for external JavaScript/CSS libraries.'
+	. ' You need to install it through Command Line: <a href="https://docs.npmjs.com/downloading-and-installing-node-js-and-npm">https://docs.npmjs.com/downloading-and-installing-node-js-and-npm</a>'
+	. ' When you done with installing that tool, execute: "npm install" in the main MyAAC folder.';
 $locale['step_requirements_failed'] = 'Installation will be disabled until these requirements will be passed.</b><br/>For more informations see <b>README</b> file.';
 $locale['step_requirements_extension'] = '$EXTENSION$ PHP extension';
 $locale['step_requirements_warning_images_guilds'] = 'Guild logo upload will not work';

system/locale/pl/install.php

@@ -36,6 +36,10 @@ $locale['step_requirements'] = 'Wymagania';
 $locale['step_requirements_title'] = 'Sprawdzanie wymagań';
 $locale['step_requirements_php_version'] = 'Wersja PHP';
 $locale['step_requirements_write_perms'] = 'Uprawnienia do zapisu';
+$locale['step_requirements_folder_exists'] = 'Folder istnieje';
+$locale['step_requirements_folder_not_exists_tools_ext'] = 'Manadżer Pakietów NPM jest używany do zewnętrznych bibliotek JavaScript/CSS.'
+	. ' Trzeba go zainstalować poprzez wiersz poleceń: <a href="https://docs.npmjs.com/downloading-and-installing-node-js-and-npm">https://docs.npmjs.com/downloading-and-installing-node-js-and-npm</a>'
+	. ' Po instalacji narzędzia, wywołaj następujące polecenie w głownym katalogu MyAAC: "npm install".';
 $locale['step_requirements_failed'] = 'Instalacja zostanie zablokowana dopóki te wymagania nie zostaną spełnione.</b><br/>Po więcej informacji zasięgnij do pliku <b>README</b>.';
 $locale['step_requirements_extension'] = 'Rozszerzenie PHP - $EXTENSION$';
 $locale['step_requirements_warning_images_guilds'] = 'Nie będzie możliwości uploadu obrazków gildii';

system/logout.php

@@ -22,11 +22,5 @@ if(isset($account_logged) && $account_logged->isLoaded()) {
 
 		$logged = false;
 		unset($account_logged);
-
-		if(isset($_REQUEST['redirect']))
-		{
-			header('Location: ' . urldecode($_REQUEST['redirect']));
-			exit;
-		}
 	}
 }

system/pages/account/base.php

@@ -12,6 +12,8 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 if(!$logged)
 {
+	$title = 'Login';
+
 	if(!empty($errors))
 		$twig->display('error_box.html.twig', array('errors' => $errors));
 
@@ -19,7 +21,8 @@ if(!$logged)
 		'redirect' => $_REQUEST['redirect'] ?? null,
 		'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number',
 		'account_login_by' => getAccountLoginByLabel(),
-		'error' => $errors[0] ?? null
+		'error' => $errors[0] ?? null,
+		'errors' => $errors ?? [],
 	));
 
 	return;

system/pages/account/change-email.php

@@ -57,14 +57,14 @@ if($email_new_time < 10) {
 			$twig->display('error_box.html.twig', array('errors' => $errors));
 
 			//show form
-			$twig->display('account.change_mail.html.twig', array(
+			$twig->display('account.change-email.html.twig', array(
 				'new_email' => isset($_POST['new_email']) ? $_POST['new_email'] : null
 			));
 		}
 	}
 	else
 	{
-		$twig->display('account.change_mail.html.twig', array(
+		$twig->display('account.change-email.html.twig', array(
 			'new_email' => isset($_POST['new_email']) ? $_POST['new_email'] : null
 		));
 	}

system/pages/account/change-info.php

@@ -26,12 +26,13 @@ if(setting('core.account_country'))
 $account = Account::find($account_logged->getId());
 
 $show_form = true;
-$new_rlname = isset($_POST['info_rlname']) ? htmlspecialchars(stripslashes($_POST['info_rlname'])) : NULL;
-$new_location = isset($_POST['info_location']) ? htmlspecialchars(stripslashes($_POST['info_location'])) : NULL;
-$new_country = isset($_POST['info_country']) ? htmlspecialchars(stripslashes($_POST['info_country'])) : NULL;
+$new_rlname = isset($_POST['info_rlname']) ? htmlspecialchars(stripslashes($_POST['info_rlname'])) : '';
+$new_location = isset($_POST['info_location']) ? htmlspecialchars(stripslashes($_POST['info_location'])) : '';
+$new_country = isset($_POST['info_country']) ? htmlspecialchars(stripslashes($_POST['info_country'])) : '';
 if(isset($_POST['changeinfosave']) && $_POST['changeinfosave'] == 1) {
-	if(!isset($config['countries'][$new_country]))
+	if(setting('core.account_country') && !isset($config['countries'][$new_country])) {
 		$errors[] = 'Country is not correct.';
+	}
 
 	if(empty($errors)) {
 		//save data from form
@@ -39,7 +40,14 @@ if(isset($_POST['changeinfosave']) && $_POST['changeinfosave'] == 1) {
 		$account->location = $new_location;
 		$account->country = $new_country;
 		$account->save();
-		$account_logged->logAction('Changed Real Name to <b>' . $new_rlname . '</b>, Location to <b>' . $new_location . '</b> and Country to <b>' . $config['countries'][$new_country] . '</b>.');
+
+		$log = 'Changed Real Name to <b>' . $new_rlname . '</b>, Location to <b>' . $new_location . '</b>';
+		if(setting('core.account_country')) {
+			$log .= ' and Country to <b>' . $config['countries'][$new_country] . '</b>';
+		}
+		$log .= '.';
+
+		$account_logged->logAction($log);
 		$twig->display('success.html.twig', array(
 			'title' => 'Public Information Changed',
 			'description' => 'Your public information has been changed.'
@@ -68,7 +76,7 @@ if($show_form) {
 			$countries[$code] = $country;
 	}
 
-	$twig->display('account.change_info.html.twig', array(
+	$twig->display('account.change-info.html.twig', array(
 		'countries' => $countries ?? [],
 		'account_rlname' => $account_rlname,
 		'account_location' => $account_location,

system/pages/account/change-password.php

@@ -21,7 +21,7 @@ $new_password = $_POST['newpassword'] ?? NULL;
 $new_password_confirm = $_POST['newpassword_confirm'] ?? NULL;
 $old_password = $_POST['oldpassword'] ?? NULL;
 if(empty($new_password) && empty($new_password_confirm) && empty($old_password)) {
-	$twig->display('account.change_password.html.twig');
+	$twig->display('account.change-password.html.twig');
 }
 else
 {
@@ -52,7 +52,7 @@ else
 		$twig->display('error_box.html.twig', array('errors' => $errors));
 
 		//show form
-		$twig->display('account.change_password.html.twig');
+		$twig->display('account.change-password.html.twig');
 	}
 	else {
 		$org_pass = $new_password;

system/pages/account/characters/change-comment.php

@@ -14,7 +14,7 @@ use MyAAC\Models\Player;
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Change Comment';
-require __DIR__ . '/base.php';
+require PAGES . 'account/base.php';
 
 if(!$logged) {
 	return;
@@ -68,7 +68,7 @@ if($show_form) {
 	}
 
 	if(isset($player) && $player) {
-		$twig->display('account.change_comment.html.twig', array(
+		$twig->display('account.characters.change-comment.html.twig', array(
 			'player' => $player->toArray()
 		));
 	}

system/pages/account/characters/change-name.php

@@ -11,7 +11,7 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Change Name';
-require __DIR__ . '/base.php';
+require PAGES . 'account/base.php';
 
 if(!$logged) {
 	return;
@@ -109,7 +109,7 @@ else
 			$twig->display('error_box.html.twig', array('errors' => $errors));
 		}
 
-		$twig->display('account.change_name.html.twig', array(
+		$twig->display('account.characters.change-name.html.twig', array(
 			'points' => $points,
 			'errors' => $errors
 			//'account_players' => $account_logged->getPlayersList()

system/pages/account/characters/change-sex.php

@@ -11,7 +11,7 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Change Sex';
-require __DIR__ . '/base.php';
+require PAGES . 'account/base.php';
 
 if(!$logged) {
 	return;
@@ -88,7 +88,7 @@ else
 		if(!empty($errors)) {
 			$twig->display('error_box.html.twig', array('errors' => $errors));
 		}
-		$twig->display('account.change_sex.html.twig', array(
+		$twig->display('account.characters.change-sex.html.twig', array(
 			'players' => $account_logged->getPlayersList(false),
 			'player_sex' => isset($player) ? $player->getSex() : -1,
 			'points' => $points

system/pages/account/characters/create.php

@@ -14,7 +14,7 @@ use MyAAC\CreateCharacter;
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Create Character';
-require __DIR__ . '/base.php';
+require PAGES . 'account/base.php';
 
 if(!$logged) {
 	return;
@@ -43,7 +43,7 @@ if(count($errors) > 0) {
 }
 
 if(!$character_created) {
-	$twig->display('account.create_character.html.twig', array(
+	$twig->display('account.characters.create.html.twig', array(
 		'name' => $character_name,
 		'sex' => $character_sex,
 		'vocation' => $character_vocation,

system/pages/account/characters/delete.php

@@ -11,7 +11,7 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Delete Character';
-require __DIR__ . '/base.php';
+require PAGES . 'account/base.php';
 
 if(!$logged) {
 	return;
@@ -93,5 +93,5 @@ if($show_form) {
 		$twig->display('error_box.html.twig', array('errors' => $errors));
 	}
 
-	$twig->display('account.delete_character.html.twig');
+	$twig->display('account.characters.delete.html.twig');
 }

system/pages/account/confirm-email.php

@@ -25,16 +25,20 @@ if(!Account::where('email_hash', $hash)->exists()) {
 }
 else
 {
-	if (Account::where('email_hash', $hash)->where('email_verified', 0)->exists()) {
-		$query = $query->fetch(PDO::FETCH_ASSOC);
+	$accountModel = Account::where('email_hash', $hash)->where('email_verified', 0)->first();
+	if ($accountModel) {
+		$accountModel->email_verified = 1;
+		$accountModel->save();
+
+		success('You have now verified your e-mail, this will increase the security of your account. Thank you for doing this. You can now <a href=' . getLink('account/manage') . '>log in</a>.');
+
 		$account = new OTS_Account();
-		$account->load($query['id']);
+		$account->load($accountModel->id);
 		if ($account->isLoaded()) {
 			$hooks->trigger(HOOK_EMAIL_CONFIRMED, ['account' => $account]);
 		}
 	}
-
-	Account::where('email_hash', $hash)->update('email_verified', 1);
-	success('You have now verified your e-mail, this will increase the security of your account. Thank you for doing this.');
+	else {
+		error('Link has expired.');
+	}
 }
-?>

system/pages/account/create.php

@@ -227,7 +227,7 @@ if($save)
 			$hash = md5(generateRandomString(16, true, true) . $email);
 			$new_account->setCustomField('email_hash', $hash);
 
-			$verify_url = getLink('account/confirm_email/' . $hash);
+			$verify_url = getLink('account/confirm-email/' . $hash);
 			$body_html = $twig->render('mail.account.verify.html.twig', array(
 				'account' => $tmp_account,
 				'verify_url' => generateLink($verify_url, $verify_url, true)
@@ -236,6 +236,9 @@ if($save)
 			if(_mail($email, 'New account on ' . $config['lua']['serverName'], $body_html))
 			{
 				echo 'Your account has been created.<br/><br/>';
+
+				warning("Before you can login - you need to verify your E-Mail. The verification link has been sent to $email. If the message is not coming - remember to check the SPAM folder.");
+
 				$twig->display('success.html.twig', array(
 					'title' => 'Account Created',
 					'description' => 'Your account ' . $account_type . ' is <b>' . $tmp_account . '</b><br/>You will need the account ' . $account_type . ' and your password to play on ' . configLua('serverName') . '.
@@ -252,15 +255,6 @@ if($save)
 		}
 		else
 		{
-			if(setting('core.account_create_character_create')) {
-				// character creation
-				$character_created = $createCharacter->doCreate($character_name, $character_sex, $character_vocation, $character_town, $new_account, $errors);
-				if (!$character_created) {
-					error('There was an error creating your character. Please create your character later in account management page.');
-					error(implode(' ', $errors));
-				}
-			}
-
 			if(setting('core.account_create_auto_login')) {
 				if ($hasBeenCreatedByEMail) {
 					$_POST['account_login'] = $email;
@@ -311,6 +305,15 @@ if($save)
 			}
 		}
 
+		if(setting('core.account_create_character_create')) {
+			// character creation
+			$character_created = $createCharacter->doCreate($character_name, $character_sex, $character_vocation, $character_town, $new_account, $errors);
+			if (!$character_created) {
+				error('There was an error creating your character. Please create your character later in account management page.');
+				error(implode(' ', $errors));
+			}
+		}
+
 		return;
 	}
 }

system/pages/account/login.php

@@ -9,56 +9,61 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Login';
 
 // new login with data from form
-if(!$logged && isset($_POST['account_login'], $_POST['password_login']))
+if($logged || !isset($_POST['account_login']) || !isset($_POST['password_login'])) {
+	return;
+}
+
+$login_account = $_POST['account_login'];
+$login_password = $_POST['password_login'];
+$remember_me = isset($_POST['remember_me']);
+if(!empty($login_account) && !empty($login_password))
 {
-	$login_account = $_POST['account_login'];
-	$login_password = $_POST['password_login'];
-	$remember_me = isset($_POST['remember_me']);
-	if(!empty($login_account) && !empty($login_password))
+	if($cache->enabled())
 	{
-		if($cache->enabled())
+		$tmp = '';
+		if($cache->fetch('failed_logins', $tmp))
 		{
-			$tmp = '';
-			if($cache->fetch('failed_logins', $tmp))
+			$tmp = unserialize($tmp);
+			$to_remove = array();
+			foreach($tmp as $ip => $t)
 			{
-				$tmp = unserialize($tmp);
-				$to_remove = array();
-				foreach($tmp as $ip => $t)
-				{
-					if(time() - $t['last'] >= 5 * 60)
-						$to_remove[] = $ip;
-				}
-
-				foreach($to_remove as $ip)
-					unset($tmp[$ip]);
+				if(time() - $t['last'] >= 5 * 60)
+					$to_remove[] = $ip;
 			}
-			else
-				$tmp = array();
 
-			$ip = $_SERVER['REMOTE_ADDR'];
-			$t = $tmp[$ip] ?? null;
+			foreach($to_remove as $ip)
+				unset($tmp[$ip]);
 		}
+		else
+			$tmp = array();
 
-		$account_logged = new OTS_Account();
-		if (config('account_login_by_email')) {
-			$account_logged->findByEMail($login_account);
+		$ip = $_SERVER['REMOTE_ADDR'];
+		$t = $tmp[$ip] ?? null;
+	}
+
+	$account_logged = new OTS_Account();
+	if (config('account_login_by_email')) {
+		$account_logged->findByEMail($login_account);
+	}
+
+	if (!config('account_login_by_email') || config('account_login_by_email_fallback')) {
+		if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER) {
+			$account_logged->find($login_account);
+		} else {
+			$account_logged->load($login_account, true);
 		}
+	}
 
-		if (!config('account_login_by_email') || config('account_login_by_email_fallback')) {
-			if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER) {
-				$account_logged->find($login_account);
-			} else {
-				$account_logged->load($login_account, true);
-			}
+	if($account_logged->isLoaded() && encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $login_password) == $account_logged->getPassword()
+		&& (!isset($t) || $t['attempts'] < 5)
+	)
+	{
+		if (setting('core.account_mail_verify') && (int)$account_logged->getCustomField('email_verified') !== 1) {
+			$errors[] = 'Your account is not verified. Please verify your email address. If the message is not coming check the SPAM folder in your E-Mail client.';
 		}
-
-		if($account_logged->isLoaded() && encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $login_password) == $account_logged->getPassword()
-			&& (!isset($t) || $t['attempts'] < 5)
-		)
-		{
+		else {
 			session_regenerate_id();
 			setSession('account', $account_logged->getId());
 			setSession('password', encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $login_password));
@@ -82,44 +87,44 @@ if(!$logged && isset($_POST['account_login'], $_POST['password_login']))
 
 			$hooks->trigger(HOOK_LOGIN, array('account' => $account_logged, 'password' => $login_password, 'remember_me' => $remember_me));
 		}
-		else
+	}
+	else
+	{
+		$hooks->trigger(HOOK_LOGIN_ATTEMPT, array('account' => $login_account, 'password' => $login_password, 'remember_me' => $remember_me));
+
+		$errorMessage = getAccountLoginByLabel() . ' or password is not correct.';
+
+		// temporary solution for blocking failed login attempts
+		if($cache->enabled())
 		{
-			$hooks->trigger(HOOK_LOGIN_ATTEMPT, array('account' => $login_account, 'password' => $login_password, 'remember_me' => $remember_me));
-
-			$errorMessage = getAccountLoginByLabel() . ' or password is not correct.';
-
-			// temporary solution for blocking failed login attempts
-			if($cache->enabled())
+			if(isset($t))
 			{
-				if(isset($t))
-				{
-					$t['attempts']++;
-					$t['last'] = time();
+				$t['attempts']++;
+				$t['last'] = time();
 
-					if($t['attempts'] >= 5)
-						$errors[] = 'A wrong password has been entered 5 times in a row. You are unable to log into your account for the next 5 minutes. Please wait.';
-					else
-						$errors[] = $errorMessage;
-				}
+				if($t['attempts'] >= 5)
+					$errors[] = 'A wrong password has been entered 5 times in a row. You are unable to log into your account for the next 5 minutes. Please wait.';
 				else
-				{
-					$t = array('attempts' => 1, 'last' => time());
 					$errors[] = $errorMessage;
-				}
-
-				$tmp[$ip] = $t;
-				$cache->set('failed_logins', serialize($tmp), 60 * 60); // save for 1 hour
 			}
-			else {
+			else
+			{
+				$t = array('attempts' => 1, 'last' => time());
 				$errors[] = $errorMessage;
 			}
+
+			$tmp[$ip] = $t;
+			$cache->set('failed_logins', serialize($tmp), 60 * 60); // save for 1 hour
+		}
+		else {
+			$errors[] = $errorMessage;
 		}
 	}
-	else {
-		$errors[] = 'Please enter your ' . getAccountLoginByLabel() . ' and password.';
-
-		$hooks->trigger(HOOK_LOGIN_ATTEMPT, array('account' => $login_account, 'password' => $login_password, 'remember_me' => $remember_me));
-	}
-
-	$hooks->trigger(HOOK_ACCOUNT_LOGIN_POST);
 }
+else {
+	$errors[] = 'Please enter your ' . getAccountLoginByLabel() . ' and password.';
+
+	$hooks->trigger(HOOK_LOGIN_ATTEMPT, array('account' => $login_account, 'password' => $login_password, 'remember_me' => $remember_me));
+}
+
+$hooks->trigger(HOOK_ACCOUNT_LOGIN_POST);

system/pages/account/manage.php

@@ -22,6 +22,12 @@ if(isset($_REQUEST['redirect']))
 {
 	$redirect = urldecode($_REQUEST['redirect']);
 
+	// should never happen, unless hacker modify the URL
+	if (!str_contains($redirect, BASE_URL)) {
+		error('Fatal error: Cannot redirect outside the website.');
+		return;
+	}
+
 	$twig->display('account.redirect.html.twig', array(
 		'redirect' => $redirect
 	));
@@ -46,7 +52,7 @@ if(empty($recovery_key))
 else
 {
 	if(setting('core.account_generate_new_reckey') && setting('core.mail_enabled'))
-		$account_registered = '<b><span style="color: green">Yes ( <a href="' . getLink('account/register/new') . '"> Buy new Recovery Key </a> )</span></b>';
+		$account_registered = '<b><span style="color: green">Yes ( <a href="' . getLink('account/register-new') . '"> Buy new Recovery Key </a> )</span></b>';
 	else
 		$account_registered = '<b><span style="color: green">Yes</span></b>';
 }

system/pages/account/redirect.php

@@ -12,6 +12,12 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 $redirect = urldecode($_REQUEST['redirect']);
 
+// should never happen, unless hacker modify the URL
+if (!str_contains($redirect, BASE_URL)) {
+	error('Fatal error: Cannot redirect outside the website.');
+	return;
+}
+
 $twig->display('account.redirect.html.twig', array(
 	'redirect' => $redirect
 ));

system/pages/characters.php

@@ -8,6 +8,9 @@
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
+
+use MyAAC\Models\PlayerDeath;
+
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Characters';
 
@@ -199,7 +202,7 @@ if($player->isLoaded() && !$player->isDeleted())
 		unset($storage);
 	}
 
-	if($config['characters']['equipment'] && $db->hasTable('player_items') && $db->hasColumn('player_items', 'pid') && $db->hasColumn('player_items', 'sid') && $db->hasColumn('player_items', 'itemtype')) {
+	if($db->hasTable('player_items') && $db->hasColumn('player_items', 'pid') && $db->hasColumn('player_items', 'sid') && $db->hasColumn('player_items', 'itemtype')) {
 		$eq_sql = $db->query('SELECT `pid`, `itemtype` FROM player_items WHERE player_id = '.$player->getId().' AND (`pid` >= 1 and `pid` <= 10)');
 		$equipment = array();
 		foreach($eq_sql as $eq)
@@ -322,17 +325,36 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 
 	$frags = array();
 	$frag_add_content = '';
-	if($config['characters']['frags'] && $db->hasTable('killers')) {
-		//frags list by Xampy
-		$i = 0;
+	if ($config['characters']['frags']) {
 		$frags_limit = 10; // frags limit to show? // default: 10
-		$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.';')->fetchAll();
-		if(count($player_frags)) {
-			$row_count = 0;
-			foreach($player_frags as $frag)
-			{
-				$description = 'Fragged <a href="' . getPlayerLink($frag['name'], false) . '">' . $frag['name'] . '</a> at level ' . $frag['level'];
-				$frags[] = array('time' => $frag['date'], 'description' => $description, 'unjustified' => $frag['unjustified'] != 0);
+
+		if ($db->hasTable('killers')) {
+			//frags list by Xampy
+			$i = 0;
+			$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 . ';')->fetchAll();
+			if (count($player_frags)) {
+				$row_count = 0;
+				foreach ($player_frags as $frag) {
+					$description = 'Fragged <a href="' . getPlayerLink($frag['name'], false) . '">' . $frag['name'] . '</a> at level ' . $frag['level'];
+					$frags[] = array('time' => $frag['date'], 'description' => $description, 'unjustified' => $frag['unjustified'] != 0);
+				}
+			}
+		}
+		else if($db->hasTable('player_deaths') && $db->hasColumn('player_deaths', 'killed_by')) {
+			$i = 0;
+			$player_frags = PlayerDeath::where('player_deaths.killed_by', $player->getName())
+				->join('players', 'players.id', '=', 'player_deaths.player_id')
+				->limit($frags_limit)
+				->selectRaw('players.name, player_deaths.*')
+				->orderBy('player_deaths.time', 'DESC')
+				->get();
+
+			if ($player_frags->count()) {
+				$row_count = 0;
+				foreach ($player_frags as $frag) {
+					$description = 'Fragged <a href="' . getPlayerLink($frag->name, false) . '">' . $frag->name . '</a> at level ' . $frag->level;
+					$frags[] = array('time' => $frag->time, 'description' => $description, 'unjustified' => $frag->unjustified != 0);
+				}
 			}
 		}
 	}

system/pages/forum/edit_post.php

@@ -19,7 +19,7 @@ if ($ret === false) {
 }
 
 if(!$logged) {
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/move_thread.php

@@ -19,7 +19,7 @@ if ($ret === false) {
 }
 
 if(!$logged) {
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/new_post.php

@@ -24,7 +24,7 @@ if(!$logged) {
 		$extra_url = '?action=new_post&thread_id=' . $_GET['thread_id'];
 	}
 
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/new_thread.php

@@ -24,7 +24,7 @@ if(!$logged) {
 		$extra_url = '?action=new_thread&section_id=' . $_GET['section_id'];
 	}
 
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/remove_post.php

@@ -19,7 +19,7 @@ if ($ret === false) {
 }
 
 if(!$logged) {
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/show_thread.php

@@ -60,7 +60,7 @@ foreach($posts as &$post) {
 	}
 
 	if($config['characters']['outfit']) {
-		$post['outfit'] = setting('core.outfit_images_url') . '?id=' . $player->getLookType() . ($lookaddons ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet();
+		$post['outfit'] = $player->getOutfit();
 	}
 
 	$groupName = '';

system/pages/guilds/cleanup_players.php

@@ -40,7 +40,7 @@ if(count($players_list) > 0)
 				if(!$rank_guild->isLoaded())
 				{
 					$player->setRank();
-					$player->setGuildNick();
+					$player->setGuildNick('');
 					$changed_ranks_of[] = $player->getName();
 					$deleted_ranks[] = 'ID: '.$player_rank->getId().' - '.$player_rank->getName();
 					$player_rank->delete();

system/pages/guilds/create.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+use MyAAC\Models\GuildRank;
+
 require __DIR__ . '/base.php';
 
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
@@ -113,7 +115,25 @@ if(isset($todo) && $todo == 'save')
 	$new_guild->setOwner($player);
 	$new_guild->save();
 	$new_guild->setCustomField('description', setting('core.guild_description_default'));
-	//$new_guild->setCustomField('creationdata', time());
+
+	if ($db->hasTable('guild_ranks')) {
+		if (!GuildRank::where('guild_id', $new_guild->getId())->first()) {
+			$ranks = [
+				['level' => 3, 'name' => 'the Leader'],
+				['level' => 2, 'name' => 'a Vice-Leader'],
+				['level' => 1, 'name' => 'a Member'],
+			];
+
+			foreach ($ranks as $rank) {
+				GuildRank::create([
+					'guild_id' => $new_guild->getId(),
+					'name' => $rank['name'],
+					'level' => $rank['level'],
+				]);
+			}
+		}
+	}
+
 	$ranks = $new_guild->getGuildRanksList();
 	$ranks->orderBy('level', POT::ORDER_DESC);
 	foreach($ranks as $rank) {
@@ -124,14 +144,11 @@ if(isset($todo) && $todo == 'save')
 			$player->setRank($rank);
 		}
 	}
+
 	$twig->display('guilds.create.success.html.twig', array(
 		'guild_name' => $guild_name,
 		'leader_name' => $player->getName()
 	));
-
-	/*$db->exec('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "the Leader", 3)');
-	$db->exec('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "a Vice-Leader", 2)');
-	$db->exec('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "a Member", 1)');*/
 }
 else {
 	sort($array_of_player_nig);

system/pages/guilds/show.php

@@ -142,9 +142,7 @@ if($logged && count($invited_list) > 0)
 	}
 }
 
-$useGuildNick = false;
-if($db->hasColumn('players', 'guildnick'))
-	$useGuildNick = true;
+$useGuildNick = $db->hasTable('guild_members') || $db->hasTable('guild_membership') || $db->hasColumn('players', 'guildnick');
 
 $twig->display('guilds.view.html.twig', array(
 	'logo' => $guild_logo,
@@ -160,7 +158,6 @@ $twig->display('guilds.view.html.twig', array(
 	'level_in_guild' => $level_in_guild,
 	'isLeader' => $guild_leader,
 	'isVice' => $guild_vice,
-	'logged' => $logged,
 	'invited_list' => $invited_list,
 	'show_accept_invite' => $show_accept_invite,
 	'useGuildNick' => $useGuildNick

system/pages/highscores.php

@@ -182,7 +182,7 @@ if (empty($highscores)) {
 		if ($db->hasTable('player_killers')) {
 			$query->addSelect(['value' => PlayerKillers::where('player_killers.player_id', 'players.id')->selectRaw('COUNT(*)')]);
 		} else {
-			$query->addSelect(['value' => PlayerDeath::unjustified()->where('player_deaths.killed_by', 'players.name')->selectRaw('COUNT(*)')]);
+			$query->addSelect(['value' => PlayerDeath::unjustified()->whereColumn('player_deaths.killed_by', 'players.name')->selectRaw('COUNT(*)')]);
 		}
 	} else if ($skill == SKILL_BALANCE) // balance
 	{

system/pages/monsters.php

@@ -39,9 +39,12 @@ if (empty($_REQUEST['name'])) {
 
 // display monster
 $monster_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
-$monster = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first()->toArray();
+$monsterModel = Monster::where('hide', '!=', 1)->where('name', $monster_name)->first();
+
+if ($monsterModel && isset($monsterModel->name)) {
+	/** @var array $monster */
+	$monster = $monsterModel->toArray();
 
-if (isset($monster['name'])) {
 	function sort_by_chance($a, $b)
 	{
 		if ($a['chance'] == $b['chance']) {
@@ -79,7 +82,7 @@ if (isset($monster['name'])) {
 	));
 
 } else {
-	echo "Monster with name <b>" . $monster_name . "</b> doesn't exist.";
+	echo "Monster with name <b>" . htmlspecialchars($monster_name) . "</b> doesn't exist.";
 }
 
 // back button

system/pages/polls.php

@@ -51,7 +51,7 @@ function getColorByPercent($percent)
 					if($logged)
 						echo $link.'?id='.$poll['id'];
 					else
-						echo getLink('account/manage') . '?redirect=' . BASE_URL . urlencode($link.'?id='.$poll['id']);
+						echo getLink('account/manage') . '?redirect=' . urlencode($link.'?id='.$poll['id']);
 
 					echo '">'.$poll['question'] . '</a>
 				</td>
@@ -80,7 +80,7 @@ function getColorByPercent($percent)
 					if($logged)
 						echo $link.'?id='.$poll['id'];
 					else
-						echo getLink('account/manage') . '?redirect=' . BASE_URL . urlencode($link.'?id='.$poll['id']);
+						echo getLink('account/manage') . '?redirect=' . urlencode($link.'?id='.$poll['id']);
 
 					echo '">'.$poll['question'] . '</a>
 				</td>

system/router.php

@@ -91,35 +91,67 @@ if($logged && $account_logged && $account_logged->isLoaded()) {
 $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r) {
 	$routes = require SYSTEM . 'routes.php';
 
-	$isAlreadyDefined = [];
-
-	$routesTmp = [];
+	$routesFinal = [];
 	foreach(getDatabasePages() as $page) {
-		$isAlreadyDefined[$page] = true;
-		$routesTmp[] = ['*', $page, '__database__/' . $page, true];
+		$routesFinal[] = ['*', $page, '__database__/' . $page, 100];
 	}
 
 	Plugins::clearWarnings();
 	foreach (Plugins::getRoutes() as $route) {
-		if(!isset($isAlreadyDefined[$route[1]])) {
-			$isAlreadyDefined[$route[1]] = true;
-			$routesTmp[] = [$route[0], $route[1], $route[2]];
-		}
+		$routesFinal[] = [$route[0], $route[1], $route[2], $route[3] ?? 1000];
+/*
+		echo '<pre>';
+		var_dump($route[1], $route[3], $route[2]);
+		echo '/<pre>';
+*/
 	}
 
 	foreach ($routes as $route) {
-		if(!isset($isAlreadyDefined[$route[1]])) {
-			if (strpos($route[2], '__redirect__') === false && strpos($route[2], '__database__') === false) {
-				$routesTmp[] = [$route[0], $route[1], 'system/pages/' . $route[2]];
-			}
-			else {
-				$routesTmp[] = [$route[0], $route[1], $route[2]];
-			}
+		if (!str_contains($route[2], '__redirect__') && !str_contains($route[2], '__database__')) {
+			$routesFinal[] = [$route[0], $route[1], 'system/pages/' . $route[2], $route[3] ?? 10000];
+		}
+		else {
+			$routesFinal[] = [$route[0], $route[1], $route[2], $route[3] ?? 10000];
 		}
 	}
 
-	//var_dump($routesTmp);
-	foreach ($routesTmp as $route) {
+	// sort required for the next step (filter)
+	usort($routesFinal, function ($a, $b)
+	{
+		// key 3 is priority
+		if ($a[3] == $b[3]) {
+			return 0;
+		}
+
+		return ($a[3] < $b[3]) ? -1 : 1;
+	});
+
+	// remove duplicates
+	// if same route pattern, but different priority
+	$routesFinal = array_filter($routesFinal, function ($a) {
+		$aliases = [
+			[':int', ':string', ':alphanum'],
+			[':\d+', ':[A-Za-z0-9-_%+\' ]+', ':[A-Za-z0-9]+'],
+		];
+
+		// apply aliases
+		$a[1] = str_replace($aliases[0], $aliases[1], $a[1]);
+
+		static $duplicates = [];
+		if (isset($duplicates[$a[1]])) {
+			return false;
+		}
+
+		$duplicates[$a[1]] = true;
+		return true;
+	});
+/*
+	echo '<pre>';
+	var_dump($routesFinal);
+	echo '</pre>';
+	die;
+*/
+	foreach ($routesFinal as $route) {
 		if ($route[0] === '*') {
 			$route[0] = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'];
 		}

system/routes.php

@@ -11,50 +11,56 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 return [
 	['GET', '', 'news.php'], // empty URL = show news
-	['GET', 'news/archive/{id:int}[/]', 'news/archive.php'],
-	['GET', 'news/{id:int}[/]', 'news/archive.php'],
+	['GET', 'news/archive/{id:int}', 'news/archive.php'],
+	['GET', 'news/{id:int}', 'news/archive.php'],
 
 	// block access to some files
-	['*', 'account/base[/]', '404.php'], // this is to block account/base.php
-	['*', 'forum/base[/]', '404.php'],
-	['*', 'guilds/base[/]', '404.php'],
+	['*', 'account/base', '404.php', 10], // this is to block account/base.php
+	['*', 'forum/base', '404.php', 10],
+	['*', 'guilds/base', '404.php', 10],
 
-	[['GET', 'POST'], 'account/password[/]', 'account/change_password.php'],
-	[['GET', 'POST'], 'account/register/new[/]', 'account/register_new.php'],
-	[['GET', 'POST'], 'account/email[/]', 'account/change_email.php'],
-	[['GET', 'POST'], 'account/info[/]', 'account/change_info.php'],
-	[['GET', 'POST'], 'account/character/create[/]', 'account/create_character.php'],
-	[['GET', 'POST'], 'account/character/name[/]', 'account/change_name.php'],
-	[['GET', 'POST'], 'account/character/sex[/]', 'account/change_sex.php'],
-	[['GET', 'POST'], 'account/character/delete[/]', 'account/delete_character.php'],
-	[['GET', 'POST'], 'account/character/comment[/{name:[A-Za-z0-9-_%+\']+}]', 'account/change_comment.php'],
-	['GET', 'account/confirm_email/{hash:alphanum}[/]', 'account/confirm_email.php'],
+	['GET', 'account/confirm-email/{hash:alphanum}', 'account/confirm-email.php'],
 
-	['GET', 'bans/{page:int}[/]', 'bans.php'],
+	['GET', 'bans/{page:int}', 'bans.php'],
 	[['GET', 'POST'], 'characters[/{name:string}]', 'characters.php'],
 	['GET', 'changelog[/{page:int}]', 'changelog.php'],
 	[['GET', 'POST'], 'monsters[/{name:string}]', 'monsters.php'],
 
 	[['GET', 'POST'], 'faq[/{action:string}]', 'faq.php'],
 
-	[['GET', 'POST'], 'forum/{action:string}[/]', 'forum.php'],
-	['GET', 'forum/board/{id:int}[/]', 'forum/show_board.php'],
-	['GET', 'forum/board/{id:int}/{page:[0-9]+}[/]', 'forum/show_board.php'],
-	['GET', 'forum/thread/{id:int}[/]', 'forum/show_thread.php'],
-	['GET', 'forum/thread/{id:int}/{page:int}[/]', 'forum/show_thread.php'],
+	[['GET', 'POST'], 'forum/{action:string}', 'forum.php'],
+	['GET', 'forum/board/{id:int}', 'forum/show_board.php'],
+	['GET', 'forum/board/{id:int}/{page:[0-9]+}', 'forum/show_board.php'],
+	['GET', 'forum/thread/{id:int}', 'forum/show_thread.php'],
+	['GET', 'forum/thread/{id:int}/{page:int}', 'forum/show_thread.php'],
 
-	['GET', 'gallery/{image:int}[/]', 'gallery.php'],
-	[['GET', 'POST'], 'gallery/{action:string}[/]', 'gallery.php'],
+	['GET', 'gallery/{image:int}', 'gallery.php'],
+	[['GET', 'POST'], 'gallery/{action:string}', 'gallery.php'],
 
-	[['GET', 'POST'], 'guilds/{guild:string}[/]', 'guilds/show.php'],
+	[['GET', 'POST'], 'guilds/{guild:string}', 'guilds/show.php'],
 
-	['GET', 'highscores/{list:alphanum}/{vocation:alphanum}/{page:int}[/]', 'highscores.php'],
-	['GET', 'highscores/{list:alphanum}/{page:int}[/]', 'highscores.php'],
-	['GET', 'highscores/{list:alphanum}/{vocation:alphanum}[/]', 'highscores.php'],
-	['GET', 'highscores/{list:alphanum}[/]', 'highscores.php'],
+	['GET', 'highscores/{list:alphanum}/{vocation:alphanum}/{page:int}', 'highscores.php'],
+	['GET', 'highscores/{list:alphanum}/{page:int}', 'highscores.php'],
+	['GET', 'highscores/{list:alphanum}/{vocation:alphanum}', 'highscores.php'],
+	['GET', 'highscores/{list:alphanum}', 'highscores.php'],
 /*
-	'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
 	'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1'),
 	'/^spells\/[A-Za-z0-9-_%]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'spells', 'vocation' => '$1', 'order' => '$2'),
 	'/^houses\/view\/?$/' => array('subtopic' => 'houses', 'page' => 'view')*/
+
+	/**
+	 * Deprecated
+	 * To be removed in next versions
+	 * Kept just for compatibility
+	 */
+	[['GET', 'POST'], 'account/password', 'account/change-password.php'],
+	[['GET', 'POST'], 'account/register/new', 'account/register-new.php'],
+	[['GET', 'POST'], 'account/email', 'account/change-email.php'],
+	[['GET', 'POST'], 'account/info', 'account/change-info.php'],
+	[['GET', 'POST'], 'account/character/create', 'account/characters/create.php'],
+	[['GET', 'POST'], 'account/character/name', 'account/characters/change-name.php'],
+	[['GET', 'POST'], 'account/character/sex', 'account/characters/change-sex.php'],
+	[['GET', 'POST'], 'account/character/delete', 'account/characters/delete.php'],
+	[['GET', 'POST'], 'account/character/comment[/{name:string}]', 'account/characters/change-comment.php'],
+	['GET', 'account/confirm_email/{hash:alphanum}', 'account/confirm-email.php'],
 ];

system/settings.php

@@ -735,7 +735,7 @@ Sent by MyAAC,<br/>
 			'name' => 'Name Min Length',
 			'type' => 'number',
 			'desc' => '',
-			'default' => 4,
+			'default' => 3,
 		],
 		'create_character_name_max_length' => [
 			'name' => 'Name Max Length',

system/src/CreateCharacter.php

@@ -149,9 +149,9 @@ class CreateCharacter
 		if(empty($errors))
 		{
 			$char_to_copy_name = config('character_samples')[$vocation];
-			$char_to_copy = new \OTS_Player();
-			$char_to_copy->find($char_to_copy_name);
-			if(!$char_to_copy->isLoaded())
+			$playerSample = new \OTS_Player();
+			$playerSample->find($char_to_copy_name);
+			if(!$playerSample->isLoaded())
 				$errors[] = 'Wrong characters configuration. Try again or contact with admin. ADMIN: Go to Admin Panel -> Settings -> Create Character and set valid characters to copy names. Character to copy: <b>'.$char_to_copy_name.'</b> doesn\'t exist.';
 		}
 
@@ -162,72 +162,72 @@ class CreateCharacter
 		global $db;
 
 		if($sex == "0")
-			$char_to_copy->setLookType(136);
+			$playerSample->setLookType(136);
 
 		$player = new \OTS_Player();
 		$player->setName($name);
 		$player->setAccount($account);
 		$player->setGroupId(1);
 		$player->setSex($sex);
-		$player->setVocation($char_to_copy->getVocation());
+		$player->setVocation($playerSample->getVocation());
 		if($db->hasColumn('players', 'promotion'))
-			$player->setPromotion($char_to_copy->getPromotion());
+			$player->setPromotion($playerSample->getPromotion());
 
 		if($db->hasColumn('players', 'direction'))
-			$player->setDirection($char_to_copy->getDirection());
+			$player->setDirection($playerSample->getDirection());
 
-		$player->setConditions($char_to_copy->getConditions());
-		$rank = $char_to_copy->getRank();
+		$player->setConditions($playerSample->getConditions());
+		$rank = $playerSample->getRank();
 		if($rank->isLoaded()) {
-			$player->setRank($char_to_copy->getRank());
+			$player->setRank($playerSample->getRank());
 		}
 
 		if($db->hasColumn('players', 'lookaddons'))
-			$player->setLookAddons($char_to_copy->getLookAddons());
+			$player->setLookAddons($playerSample->getLookAddons());
 
 		$player->setTownId($town);
-		$player->setExperience($char_to_copy->getExperience());
-		$player->setLevel($char_to_copy->getLevel());
-		$player->setMagLevel($char_to_copy->getMagLevel());
-		$player->setHealth($char_to_copy->getHealth());
-		$player->setHealthMax($char_to_copy->getHealthMax());
-		$player->setMana($char_to_copy->getMana());
-		$player->setManaMax($char_to_copy->getManaMax());
-		$player->setManaSpent($char_to_copy->getManaSpent());
-		$player->setSoul($char_to_copy->getSoul());
+		$player->setExperience($playerSample->getExperience());
+		$player->setLevel($playerSample->getLevel());
+		$player->setMagLevel($playerSample->getMagLevel());
+		$player->setHealth($playerSample->getHealth());
+		$player->setHealthMax($playerSample->getHealthMax());
+		$player->setMana($playerSample->getMana());
+		$player->setManaMax($playerSample->getManaMax());
+		$player->setManaSpent($playerSample->getManaSpent());
+		$player->setSoul($playerSample->getSoul());
 
 		for($skill = \POT::SKILL_FIRST; $skill <= \POT::SKILL_LAST; $skill++) {
 			$value = 10;
 			if (setting('core.use_character_sample_skills')) {
-				$value = $char_to_copy->getSkill($skill);
+				$value = $playerSample->getSkill($skill);
 			}
 
 			$player->setSkill($skill, $value);
 		}
 
-		$player->setLookBody($char_to_copy->getLookBody());
-		$player->setLookFeet($char_to_copy->getLookFeet());
-		$player->setLookHead($char_to_copy->getLookHead());
-		$player->setLookLegs($char_to_copy->getLookLegs());
-		$player->setLookType($char_to_copy->getLookType());
-		$player->setCap($char_to_copy->getCap());
+		$player->setLookBody($playerSample->getLookBody());
+		$player->setLookFeet($playerSample->getLookFeet());
+		$player->setLookHead($playerSample->getLookHead());
+		$player->setLookLegs($playerSample->getLookLegs());
+		$player->setLookType($playerSample->getLookType());
+		$player->setCap($playerSample->getCap());
 		$player->setBalance(0);
 		$player->setPosX(0);
 		$player->setPosY(0);
 		$player->setPosZ(0);
 
 		if($db->hasColumn('players', 'stamina')) {
-			$player->setStamina($char_to_copy->getStamina());
+			$player->setStamina($playerSample->getStamina());
 		}
 
 		if($db->hasColumn('players', 'loss_experience')) {
-			$player->setLossExperience($char_to_copy->getLossExperience());
-			$player->setLossMana($char_to_copy->getLossMana());
-			$player->setLossSkills($char_to_copy->getLossSkills());
+			$player->setLossExperience($playerSample->getLossExperience());
+			$player->setLossMana($playerSample->getLossMana());
+			$player->setLossSkills($playerSample->getLossSkills());
 		}
 		if($db->hasColumn('players', 'loss_items')) {
-			$player->setLossItems($char_to_copy->getLossItems());
-			$player->setLossContainers($char_to_copy->getLossContainers());
+			$player->setLossItems($playerSample->getLossItems());
+			$player->setLossContainers($playerSample->getLossContainers());
 		}
 
 		$player->save();
@@ -245,7 +245,7 @@ class CreateCharacter
 			for($skill = \POT::SKILL_FIRST; $skill <= \POT::SKILL_LAST; $skill++) {
 				$value = 10;
 				if (setting('core.use_character_sample_skills')) {
-					$value = $char_to_copy->getSkill($skill);
+					$value = $playerSample->getSkill($skill);
 				}
 				$skillExists = $db->query('SELECT `skillid` FROM `player_skills` WHERE `player_id` = ' . $player->getId() . ' AND `skillid` = ' . $skill);
 				if($skillExists->rowCount() <= 0) {
@@ -255,7 +255,7 @@ class CreateCharacter
 		}
 
 		if ($db->hasTable('player_items') && $db->hasColumn('player_items', 'pid') && $db->hasColumn('player_items', 'sid') && $db->hasColumn('player_items', 'itemtype')) {
-			$loaded_items_to_copy = $db->query("SELECT * FROM player_items WHERE player_id = ".$char_to_copy->getId()."");
+			$loaded_items_to_copy = $db->query("SELECT * FROM player_items WHERE player_id = ".$playerSample->getId()."");
 			foreach($loaded_items_to_copy as $save_item) {
 				$blob = $db->quote($save_item['attributes']);
 				$db->query("INSERT INTO `player_items` (`player_id` ,`pid` ,`sid` ,`itemtype`, `count`, `attributes`) VALUES ('".$player->getId()."', '".$save_item['pid']."', '".$save_item['sid']."', '".$save_item['itemtype']."', '".$save_item['count']."', $blob);");
@@ -267,6 +267,7 @@ class CreateCharacter
 			[
 				'account' => $account,
 				'player' => $player,
+				'samplePlayer' => $playerSample,
 				'name' => $name,
 				'sex' => $sex,
 				'vocation' => $vocation,

system/src/Models/GuildRank.php

@@ -9,6 +9,8 @@ class GuildRank extends Model {
 
 	public $timestamps = false;
 
+	protected $fillable = ['guild_id', 'name', 'level'];
+
 	public function guild()
 	{
 		return $this->belongsTo(Guild::class);

system/src/Plugins.php

@@ -23,18 +23,15 @@ class Plugins {
 
 		$routes = [];
 		foreach(self::getAllPluginsJson() as $plugin) {
-			$pluginPages = glob(PLUGINS . $plugin['filename'] . '/pages/*.php');
-			foreach ($pluginPages as $file) {
-				$file = str_replace(PLUGINS, 'plugins/', $file);
-				$name = pathinfo($file, PATHINFO_FILENAME);
-
-				$routes[] = [['get', 'post'], $name, $file, 1000];
+			$routesDefaultPriority = 1000;
+			if (isset($plugin['routes-default-priority'])) {
+				$routesDefaultPriority = $plugin['routes-default-priority'];
 			}
 
 			$warningPreTitle = 'Plugin: ' . $plugin['name'] . ' - ';
 
 			if (isset($plugin['routes'])) {
-				foreach ($plugin['routes'] as $_name => $info) {
+				foreach ($plugin['routes'] as $info) {
 					// default method: get
 					$method = $info['method'] ?? ['GET'];
 					if ($method !== '*') {
@@ -51,7 +48,7 @@ class Plugins {
 					}
 
 					if (!isset($info['priority'])) {
-						$info['priority'] = 100; // default priority
+						$info['priority'] = $routesDefaultPriority; // default priority taken from plugin.json
 					}
 
 					if (isset($info['redirect_from'])) {
@@ -70,39 +67,75 @@ class Plugins {
 					// replace first occurrence of / in pattern if found (will be auto-added later)
 					removeIfFirstSlash($info['pattern']);
 
-					foreach ($routes as $id => &$route) {
-						if($route[1] == $info['pattern']) {
-							if($info['priority'] < $route[3]) {
-								self::$warnings[] = $warningPreTitle . "Duplicated route with lower priority: {$info['pattern']}. Disabling this route...";
-								continue 2;
-							}
-							else {
-								self::$warnings[] = $warningPreTitle . "Duplicated route with lower priority: {$route[1]} ({$route[3]}). Disabling this route...";
-								unset($routes[$id]);
-							}
-						}
-					}
-
 					$routes[] = [$methods, $info['pattern'], $info['file'], $info['priority']];
 				}
 			}
-		}
-		/*
-				usort($routes, function ($a, $b)
-				{
-					// key 3 is priority
-					if ($a[3] == $b[3]) {
-						return 0;
+
+			$pagesDefaultPriority = 1000;
+			if (isset($plugin['pages-default-priority'])) {
+				$pagesDefaultPriority = $plugin['pages-default-priority'];
+			}
+
+			if (self::getAutoLoadOption($plugin, 'pages', true)) {
+				//
+				// Get all plugins/*/pages/*.php pages
+				//
+				$pluginPages = glob(PLUGINS . $plugin['filename'] . '/pages/*.php');
+				foreach ($pluginPages as $file) {
+					$file = str_replace(PLUGINS, 'plugins/', $file);
+					$name = pathinfo($file, PATHINFO_FILENAME);
+
+					$routes[] = [['get', 'post'], $name, $file, $pagesDefaultPriority];
+				}
+			}
+
+			if (self::getAutoLoadOption($plugin, 'pagesSubFolders', true)) {
+				//
+				// Get all plugins/*/pages/subFolder/*.php pages
+				//
+				$pluginPagesSubFolders = glob(PLUGINS . $plugin['filename'] . '/pages/*', GLOB_ONLYDIR);
+				foreach ($pluginPagesSubFolders as $folder) {
+					$folderName = pathinfo($folder, PATHINFO_FILENAME);
+
+					$subFiles = glob(PLUGINS . $plugin['filename'] . '/pages/' . $folderName . '/*.php');
+					foreach ($subFiles as $file) {
+						$file = str_replace(PLUGINS, 'plugins/', $file);
+						$name = $folderName . '/' . pathinfo($file, PATHINFO_FILENAME);
+
+						$routes[] = [['get', 'post'], $name, $file, $pagesDefaultPriority];
 					}
 
-					return ($a[3] > $b[3]) ? -1 : 1;
-				});
-		*/
+					$subFolders = glob(PLUGINS . $plugin['filename'] . '/pages/' . $folderName . '/*', GLOB_ONLYDIR);
+					foreach ($subFolders as $subFolder) {
+						$subFolderName = pathinfo($subFolder, PATHINFO_FILENAME);
+						$subSubFiles = glob(PLUGINS . $plugin['filename'] . '/pages/' . $folderName . '/' . $subFolderName . '/*.php');
+
+						foreach ($subSubFiles as $subSubFile) {
+							$subSubFile = str_replace(PLUGINS, 'plugins/', $subSubFile);
+							$name = $folderName . '/' . $subFolderName . '/' . pathinfo($subSubFile, PATHINFO_FILENAME);
+
+							$routes[] = [['get', 'post'], $name, $subSubFile, $pagesDefaultPriority];
+						}
+					}
+				}
+			}
+		}
+
+		usort($routes, function ($a, $b)
+		{
+			// key 3 is priority
+			if ($a[3] == $b[3]) {
+				return 0;
+			}
+
+			return ($a[3] < $b[3]) ? -1 : 1;
+		});
+
 		// cleanup before passing back
 		// priority is not needed anymore
-		foreach ($routes as &$route) {
-			unset($route[3]);
-		}
+		//foreach ($routes as &$route) {
+		//	unset($route[3]);
+		//}
 
 		if ($cache->enabled()) {
 			$cache->set('plugins_routes', serialize($routes), 600);
@@ -123,6 +156,10 @@ class Plugins {
 
 		$themes = [];
 		foreach(self::getAllPluginsJson() as $plugin) {
+			if (!self::getAutoLoadOption($plugin, 'themes', true)) {
+				continue;
+			}
+
 			$pluginThemes = glob(PLUGINS . $plugin['filename'] . '/themes/*', GLOB_ONLYDIR);
 			foreach ($pluginThemes as $path) {
 				$path = str_replace(PLUGINS, 'plugins/', $path);
@@ -151,6 +188,10 @@ class Plugins {
 
 		$commands = [];
 		foreach(self::getAllPluginsJson() as $plugin) {
+			if (!self::getAutoLoadOption($plugin, 'commands', true)) {
+				continue;
+			}
+
 			$pluginCommands = glob(PLUGINS . $plugin['filename'] . '/commands/*.php');
 			foreach ($pluginCommands as $path) {
 				$commands[] = $path;
@@ -178,13 +219,19 @@ class Plugins {
 		foreach(self::getAllPluginsJson() as $plugin) {
 			if (isset($plugin['hooks'])) {
 				foreach ($plugin['hooks'] as $_name => $info) {
+					$priority = 1000;
+
 					if (str_contains($info['type'], 'HOOK_')) {
 						$info['type'] = str_replace('HOOK_', '', $info['type']);
 					}
 
+					if (isset($info['priority'])) {
+						$priority = (int)$info['priority'];
+					}
+
 					if (defined('HOOK_'. $info['type'])) {
 						$hook = constant('HOOK_'. $info['type']);
-						$hooks[] = ['name' => $_name, 'type' => $hook, 'file' => $info['file']];
+						$hooks[] = ['name' => $_name, 'type' => $hook, 'file' => $info['file'], 'priority' => $priority];
 					} else {
 						self::$warnings[] = 'Plugin: ' . $plugin['name'] . '. Unknown event type: ' . $info['type'];
 					}
@@ -192,6 +239,15 @@ class Plugins {
 			}
 		}
 
+		usort($hooks, function ($a, $b)
+		{
+			if ($a['priority'] == $b['priority']) {
+				return 0;
+			}
+
+			return ($a['priority'] < $b['priority']) ? -1 : 1;
+		});
+
 		if ($cache->enabled()) {
 			$cache->set('plugins_hooks', serialize($hooks), 600);
 		}
@@ -757,4 +813,21 @@ class Plugins {
 			}
 		}
 	}
+
+	private static function getAutoLoadOption(array $plugin, string $optionName, bool $default = true)
+	{
+		if (isset($plugin['autoload'])) {
+			$autoload = $plugin['autoload'];
+			if (is_array($autoload)) {
+				if (isset($autoload[$optionName])) {
+					return getBoolean($autoload[$optionName]);
+				}
+			}
+			else if (is_bool($autoload)) {
+				return $autoload;
+			}
+		}
+
+		return $default;
+	}
 }

system/src/Settings.php

@@ -382,6 +382,8 @@ class Settings implements \ArrayAccess
 		}
 
 		$this->settingsDatabase[$pluginKeyName][$key] = $value;
+		// invalidate cache
+		unset($this->cache[$offset]);
 	}
 
 	#[\ReturnTypeWillChange]

system/src/Towns.php

@@ -124,6 +124,6 @@ class Towns
 	 */
 	public static function getFromDatabase()
 	{
-		return Town::pluck('name', 'id')->toArray();
+		return Town::orderBy('id', 'ASC')->pluck('name', 'id')->toArray();
 	}
 }

system/src/Twig/Extension/TypeCastingExtension.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyAAC\Twig\Extension;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+final class TypeCastingExtension extends AbstractExtension
+{
+	/** @return array<int, TwigFilter> */
+	public function getFilters(): array
+	{
+		return [
+			new TwigFilter('int', function ($value) {
+				return (int)$value;
+			}),
+			new TwigFilter('float', function ($value) {
+				return (float)$value;
+			}),
+			new TwigFilter('string', function ($value) {
+				return (string)$value;
+			}),
+			new TwigFilter('bool', function ($value) {
+				return (bool)$value;
+			}),
+			new TwigFilter('array', function (object $value) {
+				return (array)$value;
+			}),
+			new TwigFilter('object', function (array $value) {
+				return (object)$value;
+			}),
+		];
+	}
+}

system/src/global.php

@@ -54,6 +54,11 @@ define('HOOK_ACCOUNT_LOGIN_AFTER_REMEMBER_ME', ++$i);
 define('HOOK_ACCOUNT_LOGIN_AFTER_PAGE', ++$i);
 define('HOOK_ACCOUNT_LOGIN_POST', ++$i);
 define('HOOK_ACCOUNT_CREATE_CHARACTER_AFTER', ++$i);
+define('HOOK_ACCOUNT_CREATE_CHARACTER_BEFORE_FIRST_TABLE', ++$i);
+define('HOOK_ACCOUNT_CREATE_CHARACTER_BEFORE_VOCATIONS', ++$i);
+define('HOOK_ACCOUNT_CREATE_CHARACTER_BEFORE_TOWNS', ++$i);
+define('HOOK_ACCOUNT_CREATE_CHARACTER_AFTER_TOWNS', ++$i);
+define('HOOK_ACCOUNT_CREATE_CHARACTER_AFTER_SECOND_TABLE', ++$i);
 define('HOOK_ADMIN_HEAD_END', ++$i);
 define('HOOK_ADMIN_HEAD_START', ++$i);
 define('HOOK_ADMIN_BODY_START', ++$i);
@@ -74,6 +79,8 @@ define('HOOK_GUILDS_AFTER_GUILD_MEMBERS', ++$i);
 define('HOOK_GUILDS_AFTER_INVITED_CHARACTERS', ++$i);
 define('HOOK_TWIG', ++$i);
 define('HOOK_CACHE_CLEAR', ++$i);
+define('HOOK_INSTALL_FINISH', ++$i);
+define('HOOK_INSTALL_FINISH_END', ++$i);
 
 const HOOK_FIRST = HOOK_STARTUP;
 define('HOOK_LAST', $i);

system/templates/account.change-email.html.twig

@@ -0,0 +1,54 @@
+Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <br/><b>For security reasons, the actual change will be finalised after a waiting period of {{ setting('core.account_mail_change') }} days.</b><br/><br/>
+{% set title = 'Change Email Address' %}
+{% set background = config('darkborder') %}
+{% set content %}
+	<table style="width:100%;">
+		<tr>
+			<td class="LabelV" >
+				<span>New Email Address:</span>
+			</td>
+			<td style="width:90%;">
+				<input form="form" name="new_email" value="{% if new_email is defined %}{{ new_email }}{% endif %}" size="30" maxlength="50" autofocus/>
+			</td>
+		</tr>
+		<tr>
+			<td class="LabelV">
+				<span >Password:</span>
+			</td>
+			<td>
+				<input form="form" type="password" name="password" size="30" maxlength="29">
+			</td>
+		</tr>
+	</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+<br/>
+<table style="width:100%;">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/change-email') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="changeemailsave" value="1"/>
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				<tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<form action="{{ getLink('account/manage') }}" method="post">
+					{{ csrf() }}
+					<tr>
+						<td style="border:0px;">
+							{{ include('buttons.back.html.twig') }}
+						</td>
+					</tr>
+				</form>
+			</table>
+		</td>
+	</tr>
+</table>

system/templates/account.change-info.html.twig

@@ -0,0 +1,84 @@
+Here you can tell other players about yourself. This information will be displayed alongside the data of your characters. If you do not want to fill in a certain field, just leave it blank.<br/><br/>
+{% set title = 'Change Public Information' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width: 100%;" >
+	<tr>
+		<td class="LabelV">Real Name:</td>
+		<td style="width:90%;" >
+			<input form="form" name="info_rlname" value="{{ account_rlname }}" size="30" maxlength="50" >
+		</td>
+	</tr>
+	<tr>
+		<td class="LabelV" >Location:</td>
+		<td>
+			<input form="form" name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
+		</td>
+	</tr>
+	{% if setting('core.account_country') %}
+	<tr>
+		<td class="LabelV">Country:</td>
+		<td>
+			<select form="form" name="info_country" id="account_country">
+				{% for code, country in countries %}
+				<option value="{{ code}}"{% if account_country == code %} selected{% endif %}>{{ country }} </option>
+				{% endfor %}
+			</select>
+			<img src="" id="account_country_img"/>
+			<script>
+				function updateFlag()
+				{
+					var img = $('#account_country_img');
+					var country = $('#account_country :selected').val();
+					if(country.length) {
+						img.attr('src', 'images/flags/' + country + '.gif');
+						img.show();
+					}
+					else {
+						img.hide();
+					}
+				}
+
+				$(function() {
+					updateFlag();
+					$('#account_country').change(function() {
+						updateFlag();
+					});
+				});
+			</script>
+		</td>
+	</tr>
+	{% endif %}
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+<br/>
+<table width="100%">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0" >
+				<tr>
+					<td style="border:0px;" >
+						<form id="form" action="{{ getLink('account/change-info') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="changeinfosave" value="1">
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0" >
+				<tr>
+					<td style="border:0px;" >
+						<form action="{{ getLink('account/manage') }}" method="post" >
+							{{ csrf() }}
+							{{ include('buttons.back.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>

system/templates/account.change-password.html.twig

@@ -0,0 +1,62 @@
+Please enter your current password and a new password. For your security, please enter the new password twice.<br/>
+<br/>
+{% set title = 'Change Password' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;">
+	<tr>
+		<td class="LabelV">
+			<span>New Password:</span>
+		</td>
+		<td style="width:90%;">
+			<input form="form" type="password" name="newpassword" size="30" maxlength="29">
+		</td>
+	</tr>
+	<tr>
+		<td class="LabelV">
+			<span>New Password Again:</span>
+		</td>
+		<td>
+			<input form="form" type="password" name="newpassword_confirm" size="30" maxlength="29">
+		</td>
+	</tr>
+	<tr>
+		<td class="LabelV">
+			<span>Current Password:</span>
+		</td>
+		<td>
+			<input form="form" type="password" name="oldpassword" size="30" maxlength="29">
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+<br/>
+<table style="width:100%;">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/change-password') }}" method="post">
+							{{ csrf() }}
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				<tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form action="{{ getLink('account/manage') }}" method="post">
+							{{ csrf() }}
+							{{ include('buttons.back.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>

system/templates/account.change_info.html.twig

@@ -1,102 +0,0 @@
-Here you can tell other players about yourself. This information will be displayed alongside the data of your characters. If you do not want to fill in a certain field, just leave it blank.<br/><br/>
-<form action="{{ getLink('account/info') }}" method="post">
-	{{ csrf() }}
-	<div class="TableContainer" >
-		<table class="Table1" cellpadding="0" cellspacing="0" >
-			<div class="CaptionContainer" >
-				<div class="CaptionInnerContainer" >
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
-					<div class="Text" >Change Public Information</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer" >
-						<table style="width:100%;" >
-							<tr>
-								<td class="LabelV" >Real Name:</td>
-								<td style="width:90%;" >
-									<input name="info_rlname" value="{{ account_rlname }}" size="30" maxlength="50" >
-								</td>
-							</tr>
-							<tr>
-								<td class="LabelV" >Location:</td>
-								<td>
-									<input name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
-								</td>
-							</tr>
-							{% if setting('core.account_country') %}
-							<tr>
-								<td class="LabelV" >Country:</td>
-								<td>
-									<select name="info_country" id="account_country">
-										{% for code, country in countries %}
-										<option value="{{ code}}"{% if account_country == code %} selected{% endif %}>{{ country }} </option>
-										{% endfor %}
-									</select>
-									<img src="" id="account_country_img"/>
-									<script>
-										function updateFlag()
-										{
-											var img = $('#account_country_img');
-											var country = $('#account_country :selected').val();
-											if(country.length) {
-												img.attr('src', 'images/flags/' + country + '.gif');
-												img.show();
-											}
-											else {
-												img.hide();
-											}
-										}
-
-										$(function() {
-											updateFlag();
-											$('#account_country').change(function() {
-												updateFlag();
-											});
-										});
-									</script>
-								</td>
-							</tr>
-							{% endif %}
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table width="100%">
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0" >
-					<tr>
-						<td style="border:0px;" >
-							<input type="hidden" name="changeinfosave" value="1">
-								{{ include('buttons.submit.html.twig') }}
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td>
-</form>
-				<table border="0" cellspacing="0" cellpadding="0" >
-					<form action="{{ getLink('account/manage') }}" method="post" >
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;" >
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>

system/templates/account.change_mail.html.twig

@@ -1,72 +0,0 @@
-Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <br/><b>For security reasons, the actual change will be finalised after a waiting period of {{ setting('core.account_mail_change') }} days.</b><br/><br/>
-<form action="{{ getLink('account/email') }}" method="post">
-	{{ csrf() }}
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer" >
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >Change Email Address</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;">
-						<tr>
-							<td class="LabelV" >
-								<span >New Email Address:</span>
-							</td>
-							<td style="width:90%;">
-								<input name="new_email" value="{% if new_email is defined %}{{ new_email }}{% endif %}" size="30" maxlength="50" autofocus/>
-							</td>
-						</tr>
-						<tr>
-							<td class="LabelV">
-								<span >Password:</span>
-							</td>
-							<td>
-								<input type="password" name="password" size="30" maxlength="29">
-							</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
-<br/>
-<table style="width:100%;">
-	<tr align="center">
-		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0px;">
-						<input type="hidden" name="changeemailsave" value="1"/>
-						{{ include('buttons.submit.html.twig') }}
-					</td>
-				<tr>
-			</table>
-		</td>
-</form>
-		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-				<form action="{{ getLink('account/manage') }}" method="post">
-					{{ csrf() }}
-					<tr>
-						<td style="border:0px;">
-							{{ include('buttons.back.html.twig') }}
-						</td>
-					</tr>
-				</form>
-			</table>
-		</td>
-	</tr>
-</table>

system/templates/account.change_name.html.twig

@@ -1,79 +0,0 @@
-To change a name of character select player and choose a new name.<br/>
-<span style="color: red">Change name cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.</span><br/><br/>
-<form action="{{ getLink('account/character/name') }}" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="changenamesave" value="1">
-	<div class="TableContainer">
-		<table class="Table1" cellpadding="0" cellspacing="0">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer" >
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >Change Name</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer" >
-						<table style="width:100%;" >
-							<tr>
-                                <td class="LabelV" ><span>Character:</span></td>
-								<td style="width:90%;" >
-									<select name="player_id">
-										{% for player in account_logged.getPlayersList(false) %}
-										<option value="{{ player.getId() }}">{{ player.getName() }}</option>
-										{% endfor %}
-									</select>
-								</td>
-							</tr>
-							<tr>
-                                <td class="LabelV" ><span>New Name:</span></td>
-								<td>
-									<input type="text" name="name" id="character_name" size="25" maxlength="25" >
-									<img id="character_indicator" src="images/global/general/{% if not save or errors|length > 0 %}n{% endif %}ok.gif" />
-									<br/>
-									<span style="font-size: 10px">
-										<div id="character_error">Please enter your character name.</div>
-									</span>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table style="width:100%" >
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td style="border:0px;">
-							{{ include('buttons.submit.html.twig') }}
-						</td>
-					</tr>
-</form>
-				</table>
-			</td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/manage') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;">
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>
-<script type="text/javascript" src="tools/check_name.js"></script>

system/templates/account.change_password.html.twig

@@ -1,80 +0,0 @@
-Please enter your current password and a new password. For your security, please enter the new password twice.<br/>
-<br/>
-<form action="{{ getLink('account/password') }}" method="post">
-	{{ csrf() }}
-	<div class="TableContainer">
-		<table class="Table1" cellpadding="0" cellspacing="0">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >Change Password</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table style="width:100%;">
-							<tr>
-								<td class="LabelV">
-									<span>New Password:</span>
-								</td>
-								<td style="width:90%;">
-									<input type="password" name="newpassword" size="30" maxlength="29">
-								</td>
-							</tr>
-							<tr>
-								<td class="LabelV">
-									<span>New Password Again:</span>
-								</td>
-								<td>
-									<input type="password" name="newpassword_confirm" size="30" maxlength="29">
-								</td>
-							</tr>
-							<tr>
-								<td class="LabelV">
-									<span>Current Password:</span>
-								</td>
-								<td>
-									<input type="password" name="oldpassword" size="30" maxlength="29">
-								</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table style="width:100%;">
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td style="border:0px;">
-							{{ include('buttons.submit.html.twig') }}
-						</td>
-					<tr>
-				</table>
-			</td>
-</form>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/manage') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;">
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>

system/templates/account.change_sex.html.twig

@@ -1,78 +0,0 @@
-To change a sex of character select player and choose a new sex.<br/>
-<span style="color: red">Change sex cost {{ setting('core.account_change_character_sex_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.</span><br/><br/>
-<form action="{{ getLink('account/character/sex') }}" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="changesexsave" value="1"/>
-	<div class="TableContainer">
-		<table class="Table1" cellpadding="0" cellspacing="0">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >Change sex</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table style="width:100%;" >
-							<tr>
-								<td class="LabelV" ><span >Character:</td>
-								<td style="width:90%;" >
-									<select name="player_id">
-										{% for player in players %}
-										<option value="{{ player.getId() }}">{{ player.getName() }}</option>
-										{% endfor %}
-									</select>
-								</td>
-							</tr>
-							<tr>
-								<td class="LabelV" ><span >New Sex:</td>
-								<td>
-									<select name="new_sex">
-										{% for id, gender in config.genders %}
-										<option value="{{ id }}"{% if player_sex == id %} selected{% endif %}>{{ gender }}</option>
-										{% endfor %}
-									</select>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table style="width:100%">
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0" >
-					<tr>
-						<td style="border:0px;" >
-							{{ include('buttons.submit.html.twig') }}
-						</td>
-					</tr>
-					<tr>
-</form>
-				</table>
-			</td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/manage') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;" >
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>

system/templates/account.characters.change-comment.html.twig

@@ -1,6 +1,6 @@
 Here you can see and edit the information about your character.<br/>
 If you do not want to specify a certain field, just leave it blank.<br/><br/>
-<form action="{{ getLink('account/character/comment') }}" method="post">
+<form action="{{ getLink('account/characters/change-comment') }}" method="post">
 	{{ csrf() }}
 	<div class="TableContainer" >
 		<table class="Table5" cellpadding="0" cellspacing="0">

system/templates/account.characters.change-name.html.twig

@@ -0,0 +1,62 @@
+To change a name of character select player and choose a new name.<br/>
+<span style="color: red">Change name cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.</span><br/><br/>
+
+{% set title = 'Change Name' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td class="LabelV" ><span>Character:</span></td>
+		<td style="width:90%;" >
+			<select form="form" name="player_id">
+				{% for player in account_logged.getPlayersList(false) %}
+				<option value="{{ player.getId() }}">{{ player.getName() }}</option>
+				{% endfor %}
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td class="LabelV" ><span>New Name:</span></td>
+		<td>
+			<input form="form" type="text" name="name" id="character_name" size="25" maxlength="25" >
+			<img id="character_indicator" src="images/global/general/{% if not save or errors|length > 0 %}n{% endif %}ok.gif" />
+			<br/>
+			<span style="font-size: 10px">
+				<div id="character_error">Please enter your character name.</div>
+			</span>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+<br/>
+<table style="width:100%" >
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/characters/change-name') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="changenamesave" value="1">
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form action="{{ getLink('account/manage') }}" method="post">
+							{{ csrf() }}
+							{{ include('buttons.back.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<script type="text/javascript" src="tools/check_name.js"></script>

system/templates/account.characters.change-sex.html.twig

@@ -0,0 +1,61 @@
+To change a sex of character select player and choose a new sex.<br/>
+<span style="color: red">Change sex cost {{ setting('core.account_change_character_sex_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.</span>
+<br/><br/>
+{% set title = 'Change sex' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td class="LabelV" ><span>Character:</span></td>
+		<td style="width:90%;" >
+			<select form="form" name="player_id">
+				{% for player in players %}
+				<option value="{{ player.getId() }}">{{ player.getName() }}</option>
+				{% endfor %}
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td class="LabelV" ><span>New Sex:</span></td>
+		<td>
+			<select form="form" name="new_sex">
+				{% for id, gender in config.genders %}
+				<option value="{{ id }}"{% if player_sex == id %} selected{% endif %}>{{ gender }}</option>
+				{% endfor %}
+			</select>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+
+<br/>
+<table style="width:100%">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0" >
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/characters/change-sex') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="changesexsave" value="1"/>
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form action="{{ getLink('account/manage') }}" method="post">
+							{{ csrf() }}
+							{{ include('buttons.back.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>

system/templates/account.characters.create.html.twig

@@ -0,0 +1,168 @@
+Please choose a name{% if config.character_samples|length > 1 %}, vocation{% endif %}
+{% if config.character_towns|length > 1 %}, town{% endif %}
+ and sex for your character. <br/>
+In any case the name must not violate the naming conventions stated in the <a href="?subtopic=rules" target="_blank" >{{ config.lua.serverName }} Rules</a>, or your character might get deleted or name locked.
+{% if account_logged.getPlayersList(true)|length >= setting('core.characters_per_account') %}
+<b><span style="color: red"> You have maximum number of characters per account on your account. Delete one before you make new.</span></b>
+{% endif %}
+<br/><br/>
+<div class="TableContainer">
+	<table class="Table3" cellpadding="0" cellspacing="0">
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Create Character</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+
+				{{ hook('HOOK_ACCOUNT_CREATE_CHARACTER_BEFORE_FIRST_TABLE') }}
+
+				<div class="InnerTableContainer">
+					<table style="width:100%;">
+						<tr>
+							<td>
+								<div class="TableShadowContainerRightTop">
+									<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/content/table-shadow-rt.gif);"></div>
+								</div>
+								<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
+									<div class="TableContentContainer">
+										<table class="TableContent" width="100%">
+											<tr class="LabelH">
+												<td style="width:50%;">
+													<span>Name</span>
+												</td>
+												<td>
+													<span>Sex</span>
+												</td>
+											</tr>
+											<tr class="Odd">
+												<td>
+													<input form="form" name="name" id="character_name" value="{{ name }}" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" >
+													<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" />
+													<br/>
+													<span style="font-size: 10px">
+														<div id="character_error">{% if not save or errors.name is defined %}Please enter your character name.{% endif %}</div>
+													</span>
+												</td>
+												<td>
+													{% set i = 0 %}
+													{% for id, gender in config.genders|reverse(true) %}
+													{% set i = i + 1 %}
+													<input form="form" type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}
+													><label for="sex{{ i }}">{{ gender|lower }}</label><br/>
+													{% endfor %}
+												</td>
+											</tr>
+										</table>
+									</div>
+								</div>
+							</td>
+						</tr>
+					</table>
+				</div>
+
+				{{ hook('HOOK_ACCOUNT_CREATE_CHARACTER_BEFORE_VOCATION') }}
+
+				<div class="InnerTableContainer">
+					<table style="width: 100%;">
+						<tr>
+							{% if config.character_samples|length > 1 %}
+							<td>
+								<table class="TableContent" width="100%">
+									<tr class="Odd" valign="top">
+										<td width="160"><br/><b>Select your vocation:</b></td>
+										<td>
+											<table class="TableContent" width="100%" >
+												{% for key, sample_char in config.character_samples %}
+												<tr>
+													<td>
+														<input form="form" type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
+														{% if vocation is not null and vocation == key %} checked="checked"{% endif %}>
+														<label for="vocation{{ key }}">{{ config['vocations'][key] }}</label>
+													</td>
+												</tr>
+												{% endfor %}
+											</table>
+										</td>
+									</tr>
+								</table>
+							</td>
+							{% endif %}
+
+							{{ hook('HOOK_ACCOUNT_CREATE_CHARACTER_BEFORE_TOWNS') }}
+
+							{% if config.character_towns|length > 1 %}
+							<td>
+								<table class="TableContent" width="100%">
+									<tr class="Odd" valign="top">
+										<td width="160"><br/><b>Select your city:</b></td>
+										<td>
+											<table class="TableContent" width="100%">
+												{% for town_id in config.character_towns %}
+												<tr>
+													<td>
+														<input form="form" type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
+														{% if town is not null and town == town_id %} checked="checked"{% endif %}>
+														<label for="town{{ town_id }}">{{ config.towns[town_id] }}</label>
+													</td>
+												</tr>
+												{% endfor %}
+											</table>
+										</td>
+									</tr>
+								</table>
+							</td>
+							{% endif %}
+
+							{{ hook('HOOK_ACCOUNT_CREATE_CHARACTER_AFTER_TOWNS') }}
+
+						</tr>
+					</table>
+				</div>
+
+				{{ hook('HOOK_ACCOUNT_CREATE_CHARACTER_AFTER_SECOND_TABLE') }}
+
+			</td>
+		</tr>
+	</table>
+</div>
+<br/>
+<table style="width:100%;">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/characters/create') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="save" value="1">
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form action="{{ getLink('account/manage') }}" method="post">
+							{{ csrf() }}
+							{{ include('buttons.back.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<script type="text/javascript" src="tools/check_name.js"></script>

system/templates/account.characters.delete.html.twig

@@ -0,0 +1,50 @@
+To delete a character enter the name of the character and your password.<br/><br/>
+{% set title = 'Delete Character' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;">
+	<tr>
+		<td class="LabelV" ><span>Character Name:</span></td>
+		<td style="width:90%;">
+			<input form="form" name="delete_name" value="" size="30" maxlength="29"/>
+		</td>
+	</tr>
+	<tr>
+		<td class="LabelV" ><span>Password:</span></td>
+		<td>
+			<input form="form" type="password" name="delete_password" size="30" maxlength="29"/>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+<br/>
+<table style="width:100%">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/characters/delete') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="deletecharactersave" value="1"/>
+							{{ include('buttons.submit.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<form action="{{ getLink('account/manage') }}" method="post">
+					{{ csrf() }}
+					<tr>
+						<td style="border:0px;">
+							{{ include('buttons.back.html.twig') }}
+						</td>
+					</tr>
+				</form>
+			</table>
+		</td>
+	</tr>
+</table>

system/templates/account.create.html.twig

@@ -1,313 +1,298 @@
 {{ hook('HOOK_ACCOUNT_CREATE_BEFORE_FORM') }}
 <form action="{{ getLink('account/create') }}" method="post" id="createaccount">
 	{{ csrf() }}
-	<div class="TableContainer" >
-		<table class="Table5" cellpadding="0" cellspacing="0" >
-			<div class="CaptionContainer" >
-				<div class="CaptionInnerContainer" >
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
-					<div class="Text" >Create {{ config.lua.serverName }} Account</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-				</div>
-			</div>
+
+	{% set title = 'Create ' ~ config.lua.serverName ~ ' Account' %}
+	{% set background = config('darkborder') %}
+	{% set tableClass = 'Table5' %}
+	{% set content %}
+		<table style="width:100%;" >
+			{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_BOXES') }}
 			<tr>
 				<td>
-					<div class="InnerTableContainer" >
-						<table style="width:100%;" >
-							{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_BOXES') }}
-							<tr>
-								<td>
-									<div class="TableShadowContainerRightTop"> <div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div></div>
-									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
-										<div class="TableContentContainer">
-											<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
-												<tbody>
+					<div class="TableShadowContainerRightTop"> <div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div></div>
+					<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
+						<div class="TableContentContainer">
+							<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
+								<tbody>
 
-												{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_ACCOUNT') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_ACCOUNT') }}
 
-												{% if not config.account_login_by_email %}
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.account is defined %} class="red"{% endif %}>Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:</span>
-														{% if not constant('USE_ACCOUNT_NAME') %}
-														<div id="SuggestAccountNumber">[<a href="#">suggest number</a>]</div>
-														{% endif %}
-													</td>
-													<td>
-														<input type="text" name="account" id="account_input" size="30" maxlength="{% if constant('USE_ACCOUNT_NAME') %}30{% else %}10{% endif %}" value="{{ account }}" autofocus/>
-														<img id="account_indicator" src="images/global/general/{% if not save or errors.account is defined %}n{% endif %}ok.gif" style="display: none;" />
-													</td>
-												</tr>
-												{% endif %}
-												<tr><td></td><td><span id="account_error" class="FormFieldError">{% if errors.account is defined %}{{ errors.account }}{% endif %}</span></td></tr>
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_ACCOUNT') }}
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.email is defined %} class="red"{% endif %}>Email Address:</span>
-													</td>
-													<td>
-														<input type="text" name="email" id="email" size="30" maxlength="50" value="{{ email }}" />
-														<img id="email_indicator" src="images/global/general/{% if not save or errors.email is defined %}n{% endif %}ok.gif" style="display: none;" />
-													</td>
-												</tr>
-												<tr>
-													<td></td><td><span id="email_error" class="FormFieldError">{% if errors.email is defined %}{{ errors.email }}{% endif %}</span></td>
-												</tr>
+								{% if not config.account_login_by_email %}
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.account is defined %} class="red"{% endif %}>Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:</span>
+										{% if not constant('USE_ACCOUNT_NAME') %}
+										<div id="SuggestAccountNumber">[<a href="#">suggest number</a>]</div>
+										{% endif %}
+									</td>
+									<td>
+										<input type="text" name="account" id="account_input" size="30" maxlength="{% if constant('USE_ACCOUNT_NAME') %}30{% else %}10{% endif %}" value="{{ account }}" autofocus/>
+										<img id="account_indicator" src="images/global/general/{% if not save or errors.account is defined %}n{% endif %}ok.gif" style="display: none;" />
+									</td>
+								</tr>
+								{% endif %}
+								<tr><td></td><td><span id="account_error" class="FormFieldError">{% if errors.account is defined %}{{ errors.account }}{% endif %}</span></td></tr>
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_ACCOUNT') }}
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.email is defined %} class="red"{% endif %}>Email Address:</span>
+									</td>
+									<td>
+										<input type="text" name="email" id="email" size="30" maxlength="50" value="{{ email }}" />
+										<img id="email_indicator" src="images/global/general/{% if not save or errors.email is defined %}n{% endif %}ok.gif" style="display: none;" />
+									</td>
+								</tr>
+								<tr>
+									<td></td><td><span id="email_error" class="FormFieldError">{% if errors.email is defined %}{{ errors.email }}{% endif %}</span></td>
+								</tr>
 
-												{% if setting('core.mail_enabled') and setting('core.account_mail_verify') %}
-													<tr><td></td><td><span><strong>Please use real address!<br/>We will send a link to validate your Email.</strong></span></td></tr>
-												{% endif %}
+								{% if setting('core.mail_enabled') and setting('core.account_mail_verify') %}
+									<tr><td></td><td><span><strong>Please use real address!<br/>We will send a link to validate your Email.</strong></span></td></tr>
+								{% endif %}
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }}
 
-                                                {% if setting('core.account_country') %}
-													<tr>
-														<td class="LabelV" style="width: 150px">
-															<span{% if errors.country[0] is defined %} class="red"{% endif %}>Country:</span>
-														</td>
-														<td>
-															<select name="country" id="account_country">
-                                                                {% for code, country_ in countries %}
-																	<option value="{{ code }}"{% if(country is defined and country == code) or (country is null and country_recognized == code) %}selected{% endif %}>{{ country_ }}</option>
-                                                                {% endfor %}
-															</select>
-															<img src="" id="account_country_img"/>
-														</td>
-													</tr>
-                                                    {% if errors.country is defined %}
-														<tr><td></td><td><span class="FormFieldError">{{ errors.country }}</span></td></tr>
-                                                    {% endif %}
-                                                {% endif %}
+								{% if setting('core.account_country') %}
+									<tr>
+										<td class="LabelV" style="width: 150px">
+											<span{% if errors.country[0] is defined %} class="red"{% endif %}>Country:</span>
+										</td>
+										<td>
+											<select name="country" id="account_country">
+												{% for code, country_ in countries %}
+													<option value="{{ code }}"{% if(country is defined and country == code) or (country is null and country_recognized == code) %}selected{% endif %}>{{ country_ }}</option>
+												{% endfor %}
+											</select>
+											<img src="" id="account_country_img"/>
+										</td>
+									</tr>
+									{% if errors.country is defined %}
+										<tr><td></td><td><span class="FormFieldError">{{ errors.country }}</span></td></tr>
+									{% endif %}
+								{% endif %}
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_COUNTRY') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_COUNTRY') }}
 
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.password is defined %} class="red"{% endif %}>Password:</span>
-													</td>
-													<td>
-														<input type="password" name="password" id="password" value="" size="30" maxlength="29" />
-														<img id="password_indicator" src="images/global/general/{% if not save or errors.password is defined %}n{% endif %}ok.gif" style="display: none;" />
-													</td>
-												</tr>
-												<tr><td></td><td><span id="password_error" class="FormFieldError">{% if errors.password is defined %}{{ errors.password }}{% endif %}</span></td></tr>
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.password is defined %} class="red"{% endif %}>Password:</span>
+									</td>
+									<td>
+										<input type="password" name="password" id="password" value="" size="30" maxlength="29" />
+										<img id="password_indicator" src="images/global/general/{% if not save or errors.password is defined %}n{% endif %}ok.gif" style="display: none;" />
+									</td>
+								</tr>
+								<tr><td></td><td><span id="password_error" class="FormFieldError">{% if errors.password is defined %}{{ errors.password }}{% endif %}</span></td></tr>
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_PASSWORD') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_PASSWORD') }}
 
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.password is defined %} class="red"{% endif %}>Repeat password:</span>
-													</td>
-													<td>
-														<input type="password" name="password_confirm" id="password_confirm" value="" size="30" maxlength="29" />
-														<img id="password_confirm_indicator" src="images/global/general/{% if not save or errors.password is defined %}n{% endif %}ok.gif" style="display: none;" />
-													</td>
-												</tr>
-												<tr><td></td><td><span id="password_confirm_error" class="FormFieldError">{% if errors.password is defined %}{{ errors.password }}{% endif %}</span></td></tr>
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.password is defined %} class="red"{% endif %}>Repeat password:</span>
+									</td>
+									<td>
+										<input type="password" name="password_confirm" id="password_confirm" value="" size="30" maxlength="29" />
+										<img id="password_confirm_indicator" src="images/global/general/{% if not save or errors.password is defined %}n{% endif %}ok.gif" style="display: none;" />
+									</td>
+								</tr>
+								<tr><td></td><td><span id="password_confirm_error" class="FormFieldError">{% if errors.password is defined %}{{ errors.password }}{% endif %}</span></td></tr>
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_PASSWORDS') }}
-												</tbody>
-											</table>
-										</div>
-									</div>
-									<div class="TableShadowContainer">
-										<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);"> <div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div> <div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div> </div></div>
-								</td>
-							</tr>
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_PASSWORDS') }}
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="TableShadowContainer">
+						<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);"> <div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div> <div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div> </div></div>
+				</td>
+			</tr>
 
-							{{ hook('HOOK_ACCOUNT_CREATE_BETWEEN_BOXES_1') }}
+			{{ hook('HOOK_ACCOUNT_CREATE_BETWEEN_BOXES_1') }}
 
-							{% if (not setting('core.mail_enabled') or not setting('core.account_mail_verify')) and setting('core.account_create_character_create') %}
-							<tr>
-								<td>
-									<div class="TableShadowContainerRightTop">
-										<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div>
-									</div>
-									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
-										<div class="TableContentContainer">
-											<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
-												<tbody>
+			{% if setting('core.account_create_character_create') %}
+			<tr>
+				<td>
+					<div class="TableShadowContainerRightTop">
+						<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div>
+					</div>
+					<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
+						<div class="TableContentContainer">
+							<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
+								<tbody>
 
-												{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_CHARACTER_NAME') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_CHARACTER_NAME') }}
 
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.name is defined %} class="red"{% endif %}>Character Name:</span>
-													</td>
-													<td>
-														<input id="character_name" name="name" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" value="{{ name }}"/>
-														<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" style="display: none;" />
-														<br>
-													</td>
-												</tr>
-												<tr>
-													<td></td>
-													<td>
-														<span id="character_error" class="FormFieldError">{% if errors.name is defined %}{{ errors.name }}{% endif %}</span>
-													</td>
-												</tr>
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.name is defined %} class="red"{% endif %}>Character Name:</span>
+									</td>
+									<td>
+										<input id="character_name" name="name" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" value="{{ name }}"/>
+										<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" style="display: none;" />
+										<br>
+									</td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>
+										<span id="character_error" class="FormFieldError">{% if errors.name is defined %}{{ errors.name }}{% endif %}</span>
+									</td>
+								</tr>
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_CHARACTER_NAME') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_CHARACTER_NAME') }}
 
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.sex is defined %} class="red"{% endif %}>Sex:</span>
-													</td>
-													<td>
-														<table width="100%">
-															<tbody>
-															<tr>
-																<td>
-                                                                    {% set i = 0 %}
-                                                                    {% for id, gender in config.genders|reverse(true) %}
-                                                                        {% set i = i + 1 %}
-																		<span style="margin-right:15px;" class="OptionContainer">
-																			<input type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}>
-																			<label for="sex{{ i }}">{{ gender|lower }}</label>
-																		</span>
-                                                                    {% endfor %}
-																</td>
-																<td>
-																</td>
-															</tr>
-															</tbody>
-														</table>
-													</td>
-												</tr>
-												<tr>
-													<td></td>
-													<td>
-														<span id="sex_error" class="FormFieldError">{% if errors.sex is defined %}{{ errors.sex }}{% endif %}</span>
-													</td>
-												</tr>
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.sex is defined %} class="red"{% endif %}>Sex:</span>
+									</td>
+									<td>
+										<table width="100%">
+											<tbody>
+											<tr>
+												<td>
+													{% set i = 0 %}
+													{% for id, gender in config.genders|reverse(true) %}
+														{% set i = i + 1 %}
+														<span style="margin-right:15px;" class="OptionContainer">
+															<input type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}>
+															<label for="sex{{ i }}">{{ gender|lower }}</label>
+														</span>
+													{% endfor %}
+												</td>
+												<td>
+												</td>
+											</tr>
+											</tbody>
+										</table>
+									</td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>
+										<span id="sex_error" class="FormFieldError">{% if errors.sex is defined %}{{ errors.sex }}{% endif %}</span>
+									</td>
+								</tr>
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_SEX') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_SEX') }}
 
-                                                {% if config.character_samples|length > 1 %}
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.vocation is defined %} class="red"{% endif %}>Vocation:</span>
-													</td>
-													<td>
-														<table width="100%" >
-															<tbody>
-															<tr>
-																<td>
-                                                           		{% for key, sample_char in config.character_samples %}
-																	<span style="margin-right:15px;" class="OptionContainer">
-																		<input type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
-                                                                                {% if vocation is not null and vocation == key %} checked="checked"{% endif %}>
-																		<label for="vocation{{ key }}">{{ config['vocations'][key] }}</label>
-																	</span>
-                                                            	{% endfor %}
-																</td>
-															</tr>
-															</tbody>
-														</table>
-													</td>
-												</tr>
-												<tr>
-													<td></td>
-													<td>
-														<span id="vocation_error" class="FormFieldError">{% if errors.vocation is defined %}{{ errors.vocation }}{% endif %}</span>
-													</td>
-												</tr>
-												{% endif %}
+								{% if config.character_samples|length > 1 %}
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.vocation is defined %} class="red"{% endif %}>Vocation:</span>
+									</td>
+									<td>
+										<table width="100%" >
+											<tbody>
+											<tr>
+												<td>
+												{% for key, sample_char in config.character_samples %}
+													<span style="margin-right:15px;" class="OptionContainer">
+														<input type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
+																{% if vocation is not null and vocation == key %} checked="checked"{% endif %}>
+														<label for="vocation{{ key }}">{{ config['vocations'][key] }}</label>
+													</span>
+												{% endfor %}
+												</td>
+											</tr>
+											</tbody>
+										</table>
+									</td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>
+										<span id="vocation_error" class="FormFieldError">{% if errors.vocation is defined %}{{ errors.vocation }}{% endif %}</span>
+									</td>
+								</tr>
+								{% endif %}
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_VOCATION') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_VOCATION') }}
 
-                                                {% if config.character_towns|length > 1 %}
-												<tr>
-													<td class="LabelV" style="width: 150px">
-														<span{% if errors.town is defined %} class="red"{% endif %}>Select your town:</span>
-													</td>
-													<td>
-														<table width="100%" >
-															<tbody>
-															<tr>
-																<td>
-																	{% for town_id in config.character_towns %}
-																		<span style="margin-right:15px;" class="OptionContainer">
-																			<input type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
-																					{% if town is not null and town == town_id %} checked="checked"{% endif %}>
-																			<label for="town{{ town_id }}">{{ config.towns[town_id] }}</label>
-																		</span>
-																	{% endfor %}
-																</td>
-															</tr>
-															</tbody>
-														</table>
-													</td>
-												</tr>
-                                                {% endif %}
+								{% if config.character_towns|length > 1 %}
+								<tr>
+									<td class="LabelV" style="width: 150px">
+										<span{% if errors.town is defined %} class="red"{% endif %}>Select your town:</span>
+									</td>
+									<td>
+										<table width="100%" >
+											<tbody>
+											<tr>
+												<td>
+													{% for town_id in config.character_towns %}
+														<span style="margin-right:15px;" class="OptionContainer">
+															<input type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
+																	{% if town is not null and town == town_id %} checked="checked"{% endif %}>
+															<label for="town{{ town_id }}">{{ config.towns[town_id] }}</label>
+														</span>
+													{% endfor %}
+												</td>
+											</tr>
+											</tbody>
+										</table>
+									</td>
+								</tr>
+								{% endif %}
 
-												{{ hook('HOOK_ACCOUNT_CREATE_AFTER_TOWNS') }}
+								{{ hook('HOOK_ACCOUNT_CREATE_AFTER_TOWNS') }}
 
-												</tbody>
-											</table>
-										</div>
-									</div>
-									<div class="TableShadowContainer">
-										<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);">
-											<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div>
-											<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div>
-										</div>
-									</div>
-								</td>
-							</tr>
-							{% endif %}
-
-							{{ hook('HOOK_ACCOUNT_CREATE_BETWEEN_BOXES_2') }}
-
-							<tr>
-								<td>
-									<div class="TableShadowContainerRightTop">
-										<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div>
-									</div>
-									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
-										<div class="TableContentContainer">
-											<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
-												<tbody>
-												<tr>
-													<td colspan="2" ><b>Please select the following check box:</b></td>
-												</tr>
-												<tr>
-													<td colspan="2" >
-														<span><input type="checkbox" id="accept_rules" name="accept_rules" value="true"{% if accept_rules %}checked{% endif %}/> <label for="accept_rules">I agree to the <a href="?subtopic=rules" target="_blank">{{ config.lua.serverName }} Rules</a>.</label></span>
-													</td>
-												</tr>
-                                                {% if errors.accept_rules is defined %}
-													<tr>
-														<td colspan="2">
-															<span class="FormFieldError">{{ errors.accept_rules }}</span>
-														</td>
-													</tr>
-                                                {% endif %}
-												</tbody>
-											</table>
-										</div>
-									</div>
-									<div class="TableShadowContainer">
-										<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);"> <div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div> <div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div>
-										</div>
-									</div>
-								</td>
-							</tr>
-
-							{{ hook('HOOK_ACCOUNT_CREATE_AFTER_BOXES') }}
-
-						</table>
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="TableShadowContainer">
+						<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);">
+							<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div>
+							<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div>
+						</div>
 					</div>
 				</td>
 			</tr>
+			{% endif %}
+
+			{{ hook('HOOK_ACCOUNT_CREATE_BETWEEN_BOXES_2') }}
+
+			<tr>
+				<td>
+					<div class="TableShadowContainerRightTop">
+						<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rt.gif);"></div>
+					</div>
+					<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-rm.gif);">
+						<div class="TableContentContainer">
+							<table class="TableContent" width="100%" style="border:1px solid #faf0d7;">
+								<tbody>
+								<tr>
+									<td colspan="2" ><b>Please select the following check box:</b></td>
+								</tr>
+								<tr>
+									<td colspan="2" >
+										<span><input type="checkbox" id="accept_rules" name="accept_rules" value="true"{% if accept_rules %}checked{% endif %}/> <label for="accept_rules">I agree to the <a href="?subtopic=rules" target="_blank">{{ config.lua.serverName }} Rules</a>.</label></span>
+									</td>
+								</tr>
+								{% if errors.accept_rules is defined %}
+									<tr>
+										<td colspan="2">
+											<span class="FormFieldError">{{ errors.accept_rules }}</span>
+										</td>
+									</tr>
+								{% endif %}
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="TableShadowContainer">
+						<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bm.gif);"> <div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-bl.gif);"></div> <div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/global/content/table-shadow-br.gif);"></div>
+						</div>
+					</div>
+				</td>
+			</tr>
+
+			{{ hook('HOOK_ACCOUNT_CREATE_AFTER_BOXES') }}
+
 		</table>
-	</div>
+	{% endset %}
+	{% include 'tables.headline.html.twig' %}
+
 	<br/>
 	{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_SUBMIT_BUTTON') }}
 	<table width="100%">

system/templates/account.create.js.html.twig

@@ -3,10 +3,12 @@
 	var lastSend = 0;
 
 	$(function() {
-		updateFlag();
-		$('#account_country').change(function() {
+		{% if setting('core.account_country') %}
 			updateFlag();
-		});
+			$('#account_country').change(function() {
+				updateFlag();
+			});
+		{% endif %}
 
 		$('#account_input').blur(function() {
 			checkAccount();

system/templates/account.create_character.html.twig

@@ -1,150 +0,0 @@
-Please choose a name{% if config.character_samples|length > 1 %}, vocation{% endif %}
-{% if config.character_towns|length > 1 %}, town{% endif %}
- and sex for your character. <br/>
-In any case the name must not violate the naming conventions stated in the <a href="?subtopic=rules" target="_blank" >{{ config.lua.serverName }} Rules</a>, or your character might get deleted or name locked.
-{% if account_logged.getPlayersList(true)|length >= setting('core.characters_per_account') %}
-<b><span style="color: red"> You have maximum number of characters per account on your account. Delete one before you make new.</span></b>
-{% endif %}
-<br/><br/>
-<form action="{{ getLink('account/character/create') }}" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="save" value="1">
-	<div class="TableContainer">
-		<table class="Table3" cellpadding="0" cellspacing="0">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >Create Character</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table style="width:100%;">
-							<tr>
-								<td>
-									<div class="TableShadowContainerRightTop">
-										<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/content/table-shadow-rt.gif);"></div>
-									</div>
-									<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
-										<div class="TableContentContainer">
-											<table class="TableContent" width="100%">
-												<tr class="LabelH">
-													<td style="width:50%;">
-														<span>Name</span>
-													</td>
-													<td>
-														<span>Sex</span>
-													</td>
-												</tr>
-												<tr class="Odd">
-													<td>
-														<input name="name" id="character_name" value="{{ name }}" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" >
-														<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" />
-														<br/>
-														<span style="font-size: 10px">
-															<div id="character_error">{% if not save or errors.name is defined %}Please enter your character name.{% endif %}</div>
-														</span>
-													</td>
-													<td>
-														{% set i = 0 %}
-														{% for id, gender in config.genders|reverse(true) %}
-														{% set i = i + 1 %}
-														<input type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}
-														><label for="sex{{ i }}">{{ gender|lower }}</label><br/>
-														{% endfor %}
-													</td>
-												</tr>
-											</table>
-										</div>
-									</div>
-						</table>
-					</div>
-					<div class="InnerTableContainer">
-						<table style="width: 100%;">
-							<tr>
-								{% if config.character_samples|length > 1 %}
-								<td>
-									<table class="TableContent" width="100%">
-										<tr class="Odd" valign="top">
-											<td width="160"><br/><b>Select your vocation:</b></td>
-											<td>
-												<table class="TableContent" width="100%" >
-													{% for key, sample_char in config.character_samples %}
-													<tr>
-														<td>
-															<input type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
-															{% if vocation is not null and vocation == key %} checked="checked"{% endif %}>
-															<label for="vocation{{ key }}">{{ config['vocations'][key] }}</label>
-														</td>
-													</tr>
-													{% endfor %}
-												</table>
-											</td>
-										</tr>
-									</table>
-								{% endif %}
-								{% if config.character_towns|length > 1 %}
-								<td>
-									<table class="TableContent" width="100%">
-										<tr class="Odd" valign="top">
-											<td width="160"><br/><b>Select your city:</b></td>
-											<td>
-												<table class="TableContent" width="100%">
-													{% for town_id in config.character_towns %}
-													<tr>
-														<td>
-															<input type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
-															{% if town is not null and town == town_id %} checked="checked"{% endif %}>
-															<label for="town{{ town_id }}">{{ config.towns[town_id] }}</label>
-														</td>
-													</tr>
-													{% endfor %}
-												</table>
-											</td>
-										</tr>
-									</table>
-								</td>
-								{% endif %}
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table style="width:100%;">
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td style="border:0px;">
-							{{ include('buttons.submit.html.twig') }}
-						</td>
-					</tr>
-</form>
-				</table>
-			</td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/manage') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;">
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>
-<script type="text/javascript" src="tools/check_name.js"></script>

system/templates/account.delete_character.html.twig

@@ -1,68 +0,0 @@
-To delete a character enter the name of the character and your password.<br/><br/>
-<form action="{{ getLink('account/character/delete') }}" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="deletecharactersave" value="1"/>
-	<div class="TableContainer">
-		<table class="Table1" cellpadding="0" cellspacing="0" >
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >Delete Character</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table style="width:100%;">
-							<tr>
-								<td class="LabelV" ><span>Character Name:</span></td>
-								<td style="width:90%;">
-									<input name="delete_name" value="" size="30" maxlength="29"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="LabelV" ><span>Password:</span></td>
-								<td>
-									<input type="password" name="delete_password" size="30" maxlength="29"/>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table style="width:100%">
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td style="border:0px;">
-							{{ include('buttons.submit.html.twig') }}
-						</td>
-					<tr>
-</form>
-				</table>
-			</td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/manage') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;">
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>

system/templates/account.generate_new_recovery_key.html.twig

@@ -1,61 +1,44 @@
 To generate new recovery key for your account please enter your password.<br/>
-<span style="color: red"><b>New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points.</span> You have {{ points }} premium points. You will receive e-mail with this recovery key.</b><br/>
-<form action="{{ getLink('account/register/new') }}" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="registeraccountsave" value="1">
-	<div class="TableContainer" >
-		<table class="Table1" cellpadding="0" cellspacing="0">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >Generate recovery key</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table style="width:100%;">
-							<tr>
-								<td class="LabelV" ><span>Password:</span></td>
-								<td><input type="password" name="reg_password" size="30" maxlength="29" ></td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<br/>
-	<table style="width:100%">
-		<tr align="center">
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td style="border:0px;">
+<span style="color: red"><b>New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points</b>.</span> You have {{ points }} premium points. You will receive e-mail with this recovery key.
+<br/>
+{% set title = 'Generate recovery key' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;">
+	<tr>
+		<td class="LabelV"><span>Password:</span></td>
+		<td><input form="form" type="password" name="reg_password" size="30" maxlength="29" ></td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+<br/>
+<table style="width:100%">
+	<tr align="center">
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form id="form" action="{{ getLink('account/register-new') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="registeraccountsave" value="1">
 							{{ include('buttons.submit.html.twig') }}
-						</td>
-					</tr>
-</form>
-				</table>
-			</td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/manage') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;">
-								{{ include('buttons.back.html.twig') }}
-							</td>
-						</tr>
-					</form>
-				</table>
-			</td>
-		</tr>
-	</table>
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td style="border:0px;">
+						<form action="{{ getLink('account/manage') }}" method="post">
+							{{ csrf() }}
+							{{ include('buttons.back.html.twig') }}
+						</form>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>

system/templates/account.generate_recovery_key.html.twig

@@ -1,40 +1,19 @@
 To generate recovery key for your account please enter your password.<br/><br/>
-<form action="{{ getLink('account/register') }}" method="post">
-	{{ csrf() }}
-<input type="hidden" name="registeraccountsave" value="1"/>
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer">
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >Generate recovery key</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;" >
-						<tr>
-							<td class="LabelV">
-								<span>Password:</span>
-							</td>
-							<td>
-								<input type="password" name="reg_password" size="30" maxlength="29" autofocus/>
-							</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+{% set title = 'Generate recovery key' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td class="LabelV">
+			<span>Password:</span>
+		</td>
+		<td>
+			<input form="form" type="password" name="reg_password" size="30" maxlength="29" autofocus/>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
 <br/>
 <table style="width:100%">
 	<tr align="center">
@@ -42,12 +21,15 @@ To generate recovery key for your account please enter your password.<br/><br/>
 			<table border="0" cellspacing="0" cellpadding="0" >
 				<tr>
 					<td style="border:0px;">
-						{{ include('buttons.submit.html.twig') }}
+						<form id="form" action="{{ getLink('account/register') }}" method="post">
+							{{ csrf() }}
+							<input type="hidden" name="registeraccountsave" value="1"/>
+							{{ include('buttons.submit.html.twig') }}
+						</form>
 					</td>
 				<tr>
 			</table>
 		</td>
-</form>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<form action="{{ getLink('account/manage') }}" method="post">

system/templates/account.login.html.twig

@@ -61,20 +61,19 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="{{
 							{{ include('buttons.submit.html.twig') }}
 						</td>
 					<tr>
-					</form>
 				</table>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="{{ getLink('account/lost') }}" method="post">
-						{{ csrf() }}
-						<tr>
-							<td style="border:0px;">
+					<tr>
+						<td style="border:0px;">
+							<a href="{{ getLink('account/lost') }}">
 								{{ include('buttons.account_lost.html.twig') }}
-							</td>
-						</tr>
-					</form>
+							</a>
+						</td>
+					</tr>
 				</table>
 			</td>
 		</tr>
 	</table>
+</form>

system/templates/account.logout.html.twig

@@ -1,28 +1,10 @@
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0" >
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer" >
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"/></span>
-				<div class="Text">Logout Successful</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"/></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;">
-						<tr>
-							<td>You have logged out of your {{ config.serverName }} account. In order to view your account you need to <a href="{{ getLink('account/manage') }}" >log in</a> again.</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+{% set title = 'Logout Successful' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;">
+	<tr>
+		<td>You have logged out of your {{ config.serverName }} account. In order to view your account you need to <a href="{{ getLink('account/manage') }}" >log in</a> again.</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}

system/templates/account.management.html.twig

@@ -26,8 +26,8 @@
 	}
 </style>
 {% set menus = {
-	'Create Character': 'account/character/create','Delete Character': 'account/character/delete',
-	'Change Info': 'account/info', 'Change Password': 'account/password', 'Change Email': 'account/email'
+	'Create Character': 'account/characters/create','Delete Character': 'account/characters/delete',
+	'Change Info': 'account/change-info', 'Change Password': 'account/change-password', 'Change Email': 'account/change-email'
 } %}
 <div id="account-manage">
 	<div id="one">
@@ -40,10 +40,10 @@
 				<a href="{{ getLink(link) }}">{{ name }}</a>
 			{% endfor %}
 			{% if setting('core.account_change_character_name') %}
-				<a href="{{ getLink('account/character/name') }}">Change Name</a>
+				<a href="{{ getLink('account/characters/change-name') }}">Change Name</a>
 			{% endif %}
 			{% if setting('core.account_change_character_sex') %}
-				<a href="{{ getLink('account/character/sex') }}">Change Sex</a>
+				<a href="{{ getLink('account/characters/change-sex') }}">Change Sex</a>
 			{% endif %}
 			<a href="{{ getLink('account/logout') }}">Logout</a>
 		</div>
@@ -80,7 +80,7 @@
 			<div style="text-align:center">
 				A request has been submitted to change the email address of this account to <b>{{ email_new }}</b>. After <b>{{ email_new_time|date("j F Y, G:i:s") }}</b> you can accept the new email address and finish the process. Please cancel the request if you do not want your email address to be changed! Also cancel the request if you have no access to the new email address!
 
-				<form action="{{ getLink('account/email') }}" method="post">
+				<form action="{{ getLink('account/change-email') }}" method="post">
 					{{ csrf() }}
 					{% set button_name = 'Edit' %}
 					{% include('buttons.base.html.twig') %}
@@ -99,8 +99,8 @@
 			{% endif %}
 			<tr style="background-color: {{ config.darkborder }};" >
 				<td style="width: 90px;">Email Address:</td>
-				<td>{{ account_email ~ email_change }}
-					<form action="{{ getLink('account/email') }}" method="post">
+				<td>{{ account_email }}{{ email_change|raw }}
+					<form action="{{ getLink('account/change-email') }}" method="post">
 						{{ csrf() }}
 						{% set button_name = 'Change Email' %}
 						{% include('buttons.base.html.twig') %}
@@ -139,7 +139,7 @@
 				<td >{{ account_location }}</td>
 			</tr>
 		</table>
-		<form action="{{ getLink('account/info') }}" method="post">
+		<form action="{{ getLink('account/change-info') }}" method="post">
 			{{ csrf() }}
 			{% set button_name = 'Change Info' %}
 			{% include('buttons.base.html.twig') %}
@@ -183,7 +183,7 @@
 					<td>{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}</td>
 					<td>{% if player.isOnline() %}<span style="color: green">ONLINE</span>{% else %}<span style="color: red">Offline</span>{% endif %}</td>
 					<td>{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}</td>
-					<td>{% if not player.isDeleted() %}[<a href="{{ getLink('account/character/comment/' ~ player.getName|urlencode) }}" >Edit</a>]{% endif %}</td>
+					<td>{% if not player.isDeleted() %}[<a href="{{ getLink('account/characters/change-comment?name=' ~ player.getName()|urlencode) }}" >Edit</a>]{% endif %}</td>
 				</tr>
 			{% endfor %}
 		</table>
@@ -191,7 +191,7 @@
 		<table>
 			<tr>
 				<td>
-					<form action="{{ getLink('account/character/create') }}" method="post" >
+					<form action="{{ getLink('account/characters/create') }}" method="post" >
 						{{ csrf() }}
 						{% set button_name = 'Create Character' %}
 						{% include('buttons.base.html.twig') %}
@@ -199,7 +199,7 @@
 				</td>
 				{% if setting('core.account_change_character_name') %}
 				<td>
-					<form action="{{ getLink('account/character/name') }}" method="post" >
+					<form action="{{ getLink('account/characters/change-name') }}" method="post" >
 						{{ csrf() }}
 						{% set button_name = 'Change Name' %}
 						{% include('buttons.base.html.twig') %}
@@ -208,7 +208,7 @@
 				{% endif %}
 				{% if setting('core.account_change_character_sex') %}
 				<td>
-					<form action="{{ getLink('account/character/sex') }}" method="post" >
+					<form action="{{ getLink('account/characters/change-sex') }}" method="post" >
 						{{ csrf() }}
 						{% set button_name = 'Change Sex' %}
 						{% include('buttons.base.html.twig') %}
@@ -216,7 +216,7 @@
 				</td>
 				{% endif %}
 				<td>
-					<form action="{{ getLink('account/character/delete') }}" method="post">
+					<form action="{{ getLink('account/characters/delete') }}" method="post">
 						{{ csrf() }}
 						{% set button_name = 'Delete Character' %}
 						{% include('buttons.base.html.twig') %}

system/templates/account.redirect.html.twig

@@ -1,31 +1,13 @@
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer">
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
-				<div class="Text" >Login Successful</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;" >
-						<tr>
-							<td>You have logged in.<br/>Press <a href="{{ redirect }}" >here</a> if you are not returned automatically.</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+{% set title = 'Login Successful' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td>You have logged in.<br/>Press <a href="{{ redirect }}" >here</a> if you are not returned automatically.</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
 
 <script language="javascript" type="text/javascript">
 	// Automatic redirect
@@ -33,4 +15,4 @@
 	function automaticRedirect() {
 		window.location = "{{ redirect|raw }}";
 	}
-</script>
+</script>

system/templates/characters.html.twig

@@ -275,7 +275,7 @@
 			{% 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|raw }}({% if frag.unjustified %}<span style="color: red; font-size: 10px">Unjustified</span>{% else %}<span style="color: green; font-size: 10px">Justified</span>{% endif %})</td>
+				<td>{{ frag.description|raw }} ({% if frag.unjustified %}<span style="color: red; font-size: 10px">Unjustified</span>{% else %}<span style="color: green; font-size: 10px">Justified</span>{% endif %})</td>
 			</tr>
 			{% set i = i + 1 %}
 			{% endfor %}

system/templates/forum.add_board.html.twig

@@ -39,7 +39,9 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" align="center"><input type="submit" value="Submit"/>
+						<td colspan="2" align="center">
+							{{ include('buttons.submit.html.twig') }}
+						</td>
 					</tr>
 				</table>
 			</td>

system/templates/forum.boards.html.twig

@@ -1,24 +1,26 @@
 <b>Boards</b>
 <table width="100%">
+	<thead>
 	<tr bgcolor="{{ config.vdarkborder }}" class="white">
-		<td>
+		<th>
 			<span style="font-size: 10px"><b>Board</b></span>
-		</td>
-		<td>
+		</th>
+		<th>
 			<span style="font-size: 10px"><b>Posts</b></span>
-		</td>
-		<td>
+		</th>
+		<th>
 			<span style="font-size: 10px"><b>Threads</b></span>
-		</td>
-		<td align="center">
+		</th>
+		<th align="center">
 			<span style="font-size: 10px"><b>Last Post</b></span>
-		</td>
+		</th>
 		{% if canEdit %}
-			<td>
+			<th>
 				<span style="font-size: 10px"><b>Options</b></span>
-			</td>
+			</th>
 		{% endif %}
 	</tr>
+	</thead>
 	{% set i = 0 %}
 	{% for board in boards %}
 	{% set i = i + 1 %}

system/templates/guilds.change_description.html.twig

@@ -1,14 +1,24 @@
-<div style="text-align:center"><h2>Change guild description</h2></div>
-Here you can change description of your guild.<br/>
-<form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_description" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="todo" value="save"/>
-	<textarea name="description" cols="60" rows="{{ setting('core.guild_description_lines_limit') - 1 }}">{{ guild.getCustomField('description')|raw }}</textarea><br>
-	(max. {{ setting('core.guild_description_lines_limit') }} lines, max. {{ setting('core.guild_description_chars_limit') }} chars) <input type="submit" value="Save description"/></form><br/>
-<br/>
-<div style="text-align:center">
-	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">
-		{{ csrf() }}
-		{{ include('buttons.back.html.twig') }}
-	</form>
-</div>
+{% set title = 'Change guild description' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td>
+			Here you can change description of your guild.<br/>
+			<form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_description" method="post">
+				{{ csrf() }}
+				<input type="hidden" name="todo" value="save"/>
+				<textarea name="description" cols="60" rows="{{ setting('core.guild_description_lines_limit') - 1 }}">{{ guild.getCustomField('description')|raw }}</textarea><br>
+				(max. {{ setting('core.guild_description_lines_limit') }} lines, max. {{ setting('core.guild_description_chars_limit') }} chars) <input type="submit" value="Save description"/></form><br/>
+			<br/>
+			<div style="text-align:center">
+				<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">
+					{{ csrf() }}
+					{{ include('buttons.back.html.twig') }}
+				</form>
+			</div>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}

system/templates/guilds.change_logo.html.twig

@@ -1,20 +1,32 @@
-<div style="text-align:center"><h2>Change guild logo</h2></div>
-Here you can change logo of your guild.<br/>Actuall logo: <img src="{{ constant('GUILD_IMAGES_DIR') }}{{ guild_logo }}" height="64" width="64"><br/><br/>
-<form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_logo" method="post" id="upload_form">
-	{{ csrf() }}
-	<input type="hidden" name="todo" value="save" />
-	<input type="hidden" name="MAX_FILE_SIZE" value="{{ max_image_size_b }}" />
-	Select new logo: <input name="newlogo" id="newlogo" type="file" />
-	<input type="submit" value="Send new logo" />
-</form>
-Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ setting('core.guild_image_size_kb') }} KB</b><br>
-<br/>
+{% set title = 'Change guild logo' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td>
+			Here you can change logo of your guild.<br/>Actuall logo: <img src="{{ constant('GUILD_IMAGES_DIR') }}{{ guild_logo }}" height="64" width="64"><br/><br/>
+			<form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_logo" method="post" id="upload_form">
+				{{ csrf() }}
+				<input type="hidden" name="todo" value="save" />
+				<input type="hidden" name="MAX_FILE_SIZE" value="{{ max_image_size_b }}" />
+				Select new logo: <input name="newlogo" id="newlogo" type="file" />
+				<input type="submit" value="Send new logo" />
+			</form>
+			Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ setting('core.guild_image_size_kb') }} KB</b><br>
+			<br/>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">
 		{{ csrf() }}
 		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
+
 <script type="text/javascript">
 	$(function() {
 		$('#upload_form').submit(function (event) {

system/templates/guilds.change_motd.html.twig

@@ -1,11 +1,22 @@
-<div style="text-align:center"><h2>Change guild MOTD</h2></div>
-Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br/>
-<form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_motd" method="post">
-	{{ csrf() }}
-	<input type="hidden" name="todo" value="save"/>
-	<textarea name="motd" cols="60" rows="3">{{ guild.getCustomField('motd')|raw }}</textarea><br/>
-	(max. {{ setting('core.guild_motd_chars_limit') }} chars) <input type="submit" value="Save MOTD" /></form><br/>
-<br/>
+{% set title = 'Change guild MOTD' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td>
+			Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br/>
+			<form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_motd" method="post">
+				{{ csrf() }}
+				<input type="hidden" name="todo" value="save"/>
+				<textarea name="motd" cols="60" rows="3">{{ guild.getCustomField('motd')|raw }}</textarea><br/>
+				(max. {{ setting('core.guild_motd_chars_limit') }} chars) <input type="submit" value="Save MOTD" />
+			</form>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">
 		{{ csrf() }}

system/templates/guilds.delete_guild.html.twig

@@ -1,37 +1,19 @@
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer" >
-			<div class="CaptionInnerContainer" >
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >Delete Guild</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;" >
-						<tr>
-							<td>Are you sure you want delete guild <b>{{ guild.getName() }}</b>?<br/>
-								<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=delete_guild" method="post">
-									{{ csrf() }}
-									<input type="hidden" name="todo" value="save"/>
-									<input type="submit" value="Yes, delete"/>
-								</form>
-							</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+{% set title = 'Delete Guild' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;" >
+	<tr>
+		<td>Are you sure you want delete guild <b>{{ guild.getName() }}</b>?<br/>
+			<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=delete_guild" method="post">
+				{{ csrf() }}
+				<input type="hidden" name="todo" value="save"/>
+				<input type="submit" value="Yes, delete"/>
+			</form>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
 <br/>
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">

system/templates/guilds.list.html.twig

@@ -1,118 +1,96 @@
-<div class="TableContainer">
-	<div class="CaptionContainer">
-		<div class="CaptionInnerContainer">
-			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<div class="Text">Active Guilds on {{ config.lua.serverName }}</div>
-			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-		</div>
-	</div>
-
-	<table class="Table3">
-		<tbody>
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table style="width:100%;">
+{% set title = 'Active Guilds on ' ~ config.lua.serverName %}
+{% set content %}
+<table style="width:100%;">
+	<tbody>
+		<tr>
+			<td>
+				<div class="TableShadowContainerRightTop">
+					<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/content/table-shadow-rt.gif);"></div>
+				</div>
+				<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
+					<div class="TableContentContainer">
+						<table class="TableContent" width="100%">
 							<tbody>
-								<tr>
-									<td>
-										<div class="TableShadowContainerRightTop">
-											<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/content/table-shadow-rt.gif);"></div>
-										</div>
-										<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
-											<div class="TableContentContainer">
-												<table class="TableContent" width="100%">
-													<tbody>
-														{% if guilds|length > 0 %}
-														<tr bgcolor="{{ config.darkborder }}">
-															<td width="64"><b>Logo</b></td>
-															<td><b>Description</b></td>
-															<td width="12%"><b>&nbsp;</b></td>
-														</tr>
-
-															{% set i = 0 %}
-															{% for guild in guilds %}
-															{% set i = i + 1 %}
-															<tr bgcolor="{{ getStyle(i) }}">
-																<td>
-																	<img src="{{ constant('GUILD_IMAGES_DIR') }}{{ guild.logo }}" width="64" height="64">
-																</td>
-
-																<td style="word-break: break-all">
-																	<span{% if guild.description is not empty %} valign="top"{% endif %}>
-																		<b>{{ guild.name }}</b>{% if isAdmin %}<a href="{{ getLink('guilds') }}?action=delete_by_admin&guild={{ guild.name }}"> - Delete this guild (for ADMIN only!)</a>{% endif %}
-																	</span>
-
-																	{% if guild.description is not empty %}
-																	<br>
-																	<span>{{ guild.description }}</span>
-																	{% endif %}
-																</td>
-
-																<td>
-																	<table border="0" cellspacing="0" cellpadding="0" width="100%">
-																		<tbody>
-																			<tr>
-																				<td style="border:0;">
-																					<form action="{{ guild.link }}" method="post">
-																						{{ csrf() }}
-																						{{ include('buttons.view.html.twig') }}
-																					</form>
-																				</td>
-																			</tr>
-																		</tbody>
-																	</table>
-																</td>
-															</tr>
-															{% endfor %}
-														{% else %}
-														<tr bgcolor="{{ config.darkborder }}">
-															<td valign="top">
-																<b>Create Guild</b>
-																<br/>
-																Actually there is no guild on server.{% if logged %} Create first! Press button "Create Guild"{% endif %}
-															</td>
-
-															{% if logged %}
-															<td>
-																<table border="0" cellpadding="0" cellspacing="0" width="100%">
-																	<form action="{{ getLink('guilds') }}?action=create" method="post">
-																		{{ csrf() }}
-																		{% set button_name = 'Found Guild' %}
-																		{% set button_image = '_sbutton_foundguild' %}
-																		{% include('buttons.base.html.twig') %}
-																	</form>
-																</table>
-															</td>
-															{% endif %}
-														</tr>
-														{% endif %}
-													</tbody>
-												</table>
-											</div>
-										</div>
-										<div class="TableShadowContainer">
-											<div class="TableBottomShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bm.gif);">
-												<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bl.gif);"></div>
-												<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>
-											</div>
-										</div>
-									</td>
+								{% if guilds|length > 0 %}
+								<tr bgcolor="{{ config.darkborder }}">
+									<td width="64"><b>Logo</b></td>
+									<td><b>Description</b></td>
+									<td width="12%"><b>&nbsp;</b></td>
 								</tr>
+
+									{% set i = 0 %}
+									{% for guild in guilds %}
+									{% set i = i + 1 %}
+									<tr bgcolor="{{ getStyle(i) }}">
+										<td>
+											<img src="{{ constant('GUILD_IMAGES_DIR') }}{{ guild.logo }}" width="64" height="64">
+										</td>
+
+										<td style="word-break: break-all">
+											<span{% if guild.description is not empty %} valign="top"{% endif %}>
+												<b>{{ guild.name }}</b>{% if isAdmin %}<a href="{{ getLink('guilds') }}?action=delete_by_admin&guild={{ guild.name }}"> - Delete this guild (for ADMIN only!)</a>{% endif %}
+											</span>
+
+											{% if guild.description is not empty %}
+											<br>
+											<span>{{ guild.description }}</span>
+											{% endif %}
+										</td>
+
+										<td>
+											<table border="0" cellspacing="0" cellpadding="0" width="100%">
+												<tbody>
+													<tr>
+														<td style="border:0;">
+															<form action="{{ guild.link }}" method="post">
+																{{ csrf() }}
+																{{ include('buttons.view.html.twig') }}
+															</form>
+														</td>
+													</tr>
+												</tbody>
+											</table>
+										</td>
+									</tr>
+									{% endfor %}
+								{% else %}
+								<tr bgcolor="{{ config.darkborder }}">
+									<td valign="top">
+										<b>Create Guild</b>
+										<br/>
+										Actually there is no guild on server.{% if logged %} Create first! Press button "Create Guild"{% endif %}
+									</td>
+
+									{% if logged %}
+									<td>
+										<table border="0" cellpadding="0" cellspacing="0" width="100%">
+											<form action="{{ getLink('guilds') }}?action=create" method="post">
+												{{ csrf() }}
+												{% set button_name = 'Found Guild' %}
+												{% set button_image = '_sbutton_foundguild' %}
+												{% include('buttons.base.html.twig') %}
+											</form>
+										</table>
+									</td>
+									{% endif %}
+								</tr>
+								{% endif %}
 							</tbody>
 						</table>
 					</div>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+				</div>
+				<div class="TableShadowContainer">
+					<div class="TableBottomShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bm.gif);">
+						<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bl.gif);"></div>
+						<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>
+					</div>
+				</div>
+			</td>
+		</tr>
+	</tbody>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
 <br>
 
 <table border="0" cellspacing="1" cellpadding="4" width="100%">

system/templates/guilds.manager.html.twig

@@ -54,41 +54,25 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 	</tr>
 </table>
 <br/>
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer">
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>        <span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >Add new rank</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;">
-						<tr>
-							<td width="120" valign="top">New rank name:</td>
-							<td>
-								<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=add_rank" method="post">
-									{{ csrf() }}
-									<input type="text" name="rank_name" size="20"/>
-									<input type="submit" value="Add"/>
-								</form>
-							</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
-<div style="text-align:center"><h3>Change rank names and levels</h3></div>
+{% set title = 'Add new rank' %}
+{% set content %}
+<table style="width:100%;">
+	<tr>
+		<td width="120" valign="top">New rank name:</td>
+		<td>
+			<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=add_rank" method="post">
+				{{ csrf() }}
+				<input type="text" name="rank_name" size="20"/>
+				<input type="submit" value="Add"/>
+			</form>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+
+{% set title = 'Change rank names and levels' %}
+{% set content %}
 <form action="{{ getLink('guilds') }}?action=save_ranks&guild={{ guild.getName() }}" method="post">
 	{{ csrf() }}
 	<table style="clear:both" border="0" cellpadding="0" cellspacing="0" width="100%">
@@ -146,6 +130,7 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 		</tr>
 	</table>
 </form>
+
 <h3>Ranks info:</h3>
 <b>0. Owner of guild</b> - it's highest rank, only one player in guild may has this rank. Player with this rank can:
 <li>Invite/Cancel Invitation/Kick Player from guild</li>
@@ -155,15 +140,19 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 <li>Change {% if constant('MOTD_EXISTS') %}MOTD, {% endif %}logo and description of guild</li>
 <hr/>
 <b>1. Leader</b> - it's second rank in guild. Player with this rank can:
-<li>Invite/Cancel Invitation/Kick Player from guild (only with lower rank than his)
-<li>Change ranks of players with lower rank level ("vice leader", "member") in guild<hr>
+<li>Invite/Cancel Invitation/Kick Player from guild (only with lower rank than his)</li>
+<li>Change ranks of players with lower rank level ("vice leader", "member") in guild</li>
+<hr>
 <b>2. Vice Leader</b> - it's third rank in guild. Player with this rank can:
-<li>Invite/Cancel Invitation
-<li>Change ranks of players with lower rank level ("member") in guild<hr>
+<li>Invite/Cancel Invitation</li>
+<li>Change ranks of players with lower rank level ("member") in guild</li>
+<hr>
 <b>3. Member</b> - it's lowest rank in guild. Player with this rank can:
-<li>Be a member of guild
+<li>Be a member of guild</li>
 <br/>
-<div style="text-align:center">
+{% endset %}
+{% include 'tables.headline.html.twig' %}
+	<div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?action=show&guild={{ guild.getName() }}" method="post">
 		{{ csrf() }}
 		{{ include('buttons.back.html.twig') }}

system/templates/guilds.pass_leadership.html.twig

@@ -1,38 +1,20 @@
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer">
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >Pass leadership</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer" >
-					<table style="width:100%;">
-						<tr>
-							<td>Pass leadership to: </b><br>
-								<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=pass_leadership" method="post">
-									{{ csrf() }}
-									<input type="hidden" name="todo" value="save"/>
-									<input type="text" size="40" name="player"/>
-									<input type="submit" value="Save">
-								</form>
-							</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+{% set title = 'Pass leadership' %}
+{% set background = config('darkborder') %}
+{% set content %}
+<table style="width:100%;">
+	<tr>
+		<td><strong>Pass leadership to: </strong><br>
+			<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=pass_leadership" method="post">
+				{{ csrf() }}
+				<input type="hidden" name="todo" value="save"/>
+				<input type="text" size="40" name="player"/>
+				<input type="submit" value="Save">
+			</form>
+		</td>
+	</tr>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
 <br/>
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">

system/templates/guilds.view.html.twig

@@ -21,64 +21,170 @@
 
 			{{ hook('HOOK_GUILDS_AFTER_GUILD_HEADER') }}
 
-			<table width="100%">
+			{% set title = 'Guild Information' %}
+			{% set background = config('darkborder') %}
+			{% set content %}
+			<table style="width:100%;">
 				<tbody>
 				<tr>
-					<td style="vertical-align:top;">
-						<div class="TableContainer">
-							<div class="TableContainer">
-								<div class="CaptionContainer">
-									<div class="CaptionInnerContainer">
-										<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-										<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-										<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-										<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-										<div class="Text">Guild Information</div>
-										<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-										<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-										<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-										<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-									</div>
-								</div>
+					<td style="word-break: break-all">
+						<div id="GuildInformationContainer">
+							{% if description is not empty %}
+								{{ description|raw }}
+								<br>
+								<br>
+							{% endif %}
+
+							{% if guild_owner is not empty %}
+								{% set guildOwnerName = guild_owner.getName() %}
+
+								<a href="{{ getPlayerLink(guildOwnerName, false) }}"><b>{{ guildOwnerName }}</b></a> is guild leader of <b>{{ guild_name }}</b>.
+								<br>
+							{% endif %}
+
+							The guild was founded on {{ config.lua.serverName }} on {{ guild_creation_date|date("j F Y") }}.
+							{% if isLeader %}
+								<a href="{{ getLink('guilds') }}?action=manager&guild={{ guild_name }}" style="float: right;">
+									{% set button_name = 'Manage Guild' %}
+									{% include('buttons.base.html.twig') %}
+								</a>
+							{% endif %}
+						</div>
+					</td>
+				</tr>
+				</tbody>
+			</table>
+			{% endset %}
+			{% include 'tables.headline.html.twig' %}
+			<br/>
+
+			{{ hook('HOOK_GUILDS_AFTER_GUILD_INFORMATION') }}
+
+			{% set title = 'Guild Members' %}
+			{% set content %}
+			<table style="width:100%;">
+				<tbody>
+				<tr>
+					<td>
+						<div class="TableContentAndRightShadow">
+							<div class="TableContentContainer">
+								<table class="TableContent" width="100%">
+									<tbody>
+									<tr class="LabelH">
+										<td>Rank</td>
+										<td>Name{% if useGuildNick %} and Title{% endif %}</td>
+										<td>Vocation</td>
+										<td>Level</td>
+										<td>Status</td>
+									</tr>
+
+									{% set showedRank, i = false, 0 %}
+									{% for rank in guild_members if rank.members|length > 0 %}
+										{% set rankStyle, i = getStyle(i), i + 1  %}
+
+										{% for player in rank.members %}
+											<tr bgcolor="{{ rankStyle }}">
+												<td>
+													{% if not showedRank %}{{ rank.rank_name }}{% endif %}
+													{% set showedRank = true %}
+												</td>
+
+												<td>
+													{% set playerName = player.getName() %}
+													<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
+														{{ csrf() }}
+														{{ getPlayerLink(playerName, true)|raw }}
+
+														{% set showGuildNick = false %}
+														{% if player.getGuildNick() is not empty %}
+															{% set showGuildNick = true %}
+															{% set guildNickRaw = player.getGuildNick()|raw %}
+														{% endif %}
+
+														{% if logged %}
+															{% if player.getId() in players_from_account_ids %}
+																(<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">)
+															{% else %}
+																{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
+															{% endif %}
+
+															{% if level_in_guild > rank.rank_level or isLeader %}
+																{% if guildOwnerName != playerName %}
+																	<span style="font-size: 10px; float: right">
+																		{<a href="{{ getLink('guilds') }}?action=kick_player&guild={{ guild_name|url_encode }}&name={{ playerName|url_encode }}">KICK</a>}
+																	</span>
+																{% endif %}
+															{% endif %}
+														{% else %}
+															{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
+														{% endif %}
+													</form>
+												</td>
+
+												<td>{{ player.getVocationName() }}</td>
+												<td>{{ player.getLevel() }}</td>
+												<td>
+													<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
+												</td>
+											</tr>
+										{% endfor %}
+
+										{% set showedRank = false %}
+									{% else %}
+										<tr bgcolor="{{ getStyle(i) }}">
+											<td colspan="5">No guild members found.</td>
+										</tr>
+									{% endfor %}
+									</tbody>
+								</table>
 							</div>
+						</div>
+					</td>
+				</tr>
+				</tbody>
+			</table>
+			{% endset %}
+			{% include 'tables.headline.html.twig' %}
+			<br/>
 
-							<table class="Table1" cellpadding="0" cellspacing="0">
+			{{ hook('HOOK_GUILDS_AFTER_GUILD_MEMBERS') }}
+			{% set title = 'Invited Characters' %}
+			{% set content %}
+			<table style="width:100%;">
+				<tbody>
+				<tr>
+					<td>
+						<div class="TableContentContainer">
+							<table class="TableContent" width="100%">
 								<tbody>
-								<tr>
-									<td>
-										<div class="InnerTableContainer">
-											<table style="width:100%;">
-												<tbody>
-												<tr>
-													<td style="word-break: break-all">
-														<div id="GuildInformationContainer">
-															{% if description is not empty %}
-																{{ description|raw }}
-																<br>
-																<br>
-															{% endif %}
-
-															{% if guild_owner is not empty %}
-																{% set guildOwnerName = guild_owner.getName() %}
-
-																<a href="{{ getPlayerLink(guildOwnerName, false) }}"><b>{{ guildOwnerName }}</b></a> is guild leader of <b>{{ guild_name }}</b>.
-																<br>
-															{% endif %}
-
-															The guild was founded on {{ config.lua.serverName }} on {{ guild_creation_date|date("j F Y") }}.
-															{% if isLeader %}
-																<a href="{{ getLink('guilds') }}?action=manager&guild={{ guild_name }}" style="float: right;">
-																	<img src="{{ template_path }}/images/global/buttons/sbutton_manageguild.png" style="width: 120px; height: 20px;" alt="Manage Guild">
-																</a>
-															{% endif %}
-														</div>
-													</td>
-												</tr>
-												</tbody>
-											</table>
-										</div>
-									</td>
+								<tr class="LabelH">
+									<td><b>Name</b></td>
 								</tr>
+
+								{% set i = 0 %}
+								{% for invited_player in invited_list if invited_list|length > 0 %}
+									{% if invited_player.isLoaded() %}
+										<tr bgcolor="{{ getStyle(i) }}">
+											{% set i = i + 1 %}
+
+											<td>
+												{{ getPlayerLink(invited_player.getName(), true)|raw }}
+
+												{% if isVice %}
+													<div style="float: right">
+														{<a href="{{ getLink('guilds') }}?action=delete_invite&guild={{ guild_name|url_encode }}&name={{ invited_player.getName()|url_encode }}">Cancel Invitation</a>}
+													</div>
+												{% endif %}
+											</td>
+										</tr>
+									{% endif %}
+								{% else %}
+									<tr bgcolor="{{ getStyle(i) }}">
+										<td>
+											No invited characters found.
+										</td>
+									</tr>
+								{% endfor %}
 								</tbody>
 							</table>
 						</div>
@@ -86,191 +192,8 @@
 				</tr>
 				</tbody>
 			</table>
-			<br/>
-
-			{{ hook('HOOK_GUILDS_AFTER_GUILD_INFORMATION') }}
-
-			<div class="TableContainer">
-				<div class="TableContainer">
-					<div class="CaptionContainer">
-						<div class="CaptionInnerContainer">
-							<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-							<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-							<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-							<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-							<div class="Text">Guild Members</div>
-							<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-							<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-							<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-							<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-						</div>
-					</div>
-				</div>
-
-				<table class="Table3" cellpadding="0" cellspacing="0">
-					<tbody>
-					<tr>
-						<td>
-							<div class="InnerTableContainer">
-								<table style="width:100%;">
-									<tbody>
-									<tr>
-										<td>
-											<div class="TableContentAndRightShadow">
-												<div class="TableContentContainer">
-													<table class="TableContent" width="100%">
-														<tbody>
-														<tr class="LabelH">
-															<td>Rank</td>
-															<td>Name{% if useGuildNick %} and Title{% endif %}</td>
-															<td>Vocation</td>
-															<td>Level</td>
-															<td>Status</td>
-														</tr>
-
-														{% set showedRank, i = false, 0 %}
-														{% for rank in guild_members if rank.members|length > 0 %}
-															{% set rankStyle, i = getStyle(i), i + 1  %}
-
-															{% for player in rank.members %}
-																<tr bgcolor="{{ rankStyle }}">
-																	<td>
-																		{% if not showedRank %}{{ rank.rank_name }}{% endif %}
-																		{% set showedRank = true %}
-																	</td>
-
-																	<td>
-																		{% set playerName = player.getName() %}
-																		<form action="{{ getLink('guilds') }}?action=change_nick&name={{ playerName }}&guild={{ guild_name }}" method="post">
-																			{{ csrf() }}
-																			{{ getPlayerLink(playerName, true)|raw }}
-
-																			{% set showGuildNick = false %}
-																			{% if player.getGuildNick() is not empty %}
-																				{% set showGuildNick = true %}
-																				{% set guildNickRaw = player.getGuildNick()|raw %}
-																			{% endif %}
-
-																			{% if logged %}
-																				{% if player.getId() in players_from_account_ids %}
-																					(<input type="text" name="nick" value="{{ guildNickRaw }}"><input type="submit" value="Change">)
-																				{% else %}
-																					{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
-																				{% endif %}
-
-																				{% if level_in_guild > rank.rank_level or isLeader %}
-																					{% if guildOwnerName != playerName %}
-																						<span style="font-size: 10px; float: right">
-																							{<a href="{{ getLink('guilds') }}?action=kick_player&guild={{ guild_name|url_encode }}&name={{ playerName|url_encode }}">KICK</a>}
-																						</span>
-																					{% endif %}
-																				{% endif %}
-																			{% else %}
-																				{% if showGuildNick %} ({{ guildNickRaw }}){% endif %}
-																			{% endif %}
-																		</form>
-																	</td>
-
-																	<td>{{ player.getVocationName() }}</td>
-																	<td>{{ player.getLevel() }}</td>
-																	<td>
-																		<span style="color: {% if player.isOnline() %} green;"><b>Online{% else %} red;"><b>Offline{% endif %}</b></span>
-																	</td>
-																</tr>
-															{% endfor %}
-
-															{% set showedRank = false %}
-														{% else %}
-															<tr bgcolor="{{ getStyle(i) }}">
-																<td colspan="5">No guild members found.</td>
-															</tr>
-														{% endfor %}
-														</tbody>
-													</table>
-												</div>
-											</div>
-										</td>
-									</tr>
-									</tbody>
-								</table>
-							</div>
-						</td>
-					</tr>
-					</tbody>
-				</table>
-			</div>
-			<br/>
-
-			{{ hook('HOOK_GUILDS_AFTER_GUILD_MEMBERS') }}
-
-			<div class="TableContainer">
-				<div class="CaptionContainer">
-					<div class="CaptionInnerContainer">
-						<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-						<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-						<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-						<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-						<div class="Text">Invited Characters</div>
-						<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-						<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-						<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-						<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					</div>
-				</div>
-
-				<table class="Table3" cellpadding="0" cellspacing="0">
-					<tbody>
-					<tr>
-						<td>
-							<div class="InnerTableContainer">
-								<table style="width:100%;">
-									<tbody>
-									<tr>
-										<td>
-											<div class="TableContentContainer">
-												<table class="TableContent" width="100%">
-													<tbody>
-													<tr class="LabelH">
-														<td><b>Name</b></td>
-													</tr>
-
-													{% set i = 0 %}
-													{% for invited_player in invited_list if invited_list|length > 0 %}
-														{% if invited_player.isLoaded() %}
-															<tr bgcolor="{{ getStyle(i) }}">
-																{% set i = i + 1 %}
-
-																<td>
-																	{{ getPlayerLink(invited_player.getName(), true)|raw }}
-
-																	{% if isVice %}
-																		<div style="float: right">
-																			{<a href="{{ getLink('guilds') }}?action=delete_invite&guild={{ guild_name|url_encode }}&name={{ invited_player.getName()|url_encode }}">Cancel Invitation</a>}
-																		</div>
-																	{% endif %}
-																</td>
-															</tr>
-														{% endif %}
-													{% else %}
-														<tr bgcolor="{{ getStyle(i) }}">
-															<td>
-																No invited characters found.
-															</td>
-														</tr>
-													{% endfor %}
-													</tbody>
-												</table>
-											</div>
-										</td>
-									</tr>
-									</tbody>
-								</table>
-							</div>
-						</td>
-					</tr>
-					</tbody>
-				</table>
-			</div>
+			{% endset %}
+			{% include 'tables.headline.html.twig' %}
 			<br/>
 
 			{{ hook('HOOK_GUILDS_AFTER_INVITED_CHARACTERS', { 'guild': guild, 'isLeader': isLeader }) }}

system/templates/highscores.html.twig

@@ -11,7 +11,7 @@
 						<select onchange="location = this.value;" aria-label="skillFilter" id="skillFilter">
 							{% set i = 0 %}
 							{% for link, name in types %}
-								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is defined %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
+								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
 							{% endfor %}
 						</select>
 					</td>
@@ -105,7 +105,7 @@
 				<tr bgcolor="{{ config.lightborder }}">
 					<td>
 						{% for link, name in types %}
-						<a href="{{ getLink('highscores') }}/{{ link }}{% if vocation is defined %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</a><br/>
+						<a href="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}/{{ vocation }}{% endif %}" class="size_xs">{{ name }}</a><br/>
 						{% endfor %}
 					</td>
 				</tr>

system/templates/houses.html.twig

@@ -1,171 +1,151 @@
-<div class="TableContainer">
-	{% if errors is not empty %}
-		{% for error in errors %}
-			<p class="error">{{ error }}</p>
-		{% endfor %}
-	{% else %}
-		<table class="Table1" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >House Search</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
+{% set title = 'House Search' %}
+{% set content %}
+{% if errors is not empty %}
+	{% for error in errors %}
+		<p class="error">{{ error }}</p>
+	{% endfor %}
+{% else %}
+Here you can see the list of all available houses, flats{{ guildString }}.
+Click on any view button to get more information about a house or adjust
+the search criteria and start a new search.
+<br><br>
+{% if cleanOldHouse is not empty or rentType != 'never' %}
+	Every morning during global server save there is automatic house cleaning. Server delete house owners who have not logged in last {{ cleanOldHouse }} days{% if rentType != 'never' %} or have not paid {{ rentType }} house rent. Remember to leave money for a rent in {% if config.lua.bankSystem is not empty %}your house bank or {% else %}depo in same city where you have house!{% endif %}{% else %}.{% endif %}
+	<br><br>
+{% endif %}
 
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						Here you can see the list of all available houses, flats{{ guildString }}.
-						Click on any view button to get more information about a house or adjust
-						the search criteria and start a new search.
-						<br><br>
-						{% if cleanOldHouse is not empty or rentType != 'never' %}
-							Every morning during global server save there is automatic house cleaning. Server delete house owners who have not logged in last {{ cleanOldHouse }} days{% if rentType != 'never' %} or have not paid {{ rentType }} house rent. Remember to leave money for a rent in {% if config.lua.bankSystem is not empty %}your house bank or {% else %}depo in same city where you have house!{% endif %}{% else %}.{% endif %}
-							<br><br>
-						{% endif %}
+{% if houses is not empty or housesSearch %}
+<table border="0" cellspacing="1" cellpadding="4" width="100%">
+	<tbody>
+		<tr bgcolor="{{ config.vdarkborder }}">
+			<td colspan="6" class="white"><b>Available {{ houseType }}{% if townName is not empty %} in {{ townName }}{% endif %} on <b>{{ config.lua.serverName }}</b></b></td>
+		</tr>
 
-						{% if houses is not empty or housesSearch %}
-						<table border="0" cellspacing="1" cellpadding="4" width="100%">
-							<tbody>
-								<tr bgcolor="{{ config.vdarkborder }}">
-									<td colspan="6" class="white"><b>Available {{ houseType }}{% if townName is not empty %} in {{ townName }}{% endif %} on <b>{{ config.lua.serverName }}</b></b></td>
-								</tr>
+		<tr bgcolor="{{ config.darkborder }}">
+			{% if houses is not empty %}
+				<td width="40%"><b>Name</b></td>
+				<td width="10%"><b>Size</b></td>
+				<td width="10%"><b>Rent</b></td>
 
-								<tr bgcolor="{{ config.darkborder }}">
-									{% if houses is not empty %}
-										<td width="40%"><b>Name</b></td>
-										<td width="10%"><b>Size</b></td>
-										<td width="10%"><b>Rent</b></td>
+				<td width="40%"><b>Status</b></td>
+				<td>&nbsp;</td>
+			{% elseif housesSearch %}
+				<td>No {{ houseType }} with specified criterias.</td>
+			{% endif %}
+		</tr>
 
-										<td width="40%"><b>Status</b></td>
-										<td>&nbsp;</td>
-									{% elseif housesSearch %}
-										<td>No {{ houseType }} with specified criterias.</td>
-									{% endif %}
-								</tr>
+		{% if houses is not empty %}
+			{% set i = 0 %}
+			{% for house in houses %}
+				{% set i = i + 1 %}
+				<tr bgcolor="{{ getStyle(i) }}">
+					<td width="40%">
+						{{ house.name }}
+					</td>
 
-								{% if houses is not empty %}
-									{% set i = 0 %}
-									{% for house in houses %}
-										{% set i = i + 1 %}
-										<tr bgcolor="{{ getStyle(i) }}">
-											<td width="40%">
-												{{ house.name }}
-											</td>
+					<td width="10%">
+						{{ house.size }}
+					</td>
 
-											<td width="10%">
-												{{ house.size }}
-											</td>
+					<td width="10%">
+						{{ house.rent }} golds
+					</td>
 
-											<td width="10%">
-												{{ house.rent }} golds
-											</td>
+					<td width="40%">
+						{{ house.rentedBy|raw }}
+					</td>
 
-											<td width="40%">
-												{{ house.rentedBy|raw }}
-											</td>
-
-											<td>
-												<form action="{{ getLink('houses/view') }}" method="post">
-													<input type="hidden" name="house" value="{{ house.name }}">
-													{{ include('buttons.view.html.twig') }}
-												</form>
-											</td>
-										</tr>
-									{% endfor %}
-								{% endif %}
-							</tbody>
-						</table>
-						<br>
-						{% endif %}
-
-						<form action="{{ getLink('houses') }}" method="post">
-							<table border="0" cellspacing="1" cellpadding="4" width="100%">
-								<tbody>
-									<tr bgcolor="{{ config.vdarkborder }}">
-										<td colspan="4" class="white"><b>House Search</b></td>
-									</tr>
-
-									<tr bgcolor="{{ config.darkborder }}">
-										<td width="25%"><b>Town</b></td>
-										<td width="25%"><b>Status</b></td>
-										<td width="25%"><b>Order</b></td>
-									</tr>
-
-									<tr bgcolor="{{ config.darkborder }}">
-										<td valign="top" rowspan="2">
-											{% set checked = false %}
-											{% for id, name in config.towns if id > 0 %}
-												{% if ((townId is empty and name is not empty) or id == townId) and not checked %}
-													{% set variable = "checked" %}
-													{% set checked = true %}
-												{% else %}
-													{% set variable = "" %}
-												{% endif %}
-
-												<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
-												<label for="town_{{ id }}"> {{ name }}</label>
-												<br>
-											{% endfor %}
-										</td>
-
-										<td valign="top">
-											<input type="radio" name="state" id="state_all" value=""{% if state is empty %} checked{% endif %}>
-											<label for="state_all">all states</label><br>
-
-											<input type="radio" name="state" id="state_free" value="free"{% if state == 'free' %} checked{% endif %}>
-											<label for="state_free">free</label><br>
-
-											<input type="radio" name="state" id="state_rented" value="rented"{% if state == 'rented' %} checked{% endif %}>
-											<label for="state_rented">rented</label><br>
-										</td>
-
-										<td valign="top" rowspan="2">
-											<input type="radio" name="order" id="order_name" value=""{% if order is empty %} checked{% endif %}>
-											<label for="order_name"> by name</label><br>
-
-											<input type="radio" name="order" id="order_size" value="size"{% if order == 'size' %} checked{% endif %}>
-											<label for="order_size"> by size</label><br>
-
-											<input type="radio" name="order" id="order_rent" value="rent"{% if order == 'rent' %} checked{% endif %}>
-											<label for="order_rent"> by rent</label><br>
-										</td>
-									</tr>
-
-									<tr bgcolor="{{ config.darkborder }}">
-										<td valign="top">
-											<input type="radio" name="type" id="type_all" value=""{% if type is empty %} checked{% endif %}>
-											<label for="type"> all</label><br>
-											<input type="radio" name="type" id="type_houses" value="houses"{% if type == 'houses' %} checked{% endif %}>
-											<label for="type_houses"> houses and flats</label><br>
-											<input type="radio" name="type" id="type_guildhalls" value="guildhalls"{% if type == 'guildhalls' %} checked{% endif %}>
-											<label for="type_guildhalls"> guildhalls</label><br>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-							<br>
-
-							<table border="0" cellspacing="0" cellpadding="0" width="100%">
-								<tbody>
-									<tr align="center">
-										<td>
-											{{ include('buttons.submit.html.twig') }}
-										</td>
-									</tr>
-								</tbody>
-							</table>
+					<td>
+						<form action="{{ getLink('houses/view') }}" method="post">
+							<input type="hidden" name="house" value="{{ house.name }}">
+							{{ include('buttons.view.html.twig') }}
 						</form>
-					</div>
+					</td>
+				</tr>
+			{% endfor %}
+		{% endif %}
+	</tbody>
+</table>
+<br>
+{% endif %}
+
+<form action="{{ getLink('houses') }}" method="post">
+	<table border="0" cellspacing="1" cellpadding="4" width="100%">
+		<tbody>
+			<tr bgcolor="{{ config.vdarkborder }}">
+				<td colspan="4" class="white"><b>House Search</b></td>
+			</tr>
+
+			<tr bgcolor="{{ config.darkborder }}">
+				<td width="25%"><b>Town</b></td>
+				<td width="25%"><b>Status</b></td>
+				<td width="25%"><b>Order</b></td>
+			</tr>
+
+			<tr bgcolor="{{ config.darkborder }}">
+				<td valign="top" rowspan="2">
+					{% set checked = false %}
+					{% for id, name in config.towns if id > 0 %}
+						{% if ((townId is empty and name is not empty) or id == townId) and not checked %}
+							{% set variable = "checked" %}
+							{% set checked = true %}
+						{% else %}
+							{% set variable = "" %}
+						{% endif %}
+
+						<input type="radio" name="town" id="town_{{ id }}" value="{{ id }}"{% if variable is defined %} {{ variable }}{% endif %}>
+						<label for="town_{{ id }}"> {{ name }}</label>
+						<br>
+					{% endfor %}
+				</td>
+
+				<td valign="top">
+					<input type="radio" name="state" id="state_all" value=""{% if state is empty %} checked{% endif %}>
+					<label for="state_all">all states</label><br>
+
+					<input type="radio" name="state" id="state_free" value="free"{% if state == 'free' %} checked{% endif %}>
+					<label for="state_free">free</label><br>
+
+					<input type="radio" name="state" id="state_rented" value="rented"{% if state == 'rented' %} checked{% endif %}>
+					<label for="state_rented">rented</label><br>
+				</td>
+
+				<td valign="top" rowspan="2">
+					<input type="radio" name="order" id="order_name" value=""{% if order is empty %} checked{% endif %}>
+					<label for="order_name"> by name</label><br>
+
+					<input type="radio" name="order" id="order_size" value="size"{% if order == 'size' %} checked{% endif %}>
+					<label for="order_size"> by size</label><br>
+
+					<input type="radio" name="order" id="order_rent" value="rent"{% if order == 'rent' %} checked{% endif %}>
+					<label for="order_rent"> by rent</label><br>
 				</td>
 			</tr>
-		</table>
-	{% endif %}
-</div>
+
+			<tr bgcolor="{{ config.darkborder }}">
+				<td valign="top">
+					<input type="radio" name="type" id="type_all" value=""{% if type is empty %} checked{% endif %}>
+					<label for="type"> all</label><br>
+					<input type="radio" name="type" id="type_houses" value="houses"{% if type == 'houses' %} checked{% endif %}>
+					<label for="type_houses"> houses and flats</label><br>
+					<input type="radio" name="type" id="type_guildhalls" value="guildhalls"{% if type == 'guildhalls' %} checked{% endif %}>
+					<label for="type_guildhalls"> guildhalls</label><br>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<br>
+
+	<table border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tbody>
+			<tr align="center">
+				<td>
+					{{ include('buttons.submit.html.twig') }}
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</form>
+{% endif %}
+{% endset %}
+{% include 'tables.headline.html.twig' %}

system/templates/houses.view.html.twig

@@ -1,51 +1,32 @@
-<div class="TableContainer">
-	{% if errors is not empty %}
-		{% for error in errors %}
-			<p class="error">{{ error }}</p>
-		{% endfor %}
-	{% else %}
-		<table class="Table1" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
-			<div class="CaptionContainer">
-				<div class="CaptionInnerContainer">
-					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<div class="Text" >{{ houseName }}</div>
-					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				</div>
-			</div>
+{% set title = houseName %}
+{% set content %}
 
-			<tr>
-				<td>
-					<div class="InnerTableContainer">
-						<table border="0" cellpadding="4" cellspacing="1" width="100%">
-							<tr style="display: inline-flex;">
-								<td><img src="{{ imgPath }}"></td>
-								<td>
-									{{ bedsMessage }} and has a size of <b>{{ houseSize }} square meters</b>.
+{% if errors is not empty %}
+	{% for error in errors %}
+		<p class="error">{{ error }}</p>
+	{% endfor %}
+{% else %}
+<table border="0" cellpadding="4" cellspacing="1" width="100%">
+	<tr style="display: inline-flex;">
+		<td><img src="{{ imgPath }}"></td>
+		<td>
+			{{ bedsMessage }} and has a size of <b>{{ houseSize }} square meters</b>.
 
-									{% if rentType != 'never' %}
-										The {{ rentType }} is <b>{{ houseRent }} gold</b> and will be debited to the bank account on <b>{{ config.lua.serverName }}</b>.
-									{% endif %}
-									<br>
+			{% if rentType != 'never' %}
+				The {{ rentType }} is <b>{{ houseRent }} gold</b> and will be debited to the bank account on <b>{{ config.lua.serverName }}</b>.
+			{% endif %}
+			<br>
 
-									{% if owner is not empty  %}
-									The house has been rented by <b>{{ owner|raw }}</b>.
-									{% else %}
-									No one has bought this house yet.
-									{% endif %}
-								</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	{% endif %}
+			{% if owner is not empty  %}
+			The house has been rented by <b>{{ owner|raw }}</b>.
+			{% else %}
+			No one has bought this house yet.
+			{% endif %}
+		</td>
+	</tr>
+</table>
+{% endif %}
 
-</div>
+{% endset %}
+{% include 'tables.headline.html.twig' %}
 <br><br>

system/templates/lastkills.html.twig

@@ -1,72 +1,53 @@
-<div class="TableContainer" >
-	<table class="Table3">
-		<div class="CaptionContainer" >
-			<div class="CaptionInnerContainer" >
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" ></span>
-				<div class="Text" >Last Kills</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" ></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
+{% set title = 'Last Kills' %}
+{% set content %}
+<table style="width:100%;">
+	<tbody>
+	<tr>
+		<td>
+			<div class="TableShadowContainerRightTop">
+				<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/content/table-shadow-rt.gif);"></div>
 			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer" >
-					<table style="width:100%;">
-						<tbody>
-						<tr>
-							<td>
-								<div class="TableShadowContainerRightTop">
-									<div class="TableShadowRightTop" style="background-image:url({{ template_path }}/images/content/table-shadow-rt.gif);"></div>
-								</div>
-								<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
-									<div class="TableContentContainer">
-										<table class="TableContent" width="100%">
-											{% if lastkills|length <= 0 %}
-												<tr>
-													<td>
-														No one died on {{ config.lua.serverName }}
-													</td>
-												</tr>
-											{% else %}
-												{% for lastkill in lastkills %}
-												<tr bgcolor="{{ getStyle(lastkill.id) }}">
-													<td class="centralizeContent" width="30">
-														{{ lastkill.id }}.
-													</td>
-													<td width="125">
-														<small>{{ lastkill.time|date("j.m.Y, G:i:s") }}</small>
-													</td>
-													<td>
-														{{ lastkill.killers_string|raw }}
-													</td>
-													{% if config.multiworld %}
-														<td>
-															{{ lastkill.world_id }}
-														</td>
-													{% endif %}
-												</tr>
-												{% endfor %}
-											{% endif %}
-										</table>
-									</div>
-								</div>
-								<div class="TableShadowContainer">
-									<div class="TableBottomShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bm.gif);">
-										<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bl.gif);"></div>
-										<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>
-									</div>
-								</div>
-							</td>
-						</tr>
-						</tbody>
+			<div class="TableContentAndRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-rm.gif);">
+				<div class="TableContentContainer">
+					<table class="TableContent" width="100%">
+						{% if lastkills|length <= 0 %}
+							<tr>
+								<td>
+									No one died on {{ config.lua.serverName }}
+								</td>
+							</tr>
+						{% else %}
+							{% for lastkill in lastkills %}
+							<tr bgcolor="{{ getStyle(lastkill.id) }}">
+								<td class="centralizeContent" width="30">
+									{{ lastkill.id }}.
+								</td>
+								<td width="125">
+									<small>{{ lastkill.time|date("j.m.Y, G:i:s") }}</small>
+								</td>
+								<td>
+									{{ lastkill.killers_string|raw }}
+								</td>
+								{% if config.multiworld %}
+									<td>
+										{{ lastkill.world_id }}
+									</td>
+								{% endif %}
+							</tr>
+							{% endfor %}
+						{% endif %}
 					</table>
 				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+			</div>
+			<div class="TableShadowContainer">
+				<div class="TableBottomShadow" style="background-image:url(https://static.tibia.com/images/global/content/table-shadow-bm.gif);">
+					<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bl.gif);"></div>
+					<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>
+				</div>
+			</div>
+		</td>
+	</tr>
+	</tbody>
+</table>
+{% endset %}
+{% include 'tables.headline.html.twig' %}

system/templates/success.html.twig

@@ -1,31 +1,17 @@
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer">
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >{{ title|raw }}</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;">
-						<tr>
-							<td>{{ description|raw }}</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+<table border="0" cellspacing="1" cellpadding="4" width="100%">
+	<thead>
+	<tr bgcolor="{{ config.vdarkborder }}">
+		<td colspan="3" class="white"><b>{{ title|raw }}</b></td>
+	</tr>
+	</thead>
+	<tbody>
+	<tr style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.darkborder }}{% endif %}">
+		<td>
+			{{ description|raw }}
+		</td>
+	</tr>
+	</tbody>
+</table>
 <br/>
 {% if custom_buttons is defined %}
 {{ custom_buttons|raw }}

system/templates/tables.headline.html.twig

@@ -1,24 +1,14 @@
-<div class="TableContainer">
-	<div class="CaptionContainer">
-		<div class="CaptionInnerContainer">
-			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<div class="Text" >{{ title|raw }}</div>
-			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-		</div>
-	</div>
-	<table class="Table5" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					{{ content|raw }}
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+<table border="0" cellspacing="1" cellpadding="4" width="100%">
+	<thead>
+	<tr bgcolor="{{ config.vdarkborder }}">
+		<td colspan="3" class="white"><b>{{ title|raw }}</b></td>
+	</tr>
+	</thead>
+	<tbody>
+	<tr style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.lightborder }}{% endif %}">
+		<td>
+			{{ content|raw }}
+		</td>
+	</tr>
+	</tbody>
+</table>

system/templates/team.html.twig

@@ -1,186 +1,170 @@
-<div class="TableContainer">
-	<div class="CaptionContainer">
-		<div class="CaptionInnerContainer">
-			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<div class="Text" >Support in game</div>
-			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-		</div>
-	</div>
-	<table class="Table1" cellpadding="0" cellspacing="0" style="background-color: {{ config.darkborder }}">
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					{% set i = 0 %}
-					{% if setting('core.team_style') == 1 %}
+{% set title = 'Support in game' %}
+{% set content %}
+{% set i = 0 %}
 
-						<table border="0" cellpadding="4" cellspacing="1" width="100%">
-							<tr bgcolor="{{ config.vdarkborder }}">
-								<td width="10%" class="white">
-									<b>Group</b>
-								</td>
-
-								{% if setting('core.team_outfit') %}
-								<td width="5%" class="white">
-									<b>Outfit</b>
-								</td>
-								{% endif %}
-
-								<td width="40%" class="white">
-									<b>Name</b>
-								</td>
-
-								{% if setting('core.team_status') %}
-								<td class="white">
-									<b>Status</b>
-								</td>
-								{% endif %}
-
-								{% if (setting('core.multiworld') or setting('core.team_world')) %}
-								<td class="white">
-									<b>World</b>
-								</td>
-								{% endif %}
-
-								{% if setting('core.team_lastlogin') %}
-								<td class="white">
-									<b>Last login</b>
-								</td>
-								{% endif %}
-							</tr>
-
-							{% for group in groupmember|reverse %}
-								{% if group.members is not empty %}
-									{% for member in group.members|reverse %}
-									{% set i = i + 1 %}
-									<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
-										<td>{{ group.group_name|capitalize }}</td>
-
-										{% if setting('core.team_outfit') %}
-										<td>
-											<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
-										</td>
-										{% endif %}
-
-										<td>
-											{% if setting('core.account_country') %}
-												{{ member.flag_image|raw }}
-											{% endif %}
-											{{ member.link|raw }}
-										</td>
-
-										{% if setting('core.team_status') %}
-										<td>
-											{% if member.status %}
-												<span style="color: green"><b>Online</b></span>
-											{% else %}
-												<span style="color: red"><b>Offline</b></span>
-											{% endif %}
-										</td>
-										{% endif %}
-
-										{% if (setting('core.multiworld') or setting('core.team_world')) %}
-										<td>
-											<span><b>{{ member.world_name }}</b></span>
-										</td>
-										{% endif %}
-
-										{% if setting('core.team_lastlogin') %}
-										<td>
-											<span>{{ member.last_login }}</span>
-										</td>
-										{% endif %}
-									</tr>
-									{% endfor %}
-								{% endif %}
-							{% endfor %}
-						</table>
-					{% elseif setting('core.team_style') == 2 %}
-						{% for group in groupmember|reverse %}
-							{% if group.members is not empty %}
-							<div style="text-align:center"><h2>{{ group.group_name|capitalize }}</h2></div>
-
-							<table cellspacing="1" cellpadding="4" border="0" width="100%">
-								<tr bgcolor="{{ config.vdarkborder }}">
-									{% if setting('core.team_outfit') %}
-									<td width="5%" class="white">
-										<b>Outfit</b>
-									</td>
-									{% endif %}
-
-									<td width="40%" class="white">
-										<b>Name</b>
-									</td>
-
-									{% if setting('core.team_status') %}
-									<td class="white">
-										<b>Status</b>
-									</td>
-									{% endif %}
-
-									{% if (setting('core.multiworld') or setting('core.team_world')) %}
-									<td class="white">
-										<b>World</b>
-									</td>
-									{% endif %}
-
-									{% if setting('core.team_lastlogin') %}
-									<td class="white">
-										<b>Last login</b>
-									</td>
-									{% endif %}
-								</tr>
-
-								{% for member in group.members %}
-								{% set i = i + 1 %}
-									<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
-									{% if setting('core.team_outfit') %}
-									<td>
-										<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
-									</td>
-									{% endif %}
-
-									<td>
-										{% if setting('core.account_country') %}
-											{{ member.flag_image|raw }}
-										{% endif %}
-										{{ member.link|raw }}
-									</td>
-
-									{% if setting('core.team_status') %}
-									<td>
-										{% if member.status %}
-											<span style="color: green"><b>Online</b></span>
-										{% else %}
-											<span style="color: red"><b>Offline</b></span>
-										{% endif %}
-									</td>
-									{% endif %}
-
-									{% if (setting('core.multiworld') or setting('core.team_world')) %}
-									<td>
-										<span><b>{{ member.world_name }}</b></span>
-									</td>
-									{% endif %}
-
-									{% if setting('core.team_lastlogin') %}
-									<td>
-										<span>{{ member.last_login }}</span>
-									</td>
-									{% endif %}
-								</tr>
-								{% endfor %}
-							</table>
-							{% endif %}
-						{% endfor %}
-					{% endif %}
-				</div>
+{% if setting('core.team_style') == 1 %}
+	<table border="0" cellpadding="4" cellspacing="1" width="100%">
+		<tr bgcolor="{{ config.vdarkborder }}">
+			<td width="10%" class="white">
+				<b>Group</b>
 			</td>
+
+			{% if setting('core.team_outfit') %}
+			<td width="5%" class="white">
+				<b>Outfit</b>
+			</td>
+			{% endif %}
+
+			<td width="40%" class="white">
+				<b>Name</b>
+			</td>
+
+			{% if setting('core.team_status') %}
+			<td class="white">
+				<b>Status</b>
+			</td>
+			{% endif %}
+
+			{% if (setting('core.multiworld') or setting('core.team_world')) %}
+			<td class="white">
+				<b>World</b>
+			</td>
+			{% endif %}
+
+			{% if setting('core.team_lastlogin') %}
+			<td class="white">
+				<b>Last login</b>
+			</td>
+			{% endif %}
 		</tr>
+
+		{% for group in groupmember|reverse %}
+			{% if group.members is not empty %}
+				{% for member in group.members|reverse %}
+				{% set i = i + 1 %}
+				<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
+					<td>{{ group.group_name|capitalize }}</td>
+
+					{% if setting('core.team_outfit') %}
+					<td>
+						<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
+					</td>
+					{% endif %}
+
+					<td>
+						{% if setting('core.account_country') %}
+							{{ member.flag_image|raw }}
+						{% endif %}
+						{{ member.link|raw }}
+					</td>
+
+					{% if setting('core.team_status') %}
+					<td>
+						{% if member.status %}
+							<span style="color: green"><b>Online</b></span>
+						{% else %}
+							<span style="color: red"><b>Offline</b></span>
+						{% endif %}
+					</td>
+					{% endif %}
+
+					{% if (setting('core.multiworld') or setting('core.team_world')) %}
+					<td>
+						<span><b>{{ member.world_name }}</b></span>
+					</td>
+					{% endif %}
+
+					{% if setting('core.team_lastlogin') %}
+					<td>
+						<span>{{ member.last_login }}</span>
+					</td>
+					{% endif %}
+				</tr>
+				{% endfor %}
+			{% endif %}
+		{% endfor %}
 	</table>
-</div>
+
+	{% elseif setting('core.team_style') == 2 %}
+
+	{% for group in groupmember|reverse %}
+		{% if group.members is not empty %}
+		<div style="text-align:center"><h2>{{ group.group_name|capitalize }}</h2></div>
+
+		<table cellspacing="1" cellpadding="4" border="0" width="100%">
+			<tr bgcolor="{{ config.vdarkborder }}">
+				{% if setting('core.team_outfit') %}
+				<td width="5%" class="white">
+					<b>Outfit</b>
+				</td>
+				{% endif %}
+
+				<td width="40%" class="white">
+					<b>Name</b>
+				</td>
+
+				{% if setting('core.team_status') %}
+				<td class="white">
+					<b>Status</b>
+				</td>
+				{% endif %}
+
+				{% if (setting('core.multiworld') or setting('core.team_world')) %}
+				<td class="white">
+					<b>World</b>
+				</td>
+				{% endif %}
+
+				{% if setting('core.team_lastlogin') %}
+				<td class="white">
+					<b>Last login</b>
+				</td>
+				{% endif %}
+			</tr>
+
+			{% for member in group.members %}
+			{% set i = i + 1 %}
+				<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
+				{% if setting('core.team_outfit') %}
+				<td>
+					<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
+				</td>
+				{% endif %}
+
+				<td>
+					{% if setting('core.account_country') %}
+						{{ member.flag_image|raw }}
+					{% endif %}
+					{{ member.link|raw }}
+				</td>
+
+				{% if setting('core.team_status') %}
+				<td>
+					{% if member.status %}
+						<span style="color: green"><b>Online</b></span>
+					{% else %}
+						<span style="color: red"><b>Offline</b></span>
+					{% endif %}
+				</td>
+				{% endif %}
+
+				{% if (setting('core.multiworld') or setting('core.team_world')) %}
+				<td>
+					<span><b>{{ member.world_name }}</b></span>
+				</td>
+				{% endif %}
+
+				{% if setting('core.team_lastlogin') %}
+				<td>
+					<span>{{ member.last_login }}</span>
+				</td>
+				{% endif %}
+			</tr>
+			{% endfor %}
+		</table>
+		{% endif %}
+	{% endfor %}
+{% endif %}
+
+{% endset %}
+{% include 'tables.headline.html.twig' %}

system/twig.php

@@ -31,6 +31,8 @@ if($dev_mode) {
 }
 unset($dev_mode);
 
+$twig->addExtension(new MyAAC\Twig\Extension\TypeCastingExtension());
+
 $filter = new TwigFilter('timeago', function ($datetime) {
 
 	$time = time() - strtotime($datetime);
@@ -71,8 +73,8 @@ $function = new TwigFunction('generateLink', function ($s, $n, $b = false) {
 });
 $twig->addFunction($function);
 
-$function = new TwigFunction('getPlayerLink', function ($s, $p = true) {
-	return getPlayerLink($s, $p);
+$function = new TwigFunction('getPlayerLink', function ($s, $p = true, $colored = false) {
+	return getPlayerLink($s, $p, $colored);
 });
 $twig->addFunction($function);