From 0b3f689e4c30ef9c0283c51f520ebae4cbfea803 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Wed, 22 Nov 2017 19:43:58 +0100 Subject: [PATCH] fix: beginner's protection shown wrong date and time in profile picture --- Admin/Templates/playeradditionalinfo.tpl | 2 +- Admin/admin.php | 129 ++++++++++------------- Templates/Profile/medal.php | 12 +-- src/Utils/DateTime.php | 45 ++++++++ 4 files changed, 105 insertions(+), 83 deletions(-) create mode 100644 src/Utils/DateTime.php diff --git a/Admin/Templates/playeradditionalinfo.tpl b/Admin/Templates/playeradditionalinfo.tpl index 73cb1f2a..ccb4c256 100644 --- a/Admin/Templates/playeradditionalinfo.tpl +++ b/Admin/Templates/playeradditionalinfo.tpl @@ -98,7 +98,7 @@ else { $tsdiffact = $datetime - $now; - $timetoecho = $timeformat->getTimeFormat($tsdiffact); + $timetoecho = \App\Utils\DateTime::getTimeFormat($tsdiffact); echo ''; echo " $timetoecho"; } diff --git a/Admin/admin.php b/Admin/admin.php index 1069e6d7..e7aa1351 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -22,30 +22,7 @@ include_once("../GameEngine/config.php"); include_once("../GameEngine/Database.php"); include_once ("../GameEngine/Lang/" . LANG . ".php"); include_once("../GameEngine/Admin/database.php"); -include_once("../GameEngine/Data/buidata.php"); - -class timeFormatGenerator -{ - public function getTimeFormat($time) - { - $min = 0; - $hr = 0; - $days = 0; - while ($time >= 60): $time -= 60; $min += 1; endwhile; - while ($min >= 60): $min -= 60; $hr += 1; endwhile; - while ($hr >= 24): $hr -= 24; $days +=1; endwhile; - if ($min < 10) - { - $min = "0".$min; - } - if($time < 10) - { - $time = "0".$time; - } - return $days ." day ".$hr."h ".$min."m ".$time."s"; - } -}; -$timeformat = new timeFormatGenerator; +include_once("../GameEngine/Data/buidata.php"); include('Templates/ver.tpl'); include('Templates/update_latest.tpl'); @@ -58,131 +35,131 @@ if (!empty($_GET['p'])) { case 'server_info': $subpage = 'Server Info'; break; - + case 'online': $subpage = 'Online Users'; break; - + case 'notregistered': $subpage = 'Players Not Activated'; break; - + case 'inactive': $subpage = 'Players Inactivate'; break; - + case 'report': $subpage = 'Players Reported'; break; - + case 'map': $subpage = 'Map'; break; - + case 'search': $subpage = 'General Search'; break; - + case 'message': $subpage = 'Search IGMs/Reports'; break; - + case 'ban': $subpage = 'Ban/Unban Players'; break; - + case 'maintenence': $subpage = 'Server Maintenence'; break; - + case 'cleanban': $subpage = 'Clean Banlist Data'; break; - + case 'gold': $subpage = 'Give All Free Gold'; break; - + case 'usergold': $subpage = 'Give Free Gold To Specific User'; break; - + case 'maintenenceResetGold': $subpage = 'Reset Gold'; break; - + case 'delmedal': $subpage = 'Delete Player Medals'; break; - + case 'delallymedal': $subpage = 'Delete Ally Medals'; break; - + case 'givePlus': $subpage = 'Give All Plus'; break; - + case 'maintenenceResetPlus': $subpage = 'Reset Plus'; break; - + case 'givePlusRes': $subpage = 'Give All Res Bonus'; break; - + case 'maintenenceResetPlusBonus': $subpage = 'Reset Res Bonus'; break; - + case 'addUsers': $subpage = 'Create Users'; break; - + case 'natarend': $subpage = 'Add WW Villages'; break; - + case 'natarbuildingplan': $subpage = 'Add WW Building Plan Villages'; break; - + case 'admin_log': $subpage = 'Admin Log'; break; - + case 'config': $subpage = 'Server Settings'; break; - + case 'editServerSet': $subpage = 'Server Configuration'; break; - + case 'editPlusSet': $subpage = 'PLUS Settings'; break; - + case 'editLogSet': $subpage = 'Log Settings'; break; - + case 'editNewsboxSet': $subpage = 'NewsBox Settings'; break; - + case 'editExtraSet': $subpage = 'Extra Settings'; break; - + case 'editAdminInfo': $subpage = 'Edit Admin Information'; break; - + case 'resetServer': $subpage = 'Server Resetting'; break; - + case 'player': if (!empty($_GET['uid'])) { $displayarray = $database->getUserArray($_GET['uid'],1); @@ -192,7 +169,7 @@ if (!empty($_GET['p'])) { $subpage = 'Player Details (no player)'; } break; - + case 'editUser': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -201,7 +178,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Player (no player)'; } break; - + case 'deletion': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -210,7 +187,7 @@ if (!empty($_GET['p'])) { $subpage = 'Delete Player (no player)'; } break; - + case 'Newmessage': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -219,7 +196,7 @@ if (!empty($_GET['p'])) { $subpage = 'Compose Message'; } break; - + case 'editPlus': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -228,7 +205,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Plus & Resources'; } break; - + case 'editSitter': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -237,7 +214,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Sitters '; } break; - + case 'editOverall': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -246,7 +223,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Off & Def'; } break; - + case 'editWeek': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -255,7 +232,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Weekly Off & Def'; } break; - + case 'userlogin': if (!empty($_GET['uid'])) { $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $_GET['uid'])); @@ -264,7 +241,7 @@ if (!empty($_GET['p'])) { $subpage = 'User Logins (no player)'; } break; - + case 'userillegallog': if (!empty($_GET['uid'])) { $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $_GET['uid'])); @@ -273,7 +250,7 @@ if (!empty($_GET['p'])) { $subpage = 'User Illegals Log (no player)'; } break; - + case 'editHero': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -282,7 +259,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Hero'; } break; - + case 'editAdditional': if (!empty($_GET['uid'])) { $user = $database->getUserArray($_GET['uid'],1); @@ -291,7 +268,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Additional Info'; } break; - + case 'village': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -301,7 +278,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Village (no village)'; } break; - + case 'editResources': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -311,7 +288,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Resources (no village)'; } break; - + case 'addTroops': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -321,7 +298,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Troops (no village)'; } break; - + case 'addABTroops': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -331,7 +308,7 @@ if (!empty($_GET['p'])) { $subpage = 'Upgrade Troops (no village)'; } break; - + case 'editVillage': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -341,7 +318,7 @@ if (!empty($_GET['p'])) { $subpage = 'Edit Village (no village)'; } break; - + case 'villagelog': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -351,7 +328,7 @@ if (!empty($_GET['p'])) { $subpage = 'Build Log (no village)'; } break; - + case 'techlog': if (!empty($_GET['did'])) { $village = $database->getVillage($_GET['did']); @@ -449,8 +426,8 @@ if (!empty($_GET['p'])) { function go_url(url) { location=url; return(false); - } - + } +
diff --git a/Templates/Profile/medal.php b/Templates/Profile/medal.php index abcfb3c7..99cb487a 100644 --- a/Templates/Profile/medal.php +++ b/Templates/Profile/medal.php @@ -1,4 +1,4 @@ -getUserField($_SESSION['username'], 'gpack', 1); @@ -24,14 +24,14 @@ $gpack= $separator.GP_LOCATE; } else { $gpack= $separator.$gpack_load; - } + } //de bird if($displayarray['protect'] > time()){ $secondsDiff = $displayarray['protect'] - time(); $remainingDay = floor($secondsDiff/(3600*24)); -$left = "$remainingDay days ".date("H:i:s", $secondsDiff); +$left = \App\Utils\DateTime::getTimeFormat($secondsDiff); $profiel = preg_replace("/\[#0]/is",'', $profiel, 1); } else { $geregistreerd=date('d-m-Y', ($displayarray['regtime'])); @@ -169,7 +169,7 @@ switch ($medal['categorie']) { break; case "10": $titel="Rank Climbers of the week."; - $woord="Ranks"; + $woord="Ranks"; break; case "11": $titel="Receiving this medal shows that you were in the top 3 of the Rank Climbers of the week ".$medal['points']." in a row."; @@ -195,7 +195,7 @@ switch ($medal['categorie']) { $titel="Receiving this medal shows that you were in the top 10 Rank Climbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - + } diff --git a/src/Utils/DateTime.php b/src/Utils/DateTime.php new file mode 100644 index 00000000..467da31b --- /dev/null +++ b/src/Utils/DateTime.php @@ -0,0 +1,45 @@ += 60): $time -= 60; $min += 1; endwhile; + while ($min >= 60): $min -= 60; $hr += 1; endwhile; + while ($hr >= 24): $hr -= 24; $days +=1; endwhile; + if ($min < 10) + { + $min = "0".$min; + } + if($time < 10) + { + $time = "0".$time; + } + return $days ." day ".$hr."h ".$min."m ".$time."s"; + } + +} \ No newline at end of file