From 55f669b5d8dad812f86d076753f0a372ebe2418b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Sajdl?= <vojtech@sajdl.com>
Date: Fri, 20 Apr 2018 16:49:49 +0200
Subject: [PATCH] Naming change, more dead code & vars removed

---
 classes/token.php |  2 +-
 classes/user.php  | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/classes/token.php b/classes/token.php
index 2b3b36e..b2eebee 100644
--- a/classes/token.php
+++ b/classes/token.php
@@ -30,7 +30,7 @@ class Token
    * @param String $data
    * @return int count of results in database
    */
-  public static function validate_token($token, $id, $data)
+  public static function validate($token, $id, $data)
   {
     global $mysqli;
     $time = time();
diff --git a/classes/user.php b/classes/user.php
index 6cd1097..11b1d86 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -273,7 +273,7 @@ class User
     $id = $_COOKIE['user'];
     $token = $_COOKIE['token'];
 
-    if (Token::validate_token($token, $id, "remember"))
+    if (Token::validate($token, $id, "remember"))
     {
       $year = strtotime('+356 days', time());
       unset($_COOKIE['token']);
@@ -401,7 +401,6 @@ class User
   public function change_password($token = false)
   {
     global $mysqli, $message;
-    $time = time();
     $id = $this->id;
     if ($_POST['password']!=$_POST['password_repeat'])
     {
@@ -437,7 +436,7 @@ class User
             $stmt = $mysqli->prepare("DELETE FROM tokens WHERE user = ? AND data = 'remember'");
     		    $stmt->bind_param("d", $id);
     		    $stmt->execute();
-    		    $query = $stmt->get_result();
+    		    $stmt->get_result();
             User::logout();
           }
           else{
@@ -445,7 +444,7 @@ class User
           }
         }
       }else{
-        if (Token::validate_token($token, $id, "passwd"))
+        if (Token::validate($token, $id, "passwd"))
         {
           $stmt = $mysqli->prepare("SELECT password_salt as salt FROM users WHERE id=?");
           $stmt->bind_param("i", $id);
@@ -463,7 +462,7 @@ class User
           $stmt = $mysqli->prepare("DELETE FROM tokens WHERE user = ? AND data = 'remember'");
     		  $stmt->bind_param("d", $id);
     		  $stmt->execute();
-    		  $query = $stmt->get_result();
+    		  $stmt->get_result();
         }
         else
         {
@@ -538,13 +537,12 @@ class User
   public function change_email()
   {
     global $mysqli, $message;
-    $time = time();
     $token = $_GET['token'];
     $id = $_GET['id'];
 
-    if (Token::validate_token($token, $id, "email;%"))
+    if (Token::validate($token, $id, "email;%"))
     {
-      $data = explode(";", $result['data']);
+      $data = explode(";", Token::get_data($token, $id));
 
       $email = $data[1];
 
@@ -569,12 +567,10 @@ class User
    * @return void
    */
   public static function logout(){
-    global $mysqli;
     session_unset();
     if (isset($_COOKIE['token']))
     {
       $token = $_COOKIE['token'];
-      $time = time();
       Token::delete($token);
       unset($_COOKIE['user']);
       unset($_COOKIE['token']);