Merge branch 'develop'

The-Commuters · Mar 15, 2019 · 485d227 · 485d227
2 parents 31f9167 + 8b18c0a
commit 485d227
Show file tree

Hide file tree

Showing 101 changed files with 9,245 additions and 1,489 deletions.
diff --git a/achievement.php b/achievement.php
@@ -0,0 +1,7 @@
+<?php include("includes/views/header.php"); ?>
+
+
+
+
+
+<?php include("includes/views/footer.php"); ?>
diff --git a/activate.php b/activate.php
@@ -0,0 +1,31 @@
+<?php include("includes/header.php"); ?>
+
+<!-- <?php if ($session->is_signed_in()) {redirect("profile.php");} ?> -->
+
+<?php 
+
+
+// Email::send_ActivationMail("newuser@localhost", "Markus", "hI" );
+
+/**
+* Sjekker om at det er noe i get variablen, 
+* burde sjekke om det er det rette som blir sendt inn
+
+*/
+if (isset($_GET["code"])){
+	$code = ($_GET["code"]);
+
+	// henter inn koden og gir den vidre til aktiverings metoden 
+	User::activate_user($code);
+
+}else{
+	echo "Activation could not be completed";
+}
+
+
+?>
+
+
+<script src="js/functions.js"></script>
+
+<?php include("includes/footer.php"); ?>
diff --git a/admin_includes/delete_game.php b/admin_includes/delete_game.php
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,7 @@
		<?php include("includes/views/header.php"); ?>





		<?php include("includes/views/footer.php"); ?>