Diff between 75f6c547887a74bb2a7c71f1dc39ca1fd8fb860c and 07ad663b0aa8e5f6b0c5881829c4d1f07e8706a7

Changed Files

File Additions Deletions Status
public/index.php +1 -1 modified
public/nollaa.php +5 -4 modified
src/kirjaudu.php +1 -1 modified

Full Patch

diff --git a/public/index.php b/public/index.php
index 30897a9..7b45ac5 100755
--- a/public/index.php
+++ b/public/index.php
@@ -32,7 +32,7 @@ if ($result->num_rows>0){
 		<div class="table-container">
 			<input class="searchInput" data-table-id="table1" type="search" placeholder="Hae🔍" aria-label="Hae🔍" aria-target="table1">  
 			<?php
-			if ($logged_in) {
+			if ($logged_in and $op) {
 				echo "<a href='uusopiskelija.php'><button>+</button></a>";
 			}
 			?>
diff --git a/public/nollaa.php b/public/nollaa.php
index 833944b..d5dbf26 100644
--- a/public/nollaa.php
+++ b/public/nollaa.php
@@ -1,11 +1,11 @@
 <?php
 include "../src/connect.php";
 
-$nimi =  mysqli_real_escape_string($conn, $_POST["nimi"]);
+$nimi =  mysqli_real_escape_string($conn, $_GET["nimi"]);
 $salasana =  mysqli_real_escape_string($conn, $_POST["salasana"]);
 $vsalasana =  mysqli_real_escape_string($conn, $_POST["vahvista-salasana"]);
 
-if (isset($_POST['nimi']) && $_SERVER['REQUEST_METHOD'] === 'POST') {
+if (isset($nimi) && $_SERVER['REQUEST_METHOD'] === 'POST') {
     $sql = "SELECT * FROM `kayttajat` WHERE nimi='{$nimi}';";
 	$kayttaja = $conn->query($sql)->fetch_assoc(); // Aja komento
 
@@ -17,15 +17,16 @@ if (isset($_POST['nimi']) && $_SERVER['REQUEST_METHOD'] === 'POST') {
     if ($salasana === $vsalasana) {
         $suolattusalasana = password_hash($salasana, PASSWORD_DEFAULT); // password default = bcrypt
         $sql = "UPDATE kayttajat SET salasana='{$suolattusalasana}' WHERE nimi='{$nimi}'; ";
-        $conn->query($sql);
+		$conn->query($sql);
     }
     else {
         echo "";
     }
 
+
     $conn->close();
     // Redirect
-    $newURL = "../public/nollaa.php";
+    $newURL = "../public/kirjautuminen.php"; // Heitä kirjautumis ruutuun luka mitä ihmettä
     header('Location: '.$newURL);
     die();
 }
diff --git a/src/kirjaudu.php b/src/kirjaudu.php
index 03bf4f0..7bd685f 100644
--- a/src/kirjaudu.php
+++ b/src/kirjaudu.php
@@ -13,7 +13,7 @@ $salasana_tietokanta = $kayttaja['salasana'];
 echo $salasana;
 echo $tietokanta;
 if ($salasana_tietokanta == "0"){
-	$newURL = "../public/nollaa.php";
+	$newURL = "../public/nollaa.php?nimi=" . $nimi;
     header('Location: '.$newURL);
     die();
 }