From 88f76f32ae8a4eb4dd76e7f2771278d5de3c542f Mon Sep 17 00:00:00 2001
From: kasparkivistik <kkivis@ttu.ee>
Date: Mon, 11 Dec 2017 16:58:07 +0200
Subject: [PATCH] hashed prax4 passwords and node is weird

---
 prax4/src/auth.php          | 3 ++-
 prax4/src/config.php        | 2 +-
 prax4/src/signup.php        | 3 ++-
 prax5/app.js                | 8 +++++++-
 prax5/index.html            | 5 ++++-
 prax5/{run.js => server.js} | 0
 6 files changed, 16 insertions(+), 5 deletions(-)
 rename prax5/{run.js => server.js} (100%)

diff --git a/prax4/src/auth.php b/prax4/src/auth.php
index 0905857..0da3c24 100644
--- a/prax4/src/auth.php
+++ b/prax4/src/auth.php
@@ -49,7 +49,8 @@
     <?php
     if (isset($_REQUEST['username']) and isset($_REQUEST['password'])) {
         $username = $_REQUEST['username'];
-        $password = escape($connection, $_REQUEST['password']);
+        $password = $_REQUEST['password'];
+        $password = hash('md5', $password);
         $query = "SELECT * FROM 164347_users WHERE user_name = '$username' AND password = '$password'";
         if (count(mysqli_fetch_array(mysqli_query($connection, $query)))) {
             $_SESSION['username'] = $username;
diff --git a/prax4/src/config.php b/prax4/src/config.php
index 677de39..13396af 100644
--- a/prax4/src/config.php
+++ b/prax4/src/config.php
@@ -8,4 +8,4 @@ function escape($db, $string) {
     $string = mysqli_real_escape_string($db, $string);
     $string = htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
     return $string;
-    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/prax4/src/signup.php b/prax4/src/signup.php
index 85de66c..c5165bd 100644
--- a/prax4/src/signup.php
+++ b/prax4/src/signup.php
@@ -76,10 +76,11 @@ function validifyData($username, $db) {
 if (isset($_REQUEST['username']) and isset($_REQUEST['password']) and isset($_REQUEST['fullname']) and isset($_REQUEST['email'])) {
     $username = escape($connection, $_REQUEST['username']);
     $password = escape($connection, $_REQUEST['password']);
+    $hash = hash('md5', $password);
     $fullname = escape($connection, $_REQUEST["fullname"]);
     $email = escape($connection, $_REQUEST["email"]);
     if (validifyData($username, $connection)) {
-        $sql = "INSERT INTO 164347_users VALUES ('$username', '$password', '$fullname', '$email')";
+        $sql = "INSERT INTO 164347_users VALUES ('$username', '$hash', '$fullname', '$email')";
         if ($connection->query($sql) === true) {
             $message = "Success!";
             echo "<script type='text/javascript'>alert('$message');</script>";
diff --git a/prax5/app.js b/prax5/app.js
index 7fca69d..77ac849 100644
--- a/prax5/app.js
+++ b/prax5/app.js
@@ -1,3 +1,9 @@
-function move(pick) {
 
+
+
+function changeScore(win, lose) {
+    var score = $('$score').text();
+    win = win + parseInt(score.substr(0, score.indexOf('-')));
+    lose = lose + parseInt(score.substr(0, score.indexOf('-') + 1));
+    $('score').text(win + "-" + lose);
 }
\ No newline at end of file
diff --git a/prax5/index.html b/prax5/index.html
index 1b3cf2e..73af339 100644
--- a/prax5/index.html
+++ b/prax5/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>rock papa scisas</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="stylesheet.css">
+    <link rel="stylesheet" href="/stylesheet.css">
     <link rel="stylesheet" href="https://bootswatch.com/4/cosmo/bootstrap.min.css">
     <script src="app.js"></script>
 </head>
@@ -21,6 +21,9 @@ <h1 class="centered-content">
     <a id="playerrock"><img width="150" height="150" src="rock.png" alt="kivi"></a>
     <a id="playerpaper"><img width="150" height="150" src="paper.jpg" alt="paber"></a>
     <a id="playerscissors"><img width="150" height="150" src="scissors.jpg" alt="käärid"></a>
+
+    <h1 class="centered-content">scores</h1>
+    <div class="score" id="score"><h3>0-0</h3></div>
 </div>
 </body>
 </html>
diff --git a/prax5/run.js b/prax5/server.js
similarity index 100%
rename from prax5/run.js
rename to prax5/server.js