Skip to content

Commit f06bc7c

Browse files
hobsRKMhobsRKM
authored
Merge pull request #145 from originalaidn/new-ws-skins&adding-unbans
new skins & adding unbans to sa_unbans table
2 parents 70085fd + ce99db4 commit f06bc7c

File tree

7 files changed

+15789
-9212
lines changed

7 files changed

+15789
-9212
lines changed

‎app/Http/Controllers/BansController.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,28 +108,47 @@ public function unban(Request $request, $dataId)
108108
// Start a database transaction
109109
DB::beginTransaction();
110110

111+
$adminId = DB::table('sa_admins')
112+
->where('player_steamid', Auth::user()->steam_id)
113+
->value('id');
114+
115+
if (!$adminId) {
116+
throw new \Exception('Admin not found in sa_admins table');
117+
}
118+
111119
foreach ($bans as $ban) {
112120
// Update each ban record to mark it as unbanned
113121
$ban->status = 'UNBANNED';
114122
$ban->ends = now();
115123
$ban->save();
124+
125+
DB::table('sa_unbans')->insert([
126+
'ban_id' => $ban->id,
127+
'admin_id' => $adminId,
128+
'reason' => 'Manual unban',
129+
'date' => now()
130+
]);
131+
116132
CommonHelper::sendActionLog('unban', $ban->id);
117133
}
118134

119135
// If all unbans are successful, commit the transaction
120136
DB::commit();
121137
return response()->json(['success' => true, 'message' => __('admins.bansSuccess')]);
138+
122139
} catch (\Exception $e) {
123140
// If any error occurs, rollback the transaction
124141
DB::rollBack();
125142
return response()->json(['success' => false, 'message' => $e->getMessage()]);
126143
}
127144
}
145+
128146
public function create()
129147
{
130148
$servers = SaServer::all();
131149
return view('admin.bans.add', ['servers' => $servers]);
132150
}
151+
133152
public function store(Request $request)
134153
{
135154
$validatedData = $request->validate([

‎app/Http/Controllers/ServerController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function getAllServerInfo(RconService $rcon)
7979
->where('server_id', $server->id)
8080
->where('status', 'ACTIVE')
8181
->exists()) {
82-
$banned = ' <span class="badge badge-light-danger mb-2 me-4">Banned</span>';
82+
$banned = ' <span class="badge badge-light-danger mb-2 me-4">' . __('admins.banned') . '</span>';
8383
}
8484
}
8585
$formattedServer = [

‎resources/images/default-gloves.png‎

80.8 KB
Loading

‎resources/json/collectibles.json‎

Lines changed: 255 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,261 @@
12741274
"name": "Quarterfinalist at PGL Copenhagen 2024",
12751275
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4936.png"
12761276
},
1277+
{
1278+
"id": "4951",
1279+
"name": "2025 Service Medal",
1280+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4951.png"
1281+
},
1282+
{
1283+
"id": "4952",
1284+
"name": "2025 Service Medal",
1285+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4952.png"
1286+
},
1287+
{
1288+
"id": "4953",
1289+
"name": "2025 Service Medal",
1290+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4953.png"
1291+
},
1292+
{
1293+
"id": "4954",
1294+
"name": "2025 Service Medal",
1295+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4954.png"
1296+
},
1297+
{
1298+
"id": "4955",
1299+
"name": "2025 Service Medal",
1300+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4955.png"
1301+
},
1302+
{
1303+
"id": "4956",
1304+
"name": "2025 Service Medal",
1305+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4956.png"
1306+
},
1307+
{
1308+
"id": "4958",
1309+
"name": "Shanghai 2024 Coin",
1310+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4958.png"
1311+
},
1312+
{
1313+
"id": "4959",
1314+
"name": "Shanghai 2024 Silver Coin",
1315+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4959.png"
1316+
},
1317+
{
1318+
"id": "4960",
1319+
"name": "Shanghai 2024 Gold Coin",
1320+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4960.png"
1321+
},
1322+
{
1323+
"id": "4961",
1324+
"name": "Shanghai 2024 Diamond Coin",
1325+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4961.png"
1326+
},
1327+
{
1328+
"id": "4974",
1329+
"name": "Champion at Perfect World Shanghai 2024",
1330+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4974.png"
1331+
},
1332+
{
1333+
"id": "4975",
1334+
"name": "Finalist at Perfect World Shanghai 2024",
1335+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4975.png"
1336+
},
1337+
{
1338+
"id": "4976",
1339+
"name": "Semifinalist at Perfect World Shanghai 2024",
1340+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4976.png"
1341+
},
1342+
{
1343+
"id": "4977",
1344+
"name": "Quarterfinalist at Perfect World Shanghai 2024",
1345+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4977.png"
1346+
},
1347+
{
1348+
"id": "4986",
1349+
"name": "Premier Season One Medal",
1350+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4986.png"
1351+
},
1352+
{
1353+
"id": "4987",
1354+
"name": "Premier Season Two Medal",
1355+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4987.png"
1356+
},
1357+
{
1358+
"id": "4988",
1359+
"name": "Premier Season Two Medal",
1360+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4988.png"
1361+
},
1362+
{
1363+
"id": "4989",
1364+
"name": "Premier Season Two Medal",
1365+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4989.png"
1366+
},
1367+
{
1368+
"id": "4990",
1369+
"name": "Premier Season Two Medal",
1370+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4990.png"
1371+
},
1372+
{
1373+
"id": "4991",
1374+
"name": "Premier Season Two Medal",
1375+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4991.png"
1376+
},
1377+
{
1378+
"id": "4992",
1379+
"name": "Premier Season Two Medal",
1380+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4992.png"
1381+
},
1382+
{
1383+
"id": "4993",
1384+
"name": "Premier Season Two Medal",
1385+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4993.png"
1386+
},
1387+
{
1388+
"id": "4994",
1389+
"name": "Premier Season Two Medal",
1390+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4994.png"
1391+
},
1392+
{
1393+
"id": "4995",
1394+
"name": "Premier Season Two Medal",
1395+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4995.png"
1396+
},
1397+
{
1398+
"id": "4996",
1399+
"name": "Premier Season Two Medal",
1400+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4996.png"
1401+
},
1402+
{
1403+
"id": "4997",
1404+
"name": "Premier Season Two Medal",
1405+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4997.png"
1406+
},
1407+
{
1408+
"id": "4998",
1409+
"name": "Premier Season Two Medal",
1410+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4998.png"
1411+
},
1412+
{
1413+
"id": "4999",
1414+
"name": "Premier Season Two Medal",
1415+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-4999.png"
1416+
},
1417+
{
1418+
"id": "5000",
1419+
"name": "Premier Season Two Medal",
1420+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5000.png"
1421+
},
1422+
{
1423+
"id": "5001",
1424+
"name": "Premier Season Two Medal",
1425+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5001.png"
1426+
},
1427+
{
1428+
"id": "5002",
1429+
"name": "Premier Season Two Medal",
1430+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5002.png"
1431+
},
1432+
{
1433+
"id": "5003",
1434+
"name": "Premier Season Two Medal",
1435+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5003.png"
1436+
},
1437+
{
1438+
"id": "5004",
1439+
"name": "Premier Season Two Medal",
1440+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5004.png"
1441+
},
1442+
{
1443+
"id": "5005",
1444+
"name": "Premier Season Two Medal",
1445+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5005.png"
1446+
},
1447+
{
1448+
"id": "5006",
1449+
"name": "Premier Season Two Medal",
1450+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5006.png"
1451+
},
1452+
{
1453+
"id": "5007",
1454+
"name": "Premier Season Two Medal",
1455+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5007.png"
1456+
},
1457+
{
1458+
"id": "5008",
1459+
"name": "Premier Season Two Medal",
1460+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5008.png"
1461+
},
1462+
{
1463+
"id": "5009",
1464+
"name": "Premier Season Two Medal",
1465+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5009.png"
1466+
},
1467+
{
1468+
"id": "5010",
1469+
"name": "Premier Season Two Medal",
1470+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5010.png"
1471+
},
1472+
{
1473+
"id": "5011",
1474+
"name": "Premier Season Two Medal",
1475+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5011.png"
1476+
},
1477+
{
1478+
"id": "5012",
1479+
"name": "Premier Season Two Medal",
1480+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5012.png"
1481+
},
1482+
{
1483+
"id": "5013",
1484+
"name": "Premier Season Two Medal",
1485+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5013.png"
1486+
},
1487+
{
1488+
"id": "5014",
1489+
"name": "Premier Season Two Medal",
1490+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5014.png"
1491+
},
1492+
{
1493+
"id": "5015",
1494+
"name": "Premier Season Two Medal",
1495+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5015.png"
1496+
},
1497+
{
1498+
"id": "5016",
1499+
"name": "Premier Season Two Medal",
1500+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5016.png"
1501+
},
1502+
{
1503+
"id": "5017",
1504+
"name": "Premier Season Two Medal",
1505+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5017.png"
1506+
},
1507+
{
1508+
"id": "5018",
1509+
"name": "Premier Season Two Medal",
1510+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5018.png"
1511+
},
1512+
{
1513+
"id": "5019",
1514+
"name": "Premier Season Two Medal",
1515+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5019.png"
1516+
},
1517+
{
1518+
"id": "5020",
1519+
"name": "Premier Season Two Medal",
1520+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5020.png"
1521+
},
1522+
{
1523+
"id": "5021",
1524+
"name": "Premier Season Two Medal",
1525+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5021.png"
1526+
},
1527+
{
1528+
"id": "5022",
1529+
"name": "Premier Season Two Medal",
1530+
"image": "https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/collectible-5022.png"
1531+
},
12771532
{
12781533
"id": "6101",
12791534
"name": "Dust II Pin",

0 commit comments

Comments
 (0)