From 95ed2d8d6d60873c801140e191caa3ecc2fe6458 Mon Sep 17 00:00:00 2001
From: ui0ppk <altandf4alt@gmail.com>
Date: Sun, 5 Feb 2023 16:22:50 +0200
Subject: [PATCH] join fixes

---
 game/.rnd     | Bin 0 -> 1024 bytes
 game/Join.php |   9 ++++++---
 register.php  |   5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 game/.rnd

diff --git a/game/.rnd b/game/.rnd
new file mode 100644
index 0000000000000000000000000000000000000000..d2e98c38bd376ce7f5467dc8bdd9480b7b36a329
GIT binary patch
literal 1024
zcmV+b1poV~01p$B@7=^YzVj&0tvxvtM^Kw?q=~Q7`jt$!cSV*{f%IB(BMIzHe{`FS
ziq(sYO)qzvuunD+z$PA`qKEVwOmy_HyG5KoTx$TS|A_x@B+88jvyI3dB>d_E40HWE
zvcoJ|#svLAe{t7XfJZ@s6HgtXAY2r0esBgrmH3nZm&a3J-a&6)5?}R33nOf}BDY=x
z;Ze_S?44(SI~#$ga=H-d&0WK^sdMu%niib*wNE$}P62^AW0yFHQ_@XMFqphWULJ5A
zLaF>L9a|ye=ksL9QG)~Z-fl$HRBXR^*1ssq+KYDa(kX1=D9bY<nKFz(q{n(JpkrM<
z{!?))s<aH{pSR<~Coxn~!UqBy;VpaVgW7Vpvg&iEc8etz64BBzyYI1f!x8!T>8s~a
z`mczUm1%eR!ze|%XIoHIKjj`$H*bXIB;j;l0cRD*I)`?J!b%+euSX4jsVZ%}M697E
z<1&ZFN{{+nA+}cn;`oLtb4DWZe=mNL?2obOsPIA&pR8{s?#T2}!(|dAjIrGZgdRis
zx**2|+Lq9Ae$unb5OsT^^CkoV+&Mj>ql%e*e7j=++!wX@5E*Yq{Ev=mMfotU{jd3R
z<nf_)3zg=Puq40rz{!<FTxR@0HS`1xJj+fiF~3AFUjEbeyOteQc=IB?Yk8|moE6Y;
zB)uU&1lWpKV2`1%eeluGio@ou(5mjOq$+YTU?->jpgiv@T%cOCO3^T%JwS&Yi!}hv
zBs_dB@s!op4|bK|P-%6bCN_VXxoU&bYk(U-hA#=kS3Gz>DAxC3-45v#@VL%oE82L_
zP1vl~7uqjfF3Pnrz-)_F`B5&?r+_o@qF~?4r0-2NgPhnsqyoScMc4$waR5mBqAZIF
zAbp25lj3*Icnp(A=2)YYo?=@*3P9cF#Tz5dS(N+9<Y8!4;wP6+O5Wf8IUzs@33wRY
zB=st!@kYmdBI0>Jvj7@Tgiz{6hc2}cDKg44G$ro%j;rU4S%NZaMup<w9K_|SJ0J`$
zbC*ZL)%dDKI0b;CfGIuI4SX*m<BiO^;*t)#i?G-#F7|z$1j#_5UyfaWT~i_~B=S24
zteL%*T<*2^u0}`U;mDJ@lC{K(7XSAW{d=R<<YRr$EB3@rxZ7@d;m_DgiG)+QOA<WC
ztti6bJ<{s0OYA)CQGCOJzKLYUxx!0Ye|d?*+K=IiWJt;TPEx|PNlOYdlP}Au5ytDf
zNcacJe=|;yg$Z}w6{}Ap++bHeZG&?$m<Sw{!OG`}32X!U)&AUJ`r!XG*q&DsRm!gd
u(Ar1)mrW^6avLmhct}!}i8yZ37}Ci-IF)bRTW(BxWN~MqIDh*<Gf2L85&vTV

literal 0
HcmV?d00001

diff --git a/game/Join.php b/game/Join.php
index e230985..2d429c8 100644
--- a/game/Join.php
+++ b/game/Join.php
@@ -1,16 +1,19 @@
 <?php
+session_start();
 require_once '../core/config.php';
+require_once '../core/classes/user.php';
 
 header('content-type:application/json');
+$user = new User($con, $_SESSION['user']);
 function sign($script, $key) {
-$signature = "";
+$signature = openssl_pkey_new();
 openssl_sign($script, $signature, $key, OPENSSL_ALGO_SHA1);
 return base64_encode($signature);
 }
 
 $joinUser = [
-    "id" => rand(1,getrandmax()),
-    "username" => "User".rand(1,getrandmax()),
+    "id" => $_SESSION['user'],
+    "username" => $user->getUsername(),
     "mship" => "None"
 ];
 
diff --git a/register.php b/register.php
index 0294eba..7eb3e36 100644
--- a/register.php
+++ b/register.php
@@ -19,11 +19,11 @@ if(isset($_POST['submit'])) {
 	$username = $_POST['username'];
 	$password = $_POST['pass'];
 	$passwordconfirm = $_POST['passconfirm'];
-	echo '<script>
+	/*echo '<script>
     if ( window.history.replaceState ) {
         window.history.replaceState( null, null, window.location.href );
     }
-</script>';
+</script>';*/
 	$user = new User($con, $user->getID($con, $username));
     if(preg_match('/^[a-zA-Z0-9]+$/', $username) == 0) {
         $usernamespecialchar = true;
@@ -53,7 +53,6 @@ if(isset($_POST['submit'])) {
 			$query->bindParam(':username', $username);
 			$query->bindParam(':password', $password);
             $query->execute();
-			$_POST['success'] = 1;
 			$_SESSION["user"] = $user->getID($con, $username);	
 			header("Location: /home");
   	        } else {