Merge pull request #97 from daffyyyy/some-changes

Fix for F

Commands.cs

@@ -210,7 +210,7 @@ namespace WeaponPaints
 							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
 							int.TryParse(selectedPaintID, out var paintID))
 						{
-							p!.Print(Localizer["f", selectedSkin]);
+							p!.Print(Localizer["wp_skin_menu_select", selectedSkin]);
 
 							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 							{

README.md

@@ -9,18 +9,19 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E2G0P2O) or [![Donate on Steam](https://github.com/Nereziel/cs2-WeaponPaints/assets/32937653/a0d53822-4ca7-4caf-83b4-e1a9b5f8c94e)](https://steamcommunity.com/tradeoffer/new/?partner=41515647&token=gW2W-nXE)
 
 ## Features
-- Changes only paint, seed and wear on weapons and knives;
+- Changes only paint, seed and wear on weapons and knives
-- MySQL based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need MySQL/Website;
+- MySQL based or global website at [weaponpaints.fun](https://weaponpaints.fun/), so you dont need MySQL/Website
-- Data sync on player connect;
+- Data sync on player connect
-- Added command **`!wp`** to refresh skins; ***(with cooldown in second can be configured)***
+- Added command **`!wp`** to refresh skins ***(with cooldown in second can be configured)***
-- Added command **`!ws`** to show website;
+- Added command **`!ws`** to show website
-- Added command **`!knife`** to show menu with knives;
+- Added command **`!knife`** to show menu with knives
-- Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**;
+- Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**
+- Translations support, submit a PR if you want to share your translation
 
 ## CS2 Server
-- Compile and copy plugin to plugins, [more info here](https://docs.cssharp.dev/guides/hello-world-plugin/);
+- Compile and copy plugin to plugins, [more info here](https://docs.cssharp.dev/guides/hello-world-plugin/)
-- Setup **`addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials;
+- Setup **`addons/counterstrikesharp/configs/plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
-- in **`addons/counterstrikesharp/configs/core.json`** set **FollowCS2ServerGuidelines** to **`false`**;
+- in **`addons/counterstrikesharp/configs/core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration
 <details>
@@ -69,12 +70,17 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 </details>
     
 ## Web install
-Disregard if the config is **`GlobalShare = true`**;
+Disregard if the config is **`GlobalShare = true`**
-- Requires PHP >= 7.4; ***(Tested on php ver **`8.2.3`** and nginx webserver)***
+- Requires PHP >= 7.4 ***(Tested on php ver **`8.2.3`** and nginx webserver)***
-- Copy website to web server; ***(Folder `img` not needed)***
+- Copy website to web server ***(Folder `img` not needed)***
-- Get [Steam API Key](https://steamcommunity.com/dev/apikey);
+- Get [Steam API Key](https://steamcommunity.com/dev/apikey)
-- Fill in database credentials and api key in `class/config.php`;
+- Fill in database credentials and api key in `class/config.php`
-- Visit website and login via steam;
+- Visit website and login via steam
+
+## Web Features
+- Basic website
+- Steam login/logout
+- Change knife, paint, seed and wear
 
 ## Known issues
 - Issue on Windows servers, no knives are given.

website/class/config.php

@@ -5,6 +5,8 @@ define('DB_NAME', '');
 define('DB_USER', '');
 define('DB_PASS', '');
 
+define('WEB_STYLE_DARK', true);
+
 define('STEAM_API_KEY', '');
 define('STEAM_DOMAIN_NAME', '');
 define('STEAM_LOGOUT_PAGE', '');

website/index.php

@@ -33,21 +33,18 @@ if (isset($_SESSION['steamid'])) {
 				}
 			}
 		}
-        header("Location: index.php");
+		header("Location: {$_SERVER['PHP_SELF']}");
 	}
 }
 ?>
 
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en"<?php if(WEB_STYLE_DARK) echo 'data-bs-theme="dark"'?>>
 
 <head>
 	<meta charset="utf-8">
-	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-		integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-		integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-		crossorigin="anonymous"></script>
 	<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.min.js"></script>
 	<link rel="stylesheet" href="style.css">
@@ -62,7 +59,7 @@ if (isset($_SESSION['steamid'])) {
 		loginbutton("rectangle");
 		echo "</h2></div>";
 	} else {
-		echo "<div class='bg-primary'>Your current weapon skin loadout<form action='' method='get'><button class='btn btn-secondary' name='logout' type='submit'>Logout</button></form></div>";
+		echo "<div class='bg-primary'><h2>Your current weapon skin loadout <a class='btn btn-danger' href='{$_SERVER['PHP_SELF']}'>Logout</a></h2> </div>";
 		echo "<div class='card-group mt-2'>";
 	?>
 
@@ -136,19 +133,19 @@ if (isset($_SESSION['steamid'])) {
 								?>
 							</select>
 							<br></br>
-<?php
+							<?php
-$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
+							$selectedSkinInfo = isset($selectedSkins[$defindex]) ? $selectedSkins[$defindex] : null;
-$steamid = $_SESSION['steamid'];
+							$steamid = $_SESSION['steamid'];
-$defindex = $defindex; // get defindex here, correct if not
+							$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]);
+							$queryCheck = $db->select("SELECT 1 FROM `wp_player_skins` WHERE `steamid` = :steamid AND `weapon_defindex` = :defindex", ["steamid" => $steamid, "defindex" => $defindex]);
-$hasSkinData = !empty($queryCheck);
+							$hasSkinData = !empty($queryCheck);
 
-if ($selectedSkinInfo && $hasSkinData):
+							if ($selectedSkinInfo && $hasSkinData) :
-?>
+							?>
 								<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#weaponModal<?php echo $defindex ?>">
 									Settings
 								</button>
-<?php else: ?>
+							<?php else : ?>
 								<button type="button" class="btn btn-primary" onclick="showSkinSelectionAlert()">
 									Settings
 								</button>
@@ -157,21 +154,21 @@ if ($selectedSkinInfo && $hasSkinData):
 										alert("You need to select a skin first.");
 									}
 								</script>
-<?php endif; ?>
+							<?php endif; ?>
 
-</div>
+					</div>
 
 					<?php
-// wear value 
+					// 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]);
+					$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;
+					$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);
+					$initialWearValue = isset($selectedSkinInfo['weapon_wear']) ? $selectedSkinInfo['weapon_wear'] : (isset($queryWear[0]['weapon_wear']) ? $queryWear[0]['weapon_wear'] : 0);
 
-// seed value 
+					// 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]);
+					$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;
+					$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);
+					$initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo['weapon_seed'] : (isset($querySeed[0]['weapon_seed']) ? $querySeed[0]['weapon_seed'] : 0);
-?>
+					?>
 
 
 					<div class="modal fade" id="weaponModal<?php echo $defindex ?>" tabindex="-1" role="dialog" aria-labelledby="weaponModalLabel<?php echo $defindex ?>" aria-hidden="true">
@@ -231,6 +228,7 @@ $initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo[
 					var wearInputElement = document.getElementById("wear<?php echo $defindex ?>");
 					wearInputElement.value = selectedValue;
 				}
+
 				function validateWear(inputElement) {
 					inputElement.value = inputElement.value.replace(/[^0-9]/g, '');
 				}
@@ -252,7 +250,14 @@ $initialSeedValue = isset($selectedSkinInfo['weapon_seed']) ? $selectedSkinInfo[
 		<?php } ?>
 	<?php } ?>
 	</div>
-
+	</div>
+	<div class="container">
+		<footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
+			<div class="col-md-4 d-flex align-items-center">
+				<span class="mb-3 mb-md-0 text-body-secondary">© 2023 <a href="https://github.com/Nereziel/cs2-WeaponPaints">Nereziel/cs2-WeaponPaints</a></span>
+			</div>
+		</footer>
+	</div>
 </body>
 
 </html>