diff --git a/Admin/Templates/player.tpl b/Admin/Templates/player.tpl index d282948d..32f2d1df 100644 --- a/Admin/Templates/player.tpl +++ b/Admin/Templates/player.tpl @@ -21,20 +21,14 @@ if(isset($id)) $varray = $database->getProfileVillages($id); $refreshiconfrm = "../img/admin/refresh.png"; $refreshicon = ""; - if($user) - { + if($user){ $totalpop = 0; - foreach($varray as $vil) - { - $totalpop += $vil['pop']; - } + foreach($varray as $vil) $totalpop += $vil['pop']; + include('search2.tpl'); echo "
"; $deletion = false; - if($deletion) - { - include("playerdeletion.tpl"); - } + if($deletion) include("playerdeletion.tpl"); include("playerinfo.tpl"); include("playerheroinfo.tpl"); @@ -88,9 +82,6 @@ if(isset($id)) \ No newline at end of file diff --git a/Admin/Templates/playermedals.tpl b/Admin/Templates/playermedals.tpl index 86d8c003..11c62108 100644 --- a/Admin/Templates/playermedals.tpl +++ b/Admin/Templates/playermedals.tpl @@ -1,6 +1,3 @@ -
- - @@ -16,36 +13,33 @@ - + 0) - { - foreach($varmedal as $medal) - { - $titel="Bonus"; - switch ($medal['categorie']) - { - case "1": $titel="Attackers"; break; - case "2": $titel="Defenders"; break; - case "3": $titel="Climbers"; break; - case "4": $titel="Robbers"; break; - case "5": $titel="Top 10 Att and Def"; break; - case "6": $titel="Top 3 Att, ".$medal['points']." in a row"; break; - case "7": $titel="Top 3 Def,".$medal['points']." in a row"; break; - case "8": $titel="Top 3 Climber, ".$medal['points']." in a row"; break; - case "9": $titel="Top 3 Robber, ".$medal['points']." in a row"; break; - case "10": $titel="Climber of the week"; break; - case "11": $titel="Top 3 Climber, ".$medal['points']." in a row"; break; - case "12": $titel="Top 10 Attacker, ".$medal['points']." in a row"; break; + elseif(!empty($varmedal)){ + foreach($varmedal as $medal){ + $title = "Bonus"; + switch ($medal['categorie']){ + case 1: $title = "Attackers"; break; + case 2: $title = "Defenders"; break; + case 3: $title = "Climbers"; break; + case 4: $title = "Robbers"; break; + case 5: $title = "Top 10 Att and Def"; break; + case 6: $title = "Top 3 Att, ".$medal['points']." in a row"; break; + case 7: $title = "Top 3 Def,".$medal['points']." in a row"; break; + case 8: $title = "Top 3 Climber, ".$medal['points']." in a row"; break; + case 9: $title = "Top 3 Robber, ".$medal['points']." in a row"; break; + case 10: $title = "Climber of the week"; break; + case 11: $title = "Top 3 Climber, ".$medal['points']." in a row"; break; + case 12: $title = "Top 10 Attacker, ".$medal['points']." in a row"; break; } - $title = $titel; + $rank = $medal['plaats']; - if($rank == '0') { $rank = "

Bonus

"; } else { $rank = $rank; } + if($rank == 0) $rank = "

Bonus

"; + $week = $medal['week']; $points = $medal['points']; - if($points == '') { $points = "

Bonus

"; } else { $points = $points; } + if($points == '') $points = "

Bonus

"; echo" @@ -54,38 +48,36 @@ - + + + "; } $averagerank = 0; - foreach($varmedal as $medal) - { + foreach($varmedal as $medal){ $rank = $medal['plaats']; - if($rank > 0) - { - if(is_numeric($rank)) - { - $i = $i + 1; - $averagerank = $averagerank + $medal['plaats']; - } - else - { - $averagerank = $averagerank + 0; + if($rank > 0){ + if(is_numeric($rank)){ + $i++; + $averagerank += $medal['plaats']; } } } - $average = $averagerank / $i; + $average = round($averagerank / $i, 1); echo ""; } ?> - +
This player has no medals yet
This player has no medals yet
$week $points - - + + + +
Average Rank$averageDelete All -
- - -
- 		+
+ + + +
+
diff --git a/Admin/Templates/punish.tpl b/Admin/Templates/punish.tpl index 0ac9b25b..800c69d1 100644 --- a/Admin/Templates/punish.tpl +++ b/Admin/Templates/punish.tpl @@ -30,20 +30,20 @@ $active = $admin->getUserActive(); -
+
-
+ @@ -88,5 +88,5 @@ $active = $admin->getUserActive(); - +
\ No newline at end of file diff --git a/GameEngine/Admin/Mods/medals.php b/GameEngine/Admin/Mods/medals.php index 2328084c..34294590 100755 --- a/GameEngine/Admin/Mods/medals.php +++ b/GameEngine/Admin/Mods/medals.php @@ -24,23 +24,19 @@ for ($i = 0; $i < 5; $i++) { include_once($autoprefix."GameEngine/Database.php"); -if (!isset($_SESSION)) session_start(); -if($_SESSION['access'] < ADMIN) die("Access Denied: You are not Admin!"); +if(isset($_POST['medalid']) && !empty($_POST['medalid']) && is_numeric($_POST['medalid'])){ + $medalID = (int) $_POST['medalid']; + mysqli_query($database->dblink, "UPDATE ".TB_PREFIX."medal set del = 1 WHERE id = ".$medalID.""); +} +elseif(isset($_POST['userid']) && !empty($_POST['userid']) && is_numeric($_POST['userid'])){ + $userID = (int) $_POST['userid']; + mysqli_query($database->dblink, "UPDATE ".TB_PREFIX."medal set del = 1 WHERE userid = ".$userID.""); +} -$medalid = (int) $_POST['medalid']; -$uid = (int) $_POST['uid']; -$admid = (int) $_POST['admid']; +$admidID = (int) $_SESSION['id']; +$name = $database->getUserField($adminID, "name", 0); +//TODO: Make a dedicated method for logging +mysqli_query($database->dblink, "INSERT INTO ".TB_PREFIX."admin_log values (0, $admid, 'Deleted medal id [#".$medalid."] from the user $name ',".time().")"); -mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."medal set del = 1 WHERE id = ".$medalid.""); - -$name = mysqli_fetch_array(mysqli_query($GLOBALS["link"], "SELECT name FROM ".TB_PREFIX."users WHERE id= ".$uid.""), MYSQLI_ASSOC); -$name = $name['name']; - -mysqli_query($GLOBALS["link"], "Insert into ".TB_PREFIX."admin_log values (0,$admid,'Deleted medal id [#".$medalid."] from the user $name ',".time().")"); - - -$deleteweek = (int) $_POST['medalweek']; -mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."medal set del = 1 WHERE week = ".$deleteweek.""); - -header("Location: ../../../Admin/admin.php?p=player&uid=".$uid.""); +header("Location: ../../../Admin/admin.php?p=player&uid=".$_POST['uid'].""); ?> \ No newline at end of file