Merge pull request #104 from daffyyyy/main

Small website optimization

lang/ua.json

@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
+	"wp_info_website": "Відвідайте веб-сайт {lime}{0},{default} щоб вибрати скин",
+	"wp_info_refresh": "Напишіть у чат {lime}!wp{default} для синхронізації вибраних скинів",
+	"wp_info_knife": "Напишіть у чат {lime}!knife,{default} щоб вибрати ніж",
+	"wp_command_cooldown": "{lightred}Ви не можете вибрати зброю зараз",
+	"wp_command_refresh_done": "{lime}Оновлення скинів для зброї",
+	"wp_knife_menu_select": "Ви вибрали скин {lime}{0}{default} для ножа",
+	"wp_knife_menu_kill": "Щоб правильно застосувати скин для ножа, напишіть у чат {lime}!kill{default}",
+	"wp_knife_menu_title": "Меню ножів",
+	"wp_skin_menu_weapon_title": "Меню зброї",
+	"wp_skin_menu_skin_title": "Виберіть скин для {lime}{0}{default}",
+	"wp_skin_menu_select": "Ви вибрали скин {lime}{0}{default} для зброї"
+}

lang/zh-cn.json

@@ -0,0 +1,14 @@
+{
+	"wp_prefix": "{lightblue}[武器皮肤] {default}",
+	"wp_info_website": "在线访问 {lime}{0}{default} 更改你的武器皮肤",
+	"wp_info_refresh": "输入 {lime}!wp{default} 进行在线皮肤同步",
+	"wp_info_knife": "输入 {lime}!knife{default} 打开刀菜单",
+	"wp_command_cooldown": "{lightred}皮肤同步刷新冷却中",
+	"wp_command_refresh_done": "{lime}刷新武器皮肤中",
+	"wp_knife_menu_select": "你选择了 {lime}{0}{default} 作为你的刀",
+	"wp_knife_menu_kill": "如需完全应用皮肤到刀上, 你需要输入 {lime}!kill{default} 自杀来进行刷新",
+	"wp_knife_menu_title": "刀菜单",
+	"wp_skin_menu_weapon_title": "武器菜单",
+	"wp_skin_menu_skin_title": "选择 {lime}{0}{default} 的皮肤",
+	"wp_skin_menu_select": "你选择了 {lime}{0}{default} 作为你的皮肤"
+}

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 "<div style='display: flex; flex-direction: column;align-items: center;justify-content: center;text-align: center;'><h2>Problem with database!</h2>";
+            die("<pre style='padding: 10px;text-wrap: balance; border: 2px solid #ed6bd3;background: #252525; color: #ed6bd3; width: 50%;'>" . $ex . "</pre>");
+        }
     }
     public function select($query, $bindings = []) {
         $STH = $this->PDO->prepare($query);

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;

website/getskins.php

@@ -0,0 +1,73 @@
+<?php
+$weapons = array (
+"weapon_deagle" => 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 "<pre>";
+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 ",<br>";
+	
+}
+//print_r($json);
+echo "</pre>";
+
+?>

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'])) {
 				<div class="card-body">
 					<?php
 					$actualKnife = $knifes[0];
-					foreach ($knifes as $knife) {
-						if ($selectedKnife['knife'] == $knife['weapon_name']) {
-							$actualKnife = $knife;
-							break;
+					if ($selectedKnife != null)
+					{
+						foreach ($knifes as $knife) {
+							if ($selectedKnife[0]['knife'] == $knife['weapon_name']) {
+								$actualKnife = $knife;
+								break;
+							}
 						}
 					}
 
@@ -88,7 +90,7 @@ if (isset($_SESSION['steamid'])) {
 							<option disabled>Select knife</option>
 							<?php
 							foreach ($knifes as $knifeKey => $knife) {
-								if ($selectedKnife['knife'] == $knife['weapon_name'])
+								if ($selectedKnife[0]['knife'] == $knife['weapon_name'])
 									echo "<option selected value=\"knife-{$knifeKey}\">{$knife['paint_name']}</option>";
 								else
 									echo "<option value=\"knife-{$knifeKey}\">{$knife['paint_name']}</option>";
@@ -108,9 +110,9 @@ if (isset($_SESSION['steamid'])) {
 						<?php
 						if (array_key_exists($defindex, $selectedSkins)) {
 							echo "<div class='card-header'>";
-							echo "<h5 class='card-title item-name'>{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]}</h5>";
+							echo "<h5 class='card-title item-name'>{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]["paint_name"]}</h5>";
 							echo "</div>";
-							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]]['image_url']}' class='skin-image'>";
+							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]['image_url']}' class='skin-image'>";
 						} else {
 							echo "<div class='card-header'>";
 							echo "<h5 class='card-title item-name'>{$default["paint_name"]}</h5>";
@@ -125,7 +127,7 @@ if (isset($_SESSION['steamid'])) {
 								<option disabled>Select skin</option>
 								<?php
 								foreach ($skins[$defindex] as $paintKey => $paint) {
-									if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex] == $paintKey)
+									if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex]['weapon_paint_id'] == $paintKey)
 										echo "<option selected value=\"{$defindex}-{$paintKey}\">{$paint['paint_name']}</option>";
 									else
 										echo "<option value=\"{$defindex}-{$paintKey}\">{$paint['paint_name']}</option>";
@@ -136,11 +138,8 @@ if (isset($_SESSION['steamid'])) {
 							<?php
 							$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
 							$steamid = $_SESSION['steamid'];
-							$defindex = $defindex; // get defindex here, correct if not
-							$queryCheck = $db->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) :
 							?>
 								<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#weaponModal<?php echo $defindex ?>">
 									Settings
@@ -160,14 +159,13 @@ if (isset($_SESSION['steamid'])) {
 
 					<?php
 					// wear value 
-					$queryWear = $db->select("SELECT `weapon_wear` FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $defindex]);
-					$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
-					$initialWearValue = isset($selectedSkinInfo['weapon_wear']) ? $selectedSkinInfo['weapon_wear'] : (isset($queryWear[0]['weapon_wear']) ? $queryWear[0]['weapon_wear'] : 0);
+					$selectedSkinInfo = isset($selectedSkins[$defindex]['weapon_paint_id']) ? $selectedSkins[$defindex] : null;
+					$queryWear = $selectedSkins[$defindex]['weapon_wear'] ?? 1.0;
+					$initialWearValue = isset($selectedSkinInfo['weapon_wear']) ? $selectedSkinInfo['weapon_wear'] : (isset($queryWear[0]['weapon_wear']) ? $queryWear[0] : 0.0);
 
 					// seed value 
-					$querySeed = $db->select("SELECT `weapon_seed` FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $defindex]);
-					$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
-					$initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo['weapon_seed'] : (isset($querySeed[0]['weapon_seed']) ? $querySeed[0]['weapon_seed'] : 0);
+					$querySeed = $selectedSkins[$defindex]['weapon_seed'] ?? 0;
+					$initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo['weapon_seed'] : 0;
 					?>
 
 
@@ -178,7 +176,7 @@ if (isset($_SESSION['steamid'])) {
 									<h5 class='card-title item-name'>
 										<?php
 										if (array_key_exists($defindex, $selectedSkins)) {
-											echo "{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]} Settings";
+											echo "{$skins[$defindex][$selectedSkins[$defindex]['weapon_paint_id']]["paint_name"]} Settings";
 										} else {
 											echo "{$default["paint_name"]} Settings";
 										}