From 4d98a4e81c69169e76c02b34f22953d1362d10ec Mon Sep 17 00:00:00 2001
From: "sedivy.miro" <sedivy.miro@gmail.com>
Date: Wed, 28 Dec 2016 09:46:07 -0500
Subject: [PATCH] User moved to class

---
 lib/post.class.php | 43 ++++++-------------------------------------
 lib/user.class.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 37 deletions(-)
 create mode 100644 lib/user.class.php

diff --git a/lib/post.class.php b/lib/post.class.php
index aed5948..2ab78d7 100644
--- a/lib/post.class.php
+++ b/lib/post.class.php
@@ -2,16 +2,8 @@
 
 class Post
 {
-	private static function is_logged_in(){
-		if(!Config::get_safe("force_login", false)){
-			return true;
-		}
-		
-		return !empty($_SESSION["logged_in"]) && $_SESSION["logged_in"] == md5(Config::get("nick").Config::get_safe("pass", ""));
-	}
-	
 	private static function login_protected(){
-		if(!self::is_logged_in()){
+		if(!User::is_logged_in()){
 			throw new Exception("You need to be logged in to perform this action.");
 		}
 	}
@@ -238,7 +230,7 @@ class Post
 			"SELECT `id`, `text`, `feeling`, `persons`, `location`, `pirvacy`, `content_type`, `content`, DATE_FORMAT(`posts`.`datetime`,'%d %b %Y %H:%i') AS `datetime` ".
 			"FROM `posts` ".
 			"WHERE ".
-				(!self::is_logged_in() ? "`pirvacy` = 'public' AND " : "").
+				(!User::is_logged_in() ? "`pirvacy` = 'public' AND " : "").
 				($until ? "`posts`.`datetime` < DATE_ADD('{$until}', INTERVAL +1 MONTH) AND " : "").
 				($id ? "`id` = {$id} AND " : "").
 				"`status` = 1 ".
@@ -248,37 +240,14 @@ class Post
 	}
 	
 	public static function login($r){
-		if(!Config::get_safe("force_login", false)){
-			return true;
-		}
-		
-		if(self::is_logged_in()){
-			throw new Exception("You are already logged in.");
-		}
-		
-		if(Config::get("nick") == $r["nick"] && Config::get_safe("pass", "") == $r["pass"]){
-			$_SESSION["logged_in"] = md5($r["nick"].$r["pass"]);
-			return true;
-		}
-		
-		Log::put("login_fails", $r["nick"]);
-		throw new Exception("The nick or password is incorrect.");
+		return User::login($r["nick"], $r["pass"]);
 	}
 	
-	public static function logout($r){
-		if(!Config::get_safe("force_login", false)){
-			throw new Exception("You can't log out. There is no account.");
-		}
-		
-		if(!self::is_logged_in()){
-			throw new Exception("You are not even logged in.");
-		}
-		
-		$_SESSION["logged_in"] = false;
-		return true;
+	public static function logout(){
+		return User::logout();
 	}
 	
 	public static function handshake($r){
-		return ["logged_in" => self::is_logged_in()];
+		return ["logged_in" => User::is_logged_in()];
 	}
 }
\ No newline at end of file
diff --git a/lib/user.class.php b/lib/user.class.php
new file mode 100644
index 0000000..cd4f826
--- /dev/null
+++ b/lib/user.class.php
@@ -0,0 +1,45 @@
+<?php
+
+class user
+{
+	const SESSION_NAME = "logged_in";
+	
+	public static function is_logged_in(){
+		if(!Config::get_safe("force_login", false)){
+			return true;
+		}
+		
+		return !empty($_SESSION[User::SESSION_NAME]) && $_SESSION[User::SESSION_NAME] == md5(Config::get("nick").Config::get_safe("pass", ""));
+	}
+	
+	public static function login($nick, $pass){
+		if(!Config::get_safe("force_login", false)){
+			return true;
+		}
+		
+		if(self::is_logged_in()){
+			throw new Exception("You are already logged in.");
+		}
+		
+		if(Config::get("nick") == $nick && Config::get_safe("pass", "") == $pass){
+			$_SESSION[User::SESSION_NAME] = md5($nick.$pass);
+			return true;
+		}
+		
+		Log::put("login_fails", $nick);
+		throw new Exception("The nick or password is incorrect.");
+	}
+	
+	public static function logout(){
+		if(!Config::get_safe("force_login", false)){
+			throw new Exception("You can't log out. There is no account.");
+		}
+		
+		if(!self::is_logged_in()){
+			throw new Exception("You are not even logged in.");
+		}
+		
+		$_SESSION[User::SESSION_NAME] = false;
+		return true;
+	}
+}
\ No newline at end of file