From c546a468478228c4faee5d262a1a538e36f3bc42 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Thu, 14 Sep 2017 15:03:09 +0200
Subject: [PATCH] * moved rules to twig

* added bugtracker to kathrine template
---
 system/pages/bans.php             |  2 +-
 system/pages/experiencestages.php | 22 +++++++++-----------
 system/pages/rules.php            | 34 +------------------------------
 system/pages/spells.php           |  2 +-
 system/templates/rules.html.twig  | 32 +++++++++++++++++++++++++++++
 templates/kathrine/template.php   |  5 ++---
 6 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 system/templates/rules.html.twig

diff --git a/system/pages/bans.php b/system/pages/bans.php
index e2d42602..f55564f0 100644
--- a/system/pages/bans.php
+++ b/system/pages/bans.php
@@ -149,7 +149,7 @@ function getBanReason($reasonId)
 
 function getBanType($typeId)
 {
-	switch($reasonId)
+	switch($typeId)
 	{
 		case 1:
 			return "IP Banishment";
diff --git a/system/pages/experiencestages.php b/system/pages/experiencestages.php
index b3825394..b2b63c3f 100644
--- a/system/pages/experiencestages.php
+++ b/system/pages/experiencestages.php
@@ -12,13 +12,16 @@
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Experience Stages';
 
+if(file_exists($config['data_path'] . 'XML/stages.xml')) {
+	$stages = new DOMDocument();
+	$stages->load($config['data_path'] . 'XML/stages.xml');
+}
+
 if(!isset($config['lua']['experienceStages']) || !getBoolean($config['lua']['experienceStages']))
 {
 	$enabled = false;
 
-	if(file_exists($config['data_path'] . 'XML/stages.xml')) {
-		$stages = new DOMDocument();
-		$stages->load($config['data_path'] . 'XML/stages.xml');
+	if(isset($stages)) {
 		foreach($stages->getElementsByTagName('config') as $node) {
 			if($node->getAttribute('enabled'))
 				$enabled = true;
@@ -34,23 +37,18 @@ if(!isset($config['lua']['experienceStages']) || !getBoolean($config['lua']['exp
 		else if(isset($config['lua']['rate_exp']))
 			$rate_exp = $config['lua']['rate_exp'];
 
-		$content .= 'Server is not configured to use experience stages.<br/>Current experience rate is: <b>x' .  $rate_exp . '</b>';
+		echo 'Server is not configured to use experience stages.<br/>Current experience rate is: <b>x' .  $rate_exp . '</b>';
 		return;
 	}
 }
 
-if(!isset($stages)) {
-	$stages = new DOMDocument();
-	$stages->load($config['data_path'] . 'XML/stages.xml');
-}
-
 if(!$stages)
 {
 	echo 'Error: cannot load <b>stages.xml</b>!';
 	return;
 }
 
-$content .= '<center><h3>Experience stages</h3></center>
+echo '<center><h3>Experience stages</h3></center>
 <table bgcolor="'.$config['darkborder'].'" border="0" cellpadding="4" cellspacing="1" width="100%"><tbody>
 	<tr bgcolor="'.$config['vdarkborder'].'">
 		<td class="white" colspan="5"><b>Stages table</b></td>
@@ -61,11 +59,11 @@ $content .= '<center><h3>Experience stages</h3></center>
 	foreach($stages->getElementsByTagName('stage') as $stage)
 	{
 		$maxlevel = $stage->getAttribute('maxlevel');
-	$content .= '<tr bgcolor="'.$config['lightborder'].'">
+	echo '<tr bgcolor="'.$config['lightborder'].'">
 	<td>'.$stage->getAttribute('minlevel') . '-'. (isset($maxlevel[0]) ? $maxlevel : '*') . '</td><td>x'.$stage->getAttribute('multiplier').'</td>
 </tr>';
 }
-	$content .= '
+	echo '
 		</tbody></table>
 	</td></tr>
 </tbody></table>';
diff --git a/system/pages/rules.php b/system/pages/rules.php
index 5b7cc432..af64cc8c 100644
--- a/system/pages/rules.php
+++ b/system/pages/rules.php
@@ -12,36 +12,4 @@
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Server Rules';
 
-if(PAGE == 'rules'): ?>
-	<b><?php echo $config['lua']['serverName']; ?> Rules</b><br/>
-	<textarea rows="25" wrap="physical" cols="70" readonly="true">
-<?php endif; ?>
-1. Names
-a) Names which contain insulting (e.g. "Bastard"), racist (e.g. "Nigger"), extremely right-wing (e.g. "Hitler"), sexist (e.g. "Bitch") or offensive (e.g. "Copkiller") language.
-b) Names containing parts of sentences (e.g. "Mike returns"), nonsensical combinations of letters (e.g. "Fgfshdsfg") or invalid formattings (e.g. "Thegreatknight").
-c) Names that obviously do not describe a person (e.g. "Christmastree", "Matrix"), names of real life celebrities (e.g. "Britney Spears"), names that refer to real countries (e.g. "Swedish Druid"), names which were created to fake other players' identities (e.g. "Arieswer" instead of "Arieswar") or official positions (e.g. "System Admin").
-
-2. Cheating
-a) Exploiting obvious errors of the game ("bugs"), for instance to duplicate items. If you find an error you must report it to CipSoft immediately.
-b) Intentional abuse of weaknesses in the gameplay, for example arranging objects or players in a way that other players cannot move them.
-c) Using tools to automatically perform or repeat certain actions without any interaction by the player ("macros").
-d) Manipulating the client program or using additional software to play the game.
-e) Trying to steal other players' account data ("hacking").
-f) Playing on more than one account at the same time ("multi-clienting").
-g) Offering account data to other players or accepting other players' account data ("account-trading/sharing").
-
-3. Gamemasters
-a) Threatening a gamemaster because of his or her actions or position as a gamemaster.
-b) Pretending to be a gamemaster or to have influence on the decisions of a gamemaster.
-c) Intentionally giving wrong or misleading information to a gamemaster concerning his or her investigations or making false reports about rule violations.
-
-4. Player Killing
-a) Excessive killing of characters who are not marked with a "skull" on worlds which are not PvP-enforced. Please note that killing marked characters is not a reason for a banishment.
-
-A violation of the Tibia Rules may lead to temporary banishment of characters and accounts. In severe cases removal or modification of character skills, attributes and belongings, as well as the permanent removal of accounts without any compensation may be considered. The sanction is based on the seriousness of the rule violation and the previous record of the player. It is determined by the gamemaster imposing the banishment.
-
-These rules may be changed at any time. All changes will be announced on the official website.
-<?php
-if(PAGE == 'rules'): ?>
-	</textarea>
-<?php endif;?>
+echo $twig->render('rules.html.twig');
diff --git a/system/pages/spells.php b/system/pages/spells.php
index 5ef955e6..3aadbc0f 100644
--- a/system/pages/spells.php
+++ b/system/pages/spells.php
@@ -143,7 +143,7 @@ if($canEdit)
 <?php
 }
 
-$vocation_id = (int) (isset($_REQUEST['vocation_id']) ? $_REQUEST['vocation_id'] : 'All');
+$vocation_id = (isset($_REQUEST['vocation_id']) ? (int)$_REQUEST['vocation_id'] : 'All');
 $order = 'spell';
 if(isset($_GET['order']))
 	$order = $_GET['order'];
diff --git a/system/templates/rules.html.twig b/system/templates/rules.html.twig
new file mode 100644
index 00000000..989d18a7
--- /dev/null
+++ b/system/templates/rules.html.twig
@@ -0,0 +1,32 @@
+{% if constant('PAGE') == 'rules' %}
+<b>{{ config.lua.serverName }} Rules</b><br/>
+<textarea rows="25" wrap="physical" cols="70" readonly="true">
+{% endif %}
+    1. Names
+a) Names which contain insulting (e.g. "Bastard"), racist (e.g. "Nigger"), extremely right-wing (e.g. "Hitler"), sexist (e.g. "Bitch") or offensive (e.g. "Copkiller") language.
+b) Names containing parts of sentences (e.g. "Mike returns"), nonsensical combinations of letters (e.g. "Fgfshdsfg") or invalid formattings (e.g. "Thegreatknight").
+c) Names that obviously do not describe a person (e.g. "Christmastree", "Matrix"), names of real life celebrities (e.g. "Britney Spears"), names that refer to real countries (e.g. "Swedish Druid"), names which were created to fake other players' identities (e.g. "Arieswer" instead of "Arieswar") or official positions (e.g. "System Admin").
+
+2. Cheating
+a) Exploiting obvious errors of the game ("bugs"), for instance to duplicate items. If you find an error you must report it to CipSoft immediately.
+b) Intentional abuse of weaknesses in the gameplay, for example arranging objects or players in a way that other players cannot move them.
+c) Using tools to automatically perform or repeat certain actions without any interaction by the player ("macros").
+d) Manipulating the client program or using additional software to play the game.
+e) Trying to steal other players' account data ("hacking").
+f) Playing on more than one account at the same time ("multi-clienting").
+g) Offering account data to other players or accepting other players' account data ("account-trading/sharing").
+
+3. Gamemasters
+a) Threatening a gamemaster because of his or her actions or position as a gamemaster.
+b) Pretending to be a gamemaster or to have influence on the decisions of a gamemaster.
+c) Intentionally giving wrong or misleading information to a gamemaster concerning his or her investigations or making false reports about rule violations.
+
+4. Player Killing
+a) Excessive killing of characters who are not marked with a "skull" on worlds which are not PvP-enforced. Please note that killing marked characters is not a reason for a banishment.
+
+A violation of the Tibia Rules may lead to temporary banishment of characters and accounts. In severe cases removal or modification of character skills, attributes and belongings, as well as the permanent removal of accounts without any compensation may be considered. The sanction is based on the seriousness of the rule violation and the previous record of the player. It is determined by the gamemaster imposing the banishment.
+
+These rules may be changed at any time. All changes will be announced on the official website.
+{% if constant('PAGE') == 'rules' %}
+	</textarea>
+{% endif %}
\ No newline at end of file
diff --git a/templates/kathrine/template.php b/templates/kathrine/template.php
index d2ec0144..e5c3d975 100644
--- a/templates/kathrine/template.php
+++ b/templates/kathrine/template.php
@@ -18,7 +18,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 				elseif(in_array(PAGE, array('online', 'characters', 'guilds', 'highscores', 'wars', 'lastkills', 'houses', 'bans',
 					'forum', 'team')))
 						echo 'community';
-				elseif(in_array(PAGE, array('account', 'accountmanagement', 'createaccount', 'lostaccount', 'rules')))
+				elseif(in_array(PAGE, array('account', 'accountmanagement', 'createaccount', 'lostaccount', 'rules', 'bugtracker')))
 					echo 'account';
 				elseif(in_array(PAGE, array('points', 'gifts')))
 					echo 'shops';
@@ -175,8 +175,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 					</table>
 					<hr noshade="noshade" size="1" />
 					<div class="Content"><div id="ContentHelper">
-					<?php echo template_place_holder('center_top'); ?>
-					<?php echo $content; ?>
+					<?php echo template_place_holder('center_top') . $content; ?>
 					</div></div>
 				</div>
 			</div>