Merge branch 'dev' of github.com:ctrlaltf24/assignmentsmanager

Nathan Shaaban · Nathan Shaaban · commit 4f96171f6ff9 · 2020-08-31T16:01:18.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ public_html/class/
 public_html/assets
 public_html/adminer
 error_log.txt
-public_html/resources/googleAuth/
+public_html/resources/googleAuth/
+public_html/resources/VisualMathEditor/
diff --git a/public_html/index.php b/public_html/index.php
@@ -1,7 +1,7 @@
 <?php
 include "template/ui.php";
 include "../resources/connect.php";
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 /*
     <div class="jumbotron"></div>
     <div class="jumbotronCap" style="background-color: #263238">
diff --git a/public_html/legal.php b/public_html/legal.php
@@ -1,7 +1,7 @@
 <?php
 include "template/ui.php";
 include "../resources/connect.php";
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 ?>
 
     <div class="mdl-grid">
diff --git a/public_html/login.php b/public_html/login.php
@@ -10,7 +10,7 @@
 }
 //check to see if the user is already in the database, if so delete them.
 
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 if($result = $conn->query("SELECT * FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())) {
     if ($result->num_rows != 0) {
         if(!$conn->query("DELETE FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())){
diff --git a/public_html/logout.php b/public_html/logout.php
@@ -0,0 +1,24 @@
+<?php
+include "template/ui.php";
+require_once "../resources/connect.php";
+require_once "../resources/startsWithEndsWith.php";
+//check to see if the user is in the database, if so delete them.
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
+if($result = $conn->query("SELECT * FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())) {
+    if ($result->num_rows != 0) {
+        if(!$conn->query("DELETE FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())){
+            log_error("failed to delete tokens","",$conn->error);
+        }
+    }
+} else {
+    log_error("failed to get tokens","",$conn->error);
+}
+// Reset google auth token
+require_once "../resources/gClient.php";
+$gClient->revokeToken();
+echo "<a href='index.php'>Log out sucessful</a>";
+?>
+<?php
+
+echo template_footer();
+header("Location: index.php");
diff --git a/public_html/postlogin.php b/public_html/postlogin.php
@@ -15,6 +15,15 @@
     if(!$conn->query("DELETE FROM `token` WHERE `expire`<".time())){
         log_error("failed to delete tokens","",$conn->error);
     }
+    if($result = $conn->query("SELECT * FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())) {
+        if ($result->num_rows != 0) {
+            if(!$conn->query("DELETE FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())){
+                log_error("failed to delete tokens","",$conn->error);
+            }
+        }
+    } else {
+        log_error("failed to get tokens","",$conn->error);
+    }
     if(!$conn->query("INSERT INTO `token`(`token`, `email`, `expire`, `ip`) VALUES (\"".$_COOKIE["TOKEN"]."\",\"".$userData["email"]."\",".(time()+31*24*60*60).",\""."0.0.0.0"."\")")){
         log_error("failed to insert tokens","",$conn->error);
     }
diff --git a/public_html/register.php b/public_html/register.php
@@ -2,7 +2,7 @@
 require_once "template/ui.php";
 require_once "template/form.php";
 require_once "../resources/connect.php";
-echo template_header(true, $logged_in, $is_teacher);
+echo template_header(true, $logged_in, $is_teacher,$user["email"]);
 $found=false;
 if ($result=$conn->query("SELECT * FROM users WHERE email = \"" . $user["email"] . "\"")) {
     while ($row = $result->fetch_assoc()) {
diff --git a/public_html/registerationComplete.php b/public_html/registerationComplete.php
@@ -1,7 +1,7 @@
 <?php
 require_once "template/ui.php";
 require_once "../resources/connect.php";
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 //if($logged_in) {
     if(isset($_POST["first_name"])&&isset($_POST["last_name"])&&isset($_POST["class_code"])) {
         if($result=$conn->query("SELECT `key` FROM `classes` WHERE `classCode`=\"".$_POST["class_code"]."\"")) {
diff --git a/public_html/student/assignments.php b/public_html/student/assignments.php
@@ -3,7 +3,7 @@
 require_once "../../resources/connect.php";
 require_once "../../resources/assignmentFunctions.php";
 require_once "../template/miscElements.php";
-echo template_header(true, $logged_in, $is_teacher);
+echo template_header(true, $logged_in, $is_teacher,$user["email"]);
 $classes = explode(";",$user["classKey"]);
 echo "
     <div class=\"mdl-grid\">
diff --git a/public_html/student/noShowAssignment.php b/public_html/student/noShowAssignment.php
@@ -1,7 +1,7 @@
 <?php
 require_once "../template/ui.php";
 require_once "../../resources/connect.php";
-echo template_header(true, $logged_in, $is_teacher);
+echo template_header(true, $logged_in, $is_teacher,$user["email"]);
 
 //get assignemnt key and display questions one by one
 if(isset($_GET["key"])){
diff --git a/public_html/teacher/createAssignment.php b/public_html/teacher/createAssignment.php
@@ -4,7 +4,7 @@
 require_once "../template/form.php";
 require_once "../template/ui.php";
 require_once "../template/miscElements.php";
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 ?>
 <div class="mdl-grid" style="width:75%;padding-top:32px;" id="main-container">
     <div class="mdl-cell--12-col mdl-cell">
diff --git a/public_html/teacher/createClass.php b/public_html/teacher/createClass.php
@@ -2,7 +2,7 @@
 require_once "../template/ui.php";
 require_once "../../resources/connect.php";
 require_once "../template/form.php";
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 ?>
 <div class="mdl-grid">
     <div class="mdl-cell mdl-cell--8-col mdl-cell--2-offset">
diff --git a/public_html/teacher/createImage.php b/public_html/teacher/createImage.php
@@ -2,7 +2,7 @@
 require_once "../template/ui.php";
 require_once "../../resources/connect.php";
 $showUI = isset($_GET["hideUI"])&&!$_GET["hideUI"]||!isset($_GET["hideUI"]);
-echo template_header($showUI,$logged_in,$is_teacher);
+echo template_header($showUI,$logged_in,$is_teacher,$user["email"]);
 if(!$logged_in||!$is_teacher){
     echo "not logged in or not a teacher.";
     exit();
diff --git a/public_html/teacher/duplicateClass.php b/public_html/teacher/duplicateClass.php
@@ -3,7 +3,7 @@
 require_once "../../resources/connect.php";
 require_once "../template/form.php";
 $showUI = isset($_GET["hideUI"])&&!$_GET["hideUI"]||!isset($_GET["hideUI"]);
-echo template_header($showUI,$logged_in,$is_teacher);
+echo template_header($showUI,$logged_in,$is_teacher,$user["email"]);
 if(!$logged_in||!$is_teacher){
     echo "not logged in or not a teacher.";
     exit();
diff --git a/public_html/teacher/noShowCreateQuestion.php b/public_html/teacher/noShowCreateQuestion.php
@@ -44,7 +44,7 @@
 if(!isset($_GET["assignment"])&&isset($assignmentKey)){
     $_GET["assignment"]=$assignmentKey;
 }
-//echo template_header(false,$logged_in,$is_teacher);
+//echo template_header(false,$logged_in,$is_teacher,$user["email"]);
 if(!isset($_GET["parent-question"])){
 	echo '<div class="mdl-grid">';
 }
diff --git a/public_html/teacher/noShowViewAssignment.php b/public_html/teacher/noShowViewAssignment.php
@@ -10,7 +10,7 @@
 	echo '<head><meta http-equiv="refresh" conent="0; url=viewAssignments.php" /></head><body><a href="viewAssignments.php">Please choose a key.</a></body>';
 	exit();
 }
-echo template_header(true, $logged_in, $is_teacher);?>
+echo template_header(true, $logged_in, $is_teacher,$user["email"]);?>
     <div class="mdl-grid">
         <div class="mdl-cell mdl-cell--10-col-desktop mdl-cell--12-col-tablet mdl-cell--1-offset-desktop">
 		<?php
diff --git a/public_html/teacher/postClass.php b/public_html/teacher/postClass.php
@@ -1,7 +1,7 @@
 <?php
 include "../template/ui.php";
 require_once "../../resources/connect.php";
-echo template_header(true,$logged_in,$is_teacher);
+echo template_header(true,$logged_in,$is_teacher,$user["email"]);
 //TODO: ADD SOME SORT OF SCRIPT TO MAKE SURE ALL INPUTS ARE LEGIT HERE OR IN createClass
 
 //add subject to subjects if it is not already there
diff --git a/public_html/teacher/postDuplicateClass.php b/public_html/teacher/postDuplicateClass.php
@@ -3,7 +3,7 @@
 require_once "../../resources/duplicationUtils.php";
 require_once "../template/ui.php";
 $showUI = isset($_GET["hideUI"])&&!$_GET["hideUI"]||!isset($_GET["hideUI"]);
-echo template_header($showUI,$logged_in,$is_teacher);
+echo template_header($showUI,$logged_in,$is_teacher,$user["email"]);
 if(!$logged_in||!$is_teacher){
     echo "not logged in or not a teacher.<br>";
     exit();
diff --git a/public_html/teacher/postImage.php b/public_html/teacher/postImage.php
@@ -2,7 +2,7 @@
 require_once "../../resources/connect.php";
 require_once "../template/ui.php";
 $showUI = isset($_GET["hideUI"])&&!$_GET["hideUI"]||!isset($_GET["hideUI"]);
-echo template_header($showUI,$logged_in,$is_teacher);
+echo template_header($showUI,$logged_in,$is_teacher,$user["email"]);
 if(!$logged_in||!$is_teacher){
     echo "not logged in or not a teacher.<br>";
     exit();
diff --git a/public_html/teacher/viewAssignments.php b/public_html/teacher/viewAssignments.php
@@ -5,7 +5,7 @@
 require_once "../template/form.php";
 require_once '../../resources/score_manager.php';
 require_once '../../resources/sqlArray.php';
-echo template_header(true, $logged_in, $is_teacher);?>
+echo template_header(true, $logged_in, $is_teacher,$user["email"]);?>
     <div class="mdl-grid">
         <div class="mdl-cell mdl-cell--10-col-desktop mdl-cell--12-col-tablet mdl-cell--1-offset-desktop">
             <?php
diff --git a/public_html/teacher/viewClass.php b/public_html/teacher/viewClass.php
@@ -5,7 +5,7 @@
 require_once "../template/form.php";
 require_once '../../resources/score_manager.php';
 require_once '../../resources/sqlArray.php';
-echo template_header(true, $logged_in, $is_teacher);?>
+echo template_header(true, $logged_in, $is_teacher,$user["email"]);?>
     <div class="mdl-grid">
         <div class="mdl-cell mdl-cell--10-col-desktop mdl-cell--12-col-tablet mdl-cell--1-offset-desktop">
 <?php
diff --git a/public_html/teacher/viewImages.php b/public_html/teacher/viewImages.php
@@ -3,7 +3,7 @@
 require_once '../template/miscElements.php';
 require_once "../../resources/connect.php";
 $showUI = isset($_GET["hideUI"])&&!$_GET["hideUI"]||!isset($_GET["hideUI"]);
-echo template_header($showUI,$logged_in,$is_teacher);
+echo template_header($showUI,$logged_in,$is_teacher,$user["email"]);
 if(!$logged_in||!$is_teacher){
     echo "not logged in or not a teacher.<br>";
     exit();
diff --git a/public_html/template/ui.php b/public_html/template/ui.php
@@ -2,7 +2,7 @@
 /**
  * @param bool $showHeader
  */
-function template_header($showHeader=true,$logged_in=false,$is_teacher=false){
+function template_header($showHeader=true,$logged_in=false,$is_teacher=false,$email=null){
     echo "<html>
 <head>";
     $path = "https://".$_SERVER['HTTP_HOST']."/";
@@ -35,14 +35,14 @@ function template_header($showHeader=true,$logged_in=false,$is_teacher=false){
             <a href='/' class=\"mdl-layout-title\">Assignments Manager</a>
             <div class=\"mdl-layout-spacer\"></div>
             <nav class=\"mdl-navigation mdl-layout--large-screen-only\">";
-        $output.=get_header_items($logged_in,$is_teacher,false);
+        $output.=get_header_items($logged_in,$is_teacher,false,$email);
         $output.="    </nav>
         </div>
     </header>
     <div class=\"mdl-layout__drawer\">
         <span class=\"mdl-layout-title\">Assignments Manager</span>
         <nav class=\"mdl-navigation\">";
-        $output.=get_header_items($logged_in,$is_teacher,true);
+        $output.=get_header_items($logged_in,$is_teacher,true,$email);
         $output.="</nav>
     </div>";
     }
@@ -82,7 +82,7 @@ function dirToArray($dir) {
 /**
  * This is used as it needs to be done twice
  */
-function get_header_items($logged_in=false,$is_teacher=false,$drawer=false){
+function get_header_items($logged_in=false,$is_teacher=false,$drawer=false,$email=null){
     require_once $_SERVER['DOCUMENT_ROOT']."/../resources/startsWithEndsWith.php";
     $array=array();
     if($logged_in) {
@@ -118,6 +118,11 @@ function get_header_items($logged_in=false,$is_teacher=false,$drawer=false){
             }
         }
         $output=get_header_html_from_array($array,$drawer);
+        $rand=microtime();
+        $output.= "<a class=\"mdl-navigation__link\" id=\"logout$rand\" href=\"/logout.php\">Logout</a>";
+        if ($email != null){
+            $output.="<div class=\"mdl-tooltip\" data-mdl-for=\"logout$rand\">$email</div>";
+        }
     } else {
         $output= "<a class=\"mdl-navigation__link\" href=\"/login.php\">Login</a>";
     }
diff --git a/resources/gClient.php b/resources/gClient.php
@@ -1,6 +1,7 @@
 <?php
 require_once "./resources/googleAuth/vendor/autoload.php";
 $gClient = new Google_Client();
+$gClient->revokeToken();
 $gClient->setClientId("");
 $gClient->setClientSecret("");
 $gClient->setApplicationName("");

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`//check to see if the user is already in the database, if so delete them.`
`12`	`12`
`13`		`-echo template_header(true,$logged_in,$is_teacher);`
	`13`	`+echo template_header(true,$logged_in,$is_teacher,$user["email"]);`
`14`	`14`	`if($result = $conn->query("SELECT * FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())) {`
`15`	`15`	`if ($result->num_rows != 0) {`
`16`	`16`	`if(!$conn->query("DELETE FROM token WHERE token = \"".$_COOKIE["TOKEN"]."\" AND expire>".time())){`