diff --git a/GameEngine/BBCode.php b/GameEngine/BBCode.php
index 67e87266..aacdc70f 100644
--- a/GameEngine/BBCode.php
+++ b/GameEngine/BBCode.php
@@ -1 +1 @@
-<?php

$pattern= array();
$pattern[0] = "/\[b\](.*?)\[\/b\]/is";
$pattern[1] = "/\[i\](.*?)\[\/i\]/is";
$pattern[2] = "/\[u\](.*?)\[\/u\]/is";
$pattern[3] = "/\[tid1\]/";
$pattern[4] = "/\[tid2\]/";
$pattern[5] = "/\[tid3\]/";
$pattern[6] = "/\[tid4\]/";
$pattern[7] = "/\[tid5\]/";
$pattern[8] = "/\[tid6\]/";
$pattern[9] = "/\[tid7\]/";
$pattern[10] = "/\[tid8\]/";
$pattern[11] = "/\[tid9\]/";
$pattern[12] = "/\[tid10\]/";
$pattern[13] = "/\[tid11\]/";
$pattern[14] = "/\[tid12\]/";
$pattern[15] = "/\[tid13\]/";
$pattern[16] = "/\[tid14\]/";
$pattern[17] = "/\[tid15\]/";
$pattern[18] = "/\[tid16\]/";
$pattern[19] = "/\[tid17\]/";
$pattern[20] = "/\[tid18\]/";
$pattern[21] = "/\[tid19\]/";
$pattern[22] = "/\[tid20\]/";
$pattern[23] = "/\[tid21\]/";
$pattern[24] = "/\[tid22\]/";
$pattern[25] = "/\[tid23\]/";
$pattern[26] = "/\[tid24\]/";
$pattern[27] = "/\[tid25\]/";
$pattern[28] = "/\[tid26\]/";
$pattern[29] = "/\[tid27\]/";
$pattern[30] = "/\[tid28\]/";
$pattern[31] = "/\[tid29\]/";
$pattern[32] = "/\[tid30\]/";
$pattern[33] = "/\[tid31\]/";
$pattern[34] = "/\[tid32\]/";
$pattern[35] = "/\[tid33\]/";
$pattern[36] = "/\[tid34\]/";
$pattern[37] = "/\[tid35\]/";
$pattern[38] = "/\[tid36\]/";
$pattern[39] = "/\[tid37\]/";
$pattern[40] = "/\[tid38\]/";
$pattern[41] = "/\[tid39\]/";
$pattern[42] = "/\[tid40\]/";
$pattern[43] = "/\[tid41\]/";
$pattern[44] = "/\[tid42\]/";
$pattern[45] = "/\[tid43\]/";
$pattern[46] = "/\[tid44\]/";
$pattern[47] = "/\[tid45\]/";
$pattern[48] = "/\[tid46\]/";
$pattern[49] = "/\[tid47\]/";
$pattern[50] = "/\[tid48\]/";
$pattern[51] = "/\[tid49\]/";
$pattern[52] = "/\[tid50\]/";
$pattern[53] = "/\[hero\]/";
$pattern[54] = "/\[lumber\]/";
$pattern[55] = "/\[clay\]/";
$pattern[56] = "/\[iron\]/";
$pattern[57] = "/\[crop\]/";
$pattern[58] = "/\*aha\*/";
$pattern[59] = "/\*angry\*/";
$pattern[60] = "/\*cool\*/";
$pattern[61] = "/\*cry\*/";
$pattern[62] = "/\*cute\*/";
$pattern[63] = "/\*depressed\*/";
$pattern[64] = "/\*eek\*/";
$pattern[65] = "/\*ehem\*/";
$pattern[66] = "/\*emotional\*/";
$pattern[67] = "/\:D/";
$pattern[68] = "/\:\)/";
$pattern[69] = "/\*hit\*/";
$pattern[70] = "/\*hmm\*/";
$pattern[71] = "/\*hmpf\*/";
$pattern[72] = "/\*hrhr\*/";
$pattern[73] = "/\*huh\*/";
$pattern[74] = "/\*lazy\*/";
$pattern[75] = "/\*love\*/";
$pattern[76] = "/\*nocomment\*/";
$pattern[77] = "/\*noemotion\*/";
$pattern[78] = "/\*notamused\*/";
$pattern[79] = "/\*pout\*/";
$pattern[80] = "/\*redface\*/";
$pattern[81] = "/\*rolleyes\*/";
$pattern[82] = "/\:\(/";
$pattern[83] = "/\*shy\*/";
$pattern[84] = "/\*smile\*/";
$pattern[85] = "/\*tongue\*/";
$pattern[86] = "/\*veryangry\*/";
$pattern[87] = "/\*veryhappy\*/";
$pattern[88] = "/\;\)/";
$pattern[89] = "/\[alliance\](.*?)\[\/alliance\]/is";
$pattern[90] = "/\[player\](.*?)\[\/player\]/is";

$replace= array();
$replace[0] = "<b>$1</b>";
$replace[1] = "<i>$1</i>";
$replace[2] = "<u>$1</u>";
$replace[3] = "<img class='unit u1' src='img/x.gif' title='Legionnaire' alt='Legionnaire'>";
$replace[4] = "<img class='unit u2' src='img/x.gif' title='Praetorian' alt='Praetorian'>";
$replace[5] = "<img class='unit u3' src='img/x.gif' title='Imperian' alt='Imperian'>";
$replace[6] = "<img class='unit u4' src='img/x.gif' title='Equites Legati' alt='Equites Legati'>";
$replace[7] = "<img class='unit u5' src='img/x.gif' title='Equites Imperatoris' alt='Equites Imperatoris'>";
$replace[8] = "<img class='unit u6' src='img/x.gif' title='Equites Caesaris' alt='Equites Caesaris'>";
$replace[9] = "<img class='unit u7' src='img/x.gif' title='Battering Ram' alt='Battering Ram'>";
$replace[10] = "<img class='unit u8' src='img/x.gif' title='Fire Catapult' alt='Fire Catapult'>";
$replace[11] = "<img class='unit u9' src='img/x.gif' title='Senator' alt='Senator'>";
$replace[12] = "<img class='unit u10' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[13] = "<img class='unit u11' src='img/x.gif' title='Clubswinger' alt='Clubswinger'>";
$replace[14] = "<img class='unit u12' src='img/x.gif' title='Spearman' alt='Spearman'>";
$replace[15] = "<img class='unit u13' src='img/x.gif' title='Axeman' alt='Axeman'>";
$replace[16] = "<img class='unit u14' src='img/x.gif' title='Scout' alt='Scout'>";
$replace[17] = "<img class='unit u15' src='img/x.gif' title='Paladin' alt='Paladin'>";
$replace[18] = "<img class='unit u16' src='img/x.gif' title='Teutonic Knight' alt='Teutonic Knight'>";
$replace[19] = "<img class='unit u17' src='img/x.gif' title='Ram' alt='Ram'>";
$replace[20] = "<img class='unit u18' src='img/x.gif' title='Catapult' alt='Catapult'>";
$replace[21] = "<img class='unit u19' src='img/x.gif' title='Chief' alt='Chief'>";
$replace[22] = "<img class='unit u20' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[23] = "<img class='unit u21' src='img/x.gif' title='Phalanx' alt='Phalanx'>";
$replace[24] = "<img class='unit u22' src='img/x.gif' title='Swordsman' alt='Swordsman'>";
$replace[25] = "<img class='unit u23' src='img/x.gif' title='Pathfinder' alt='Pathfinder'>";
$replace[26] = "<img class='unit u24' src='img/x.gif' title='Theutates Thunder' alt='Theutates Thunder'>";
$replace[27] = "<img class='unit u25' src='img/x.gif' title='Druidrider' alt='Druidrider'>";
$replace[28] = "<img class='unit u26' src='img/x.gif' title='Haeduan' alt='Haeduan'>";
$replace[29] = "<img class='unit u27' src='img/x.gif' title='Ram' alt='Ram'>";
$replace[30] = "<img class='unit u28' src='img/x.gif' title='Trebuchet' alt='Trebuchet'>";
$replace[31] = "<img class='unit u29' src='img/x.gif' title='Chieftain' alt='Chieftain'>";
$replace[32] = "<img class='unit u30' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[33] = "<img class='unit u31' src='img/x.gif' title='Rat' alt='Rat'>";
$replace[34] = "<img class='unit u32' src='img/x.gif' title='Spider' alt='Spider'>";
$replace[35] = "<img class='unit u33' src='img/x.gif' title='Snake' alt='Snake'>";
$replace[36] = "<img class='unit u34' src='img/x.gif' title='Bat' alt='Bat'>";
$replace[37] = "<img class='unit u35' src='img/x.gif' title='Wild Boar' alt='Wild Boar'>";
$replace[38] = "<img class='unit u36' src='img/x.gif' title='Wolf' alt='Wolf'>";
$replace[39] = "<img class='unit u37' src='img/x.gif' title='Bear' alt='Bear'>";
$replace[40] = "<img class='unit u38' src='img/x.gif' title='Crocodile' alt='Crocodile'>";
$replace[41] = "<img class='unit u39' src='img/x.gif' title='Tiger' alt='Tiger'>";
$replace[42] = "<img class='unit u40' src='img/x.gif' title='Elephant' alt='Elephant'>";
$replace[43] = "<img class='unit u41' src='img/x.gif' title='Pikeman' alt='Pikeman'>";
$replace[44] = "<img class='unit u42' src='img/x.gif' title='Thorned Warrior' alt='Thorned Warrior'>";
$replace[45] = "<img class='unit u43' src='img/x.gif' title='Guardsman' alt='Guardsman'>";
$replace[46] = "<img class='unit u44' src='img/x.gif' title='Birds Of Prey' alt='Birds Of Prey'>";
$replace[47] = "<img class='unit u45' src='img/x.gif' title='Axerider' alt='Axerider'>";
$replace[48] = "<img class='unit u46' src='img/x.gif' title='Natarian Knight' alt='Natarian Knight'>";
$replace[49] = "<img class='unit u47' src='img/x.gif' title='War Elephant' alt='War Elephant'>";
$replace[50] = "<img class='unit u48' src='img/x.gif' title='Ballista' alt='Ballista'>";
$replace[51] = "<img class='unit u49' src='img/x.gif' title='Natarian Emperor' alt='Natarian Emperor'>";
$replace[52] = "<img class='unit u50' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[53] = "<img class='unit uhero' src='img/x.gif' title='Hero' alt='Hero'>";
$replace[54] = "<img src='img/x.gif' class='r1' title='Lumber' alt='Lumber'>";
$replace[55] = "<img src='img/x.gif' class='r2' title='Clay' alt='Clay'>";
$replace[56] = "<img src='img/x.gif' class='r3' title='Iron' alt='Iron'>";
$replace[57] = "<img src='img/x.gif' class='r4' title='Crop' alt='Crop'>";
$replace[58] = "<img class='smiley aha' src='img/x.gif' alt='*aha*' title='*aha*'>";
$replace[59] = "<img class='smiley angry' src='img/x.gif' alt='*angry*' title='*angry*'>";
$replace[60] = "<img class='smiley cool' src='img/x.gif' alt='*cool*' title='*cool*'>";
$replace[61] = "<img class='smiley cry' src='img/x.gif' alt='*cry*' title='*cry*'>";
$replace[62] = "<img class='smiley cute' src='img/x.gif' alt='*cute*' title='*cute*'>";
$replace[63] = "<img class='smiley depressed' src='img/x.gif' alt='*depressed*' title='*depressed*'>";
$replace[64] = "<img class='smiley eek' src='img/x.gif' alt='*eek*' title='*eek*'>";
$replace[65] = "<img class='smiley ehem' src='img/x.gif' alt='*ehem*' title='*ehem*'>";
$replace[66] = "<img class='smiley emotional' src='img/x.gif' alt='*emotional*' title='*emotional*'>";
$replace[67] = "<img class='smiley grin' src='img/x.gif' alt=':D' title=':D'>";
$replace[68] = "<img class='smiley happy' src='img/x.gif' alt=':)' title=':)'>";
$replace[69] = "<img class='smiley hit' src='img/x.gif' alt='*hit*' title='*hit*'>";
$replace[70] = "<img class='smiley hmm' src='img/x.gif' alt='*hmm*' title='*hmm*'>";
$replace[71] = "<img class='smiley hmpf' src='img/x.gif' alt='*hmpf*' title='*hmpf*'>";
$replace[72] = "<img class='smiley hrhr' src='img/x.gif' alt='*hrhr*' title='*hrhr*'>";
$replace[73] = "<img class='smiley huh' src='img/x.gif' alt='*huh*' title='*huh*'>";
$replace[74] = "<img class='smiley lazy' src='img/x.gif' alt='*lazy*' title='*lazy*'>";
$replace[75] = "<img class='smiley love' src='img/x.gif' alt='*love*' title='*love*'>";
$replace[76] = "<img class='smiley nocomment' src='img/x.gif' alt='*nocomment*' title='*nocomment*'>";
$replace[77] = "<img class='smiley noemotion' src='img/x.gif' alt='*noemotion*' title='*noemotion*'>";
$replace[78] = "<img class='smiley notamused' src='img/x.gif' alt='*notamused*' title='*notamused*'>";
$replace[79] = "<img class='smiley pout' src='img/x.gif' alt='*pout*' title='*pout*'>";
$replace[80] = "<img class='smiley redface' src='img/x.gif' alt='*redface*' title='*redface*'>";
$replace[81] = "<img class='smiley rolleyes' src='img/x.gif' alt='*rolleyes*' title='*rolleyes*'>";
$replace[82] = "<img class='smiley sad' src='img/x.gif' alt=':(' title=':('>";
$replace[83] = "<img class='smiley shy' src='img/x.gif' alt='*shy*' title='*shy*'>";
$replace[84] = "<img class='smiley smile' src='img/x.gif' alt='*smile*' title='*smile*'>";
$replace[85] = "<img class='smiley tongue' src='img/x.gif' alt='*tongue*' title='*tongue*'>";
$replace[86] = "<img class='smiley veryangry' src='img/x.gif' alt='*veryangry*' title='*veryangry*'>";
$replace[87] = "<img class='smiley veryhappy' src='img/x.gif' alt='*veryhappy*' title='*veryhappy*'>";
$replace[88] = "<img class='smiley wink' src='img/x.gif' alt=';)' title=';)'>";
$replace[89] = "<a href=allianz.php?aname=$1>$1</a>";
$replace[90] = "<a href=spieler.php?uname=$1>$1</a>";
$bbcoded = preg_replace($pattern, $replace, $input);
?>
\ No newline at end of file
+<?php

$pattern= array();
$pattern[0] = "/\[b\](.*?)\[\/b\]/is";
$pattern[1] = "/\[i\](.*?)\[\/i\]/is";
$pattern[2] = "/\[u\](.*?)\[\/u\]/is";
$pattern[3] = "/\[tid1\]/";
$pattern[4] = "/\[tid2\]/";
$pattern[5] = "/\[tid3\]/";
$pattern[6] = "/\[tid4\]/";
$pattern[7] = "/\[tid5\]/";
$pattern[8] = "/\[tid6\]/";
$pattern[9] = "/\[tid7\]/";
$pattern[10] = "/\[tid8\]/";
$pattern[11] = "/\[tid9\]/";
$pattern[12] = "/\[tid10\]/";
$pattern[13] = "/\[tid11\]/";
$pattern[14] = "/\[tid12\]/";
$pattern[15] = "/\[tid13\]/";
$pattern[16] = "/\[tid14\]/";
$pattern[17] = "/\[tid15\]/";
$pattern[18] = "/\[tid16\]/";
$pattern[19] = "/\[tid17\]/";
$pattern[20] = "/\[tid18\]/";
$pattern[21] = "/\[tid19\]/";
$pattern[22] = "/\[tid20\]/";
$pattern[23] = "/\[tid21\]/";
$pattern[24] = "/\[tid22\]/";
$pattern[25] = "/\[tid23\]/";
$pattern[26] = "/\[tid24\]/";
$pattern[27] = "/\[tid25\]/";
$pattern[28] = "/\[tid26\]/";
$pattern[29] = "/\[tid27\]/";
$pattern[30] = "/\[tid28\]/";
$pattern[31] = "/\[tid29\]/";
$pattern[32] = "/\[tid30\]/";
$pattern[33] = "/\[tid31\]/";
$pattern[34] = "/\[tid32\]/";
$pattern[35] = "/\[tid33\]/";
$pattern[36] = "/\[tid34\]/";
$pattern[37] = "/\[tid35\]/";
$pattern[38] = "/\[tid36\]/";
$pattern[39] = "/\[tid37\]/";
$pattern[40] = "/\[tid38\]/";
$pattern[41] = "/\[tid39\]/";
$pattern[42] = "/\[tid40\]/";
$pattern[43] = "/\[tid41\]/";
$pattern[44] = "/\[tid42\]/";
$pattern[45] = "/\[tid43\]/";
$pattern[46] = "/\[tid44\]/";
$pattern[47] = "/\[tid45\]/";
$pattern[48] = "/\[tid46\]/";
$pattern[49] = "/\[tid47\]/";
$pattern[50] = "/\[tid48\]/";
$pattern[51] = "/\[tid49\]/";
$pattern[52] = "/\[tid50\]/";
$pattern[53] = "/\[hero\]/";
$pattern[54] = "/\[lumber\]/";
$pattern[55] = "/\[clay\]/";
$pattern[56] = "/\[iron\]/";
$pattern[57] = "/\[crop\]/";
$pattern[58] = "/\*aha\*/";
$pattern[59] = "/\*angry\*/";
$pattern[60] = "/\*cool\*/";
$pattern[61] = "/\*cry\*/";
$pattern[62] = "/\*cute\*/";
$pattern[63] = "/\*depressed\*/";
$pattern[64] = "/\*eek\*/";
$pattern[65] = "/\*ehem\*/";
$pattern[66] = "/\*emotional\*/";
$pattern[67] = "/\:D/";
$pattern[68] = "/\:\)/";
$pattern[69] = "/\*hit\*/";
$pattern[70] = "/\*hmm\*/";
$pattern[71] = "/\*hmpf\*/";
$pattern[72] = "/\*hrhr\*/";
$pattern[73] = "/\*huh\*/";
$pattern[74] = "/\*lazy\*/";
$pattern[75] = "/\*love\*/";
$pattern[76] = "/\*nocomment\*/";
$pattern[77] = "/\*noemotion\*/";
$pattern[78] = "/\*notamused\*/";
$pattern[79] = "/\*pout\*/";
$pattern[80] = "/\*redface\*/";
$pattern[81] = "/\*rolleyes\*/";
$pattern[82] = "/\:\(/";
$pattern[83] = "/\*shy\*/";
$pattern[84] = "/\*smile\*/";
$pattern[85] = "/\*tongue\*/";
$pattern[86] = "/\*veryangry\*/";
$pattern[87] = "/\*veryhappy\*/";
$pattern[88] = "/\;\)/";
$pattern[89] = "/\[alliance\](.*?)\[\/alliance\]/is";
$pattern[90] = "/\[player\](.*?)\[\/player\]/is";
$pattern[91] = "/\[report\](.*?)\[\/report\]/is";
$pattern[92] = "/\[coor\](.*?)\[\/coor\]/is";

$a= array();
$a[0] = "<b>$1</b>";
$a[1] = "<i>$1</i>";
$a[2] = "<u>$1</u>";
$a[3] = "<img class='unit u1' src='img/x.gif' title='Legionnaire' alt='Legionnaire'>";
$a[4] = "<img class='unit u2' src='img/x.gif' title='Praetorian' alt='Praetorian'>";
$a[5] = "<img class='unit u3' src='img/x.gif' title='Imperian' alt='Imperian'>";
$a[6] = "<img class='unit u4' src='img/x.gif' title='Equites Legati' alt='Equites Legati'>";
$a[7] = "<img class='unit u5' src='img/x.gif' title='Equites Imperatoris' alt='Equites Imperatoris'>";
$a[8] = "<img class='unit u6' src='img/x.gif' title='Equites Caesaris' alt='Equites Caesaris'>";
$a[9] = "<img class='unit u7' src='img/x.gif' title='Battering Ram' alt='Battering Ram'>";
$a[10] = "<img class='unit u8' src='img/x.gif' title='Fire Catapult' alt='Fire Catapult'>";
$a[11] = "<img class='unit u9' src='img/x.gif' title='Senator' alt='Senator'>";
$a[12] = "<img class='unit u10' src='img/x.gif' title='Settler' alt='Settler'>";
$a[13] = "<img class='unit u11' src='img/x.gif' title='Clubswinger' alt='Clubswinger'>";
$a[14] = "<img class='unit u12' src='img/x.gif' title='Spearman' alt='Spearman'>";
$a[15] = "<img class='unit u13' src='img/x.gif' title='Axeman' alt='Axeman'>";
$a[16] = "<img class='unit u14' src='img/x.gif' title='Scout' alt='Scout'>";
$a[17] = "<img class='unit u15' src='img/x.gif' title='Paladin' alt='Paladin'>";
$a[18] = "<img class='unit u16' src='img/x.gif' title='Teutonic Knight' alt='Teutonic Knight'>";
$a[19] = "<img class='unit u17' src='img/x.gif' title='Ram' alt='Ram'>";
$a[20] = "<img class='unit u18' src='img/x.gif' title='Catapult' alt='Catapult'>";
$a[21] = "<img class='unit u19' src='img/x.gif' title='Chief' alt='Chief'>";
$a[22] = "<img class='unit u20' src='img/x.gif' title='Settler' alt='Settler'>";
$a[23] = "<img class='unit u21' src='img/x.gif' title='Phalanx' alt='Phalanx'>";
$a[24] = "<img class='unit u22' src='img/x.gif' title='Swordsman' alt='Swordsman'>";
$a[25] = "<img class='unit u23' src='img/x.gif' title='Pathfinder' alt='Pathfinder'>";
$a[26] = "<img class='unit u24' src='img/x.gif' title='Theutates Thunder' alt='Theutates Thunder'>";
$a[27] = "<img class='unit u25' src='img/x.gif' title='Druidrider' alt='Druidrider'>";
$a[28] = "<img class='unit u26' src='img/x.gif' title='Haeduan' alt='Haeduan'>";
$a[29] = "<img class='unit u27' src='img/x.gif' title='Ram' alt='Ram'>";
$a[30] = "<img class='unit u28' src='img/x.gif' title='Trebuchet' alt='Trebuchet'>";
$a[31] = "<img class='unit u29' src='img/x.gif' title='Chieftain' alt='Chieftain'>";
$a[32] = "<img class='unit u30' src='img/x.gif' title='Settler' alt='Settler'>";
$a[33] = "<img class='unit u31' src='img/x.gif' title='Rat' alt='Rat'>";
$a[34] = "<img class='unit u32' src='img/x.gif' title='Spider' alt='Spider'>";
$a[35] = "<img class='unit u33' src='img/x.gif' title='Snake' alt='Snake'>";
$a[36] = "<img class='unit u34' src='img/x.gif' title='Bat' alt='Bat'>";
$a[37] = "<img class='unit u35' src='img/x.gif' title='Wild Boar' alt='Wild Boar'>";
$a[38] = "<img class='unit u36' src='img/x.gif' title='Wolf' alt='Wolf'>";
$a[39] = "<img class='unit u37' src='img/x.gif' title='Bear' alt='Bear'>";
$a[40] = "<img class='unit u38' src='img/x.gif' title='Crocodile' alt='Crocodile'>";
$a[41] = "<img class='unit u39' src='img/x.gif' title='Tiger' alt='Tiger'>";
$a[42] = "<img class='unit u40' src='img/x.gif' title='Elephant' alt='Elephant'>";
$a[43] = "<img class='unit u41' src='img/x.gif' title='Pikeman' alt='Pikeman'>";
$a[44] = "<img class='unit u42' src='img/x.gif' title='Thorned Warrior' alt='Thorned Warrior'>";
$a[45] = "<img class='unit u43' src='img/x.gif' title='Guardsman' alt='Guardsman'>";
$a[46] = "<img class='unit u44' src='img/x.gif' title='Birds Of Prey' alt='Birds Of Prey'>";
$a[47] = "<img class='unit u45' src='img/x.gif' title='Axerider' alt='Axerider'>";
$a[48] = "<img class='unit u46' src='img/x.gif' title='Natarian Knight' alt='Natarian Knight'>";
$a[49] = "<img class='unit u47' src='img/x.gif' title='War Elephant' alt='War Elephant'>";
$a[50] = "<img class='unit u48' src='img/x.gif' title='Ballista' alt='Ballista'>";
$a[51] = "<img class='unit u49' src='img/x.gif' title='Natarian Emperor' alt='Natarian Emperor'>";
$a[52] = "<img class='unit u50' src='img/x.gif' title='Settler' alt='Settler'>";
$a[53] = "<img class='unit uhero' src='img/x.gif' title='Hero' alt='Hero'>";
$a[54] = "<img src='img/x.gif' class='r1' title='Lumber' alt='Lumber'>";
$a[55] = "<img src='img/x.gif' class='r2' title='Clay' alt='Clay'>";
$a[56] = "<img src='img/x.gif' class='r3' title='Iron' alt='Iron'>";
$a[57] = "<img src='img/x.gif' class='r4' title='Crop' alt='Crop'>";
$a[58] = "<img class='smiley aha' src='img/x.gif' alt='*aha*' title='*aha*'>";
$a[59] = "<img class='smiley angry' src='img/x.gif' alt='*angry*' title='*angry*'>";
$a[60] = "<img class='smiley cool' src='img/x.gif' alt='*cool*' title='*cool*'>";
$a[61] = "<img class='smiley cry' src='img/x.gif' alt='*cry*' title='*cry*'>";
$a[62] = "<img class='smiley cute' src='img/x.gif' alt='*cute*' title='*cute*'>";
$a[63] = "<img class='smiley depressed' src='img/x.gif' alt='*depressed*' title='*depressed*'>";
$a[64] = "<img class='smiley eek' src='img/x.gif' alt='*eek*' title='*eek*'>";
$a[65] = "<img class='smiley ehem' src='img/x.gif' alt='*ehem*' title='*ehem*'>";
$a[66] = "<img class='smiley emotional' src='img/x.gif' alt='*emotional*' title='*emotional*'>";
$a[67] = "<img class='smiley grin' src='img/x.gif' alt=':D' title=':D'>";
$a[68] = "<img class='smiley happy' src='img/x.gif' alt=':)' title=':)'>";
$a[69] = "<img class='smiley hit' src='img/x.gif' alt='*hit*' title='*hit*'>";
$a[70] = "<img class='smiley hmm' src='img/x.gif' alt='*hmm*' title='*hmm*'>";
$a[71] = "<img class='smiley hmpf' src='img/x.gif' alt='*hmpf*' title='*hmpf*'>";
$a[72] = "<img class='smiley hrhr' src='img/x.gif' alt='*hrhr*' title='*hrhr*'>";
$a[73] = "<img class='smiley huh' src='img/x.gif' alt='*huh*' title='*huh*'>";
$a[74] = "<img class='smiley lazy' src='img/x.gif' alt='*lazy*' title='*lazy*'>";
$a[75] = "<img class='smiley love' src='img/x.gif' alt='*love*' title='*love*'>";
$a[76] = "<img class='smiley nocomment' src='img/x.gif' alt='*nocomment*' title='*nocomment*'>";
$a[77] = "<img class='smiley noemotion' src='img/x.gif' alt='*noemotion*' title='*noemotion*'>";
$a[78] = "<img class='smiley notamused' src='img/x.gif' alt='*notamused*' title='*notamused*'>";
$a[79] = "<img class='smiley pout' src='img/x.gif' alt='*pout*' title='*pout*'>";
$a[80] = "<img class='smiley redface' src='img/x.gif' alt='*redface*' title='*redface*'>";
$a[81] = "<img class='smiley rolleyes' src='img/x.gif' alt='*rolleyes*' title='*rolleyes*'>";
$a[82] = "<img class='smiley sad' src='img/x.gif' alt=':(' title=':('>";
$a[83] = "<img class='smiley shy' src='img/x.gif' alt='*shy*' title='*shy*'>";
$a[84] = "<img class='smiley smile' src='img/x.gif' alt='*smile*' title='*smile*'>";
$a[85] = "<img class='smiley tongue' src='img/x.gif' alt='*tongue*' title='*tongue*'>";
$a[86] = "<img class='smiley veryangry' src='img/x.gif' alt='*veryangry*' title='*veryangry*'>";
$a[87] = "<img class='smiley veryhappy' src='img/x.gif' alt='*veryhappy*' title='*veryhappy*'>";
$a[88] = "<img class='smiley wink' src='img/x.gif' alt=';)' title=';)'>";
$a[89] = "$1";
$a[90] = "$1";
$a[91] = "$1";
$a[92] = "$1";

$replace= array();
$replace[0] = "<b>$1</b>";
$replace[1] = "<i>$1</i>";
$replace[2] = "<u>$1</u>";
$replace[3] = "<img class='unit u1' src='img/x.gif' title='Legionnaire' alt='Legionnaire'>";
$replace[4] = "<img class='unit u2' src='img/x.gif' title='Praetorian' alt='Praetorian'>";
$replace[5] = "<img class='unit u3' src='img/x.gif' title='Imperian' alt='Imperian'>";
$replace[6] = "<img class='unit u4' src='img/x.gif' title='Equites Legati' alt='Equites Legati'>";
$replace[7] = "<img class='unit u5' src='img/x.gif' title='Equites Imperatoris' alt='Equites Imperatoris'>";
$replace[8] = "<img class='unit u6' src='img/x.gif' title='Equites Caesaris' alt='Equites Caesaris'>";
$replace[9] = "<img class='unit u7' src='img/x.gif' title='Battering Ram' alt='Battering Ram'>";
$replace[10] = "<img class='unit u8' src='img/x.gif' title='Fire Catapult' alt='Fire Catapult'>";
$replace[11] = "<img class='unit u9' src='img/x.gif' title='Senator' alt='Senator'>";
$replace[12] = "<img class='unit u10' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[13] = "<img class='unit u11' src='img/x.gif' title='Clubswinger' alt='Clubswinger'>";
$replace[14] = "<img class='unit u12' src='img/x.gif' title='Spearman' alt='Spearman'>";
$replace[15] = "<img class='unit u13' src='img/x.gif' title='Axeman' alt='Axeman'>";
$replace[16] = "<img class='unit u14' src='img/x.gif' title='Scout' alt='Scout'>";
$replace[17] = "<img class='unit u15' src='img/x.gif' title='Paladin' alt='Paladin'>";
$replace[18] = "<img class='unit u16' src='img/x.gif' title='Teutonic Knight' alt='Teutonic Knight'>";
$replace[19] = "<img class='unit u17' src='img/x.gif' title='Ram' alt='Ram'>";
$replace[20] = "<img class='unit u18' src='img/x.gif' title='Catapult' alt='Catapult'>";
$replace[21] = "<img class='unit u19' src='img/x.gif' title='Chief' alt='Chief'>";
$replace[22] = "<img class='unit u20' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[23] = "<img class='unit u21' src='img/x.gif' title='Phalanx' alt='Phalanx'>";
$replace[24] = "<img class='unit u22' src='img/x.gif' title='Swordsman' alt='Swordsman'>";
$replace[25] = "<img class='unit u23' src='img/x.gif' title='Pathfinder' alt='Pathfinder'>";
$replace[26] = "<img class='unit u24' src='img/x.gif' title='Theutates Thunder' alt='Theutates Thunder'>";
$replace[27] = "<img class='unit u25' src='img/x.gif' title='Druidrider' alt='Druidrider'>";
$replace[28] = "<img class='unit u26' src='img/x.gif' title='Haeduan' alt='Haeduan'>";
$replace[29] = "<img class='unit u27' src='img/x.gif' title='Ram' alt='Ram'>";
$replace[30] = "<img class='unit u28' src='img/x.gif' title='Trebuchet' alt='Trebuchet'>";
$replace[31] = "<img class='unit u29' src='img/x.gif' title='Chieftain' alt='Chieftain'>";
$replace[32] = "<img class='unit u30' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[33] = "<img class='unit u31' src='img/x.gif' title='Rat' alt='Rat'>";
$replace[34] = "<img class='unit u32' src='img/x.gif' title='Spider' alt='Spider'>";
$replace[35] = "<img class='unit u33' src='img/x.gif' title='Snake' alt='Snake'>";
$replace[36] = "<img class='unit u34' src='img/x.gif' title='Bat' alt='Bat'>";
$replace[37] = "<img class='unit u35' src='img/x.gif' title='Wild Boar' alt='Wild Boar'>";
$replace[38] = "<img class='unit u36' src='img/x.gif' title='Wolf' alt='Wolf'>";
$replace[39] = "<img class='unit u37' src='img/x.gif' title='Bear' alt='Bear'>";
$replace[40] = "<img class='unit u38' src='img/x.gif' title='Crocodile' alt='Crocodile'>";
$replace[41] = "<img class='unit u39' src='img/x.gif' title='Tiger' alt='Tiger'>";
$replace[42] = "<img class='unit u40' src='img/x.gif' title='Elephant' alt='Elephant'>";
$replace[43] = "<img class='unit u41' src='img/x.gif' title='Pikeman' alt='Pikeman'>";
$replace[44] = "<img class='unit u42' src='img/x.gif' title='Thorned Warrior' alt='Thorned Warrior'>";
$replace[45] = "<img class='unit u43' src='img/x.gif' title='Guardsman' alt='Guardsman'>";
$replace[46] = "<img class='unit u44' src='img/x.gif' title='Birds Of Prey' alt='Birds Of Prey'>";
$replace[47] = "<img class='unit u45' src='img/x.gif' title='Axerider' alt='Axerider'>";
$replace[48] = "<img class='unit u46' src='img/x.gif' title='Natarian Knight' alt='Natarian Knight'>";
$replace[49] = "<img class='unit u47' src='img/x.gif' title='War Elephant' alt='War Elephant'>";
$replace[50] = "<img class='unit u48' src='img/x.gif' title='Ballista' alt='Ballista'>";
$replace[51] = "<img class='unit u49' src='img/x.gif' title='Natarian Emperor' alt='Natarian Emperor'>";
$replace[52] = "<img class='unit u50' src='img/x.gif' title='Settler' alt='Settler'>";
$replace[53] = "<img class='unit uhero' src='img/x.gif' title='Hero' alt='Hero'>";
$replace[54] = "<img src='img/x.gif' class='r1' title='Lumber' alt='Lumber'>";
$replace[55] = "<img src='img/x.gif' class='r2' title='Clay' alt='Clay'>";
$replace[56] = "<img src='img/x.gif' class='r3' title='Iron' alt='Iron'>";
$replace[57] = "<img src='img/x.gif' class='r4' title='Crop' alt='Crop'>";
$replace[58] = "<img class='smiley aha' src='img/x.gif' alt='*aha*' title='*aha*'>";
$replace[59] = "<img class='smiley angry' src='img/x.gif' alt='*angry*' title='*angry*'>";
$replace[60] = "<img class='smiley cool' src='img/x.gif' alt='*cool*' title='*cool*'>";
$replace[61] = "<img class='smiley cry' src='img/x.gif' alt='*cry*' title='*cry*'>";
$replace[62] = "<img class='smiley cute' src='img/x.gif' alt='*cute*' title='*cute*'>";
$replace[63] = "<img class='smiley depressed' src='img/x.gif' alt='*depressed*' title='*depressed*'>";
$replace[64] = "<img class='smiley eek' src='img/x.gif' alt='*eek*' title='*eek*'>";
$replace[65] = "<img class='smiley ehem' src='img/x.gif' alt='*ehem*' title='*ehem*'>";
$replace[66] = "<img class='smiley emotional' src='img/x.gif' alt='*emotional*' title='*emotional*'>";
$replace[67] = "<img class='smiley grin' src='img/x.gif' alt=':D' title=':D'>";
$replace[68] = "<img class='smiley happy' src='img/x.gif' alt=':)' title=':)'>";
$replace[69] = "<img class='smiley hit' src='img/x.gif' alt='*hit*' title='*hit*'>";
$replace[70] = "<img class='smiley hmm' src='img/x.gif' alt='*hmm*' title='*hmm*'>";
$replace[71] = "<img class='smiley hmpf' src='img/x.gif' alt='*hmpf*' title='*hmpf*'>";
$replace[72] = "<img class='smiley hrhr' src='img/x.gif' alt='*hrhr*' title='*hrhr*'>";
$replace[73] = "<img class='smiley huh' src='img/x.gif' alt='*huh*' title='*huh*'>";
$replace[74] = "<img class='smiley lazy' src='img/x.gif' alt='*lazy*' title='*lazy*'>";
$replace[75] = "<img class='smiley love' src='img/x.gif' alt='*love*' title='*love*'>";
$replace[76] = "<img class='smiley nocomment' src='img/x.gif' alt='*nocomment*' title='*nocomment*'>";
$replace[77] = "<img class='smiley noemotion' src='img/x.gif' alt='*noemotion*' title='*noemotion*'>";
$replace[78] = "<img class='smiley notamused' src='img/x.gif' alt='*notamused*' title='*notamused*'>";
$replace[79] = "<img class='smiley pout' src='img/x.gif' alt='*pout*' title='*pout*'>";
$replace[80] = "<img class='smiley redface' src='img/x.gif' alt='*redface*' title='*redface*'>";
$replace[81] = "<img class='smiley rolleyes' src='img/x.gif' alt='*rolleyes*' title='*rolleyes*'>";
$replace[82] = "<img class='smiley sad' src='img/x.gif' alt=':(' title=':('>";
$replace[83] = "<img class='smiley shy' src='img/x.gif' alt='*shy*' title='*shy*'>";
$replace[84] = "<img class='smiley smile' src='img/x.gif' alt='*smile*' title='*smile*'>";
$replace[85] = "<img class='smiley tongue' src='img/x.gif' alt='*tongue*' title='*tongue*'>";
$replace[86] = "<img class='smiley veryangry' src='img/x.gif' alt='*veryangry*' title='*veryangry*'>";
$replace[87] = "<img class='smiley veryhappy' src='img/x.gif' alt='*veryhappy*' title='*veryhappy*'>";
$replace[88] = "<img class='smiley wink' src='img/x.gif' alt=';)' title=';)'>";
$bbcoded1 = preg_replace($pattern, $a, $input);
$aname = $database->getAllianceID($bbcoded1);
if($aname != ""){
$replace[89] = "<a href=allianz.php?aid=$aname>$1</a>";
}else{
$replace[89] = "alliance not exist";
}
$bbcoded1 = preg_replace($pattern, $a, $input);
$uname = $database->getUserField($bbcoded1, "id", 1);
if($uname != ""){
$replace[90] = "<a href=spieler.php?uid=$uname>$1</a>";
}else{
$replace[90] = "player not exist";
}
$bbcoded1 = preg_replace($pattern, $a, $input);
$report = count($database->getNotice4($bbcoded1));
if($report > 0){
$topic = $database->getNotice2($bbcoded1,"topic");
$replace[91] = "<a href=beriche.php?id=$1>$topic</a>";
}else{
$replace[91] = "report not exist";
}
$bbcoded1 = preg_replace($pattern, $a, $input);
for($x = -400; $x < 401; $x++) {
if(preg_match('/^'.$x.'/', $bbcoded1)){
$xx = 1;
$cx = $x;
}
}
for($y = -400; $y < 401; $y++) {
if(preg_match('/'.$y.'$/', $bbcoded1)){
$yy = 1;
$cy = $y;
}
}
if(preg_match('/|/', $bbcoded1) && $xx == 1 && $yy == 1){
$wref = $database->getVilWref($cx,$cy);
$cwref = $generator->getMapCheck($wref);
if($wref != ""){
$wref1 = $database->getVillageType3($wref);
if($wref1['oasistype'] == 0 && $wref1['occupied'] == 1){
$vname = $database->getVillageField($wref,"name");
}else if($wref1['oasistype'] == 0 && $wref1['occupied'] == 0){
$vname = "Abandoned valley";
}else if($wref1['oasistype'] != 0 && $wref1['occupied'] == 1){
$vname = "Occupied Oasis";
}else if($wref1['oasistype'] == 0 && $wref1['occupied'] == 0){
$vname = "Unoccupied Oasis";
}
$replace[92] = "<a href=karte.php?d=$wref&c=$cwref>$vname($cx|$cy)</a>";
}
}
$bbcoded = preg_replace($pattern, $replace, $input);

?>
\ No newline at end of file
diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 37ac4268..cd09eca2 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -930,6 +930,13 @@
                 $dbarray = mysql_fetch_array($result);
                 return $dbarray['oasistype'];
             }
+			
+			function getVillageType3($wref) {
+                $q = "SELECT * FROM " . TB_PREFIX . "wdata where id = $wref";
+                $result = mysql_query($q, $this->connection);
+                $dbarray = mysql_fetch_array($result);
+                return $dbarray;
+            }
 
 			function getFLData($id) {
                 $q = "SELECT * FROM " . TB_PREFIX . "farmlist where id = $id";
@@ -1609,6 +1616,12 @@
                 return $this->mysql_fetch_all($result);
             }
 			
+            function getNotice4($id) {
+                $q = "SELECT * FROM " . TB_PREFIX . "ndata where id = $id ORDER BY time DESC";
+                $result = mysql_query($q, $this->connection);
+                return $this->mysql_fetch_all($result);
+            }
+			
             function createTradeRoute($uid,$wid,$from,$r1,$r2,$r3,$r4,$start,$deliveries,$merchant,$time) {
 			$x = "UPDATE " . TB_PREFIX . "users SET gold = gold - 2 WHERE id = ".$uid."";
                 mysql_query($x, $this->connection);
diff --git a/Templates/Message/write.tpl b/Templates/Message/write.tpl
index b4bdaa70..c8246438 100644
--- a/Templates/Message/write.tpl
+++ b/Templates/Message/write.tpl
@@ -67,7 +67,7 @@ echo "re1:".$message->reply['topic']; }} ?>" maxlength="35" onkeyup="copyElement
 					<a href="javascript:void(0);" bbType="d" bbTag="u" ><div title="underline" alt="underline" class="bbButton bbUnderscore"></div></a>
 					<a href="javascript:void(0);" bbType="d" bbTag="alliance" ><div title="alliance" alt="alliance" class="bbButton bbAlliance"></div></a>
 					<a href="javascript:void(0);" bbType="d" bbTag="player" ><div title="player" alt="player" class="bbButton bbPlayer"></div></a>
-					<a href="javascript:void(0);" bbType="d" bbTag="x|y" ><div title="coordinates" alt="coordinates" class="bbButton bbCoordinate"></div></a>
+					<a href="javascript:void(0);" bbType="d" bbTag="coor" ><div title="coordinates" alt="coordinates" class="bbButton bbCoordinate"></div></a>
 					<a href="javascript:void(0);" bbType="d" bbTag="report" ><div title="report" alt="report" class="bbButton bbReport"></div></a>
 					<a href="javascript:void(0);" bbWin="resources" id="message_resourceButton"><div title="resources" alt="resources" class="bbButton bbResource"></div></a>
 					<a href="javascript:void(0);" bbWin="smilies" id="message_smilieButton"><div title="smilies" alt="smilies" class="bbButton bbSmilie"></div></a>
diff --git a/allianz.php b/allianz.php
index 4ad46616..8c0f3f59 100644
--- a/allianz.php
+++ b/allianz.php
@@ -33,11 +33,7 @@ if(isset($_GET['newdid'])) {
 	   if(isset($_GET['s'])){
 		$automation->isWinner();
 		}
-if(isset($_GET['aname'])){
-$aname = $database->getAllianceID($_GET['aname']);
-$_GET['aid'] = $aname;
-header("Location: ".$_SERVER['PHP_SELF']."?aid=".$aname);
-}
+
 if(isset($_GET['fid'])){
 $fid = $_GET['fid'];
 $forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid."");
diff --git a/spieler.php b/spieler.php
index 813d3e33..3696668b 100644
--- a/spieler.php
+++ b/spieler.php
@@ -30,13 +30,6 @@ else {
 if(isset($_GET['s'])){
 $automation->isWinner();
 }
-if(isset($_GET['uname'])){
-$uname = $database->getUserField($_GET['uname'], "id", 1);
-if($uname == ""){
-$uname = $session->uid;
-}
-header("Location: ".$_SERVER['PHP_SELF']."?uid=".$uname);
-}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>