From e338bebaece77613ce49d05b4ca0568235d8b868 Mon Sep 17 00:00:00 2001 From: daffyyyy Date: Mon, 18 Dec 2023 01:51:24 +0100 Subject: [PATCH] Small website optimization --- website/class/database.php | 9 ++++- website/class/utils.php | 6 +++- website/getskins.php | 73 ++++++++++++++++++++++++++++++++++++++ website/index.php | 44 +++++++++++------------ 4 files changed, 107 insertions(+), 25 deletions(-) create mode 100644 website/getskins.php diff --git a/website/class/database.php b/website/class/database.php index 80483e2f..2b4550f6 100644 --- a/website/class/database.php +++ b/website/class/database.php @@ -4,7 +4,14 @@ class DataBase { private $PDO; public function __construct() { - $this->PDO = new PDO("mysql:host=".DB_HOST."; port=".DB_PORT."; dbname=".DB_NAME, DB_USER, DB_PASS, array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8")); + try { + $this->PDO = new PDO("mysql:host=".DB_HOST."; port=".DB_PORT."; dbname=".DB_NAME, DB_USER, DB_PASS, array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8")); + } + catch(PDOException $ex) + { + echo "

Problem with database!

"; + die("
" . $ex . "
"); + } } public function select($query, $bindings = []) { $STH = $this->PDO->prepare($query); diff --git a/website/class/utils.php b/website/class/utils.php index 2bc90926..28a61bb0 100644 --- a/website/class/utils.php +++ b/website/class/utils.php @@ -88,7 +88,11 @@ class UtilsClass $selected = []; foreach ($temp as $weapon) { - $selected[$weapon['weapon_defindex']] = $weapon['weapon_paint_id']; + $selected[$weapon['weapon_defindex']] = [ + 'weapon_paint_id' => $weapon['weapon_paint_id'], + 'weapon_seed' => $weapon['weapon_seed'], + 'weapon_wear' => $weapon['weapon_wear'], + ]; } return $selected; diff --git a/website/getskins.php b/website/getskins.php new file mode 100644 index 00000000..95539e97 --- /dev/null +++ b/website/getskins.php @@ -0,0 +1,73 @@ + 1, +"weapon_elite" => 2, +"weapon_fiveseven" => 3, +"weapon_glock" => 4, +"weapon_ak47" => 7, +"weapon_aug" => 8, +"weapon_awp" => 9, +"weapon_famas" => 10, +"weapon_g3sg1" => 10, +"weapon_galilar" => 13, +"weapon_m249" => 14, +"weapon_m4a1" => 16, +"weapon_mac10" => 17, +"weapon_p90" => 19, +"weapon_mp5sd" => 23, +"weapon_ump45" => 24, +"weapon_xm1014" => 25, +"weapon_bizon" => 26, +"weapon_mag7" => 27, +"weapon_negev" => 28, +"weapon_sawedoff" => 29, +"weapon_tec9" => 30, +"weapon_hkp2000" => 32, +"weapon_mp7" => 33, +"weapon_mp9" => 34, +"weapon_nova" => 35, +"weapon_p250" => 36, +"weapon_scar20" => 38, +"weapon_sg556" => 39, +"weapon_ssg08" => 40, +"weapon_m4a1_silencer" => 60, +"weapon_usp_silencer" => 61, +"weapon_cz75a" => 63, +"weapon_revolver" => 64, +"weapon_bayonet" => 500, +"weapon_knife_css" => 503, +"weapon_knife_flip" => 505, +"weapon_knife_gut" => 506, +"weapon_knife_karambit" => 507, +"weapon_knife_m9_bayonet" => 508, +"weapon_knife_tactical" => 509, +"weapon_knife_falchion" => 512, +"weapon_knife_survival_bowie"=> 514, +"weapon_knife_butterfly" => 515, +"weapon_knife_push" => 516, +"weapon_knife_cord" => 517, +"weapon_knife_canis" => 518, +"weapon_knife_ursus" => 519, +"weapon_knife_gypsy_jackknife" => 520, +"weapon_knife_outdoor" => 521, +"weapon_knife_stiletto" => 522, +"weapon_knife_widowmaker" => 523, +"weapon_knife_skeleton" => 525); +$json = json_decode(file_get_contents('skins.json')); +echo "
";
+foreach($json as $skin)
+{
+	if(!str_contains($skin->weapon->id, "weapon_")) continue;
+	$name = $skin->name;
+	$name = str_replace("'","\'",$name);
+	$weapon = $skin->weapon->id;
+	$image = $skin->image;
+	$paint = $skin->paint_index;
+	echo "('{$weapon}', {$weapons[$weapon]}, {$paint}, '{$image}', '{$name}')";
+	echo ",
";
+	
+}
+//print_r($json);
+echo "
"; + +?> diff --git a/website/index.php b/website/index.php index 5339448e..dca1be27 100644 --- a/website/index.php +++ b/website/index.php @@ -7,14 +7,13 @@ require_once 'class/utils.php'; $db = new DataBase(); if (isset($_SESSION['steamid'])) { - include('steamauth/userInfo.php'); - $steamid = $steamprofile['steamid']; + $steamid = $_SESSION['steamid']; $weapons = UtilsClass::getWeaponsFromArray(); $skins = UtilsClass::skinsFromJson(); - $querySelected = $query3 = $db->select("SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]); + $querySelected = $db->select("SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]); $selectedSkins = UtilsClass::getSelectedSkins($querySelected); - $selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid])[0]; + $selectedKnife = $db->select("SELECT * FROM `wp_player_knife` WHERE `wp_player_knife`.`steamid` = :steamid", ["steamid" => $steamid]); $knifes = UtilsClass::getKnifeTypes(); if (isset($_POST['forma'])) { @@ -68,10 +67,13 @@ if (isset($_SESSION['steamid'])) {
Select knife $knife) { - if ($selectedKnife['knife'] == $knife['weapon_name']) + if ($selectedKnife[0]['knife'] == $knife['weapon_name']) echo ""; else echo ""; @@ -108,9 +110,9 @@ if (isset($_SESSION['steamid'])) { "; - echo "
{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]}
"; + echo "
{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]["paint_name"]}
"; echo "
"; - echo ""; + echo ""; } else { echo "
"; echo "
{$default["paint_name"]}
"; @@ -125,7 +127,7 @@ if (isset($_SESSION['steamid'])) { $paint) { - if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex] == $paintKey) + if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex]['weapon_paint_id'] == $paintKey) echo ""; else echo ""; @@ -136,11 +138,8 @@ if (isset($_SESSION['steamid'])) { select("SELECT 1 FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :defindex", ["steamid" => $steamid, "defindex" => $defindex]); - $hasSkinData = !empty($queryCheck); - if ($selectedSkinInfo && $hasSkinData) : + if ($selectedSkinInfo) : ?>