UPDATED MVC

shahamitr · Aug 9, 2020 · edc6dea · edc6dea
1 parent f7cddce
commit edc6dea
Show file tree

Hide file tree

Showing 33 changed files with 237 additions and 230 deletions.
diff --git a/login.php → Controller/login.php b/login.php → Controller/login.php
@@ -1,5 +1,5 @@
 <?php
-	require('tableConst.php');
+	require('../common/tableConst.php');
 	require(CONNECT);
 
 
@@ -26,30 +26,30 @@
 				$sql = "update ".USER." set last_login = NOW() where id=".$id." limit 1";
 				$result = $conn->query($sql);
 				if($row['type']==2){
-					header('Location: Student_profile.php');
+					header('Location: ../View/Student_profile.php');
 				}
 				else if($row['type']==3){
-					header('Location: faculty_profile.php');
+					header('Location: ../View/faculty_profile.php');
 				}
 				else{
 					//update will not return count
 					if($result){
 
-						header('Location: dashboard.php');
+						header('Location: '.DASH.'');
 
 					} else {
-						header('Location: index.php?error=contact your administrator');
+						header('Location: '.INDEX.'?error=contact your administrator');
 					}
 				}
 
 			} else {
-				header('Location: index.php?error=Invalid credentials');
+				header('Location: '.INDEX.'?error=Invalid credentials');
 			}
 			exit;
 		} else {
-			header('Location: index.php?error=Invalid credentials');
+			header('Location: '.INDEX.'.?error=Invalid credentials');
 		}
 	} else {
-		header('Location: index.php?error=Invalid credentials');
+		header('Location: '.INDEX.'.?error=Invalid credentials');
 	}
 ?>
diff --git a/process_faculty.php → Controller/process_faculty.php b/process_faculty.php → Controller/process_faculty.php
@@ -1,17 +1,9 @@
 <?php 
-require("session.php");
-require('tableConst.php');
+require('../common/tableConst.php');
+require(SESS);
+
 require(FACM);
-if(isset($_SESSION['lang'])){
-		if($_SESSION['lang']=='fr'){
-			require('lang.php');
-		}
-		else{
-			require('eng.php');
-		}
-	}else{
-			require('eng.php');
-		}
+require(ADMIN);
 if($_POST){
 	$action = $_POST['action'];
 	$id = $_POST['id'];
@@ -37,5 +29,5 @@
 		$result = InactiveFaculty($status, $id);
 	}
 } else {
-	header('Location: index.php');
+	header('Location: '.INDEX);
 }
diff --git a/process_student.php → Controller/process_student.php b/process_student.php → Controller/process_student.php
@@ -1,18 +1,9 @@
 <?php 
-require("session.php");
-require('tableConst.php');
-require(STUM);
+require('../common/tableConst.php');
+require(SESS);
 
-	if(isset($_SESSION['lang'])){
-		if($_SESSION['lang']=='fr'){
-			require('lang.php');
-		}
-		else{
-			require('eng.php');
-		}
-	}else{
-			require('eng.php');
-		}
+require(STUM);
+require(ADMIN);
 
 if($_POST){
 	$action = $_POST['action'];
@@ -38,5 +29,5 @@
 		$result = InactiveStudent($status, $id);
 	}	
 } else {
-	header('Location: index.php');
+	header('Location: '.INDEX);
 }
diff --git a/process_user.php → Controller/process_user.php b/process_user.php → Controller/process_user.php
@@ -1,17 +1,9 @@
 <?php 
-require("session.php");
-require('tableConst.php');
+require('../common/tableConst.php');
+require(SESS);
+
 require(USM);
-if(isset($_SESSION['lang'])){
-		if($_SESSION['lang']=='fr'){
-			require('lang.php');
-		}
-		else{
-			require('eng.php');
-		}
-	}else{
-			require('eng.php');
-		}
+require(ADMIN);
 if($_POST){
 	$action = $_POST['action'];
 	$id = $_POST['id'];
@@ -36,5 +28,5 @@
 		$result = InactiveUser($status, $id);
 	}
 } else {
-	header('Location: index.php');
+	header('Location: '.INDEX);
 }
diff --git a/add.php → Model/add.php b/add.php → Model/add.php
@@ -1,18 +1,11 @@
-<?php require("session.php");?>
 <?php
-	if(isset($_SESSION['lang'])){
-		if($_SESSION['lang']=='fr'){
-			require('lang.php');
-		}
-		else{
-			require('eng.php');
-		}
-	}else{
-			require('eng.php');
-		}
+	require('../common/tableConst.php');
+	require(SESS);
+?>
+<?php
 ?>
 <?php 
-require('tableConst.php');
+require(ADMIN);
 require(CONNECT);
 require(STUM);
 require(FACM);
@@ -25,7 +18,7 @@
 				$type = $_POST['type'];
 				$result =addUser($username,$password,$type);
 
-				header('Location: user.php?message='.$nav['User']." ".$message['added']);
+				header('Location: '.US.'?message='.$nav['User']." ".$message['added']);
 
 			} elseif($_GET['type']=="faculty"){
 				$name= $_POST['name'];
@@ -45,7 +38,7 @@
 				$password = $username;
 				$type=3;
 				addUser($username,$password,$type);
-				header('Location: faculty.php?message='.$nav['Faculty']." ".$message['added']);
+				header('Location: '.FACUL.'?message='.$nav['Faculty']." ".$message['added']);
 			} else if($_GET['type']=="student"){
 				$name= $_POST['name'];
 				$surname= $_POST['surname'];
@@ -61,7 +54,7 @@
 				$password = $username;
 				$type=2;
 				addUser($username,$password,$type);
-				header('Location: student.php?message='.$nav['Student']." ".$message['added']);
+				header('Location: '.STU.'?message='.$nav['Student']." ".$message['added']);
 			}
 		}
 	}
@@ -74,7 +67,7 @@
 	<title>Dashboard - Add</title>
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<script src="js/cities.js"></script>
+	<script src="../js/cities.js"></script>
 
 	<?php require(ADMIN); ?>
 
@@ -194,7 +187,7 @@
 
 } 
  else {
-	header('Location: index.php');
+	header('Location: '.INDEX);
  }
 ?>
 

diff --git a/faculty_model.php → Model/faculty_model.php b/faculty_model.php → Model/faculty_model.php
@@ -1,5 +1,5 @@
 <?php 
-require('tableConst.php');
+require('../common/tableConst.php');
 require(CONNECT);
 
 

diff --git a/student_model.php → Model/student_model.php b/student_model.php → Model/student_model.php
@@ -1,5 +1,5 @@
 <?php 
-require('tableConst.php');
+require('../common/tableConst.php');
 require(CONNECT);
 
 function getAllStudent(){

diff --git a/user_model.php → Model/user_model.php b/user_model.php → Model/user_model.php
@@ -1,5 +1,5 @@
 <?php 
-require('tableConst.php');
+require('../common/tableConst.php');
 require(CONNECT);
 
 function InactiveUser($status,$total){

diff --git a/Student_profile.php → View/Student_profile.php b/Student_profile.php → View/Student_profile.php
@@ -1,6 +1,9 @@
-<?php require("session.php");?>
+<?php 
+require('../common/tableConst.php');
+require(SESS);
+?>
 <?php
-	require('tableConst.php');
+
 	require(CONNECT);
 ?>
 <!DOCTYPE html>
@@ -33,8 +36,8 @@
 </head>
 <body>
 
-<?php require("navbar_profile.php") ?>
-	<?php require("sidemenu_profile.php"); ?>
+<?php require("../common/navbar_profile.php") ?>
+	<?php require("../common/sidemenu_profile.php"); ?>
 
     <div class="col-sm-8 text-left"> 
       <p>Your Profile</p>
@@ -44,7 +47,7 @@
 				$name = $_SESSION['username']; 
 			}
 			echo '<div class="card">
-					<img src="images/img_avatar.png" alt="Avatar" style="width:100%">
+					<img src="../images/img_avatar.png" alt="Avatar" style="width:100%">
 						<div class="card_container">
 							<h4><b>'.$name.'</b></h4>
 							<p>Architect & Engineer</p>

diff --git a/dashboard.php → View/dashboard.php b/dashboard.php → View/dashboard.php
@@ -1,6 +1,7 @@
 <?php 
-	require("session.php");
-	require('tableConst.php');
+	require('../common/tableConst.php');
+	require(SESS);
+
 	require(STUM);
 	$stmt ="This dashboard will give you infromation about all students and faculty of Arena Animation.";
 	$totalS="Total Students In System";

diff --git a/faculty.php → View/faculty.php b/faculty.php → View/faculty.php
@@ -1,6 +1,8 @@
-<?php require("session.php");?>
+<?php 
+	require('../common/tableConst.php');
+require(SESS);?>
 <?php
-	require('tableConst.php');
+
 	require(FACM);
 	$error=false;
 	if(isset($_GET['IN'])||isset($_GET['Ac'])||isset($_GET['num'])){
@@ -26,24 +28,15 @@
 	}
 ?>
 <?php
-	if(isset($_SESSION['lang'])){
-		if($_SESSION['lang']=='fr'){
-			require('lang.php');
-		}
-		else{
-			require('eng.php');
-		}
-	}else{
-			require('eng.php');
-		}
+
 ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Dashboard - Faculty Master</title>
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<script src="student.js"></script>
+	<script src="../student.js"></script>
 	<?php require(ADMIN); ?>
 
 	<style>
@@ -183,7 +176,7 @@
 			 <?php } ?>
 	  <div style="float: right;">
 		<button type="button" class="btn btn-primary" onClick='location.href="faculty.php"'><?php echo $common['View']?></button>
-		<button type="button" class="btn btn-success" onClick='location.href="add.php?type=faculty"'><?php echo $common['Add']?></button>
+		<button type="button" class="btn btn-success" onClick='location.href="../Model/add.php?type=faculty"'><?php echo $common['Add']?></button>
 	  </div>
 
 		<?php
@@ -203,7 +196,7 @@
 						$row = $result->fetch();
 						if(isset($_GET['action']) && $_GET['action']=="view"){
 							echo '<div class="card">
-							  <img src="images/img_avatar.png" alt="Avatar" style="width:100%">
+							  <img src="../images/img_avatar.png" alt="Avatar" style="width:100%">
 							  <div class="card_container">
 								<h4><b>'.$row["name"].' '.$row["surname"].'</b></h4>
 								<p>Architect & Engineer</p>
@@ -213,7 +206,7 @@
 							?>
 
 						<div class="col-md-5">						
-							<form action="process_faculty.php" method="post">
+							<form action="../Controller/process_faculty.php" method="post">
 								<input type="hidden" name="action" value="<?php echo $_GET['action'];?>"/>
 								<input type="hidden" name="id" value="<?php echo $_GET['id'];?>"/>
 								<div class="form-group">
@@ -424,7 +417,7 @@ function myFunction() {
   setTimeout(function(){ x.className = x.className.replace("show", ""); }, 2000);
   var queryString = window.location.search;
 	if(queryString=="")queryString = "?page=1";
-  setTimeout(function(){ location.href="faculty.php"+queryString }, 2000);
+  setTimeout(function(){ location.href="faculty.php" }, 2000);
 }
 myFunction();
 function myFunction1() {

diff --git a/faculty_personal_profile.php → View/faculty_personal_profile.php b/faculty_personal_profile.php → View/faculty_personal_profile.php
@@ -1,6 +1,8 @@
-<?php require("session.php");?>
+<?php 
+require('../common/tableConst.php');
+require(SESS);?>
 <?php
-	require('tableConst.php');
+
 	require(CONNECT);
 ?>
 <!DOCTYPE html>
@@ -33,8 +35,8 @@
 </head>
 <body>
 
-<?php require('navbar_profile.php') ?>
-	<?php require("sidemenu_profile.php"); ?>
+<?php require('../common/navbar_profile.php') ?>
+	<?php require("../common/sidemenu_profile.php"); ?>
 
     <div class="col-sm-8 text-left"> 
       <p>Your Profile</p>
@@ -44,7 +46,7 @@
 				$name = $_SESSION['username']; 
 			}
 			echo '<div class="card">
-					<img src="images/img_avatar.png" alt="Avatar" style="width:100%">
+					<img src="../images/img_avatar.png" alt="Avatar" style="width:100%">
 						<div class="card_container">
 							<h4><b>'.$name.'</b></h4>
 							<p>Architect & Engineer</p>