* moved .htaccess rules to plain php (index.php)

Its a salut to nginx and other web server nutzer (not apache), as they can now simply redirect all requests with simple rule to index.php, and php will take care of all redirects. .htaccess just now redirects everything to index.php with simple 3 lines.
* change accountmanagement links to use friendly_urls
* fixed creating new forum thread
* some fixes in account changecomment action
* show info when account name/number or password is empty on login
* fixed showing account login errors
* added new twig function getLink that convert link taking into account config.friendly_urls
* internalLayoutLink -> getLink

.htaccess.dist

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

index.php

@@ -39,8 +39,81 @@ if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['i
 	die('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
 }
 
+$uri = str_replace(BASE_DIR . '/', '', $_SERVER['REQUEST_URI']);
+$uri = str_replace('index.php/', '', $uri);
+$uri = str_replace('?', '', $uri);
+
+if(empty($uri)) {
+	$_REQUEST['p'] = 'news';
+}
+else if(file_exists(SYSTEM . 'pages/' . $uri . '.php')) {
+	$_REQUEST['p'] = $uri;
+}
+else {
+	$rules = array(
+		'/^account\/manage\/?$/' => array('subtopic' => 'accountmanagement'),
+		'/^account\/create\/?$/' => array('subtopic' => 'createaccount'),
+		'/^account\/lost\/?$/' => array('subtopic' => 'lostaccount'),
+		'/^account\/logout\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'logout'),
+		'/^account\/password\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changepassword'),
+		'/^account\/register\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'registeraccount'),
+		'/^account\/register\/new\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'registernew'),
+		'/^account\/email\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changeemail'),
+		'/^account\/info\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changeinfo'),
+		'/^account\/character\/create\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'createcharacter'),
+		'/^account\/character\/name\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changename'),
+		'/^account\/character\/sex\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changesex'),
+		'/^account\/character\/delete\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'deletecharacter'),
+		'/^account\/character\/comment\/[A-Za-z]+\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changecomment', 'name' => '$3'),
+		'/^account\/character\/comment\/?$/' => array('subtopic' => 'accountmanagement', 'action' => 'changecomment'),
+		'/^characters\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'characters', 'name' => '$1'),
+		'/^news\/archive\/?$/' => array('subtopic' => 'newsarchive'),
+		'/^news\/archive\/[0-9]+\/?$/' => array('subtopic' => 'newsarchive', 'id' => '$2'),
+		'/^guilds\/[A-Za-z0-9-_%+\']+$/' => array('subtopic' => 'guilds', 'action' => 'show', 'guild' => '$1'),
+		'/^forum\/board\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2'),
+		'/^forum\/board\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_board', 'id' => '$2', 'page' => '$3'),
+		'/^forum\/thread\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2'),
+		'/^forum\/thread\/[0-9]+\/[0-9]+\/?$/' => array('subtopic' => 'forum', 'action' => 'show_thread', 'id' => '$2', 'page' => '$3'),
+		'/^gifts\/history\/?$/' => array('subtopic' => 'gifts', 'action' => 'show_history'),
+		'/^highscores\/[A-Za-z0-9-_]+\/[A-Za-z0-9-_]+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1', 'vocation' => '$2'),
+		'/^highscores\/[A-Za-z0-9-_\']+\/?$/' => array('subtopic' => 'highscores', 'list' => '$1'),
+		'/^polls\/[0-9]+\/?$/' => array('subtopic' => 'polls', 'id' => '$1')
+	);
+	
+	if (preg_match("/^[A-Za-z0-9-_%\'+]+\.png$/i", $uri)) {
+		$tmp = explode('.', $uri);
+		$_REQUEST['name'] = urldecode($tmp[0]);
+		
+		chdir(TOOLS . 'signature');
+		include('index.php');
+		exit();
+	}
+	
+	$found = false;
+	foreach($rules as $rule => $redirect) {
+		if (preg_match($rule, $uri)) {
+			$tmp = explode('/', $uri);
+			foreach($redirect as $key => $value) {
+				if(strpos($value, '$') !== false) {
+					$value = str_replace('$' . $value[1], $tmp[$value[1]], $value);
+				}
+				
+				$_REQUEST[$key] = $value;
+				$_GET[$key] = $value;
+			}
+			
+			$found = true;
+			break;
+		}
+	}
+	
+	if(!$found) {
+		$_REQUEST['p'] = '404';
+	}
+}
+
 // define page visited, so it can be used within events system
-$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_GET['p']) ? $_GET['p'] : '');
+$page = isset($_REQUEST['subtopic']) ? $_REQUEST['subtopic'] : (isset($_REQUEST['p']) ? $_REQUEST['p'] : '');
 if(empty($page) || preg_match('/[^A-z0-9_\-]/', $page))
 	$page = 'news';
 
@@ -156,7 +229,7 @@ if($config['backward_support']) {
 	$config['site']['screenshot_page'] = true;
 	
 	if($config['forum'] != '')
-		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? internalLayoutLink('forum') : $config['forum']);
+		$config['forum_link'] = (strtolower($config['forum']) == 'site' ? getLink('forum') : $config['forum']);
 
 	foreach($status as $key => $value)
 		$config['status']['serverStatus_' . $key] = $value;

system/functions.php

@@ -38,46 +38,27 @@ function generateLink($url, $name, $blank = false) {
 	return '<a href="' . $url . '"' . ($blank ? ' target="_blank"' : '') . '>' . $name . '</a>';
 }
 
-function getLink($page, $name, $blank = false) {
+function getFullLink($page, $name, $blank = false) {
-	return generateLink(getPageLink($page), $name, $blank);
+	return generateLink(getLink($page), $name, $blank);
 }
 
-function getPageLink($page, $action = null)
+function getLink($page, $action = null)
 {
 	global $config;
-
+	return BASE_URL . ($config['friendly_urls'] ? '' : '?') . $page . ($action ? '/' . $action : '');
-	// TODO: tibiacom template is not working correctly with this
-	if($config['friendly_urls'])
-		return BASE_URL . $page . ($action ? '/' . $action : '');
-
-	return BASE_URL . '?subtopic=' . $page . ($action ? '&action=' . $action : '');
 }
-function internalLayoutLink($page, $action = null) {return getPageLink($page, $action);}
+function internalLayoutLink($page, $action = null) {return getLink($page, $action);}
 
 function getForumThreadLink($thread_id, $page = NULL)
 {
 	global $config;
-
+	return BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'forum/thread/' . (int)$thread_id . (isset($page) ? '/' . $page : '');
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'forum/thread/' . (int)$thread_id . (isset($page) ? '/' . $page : '');
-	else
-		$url = BASE_URL . '?subtopic=forum&action=show_thread&id=' . (int)$thread_id . (isset($page) ? '&page=' . $page : '');
-
-	return $url;
 }
 
 function getForumBoardLink($board_id, $page = NULL)
 {
 	global $config;
-
+	return BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'forum/board/' . (int)$board_id . (isset($page) ? '/' . $page : '');
-	$url = '';
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'forum/board/' . (int)$board_id . (isset($page) ? '/' . $page : '');
-	else
-		$url = BASE_URL . '?subtopic=forum&action=show_board&id=' . (int)$board_id . (isset($page) ? '&page=' . $page : '');
-
-	return $url;
 }
 
 function getPlayerLink($name, $generate = true)
@@ -92,11 +73,7 @@ function getPlayerLink($name, $generate = true)
 			$name = $player->getName();
 	}
 	
-	$url = '';
+	$url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'characters/' . urlencode($name);
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'characters/' . urlencode($name);
-	else
-		$url = BASE_URL . '?subtopic=characters&name=' . urlencode($name);
 
 	if(!$generate) return $url;
 	return generateLink($url, $name);
@@ -116,11 +93,7 @@ function getHouseLink($name, $generate = true)
 			$name = $house->fetchColumn();
 	}
 	
-	$url = '';
+	$url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'houses/' . urlencode($name);
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'houses/' . urlencode($name);
-	else
-		$url = BASE_URL . '?subtopic=houses&page=view&house=' . urlencode($name);
 	
 	if(!$generate) return $url;
 	return generateLink($url, $name);
@@ -138,11 +111,7 @@ function getGuildLink($name, $generate = true)
 			$name = $guild->fetchColumn();
 	}
 
-	$url = '';
+	$url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . 'guilds/' . urlencode($name);
-	if($config['friendly_urls'])
-		$url = BASE_URL . 'guilds/' . urlencode($name);
-	else
-		$url = BASE_URL . '?subtopic=guilds&action=show&guild=' . urlencode($name);
 
 	if(!$generate) return $url;
 	return generateLink($url, $name);

system/init.php

@@ -42,6 +42,15 @@ $function = new Twig_SimpleFunction('getStyle', function ($i) {
 });
 $twig->addFunction($function);
 
+$function = new Twig_SimpleFunction('getLink', function ($s) {
+	global $config;
+	if($config['friendly_urls'])
+		return $s;
+	
+	return '?' . $s;
+});
+$twig->addFunction($function);
+
 // trim values we receive
 if(isset($_POST))
 {

system/login.php

@@ -113,6 +113,9 @@ else
 				}
 			}
 		}
+		else {
+			$errors[] = 'Please enter your account ' . (USE_ACCOUNT_NAME ? 'name' : 'password') . ' and password.';
+		}
 	}
 
 	// stay-logged with sessions

system/pages/accountmanagement.php

@@ -17,7 +17,6 @@ if($config['account_country'])
 
 $groups = new OTS_Groups_List();
 
-$errors = array();
 $show_form = true;
 $config_salt_enabled = fieldExist('salt', 'accounts');
 if(!$logged)
@@ -39,6 +38,8 @@ if(!$logged)
 	}
 }
 
+$errors = array();
+
 	if(isset($_REQUEST['redirect']))
 	{
 		$redirect = urldecode($_REQUEST['redirect']);
@@ -63,7 +64,7 @@ if(!$logged)
 		else
 		{
 			if($config['generate_new_reckey'] && $config['mail_enabled'])
-				$account_registered = '<b><font color="green">Yes ( <a href="?subtopic=accountmanagement&action=newreckey"> Buy new Recovery Key </a> )</font></b>';
+				$account_registered = '<b><font color="green">Yes ( <a href="?subtopic=accountmanagement&action=registernew"> Buy new Recovery Key </a> )</font></b>';
 			else
 				$account_registered = '<b><font color="green">Yes</font></b>';
 		}
@@ -477,7 +478,7 @@ if($action == "changeemail") {
 	}
 
 //############## GENERATE NEW RECOVERY KEY ###########
-	if($action == "newreckey")
+	if($action == "registernew")
 	{
 		if(isset($_POST['reg_password']))
 			$reg_password = encrypt(($config_salt_enabled ? $account_logged->getCustomField('salt') : '') . $_POST['reg_password']);
@@ -542,45 +543,52 @@ if($action == "changeemail") {
 
 //###### CHANGE CHARACTER COMMENT ######
 	if($action == "changecomment") {
-		$player_name = stripslashes($_REQUEST['name']);
+		$player_name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
 		$new_comment = isset($_POST['comment']) ? htmlspecialchars(stripslashes(substr($_POST['comment'],0,2000))) : NULL;
 		$new_hideacc = isset($_POST['accountvisible']) ? (int)$_POST['accountvisible'] : NULL;
-		if(check_name($player_name)) {
+		
-			$player = $ots->createObject('Player');
+		if($player_name != null) {
-			$player->find($player_name);
+			if (check_name($player_name)) {
-			if($player->isLoaded()) {
+				$player = $ots->createObject('Player');
-				$player_account = $player->getAccount();
+				$player->find($player_name);
-				if($account_logged->getId() == $player_account->getId()) {
+				if ($player->isLoaded()) {
-					if(isset($_POST['changecommentsave']) && $_POST['changecommentsave'] == 1) {
+					$player_account = $player->getAccount();
-						$player->setCustomField("hidden", $new_hideacc);
+					if ($account_logged->getId() == $player_account->getId()) {
-						$player->setCustomField("comment", $new_comment);
+						if (isset($_POST['changecommentsave']) && $_POST['changecommentsave'] == 1) {
-						$account_logged->logAction('Changed comment for character <b>' . $player->getName() . '</b>.');
+							$player->setCustomField("hidden", $new_hideacc);
-						echo $twig->render('success.html.twig', array(
+							$player->setCustomField("comment", $new_comment);
-							'title' => 'Character Information Changed',
+							$account_logged->logAction('Changed comment for character <b>' . $player->getName() . '</b>.');
-							'description' => 'The character information has been changed.'
+							echo $twig->render('success.html.twig', array(
-						));
+								'title' => 'Character Information Changed',
-					}
+								'description' => 'The character information has been changed.'
-					else
+							));
-					{
+							$show_form = false;
-						echo $twig->render('account.change_comment.html.twig', array(
+						}
-							'player' => $player,
+					} else {
-							'player_name' => $player_name
+						$errors[] = 'Error. Character <b>' . $player_name . '</b> is not on your account.';
-						));
 					}
+				} else {
+					$errors[] = "Error. Character with this name doesn't exist.";
 				}
-				else
+			} else {
-				{
+				$errors[] = 'Error. Name contain illegal characters.';
-					echo "Error. Character <b>".$player_name."</b> is not on your account.";
-				}
-			}
-			else
-			{
-				echo "Error. Character with this name doesn't exist.";
 			}
 		}
-		else
+		else {
-		{
+			$errors[] = 'Please enter character name.';
-			echo "Error. Name contain illegal characters.";
+		}
+		
+		if($show_form) {
+			if(!empty($errors)) {
+				echo $twig->render('error_box.html.twig', array('errors' => $errors));
+			}
+			
+			if(isset($player)) {
+				echo $twig->render('account.change_comment.html.twig', array(
+					'player' => $player,
+					'player_name' => $player_name
+				));
+			}
 		}
 	}
 

system/pages/admin/pages.php

@@ -181,7 +181,7 @@ if(!empty($action))
 					<tr>
 						<td align="right"><input type="submit" class="button" value="Save"/></td>
 						<td align="left">
-							<input type="button" onclick="window.location = '<?php echo getPageLink(PAGE) . ($config['friendly_urls'] ? '?' : '&'); ?>p=pages';" class="button" value="Cancel"/>
+							<input type="button" onclick="window.location = '<?php echo getLink(PAGE) . ($config['friendly_urls'] ? '?' : '&'); ?>p=pages';" class="button" value="Cancel"/>
 						</td>
 					</tr>
 				</table>
@@ -203,7 +203,7 @@ $pages =
 $i = 0;
 foreach($pages as $_page): ?>
 	<tr>
-		<td><?php echo getLink($_page['name'], $_page['name']); ?></td>
+		<td><?php echo getFullLink($_page['name'], $_page['name']); ?></td>
 		<td><i><?php echo substr($_page['title'], 0, 20); ?></i></td>
 		<td>
 			<a href="?p=pages&action=edit&id=<?php echo $_page['id']; ?>" class="ico" title="Edit">

system/pages/characters.php

@@ -18,7 +18,7 @@ function generate_search_form($autofocus = false)
 {
 	global $config, $twig;
 	return $twig->render('characters.form.html.twig', array(
-		'link' => getPageLink('characters'),
+		'link' => getLink('characters'),
 		'autofocus' => $autofocus
 	));
 }
@@ -42,7 +42,7 @@ function retrieve_former_name($name)
 
 $name = '';
 if(isset($_REQUEST['name']))
-	$name = stripslashes(ucwords(strtolower(trim($_REQUEST['name']))));
+	$name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
 
 if(empty($name))
 {
@@ -370,9 +370,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 	
 	// signature
 	if($config['signature_enabled']) {
-		$signature_url = BASE_URL . 'tools/signature/?name=' . urlencode($player->getName());
+		$signature_url = BASE_URL . ($config['friendly_urls'] ? '' : '?') . urlencode($player->getName()) . '.png';
-		if($config['friendly_urls'])
-			$signature_url = BASE_URL . urlencode($player->getName()) . '.png';
 	}
 	
 	$hidden = $player->getCustomField('hidden');
@@ -431,7 +429,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
 		'player_link' => getPlayerLink($player->getName(), false),
 		'hidden' => $hidden,
 		'bannedUntil' => isset($bannedUntil) ? $bannedUntil : null,
-		'characters_link' => internalLayoutLink('characters'),
+		'characters_link' => getLink('characters'),
 		'account_players' => isset($account_players) ? $account_players : null,
 		'search_form' => generate_search_form()
 	));

system/pages/commands.php

@@ -73,7 +73,7 @@ if($canEdit)
 	}
 	
 	echo $twig->render('commands.form.html.twig', array(
-		'link' => getPageLink('commands', ($action == 'edit' ? 'edit' : 'add')),
+		'link' => getLink('commands/' . ($action == 'edit' ? 'edit' : 'add')),
 		'action' => $action,
 		'id' => isset($id) ? $id : null,
 		'words' => isset($words) ? $words : null,

system/pages/forum.php

@@ -174,7 +174,7 @@ if($canEdit)
 	
 	if(empty($action) || $action == 'edit_board') {
 		echo $twig->render('forum.add_board.html.twig', array(
-			'link' => getPageLink('forum', ($action == 'edit_board' ? 'edit_board' : 'add_board')),
+			'link' => getLink('forum', ($action == 'edit_board' ? 'edit_board' : 'add_board')),
 			'action' => $action,
 			'id' => isset($id) ? $id : null,
 			'name' => isset($name) ? $name : null,
@@ -253,7 +253,7 @@ if($action == 'show_board')
 		else
 			$links_to_pages .= '<b>'.($i + 1).' </b>';
 	}
-	echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <b>'.$sections[$section_id]['name'].'</b>';
+	echo '<a href="' . getLink('forum') . '">Boards</a> >> <b>'.$sections[$section_id]['name'].'</b>';
 	if(!$sections[$section_id]['closed'] || Forum::isModerator())
 	{
 		echo '<br /><br />
@@ -324,7 +324,7 @@ if($action == 'show_thread')
 		$threads = $db->query("SELECT `players`.`id` as `player_id`, `players`.`name`, `players`.`account_id`, `players`.`vocation`" . (fieldExist('promotion', 'players') ? ", `players`.`promotion`" : "") . ", `players`.`level`, `" . TABLE_PREFIX . "forum`.`id`,`" . TABLE_PREFIX . "forum`.`first_post`, `" . TABLE_PREFIX . "forum`.`section`,`" . TABLE_PREFIX . "forum`.`post_text`, `" . TABLE_PREFIX . "forum`.`post_topic`, `" . TABLE_PREFIX . "forum`.`post_date`, `" . TABLE_PREFIX . "forum`.`post_smile`, `" . TABLE_PREFIX . "forum`.`author_aid`, `" . TABLE_PREFIX . "forum`.`author_guid`, `" . TABLE_PREFIX . "forum`.`last_edit_aid`, `" . TABLE_PREFIX . "forum`.`edit_date` FROM `players`, `" . TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . TABLE_PREFIX . "forum`.`author_guid` AND `" . TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread_id." ORDER BY `" . TABLE_PREFIX . "forum`.`post_date` LIMIT ".$config['forum_posts_per_page']." OFFSET ".($_page * $config['forum_posts_per_page']))->fetchAll();
 		if(isset($threads[0]['name']))
 			$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `views`=`views`+1 WHERE `id` = ".(int) $thread_id);
-		echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($threads[0]['section']) . '">'.$sections[$threads[0]['section']]['name'].'</a> >> <b>'.$thread_name['post_topic'].'</b>';
+		echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($threads[0]['section']) . '">'.$sections[$threads[0]['section']]['name'].'</a> >> <b>'.$thread_name['post_topic'].'</b>';
 		echo '<br /><br /><a href="?subtopic=forum&action=new_post&thread_id='.$thread_id.'"><img src="images/forum/post.gif" border="0" /></a><br /><br />Page: '.$links_to_pages.'<br /><table width="100%"><tr bgcolor="'.$config['lightborder'].'" width="100%"><td colspan="2"><font size="4"><b>'.htmlspecialchars($thread_name['post_topic']).'</b></font><font size="1"><br />by ' . getPlayerLink($thread_name['name']) . '</font></td></tr><tr bgcolor="'.$config['vdarkborder'].'"><td width="200"><font color="white" size="1"><b>Author</b></font></td><td>&nbsp;</td></tr>';
 		$player = $ots->createObject('Player');
 		foreach($threads as $thread)
@@ -421,7 +421,7 @@ if($action == 'new_post')
 		$players_from_account = $db->query("SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = ".(int) $account_logged->getId())->fetchAll();
 		$thread_id = (int) $_REQUEST['thread_id'];
 		$thread = $db->query("SELECT `" . TABLE_PREFIX . "forum`.`post_topic`, `" . TABLE_PREFIX . "forum`.`id`, `" . TABLE_PREFIX . "forum`.`section` FROM `" . TABLE_PREFIX . "forum` WHERE `" . TABLE_PREFIX . "forum`.`id` = ".(int) $thread_id." AND `" . TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread_id." LIMIT 1")->fetch();
-		echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread_id) . '">'.$thread['post_topic'].'</a> >> <b>Post new reply</b><br /><h3>'.$thread['post_topic'].'</h3>';
+		echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread_id) . '">'.$thread['post_topic'].'</a> >> <b>Post new reply</b><br /><h3>'.$thread['post_topic'].'</h3>';
 		if(isset($thread['id']))
 		{
 			$quote = isset($_REQUEST['quote']) ? (int) $_REQUEST['quote'] : NULL;
@@ -537,7 +537,7 @@ if($action == 'edit_post')
 		if(isset($thread['id']))
 		{
 			$first_post = $db->query("SELECT `" . TABLE_PREFIX . "forum`.`author_guid`, `" . TABLE_PREFIX . "forum`.`author_aid`, `" . TABLE_PREFIX . "forum`.`first_post`, `" . TABLE_PREFIX . "forum`.`post_topic`, `" . TABLE_PREFIX . "forum`.`post_text`, `" . TABLE_PREFIX . "forum`.`post_smile`, `" . TABLE_PREFIX . "forum`.`id`, `" . TABLE_PREFIX . "forum`.`section` FROM `" . TABLE_PREFIX . "forum` WHERE `" . TABLE_PREFIX . "forum`.`id` = ".(int) $thread['first_post']." LIMIT 1")->fetch();
-			echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread['first_post']) . '">'.$first_post['post_topic'].'</a> >> <b>Edit post</b>';
+			echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($thread['section']) . '">'.$sections[$thread['section']]['name'].'</a> >> <a href="' . getForumThreadLink($thread['first_post']) . '">'.$first_post['post_topic'].'</a> >> <b>Edit post</b>';
 			if($account_logged->getId() == $thread['author_aid'] || Forum::isModerator())
 			{
 				$players_from_account = $db->query("SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = ".(int) $account_logged->getId())->fetchAll();
@@ -634,7 +634,7 @@ if($action == 'new_thread')
 		$players_from_account = $db->query('SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = '.(int) $account_logged->getId())->fetchAll();
 		$section_id = isset($_REQUEST['section_id']) ? $_REQUEST['section_id'] : null;
 		if($section_id !== null) {
-			echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($section_id) . '">' . $sections[$section_id]['name'] . '</a> >> <b>Post new thread</b><br />';
+			echo '<a href="' . getLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($section_id) . '">' . $sections[$section_id]['name'] . '</a> >> <b>Post new thread</b><br />';
 			if (isset($sections[$section_id]['name'])) {
 				if ($sections[$section_id]['closed'] && !Forum::isModerator())
 					$errors[] = 'You cannot create topic on this board.';

system/pages/guilds.php

@@ -104,6 +104,8 @@ if($action == '')
 			{
 				foreach($guilds_list as $guild)
 				{
+					$link = ($config['friendly_urls'] ? '' : '?') . 'guilds/' . $guild->getName();
+					
 					$guild_logo = $guild->getCustomField('logo_name');
 					if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo))
 						$guild_logo = "default.gif";
@@ -117,7 +119,7 @@ if($action == '')
 					<TD valign="top"><B>'.$guild->getName().'</B><BR/>'.$description.'';
 					if(admin())
 						echo '<br /><a href="?subtopic=guilds&action=deletebyadmin&guild='.$guild->getName().'">Delete this guild (for ADMIN only!)</a>';
-					echo '</TD><TD><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=guilds&action=show&guild='.$guild->getName().'" METHOD=post><TR><TD>
+					echo '</TD><TD><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="' . $link . '" METHOD=post><TR><TD>
 					<INPUT TYPE=image NAME="View" ALT="View" SRC="'.$template_path.'/images/buttons/sbutton_view.gif" BORDER=0 WIDTH=120 HEIGHT=18>
 					</TD></TR></FORM></TABLE>
 					</TD></TR>';
@@ -145,7 +147,7 @@ if($action == '')
 		<BR /><a href="?subtopic=guilds&action=cleanup_players">Cleanup players</a> - can\'t join guild/be invited? Can\'t create guild? Try cleanup players.
 		<BR /><a href="?subtopic=guilds&action=cleanup_guilds">Cleanup guilds</a> - made guild, you are a leader, but you are not on players list? Cleanup guilds!';
 	else
-		echo 'Before you can create guild you must login.<br><TABLE BORDER=0 WIDTH=100%><TR><TD ALIGN=center><IMG SRC="'.$template_path.'/images/general/blank.gif" WIDTH=80 HEIGHT=1 BORDER=0<BR></TD><TD ALIGN=center><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=accountmanagement&redirect=' . getPageLink('guilds') . '" METHOD=post><TR><TD>
+		echo 'Before you can create guild you must login.<br><TABLE BORDER=0 WIDTH=100%><TR><TD ALIGN=center><IMG SRC="'.$template_path.'/images/general/blank.gif" WIDTH=80 HEIGHT=1 BORDER=0<BR></TD><TD ALIGN=center><TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0><FORM ACTION="?subtopic=accountmanagement&redirect=' . getLink('guilds') . '" METHOD=post><TR><TD>
 		<INPUT TYPE=image NAME="Login" ALT="Login" SRC="'.$template_path.'/images/buttons/sbutton_login.gif" BORDER=0 WIDTH=120 HEIGHT=18>
 		</TD></TR></FORM></TABLE></TD><TD ALIGN=center><IMG SRC="'.$template_path.'/images/general/blank.gif" WIDTH=80 HEIGHT=1 BORDER=0<BR></TD></TR></TABLE>';
 }

system/pages/highscores.php

@@ -289,42 +289,32 @@ echo '
 			);
 				
 			foreach($types as $link => $name) {
-				if($config['friendly_urls'])
+				echo '<A HREF="' . getLink('highscores') . '/' . $link . (isset($vocation) ? '/' . $vocation : '') . '" CLASS="size_xs">' . $name . '</A><BR>';
-					echo '<A HREF="' . getPageLink('highscores') . '/' . $link . (isset($vocation) ? '/' . $vocation : '') . '" CLASS="size_xs">' . $name . '</A><BR>';
-				else
-					echo '<A HREF="' . getPageLink('highscores') . '&list=' . $link . (isset($vocation) ? '&vocation=' . $vocation : '') . '" CLASS="size_xs">' . $name . '</A><BR>';
 			}
 
 if($config['highscores_frags'])
-	if($config['friendly_urls'])
+	echo '<a href="' . getLink('highscores') . '/frags' . (isset($vocation) ? '/' . $vocation : '') . '" CLASS="size_xs">Frags</a><br/>';
-		echo '<A HREF="' . getPageLink('highscores') . '/frags" CLASS="size_xs">Frags</A><BR>';
+echo 	'</td>
-	else
+	</tr>
-		echo '<A HREF="' . getPageLink('highscores') . '&list=frags' . (isset($vocation) ? '&vocation=' . $vocation : '') . '" CLASS="size_xs">Frags</A><BR>';
+</table><br>';
-
-echo 	'</TD>
-	</TR>
-</TABLE><BR>';
 
 if($config['highscores_vocation_box'])
 {
 	echo
-	'<TABLE BORDER=0 width="100%" CELLPADDING=4 CELLSPACING=1>
+	'<table border="0" width="100%" cellpadding="4" cellspacing="1">
-		<TR BGCOLOR="' . $config['vdarkborder'] . '">
+		<tr bgcolor="' . $config['vdarkborder'] . '">
-			<TD CLASS=whites><B>Choose a vocation</B></TD>
+			<td class=whites><b>Choose a vocation</b></td>
-		</TR>
+		</tr>
-		<TR BGCOLOR="'.$config['lightborder'].'">
+		<tr bgcolor="'.$config['lightborder'].'">
-			<TD>
+			<td>
-				<A HREF="' . getPageLink('highscores') . ($config['friendly_urls'] ? '/' : '&list=') . $list . '" CLASS="size_xs">[ALL]</A><BR>';
+				<a href="' . getLink('highscores') . ($config['friendly_urls'] ? '/' : '&list=') . $list . '" class="size_xs">[ALL]</A><BR>';
 				for($i = 1; $i < count($config_vocations) / 2; $i++) {
-					if($config['friendly_urls'])
+					echo '<a href="' . getLink('highscores') . '/' . $list . '/' . strtolower($config_vocations[$i]) . '" class="size_xs">' . $config_vocations[$i] . '</a><br/>';
-						echo '<A HREF="' . getPageLink('highscores') . '/' . $list . '/' . strtolower($config_vocations[$i]) . '" CLASS="size_xs">' . $config_vocations[$i] . '</A><BR>';
-					else
-						echo '<A HREF="' . getPageLink('highscores') . '&list=' . $list . '&vocation=' . strtolower($config_vocations[$i]) . '" CLASS="size_xs">' . $config_vocations[$i] . '</A><BR>';
 				}
 		echo '
-			</TD>
+			</td>
-		</TR>
+		</tr>
-	</TABLE>';
+	</table>';
 }
 ?>
 		</td>

system/pages/news.php

@@ -66,11 +66,9 @@ if(isset($_GET['archive']))
 		}
 		else
 			echo "This news doesn't exist or is hidden.<br/>";
-
-		//echo '<br /><a href="' . internalLayoutLink('news') . ($config['friendly_urls'] ? '/' : '') . 'archive' . '"><font size="2"><b>Back to Archive</b></font></a>';
 	?>
 	<center>
-	<table cellspacing="0" cellpadding="0" border="0"><form method="post" action="<?php echo internalLayoutLink('news') . ($config['friendly_urls'] ? '' : '') . 'archive'; ?>"><tbody><tr><td>
+	<table cellspacing="0" cellpadding="0" border="0"><form method="post" action="<?php echo getLink('news/archive'); ?>"><tbody><tr><td>
 		<input width="120" height="18" border="0" type="image" src="<?php echo $template_path; ?>/images/buttons/sbutton_back.gif" alt="Back" name="Back">
 	</form></td></tr></tbody></table>
 	</center>
@@ -85,14 +83,8 @@ if(isset($_GET['archive']))
 	$news_DB = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'news').' WHERE `type` = 1 AND `hidden` != 1 ORDER BY `date` DESC');
 	foreach($news_DB as $news)
 	{
-		$link = internalLayoutLink('news');
-		if($config['friendly_urls'])
-			$link .= '/archive/' . $news['id'];
-		else
-			$link .= 'archive&id=' . $news['id'];
-		
 		$newses[] = array(
-			'link' => $link,
+			'link' => ($config['friendly_urls']) . getLink('news') . '/archive/' . $news['id'],
 			'icon_id' => $categories[$news['category']]['icon_id'],
 			'title' => stripslashes($news['title']),
 			'date' => $news['date']
@@ -283,8 +275,8 @@ if(!$news_cached)
 
 		echo $twig->render('news.add.html.twig', array(
 			'action' => $action,
-			'news_link' => getPageLink(PAGE),
+			'news_link' => getLink(PAGE),
-			'news_link_form' => getPageLink('news', ($action == 'edit' ? 'edit' : 'add')),
+			'news_link_form' => getLink('news/' . ($action == 'edit' ? 'edit' : 'add')),
 			'news_id' => isset($id) ? $id : null,
 			'title' => isset($p_title) ? $p_title : '',
 			'body' => isset($body) ? $body : '',

system/pages/screenshots.php

@@ -57,7 +57,7 @@ if($canEdit) {
 		}
 		
 		echo $twig->render('screenshots.form.html.twig', array(
-			'link' => getPageLink('screenshots', ($action == 'edit' ? 'edit' : 'add')),
+			'link' => getLink('screenshots/' . ($action == 'edit' ? 'edit' : 'add')),
 			'action' => $action,
 			'id' => isset($id) ? $id : null,
 			'comment' => isset($comment) ? $comment : null,

system/pages/serverinfo.php

@@ -20,10 +20,10 @@ if(isset($config['lua']['experience_stages']))
 	<h1><?php echo $config['lua']['serverName']; ?></h1>
 	<h3>
 		<?php if(isset($config['lua']['experienceStages']) && getBoolean($config['lua']['experienceStages'])): ?>
-		Experience stages: <a href="<?php echo getPageLink('experienceStages'); ?>">Look here</a><br/>
+		Experience stages: <a href="<?php echo getLink('experienceStages'); ?>">Look here</a><br/>
 		<?php endif; ?>
-		Commands: <a href="<?php echo getPageLink('commands'); ?>">Look here</a><br/>
+		Commands: <a href="<?php echo getLink('commands'); ?>">Look here</a><br/>
-		Team: <a href="<?php echo getPageLink('team'); ?>">Look here</a><br/>
+		Team: <a href="<?php echo getLink('team'); ?>">Look here</a><br/>
 	</h3>
 </center>
 
@@ -184,6 +184,6 @@ if(isset($config['lua']['experience_stages']))
 	<?php endif; ?>
 	<br/>
 	<h2>Other</h2>
-	<li>Respect our <a href="<?php echo getPageLink('rules'); ?>">rules</a>.</li>
+	<li>Respect our <a href="<?php echo getLink('rules'); ?>">rules</a>.</li>
 	<li>Please report rule violations (Botters, players breaking rules etc) with <b>CTRL + R</b>.</li>
 </ul>

system/template.php

@@ -72,23 +72,23 @@ else if(file_exists($template_path . '/config.php'))
 	require($template_path . '/config.php');
 
 $template = array();
-$template['link_account_manage'] = internalLayoutLink('account' . ($config['friendly_urls'] ? '/manage' : 'management'));
+$template['link_account_manage'] = getLink('account/manage');
-$template['link_account_create'] = internalLayoutLink(($config['friendly_urls'] ? 'account/create' : 'createaccount'));
+$template['link_account_create'] = getLink('account/create');
-$template['link_account_lost'] = internalLayoutLink(($config['friendly_urls'] ? 'account/lost' : 'lostaccount'));
+$template['link_account_lost'] = getLink('account/lost');
-$template['link_account_logout'] = internalLayoutLink(($config['friendly_urls'] ? 'account' : 'accountmanagement'), 'logout');
+$template['link_account_logout'] = getLink('account/logout');
 
-$template['link_news_archive'] = internalLayoutLink('news' . ($config['friendly_urls'] ? '/' : '') . 'archive');
+$template['link_news_archive'] = getLink('news/archive');
 
 $links = array('news', 'changelog', 'rules', 'downloads', 'characters', 'online', 'highscores', 'powergamers', 'lastkills', 'houses', 'guilds', 'wars', 'polls', 'bans', 'team', 'creatures', 'spells', 'commands', 'experienceStages', 'freeHouses', 'screenshots', 'movies', 'serverInfo', 'experienceTable', 'faq', 'points', 'gifts', 'bugtracker');
 foreach($links as $link) {
-    $template['link_' . $link] = internalLayoutLink($link);
+    $template['link_' . $link] = getLink($link);
 }
 
-$template['link_gifts_history'] = internalLayoutLink('gifts', 'show_history');
+$template['link_gifts_history'] = getLink('gifts', 'show_history');
 if($config['forum'] != '')
 {
 	if(strtolower($config['forum']) == 'site')
-		$template['link_forum'] = "<a href='" . internalLayoutLink('forum') . "'>";
+		$template['link_forum'] = "<a href='" . getLink('forum') . "'>";
 	else
 		$template['link_forum'] = "<a href='" . $config['forum'] . "' target='_blank'>";
 }

system/templates/account.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="?subtopic=accountmanagement&action=changecomment" method="post">
+<form action="{{ getLink('account/character/comment') }}" method="post">
 	<div class="TableContainer" >
 		<table class="Table5" cellpadding="0" cellspacing="0">
 			<div class="CaptionContainer">
@@ -99,7 +99,7 @@ If you do not want to specify a certain field, just leave it blank.<br/><br/>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.change_info.html.twig

@@ -1,5 +1,5 @@
 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="?subtopic=accountmanagement&action=changeinfo" method=post>
+<form action="{{ getLink('account/info') }}" method=post>
 	<div class="TableContainer" >
 		<table class="Table1" cellpadding="0" cellspacing="0" >
 			<div class="CaptionContainer" >
@@ -89,7 +89,7 @@ Here you can tell other players about yourself. This information will be display
 			<td>
 </form>
 				<table border="0" cellspacing="0" cellpadding="0" >
-					<form action="?subtopic=accountmanagement" method="post" >
+					<form action="{{ getLink('account/manage') }}" method="post" >
 						<tr>
 							<td style="border:0px;" >
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" >

system/templates/account.change_mail.html.twig

@@ -1,5 +1,5 @@
 Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <b>For security reasons, the actual change will be finalised after a waiting period of {{ config.account_mail_change }} days.</b><br/><br/>
-<form action="?subtopic=accountmanagement&action=changeemail" method="post">
+<form action="{{ getLink('account/email') }}" method="post">
 <div class="TableContainer">
 	<table class="Table1" cellpadding="0" cellspacing="0">
 		<div class="CaptionContainer">
@@ -58,7 +58,7 @@ Please enter your password and the new email address. Make sure that you enter a
 </form>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
-				<form action="?subtopic=accountmanagement" method="post">
+				<form action="{{ getLink('account/manage') }}" method="post">
 					<tr>
 						<td style="border:0px;">
 							<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.change_name.html.twig

@@ -1,6 +1,6 @@
 To change a name of character select player and choose a new name.<br/>
 <font color="red">Change name cost {{ config.account_change_character_name_points }} premium points. You have {{ points }} premium points.</font><br/><br/>
-<form action="?subtopic=accountmanagement&action=changename" method="post">
+<form action="{{ getLink('account/character/name') }}" method="post">
 	<input type="hidden" name="changenamesave" value="1">
 	<div class="TableContainer">
 		<table class="Table1" cellpadding="0" cellspacing="0">
@@ -62,7 +62,7 @@ To change a name of character select player and choose a new name.<br/>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.change_password.html.twig

@@ -1,6 +1,6 @@
 Please enter your current password and a new password. For your security, please enter the new password twice.<br/>
 <br/>
-<form action="?subtopic=accountmanagement&action=changepassword" method="post">
+<form action="{{ getLink('account/password') }}" method="post">
 	<div class="TableContainer">
 		<table class="Table1" cellpadding="0" cellspacing="0">
 			<div class="CaptionContainer">
@@ -66,7 +66,7 @@ Please enter your current password and a new password. For your security, please
 </form>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.change_sex.html.twig

@@ -1,6 +1,6 @@
 To change a sex of character select player and choose a new sex.<br/>
 <font color="red">Change sex cost {{ config.account_change_character_sex_points }} premium points. You have {{ points }} premium points.</font><br/><br/>
-<form action="?subtopic=accountmanagement&action=changesex" method="post">
+<form action="{{ getLink('account/character/sex') }}" method="post">
 	<input type="hidden" name="changesexsave" value="1"/>
 	<div class="TableContainer">
 		<table class="Table1" cellpadding="0" cellspacing="0">
@@ -64,7 +64,7 @@ To change a sex of character select player and choose a new sex.<br/>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
 						<tr>
 							<td style="border:0px;" >
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.create.html.twig

@@ -1,7 +1,7 @@
 To play on {{ config.lua.serverName }} you need an account.
 All you have to do to create your new account is to enter an account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %}, password{% if config.recaptcha_enabled %}, confirm reCAPTCHA{% endif %}{% if config.account_country %}, country{% endif %} and your email address.
 Also you have to agree to the terms presented below. If you have done so, your account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %} will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.<br/><br/>
-<form action="?subtopic=createaccount" method="post" id="createaccount">
+<form action="{{ getLink('account/create') }}" method="post" id="createaccount">
 	<div class="TableContainer" >
 		<table class="Table1" cellpadding="0" cellspacing="0" >
 			<div class="CaptionContainer" >
@@ -139,7 +139,11 @@ Also you have to agree to the terms presented below. If you have done so, your a
 							{% endif %}
 						</table>
 					</div>
-		</table></div></td></tr><br/>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<br/>
 	<table width="100%">
 		<tr align="center">
 			<td>

system/templates/account.create_character.html.twig

@@ -6,7 +6,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 <b><font color="red"> You have maximum number of characters per account on your account. Delete one before you make new.</font></b>
 {% endif %}
 <br/><br/>
-<form action="?subtopic=accountmanagement&action=createcharacter" method="post">
+<form action="{{ getLink('account/character/create') }}" method="post">
 	<input type="hidden" name=savecharacter value="1">
 	<div class="TableContainer">
 		<table class="Table3" cellpadding="0" cellspacing="0">
@@ -134,7 +134,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div></div>

system/templates/account.delete_character.html.twig

@@ -1,5 +1,5 @@
 To delete a character enter the name of the character and your password.<br/><br/>
-<form action="?subtopic=accountmanagement&action=deletecharacter" method="post">
+<form action="{{ getLink('account/character/delete') }}" method="post">
 	<input type="hidden" name="deletecharactersave" value="1"/>
 	<div class="TableContainer">
 		<table class="Table1" cellpadding="0" cellspacing="0" >
@@ -54,7 +54,7 @@ To delete a character enter the name of the character and your password.<br/><br
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.generate_new_recovery_key.html.twig

@@ -1,61 +1,61 @@
 To generate new recovery key for your account please enter your password.<br/>
 <font color="red"><b>New recovery key cost {{ config.generate_new_reckey_price }} Premium Points.</font> You have {{ points }} premium points. You will receive e-mail with this recovery key.</b><br/>
-<form action="?subtopic=accountmanagement&action=newreckey" method="post">
+<form action="{{ getLink('account/register/new') }}" method="post">
 	<input type="hidden" name="registeraccountsave" value="1">
 	<div class="TableContainer" >
-        <table class="Table1" cellpadding="0" cellspacing="0">
+		<table class="Table1" cellpadding="0" cellspacing="0">
-            <div class="CaptionContainer">
+			<div class="CaptionContainer">
-                <div class="CaptionInnerContainer">
+				<div class="CaptionInnerContainer">
-                    <span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<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="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="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>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-                    <div class="Text" >Generate recovery key</div>
+					<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="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="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="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>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-                </div>
+				</div>
-            </div>
+			</div>
-            <tr>
+			<tr>
-                <td>
+				<td>
-                    <div class="InnerTableContainer">
+					<div class="InnerTableContainer">
-                        <table style="width:100%;">
+						<table style="width:100%;">
-                            <tr>
+							<tr>
-                                <td class="LabelV" ><span>Password:</span></td>
+								<td class="LabelV" ><span>Password:</span></td>
-                                <td><input type="password" name="reg_password" size="30" maxlength="29" ></td>
+								<td><input type="password" name="reg_password" size="30" maxlength="29" ></td>
-                            </tr>
+							</tr>
-                        </table>
+						</table>
-                    </div>
+					</div>
-                </td>
+				</td>
-            </tr>
+			</tr>
-        </table>
+		</table>
-    </div>
+	</div>
-    <br/>
+	<br/>
-    <table style="width:100%">
+	<table style="width:100%">
-        <tr align="center">
+		<tr align="center">
-            <td>
+			<td>
-                <table border="0" cellspacing="0" cellpadding="0">
+				<table border="0" cellspacing="0" cellpadding="0">
-                    <tr>
+					<tr>
-                        <td style="border:0px;">
+						<td style="border:0px;">
-                            <div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Submit" alt="Submit" src="{{ template_path }}/images/buttons/_sbutton_submit.gif" ></div>
+							<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Submit" alt="Submit" src="{{ template_path }}/images/buttons/_sbutton_submit.gif" ></div>
-                            </div>
+							</div>
-                        </td>
+						</td>
-                    </tr>
+					</tr>
 </form>
-                </table>
+				</table>
-            </td>
+			</td>
-            <td>
+			<td>
-                <table border="0" cellspacing="0" cellpadding="0">
+				<table border="0" cellspacing="0" cellpadding="0">
-                    <form action="?subtopic=accountmanagement" method="post">
+					<form action="{{ getLink('account/manage') }}" method="post">
-                        <tr>
+						<tr>
-                            <td style="border:0px;">
+							<td style="border:0px;">
-                                <div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>
+								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>
-                                </div>
+								</div>
-                            </td>
+							</td>
-                        </tr>
+						</tr>
-                    </form>
+					</form>
-                </table>
+				</table>
-            </td>
+			</td>
-        </tr>
+		</tr>
-    </table>
+	</table>

system/templates/account.generate_recovery_key.html.twig

@@ -1,5 +1,5 @@
 To generate recovery key for your account please enter your password.<br/><br/>
-<form action="?subtopic=accountmanagement&action=registeraccount" method="post">
+<form action="{{ getLink('account/register') }}" method="post">
 <input type="hidden" name="registeraccountsave" value="1"/>
 <div class="TableContainer">
 	<table class="Table1" cellpadding="0" cellspacing="0">
@@ -50,7 +50,7 @@ To generate recovery key for your account please enter your password.<br/><br/>
 </form>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
-				<form action="?subtopic=accountmanagement" method="post">
+				<form action="{{ getLink('account/manage') }}" method="post">
 					<tr>
 						<td style="border: 0px;">
 							<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

system/templates/account.login.html.twig

@@ -1,5 +1,5 @@
 Please enter your account {{ account|lower }} and your password.<br/><a href="?subtopic=createaccount" >Create an account</a> if you do not have one yet.<br/><br/>
-<form action="?subtopic=accountmanagement" method="post" >
+<form action="{{ getLink('account/manage') }}" method="post" >
 	{% if redirect is not null %}
 		<input type="hidden" name="redirect" value="{{ redirect }}" />
 	{% endif %}
@@ -66,7 +66,7 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="?s
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=lostaccount" method="post">
+					<form action="{{ getLink('account/lost') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>

system/templates/account.logout.html.twig

@@ -18,7 +18,7 @@
 				<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="?subtopic=accountmanagement" >log in</a> again.</td>
+							<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>

system/templates/account.lost.noaction.html.twig

@@ -2,7 +2,7 @@ Please select action.<br/>
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
 	<tr>
 		<td align="center">
-			<a href="?subtopic=lostaccount" border="0">
+			<a href="{{ getLink('account/lost') }}" border="0">
 				<img src="{{ template_path }}/images/buttons/sbutton_back.gif" name="back" alt="back" border="0" width="120" height="18">
 			</a>
 		</td>

system/templates/account.management.html.twig

@@ -11,7 +11,7 @@
 					<td width="100%"></td>
 					<td>
 						<table border="0" cellspacing="0" cellpadding="0" >
-							<form action="?subtopic=accountmanagement&action=logout" method="post" >
+							<form action="{{ getLink('account/logout') }}" method="post" >
 								<tr>
 									<td style="border:0px;">
 										<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
@@ -61,7 +61,7 @@
 			</table>
 			<div align="center">
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement&action=registeraccount" method="post">
+					<form action="{{ getLink('account/register') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
@@ -93,12 +93,12 @@
 			<table>
 				<tr>
 					<td class="LabelV" >Note:</td>
-					<td style="width:100%;" >A request has beefffn 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!</td>
+					<td style="width:100%;" >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!</td>
 				</tr>
 			</table>
 			<div align="center">
 				<table border="0" cellspacing="0" cellpadding="0">
-					<form action="?subtopic=accountmanagement&action=changeemail" method="post">
+					<form action="{{ getLink('account/email') }}" method="post">
 						<tr>
 							<td style="border:0px;">
 								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
@@ -194,7 +194,7 @@
 									<tr>
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0">
-												<form action="?subtopic=accountmanagement&action=changepassword" method="post">
+												<form action="{{ getLink('account/password') }}" method="post">
 													<tr>
 														<td style="border:0px;" >
 															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Password" alt="Change Password" src="{{ template_path }}/images/buttons/_sbutton_changepassword.gif" ></div>
@@ -206,7 +206,7 @@
 										</td>
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0">
-												<form action="?subtopic=accountmanagement&action=changeemail" method="post">
+												<form action="{{ getLink('account/email') }}" method="post">
 													<tr>
 														<td style="border:0px;">
 															<input type="hidden" name="newemail" value=""/>
@@ -223,7 +223,7 @@
 										{% if recovery_key is empty %}
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0">
-												<form action="?subtopic=accountmanagement&action=registeraccount" method="post">
+												<form action="{{ getLink('account/register') }}" method="post">
 													<tr>
 														<td style="border:0px;">
 															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Register Account" alt="Register Account" src="{{ template_path }}/images/buttons/_sbutton_registeraccount.gif" ></div>
@@ -295,7 +295,7 @@
 												</td>
 												<td align=right>
 													<table border="0" cellspacing="0" cellpadding="0">
-														<form action="?subtopic=accountmanagement&action=changeinfo" method="post">
+														<form action="{{ getLink('account/info') }}" method="post">
 															<tr>
 																<td style="border:0px;">
 																	<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Edit" alt="Edit" src="{{ template_path }}/images/buttons/_sbutton_edit.gif" ></div>
@@ -450,7 +450,7 @@
 												{% else %}
 												<td><font color="red"><b>Offline</b></font></td>
 												{% endif %}
-												<td>[<a href="?subtopic=accountmanagement&action=changecomment&name={{ player.name_encoded }}" >Edit</a>]</td>
+												<td>[<a href="{{ getLink('account/character/comment/' ~ player.name_encoded) }}" >Edit</a>]</td>
 											</tr>
 											{% endfor %}
 										</table>
@@ -469,7 +469,7 @@
 									<tr>
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0" >
-												<form action="?subtopic=accountmanagement&action=createcharacter" method="post" >
+												<form action="{{ getLink('account/character/create') }}" method="post" >
 													<tr>
 														<td style="border:0px;" ><div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
 															<input class="ButtonText" type="image" name="Create Character" alt="Create Character" src="{{ template_path }}/images/buttons/_sbutton_createcharacter.gif" ></div>
@@ -482,7 +482,7 @@
 										{% if config.account_change_character_name %}
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0" >
-												<form action="?subtopic=accountmanagement&action=changename" method="post" >
+												<form action="{{ getLink('account/character/name') }}" method="post" >
 													<tr>
 														<td style="border:0px;" ><div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Name" alt="Change Name" src="images/buttons/_sbutton_change_name.gif" ></div>
 														</div>
@@ -495,7 +495,7 @@
 										{% if config.account_change_character_sex %}
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0" >
-												<form action="?subtopic=accountmanagement&action=changesex" method="post" >
+												<form action="{{ getLink('account/character/sex') }}" method="post" >
 													<tr>
 														<td style="border:0px;" ><div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Sex" alt="Change Sex" src="images/buttons/_sbutton_change_sex.gif" ></div>
 														</div>
@@ -508,7 +508,7 @@
 										<td style="width:100%;" ></td>
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0">
-												<form action="?subtopic=accountmanagement&action=deletecharacter" method="post">
+												<form action="{{ getLink('account/character/delete') }}" method="post">
 													<tr>
 														<td style="border:0px;">
 															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Delete Character" alt="Delete Character" src="{{ template_path }}/images/buttons/_sbutton_deletecharacter.gif" ></div>

system/templates/account.redirect.html.twig

@@ -28,9 +28,9 @@
 </div>
 
 <script language="javascript" type="text/javascript">
-    // Automatic redirect
+	// Automatic redirect
-    setTimeout ("automaticRedirect()", 1000);
+	setTimeout ("automaticRedirect()", 1000);
-    function automaticRedirect() {
+	function automaticRedirect() {
-        window.location = "{{ redirect }}";
+		window.location = "{{ redirect }}";
-    }
+	}
 </script>

system/templates/forum.new_thread.html.twig

@@ -1,5 +1,5 @@
 <form action="?" method="post">
-	<input type="hidden" name="action" value="new_topic" />
+	<input type="hidden" name="action" value="new_thread" />
 	<input type="hidden" name="section_id" value="{{ section_id }}" />
 	<input type="hidden" name="subtopic" value="forum" />
 	<input type="hidden" name="save" value="save" />

system/templates/success.html.twig

@@ -32,7 +32,7 @@
 {% else %}
 <center>
 	<table border="0" cellspacing="0" cellpadding="0">
-		<form action="?subtopic=accountmanagement" method="post">
+		<form action="{{ getLink('account/manage') }}" method="post">
 			<tr>
 				<td style="border:0px;">
 					<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="{{ template_path }}/images/buttons/_sbutton_back.gif" ></div>

templates/kathrine/account.change_name.html.twig

@@ -1,6 +1,6 @@
 To change a name of character select player and choose a new name.<br/>
 <font color="red">Change name cost {{ config.account_change_character_name_points }} premium points. You have {{ points }} premium points.</font><br/><br/>
-<form action="?subtopic=accountmanagement&action=changename" method="post">
+<form action="{{ getLink('account/character/name') }}" method="post">
 	<input type="hidden" name="changenamesave" value="1">
 	<h3>Change Name</h3>
 	<table style="width:100%;">
@@ -33,7 +33,7 @@ To change a name of character select player and choose a new name.<br/>
 <br/>
 <div style="text-align: center; margin: 0 auto;">
 	<table border="0" cellspacing="0" cellpadding="0">
-		<form action="?subtopic=accountmanagement" method="post">
+		<form action="{{ getLink('account/manage') }}" method="post">
 			<tr>
 				<td style="border:0px; text-align: center;">
 					<input type="submit" name="Back" value="Back"/>

templates/kathrine/success.html.twig

@@ -5,7 +5,7 @@
 {% else %}
 <div style="text-align: center; margin: 0 auto;">
 	<table border="0" cellspacing="0" cellpadding="0">
-		<form action="?subtopic=accountmanagement" method="post">
+		<form action="{{ getLink('account/manage') }}" method="post">
 			<tr>
 				<td style="border:0px; text-align: center;">
 					<input type="submit" name="Back" value="Back"/>

templates/kathrine/template.php

@@ -53,9 +53,9 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 			<div id="mainsubmenu">
 				<div id="news-submenu">
-					<a href="<?php echo $template['link_news']; ?>">Latest News</a>
+					<a href="<?php echo getLink('news'); ?>">Latest News</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_news_archive']; ?>">News Archives</a>
+					<a href="<?php echo getLink('news/archive'); ?>">News Archives</a>
 				</div>
 
 				<div id="account-submenu">
@@ -63,91 +63,91 @@ defined('MYAAC') or die('Direct access not allowed!');
 					if($logged)
 					{
 ?>
-						<a href="<?php echo $template['link_account_manage']; ?>">My Account</a>
+						<a href="<?php echo getLink('account/manage'); ?>">My Account</a>
 						<span class="separator"></span>
-						<a href="<?php echo $template['link_account_logout']; ?>">Logout</a>
+						<a href="<?php echo getLink('account/logout'); ?>">Logout</a>
 						<span class="separator"></span>
 <?php
 					}
 					else
 					{
 ?>
-						<a href="<?php echo $template['link_account_manage']; ?>">Login</a>
+						<a href="<?php echo getLink('account/manage'); ?>">Login</a>
 						<span class="separator"></span>
-					<a href="<?php echo $template['link_account_create']; ?>">Create Account</a>
+					<a href="<?php echo getLink('account/create'); ?>">Create Account</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_account_lost']; ?>">Lost Account</a>
+					<a href="<?php echo getLink('account/lost'); ?>">Lost Account</a>
 					<span class="separator"></span>
 <?php
 					}
 ?>
-					<a href="<?php echo $template['link_rules']; ?>">Server Rules</a>
+					<a href="<?php echo getLink('rules'); ?>">Server Rules</a>
 					<?php if($config['bug_report']): ?>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_bugtracker']; ?>">Report Bug</a>
+					<a href="<?php echo getLink('bugtracker'); ?>">Report Bug</a>
 					<?php endif; ?>
 				</div>
 
 				<div id="community-submenu">
-					<a href="<?php echo $template['link_online']; ?>">Who is Online?</a>
+					<a href="<?php echo getLink('online'); ?>">Who is Online?</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_characters']; ?>">Characters</a>
+					<a href="<?php echo getLink('characters'); ?>">Characters</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_guilds']; ?>">Guilds</a>
+					<a href="<?php echo getLink('guilds'); ?>">Guilds</a>
 					<?php
 					if(isset($config['wars'])): ?>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_wars']; ?>">Wars</a>
+					<a href="<?php echo getLink('wars'); ?>">Wars</a>
 					<?php endif; ?>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_highscores']; ?>">Highscores</a>
+					<a href="<?php echo getLink('highscores'); ?>">Highscores</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_lastkills']; ?>">Last Deaths</a>
+					<a href="<?php echo getLink('lastkills'); ?>">Last Deaths</a>
 					<?php if(fieldExist('name', 'houses')): ?>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_houses']; ?>">Houses</a>
+					<a href="<?php echo getLink('houses'); ?>">Houses</a>
 					<?php endif;
 					if($config['otserv_version'] == TFS_03): ?>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_bans']; ?>">Bans</a>
+					<a href="<?php echo getLink('bans'); ?>">Bans</a>
 					<?php endif;
 					if($config['forum'] != ''): ?>
 					<span class="separator"></span>
 					<?php echo $template['link_forum']; ?>Forum</a>
 					<?php endif; ?>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_team']; ?>">Team</a>
+					<a href="<?php echo getLink('team'); ?>">Team</a>
 				</div>
 
 				<div id="library-submenu">
-					<a href="<?php echo $template['link_creatures']; ?>">Monsters</a>
+					<a href="<?php echo getLink('creatures'); ?>">Monsters</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_spells']; ?>">Spells</a>
+					<a href="<?php echo getLink('spells'); ?>">Spells</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_serverInfo']; ?>">Server Info</a>
+					<a href="<?php echo getLink('serverInfo'); ?>">Server Info</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_downloads']; ?>">Downloads</a>
+					<a href="<?php echo getLink('downloads'); ?>">Downloads</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_commands']; ?>">Commands</a>
+					<a href="<?php echo getLink('commands'); ?>">Commands</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_movies']; ?>">Movies</a>
+					<a href="<?php echo getLink('movies'); ?>">Movies</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_screenshots']; ?>">Screenshots</a>
+					<a href="<?php echo getLink('screenshots'); ?>">Screenshots</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_experienceTable']; ?>">Experience Table</a>
+					<a href="<?php echo getLink('experienceTable'); ?>">Experience Table</a>
 					<span class="separator"></span>
-					<a href="<?php echo $template['link_faq']; ?>">FAQ</a>
+					<a href="<?php echo getLink('faq'); ?>">FAQ</a>
 				</div>
 				<?php
 				if($config['gifts_system'])
 				{
 					echo '
 					<div id="shops-submenu">
-						<a href="' . $template['link_points'] . '">Buy Premium Points</a>
+						<a href="' . getLink('points') . '">Buy Premium Points</a>
 						<span class="separator"></span>
-						<a href="' . $template['link_gifts'] . '">Shop Offer</a>';
+						<a href="' . getLink('gifts') . '">Shop Offer</a>';
 						if($logged)
-							echo '<span class="separator"></span><a href="' . $template['link_gifts_history'] . '">Shop History</a>';
+							echo '<span class="separator"></span><a href="' . getLink('gifts/history') . '">Shop History</a>';
 					echo '</div>';
 				}
 				?>
@@ -159,7 +159,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 				<div id="margins">
 					<table cellpadding="0" cellspacing="0" border="0" width="100%">
 						<tr>
-							<td><a href="<?php echo $template['link_news']; ?>"><?php echo $config['lua']['serverName']; ?></a> &raquo; <?php echo $title; ?></td>
+							<td><a href="<?php echo getLink('news'); ?>"><?php echo $config['lua']['serverName']; ?></a> &raquo; <?php echo $title; ?></td>
 							<td>
 							<?php
 							if($status['online'])

templates/tibiacom/index.php

@@ -63,16 +63,16 @@ if(isset($config['boxes']))
 		function LoginButtonAction()
 		{
 		  if(loginStatus == "false") {
-			window.location = "<?php echo $template['link_account_manage']; ?>";
+			window.location = "<?php echo getLink('account/manage'); ?>";
 		  } else {
-			window.location = "<?php echo $template['link_account_manage']; ?>";
+			window.location = "<?php echo getLink('account/manage'); ?>";
 		  }
 		}
 		function LoginstatusTextAction(source) {
 		  if(loginStatus == "false") {
-			window.location = "<?php echo $template['link_account_create']; ?>";
+			window.location = "<?php echo getLink('account/create'); ?>";
 		  } else {
-			window.location = "<?php echo $template['link_account_logout']; ?>";
+			window.location = "<?php echo getLink('account/logout'); ?>";
 		  }
 		}
 
@@ -199,7 +199,7 @@ if(isset($config['boxes']))
         <div id="MenuColumn">
           <div id="LeftArtwork">
             <img id="Statue_1" src="<?php echo $template_path; ?>/images/header/animated-statue.gif" alt="logoartwork" />
-            <img id="TibiaLogoArtworkTop" src="<?php echo $template_path; ?>/images/header/<?php echo $config['logo_image']; ?>" onClick="window.location = '<?php echo internalLayoutLink('news')?>';" alt="logoartwork" />
+            <img id="TibiaLogoArtworkTop" src="<?php echo $template_path; ?>/images/header/<?php echo $config['logo_image']; ?>" onClick="window.location = '<?php echo getLink('news')?>';" alt="logoartwork" />
             <img id="TibiaLogoArtworkBottom" src="<?php echo $template_path; ?>/images/header/tibia-logo-artwork-bottom.gif" alt="logoartwork" />
             <img id="Statue_2" src="<?php echo $template_path; ?>/images/header/animated-statue.gif" alt="logoartwork" />
             <img id="LogoLink" src="<?php echo $template_path; ?>/images/header/tibia-logo-artwork-string.gif" onClick="window.location = 'mailto:<?php echo $config['lua']['ownerEmail']; ?>';" alt="logoartwork" />
@@ -256,7 +256,7 @@ if(isset($config['boxes']))
   </div>
 </span>
 <div id='news_Submenu' class='Submenu'>
-<a href='<?php echo $template['link_news']; ?>'>
+<a href='<?php echo getLink('news'); ?>'>
   <div id='submenu_news' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_news' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -264,7 +264,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_news_archive'];?>'>
+<a href='<?php echo getLink('news/archive');?>'>
   <div id='submenu_newsarchive' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_newsarchive' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -272,7 +272,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<!--a href='<?php echo $template['link_changelog'];?>'>
+<!--a href='<?php echo getLink('changelog');?>'>
   <div id='submenu_changelog' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_changelog' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -302,7 +302,7 @@ if(isset($config['boxes']))
   </div>
 </span>
 <div id='account_Submenu' class='Submenu'>
-<a href='<?php echo $template['link_account_manage']; ?>'>
+<a href='<?php echo getLink('account/manage'); ?>'>
   <div id='submenu_accountmanagement' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_accountmanagement' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -310,7 +310,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_account_create']; ?>'>
+<a href='<?php echo getLink('account/create'); ?>'>
   <div id='submenu_createaccount' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_createaccount' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -318,7 +318,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_account_lost']; ?>'>
+<a href='<?php echo getLink('account/lost'); ?>'>
   <div id='submenu_lostaccount' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_lostaccount' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -326,7 +326,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_rules']; ?>'>
+<a href='<?php echo getLink('rules'); ?>'>
   <div id='submenu_rules' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_rules' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -334,7 +334,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_downloads']; ?>'>
+<a href='<?php echo getLink('downloads'); ?>'>
   <div id='submenu_downloads' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_downloads' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -363,7 +363,7 @@ if(isset($config['boxes']))
   </div>
 </span>
 <div id='community_Submenu' class='Submenu'>
-<a href='<?php echo $template['link_characters']; ?>'>
+<a href='<?php echo getLink('characters'); ?>'>
   <div id='submenu_characters' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_characters' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -372,7 +372,7 @@ if(isset($config['boxes']))
 
   </div>
 </a>
-<a href='<?php echo $template['link_online']; ?>'>
+<a href='<?php echo getLink('online'); ?>'>
   <div id='submenu_online' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_online' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -380,7 +380,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_highscores']; ?>'>
+<a href='<?php echo getLink('highscores'); ?>'>
   <div id='submenu_highscores' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_highscores' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -389,7 +389,7 @@ if(isset($config['boxes']))
   </div>
 </a>
 <?php if(isset($config['powergamers'])): ?>
-<a href='<?php echo $template['link_powergamers']; ?>'>
+<a href='<?php echo getLink('powergamers'); ?>'>
   <div id='submenu_powergamers' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_powergamers' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -398,7 +398,7 @@ if(isset($config['boxes']))
   </div>
 </a>
 <?php endif; ?>
-<a href='<?php echo $template['link_lastkills']; ?>'>
+<a href='<?php echo getLink('lastkills'); ?>'>
   <div id='submenu_lastkills' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_lastkills' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -407,7 +407,7 @@ if(isset($config['boxes']))
   </div>
 </a>
 <?php if(fieldExist('name', 'houses')): ?>
-<a href='<?php echo $template['link_houses']; ?>'>
+<a href='<?php echo getLink('houses'); ?>'>
   <div id='submenu_houses' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_houses' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -416,7 +416,7 @@ if(isset($config['boxes']))
   </div>
 </a>
 <?php endif; ?>
-<a href='<?php echo $template['link_guilds']; ?>'>
+<a href='<?php echo getLink('guilds'); ?>'>
   <div id='submenu_guilds' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
 
@@ -426,7 +426,7 @@ if(isset($config['boxes']))
   </div>
 </a>
 <?php if(isset($config['wars'])): ?>
-<a href='<?php echo $template['link_wars']; ?>'>
+<a href='<?php echo getLink('wars'); ?>'>
   <div id='submenu_wars' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
 
@@ -437,7 +437,7 @@ if(isset($config['boxes']))
 </a>
 <?php endif; ?>
 <?php if(isset($config['polls'])): ?>
-<a href='<?php echo $template['link_polls']; ?>'>
+<a href='<?php echo getLink('polls'); ?>'>
   <div id='submenu_polls' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
 
@@ -448,7 +448,7 @@ if(isset($config['boxes']))
 </a>
 <?php endif; ?>
 <?php if(tableExist('bans')): ?>
-<a href='<?php echo $template['link_bans']; ?>'>
+<a href='<?php echo getLink('bans'); ?>'>
   <div id='submenu_bans' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
 
@@ -458,7 +458,7 @@ if(isset($config['boxes']))
   </div>
 </a>
 <?php endif; ?>
-<a href='<?php echo $template['link_team']; ?>'>
+<a href='<?php echo getLink('team'); ?>'>
   <div id='submenu_team' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_team' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -513,7 +513,7 @@ if(isset($config['boxes']))
   </div>
 </span>
 <div id='library_Submenu' class='Submenu'>
-<a href='<?php echo $template['link_creatures']; ?>'>
+<a href='<?php echo getLink('creatures'); ?>'>
   <div id='submenu_creatures' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_creatures' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -521,7 +521,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_spells']; ?>'>
+<a href='<?php echo getLink('spells'); ?>'>
   <div id='submenu_spells' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_spells' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -529,7 +529,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_commands']; ?>'>
+<a href='<?php echo getLink('commands'); ?>'>
   <div id='submenu_commands' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_commands' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -537,7 +537,7 @@ if(isset($config['boxes']))
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo  $template['link_experienceStages']; ?>'>
+<a href='<?php echo getLink('experienceStages'); ?>'>
   <div id='submenu_experiencestages' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_experiencestages' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -548,7 +548,7 @@ if(isset($config['boxes']))
 <?php
 
 if(isset($config['freehouses'])): ?>
-<a href='<?php echo $template['link_freehouses']; ?>'>
+<a href='<?php echo getLink('freehouses'); ?>'>
   <div id='submenu_freehouses' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_freehouses' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -560,35 +560,23 @@ if(isset($config['freehouses'])): ?>
 endif;
 ?>
 
-<a href="<?php echo $template['link_screenshots']; ?>">
+<a href="<?php echo getLink('screenshots'); ?>">
-  <div id='submenu_screenshots' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
+	<div id='submenu_screenshots' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
-    <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
+		<div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
-    <div id='ActiveSubmenuItemIcon_screenshots' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
+		<div id='ActiveSubmenuItemIcon_screenshots' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
-    <div class='SubmenuitemLabel'>Screenshots</div>
+		<div class='SubmenuitemLabel'>Screenshots</div>
-    <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
+		<div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
-  </div>
+	</div>
 </a>
-<a href="<?php echo $template['link_movies']; ?>">
+<a href="<?php echo getLink('movies'); ?>">
-		<div id='submenu_movies' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
+	<div id='submenu_movies' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
-			<div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
+		<div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
-			<div id='ActiveSubmenuItemIcon_movies' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
+		<div id='ActiveSubmenuItemIcon_movies' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
-			<div class='SubmenuitemLabel'>Movies</div>
+		<div class='SubmenuitemLabel'>Movies</div>
-			<div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
+		<div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
-		</div>
+	</div>
-	</a>
-<?php
-if(isset($config['movies'])): ?>
-<a href='<?php echo $template['link_movies']; ?>'>
-  <div id='submenu_movies' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
-    <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
-    <div id='ActiveSubmenuItemIcon_movies' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
-    <div class='SubmenuitemLabel'>Movies</div>
-    <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
-  </div>
 </a>
-<?php endif; ?>
+<a href='<?php echo getLink('serverInfo'); ?>'>
-
-<a href='<?php echo $template['link_serverInfo']; ?>'>
   <div id='submenu_serverinfo' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_serverinfo' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -597,7 +585,7 @@ if(isset($config['movies'])): ?>
   </div>
 </a>
 
-<a href='<?php echo $template['link_experienceTable']; ?>'>
+<a href='<?php echo getLink('experienceTable'); ?>'>
   <div id='submenu_experiencetable' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_experiencetable' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -628,7 +616,7 @@ if($config['bug_report']):
 </span>
 <div id='support_Submenu' class='Submenu'>
 
-<a href='<?php echo $template['link_bugtracker']; ?>'>
+<a href='<?php echo getLink('bugtracker'); ?>'>
   <div id='submenu_bugtracker' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_bugtracker' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -661,7 +649,7 @@ if($config['gifts_system']):
 </span>
 </div>
 <div id='shops_Submenu' class='Submenu'>
-<a href='<?php echo $template['link_points']; ?>'>
+<a href='<?php echo getLink('points'); ?>'>
   <div id='submenu_points' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_points' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -669,7 +657,7 @@ if($config['gifts_system']):
     <div class='RightChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
   </div>
 </a>
-<a href='<?php echo $template['link_gifts']; ?>'>
+<a href='<?php echo getLink('gifts'); ?>'>
   <div id='submenu_gifts' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_gifts' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -680,7 +668,7 @@ if($config['gifts_system']):
 <?php
 if($logged):
 ?>
-<a href='<?php echo $template['link_gifts_history']; ?>'>
+<a href='<?php echo getLink('gifts/history'); ?>'>
   <div id='submenu_gifts' class='Submenuitem' onMouseOver='MouseOverSubmenuItem(this)' onMouseOut='MouseOutSubmenuItem(this)'>
     <div class='LeftChain' style='background-image:url(<?php echo $template_path; ?>/images/general/chain.gif);'></div>
     <div id='ActiveSubmenuItemIcon_gifts' class='ActiveSubmenuItemIcon' style='background-image:url(<?php echo $template_path; ?>/images/menu/icon-activesubmenu.gif);'></div>
@@ -740,7 +728,7 @@ if($logged):
 		  ?>
             <img id="Monster" src="images/monsters/<?php echo logo_monster() ?>.gif" onClick="window.location = '?subtopic=creatures&creature=<?php echo $config['logo_monster'] ?>';" alt="Monster of the Week" />
             <img id="PedestalAndOnline" src="<?php echo $template_path; ?>/images/header/pedestal-and-online.gif" alt="Monster Pedestal and Players Online Box"/>
-          <div id="PlayersOnline" onClick="window.location = '<?php echo $template['link_online']; ?>'">
+          <div id="PlayersOnline" onClick="window.location = '<?php echo getLink('online'); ?>'">
 		  <?php
 			if($status['online'])
 				echo '<div id="players" style="display: inline;">' . $status['players'] . '</div><br>Players Online';
@@ -752,7 +740,7 @@ if($logged):
         <div id="Themeboxes">
 			<?php if(in_array("newcomer", $config['boxes'])): ?>
 			<div id="NewcomerBox" class="Themebox" style="background-image:url(<?php echo $template_path; ?>/images/themeboxes/newcomer/newcomerbox.gif);">
-				<a class="ThemeboxButton" href="<?php echo $template['link_account_create']; ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
+				<a class="ThemeboxButton" href="<?php echo getLink('account/create'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
 					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif);"></div>
 					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/buttons/_sbutton_jointibia.gif);"></div>
 				</a>
@@ -761,7 +749,7 @@ if($logged):
 			<?php endif; ?>
 			<?php if(in_array("premium", $config['boxes'])): ?>
 			<div id="PremiumBox" class="Themebox" style="background-image:url(<?php echo $template_path; ?>/images/themeboxes/premium/premiumbox.gif);">
-				<a class="ThemeboxButton" href="<?php echo internalLayoutLink('premium'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
+				<a class="ThemeboxButton" href="<?php echo getLink('premium'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
 					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif);"></div>
 					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/buttons/_sbutton_getpremium.gif);"></div>
 				</a>
@@ -784,7 +772,7 @@ if($logged):
 					?>
 			<div id="CurrentPollBox" class="Themebox" style="background-image:url(<?php echo $template_path; ?>/images/themeboxes/current-poll/currentpollbox.gif);">
 				<div id="CurrentPollText"><?php echo $poll['question']; ?></div>
-					<a class="ThemeboxButton" href="<?php echo internalLayoutLink('polls') . '&id=' . $poll['id']; ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
+					<a class="ThemeboxButton" href="<?php echo getLink('polls') . '&id=' . $poll['id']; ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
 					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif);"></div>
 					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/buttons/_sbutton_votenow.gif);"></div>
 				</a>

tools/signature/index.php

@@ -1,7 +1,7 @@
 <?php
-	require('../../common.php');
+	require_once('../../common.php');
-	require(SYSTEM . 'functions.php');
+	require_once(SYSTEM . 'functions.php');
-	require(SYSTEM . 'init.php');
+	require_once(SYSTEM . 'init.php');
 
 	// Definitions
 	define('SIGNATURES', TOOLS . 'signature/');