commit 42573954e01e8975ad6e03de42cdb0827ee054ae
parent 4ad3ddeaea4fff0530a042371935319edf0cd152
Author: LennartSchroot <[email protected]>
Date: Sun, 21 May 2023 14:43:48 +0200
Merge branch 'tak' of https://github.com/friedelschoen/iwa-webapp into tak
Diffstat:
11 files changed, 171 insertions(+), 301 deletions(-)
diff --git a/back-up/router.php b/back-up/router.php
@@ -1,38 +0,0 @@
-<?php
-
-function router_match(string $route, string $match): ?array
-{
- $route_split = explode('/', $route);
- $match_split = explode('/', $match);
-
- if (sizeof($route_split) != sizeof($match_split)) {
- return null;
- }
-
- $route_vars = array();
- foreach ($match_split as $index => $m) {
- if (str_starts_with($m, ':')) {
- $route_vars[substr($m, 1)] = $route_split[$index];
- } else if ($m != $route_split[$index]) {
- return null;
- }
- }
- return $route_vars;
-}
-
-function router(string $base, array $routes): bool
-{
- $url = $_SERVER["REQUEST_URI"];
- $route = '/';
- if (strpos($url, "alteruser.php"))
- $route = explode("alteruser.php", $url)[1];
-
- foreach ($routes as $match => $func) {
- $vars = router_match($route, $match);
- if ($vars != null) {
- $func($vars);
- return true;
- }
- }
- return false;
-}
-\ No newline at end of file
diff --git a/classes/Login_handler.php b/classes/Login_handler.php
@@ -0,0 +1,46 @@
+<?php
+class Login_handler
+{
+ function login(string $email, string $pwd) : bool
+ //this function return true when user is autheticated uses set_globals to set $_SESSION variables
+ {
+ //create a SQLDatabase class
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "wap2");
+ //create a Database object class, with the table User
+ $u = $db->get(User::class);
+
+ //check if the email exists in db
+ if(!$u->where('email', $email)){
+ //email does not exist
+ return false;
+ }else{
+ if(password_verify($pwd, $u->password)){
+ //authenticated -> set $_SESSION variables
+ $this->set_globals($u, $db);
+ return true;
+ } else {
+ //password did not match
+ return false;
+ }
+ }
+ }
+
+ private function set_globals(Lollipop\DatabaseObject $u, Lollipop\SQLDatabase $db)
+ //this function sets Session variables which incluse
+ //email, first_name, last_name and array user_permissions
+ {
+ //start session and set
+ session_start();
+ $_SESSION['email'] = $u->email;
+ $_SESSION['first_name'] = $u->first_name;
+ $_SESSION['last_name'] = $u->last_name;
+
+ //get permissions form db and set sessions_permissions
+ $p = $db->all_where(Permission_user::class, array('user_id' => $u->user_id));
+ foreach($p as $permission){
+ $user_permissions[] = $permission->permission_id;
+ }
+ $_SESSION['user_permissions'] = $user_permissions;
+ }
+}
+?>
+\ No newline at end of file
diff --git a/index.php b/index.php
@@ -1,137 +1,65 @@
<?php
-include "utils/Router.php";
-$router = new Router\Router();
+require "utils/router.php";
-$router->get('/', function () {
- include 'views/homepage.php';
-});
+$router = new Router();
+
+$router->addRoute(['GET'], '/', 'views/homepage.php');
//views
//add contract
-$router->get('/add_contract', function () {
- include 'views/add_contract.php';
-});
-$router->post('/add_contract', function () {
- include 'views/add_contract.php';
-});
+$router->addRoute(['GET', 'POST'], '/add_contract', 'views/add_contract.php');
//add customer
-$router->get('/add_customer', function () {
- include 'views/add_customer.php';
-});
-$router->post('/add_customer', function () {
- include 'views/add_customer.php';
-});
+$router->addRoute(['GET', 'POST'], '/add_customer', 'views/add_customer.php');
//add user
-$router->get('/add_user', function () {
- include 'views/add_user.php';
-});
-$router->post('/add_user', function () {
- include 'views/add_user.php';
-});
+$router->addRoute(['GET', 'POST'], '/add_user', 'views/add_user.php');
//alter_contract
-$router->get('/alter_contract ', function () {
- include 'views/alter_contract .php';
-});
-$router->post('/alter_contract ', function () {
- include 'views/alter_contract .php';
-});
+$router->addRoute(['GET', 'POST'], '/alter_contract', 'views/alter_contract.php');
//alter_customer
-$router->get('/alter_customer ', function () {
- include 'views/alter_customer .php';
-});
-$router->post('/alter_customer ', function () {
- include 'views/alter_customer .php';
-});
+$router->addRoute(['GET', 'POST'], '/alter_customer', 'views/alter_customer.php');
//alter_user
-$router->get('/alter_user', function () {
- include 'views/alter_user.php';
-});
-$router->post('/alter_user', function () {
- include 'views/alter_user.php';
-});
+$router->addRoute(['GET', 'POST'], '/alter_user', 'views/alter_user.php');
//dashboard
-$router->get('/dashboard', function () {
- include 'views/search_data.php';
-});
+$router->addRoute(['GET'], '/dashboard', 'views/dashboard.php');
//homepage
-$router->get('/homepage', function () {
- include 'views/homepage.php';
-});
+$router->addRoute(['GET', 'POST'], '/homepage', 'views/homepage.php');
//navbar
-$router->get('/navbar', function () {
- include 'views/navbar.php';
-});
+$router->addRoute(['GET'], '/navbar', 'views/navbar.php');
//search_contract
-$router->get('/search_contract', function () {
- include 'views/search_contract.php';
-});
-$router->post('/search_contract', function () {
- include 'views/search_contract.php';
-});
+$router->addRoute(['GET', 'POST'], '/search_contract', 'views/search_contract.php');
//search_customer
-$router->get('/search_customer', function () {
- include 'views/search_customer.php';
-});
-$router->post('/search_customer', function () {
- include 'views/search_customer.php';
-});
+$router->addRoute(['GET', 'POST'], '/search_customer', 'views/search_customer.php');
//search_data
-$router->get('/search_data', function () {
- include 'views/search_data.php';
-});
-$router->post('/search_data', function () {
- include 'views/search_data.php';
-});
+$router->addRoute(['GET', 'POST'], '/search_data', 'views/search_data.php');
//search_user
-$router->get('/search_user', function () {
- include 'views/search_user.php';
-});
-$router->post('/search_user', function () {
- include 'views/search_user.php';
-});
+$router->addRoute(['GET', 'POST'], '/search_user', 'views/search_user.php');
//logic
//login_handler
-$router->get('/login_handler', function () {
- include 'logic/login_handler.php';
-});
-$router->post('/login_handler', function () {
- include 'logic/login_handler.php';
-});
+$router->addRoute(['GET', 'POST'], '/login_handler', 'logic/login_handler.php');
//data inserter
-$router->post('/datainserter', function () {
- include 'logic/datainserter.php';
-});
+$router->addRoute(['POST'], '/datainserter', 'logic/datainserter.php');
//log-out
-$router->post('/logout', function () {
- include 'logic/logout.php';
-});
+$router->addRoute(['POST'], '/logout', 'logic/logout.php');
//post weather data
-$router->post('/weather_data', function () {
- include 'logic/postWeatherData.php';
-});
+$router->addRoute(['POST'], '/weather_data', 'logic/postWeatherData.php');
//404
-$router->addNotFoundHandler(function (){
- include 'views/404.html';
-});
-
-$router->run();
+$router->route('views/404.html');
+\ No newline at end of file
diff --git a/logic/login.php b/logic/login.php
@@ -0,0 +1,17 @@
+<?php
+include "utils\autoloader.php";
+
+//create login class
+$login_handler = new Login_handler;
+$msg = "";
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ if(isset($_POST['email']) || !isset($_POST['password'])){
+ // fetch data from the form pass to login_handler function
+ if(($login_handler->login($_POST['email'], $_POST['password']))){
+ //authenticated
+ header('Location: /dashboard');
+ }
+ }
+ $msg = "<p style=\"color:red\">Incorrect username of password.</p>";
+}
+?>
+\ No newline at end of file
diff --git a/logic/login_handler.php b/logic/login_handler.php
@@ -1,52 +0,0 @@
-<?php
- include "utils/autoloader.php";
- if(isset($_SESSION['email'])){
- header('Location: dashboard.php');
- }
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "wap2");
- // check if a post request was sent
- if ($_SERVER["REQUEST_METHOD"] == "POST") {
- // fetch data from the form
- if(isset($_POST['login_btn'])){
- if(!isset($_POST['email']) || !isset($_POST['password'])){
- echo "<p style=\"color:red\">One of the forms was empty.</p>";
- } else {
- //store data from the form in a variable
- $email = $_POST['email'];
- $pwd = $_POST['password'];
-
- //create a User orm class
- $u = $db->all_where(User::class, array('email' => $email));
- //tm 26 is workaround
- foreach($u as $userdata){
- $userdata->email;
- }
- $u = $userdata;
- var_dump($u);
- if($u->email == null){
- //user incorrect, but to give out as little person info as possible just show either is wrong
- echo"<p style=\"color:red\">Invalid username or password. cannot find user</p>";
- }else{
- //password verification logic
- if(password_verify($pwd, $u->password)){
- //start session and set session variables
- session_start();
- $_SESSION['email'] = $u->email;
- $_SESSION['first_name'] = $u->first_name;
- $_SESSION['last_name'] = $u->last_name;
-
- $p = $db->all_where(Permission_user::class, array('user_id' => $u->user_id));
- foreach($p as $permission){
- $user_permissions[] = $permission->permission_id;
- }
- $_SESSION['user_permissions'] = $user_permissions;
- header('Location: /dashboard');
- }else{
- //password incorrect, but to give out as little person info as possible just show either is wrong
- echo"<p style=\"color:red\">Invalid username or password.</p>";
- }
- }
- }
- }
-}
-?>
-\ No newline at end of file
diff --git a/logic/postWeatherData.php b/logic/postWeatherData.php
@@ -1,44 +0,0 @@
-<?php
-
-// Check if request method is POST
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- // Include data validator function
- include 'datavalidator.php';
-
- // Retrieve the raw request body data
- $request_body = file_get_contents('php://input');
-
- // Decode the JSON data into a PHP associative array
- $data = json_decode($request_body, true);
-
- // Access the "WEATHERDATA" array from the decoded data
- $weather_data = $data['WEATHERDATA'];
-
- // Open the text file for writing
- $file = fopen('weather_data.txt', 'w');
-
- // Loop through each weather data object and write it to the text file
- foreach ($weather_data as $weather_obj) {
- $stn = $weather_obj['STN'];
- $date = $weather_obj['DATE'];
- $time = $weather_obj['TIME'];
- $temp = $weather_obj['TEMP'];
- $dewp = $weather_obj['DEWP'];
- $stp = $weather_obj['STP'];
- $slp = $weather_obj['SLP'];
- $visib = $weather_obj['VISIB'];
- $wdsp = $weather_obj['WDSP'];
- $prcp = $weather_obj['PRCP'];
- $sndp = $weather_obj['SNDP'];
- $frshtt = $weather_obj['FRSHTT'];
- $cldc = $weather_obj['CLDC'];
- $wnddir = $weather_obj['WNDDIR'];
-
- // Write the weather data to the text file
- fwrite($file, "$stn,$date,$time,$temp,$dewp,$stp,$slp,$visib,$wdsp,$prcp,$sndp,$frshtt,$cldc,$wnddir\n");
- }
-
- // Close the text file
- fclose($file);
-}
-?>
diff --git a/utils/Router.php b/utils/Router.php
@@ -1,60 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Router;
-
-class Router
-{
- private $handlers;
- private $notFoundHandler;
- private const METHOD_POST = 'POST';
- private const METHOD_GET = 'GET';
-
- public function get(string $path, $handler): void
- {
- $this->addHandler(self::METHOD_GET, $path, $handler);
- }
- public function post(string $path, $handler): void
- {
- $this->addHandler(self::METHOD_POST, $path, $handler);
- }
-
- public function addNotFoundHandler($handler): void
- {
- $this->notFoundHandler = $handler;
- }
-
- private function addHandler(string $method, string $path, $handler): void
- {
- $this->handlers[$method . $path] = [
- 'path' => $path,
- 'method' => $method,
- 'handler' => $handler
- ];
- }
- public function run()
- {
- $requestUri = parse_url($_SERVER['REQUEST_URI']);
- $requestPath = $requestUri['path'];
- $method = $_SERVER['REQUEST_METHOD'];
-
- $callback = null;
- foreach ($this->handlers as $handler){
- if ($handler['path'] === $requestPath && $method === $handler['method']){
- $callback = $handler['handler'];
- }
- }
-
- if (!$callback){
- header("HTTP/1.0 404 Not Found");
- if (!empty($this->notFoundHandler)) {
- $callback = $this->notFoundHandler;
- }
- }
-
- call_user_func_array($callback, [
- array_merge($_GET, $_POST)
- ]);
- }
-}
diff --git a/utils/router.php b/utils/router.php
@@ -0,0 +1,73 @@
+<?php
+
+class Router
+{
+ protected array $routes = [];
+ protected string $path;
+
+ protected function match(string $match, array &$route_vars): bool
+ {
+ $route_split = explode('/', $this->path);
+ $match_split = explode('/', $match);
+
+ if (sizeof($route_split) != sizeof($match_split)) {
+ return false;
+ }
+
+ foreach ($match_split as $index => $m) {
+ if (str_starts_with($m, ':')) {
+ $route_vars[substr($m, 1)] = $route_split[$index];
+ } else if ($m != $route_split[$index]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+
+ function addRoute(string|array $method, string $match, string|callable $func)
+ {
+ if (is_string($method))
+ $method = [$method];
+
+
+ $this->routes[] = array(
+ "method" => $method,
+ "match" => $match,
+ "func" => $func,
+ );
+ }
+
+ function includeRoute(string $path, array $_PARAM)
+ {
+ if (is_callable($path))
+ return $path($_PARAM);
+ else
+ include $path;
+ }
+
+ function route(string|callable $not_found_handler)
+ {
+ $this->path = $_SERVER["REQUEST_URI"];
+
+ $query = parse_url($this->path, PHP_URL_QUERY);
+ parse_str($query, $_GET);
+
+ if (strpos($this->path, '?'))
+ $this->path = explode('?', $this->path)[0];
+
+ $method = $_SERVER["REQUEST_METHOD"];
+
+ foreach ($this->routes as $route) {
+ if ($route["method"] != null && !in_array($method, $route["method"]))
+ continue;
+
+ $vars = [];
+ if ($this->match($route["match"], $vars)) {
+ return $this->includeRoute($route["func"], $vars);
+ }
+ }
+
+ return $this->includeRoute($not_found_handler, $vars);
+ }
+}
+\ No newline at end of file
diff --git a/views/dashboard.php b/views/dashboard.php
@@ -4,6 +4,7 @@
</head>
<?php
include "views/navbar.php";
+ echo file_get_contents('http://127.0.0.1/server-status');
echo "voornaam = ";
echo $_SESSION['first_name'];
echo "<br>";
diff --git a/views/homepage.php b/views/homepage.php
@@ -1,4 +1,7 @@
<!DOCTYPE html>
+<?php
+include "logic\login.php"
+?>
<html>
<head>
<title>IWA - Weather Stations</title>
@@ -20,12 +23,16 @@
</div>
<div class="login-section">
<h2>Login</h2>
- <form class="login-form" action="login_handler" method="post">
+ <form class="login-form" action="/homepage" method="post">
<label for="email">Email:</label>
<input type="text" name="email" required>
<label for="password">Password:</label>
<input type="password" name="password" required>
<button type="submit" name='login_btn'>Login</button>
+ <?php
+ //display login $msg
+ echo $msg;
+ ?>
</form>
</div>
</div>
diff --git a/weather_data.txt b/weather_data.txt
@@ -1,10 +0,0 @@
-75630,2023-04-18,14:40:58,7.6,2,993.1,998.9,27.9,17.8,0,0,000000,5.2,37
-135780,2023-04-18,14:40:58,6.1,2.5,999.4,1002.2,12.1,8.6,0.03,0,010000,59.8,232
-170980,2023-04-18,14:40:58,8.6,2.4,815.6,813.1,10.3,13.3,0.22,0.2,011000,53.4,242
-324080,2023-04-18,14:40:58,-4.4,-8.9,1006.5,1008.3,29,15.3,0.04,19.5,111000,50,274
-725200,2023-04-18,14:40:58,4,-5.1,975.3,1016,17.6,15.9,0.07,0,010000,96.7,235
-725214,2023-04-18,14:40:58,5.8,-2.6,1010,1018.7,14.9,15.5,0,0,000000,98.3,220
-478580,2023-04-18,14:40:58,11.9,3.5,1002.9,996.8,9.7,15.8,0,0,000000,51.3,310
-324090,2023-04-18,14:40:58,-1.4,-5.4,1014,1001.3,40.4,14.3,0,0,100000,69.5,313
-725210,2023-04-18,14:40:58,2.5,-4.2,977.1,1017,15.3,15.1,0.09,0,010000,50,264
-725208,2023-04-18,14:40:58,3.8,-3.9,1018.6,1017.8,15.3,14.8,0.01,0,010000,80,231
