From c0730af9ee13876fa91922c9e51e60e9c15f6baf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 9 Jul 2012 13:58:10 +0300 Subject: [PATCH] fix some bugs --- Admin/Templates/server_info.tpl | 12 +++--- Templates/Ranking/ally_top10.tpl | 29 ++++++++++---- Templates/Ranking/player_top10.tpl | 61 ++++++++++++++++++------------ Templates/dorf3/5.tpl | 6 ++- 4 files changed, 69 insertions(+), 39 deletions(-) diff --git a/Admin/Templates/server_info.tpl b/Admin/Templates/server_info.tpl index f145aeeb..76f9460b 100644 --- a/Admin/Templates/server_info.tpl +++ b/Admin/Templates/server_info.tpl @@ -100,7 +100,7 @@ $users = mysql_num_rows(mysql_query("SELECT SQL_CACHE * FROM ".TB_PREFIX."users" - Gold Gold + Gold Gold @@ -115,7 +115,7 @@ $users = mysql_num_rows(mysql_query("SELECT SQL_CACHE * FROM ".TB_PREFIX."users" '; + echo ''; } echo ''; for($i=1; $i<11; $i++) @@ -128,7 +128,7 @@ $users = mysql_num_rows(mysql_query("SELECT SQL_CACHE * FROM ".TB_PREFIX."users" echo ""; for($i=11; $i<21; $i++) { - echo ''; + echo ''; } echo ''; for($i=11; $i<21; $i++) @@ -141,7 +141,7 @@ $users = mysql_num_rows(mysql_query("SELECT SQL_CACHE * FROM ".TB_PREFIX."users" echo ""; for($i=21; $i<31; $i++) { - echo ''; + echo ''; } echo ''; for($i=21; $i<31; $i++) @@ -154,7 +154,7 @@ $users = mysql_num_rows(mysql_query("SELECT SQL_CACHE * FROM ".TB_PREFIX."users" echo ""; for($i=31; $i<41; $i++) { - echo ''; + echo ''; } echo ''; for($i=31; $i<41; $i++) @@ -167,7 +167,7 @@ $users = mysql_num_rows(mysql_query("SELECT SQL_CACHE * FROM ".TB_PREFIX."users" echo ""; for($i=41; $i<51; $i++) { - echo ''; + echo ''; } echo ''; for($i=41; $i<51; $i++) diff --git a/Templates/Ranking/ally_top10.tpl b/Templates/Ranking/ally_top10.tpl index 9f832e1e..e72814ee 100644 --- a/Templates/Ranking/ally_top10.tpl +++ b/Templates/Ranking/ally_top10.tpl @@ -1,4 +1,5 @@ alliance."' ORDER BY ap DESC Limit 1"); ?> @@ -40,6 +41,9 @@ alliance) { + $place = $i; + } if($row['id']==$session->alliance) { echo ""; } else { echo ""; } echo ""; @@ -56,7 +60,7 @@ { if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } - echo ""; + echo ""; if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } echo ""; @@ -71,7 +75,7 @@ for($i=1;$i<=0;$i++) { echo "Row ".$i; } - $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY dp DESC Limit 10"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY dp DESC, id DESC Limit 10"); $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = '".$session->alliance."' ORDER BY dp DESC Limit 1"); ?>
".$i++.". 
? ".$place." ".$row['tag']."".$row['tag']."".$row['ap']."
@@ -91,6 +95,9 @@ alliance) { + $place1 = $i; + } if($row['id']==$session->alliance) { echo ""; } else { echo ""; } echo ""; @@ -108,7 +115,7 @@ { if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } - echo ""; + echo ""; if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } echo ""; @@ -122,7 +129,7 @@ for($i=1;$i<=0;$i++) { echo "Row ".$i; } - $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY clp DESC Limit 10"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY clp DESC, id DESC Limit 10"); $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = '".$session->alliance."' ORDER BY clp DESC Limit 1"); ?>
@@ -143,6 +150,9 @@ alliance) { + $place2 = $i; + } if($row['id']==$session->alliance) { echo ""; } else { echo ""; } echo ""; @@ -159,7 +169,7 @@ { if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } - echo ""; + echo ""; if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } echo ""; @@ -172,7 +182,7 @@ for($i=1;$i<=0;$i++) { echo "Row ".$i; } - $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY RR DESC Limit 10"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY RR DESC, id DESC Limit 10"); $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = '".$session->alliance."' ORDER BY RR DESC Limit 1"); ?>
".$i++.". 
? ".$place1." ".$row['tag']."".$row['tag']."".$row['dp']."
".$i++.". 
? ".$place2." ".$row['tag']."".$row['tag']."".$row['clp']."
@@ -194,6 +204,9 @@ { if($row['RR'] >= 0) { if($row['id']==$session->alliance) { + $place3 = $i; + } + if($row['id']==$session->alliance) { echo ""; } else { echo ""; } echo ""; echo ""; @@ -210,7 +223,7 @@ { if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } - echo ""; + echo ""; if($row['id'] == $session->alliance) { echo ""; } else { echo ""; } echo ""; diff --git a/Templates/Ranking/player_top10.tpl b/Templates/Ranking/player_top10.tpl index 6c1074ab..653b8195 100644 --- a/Templates/Ranking/player_top10.tpl +++ b/Templates/Ranking/player_top10.tpl @@ -1,4 +1,5 @@ 5 AND tribe<=3 AND tribe > 0 ORDER BY ap DESC Limit 10"); - $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE username = '".$session->username."' ORDER BY ap DESC Limit 1"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY ap DESC, id DESC Limit 10"); + $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE id = '".$session->uid."' ORDER BY ap DESC Limit 1"); ?>
".$i++.". ".$row['tag']."
? ".$place3." ".$row['tag']."".$row['tag']."".$row['RR']."
@@ -40,7 +41,10 @@ username) { + if($row['id']==$session->uid) { + if($row['id']==$session->uid) { + $place = $i; + } echo ""; } else { echo ""; } echo ""; echo ""; @@ -54,10 +58,10 @@ username) { + if($row['id'] == $session->uid) { echo ""; } else { echo ""; } - echo ""; - if($row['username'] == $session->username) { + echo ""; + if($row['id'] == $session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; @@ -71,8 +75,8 @@ for($i=1;$i<=0;$i++) { echo "Row ".$i; } - $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY dp DESC Limit 10"); - $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE username = '".$session->username."' ORDER BY dp DESC Limit 1"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY dp DESC, id DESC Limit 10"); + $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE id = '".$session->uid."' ORDER BY dp DESC Limit 1"); ?>
".$i++.". ".$row['username']."
? ".$place." ".$row['username']."".$row['username']."".$row['ap']."
@@ -91,7 +95,10 @@ username) { + if($row['id']==$session->uid) { + $place1 = $i; + } + if($row['id']==$session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; @@ -106,10 +113,10 @@ username) { + if($row['id'] == $session->uid) { echo ""; } else { echo ""; } - echo ""; - if($row['username'] == $session->username) { + echo ""; + if($row['id'] == $session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; @@ -122,8 +129,8 @@ for($i=1;$i<=0;$i++) { echo "Row ".$i; } - $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY clp DESC Limit 10"); - $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE username = '".$session->username."' ORDER BY clp DESC Limit 1"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY clp DESC, id DESC Limit 10"); + $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE id = '".$session->uid."' ORDER BY clp DESC Limit 1"); ?>
".$i++.". ".$row['username']."
? ".$place1." ".$row['username']."".$row['username']."".$row['dp']."
@@ -143,7 +150,10 @@ username) { + if($row['id']==$session->uid) { + $place2 = $i; + } + if($row['id']==$session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; @@ -157,10 +167,10 @@ username) { + if($row['id'] == $session->uid) { echo ""; } else { echo ""; } - echo ""; - if($row['username'] == $session->username) { + echo ""; + if($row['id'] == $session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; } @@ -171,8 +181,8 @@ for($i=1;$i<=0;$i++) { echo "Row ".$i; } - $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY RR DESC Limit 10"); - $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE username = '".$session->username."' ORDER BY RR DESC Limit 1"); + $result = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE access<".(INCLUDE_ADMIN?"10":"8")." AND id > 5 AND tribe<=3 AND tribe > 0 ORDER BY RR DESC, id DESC Limit 10"); + $result2 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE id = '".$session->uid."' ORDER BY RR DESC Limit 1"); ?>
".$i++.". ".$row['username']."
? ".$place2." ".$row['username']."".$row['username']."".$row['clp']."
@@ -192,7 +202,10 @@ while($row = mysql_fetch_array($result)) { if($row['RR'] >= 0) { - if($row['username']==$session->username) { + if($row['id']==$session->uid) { + $place3 = $i; + } + if($row['id']==$session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; @@ -207,10 +220,10 @@ username) { + if($row['id']==$session->uid) { echo ""; } else { echo ""; } - echo ""; - if($row['username'] == $session->username) { + echo ""; + if($row['id']==$session->uid) { echo ""; } else { echo ""; } echo ""; echo ""; diff --git a/Templates/dorf3/5.tpl b/Templates/dorf3/5.tpl index 1071a864..b01deb66 100644 --- a/Templates/dorf3/5.tpl +++ b/Templates/dorf3/5.tpl @@ -24,13 +24,15 @@ array_unshift($units,$database->getUnit($vid)); echo ''; - + $movement = $database->getVillageMovement($vid); for ($i=($session->tribe-1)*10+1; $i<=($session->tribe)*10; $i++) { $uni['u'.$i] = 0; foreach($units as $unit) { $uni['u'.$i] += $unit['u'.$i]; $unit_total['u'.$i] += $unit['u'.$i]; } + $uni['u'.$i] += $movement['u'.$i]; + $unit_total['u'.$i] += $movement['u'.$i]; if($uni['u'.$i] !=0){$cl = '';}else{$cl = 'none';} echo ''; } @@ -39,6 +41,8 @@ $uni['hero'] += $unit['hero']; $unit_total['hero'] += $unit['hero']; } + $uni['hero'] += $movement['hero']; + $unit_total['hero'] += $movement['hero']; if($uni['hero'] !=0){$cl = '';}else{$cl = 'none';} echo ''; echo '';
".$i++.". ".$row['username']."
? ".$place3." ".$row['username']."".$row['username']."".$row['RR']."
'.$vil['name'].''.$uni['u'.$i].''.$uni['hero'].'