diff --git a/GameEngine/BBCode.php b/GameEngine/BBCode.php
index 28d3b6af..805f450c 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] = "/\[l\]/";
$pattern[55] = "/\[cl\]/";
$pattern[56] = "/\[i\]/";
$pattern[57] = "/\[c\]/";
$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[89], $a[89], $input);
$bbcoded1 = preg_replace('/\[\/alliance\](.*?)\[\/message\]/is', '', $input);
$bbcoded1 = preg_replace('/\[message\](.*?)\[alliance\]/is', '', $bbcoded1);
$aname = $database->getAllianceID($bbcoded1);
if($aname != ""){
$replace[89] = "<a href=allianz.php?aid=$aname>$1</a>";
}else{
$replace[89] = "alliance not exist";
}
$abc = "/abcdef/";
$ab = "abcdef";
$bbcoded2 = preg_replace($pattern[90], $a[90], $input);
$bbcoded2 = preg_replace('/\[\/player\](.*?)\[\/message\]/is', '', $input);
$bbcoded2 = preg_replace('/\[message\](.*?)\[player\]/is', '', $bbcoded2);
$uname = $database->getUserField($bbcoded2, "id", 1);
if($uname != ""){
$replace[90] = "<a href=spieler.php?uid=$uname>$1</a>";
}else{
$replace[90] = "player not exist";
}
$bbcoded3 = preg_replace($pattern[91], $a[91], $input);
$bbcoded3 = preg_replace('/\[\/report\](.*?)\[\/message\]/is', '', $input);
$bbcoded3 = preg_replace('/\[message\](.*?)\[report\]/is', '', $bbcoded3);
$report = count($database->getNotice4($bbcoded3));
if($report > 0){
$topic = $database->getNotice2($bbcoded3,"topic");
$replace[91] = "<a href=berichte.php?id=$1>$topic</a>";
}else{
$replace[91] = "report not exist";
}
$bbcoded4 = preg_replace($pattern[92], $a[92], $input);
$bbcoded4 = preg_replace('/\[\/coor\](.*?)\[\/message\]/is', '', $input);
$bbcoded4 = preg_replace('/\[message\](.*?)\[coor\]/is', '', $bbcoded4);
for($x = -400; $x < 401; $x++) {
if(preg_match('/^'.$x.'/', $bbcoded4)){
$xx = 1;
$cx = $x;
}
}
for($y = 0; $y < 401; $y++) {
if(preg_match('/-'.$y.'$/', $bbcoded4)){
$yy = 1;
$cy = $y*(-1);
}else if(preg_match('/'.$y.'$/', $bbcoded4)){
$yy = 1;
$cy = $y;
}
}
if(preg_match('/|/', $bbcoded4) && $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>";
}
}
if(preg_match('/'.$a[89].'/', $bbcoded2))
echo $bbcoded2;
$input = preg_replace('/\[message\]/', '', $input);
$input = preg_replace('/\[\/message\]/', '', $input);
$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] = "/\[l\]/";
$pattern[55] = "/\[cl\]/";
$pattern[56] = "/\[i\]/";
$pattern[57] = "/\[c\]/";
$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[89], $a[89], $input);
$bbcoded1 = preg_replace('/\[\/alliance\](.*?)\[\/message\]/is', '', $input);
$bbcoded1 = preg_replace('/\[message\](.*?)\[alliance\]/is', '', $bbcoded1);
$aname = $database->getAllianceID($bbcoded1);
if($aname != ""){
$replace[89] = "<a href=allianz.php?aid=$aname>$1</a>";
}else{
$replace[89] = "alliance not exist";
}
$abc = "/abcdef/";
$ab = "abcdef";
$bbcoded2 = preg_replace($pattern[90], $a[90], $input);
$bbcoded2 = preg_replace('/\[\/player\](.*?)\[\/message\]/is', '', $input);
$bbcoded2 = preg_replace('/\[message\](.*?)\[player\]/is', '', $bbcoded2);
$uname = $database->getUserField($bbcoded2, "id", 1);
if($uname != ""){
$replace[90] = "<a href=spieler.php?uid=$uname>$1</a>";
}else{
$replace[90] = "player not exist";
}
$bbcoded3 = preg_replace($pattern[91], $a[91], $input);
$bbcoded3 = preg_replace('/\[\/report\](.*?)\[\/message\]/is', '', $input);
$bbcoded3 = preg_replace('/\[message\](.*?)\[report\]/is', '', $bbcoded3);
$report = count($database->getNotice4($bbcoded3));
if($report > 0){
$topic = $database->getNotice2($bbcoded3,"topic");
$replace[91] = "<a href=berichte.php?id=$1>$topic</a>";
}else{
$replace[91] = "report not exist";
}
$bbcoded4 = preg_replace($pattern[92], $a[92], $input);
$bbcoded4 = preg_replace('/\[\/coor\](.*?)\[\/message\]/is', '', $input);
$bbcoded4 = preg_replace('/\[message\](.*?)\[coor\]/is', '', $bbcoded4);
for($x = -400; $x < 401; $x++) {
if(preg_match('/^'.$x.'/', $bbcoded4)){
$xx = 1;
$cx = $x;
}
}
for($y = 0; $y < 401; $y++) {
if(preg_match('/-'.$y.'$/', $bbcoded4)){
$yy = 1;
$cy = $y*(-1);
}else if(preg_match('/'.$y.'$/', $bbcoded4)){
$yy = 1;
$cy = $y;
}
}
if(preg_match('/|/', $bbcoded4) && $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>";
}
}
if(preg_match('/'.$a[89].'/', $bbcoded2))
echo $bbcoded2;
$input = preg_replace('/\[message\]/', '', $input);
$input = preg_replace('/\[\/message\]/', '', $input);
$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 0e9ed75c..7d0bcb6d 100644
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -2016,19 +2016,6 @@ class MYSQL_DB {
 		return $row[0] + $row2[0] + $row3[0];
 	}
 
-	/***************************
-	Function to retrieve movement of village
-	Type 0: Send Resource
-	Type 1: Send Merchant
-	Type 2: Return Resource
-	Type 3: Attack
-	Type 4: Return
-	Type 5: Settler
-	Type 6: Bounty        Type 7: Reinf.
-	Mode 0: Send/Out
-	Mode 1: Recieve/In
-	References: Type, Village, Mode
-	***************************/
 	function getMovement($type, $village, $mode) {
 		$time = time();
 		if(!$mode) {
@@ -2061,6 +2048,9 @@ class MYSQL_DB {
 			case 7:
 				$q = "SELECT * FROM " . TB_PREFIX . "movement where " . TB_PREFIX . "movement." . $where . " = $village and sort_type = 4 and ref = 0 and proc = 0 ORDER BY endtime ASC";
 				break;
+			case 8:
+				$q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 and " . TB_PREFIX . "attacks.attack_type = 1 ORDER BY endtime ASC";
+				break;
 			case 34:
 				$q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 or " . TB_PREFIX . "movement." . $where . " = $village and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 4 ORDER BY endtime ASC";
 				break;
diff --git a/GameEngine/Message.php b/GameEngine/Message.php
index 3a4247d5..9efb52f2 100644
--- a/GameEngine/Message.php
+++ b/GameEngine/Message.php
@@ -358,7 +358,7 @@ class Message {
 		$welcomemsg = preg_replace("'%USER%'", $username, $welcomemsg);
 		$welcomemsg = preg_replace("'%START%'", date("y.m.d", COMMENCE), $welcomemsg);
 		$welcomemsg = preg_replace("'%TIME%'", date("H:i", COMMENCE), $welcomemsg);
-		$welcomemsg = preg_replace("'%PLAYERS%'", $database->countUser()-4, $welcomemsg);
+		$welcomemsg = preg_replace("'%PLAYERS%'", $database->countUser(), $welcomemsg);
 		$welcomemsg = preg_replace("'%ALLI%'", $database->countAlli(), $welcomemsg);
 		$welcomemsg = preg_replace("'%SERVER_NAME%'", SERVER_NAME, $welcomemsg);
 		$welcomemsg = "[message]".$welcomemsg."[/message]";
diff --git a/Templates/Alliance/Forum/forum_1.tpl b/Templates/Alliance/Forum/forum_1.tpl
index 2aeb74fb..84033b47 100644
--- a/Templates/Alliance/Forum/forum_1.tpl
+++ b/Templates/Alliance/Forum/forum_1.tpl
@@ -55,16 +55,16 @@ function showCheckList() {
 			newTD1.className = 'ally';
 			newTD2.className = 'tag';
 			newTD3.className = 'ad';
-			newTD1.innerHTML = html_input_1 + 'id="allys_by_id_'+num_fields+'" class="text" maxlength="8" name="allys_by_id['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'allys\')">';
-			newTD2.innerHTML = html_input_1 + 'id="allys_by_name_'+num_fields+'" class="text" maxlength="8" name="allys_by_name['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'allys\')">';
+			newTD1.innerHTML = html_input_1 + 'id="allys_by_id_'+num_fields+'" class="text" maxlength="15" name="allys_by_id['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'allys\')">';
+			newTD2.innerHTML = html_input_1 + 'id="allys_by_name_'+num_fields+'" class="text" maxlength="15" name="allys_by_name['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'allys\')">';
 		}
 
 		if(element_id == 'user_list') {
 			newTD1.className = 'id';
 			newTD2.className = 'pla';
 			newTD3.className = 'ad';
-			newTD1.innerHTML = html_input_1 + 'id="users_by_id_'+num_fields+'" class="text" maxlength="8" name="users_by_id['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'users\')">';
-			newTD2.innerHTML = html_input_1 + 'id="users_by_name_'+num_fields+'" class="text" maxlength="15" name="users_by_name['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'users\')">';
+			newTD1.innerHTML = html_input_1 + 'id="users_by_id_'+num_fields+'" class="text" maxlength="15" name="users_by_id['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'users\')">';
+			newTD2.innerHTML = html_input_1 + 'id="users_by_name_'+num_fields+'" class="text" maxlength="50" name="users_by_name['+num_fields+']" onkeyup="checkInputs('+num_fields+',\'users\')">';
 		}
 
 		newTD3.innerHTML = '<img class="add" src="img/x.gif" title="add" alt="add" onclick="addRow(\''+element_id+'\')">';
@@ -139,10 +139,10 @@ function showCheckList() {
 	</thead><tbody>
 	<tr>
 		<td class="ally">
-			<input class="text" type="text" id="allys_by_id_0" maxlength="8" name="allys_by_id[0]" onkeyup="checkInputs(0,'allys');" />
+			<input class="text" type="text" id="allys_by_id_0" maxlength="15" name="allys_by_id[0]" onkeyup="checkInputs(0,'allys');" />
 		</td>
 		<td class="tag">
-			<input class="text" type="text" id="allys_by_name_0" maxlength="8" name="allys_by_name[0]" onkeyup="checkInputs(0,'allys');" />
+			<input class="text" type="text" id="allys_by_name_0" maxlength="15" name="allys_by_name[0]" onkeyup="checkInputs(0,'allys');" />
 		</td>
 		<td class="ad">
 
@@ -162,11 +162,11 @@ function showCheckList() {
 	</thead><tbody>
 	<tr>
 		<td class="id">
-			<input class="text" type="text" id="users_by_id_0" maxlength="8" name="users_by_id[0]" onkeyup="checkInputs(0,'users');" />
+			<input class="text" type="text" id="users_by_id_0" maxlength="15" name="users_by_id[0]" onkeyup="checkInputs(0,'users');" />
 		</td>
 
 		<td class="pla">
-			<input class="text" type="text" id="users_by_name_0" maxlength="15" name="users_by_name[0]" onkeyup="checkInputs(0,'users');" />
+			<input class="text" type="text" id="users_by_name_0" maxlength="50" name="users_by_name[0]" onkeyup="checkInputs(0,'users');" />
 		</td>
 		<td class="ad">
 			<img class="add" src="img/x.gif" title="add" alt="add" onclick="addRow('user_list')" />
diff --git a/Templates/movement.tpl b/Templates/movement.tpl
index 6df80feb..ecdd4b71 100644
--- a/Templates/movement.tpl
+++ b/Templates/movement.tpl
@@ -9,16 +9,28 @@
 ##                                                                             ##
 #################################################################################
 
-$aantal=(count($database->getMovement(4,$village->wid,1))+count($database->getMovement(4,$village->wid,0))+count($database->getMovement(3,$village->wid,1))+count($database->getMovement(3,$village->wid,0))+count($database->getMovement(7,$village->wid,1)));
+$aantal = (count($database->getMovement(4,$village->wid,1))+count($database->getMovement(4,$village->wid,0))+count($database->getMovement(3,$village->wid,1))+count($database->getMovement(3,$village->wid,0))+count($database->getMovement(7,$village->wid,1))-count($database->getMovement(8,$village->wid,1)));
+
 if($aantal > 0){
 	echo	'<table id="movements" cellpadding="1" cellspacing="1"><thead><tr><th colspan="3">'.TROOP_MOVEMENTS.'</th></tr></thead><tbody>';
 }
 
 $NextArrival = array();
+$NextArrival1 = array();
+$NextArrival2 = array();
+$NextArrival3 = array();
 
-/* Units coming back from Reinf,attack,raid */
-$aantal = count($database->getMovement(4,$village->wid,1));
+/* Units coming back from Reinf,attack,raid,evasion or reinf to my town */
+$aantal = count($database->getMovement(4,$village->wid,1))+count($database->getMovement(7,$village->wid,1));
 $aantal2 = $database->getMovement(4,$village->wid,1);
+$aantal3 = $database->getMovement(7,$village->wid,1);
+$aantal4 = count($database->getMovement(3,$village->wid,1));
+$lala = $aantal4;
+$aantal5 = $database->getMovement(3,$village->wid,1);
+for($i=0;$i<$aantal4;$i++){
+	if(($aantal5[$i]['attack_type']==1) or ($aantal5[$i]['attack_type']==3) or ($aantal5[$i]['attack_type']==4)) { $lala -= 1; }
+}
+$aantal = $aantal+$lala;
 if($aantal > 0){
 	foreach($aantal2 as $receive) {
 		$action = 'def1';
@@ -27,22 +39,22 @@ if($aantal > 0){
 		$short = ''.ARRIVING_REINF_TROOPS_SHORT.'';
 		$NextArrival[] = $receive['endtime'];
 	}
-	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
-	<td><div class="mov"><span class="'.$aclass.'">'.$aantal.'&nbsp;'.$short.'</span></div><div class="dur_r">in&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat(min($NextArrival)-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
-	$timer += 1;
-}
-
-/* Units coming back from evasion */
-$aantal = count($database->getMovement(7,$village->wid,1));
-$aantal2 = $database->getMovement(7,$village->wid,1);
-if($aantal > 0){
-	foreach($aantal2 as $receive) {
+	foreach($aantal3 as $receive) {
 		$action = 'def1';
 		$aclass = 'd1';
 		$title = ''.ARRIVING_REINF_TROOPS.'';
 		$short = ''.ARRIVING_REINF_TROOPS_SHORT.'';
 		$NextArrival[] = $receive['endtime'];
 	}
+	foreach($aantal5 as $receive) {
+	if ($receive['attack_type'] == 2) {
+		$action = 'def1';
+		$aclass = 'd1';
+		$title = ''.OWN_REINFORCING_TROOPS.'';
+		$short = ''.ARRIVING_REINF_TROOPS_SHORT.'';
+		$NextArrival[] = $receive['endtime'];
+	}
+	}
 	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
 	<td><div class="mov"><span class="'.$aclass.'">'.$aantal.'&nbsp;'.$short.'</span></div><div class="dur_r">in&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat(min($NextArrival)-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
 	$timer += 1;
@@ -50,20 +62,22 @@ if($aantal > 0){
 
 /* attack/raid on you! */
 $aantal = count($database->getMovement(3,$village->wid,1));
+$aantal1 = count($database->getMovement(3,$village->wid,1));
 $aantal2 = $database->getMovement(3,$village->wid,1);
-for($i=0;$i<$aantal;$i++){
+for($i=0;$i<$aantal1;$i++){
 	if($aantal2[$i]['attack_type'] == 2) { $aantal -= 1; }
 	if($aantal2[$i]['attack_type'] == 1) { $aantal -= 1; }
 }
+
 if($aantal > 0){
-	if(!empty($NextArrival)) { reset($NextArrival); }
+	if(!empty($NextArrival1)) { reset($NextArrival1); }
 	foreach($aantal2 as $receive) {
-		if ($receive['attack_type'] != 2) {
+		if ($receive['attack_type'] != 2 && $receive['attack_type'] != 1) {
 			$action = 'att1';
 			$aclass = 'a1';
 			$title = ''.OWN_ATTACKING_TROOPS.'';
 			$short = ''.ATTACK.'';
-			$NextArrival[] = $receive['endtime'];
+			$NextArrival1[] = $receive['endtime'];
 		}
 	}
 	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
@@ -73,19 +87,20 @@ if($aantal > 0){
 
 /* on attack, raid */
 $aantal = count($database->getMovement(3,$village->wid,0));
+$aantal1 = count($database->getMovement(3,$village->wid,0));
 $aantal2 = $database->getMovement(3,$village->wid,0);
-for($i=0;$i<$aantal;$i++){
+for($i=0;$i<$aantal1;$i++){
 	if($aantal2[$i]['attack_type'] == 2) { $aantal -= 1; }
 }
 if($aantal > 0){
-	if(!empty($NextArrival)) { reset($NextArrival); }
+	if(!empty($NextArrival2)) { reset($NextArrival2); }
 		foreach($aantal2 as $receive) {
 			if ($receive['attack_type'] != 2) {
 				$action = 'att2';
 				$aclass = 'a2';
 				$title = ''.OWN_ATTACKING_TROOPS.'';
 				$short = ''.ATTACK.'';
-				$NextArrival[] = $receive['endtime'];
+				$NextArrival2[] = $receive['endtime'];
 			}
 		}
 	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
@@ -101,63 +116,17 @@ for($i=0;$i<$aantal;$i++){
 	if(($aantal2[$i]['attack_type']==1) or ($aantal2[$i]['attack_type']==3) or ($aantal2[$i]['attack_type']==4)) { $lala -= 1; }
 }
 if($lala > 0){
-	if(!empty($NextArrival)) { reset($NextArrival); }
+	if(!empty($NextArrival3)) { reset($NextArrival3); }
 		foreach($aantal2 as $receive) {
 			if ($receive['attack_type'] == 2) {
 				$action = 'def2';
 				$aclass = 'd2';
 				$title = ''.OWN_REINFORCING_TROOPS.'';
 				$short = ''.ARRIVING_REINF_TROOPS_SHORT.'';
-				$NextArrival[] = $receive['endtime'];
+				$NextArrival3[] = $receive['endtime'];
 			}
 		}
 	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
 	<td><div class="mov"><span class="'.$aclass.'">'.$lala.'&nbsp;'.$short.'</span></div><div class="dur_r">in&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat(min($NextArrival)-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
 	$timer += 1;
-}
-
-/* Units send to reinf. (to my town) */
-$aantal = count($database->getMovement(3,$village->wid,1)); $lala=$aantal;
-$aantal2 = $database->getMovement(3,$village->wid,1);
-for($i=0;$i<$aantal;$i++){
-	if(($aantal2[$i]['attack_type']==1) or ($aantal2[$i]['attack_type']==3) or ($aantal2[$i]['attack_type']==4)) { $lala -= 1; }
-}
-if($lala > 0){
-	if(!empty($NextArrival)) { reset($NextArrival); }
-		foreach($aantal2 as $receive) {
-			if ($receive['attack_type'] == 2) {
-				$action = 'def1';
-				$aclass = 'd1';
-				$title = ''.OWN_REINFORCING_TROOPS.'';
-				$short = ''.ARRIVING_REINF_TROOPS_SHORT.'';
-				$NextArrival[] = $receive['endtime'];
-			}
-		}
-	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&raquo;</span></td>
-	<td><div class="mov"><span class="'.$aclass.'">'.$lala.'&nbsp;'.$short.'</span></div><div class="dur_r">in&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat(min($NextArrival)-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
-	$timer += 1;
-}
-
-/* Units coming back from ATTACK 
-$gettroops = $database->getMovement(3,$village->wid,1);
-for($i=0;$i<count($gettroops);$i++){
-	if($gettroops[$i]['attack_type'] == 1) { unset($gettroops[$i]); }
-}
-$aantal2 = array_values($gettroops);
-$aantal = count($aantal2);
-if($aantal > 0){
-	if(!empty($NextArrival)) { reset($NextArrival); }
-		foreach($aantal2 as $receive) {
-			$action = 'att1';
-			$aclass = 'a1';
-			$title = 'Incoming troops';
-			$short = 'Attack';
-			$NextArrival[] = $receive['endtime'];
-		}
-	echo '<tr><td class="typ"><a href="build.php?id=39"><img src="img/x.gif" class="'.$action.'" alt="'.$title.'" title="'.$title.'" /></a><span class="'.$aclass.'">&laquo;</span></td>
-	<td><div class="mov"><span class="'.$aclass.'">'.$aantal.'&nbsp;'.$short.'</span></div><div class="dur_r">in&nbsp;<span id="timer'.$timer.'">'.$generator->getTimeFormat(min($NextArrival)-time()).'</span>&nbsp;'.HOURS.'</div></div></td></tr>';
-	$timer += 1;
-}
-?>
-</tbody></table>
-*/
\ No newline at end of file
+}
\ No newline at end of file