From 882215cd2aab006218e8d65de8ca28a7f71eb2de Mon Sep 17 00:00:00 2001 From: iopietro Date: Thu, 19 Apr 2018 20:14:54 +0200 Subject: [PATCH] Reports refactor #1 -Removed 29 files from the "Templates/Notice" folder, there were a lot of duplicated/very similar kinds of report. Now, there are only 6 kinds of report (9.tpl isn't counted) +Changed a lot of codes in some .tpl reports, into a foreach Automation.php: +Modified report data, for the refactored report system +Some clean-up Battle.php: +Fixed catapults and rams, they weren't able to destroy completely a building +Fixed a possible division by 0 error --- GameEngine/Automation.php | 175 ++++++-------- GameEngine/Battle.php | 13 +- GameEngine/Database.php | 13 +- GameEngine/Message.php | 34 +++ Templates/Notice/0.tpl | 284 ----------------------- Templates/Notice/0x.tpl | 287 ----------------------- Templates/Notice/1.tpl | 451 +++++++++++------------------------- Templates/Notice/10.tpl | 17 +- Templates/Notice/11.tpl | 43 ---- Templates/Notice/12.tpl | 43 ---- Templates/Notice/13.tpl | 43 ---- Templates/Notice/14.tpl | 43 ---- Templates/Notice/15.tpl | 58 ++--- Templates/Notice/16.tpl | 79 ------- Templates/Notice/17.tpl | 79 ------- Templates/Notice/18.tpl | 359 ----------------------------- Templates/Notice/18x.tpl | 301 ------------------------ Templates/Notice/19.tpl | 302 ------------------------ Templates/Notice/19x.tpl | 274 ---------------------- Templates/Notice/1x.tpl | 403 -------------------------------- Templates/Notice/2.tpl | 388 ------------------------------- Templates/Notice/20.tpl | 359 ----------------------------- Templates/Notice/20x.tpl | 301 ------------------------ Templates/Notice/21.tpl | 359 ----------------------------- Templates/Notice/21x.tpl | 301 ------------------------ Templates/Notice/22.tpl | 36 ++- Templates/Notice/2x.tpl | 403 -------------------------------- Templates/Notice/3.tpl | 330 ++++++-------------------- Templates/Notice/3x.tpl | 290 ----------------------- Templates/Notice/4.tpl | 396 -------------------------------- Templates/Notice/4x.tpl | 403 -------------------------------- Templates/Notice/5.tpl | 392 ------------------------------- Templates/Notice/5x.tpl | 403 -------------------------------- Templates/Notice/6.tpl | 386 ------------------------------- Templates/Notice/6x.tpl | 403 -------------------------------- Templates/Notice/7.tpl | 471 -------------------------------------- Templates/Notice/7x.tpl | 404 -------------------------------- Templates/Notice/8.tpl | 53 ++--- Templates/Notice/9.tpl | 3 +- Templates/Notice/9x.tpl | 4 - berichte.php | 57 ++--- 41 files changed, 426 insertions(+), 9017 deletions(-) delete mode 100644 Templates/Notice/0.tpl delete mode 100644 Templates/Notice/0x.tpl delete mode 100644 Templates/Notice/11.tpl delete mode 100644 Templates/Notice/12.tpl delete mode 100644 Templates/Notice/13.tpl delete mode 100644 Templates/Notice/14.tpl delete mode 100644 Templates/Notice/16.tpl delete mode 100644 Templates/Notice/17.tpl delete mode 100644 Templates/Notice/18.tpl delete mode 100644 Templates/Notice/18x.tpl delete mode 100644 Templates/Notice/19.tpl delete mode 100644 Templates/Notice/19x.tpl delete mode 100644 Templates/Notice/1x.tpl delete mode 100644 Templates/Notice/2.tpl delete mode 100644 Templates/Notice/20.tpl delete mode 100644 Templates/Notice/20x.tpl delete mode 100644 Templates/Notice/21.tpl delete mode 100644 Templates/Notice/21x.tpl delete mode 100644 Templates/Notice/2x.tpl delete mode 100644 Templates/Notice/3x.tpl delete mode 100644 Templates/Notice/4.tpl delete mode 100644 Templates/Notice/4x.tpl delete mode 100644 Templates/Notice/5.tpl delete mode 100644 Templates/Notice/5x.tpl delete mode 100644 Templates/Notice/6.tpl delete mode 100644 Templates/Notice/6x.tpl delete mode 100644 Templates/Notice/7.tpl delete mode 100644 Templates/Notice/7x.tpl delete mode 100644 Templates/Notice/9x.tpl diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index a47c3f0f..e886a0bd 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -1327,8 +1327,8 @@ class Automation { $rom = $ger = $gal = $nat = $natar = 0; $Defender = $database->getUnit($data['to'], false); $enforcementarray = $database->getEnforceVillage($data['to'], 0); + if(count($enforcementarray) > 0) { - foreach($enforcementarray as $enforce) { for($i=1;$i<=50;$i++) { if (!isset($enforDefender['u'.$i])) { @@ -1343,29 +1343,18 @@ class Automation { $enforDefender['hero'] += $enforce['hero']; } } - for($i=1;$i<=50;$i++){ + + for($i = 1; $i <= 50; $i++){ $def_ab[$i]=0; - if(!isset($Defender['u'.$i])){ - $Defender['u'.$i] = 0; - } else { - if($Defender['u'.$i]=='' || $Defender['u'.$i] <= 0){ - $Defender['u'.$i] = 0; - } else { - if($i<=10){ $rom='1'; } - else if($i<=20){ $ger='1'; } - else if($i<=30){ $gal='1'; } - else if($i<=40){ $nat='1'; } - else if($i<=50){ $natar='1'; } - } + if(!isset($Defender['u'.$i]) || empty($Defender['u'.$i]) || $Defender['u'.$i] < 0) { + $Defender['u'.$i] = 0; } } - if(!isset($Defender['hero'])){ - $Defender['hero'] = '0'; - } else { - if($Defender['hero']=='' or $Defender['hero'] <= 0){ - $Defender['hero'] = 0; - } + + if(!isset($Defender['hero']) || empty($Defender['hero']) || $Defender['hero'] < 0) { + $Defender['hero'] = 0; } + //get attack units $Attacker = array(); $start = ($owntribe-1)*10+1; @@ -1481,28 +1470,15 @@ class Automation { $enforDefender['hero'] += $enforce['hero']; } } - for($i=1;$i<=50;$i++){ - if(!isset($Defender['u'.$i])){ - $Defender['u'.$i] = '0'; - } else { - if($Defender['u'.$i]=='' or $Defender['u'.$i]<='0'){ - $Defender['u'.$i] = '0'; - } else { - if($i<=10){ $rom='1'; } - else if($i<=20){ $ger='1'; } - else if($i<=30){ $gal='1'; } - else if($i<=40){ $nat='1'; } - else if($i<=50){ $natar='1'; } - } - - } + + for($i = 1; $i <= 50; $i++){ + if(!isset($Defender['u'.$i]) || empty($Defender['u'.$i]) || $Defender['u'.$i] < 0) { + $Defender['u'.$i] = 0; + } } - if(!isset($Defender['hero'])){ - $Defender['hero'] = '0'; - } else { - if($Defender['hero']=='' or $Defender['hero']<'0'){ - $Defender['hero'] = '0'; - } + + if(!isset($Defender['hero']) || empty($Defender['hero']) || $Defender['hero'] < 0) { + $Defender['hero'] = 0; } //get attack units @@ -1637,13 +1613,15 @@ class Automation { while($traps > 0) { //There are some traps left, let's distribute them - for($i = 1; $i <= 10 && $traps > 0; $i++, $traps--) + for($i = 1; $i <= 10 && $traps > 0; $i++) { - ${'traped'.$i}++; + if($data['t'.$i] != 0) + { + ${'traped'.$i}++; + $traps--; + } } - } - - $GLOBALS['logging']->debug($traped1." ".$multiplier." ".$traps." ".$totalTroops); + } } } @@ -1718,31 +1696,37 @@ class Automation { $unitssend_att_check=$unitssend_att; } + //Resetting the enforcements array + for($i = 1; $i <= 50; $i++) $DefenderEnf['u'.$i] = 0; + // our reinforcements count could have changed at this point, thus the re-select - $enforcementarray2 = $database->getEnforceVillage($data['to'],0); + $enforcementarray2 = $database->getEnforceVillage($data['to'], 0); if(count($enforcementarray2) > 0) { foreach($enforcementarray2 as $enforce2) { + //TODO: Heroes must be divided by tribe $Defender['hero'] += $enforce2['hero']; - for ($i=1;$i<=50;$i++) { - $Defender['u'.$i]+= $enforce2['u'.$i]; + for($i = 1; $i <= 50; $i++) { + $DefenderEnf['u'.$i] += $enforce2['u'.$i]; } - } + } + } + + $totalsend_alldef = 0; + $unitssend_def = []; + + //Own troops + $ownTroops = array_slice($Defender, ($targettribe - 1) * 10 + 1, 10); + $totalsend_alldef = array_sum($ownTroops); + $unitssend_def[0] = implode(",", $ownTroops); + + //Reinforcements + for($i = 1; $i <= 5; $i++){ + $reinfTroops = array_slice($DefenderEnf, ($i - 1) * 10, 10); + $totalsend_alldef += array_sum($reinfTroops); + $unitssend_def[$i] = implode(",", $reinfTroops); } - $unitssend_def[1] = ''.$Defender['u1'].','.$Defender['u2'].','.$Defender['u3'].','.$Defender['u4'].','.$Defender['u5'].','.$Defender['u6'].','.$Defender['u7'].','.$Defender['u8'].','.$Defender['u9'].','.$Defender['u10'].''; - $unitssend_def[2] = ''.$Defender['u11'].','.$Defender['u12'].','.$Defender['u13'].','.$Defender['u14'].','.$Defender['u15'].','.$Defender['u16'].','.$Defender['u17'].','.$Defender['u18'].','.$Defender['u19'].','.$Defender['u20'].''; - $unitssend_def[3] = ''.$Defender['u21'].','.$Defender['u22'].','.$Defender['u23'].','.$Defender['u24'].','.$Defender['u25'].','.$Defender['u26'].','.$Defender['u27'].','.$Defender['u28'].','.$Defender['u29'].','.$Defender['u30'].''; - $unitssend_def[4] = ''.$Defender['u31'].','.$Defender['u32'].','.$Defender['u33'].','.$Defender['u34'].','.$Defender['u35'].','.$Defender['u36'].','.$Defender['u37'].','.$Defender['u38'].','.$Defender['u39'].','.$Defender['u40'].''; - $unitssend_def[5] = ''.$Defender['u41'].','.$Defender['u42'].','.$Defender['u43'].','.$Defender['u44'].','.$Defender['u45'].','.$Defender['u46'].','.$Defender['u47'].','.$Defender['u48'].','.$Defender['u49'].','.$Defender['u50'].''; - $herosend_def = $Defender['hero']; - $totalsend_alldef[1] = $Defender['u1']+$Defender['u2']+$Defender['u3']+$Defender['u4']+$Defender['u5']+$Defender['u6']+$Defender['u7']+$Defender['u8']+$Defender['u9']+$Defender['u10']; - $totalsend_alldef[2] = $Defender['u11']+$Defender['u12']+$Defender['u13']+$Defender['u14']+$Defender['u15']+$Defender['u16']+$Defender['u17']+$Defender['u18']+$Defender['u19']+$Defender['u20']; - $totalsend_alldef[3] = $Defender['u21']+$Defender['u22']+$Defender['u23']+$Defender['u24']+$Defender['u25']+$Defender['u26']+$Defender['u27']+$Defender['u28']+$Defender['u29']+$Defender['u30']; - $totalsend_alldef[4] = $Defender['u31']+$Defender['u32']+$Defender['u33']+$Defender['u34']+$Defender['u35']+$Defender['u36']+$Defender['u37']+$Defender['u38']+$Defender['u39']+$Defender['u40']; - $totalsend_alldef[5] = $Defender['u41']+$Defender['u42']+$Defender['u43']+$Defender['u44']+$Defender['u45']+$Defender['u46']+$Defender['u47']+$Defender['u48']+$Defender['u49']+$Defender['u50']; - - $totalsend_alldef = $totalsend_alldef[1]+$totalsend_alldef[2]+$totalsend_alldef[3]+$totalsend_alldef[4]+$totalsend_alldef[5]+$herosend_def; - + $unitssend_deff[0] = '?,?,?,?,?,?,?,?,?,?,'; $unitssend_deff[1] = '?,?,?,?,?,?,?,?,?,?,'; $unitssend_deff[2] = '?,?,?,?,?,?,?,?,?,?,'; $unitssend_deff[3] = '?,?,?,?,?,?,?,?,?,?,'; @@ -1754,7 +1738,7 @@ class Automation { ################FIXED BY SONGER################ ################################################# - for($i=1;$i<=11;$i++){ + for($i = 1; $i <= 11; $i++){ //MUST TO BE FIX : This is only for defender and still not properly coded if (isset($battlepart['casualties_attacker']) && isset($battlepart['casualties_attacker'][$i]) && $battlepart['casualties_attacker'][$i] <= 0) { ${'dead'.$i} = 0; @@ -1794,22 +1778,8 @@ class Automation { $start = ($targettribe-1)*10+1; $end = ($targettribe*10); - if ( $targettribe == 1 ) { - $u = ""; - $rom = '1'; - } else if ( $targettribe == 2 ) { - $u = "1"; - $ger = '1'; - } else if ( $targettribe == 3 ) { - $u = "2"; - $gal = '1'; - } else if ( $targettribe == 4 ) { - $u = "3"; - $nat = '1'; - } else { - $u = "4"; - $natar = '1'; - } //FIX + if ($targettribe == 1) $u = ""; + else $u = $targettribe - 1; $unitModifications_units = []; $unitModifications_amounts = []; @@ -1847,23 +1817,22 @@ class Automation { $life=''; $notlife=''; $wrong='0'; if($enforce['from'] != 0){ $tribe = $database->getUserArray($database->getVillageField($enforce['from'],"owner"), 1)["tribe"]; - }else{ - $tribe = 4; } + else $tribe = 4; + $start = ($tribe-1)*10+1; $end = ($tribe*10); unset($dead); - if ( $tribe == 1 ) { - $rom = '1'; - } else if ( $tribe == 2 ) { - $ger = '1'; - } else if ( $tribe == 3 ) { - $gal = '1'; - } else if ( $tribe == 4 ) { - $nat = '1'; - } else { - $natar = '1'; + switch($tribe) + { + case 1: $rom = 1; break; + case 2: $ger = 1; break; + case 3: $gal = 1; break; + case 4: $nat = 1; break; + + case 5: + default: $natar = 1; break; } $enforceModificationsById = []; @@ -1939,17 +1908,22 @@ class Automation { } } $totalsend_att = $data['t1']+$data['t2']+$data['t3']+$data['t4']+$data['t5']+$data['t6']+$data['t7']+$data['t8']+$data['t9']+$data['t10']+$data['t11']; - for ($i=1;$i<=50;$i++) { + + for ($i = 1; $i <= 50; $i++) { if (!isset($alldead[$i])) { $alldead[$i] = 0; } - $alldead[$i] += (isset($owndead[$i]) ? $owndead[$i] : 0); } + + $unitsdead_def[0] = implode(",", $owndead); $unitsdead_def[1] = ''.$alldead['1'].','.$alldead['2'].','.$alldead['3'].','.$alldead['4'].','.$alldead['5'].','.$alldead['6'].','.$alldead['7'].','.$alldead['8'].','.$alldead['9'].','.$alldead['10'].''; $unitsdead_def[2] = ''.$alldead['11'].','.$alldead['12'].','.$alldead['13'].','.$alldead['14'].','.$alldead['15'].','.$alldead['16'].','.$alldead['17'].','.$alldead['18'].','.$alldead['19'].','.$alldead['20'].''; $unitsdead_def[3] = ''.$alldead['21'].','.$alldead['22'].','.$alldead['23'].','.$alldead['24'].','.$alldead['25'].','.$alldead['26'].','.$alldead['27'].','.$alldead['28'].','.$alldead['29'].','.$alldead['30'].''; $unitsdead_def[4] = ''.$alldead['31'].','.$alldead['32'].','.$alldead['33'].','.$alldead['34'].','.$alldead['35'].','.$alldead['36'].','.$alldead['37'].','.$alldead['38'].','.$alldead['39'].','.$alldead['40'].''; $unitsdead_def[5] = ''.$alldead['41'].','.$alldead['42'].','.$alldead['43'].','.$alldead['44'].','.$alldead['45'].','.$alldead['46'].','.$alldead['47'].','.$alldead['48'].','.$alldead['49'].','.$alldead['50'].''; + + //No troops returned + $unitsdead_deff[0] = '?,?,?,?,?,?,?,?,?,?,'; $unitsdead_deff[1] = '?,?,?,?,?,?,?,?,?,?,'; $unitsdead_deff[2] = '?,?,?,?,?,?,?,?,?,?,'; $unitsdead_deff[3] = '?,?,?,?,?,?,?,?,?,?,'; @@ -2283,7 +2257,7 @@ class Automation { if (isset($empty)){ $info_ram = "".$ram_pic.",There is no wall to destroy."; } elseif ($newLevel == 0){ - $info_ram = "".$ram_pic.",Wall destroyed."; + $info_ram = "".$ram_pic.",Wall destroyed."; $database->setVillageLevel($data['to'], ["f".$wallid, "f".$wallid."t"], [0, 0]); $pop = $this->recountPop($data['to']); }elseif ($newLevel == $walllevel){ @@ -2785,7 +2759,7 @@ class Automation { else $info_spy = "".$spy_pic.", There are no informations to show"; } - $data2 = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.',0,0,0,0,0,'.$to['owner'].','.$to['wref'].','.addslashes($to['name']).','.$targettribe.',,,'.$rom.','.$unitssend_def[1].','.$unitsdead_def[1].','.$ger.','.$unitssend_def[2].','.$unitsdead_def[2].','.$gal.','.$unitssend_def[3].','.$unitsdead_def[3].','.$nat.','.$unitssend_def[4].','.$unitsdead_def[4].','.$natar.','.$unitssend_def[5].','.$unitsdead_def[5].','.$info_ram.','.$info_cat.','.$info_chief.','.$info_spy.',,'.$data['t11'].','.$dead11.','.$herosend_def.','.$deadhero.','.$unitstraped_att; + $data2 = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.',0,0,0,0,0,'.$to['owner'].','.$to['wref'].','.addslashes($to['name']).',,,'.$targettribe.','.$unitssend_def[0].','.$unitsdead_def[0].','.$rom.','.$unitssend_def[1].','.$unitsdead_def[1].','.$ger.','.$unitssend_def[2].','.$unitsdead_def[2].','.$gal.','.$unitssend_def[3].','.$unitsdead_def[3].','.$nat.','.$unitssend_def[4].','.$unitsdead_def[4].','.$natar.','.$unitssend_def[5].','.$unitsdead_def[5].','.$info_ram.','.$info_cat.','.$info_chief.','.$info_spy.',,'.$data['t11'].','.$dead11.','.$herosend_def.','.$deadhero.','.$unitstraped_att; } else{ if(isset($village_destroyed) && $village_destroyed == 1 && $can_destroy==1){ @@ -2795,12 +2769,12 @@ class Automation { \"Catapult\" The village has been destroyed."; } } - $data2 = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.','.$steal[0].','.$steal[1].','.$steal[2].','.$steal[3].','.$battlepart['bounty'].','.$to['owner'].','.$to['wref'].','.addslashes($to['name']).','.$targettribe.',,,'.$rom.','.$unitssend_def[1].','.$unitsdead_def[1].','.$ger.','.$unitssend_def[2].','.$unitsdead_def[2].','.$gal.','.$unitssend_def[3].','.$unitsdead_def[3].','.$nat.','.$unitssend_def[4].','.$unitsdead_def[4].','.$natar.','.$unitssend_def[5].','.$unitsdead_def[5].','.$info_ram.','.$info_cat.','.$info_chief.','.(isset($info_spy) ? $info_spy : '').',,'.$data['t11'].','.$dead11.','.$herosend_def.','.$deadhero.','.$unitstraped_att; + $data2 = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.','.$steal[0].','.$steal[1].','.$steal[2].','.$steal[3].','.$battlepart['bounty'].','.$to['owner'].','.$to['wref'].','.addslashes($to['name']).',,,'.$targettribe.','.$unitssend_def[0].','.$unitsdead_def[0].','.$rom.','.$unitssend_def[1].','.$unitsdead_def[1].','.$ger.','.$unitssend_def[2].','.$unitsdead_def[2].','.$gal.','.$unitssend_def[3].','.$unitsdead_def[3].','.$nat.','.$unitssend_def[4].','.$unitsdead_def[4].','.$natar.','.$unitssend_def[5].','.$unitsdead_def[5].','.$info_ram.','.$info_cat.','.$info_chief.','.(isset($info_spy) ? $info_spy : '').',,'.$data['t11'].','.$dead11.','.$herosend_def.','.$deadhero.','.$unitstraped_att; } // When all troops die, sends no info...send info $info_troop= "None of your soldiers have returned"; - $data_fail = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.','.$steal[0].','.$steal[1].','.$steal[2].','.$steal[3].','.$battlepart['bounty'].','.$to['owner'].','.$to['wref'].','.addslashes($to['name']).','.$targettribe.',,,'.$rom.','.$unitssend_deff[1].','.$unitsdead_deff[1].','.$ger.','.$unitssend_deff[2].','.$unitsdead_deff[2].','.$gal.','.$unitssend_deff[3].','.$unitsdead_deff[3].','.$nat.','.$unitssend_deff[4].','.$unitsdead_deff[4].','.$natar.','.$unitssend_deff[5].','.$unitsdead_deff[5].',,,'.$data['t11'].','.$dead11.','.$unitstraped_att.',,'.$info_ram.','.$info_cat.','.$info_chief.','.$info_troop.','.$info_hero; + $data_fail = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.','.$steal[0].','.$steal[1].','.$steal[2].','.$steal[3].','.$battlepart['bounty'].','.$to['owner'].','.$to['wref'].','.addslashes($to['name']).',,,'.$targettribe.','.$unitssend_deff[0].','.$unitsdead_deff[0].','.$rom.','.$unitssend_deff[1].','.$unitsdead_deff[1].','.$ger.','.$unitssend_deff[2].','.$unitsdead_deff[2].','.$gal.','.$unitssend_deff[3].','.$unitsdead_deff[3].','.$nat.','.$unitssend_deff[4].','.$unitsdead_deff[4].','.$natar.','.$unitssend_deff[5].','.$unitsdead_deff[5].',,,'.$data['t11'].','.$dead11.','.$unitstraped_att.',,'.$info_ram.','.$info_cat.','.$info_chief.','.$info_troop.','.$info_hero; //Undetected and detected in here. if(!empty($scout)){ @@ -2811,7 +2785,7 @@ class Automation { $database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); break; }else if($unitsdead_att == $unitssend_att && $defspy){ //fix by ronix - $database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); + $database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2.',,'.$info_troop,$AttackArrivalTime); break; }else if($defspy){ //fix by ronix $database->addNotice($to['owner'],$to['wref'],$targetally,21,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); @@ -3166,6 +3140,7 @@ class Automation { unset( $Attacker ,$Defender + ,$DefenderEnf ,$enforce ,$unitssend_att ,$unitssend_def diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php index 8f37bd02..a3174fa8 100755 --- a/GameEngine/Battle.php +++ b/GameEngine/Battle.php @@ -872,15 +872,18 @@ class Battle { { if($moral < 1) $moral = 1; elseif($moral > 3) $moral = 3; - - $needMax = round(($moral * (pow($actualLevel, 2) + $actualLevel + 1) / (8 * $upDown)) + 0.5); + + $needMax = round(($moral * (pow($actualLevel, 2) + $actualLevel + 1) / ($upDown == 0 ? 1 : 8 * $upDown)) + 0.5); for($i = $actualLevel-1; $i >= 1; $i--) { - $need = ($moral * (pow($i, 2) + $i + 1) / (8 * $upDown)) + 0.5; - if(min($realAttackers, $totalAttackers)/($needMax-$need) <= 1) break; + $need = ($moral * (pow($i, 2) + $i + 1) / ($upDown == 0 ? 1 : 8 * $upDown)) + 0.5; + if(min($realAttackers, $totalAttackers) / ($needMax - $need) <= 1) { + $i++; + break; + } } - return $i + 1; + return $i; } }; diff --git a/GameEngine/Database.php b/GameEngine/Database.php index 78b9ade1..43792931 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -897,7 +897,7 @@ class MYSQLi_DB implements IDbConnection { if ($result) { // will return the result } elseif($field=="username") { - $result = "??"; + $result = "[?]"; } else { $result = 0; } @@ -2030,7 +2030,7 @@ class MYSQLi_DB implements IDbConnection { if($result){ // will return the result }elseif($field=="name"){ - $result = "??"; + $result = "[?]"; }else $result = 0; return $result; @@ -4235,10 +4235,11 @@ References: User ID/Message ID, Mode function addNotice($uid, $toWref, $ally, $type, $topic, $data, $time = 0) { list($uid, $toWref, $ally, $type, $topic, $data, $time) = $this->escape_input((int) $uid, (int) $toWref, (int) $ally, (int) $type, $topic, $data, (int) $time); - - if($time == 0) { - $time = time(); - } + + //We don't need to send reports to Nature or Natars + if($uid == 2 || $uid == 3) return; + if($time == 0) $time = time(); + $q = "INSERT INTO " . TB_PREFIX . "ndata (id, uid, toWref, ally, topic, ntype, data, time, viewed) values (0,'$uid','$toWref','$ally','$topic',$type,'$data',$time,0)"; return mysqli_query($this->dblink,$q); } diff --git a/GameEngine/Message.php b/GameEngine/Message.php index d574972d..5d497f5c 100755 --- a/GameEngine/Message.php +++ b/GameEngine/Message.php @@ -363,6 +363,40 @@ class Message { } } + /** + * Not all notices have a corresponding .tpl file but with this function it's like they had it + * + * @param int $type The type of the report (notice) + * @return int Returns the new report type + */ + + public function getReportType($type) + { + switch($type) + { + case 2: + case 4: + case 5: + case 6: + case 7: + case 18: + case 20: + case 21: return 1; + + case 11: + case 12: + case 13: + case 14: return 10; + + case 16: + case 17: return 15; + + case 19: return 3; + } + + return $type; + } + public function loadNotes() { global $session; if(file_exists("GameEngine/Notes/" . md5($session->username) . ".txt")) { diff --git a/Templates/Notice/0.tpl b/Templates/Notice/0.tpl deleted file mode 100644 index c3bef1fb..00000000 --- a/Templates/Notice/0.tpl +++ /dev/null @@ -1,284 +0,0 @@ -readingNotice['data']); -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} - -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/0x.tpl b/Templates/Notice/0x.tpl deleted file mode 100644 index d5a5c8b9..00000000 --- a/Templates/Notice/0x.tpl +++ /dev/null @@ -1,287 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} - -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/1.tpl b/Templates/Notice/1.tpl index b65a579f..b1e17b65 100644 --- a/Templates/Notice/1.tpl +++ b/Templates/Notice/1.tpl @@ -1,380 +1,203 @@ readingNotice['data']); -if(isset($dataarray[147]) and $dataarray[147]!=0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; +$colspan = (isset($dataarray[168]) && $dataarray[168] > 0) ? 11 : 10; +$colspan2 = (isset($dataarray[170]) && $dataarray[170] > 0) ? 11 : 10; +$spy = !empty($dataarray[167]) && !empty($dataarray[166]) && empty($dataarray[185]); + +//Attacker +if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") { + $user_url="getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0).""; } +else $user_url="[?]"; + + +if($database->getVillageField($dataarray[1], 'name') != "[?]") { + $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1], 'name').""; +}else $from_url="[?]"; + //defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; +if ($database->getUserField($dataarray[28], 'username', 0) != "[?]") { + $defuser_url="getUserField($dataarray[28], 'id', 0)."\">".$database->getUserField($dataarray[28], 'username', 0).""; } +else $defuser_url="[?]"; + if($database->isVillageOases($dataarray[29])){ $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; +}elseif($database->getVillageField($dataarray[29],'name') != "[?]") { + $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29], 'name').""; } +else $deffrom_url="[?]"; + + ?> - - - - - + + + + + - - + procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- + + + + + + +
Sent:on hour
+ - +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +$tribe = $dataarray[2] ? $dataarray[2] : 5; +$start = ($tribe - 1) * 10 + 1; +for($i = $start; $i <= ($start + 9); $i++) { + echo ""; } - -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; +if (isset($dataarray[168]) && $dataarray[168] > 0){ + echo ""; } - echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = 3; $i <= 12; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; + +if (isset($dataarray[168]) && $dataarray[168] > 0){ + echo ""; } echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = 13; $i <= 22; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[148]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; + +if(isset($dataarray[168]) && $dataarray[168] > 0){ + if ($dataarray[169] == 0) $tdclass='class="none"'; else $tdclass=''; + echo ""; } -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ +if(!$spy && ($dataarray[172] > 0 || $dataarray[173] > 0 || $dataarray[174] > 0 || $dataarray[175] > 0 || $dataarray[176] > 0 || $dataarray[177] > 0 || $dataarray[178] > 0 || $dataarray[179] > 0 || $dataarray[180] > 0 || $dataarray[181] > 0 || $dataarray[182] > 0)){ echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } +for($i = 172; $i <= 181; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; +if(isset($dataarray[168]) && $dataarray[168] > 0){ + if ($dataarray[182] == 0) $tdclass='class="none"'; else $tdclass=''; + echo ""; } } echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +if (!empty($dataarray[160]) && !empty($dataarray[161])){ //ram ?> - - - - - - - - + +
Attacker from the village
  getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"\"Hero\"
Troops0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[147]$dataarray[168]
Casualties0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[148]$dataarray[169]
Prisoners0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[161]$dataarray[182]
Information - Ram - +
Information + Ram +
Information - Catapult - +
Information + Catapult +
Information - Chief - +
Information + Chief +
Information - +
Information - +
Information - Hero - + Hero +
Bounty -
Lumber | Clay | Iron | Crop
carry
+ +
Information + +
Bounty +
Lumber | Clay | Iron | Crop
carry
- + $value){ + if($value == 0) continue; + + $target = ($index == 0 ? $targetTribe : $index) - 1; + $start = $target * 10 + 1; + $troopsStart = $index * 21 + 35 - ($index == 0 ? 1 : 0); +?> + + + + + + + + + + -
Defender
 
- - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +for($i = $start; $i <= ($start + 9); $i++) { + echo ""; } -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ +if(isset($dataarray[170]) && $dataarray[170] > 0){ echo ""; } echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = $troopsStart; $i <= $troopsStart + 9; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; + +if(isset($dataarray[170]) && $dataarray[170] > 0){ + echo ""; } echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = $troopsStart + 10; $i <= $troopsStart + 19; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; +} + +if(isset($dataarray[170]) && $dataarray[170] > 0){ + if ($dataarray[171] == 0){$tdclass1='class="none"';} + echo ""; } -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; } ?>
Defender -
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[149]$dataarray[170]
Casualties0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[171]$dataarray[150]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
+
\ No newline at end of file diff --git a/Templates/Notice/10.tpl b/Templates/Notice/10.tpl index 32ccece1..195138c6 100644 --- a/Templates/Notice/10.tpl +++ b/Templates/Notice/10.tpl @@ -1,15 +1,14 @@ readingNotice['data']); -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; +if ($database->getUserField($dataarray[0],'username',0) != "[?]") { + $user_url = "getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; } -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; +else $user_url = "[?]"; + +if($database->getVillageField($dataarray[1],'name') != "[?]") { + $from_url = "getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; } +else $from_url = "[?]"; ?> @@ -22,7 +21,7 @@ if($database->getVillageField($dataarray[1],'name')!="??") { procMtime($message->readingNotice['time']); ?> - + diff --git a/Templates/Notice/11.tpl b/Templates/Notice/11.tpl deleted file mode 100644 index 95f0e1b1..00000000 --- a/Templates/Notice/11.tpl +++ /dev/null @@ -1,43 +0,0 @@ -readingNotice['data']); -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -}; -?> -
Sent:on at ".$date[1]; ?> houron hour
- - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - -
  from the village
Resources - Wood | - Clay | - Iron | - Crop -
diff --git a/Templates/Notice/12.tpl b/Templates/Notice/12.tpl deleted file mode 100644 index 32ccece1..00000000 --- a/Templates/Notice/12.tpl +++ /dev/null @@ -1,43 +0,0 @@ -readingNotice['data']); -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - -
  from the village
Resources - Wood | - Clay | - Iron | - Crop -
diff --git a/Templates/Notice/13.tpl b/Templates/Notice/13.tpl deleted file mode 100644 index 32ccece1..00000000 --- a/Templates/Notice/13.tpl +++ /dev/null @@ -1,43 +0,0 @@ -readingNotice['data']); -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - -
  from the village
Resources - Wood | - Clay | - Iron | - Crop -
diff --git a/Templates/Notice/14.tpl b/Templates/Notice/14.tpl deleted file mode 100644 index 32ccece1..00000000 --- a/Templates/Notice/14.tpl +++ /dev/null @@ -1,43 +0,0 @@ -readingNotice['data']); -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - -
  from the village
Resources - Wood | - Clay | - Iron | - Crop -
diff --git a/Templates/Notice/15.tpl b/Templates/Notice/15.tpl index 13bc15f1..4ce2194e 100644 --- a/Templates/Notice/15.tpl +++ b/Templates/Notice/15.tpl @@ -1,17 +1,16 @@ readingNotice['data']); -if(isset($dataarray[24]) and $dataarray[24]!=0){$colspan="11";}else{$colspan="10";} -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; +$colspan = (isset($dataarray[24]) && $dataarray[24] > 0) ? 10 : 11; +if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") { + $user_url = "getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0).""; } -if($database->getVillageField($dataarray[26],'name')!="??") { - $from_url="getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26],'name').""; -}else{ - $from_url="??"; +else $user_url = "[?]"; + +if($database->getVillageField($dataarray[26], 'name') != "[?]") { + $from_url = "getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26], 'name').""; } +else $from_url = "[?]"; ?> @@ -21,10 +20,9 @@ if($database->getVillageField($dataarray[26],'name')!="??") { - procMtime($message->readingNotice['time']); ?> + procMtime($message->readingNotice['time']); ?> - + @@ -41,39 +39,33 @@ if($database->getVillageField($dataarray[26],'name')!="??") { getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -if(isset($dataarray[24]) and $dataarray[24]!=0){ +if(isset($dataarray[24]) && $dataarray[24] > 0){ echo ""; } echo ""; -for($i=4;$i<=13;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = 4; $i <= 13; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[24]) and $dataarray[24]!=0){ + +if(isset($dataarray[24]) && $dataarray[24] > 0){ echo ""; } echo ""; -for($i=14;$i<=23;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } +for($i = 14; $i <= 23; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[24]) and $dataarray[24]!=0){ - if ($dataarray[25]==0){$tdclass='class="none"';} +if(isset($dataarray[24]) && $dataarray[24] > 0){ + if ($dataarray[25] == 0){$tdclass = 'class="none"';} echo ""; } ?>
Sent:on at ".$date[1]; ?> houron hour
  \"Hero\"
Troops0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[24]
Casualties0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[25]
- + \ No newline at end of file diff --git a/Templates/Notice/16.tpl b/Templates/Notice/16.tpl deleted file mode 100644 index 13bc15f1..00000000 --- a/Templates/Notice/16.tpl +++ /dev/null @@ -1,79 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[24]) and $dataarray[24]!=0){$colspan="11";}else{$colspan="10";} -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[26],'name')!="??") { - $from_url="getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26],'name').""; -}else{ - $from_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if(isset($dataarray[24]) and $dataarray[24]!=0){ - echo ""; -} -echo ""; -for($i=4;$i<=13;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[24]) and $dataarray[24]!=0){ - echo ""; -} -echo ""; -for($i=14;$i<=23;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[24]) and $dataarray[24]!=0){ - if ($dataarray[25]==0){$tdclass='class="none"';} - echo ""; -} -?> - -
Defender from the village
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[24]
Casualties0".$dataarray[$i]."$dataarray[25]
-
diff --git a/Templates/Notice/17.tpl b/Templates/Notice/17.tpl deleted file mode 100644 index 13bc15f1..00000000 --- a/Templates/Notice/17.tpl +++ /dev/null @@ -1,79 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[24]) and $dataarray[24]!=0){$colspan="11";}else{$colspan="10";} -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[26],'name')!="??") { - $from_url="getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26],'name').""; -}else{ - $from_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if(isset($dataarray[24]) and $dataarray[24]!=0){ - echo ""; -} -echo ""; -for($i=4;$i<=13;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[24]) and $dataarray[24]!=0){ - echo ""; -} -echo ""; -for($i=14;$i<=23;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[24]) and $dataarray[24]!=0){ - if ($dataarray[25]==0){$tdclass='class="none"';} - echo ""; -} -?> - -
Defender from the village
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[24]
Casualties0".$dataarray[$i]."$dataarray[25]
-
diff --git a/Templates/Notice/18.tpl b/Templates/Notice/18.tpl deleted file mode 100644 index b7ee1e45..00000000 --- a/Templates/Notice/18.tpl +++ /dev/null @@ -1,359 +0,0 @@ -readingNotice['data']); -$colspan="10"; -if(isset($dataarray[150]) and $dataarray[150]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[148]) and $dataarray[148]!=0){ - if ($dataarray[162]==0) $tdclass='class="none"'; else $tdclass=""; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker from the village
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[162]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/18x.tpl b/Templates/Notice/18x.tpl deleted file mode 100644 index bb723cc5..00000000 --- a/Templates/Notice/18x.tpl +++ /dev/null @@ -1,301 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/19.tpl b/Templates/Notice/19.tpl deleted file mode 100644 index 22408de5..00000000 --- a/Templates/Notice/19.tpl +++ /dev/null @@ -1,302 +0,0 @@ -readingNotice['data']); -$colspan="10"; -$colspan2="10"; -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0 or $dataarray[162] != 0){ -echo ""; -for($i=153;$i<=162;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -} -if(isset($dataarray[171]) && $dataarray[171] !=''){ //troop not return -?> - - -
Attacker from the village
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."
Information - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/19x.tpl b/Templates/Notice/19x.tpl deleted file mode 100644 index c1a19186..00000000 --- a/Templates/Notice/19x.tpl +++ /dev/null @@ -1,274 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -?> -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[161]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/1x.tpl b/Templates/Notice/1x.tpl deleted file mode 100644 index b7ef8744..00000000 --- a/Templates/Notice/1x.tpl +++ /dev/null @@ -1,403 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - -
\ No newline at end of file diff --git a/Templates/Notice/2.tpl b/Templates/Notice/2.tpl deleted file mode 100644 index 45d9f1e6..00000000 --- a/Templates/Notice/2.tpl +++ /dev/null @@ -1,388 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[147]) and $dataarray[147]!=0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[148]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - - - - -
Attacker from the village
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Information - Hero - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - if (!isset($tdclass1)) { - $tdclass1 = ''; - } - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/20.tpl b/Templates/Notice/20.tpl deleted file mode 100644 index b7ee1e45..00000000 --- a/Templates/Notice/20.tpl +++ /dev/null @@ -1,359 +0,0 @@ -readingNotice['data']); -$colspan="10"; -if(isset($dataarray[150]) and $dataarray[150]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[148]) and $dataarray[148]!=0){ - if ($dataarray[162]==0) $tdclass='class="none"'; else $tdclass=""; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker from the village
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[162]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/20x.tpl b/Templates/Notice/20x.tpl deleted file mode 100644 index bb723cc5..00000000 --- a/Templates/Notice/20x.tpl +++ /dev/null @@ -1,301 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/21.tpl b/Templates/Notice/21.tpl deleted file mode 100644 index b7ee1e45..00000000 --- a/Templates/Notice/21.tpl +++ /dev/null @@ -1,359 +0,0 @@ -readingNotice['data']); -$colspan="10"; -if(isset($dataarray[150]) and $dataarray[150]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[148]) and $dataarray[148]!=0){ - if ($dataarray[162]==0) $tdclass='class="none"'; else $tdclass=""; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker from the village
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[162]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ - if ($dataarray[151]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[150]
Casualties0".$dataarray[$i]."$dataarray[151]
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/21x.tpl b/Templates/Notice/21x.tpl deleted file mode 100644 index bb723cc5..00000000 --- a/Templates/Notice/21x.tpl +++ /dev/null @@ -1,301 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=152;$i<=161;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file diff --git a/Templates/Notice/22.tpl b/Templates/Notice/22.tpl index 1916eb01..a4b8a249 100644 --- a/Templates/Notice/22.tpl +++ b/Templates/Notice/22.tpl @@ -1,15 +1,7 @@ readingNotice['data']); -if(isset($dataarray[14]) and $dataarray[14]!=0){$colspan="11";}else{$colspan="10";} -if($dataarray[15] == 1){ -$image = "peace"; -}else if($dataarray[15] == 2){ -$image = "xmas"; -}else if($dataarray[15] == 3){ -$image = "newy"; -}else{ -$image = "easter"; -} +$colspan = (isset($dataarray[14]) && $dataarray[14] > 0) ? 11 : 10; + if($dataarray[15] == 1){ $message1 = "".$database->getUserField($dataarray[0],"username",0)." visited ".$database->getUserField($dataarray[2],"username",0)."'s troops"; }else if($dataarray[15] == 2){ @@ -31,7 +23,7 @@ $message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you procMtime($message->readingNotice['time']); ?> Sent: - on at ".$date[1]; ?> hour + on hour @@ -48,29 +40,27 @@ $message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you   getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -if(isset($dataarray[14]) and $dataarray[14]!=0){ +if(isset($dataarray[14]) && $dataarray[14] > 0){ echo "\"Hero\""; } echo "Troops"; -for($i=4;$i<=13;$i++) { - if($dataarray[$i] == 0) { - echo "0"; - } - else { - echo "".$dataarray[$i].""; - } + +for($i = 4; $i <= 13; $i++) { + if($dataarray[$i] == 0) echo "0"; + else echo "".$dataarray[$i].""; } -if(isset($dataarray[14]) and $dataarray[14]!=0){ + +if(isset($dataarray[14]) && $dataarray[14] > 0){ echo "$dataarray[14]"; } ?> Information - Peace + .gif" alt="Peace" title="Peace" /> diff --git a/Templates/Notice/2x.tpl b/Templates/Notice/2x.tpl deleted file mode 100644 index b7ef8744..00000000 --- a/Templates/Notice/2x.tpl +++ /dev/null @@ -1,403 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - -
\ No newline at end of file diff --git a/Templates/Notice/3.tpl b/Templates/Notice/3.tpl index 0ba44054..5b050859 100644 --- a/Templates/Notice/3.tpl +++ b/Templates/Notice/3.tpl @@ -6,32 +6,33 @@ ## TRAVIANZ ## ############################################################ $dataarray = explode(",",$message->readingNotice['data']); -if(isset($dataarray[151]) and $dataarray[151]!=0){$colspan="11";}else{$colspan="10";} +$colspan = (isset($dataarray[173]) && $dataarray[173] > 0) ? 11 : 10; $colspan2 = 10; -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; + +//Attacker +if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") { + $user_url="getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0).""; } -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; +else $user_url="[?]"; + + +if($database->getVillageField($dataarray[1],'name') != "[?]") { + $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1], 'name').""; } +else $from_url="[?]"; + //defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; +if ($database->getUserField($dataarray[28], 'username', 0) != "[?]") { + $defuser_url="getUserField($dataarray[28], 'id', 0)."\">".$database->getUserField($dataarray[28], 'username', 0).""; } +else $defuser_url="[?]"; + if($database->isVillageOases($dataarray[29])){ $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; +}elseif($database->getVillageField($dataarray[29], 'name') != "[?]") { + $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29], 'name').""; } +else $deffrom_url="[?]"; ?> @@ -44,7 +45,7 @@ if($database->isVillageOases($dataarray[29])){ procMtime($message->readingNotice['time']); ?> - + @@ -61,286 +62,107 @@ if($database->isVillageOases($dataarray[29])){ getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -if(isset($dataarray[151]) and $dataarray[151]!=0){ +if(isset($dataarray[173]) && $dataarray[173] > 0){ echo ""; } echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = 3; $i <= 12; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[151]) and $dataarray[151]!=0){ - echo ""; + +if(isset($dataarray[173]) && $dataarray[173] > 0){ + echo ""; } echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } +for($i = 13; $i <= 22; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[151]) and $dataarray[151]!=0){ - if ($dataarray[152]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; +if(isset($dataarray[173]) && $dataarray[173] > 0){ + if ($dataarray[174] == 0) $tdclass='class="none"'; else $tdclass=''; + echo ""; } -if($dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0 or $dataarray[162] != 0 or $dataarray[163] != 0){ +if($dataarray[175] > 0 || $dataarray[176] > 0 || $dataarray[177] > 0 || $dataarray[178] > 0 || $dataarray[179] > 0 || $dataarray[180] > 0 || $dataarray[181] > 0 || $dataarray[182] > 0 || $dataarray[183] > 0 || $dataarray[184] > 0 || $dataarray[185] > 0){ echo ""; -for($i=153;$i<=162;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } + +for($i = 175; $i <= 184; $i++) { + if($dataarray[$i] == 0) echo ""; + else echo ""; } -if(isset($dataarray[151]) and $dataarray[151]!=0){ - if ($dataarray[163]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; + +if(isset($dataarray[173]) && $dataarray[173] > 0){ + if ($dataarray[185]==0) $tdclass='class="none"'; else $tdclass=''; + echo ""; } } -if ($dataarray[165]!='' and $dataarray[166]!=''){ //ram +if (!empty($dataarray[187]) && !empty($dataarray[188])){ //ram ?>
Sent:on at ".$date[1]; ?> houron hour
  \"Hero\"
Troops0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[151]$dataarray[173]
Casualties0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[152]$dataarray[174]
Prisoners0".$dataarray[$i]."0".$dataarray[$i]."$dataarray[163]$dataarray[185]
Information - Ram - + Ram +
Information - Catapult - + Catapult +
Information - Chief - + Chief +
Information - Hero - + Hero +
Information - +
- - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} +$target = $dataarray[33] - 1; +$start = ($target * 10) + 1; +$troopsStart = ($target * 21) + 35; ?> -
Defender -
 
Troops??
Casualties??
+ + + + + + + + + - -
Defender
 
- - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops??
Casualties??
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops??
Casualties??
+for($i = $troopsStart; $i <= $troopsStart + 9; $i++) echo "?"; - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} +for($i = $troopsStart + 10; $i <= $troopsStart + 19; $i++) echo ""; ?>
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops??
Casualties???
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops??
Casualties??
- - - + \ No newline at end of file diff --git a/Templates/Notice/3x.tpl b/Templates/Notice/3x.tpl deleted file mode 100644 index ebeeb0e8..00000000 --- a/Templates/Notice/3x.tpl +++ /dev/null @@ -1,290 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if($dataarray[151]!='' and $dataarray[151]!=0){$colspan="11";}else{$colspan="10";} -$colspan2 = 10; -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if ($dataarray[151]!="" and $dataarray[151]!=0){ - echo ""; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if ($dataarray[151]!="" and $dataarray[151]!=0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if ($dataarray[151]!="" and $dataarray[151]!=0){ - if ($dataarray[152]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0 or $dataarray[162] != 0){ -echo ""; -for($i=153;$i<=162;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[151]) and $dataarray[151]!=0){ - if ($dataarray[163]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; ?> -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[151]
Casualties0".$dataarray[$i]."$dataarray[152]
Prisoners0".$dataarray[$i]."$dataarray[163]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops??
Casualties??
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops??
Casualties??
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops??
Casualties??
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops??
Casualties??
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == "?") { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops??
Casualties??
- - -
diff --git a/Templates/Notice/4.tpl b/Templates/Notice/4.tpl deleted file mode 100644 index 18f2c51a..00000000 --- a/Templates/Notice/4.tpl +++ /dev/null @@ -1,396 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[147]) and $dataarray[147]!=0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -$usr = $database->getUserField($dataarray[0],'username',0); -if ($usr && $usr!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} - -$villageName = $database->getVillageField($dataarray[1],'name'); -if($villageName && $villageName!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} - -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[148]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - - - - - - -
Attacker
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Information - Hero - -
Information - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/4x.tpl b/Templates/Notice/4x.tpl deleted file mode 100644 index b7ef8744..00000000 --- a/Templates/Notice/4x.tpl +++ /dev/null @@ -1,403 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - -
\ No newline at end of file diff --git a/Templates/Notice/5.tpl b/Templates/Notice/5.tpl deleted file mode 100644 index 475bc6d4..00000000 --- a/Templates/Notice/5.tpl +++ /dev/null @@ -1,392 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[147]) and $dataarray[147]!=0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[148]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - - - - - - -
Attacker from the village
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Information - Hero - -
Information - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/5x.tpl b/Templates/Notice/5x.tpl deleted file mode 100644 index b7ef8744..00000000 --- a/Templates/Notice/5x.tpl +++ /dev/null @@ -1,403 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - -
\ No newline at end of file diff --git a/Templates/Notice/6.tpl b/Templates/Notice/6.tpl deleted file mode 100644 index 52c43a6d..00000000 --- a/Templates/Notice/6.tpl +++ /dev/null @@ -1,386 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[147]) and $dataarray[147]!=0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[148]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - - - - -
Attacker from the village
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Information - Hero - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/6x.tpl b/Templates/Notice/6x.tpl deleted file mode 100644 index b7ef8744..00000000 --- a/Templates/Notice/6x.tpl +++ /dev/null @@ -1,403 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender - - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - -
\ No newline at end of file diff --git a/Templates/Notice/7.tpl b/Templates/Notice/7.tpl deleted file mode 100644 index 7629af7e..00000000 --- a/Templates/Notice/7.tpl +++ /dev/null @@ -1,471 +0,0 @@ -readingNotice['data']); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2="10";} -//attacker -if ($database->getUserField($dataarray[0],'username',0)!="??") { - $user_url="getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0).""; -}else{ - $user_url="??"; -} -if($database->getVillageField($dataarray[1],'name')!="??") { - $from_url="getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name').""; -}else{ - $from_url="??"; -} -//defender -if ($database->getUserField($dataarray[28],'username',0)!="??") { - $defuser_url="getUserField($dataarray[28],'id',0)."\">".$database->getUserField($dataarray[28],'username',0).""; -}else{ - $defuser_url="??"; -} -if($database->isVillageOases($dataarray[29])){ - $deffrom_url="getMapCheck($dataarray[29])."\">".$dataarray[30].""; -}elseif($database->getVillageField($dataarray[29],'name')!="??") { - $deffrom_url="getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name').""; -}else{ - $deffrom_url="??"; -} -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[148]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0) $tdclass='class="none"'; else $tdclass=''; - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - - - - - - -
Attacker from the village
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Information - Hero - -
Information - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - echo ""; -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ - if ($dataarray[150]==0){$tdclass1='class="none"';} - echo ""; -} -?> -
Defender -
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[149]
Casualties0".$dataarray[$i]."$dataarray[150]
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=118;$i<=127;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=139;$i<=148;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender -
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/7x.tpl b/Templates/Notice/7x.tpl deleted file mode 100644 index 446b7db9..00000000 --- a/Templates/Notice/7x.tpl +++ /dev/null @@ -1,404 +0,0 @@ -getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan="10";} -$colspan2 = 10; -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} - -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} - -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - echo ""; -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if (isset($dataarray[147]) and $dataarray[147] != 0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; -} -if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; -for($i=151;$i<=160;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -if(isset($dataarray[147]) and $dataarray[147]!=0){ - if ($dataarray[161]==0){$tdclass='class="none"';} - echo ""; -} -} -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 \"Hero\"
Troops0".$dataarray[$i]."$dataarray[147]
Casualties0".$dataarray[$i]."$dataarray[148]
Prisoners0".$dataarray[$i]."$dataarray[161]
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=118;$i<=127;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=139;$i<=148;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
diff --git a/Templates/Notice/8.tpl b/Templates/Notice/8.tpl index b776c91c..124b1a3f 100644 --- a/Templates/Notice/8.tpl +++ b/Templates/Notice/8.tpl @@ -1,16 +1,16 @@ readingNotice['data']); -if($dataarray[13]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";} -if ($database->getUserField($dataarray[1],'username',0)!="??" || $dataarray[1] == 0) { - $user_url="getUserField($dataarray[1],"id",0)."\">".($dataarray[1] == 0 ? "taskmaster" : $database->getUserField($dataarray[1],'username',0)).""; -}else{ - $user_url="??"; +$colspan = (!empty($dataarray[13]) && $dataarray[13] > 0) ? 11 : 10; + +if ($database->getUserField($dataarray[1], 'username', 0) != "[?]" || $dataarray[1] == 0) { + $user_url="getUserField($dataarray[1], "id", 0)."\">".($dataarray[1] == 0 ? "taskmaster" : $database->getUserField($dataarray[1], 'username', 0)).""; } -if($database->getVillageField($dataarray[0],'name')!="??" || $dataarray[0] == 0) { - $from_url=($dataarray[0] == 0)? "village of the elders" : "getMapCheck($dataarray[0])."\">".$database->getVillageField($dataarray[0],'name').""; -}else{ - $from_url="??"; +else $user_url="[?]"; + +if($database->getVillageField($dataarray[0],'name') != "[?]" || $dataarray[0] == 0) { + $from_url=($dataarray[0] == 0)? "village of the elders" : "getMapCheck($dataarray[0])."\">".$database->getVillageField($dataarray[0], 'name').""; } +else $from_url="[?]"; ?> @@ -23,7 +23,7 @@ if($database->getVillageField($dataarray[0],'name')!="??" || $dataarray[0] == 0) procMtime($message->readingNotice['time']); ?> - + @@ -37,30 +37,27 @@ if($database->getVillageField($dataarray[0],'name')!="??" || $dataarray[0] == 0) getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -if($dataarray[13]!=0){ -echo ""; -} +if($dataarray[13] > 0) echo ""; + echo ""; -for($i=3;$i<13;$i++) { -$unitarray['u'.($i-3+$start).''] = $dataarray[$i]; - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } +for($i = 3; $i < 13; $i++) { + $unitarray['u'.($i - 3 + $start)] = $dataarray[$i]; + + if($dataarray[$i] == 0) echo ""; + else echo ""; + } -if($dataarray[13] != 0) { - echo ""; - $unitarray['hero'] = 1; +if($dataarray[13] > 0) { + echo ""; + $unitarray['hero'] = 1; } ?> +getUpkeep($unitarray, $dataarray[2]); ?>Cropper hour -
Sent:on at ".$date[1]; ?> on
 
Troops0".$dataarray[$i]."0".$dataarray[$i]."".$dataarray[13]."".$dataarray[13]."
upkeep -getUpkeep($unitarray,$dataarray[2]); ?>Cropper hour
+ \ No newline at end of file diff --git a/Templates/Notice/9.tpl b/Templates/Notice/9.tpl index 88229cea..99797f71 100644 --- a/Templates/Notice/9.tpl +++ b/Templates/Notice/9.tpl @@ -1,4 +1,3 @@ getNotice2($_GET['id'], 'archive'); -include("".$archive.".tpl"); +include($database->getNotice2($_GET['id'], 'archive').".tpl"); ?> \ No newline at end of file diff --git a/Templates/Notice/9x.tpl b/Templates/Notice/9x.tpl deleted file mode 100644 index 97750ece..00000000 --- a/Templates/Notice/9x.tpl +++ /dev/null @@ -1,4 +0,0 @@ -getNotice2($_GET['id'], 'archive'); -include("".$archive."x.tpl"); -?> \ No newline at end of file diff --git a/berichte.php b/berichte.php index f01f2259..9b7e8fef 100644 --- a/berichte.php +++ b/berichte.php @@ -93,50 +93,27 @@ if(isset($_GET['newdid'])) { ?> alliance == $_GET['aid'] ) { - - if ( isset( $_GET['id'] ) ) { - $ally = $database->getNotice2( preg_replace( "/[^a-zA-Z0-9_-]/", "", $_GET['id'] ), 'ally' ); - - if ( $session->alliance == $ally ) { - $type = $database->getNotice2( preg_replace( "/[^a-zA-Z0-9_-]/", "", $_GET['id'] ), 'ntype' ); - - if ( $type != 10 or $type != 11 or $type != 12 or $type != 13 or $type != 14 or $type != 15 or $type != 16 or $type != 17 ) { - include( "Templates/Notice/" . $type . "x.tpl" ); - } - } - } - } +if (isset($_GET['id'])) +{ + if (isset($_GET['aid']) && $_GET['aid'] > 0 && $_GET['aid'] == $session->alliance) + { + $type = $database->getNotice2($_GET['id'], 'ntype'); + if ($type >= 10 && $type <= 17) unset($type); } -} else if ( isset( $_GET['vill'] ) ) { - - if ( isset( $_GET['id'] ) ) { - $ally = $database->getNotice2( $_GET['id'], 'ally' ); - - if ( $database->getNotice2( preg_replace( "/[^a-zA-Z0-9_-]/", "", $_GET['id'] ), 'uid' ) == $session->uid ) { - $type = ( $message->readingNotice['ntype'] == 9 ) ? $message->readingNotice['archive'] : $message->readingNotice['ntype']; - include( "Templates/Notice/" . $type . ".tpl" ); - } else if ( $session->alliance == $ally ) { - $type = $database->getNotice2( $_GET['id'], 'ntype' ); - - if ( $type != 10 or $type != 11 or $type != 12 or $type != 13 or $type != 14 or $type != 15 or $type != 16 or $type != 17 ) { - include( "Templates/Notice/" . $type . "x.tpl" ); - } - } + elseif(isset($_GET['vill']) && $database->getNotice2($_GET['id'], 'ally') == $session->alliance) + { + $type = $database->getNotice2($_GET['id'], 'ntype'); + if ($type >= 10 && $type <= 17) unset($type); } - -} else if ( isset( $_GET['id'] ) ) { - if ( $database->getNotice2( preg_replace( "/[^a-zA-Z0-9_-]/", "", $_GET['id'] ), 'uid' ) == $session->uid ) { - $type = ( $message->readingNotice['ntype'] == 9 ) ? $message->readingNotice['archive'] : $message->readingNotice['ntype']; - include( "Templates/Notice/" . $type . ".tpl" ); + elseif($database->getNotice2(preg_replace("/[^a-zA-Z0-9_-]/", "", $_GET['id']), 'uid') == $session->uid) + { + $type = ($message->readingNotice['ntype'] == 9) ? $message->readingNotice['archive'] : $message->readingNotice['ntype']; } -} else { - include( "Templates/Notice/all.tpl" ); + + if(isset($type)) include("Templates/Notice/".$message->getReportType($type).".tpl"); + unset($type); } +else include("Templates/Notice/all.tpl"); ?>