diff --git a/GameEngine/BBCode.php b/GameEngine/BBCode.php
index ccc3efe8..28d3b6af 100644
--- a/GameEngine/BBCode.php
+++ b/GameEngine/BBCode.php
@@ -1 +1 @@
-$1";
$a[1] = "$1";
$a[2] = "$1";
$a[3] = "
";
$a[4] = "
";
$a[5] = "
";
$a[6] = "
";
$a[7] = "
";
$a[8] = "
";
$a[9] = "
";
$a[10] = "
";
$a[11] = "
";
$a[12] = "
";
$a[13] = "
";
$a[14] = "
";
$a[15] = "
";
$a[16] = "
";
$a[17] = "
";
$a[18] = "
";
$a[19] = "
";
$a[20] = "
";
$a[21] = "
";
$a[22] = "
";
$a[23] = "
";
$a[24] = "
";
$a[25] = "
";
$a[26] = "
";
$a[27] = "
";
$a[28] = "
";
$a[29] = "
";
$a[30] = "
";
$a[31] = "
";
$a[32] = "
";
$a[33] = "
";
$a[34] = "
";
$a[35] = "
";
$a[36] = "
";
$a[37] = "
";
$a[38] = "
";
$a[39] = "
";
$a[40] = "
";
$a[41] = "
";
$a[42] = "
";
$a[43] = "
";
$a[44] = "
";
$a[45] = "
";
$a[46] = "
";
$a[47] = "
";
$a[48] = "
";
$a[49] = "
";
$a[50] = "
";
$a[51] = "
";
$a[52] = "
";
$a[53] = "
";
$a[54] = "
";
$a[55] = "
";
$a[56] = "
";
$a[57] = "
";
$a[58] = "
";
$a[59] = "
";
$a[60] = "
";
$a[61] = "
";
$a[62] = "
";
$a[63] = "
";
$a[64] = "
";
$a[65] = "
";
$a[66] = "
";
$a[67] = "
";
$a[68] = "
";
$a[69] = "
";
$a[70] = "
";
$a[71] = "
";
$a[72] = "
";
$a[73] = "
";
$a[74] = "
";
$a[75] = "
";
$a[76] = "";
$a[77] = "
";
$a[78] = "
";
$a[79] = "
";
$a[80] = "
";
$a[81] = "
";
$a[82] = "
";
$a[83] = "
";
$a[84] = "
";
$a[85] = "
";
$a[86] = "
";
$a[87] = "
";
$a[88] = "
";
$a[89] = "$1";
$a[90] = "$1";
$a[91] = "$1";
$a[92] = "$1";
$replace= array();
$replace[0] = "$1";
$replace[1] = "$1";
$replace[2] = "$1";
$replace[3] = "
";
$replace[4] = "
";
$replace[5] = "
";
$replace[6] = "
";
$replace[7] = "
";
$replace[8] = "
";
$replace[9] = "
";
$replace[10] = "
";
$replace[11] = "
";
$replace[12] = "
";
$replace[13] = "
";
$replace[14] = "
";
$replace[15] = "
";
$replace[16] = "
";
$replace[17] = "
";
$replace[18] = "
";
$replace[19] = "
";
$replace[20] = "
";
$replace[21] = "
";
$replace[22] = "
";
$replace[23] = "
";
$replace[24] = "
";
$replace[25] = "
";
$replace[26] = "
";
$replace[27] = "
";
$replace[28] = "
";
$replace[29] = "
";
$replace[30] = "
";
$replace[31] = "
";
$replace[32] = "
";
$replace[33] = "
";
$replace[34] = "
";
$replace[35] = "
";
$replace[36] = "
";
$replace[37] = "
";
$replace[38] = "
";
$replace[39] = "
";
$replace[40] = "
";
$replace[41] = "
";
$replace[42] = "
";
$replace[43] = "
";
$replace[44] = "
";
$replace[45] = "
";
$replace[46] = "
";
$replace[47] = "
";
$replace[48] = "
";
$replace[49] = "
";
$replace[50] = "
";
$replace[51] = "
";
$replace[52] = "
";
$replace[53] = "
";
$replace[54] = "
";
$replace[55] = "
";
$replace[56] = "
";
$replace[57] = "
";
$replace[58] = "
";
$replace[59] = "
";
$replace[60] = "
";
$replace[61] = "
";
$replace[62] = "
";
$replace[63] = "
";
$replace[64] = "
";
$replace[65] = "
";
$replace[66] = "
";
$replace[67] = "
";
$replace[68] = "
";
$replace[69] = "
";
$replace[70] = "
";
$replace[71] = "
";
$replace[72] = "
";
$replace[73] = "
";
$replace[74] = "
";
$replace[75] = "
";
$replace[76] = "";
$replace[77] = "
";
$replace[78] = "
";
$replace[79] = "
";
$replace[80] = "
";
$replace[81] = "
";
$replace[82] = "
";
$replace[83] = "
";
$replace[84] = "
";
$replace[85] = "
";
$replace[86] = "
";
$replace[87] = "
";
$replace[88] = "
";
$bbcoded1 = preg_replace($pattern, $a, $input);
$aname = $database->getAllianceID($bbcoded1);
if($aname != ""){
$replace[89] = "$1";
}else{
$replace[89] = "alliance not exist";
}
$bbcoded1 = preg_replace($pattern, $a, $input);
$uname = $database->getUserField($bbcoded1, "id", 1);
if($uname != ""){
$replace[90] = "$1";
}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] = "$topic";
}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 = 0; $y < 401; $y++) {
if(preg_match('/-'.$y.'$/', $bbcoded1)){
$yy = 1;
$cy = $y*(-1);
}else 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] = "$vname($cx|$cy)";
}
}
$bbcoded = preg_replace($pattern, $replace, $input);
?>
\ No newline at end of file
+$1";
$a[1] = "$1";
$a[2] = "$1";
$a[3] = "
";
$a[4] = "
";
$a[5] = "
";
$a[6] = "
";
$a[7] = "
";
$a[8] = "
";
$a[9] = "
";
$a[10] = "
";
$a[11] = "
";
$a[12] = "
";
$a[13] = "
";
$a[14] = "
";
$a[15] = "
";
$a[16] = "
";
$a[17] = "
";
$a[18] = "
";
$a[19] = "
";
$a[20] = "
";
$a[21] = "
";
$a[22] = "
";
$a[23] = "
";
$a[24] = "
";
$a[25] = "
";
$a[26] = "
";
$a[27] = "
";
$a[28] = "
";
$a[29] = "
";
$a[30] = "
";
$a[31] = "
";
$a[32] = "
";
$a[33] = "
";
$a[34] = "
";
$a[35] = "
";
$a[36] = "
";
$a[37] = "
";
$a[38] = "
";
$a[39] = "
";
$a[40] = "
";
$a[41] = "
";
$a[42] = "
";
$a[43] = "
";
$a[44] = "
";
$a[45] = "
";
$a[46] = "
";
$a[47] = "
";
$a[48] = "
";
$a[49] = "
";
$a[50] = "
";
$a[51] = "
";
$a[52] = "
";
$a[53] = "
";
$a[54] = "
";
$a[55] = "
";
$a[56] = "
";
$a[57] = "
";
$a[58] = "
";
$a[59] = "
";
$a[60] = "
";
$a[61] = "
";
$a[62] = "
";
$a[63] = "
";
$a[64] = "
";
$a[65] = "
";
$a[66] = "
";
$a[67] = "
";
$a[68] = "
";
$a[69] = "
";
$a[70] = "
";
$a[71] = "
";
$a[72] = "
";
$a[73] = "
";
$a[74] = "
";
$a[75] = "
";
$a[76] = "";
$a[77] = "
";
$a[78] = "
";
$a[79] = "
";
$a[80] = "
";
$a[81] = "
";
$a[82] = "
";
$a[83] = "
";
$a[84] = "
";
$a[85] = "
";
$a[86] = "
";
$a[87] = "
";
$a[88] = "
";
$a[89] = "$1";
$a[90] = "$1";
$a[91] = "$1";
$a[92] = "$1";
$replace= array();
$replace[0] = "$1";
$replace[1] = "$1";
$replace[2] = "$1";
$replace[3] = "
";
$replace[4] = "
";
$replace[5] = "
";
$replace[6] = "
";
$replace[7] = "
";
$replace[8] = "
";
$replace[9] = "
";
$replace[10] = "
";
$replace[11] = "
";
$replace[12] = "
";
$replace[13] = "
";
$replace[14] = "
";
$replace[15] = "
";
$replace[16] = "
";
$replace[17] = "
";
$replace[18] = "
";
$replace[19] = "
";
$replace[20] = "
";
$replace[21] = "
";
$replace[22] = "
";
$replace[23] = "
";
$replace[24] = "
";
$replace[25] = "
";
$replace[26] = "
";
$replace[27] = "
";
$replace[28] = "
";
$replace[29] = "
";
$replace[30] = "
";
$replace[31] = "
";
$replace[32] = "
";
$replace[33] = "
";
$replace[34] = "
";
$replace[35] = "
";
$replace[36] = "
";
$replace[37] = "
";
$replace[38] = "
";
$replace[39] = "
";
$replace[40] = "
";
$replace[41] = "
";
$replace[42] = "
";
$replace[43] = "
";
$replace[44] = "
";
$replace[45] = "
";
$replace[46] = "
";
$replace[47] = "
";
$replace[48] = "
";
$replace[49] = "
";
$replace[50] = "
";
$replace[51] = "
";
$replace[52] = "
";
$replace[53] = "
";
$replace[54] = "
";
$replace[55] = "
";
$replace[56] = "
";
$replace[57] = "
";
$replace[58] = "
";
$replace[59] = "
";
$replace[60] = "
";
$replace[61] = "
";
$replace[62] = "
";
$replace[63] = "
";
$replace[64] = "
";
$replace[65] = "
";
$replace[66] = "
";
$replace[67] = "
";
$replace[68] = "
";
$replace[69] = "
";
$replace[70] = "
";
$replace[71] = "
";
$replace[72] = "
";
$replace[73] = "
";
$replace[74] = "
";
$replace[75] = "
";
$replace[76] = "";
$replace[77] = "
";
$replace[78] = "
";
$replace[79] = "
";
$replace[80] = "
";
$replace[81] = "
";
$replace[82] = "
";
$replace[83] = "
";
$replace[84] = "
";
$replace[85] = "
";
$replace[86] = "
";
$replace[87] = "
";
$replace[88] = "
";
$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] = "$1";
}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] = "$1";
}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] = "$topic";
}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] = "$vname($cx|$cy)";
}
}
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/Message.php b/GameEngine/Message.php
index eb6e48f6..f67bfe3d 100644
--- a/GameEngine/Message.php
+++ b/GameEngine/Message.php
@@ -307,6 +307,7 @@
if($topic == "") {
$topic = "No subject";
}
+ $text = "[message]".$text."[/message]";
if($permission[opt7]==1){
if ($userally != 0) {
while ($allmembers = mysql_fetch_array($allmembersQ)) {
@@ -326,6 +327,7 @@
if($topic == "") {
$topic = "No subject";
}
+ $text = "[message]".$text."[/message]";
//if to multihunter
if($user == "0") {
//make mail server
@@ -349,6 +351,7 @@
$welcomemsg = preg_replace("'%TIME%'", date("H:i", COMMENCE), $welcomemsg);
$welcomemsg = preg_replace("'%PLAYERS%'", $database->countUser()-4, $welcomemsg);
$welcomemsg = preg_replace("'%ALLI%'", $database->countAlli(), $welcomemsg);
+ $welcomemsg = "[message]".$welcomemsg."[/message]";
return $database->sendMessage($uid, 5, WEL_TOPIC, $welcomemsg, 0);
}