Merge branch 'develop'

activate.php

@@ -1,4 +1,5 @@
-<?php include("includes/header.php"); ?>
+<?php require_once("includes/init.php") ?>
+<?php include("includes/views/header.php"); ?>
 
 <!-- <?php if ($session->is_signed_in()) {redirect("profile.php");} ?> -->
 
@@ -28,4 +29,4 @@
 
 <script src="js/functions.js"></script>
 
-<?php include("includes/footer.php"); ?>
+<?php include("includes/views/footer.php"); ?>

includes/classes/user.php

@@ -35,6 +35,7 @@ public static function verify_user($email, $password) {
 
 		$sql = "SELECT * FROM " . self::$db_table . " WHERE ";
 		$sql .= "email = '{$email}' ";
+		$sql .= "AND status = 1 ";
 		$sql .= "LIMIT 1";
 
 		// Sends the sql into the database, gets a array with the users back, only one because limit 1.
@@ -277,7 +278,6 @@ public static function verify_new_user($username, $email, $password, $password_c
 		$sql = "SELECT * FROM " . self::$db_table . " WHERE ";
 		$sql .= "email = '{$email}' ";
 		$sql .= "AND password = '{$password}' ";
-		$sql .= "AND status = 1 ";
 		$sql .= "LIMIT 1";
 		$the_result_array = self::find_by_query($sql);
 
@@ -334,6 +334,9 @@ public static function verify_new_user($username, $email, $password, $password_c
 			$user->last_name   = $last_name;
 			$user->user_image  = "1.png";
 			$user->joined      = date("Y-m-d");
+			$user->verify_code = md5($username . microtime());
+
+			Email::send_ActivationMail($email, $firstname, $user->verify_code);
 
 			$user->create();