Merge pull request #6 from pradhuman1/master

Cookie Updated
GeekHaven · Jul 10, 2020 · e9ce1a8 · e9ce1a8
2 parents c491a3e + 2845122
commit e9ce1a8
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 151 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/data_game/admin.php b/data_game/admin.php
@@ -1,25 +1,13 @@
 <?php
     require "../database/member_info.php";
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            header('location:home.php');
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
 ?>
 
 <?php
     if(isset($_POST['admin_btn'])){
         $credID = $_SESSION['admin_cred_id'];
         $admin_value = $_POST['admin_value'];
-        if($admin_value=='0'||$admin_value=='1'){
+        if($admin_value=='0'||$admin_value=='1'||$admin_value=='2'){
             $query = "UPDATE credentials SET `admin_value`='$admin_value' WHERE `credentialsID`='$credID'";
             $query_run = mysqli_query($connection,$query);
             header('location:../geekhaven/makeAdmin.php');

diff --git a/data_game/savemem.php b/data_game/savemem.php
@@ -29,7 +29,7 @@
                     }else{
                         $query = "INSERT INTO social_handles VALUES('$social_handle_id','','','','','','','','','','')";
                         $query_run = mysqli_query($connection,$query);                             
-                        $query = "INSERT INTO member VALUES ('', '', '', '', '$member_id', '0', '$social_handle_id', '$cred_id', '$mem_post', '$wing', '$sess')";
+                        $query = "INSERT INTO member VALUES ('$username', '', '', '', '$member_id', '0', '$social_handle_id', '$cred_id', '$mem_post', '$wing', '$sess')";
                         $query_run = mysqli_query($connection,$query);     
                         $query = "INSERT INTO credentials VALUES('$cred_id','$username','$pass','0','$member_id')";
                         $query_run = mysqli_query($connection,$query);

diff --git a/geekhaven/addmember.php b/geekhaven/addmember.php
@@ -1,18 +1,11 @@
 <?php
     require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            header('location:home.php');
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
+    include 'auth.php';
+    $res = callCheck();
+    if($res<1){
+        header('location:login.php');        
     }
 ?>
 <!DOCTYPE html>

diff --git a/geekhaven/announcement.php b/geekhaven/announcement.php
@@ -1,19 +1,9 @@
 <?php
-    require "../database/wingsdb.php";    
+    require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            // echo "welcome member";
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+    include 'auth.php';
+    $res = callCheck();
 ?>
 <!DOCTYPE html>
 <html lang="en">

diff --git a/geekhaven/auth.php b/geekhaven/auth.php
@@ -0,0 +1,23 @@
+<?php
+    $cookie_name = $_SESSION['member_id'];
+    $t = $_SESSION['time'];
+    function checkCookie($cookie_name,$t){
+        if(isset($_COOKIE[$cookie_name])){
+            if($_COOKIE[$cookie_name]==$t + ($t%2408)*2 + $cookie_name){
+                return 2;
+            }else if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
+                return 1;
+            }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
+                return 0;
+            }else{
+                header('location:login.php');
+            }
+        }else{
+            header('location:login.php');
+        }
+    }
+    function callCheck(){
+        $res = checkCookie($GLOBALS['cookie_name'],$GLOBALS['t']);
+        return $res;
+    }
+?>
diff --git a/geekhaven/blog.php b/geekhaven/blog.php
@@ -1,19 +1,9 @@
 <?php
-    require "../database/wingsdb.php";    
+    require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            // echo "welcome member";
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+    include 'auth.php';
+    $res = callCheck();
 ?>
 <!DOCTYPE html>
 <html lang="en">

diff --git a/geekhaven/home.php b/geekhaven/home.php
@@ -1,18 +1,9 @@
 <?php
+    require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            // echo "welcome member";
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+    include 'auth.php';
+    $res = callCheck();
 ?>
 
 <!DOCTYPE html>

diff --git a/geekhaven/makeAdmin.php b/geekhaven/makeAdmin.php
@@ -1,18 +1,11 @@
 <?php
     require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            header('location:home.php');
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
+    include 'auth.php';
+    $res = callCheck();
+    if($res<1){
+        header('location:login.php');        
     }
 ?>
 <!DOCTYPE html>
@@ -95,7 +88,7 @@
         <form method='post' action='../data_game/admin.php'>
         <div class="row">
         <div class="form-group form-button col-lg-11">             
-            <input name='admin_value' type='text' placeholder='Admin Value (0/1)'></input>
+            <input name='admin_value' type='text' placeholder='Admin Value (0/1/2)'></input>
 		</div> 
         <div class="form-group form-button col-lg-1">             
 			<button name="admin_btn" type="submit" class="form-submit button" >SAVE</button>
@@ -121,8 +114,11 @@
                         ?>
                         <br>
                         <label><?php if($name){echo $name;}else{echo 'Name Not Available';} echo ' : '; ;?></label>
-                        <?php if($admin_value){
-                            echo "Admin";
+                        <?php 
+                        if($admin_value == '2'){
+                            echo "Overall Coordinator";
+                        }else if($admin_value == '1'){
+                            echo "Coordinator";
                         }else{
                             echo "Member";
                         } ?>

diff --git a/geekhaven/makehof.php b/geekhaven/makehof.php
@@ -1,18 +1,11 @@
 <?php
     require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            header('location:home.php');
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
+    include 'auth.php';
+    $res = callCheck();
+    if($res<1){
+        header('location:login.php');        
     }
 ?>
 <!DOCTYPE html>

diff --git a/geekhaven/project.php b/geekhaven/project.php
@@ -1,19 +1,9 @@
 <?php
-    require "../database/wingsdb.php";    
+    require "../database/member_info.php";
+
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            // echo "welcome member";
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+    include 'auth.php';
+    $res = callCheck();
 ?>
 <!DOCTYPE html>
 <html lang="en">

diff --git a/geekhaven/social_handles.php b/geekhaven/social_handles.php
@@ -1,19 +1,9 @@
 <?php
-    require "../database/wingsdb.php";    
+    require "../database/member_info.php";
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            // echo "welcome member";
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+
+    include 'auth.php';
+    $res = callCheck();
 ?>
 <!DOCTYPE html>
 <html lang="en">

diff --git a/geekhaven/updateProfile.php b/geekhaven/updateProfile.php
@@ -1,21 +1,10 @@
 
 <?php
     // include './addmember.php'
-    require "../database/member_info.php";    
+    require "../database/member_info.php";
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+    include 'auth.php';
+    $res = callCheck();
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -65,7 +54,7 @@
             $query = "SELECT * FROM member WHERE member_id='$mem_id'";
             $query_run = mysqli_query($connection,$query);
             while($row = mysqli_fetch_assoc($query_run)){
-                $name =$row['name'];                
+                $name =$row['name'];   
                 $roll =$row['roll_no'];
                 $image =$row['image'];
                 $des =$row['description']; 

diff --git a/geekhaven/wing.php b/geekhaven/wing.php
@@ -1,19 +1,8 @@
 <?php
-    require "../database/wingsdb.php";    
+    require "../database/member_info.php";
     session_start();
-    $cookie_name = $_SESSION['member_id'];
-    $t = $_SESSION['time'];
-    if(isset($_COOKIE[$cookie_name])){
-        if($_COOKIE[$cookie_name]==$t + ($t%2408) + $cookie_name){
-            // echo "welcome Admin";
-        }else if($_COOKIE[$cookie_name]==$t + $cookie_name){
-            // echo "welcome member";
-        }else{
-            header('location:login.php');
-        }
-    }else{
-        header('location:login.php');
-    }
+    include 'auth.php';
+    $res = callCheck();
 ?>
 
 <!DOCTYPE html>