commit 0edaa79867ca2b22036ade83c0ba1fc7764e2713
parent 2bc15d86d3b8e0241e32121ee0e056e7a85d876a
Author: Friedel Schön <[email protected]>
Date: Wed, 28 Jun 2023 19:59:32 +0200
PHP formatting
Diffstat:
14 files changed, 206 insertions(+), 203 deletions(-)
diff --git a/Controller/hdata/hdata.php b/Controller/hdata/hdata.php
@@ -1,4 +1,5 @@
<?php
-function make_table() {
+
+function make_table()
+{
}
-?>
diff --git a/Controller/user/add_get.php b/Controller/user/add_get.php
@@ -1,4 +1,4 @@
<?php
$templater = new Lollipop\Template();
- $template["msg"] = "";
- echo $templater->template("views/add_user.html", $template);
-\ No newline at end of file
+$template["msg"] = "";
+echo $templater->template("views/add_user.html", $template);
diff --git a/Lollipop/Router.php b/Lollipop/Router.php
@@ -109,7 +109,7 @@ namespace Lollipop {
}
echo "404 '$this->path' not found!";
- http_response_code(404);
+ http_response_code(404);
return null;
}
}
diff --git a/Model/Formula.php b/Model/Formula.php
@@ -1,19 +1,20 @@
<?php
namespace Model {
- class Formula {
- static function windchill($temp, $wind): float
+ class Formula
{
- $result = 13.12 + 0.6215 * $temp - 11.37 * pow($wind, 0.16) + 0.3965 * $temp * pow($wind, 0.16);
- return round($result, 2);
- }
-
- static function humid($temp, $dewp): float|int
- {
- $specific_humidity = exp((17.625*$dewp)/(243.04+$dewp));
- $saturation_point = exp((17.625*$temp)/(243.04+$temp));
-
- return round(($specific_humidity / $saturation_point) * 100, 2);
+ public static function windchill($temp, $wind): float
+ {
+ $result = 13.12 + 0.6215 * $temp - 11.37 * pow($wind, 0.16) + 0.3965 * $temp * pow($wind, 0.16);
+ return round($result, 2);
+ }
+
+ public static function humid($temp, $dewp): float|int
+ {
+ $specific_humidity = exp((17.625*$dewp)/(243.04+$dewp));
+ $saturation_point = exp((17.625*$temp)/(243.04+$temp));
+
+ return round(($specific_humidity / $saturation_point) * 100, 2);
+ }
}
- }
-}
-\ No newline at end of file
+}
diff --git a/Model/Key.php b/Model/Key.php
@@ -1,6 +1,9 @@
<?php
-Class Key{
- function retrieveHumidityTable($key, $generateXml = false) {
+
+class Key
+{
+ public function retrieveHumidityTable($key, $generateXml = false)
+ {
$html = '<table>';
$db = new mysqli("86.92.67.21", "friedel", "hailiwa", "wap2");
$query = "SELECT distinct temperature, dew_point, nl.name as city, date_time
@@ -59,7 +62,8 @@ Class Key{
}
- function retrieveHData($key, $generateXml = false) {
+ public function retrieveHData($key, $generateXml = false)
+ {
$html = '';
$citycity = '';
$db = new mysqli("86.92.67.21", "friedel", "hailiwa", "wap2");
@@ -76,7 +80,7 @@ Class Key{
";
$stmt = mysqli_prepare($db, $query);
- $stmt->bind_param("s", $key);
+ $stmt->bind_param("s", $key);
$stmt->execute();
$data = $stmt->get_result();
$xml = '<WCTPD name="Windchill corrected temperature per day">';
@@ -103,32 +107,32 @@ Class Key{
$locations[$current_date][] = $city;
}
}
- $html .= $this->retrieveHumidityTable('ae9c50dc5cd58c538a0d6aedb17fffedcaffd568d22381dab3ae72baaeb24684');
-
- $html .= '<table id="htmlTable">';
- $html .= '<div class="space"></div>';
- $html .= '<div class="content-title"><h2>Windchill corrected temperature per day</h2></div>';
-
- foreach ($results as $date => $entries) {
- $html .= '<tr><th id="tabledate" colspan="4">' . date("d M Y", strtotime($date)) . '</th></tr>';
- $html .= '<tr><th>Location</th><th>Windchill</th></tr>';
-
- foreach ($entries as $entry) {
- $citycity = $entry['city'];
- $xml .= '<data>' . '<city>' . $citycity . '</city>' . '<wind_chill>' . $entry['windchill'] . '</wind_chill>' . '</data>';
- $html .= '<tr>';
- $html .= '<td>'.$entry['city'].'</td>';
- $html .= '<td>'.$entry['windchill'].'</td>';
- $html .= '</tr>';
- }
+ $html .= $this->retrieveHumidityTable('ae9c50dc5cd58c538a0d6aedb17fffedcaffd568d22381dab3ae72baaeb24684');
+
+ $html .= '<table id="htmlTable">';
+ $html .= '<div class="space"></div>';
+ $html .= '<div class="content-title"><h2>Windchill corrected temperature per day</h2></div>';
+
+ foreach ($results as $date => $entries) {
+ $html .= '<tr><th id="tabledate" colspan="4">' . date("d M Y", strtotime($date)) . '</th></tr>';
+ $html .= '<tr><th>Location</th><th>Windchill</th></tr>';
+
+ foreach ($entries as $entry) {
+ $citycity = $entry['city'];
+ $xml .= '<data>' . '<city>' . $citycity . '</city>' . '<wind_chill>' . $entry['windchill'] . '</wind_chill>' . '</data>';
+ $html .= '<tr>';
+ $html .= '<td>'.$entry['city'].'</td>';
+ $html .= '<td>'.$entry['windchill'].'</td>';
+ $html .= '</tr>';
}
+ }
- $html .= '</table>';
- $html .= '<a href="?downloadXml=true" class="download-button">Download XML</a>';
- $xml .= '</WCTPD>';
+ $html .= '</table>';
+ $html .= '<a href="?downloadXml=true" class="download-button">Download XML</a>';
+ $xml .= '</WCTPD>';
if ($generateXml) {
return $xml; // Return SimpleXMLElement object
}
return $html;
}
-}
-\ No newline at end of file
+}
diff --git a/Model/Login_handler.php b/Model/Login_handler.php
@@ -1,22 +1,23 @@
<?php
+
class Login_handler
{
- function login(string $email, string $pwd) : bool
+ public 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", "panda");
//create a Database object class, with the table User
$u = $db->get(Model\User::class);
-
+
//check if the email exists in db
- if(!$u->where('email', $email)){
+ if(!$u->where('email', $email)) {
//email does not exist
return false;
- }else{
- if(password_verify($pwd, $u->pwd)){
+ } else {
+ if(password_verify($pwd, $u->pwd)) {
//authenticated -> set $_SESSION variables
- $this->set_globals($u, $db);
+ $this->set_globals($u, $db);
return true;
} else {
//password did not match
@@ -24,7 +25,7 @@ class Login_handler
}
}
}
-
+
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
@@ -35,8 +36,7 @@ class Login_handler
$_SESSION['first_name'] = $u->fname;
$_SESSION['last_name'] = $u->lname;
-
+
$_SESSION['user_permissions'] = "iets";
}
}
-?>
-\ No newline at end of file
diff --git a/Model/Permission.php b/Model/Permission.php
@@ -1,15 +1,16 @@
<?php
+
namespace Model{
- Class Permission extends \Lollipop\DatabaseObject
- {
- static function get_table(): string
- {
- return "permission";
- }
+ class Permission extends \Lollipop\DatabaseObject
+ {
+ public static function get_table(): string
+ {
+ return "permission";
+ }
- static function get_primary(): string
- {
- return 'id';
- }
- }
-}
-\ No newline at end of file
+ public static function get_primary(): string
+ {
+ return 'id';
+ }
+ }
+}
diff --git a/Model/Permission_User.php b/Model/Permission_User.php
@@ -1,15 +1,16 @@
<?php
+
namespace Model {
- class Permission_User extends \Lollipop\DatabaseObject
- {
- static function get_table(): string
- {
- return "permission_user";
- }
+ class Permission_User extends \Lollipop\DatabaseObject
+ {
+ public static function get_table(): string
+ {
+ return "permission_user";
+ }
- static function get_primary(): string
- {
- return 'email';
- }
- }
-}
-\ No newline at end of file
+ public static function get_primary(): string
+ {
+ return 'email';
+ }
+ }
+}
diff --git a/Model/User.php b/Model/User.php
@@ -1,16 +1,16 @@
<?php
namespace Model {
- class User extends \Lollipop\DatabaseObject
- {
- static function get_table(): string
- {
- return "user";
- }
+ class User extends \Lollipop\DatabaseObject
+ {
+ public static function get_table(): string
+ {
+ return "user";
+ }
- static function get_primary(): string
- {
- return "email";
- }
- }
-}
-\ No newline at end of file
+ public static function get_primary(): string
+ {
+ return "email";
+ }
+ }
+}
diff --git a/Model/Utils.php b/Model/Utils.php
@@ -1,27 +1,31 @@
<?php
-Class Utils{
- static function missing_fields($post, $not_nullable){
- $missing = [];
- foreach($not_nullable as $column){
- if($post[$column] == NULL || $post[$column] == ""){
- $missing[$column] = "This field cannot be empty!";
- }
+
+class Utils
+{
+ public static function missing_fields($post, $not_nullable)
+ {
+ $missing = [];
+ foreach($not_nullable as $column) {
+ if($post[$column] == null || $post[$column] == "") {
+ $missing[$column] = "This field cannot be empty!";
+ }
+ }
+ return $missing;
}
- return $missing;
- }
-
- function create_permission_radials():string{
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- //select the available permissions from the database
- $all_p = $db->all(Permissions::class);
- $radials = "";
- foreach($all_p as $db_permission){
- $radials .= "<div class=\"mb-3 form-check\">
+
+ public function create_permission_radials(): string
+ {
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
+ //select the available permissions from the database
+ $all_p = $db->all(Permissions::class);
+ $radials = "";
+ foreach($all_p as $db_permission) {
+ $radials .= "<div class=\"mb-3 form-check\">
<input type=\"checkbox\" class=\"form-check-input\" name=\"permissions[]\" value=" . $db_permission->id . "\">
<input type='hidden' value='-1' name='{$db_permission->name}'>
<label class=\"form-check-label\" for=" . $db_permission->name . ">" . $db_permission->name . "</label>
</div> ";
+ }
+ return $radials;
}
- return $radials;
- }
-}
-\ No newline at end of file
+}
diff --git a/index.php b/index.php
@@ -48,13 +48,14 @@ if(isset($_SESSION['user_permissions']) && in_array(1, $_SESSION['user_permissio
exit();
} else {
$vars["table"] = $key->retrieveHData('3jvl/yb?sRr80s6lTdeOyxV9VTQZkCPRp/bKOWKFWxfL2vhsU4Hhpgcmz9qe0zEk');
- ();
+ }
+
return "views/hdata.html";
- })
-// static files //
-;
+ });
}
+// static files //
+
$router->addRoute(['GET'], '/css/dashboard.css', "css/dashboard.css");
$router->addRoute(['GET'], '/css/login.css', "css/login.css");
$router->addRoute(['GET'], '/css/hdata.css', "css/hdata.css");
@@ -66,4 +67,4 @@ $router->addRoute(['GET'], '/img/small_logo.png', "img/small_logo.png");
$router->addRoute(['GET'], '/js/panda.js', "js/panda.js");
$router->addRoute(['GET'], '/js/map.js', "js/map.js");
-$router->route
-\ No newline at end of file
+$router->route();
diff --git a/routing/login.php b/routing/login.php
@@ -3,49 +3,49 @@
const login = "email";
const pwd = "password";
-$login = function(&$vars) {
- $missing_fields = Utils::missing_fields($_POST , [login, pwd]);
-
- if(sizeof($missing_fields) > 0){
- $vars["msg"] = "<p style=\"color:red;\">Incorrect username or password.</p>";
- return "views/login.html";
- }
-
-
- //create a SQLDatabase clas
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "panda");
- //create a Database object class, with the table User
- $u = $db->get(Model\User::class);
-
- //check if the email exists in db
- if(!$u->load($_POST["email"])){
- $vars["msg"] = "<p style=\"color:red;\">Invalid E-Mail.</p>";
- return "views/login.html";
- }
-
- if(!password_verify($_POST[pwd], $u->{pwd})){
- $vars["msg"] = "<p style=\"color:red;\">Invalid Password.</p>";
- return "views/login.html";
- }
-
- foreach($u->getData() as $key => $data){
- if($key != pwd){
- $_SESSION[$key] = $data;
- }
- }
- //get permissions form db and set sessions_permissions
- $p = $db->all_where(Model\Permission_user::class, [login => $u->{login}]);
- $user_permissions = [];
- foreach($p as $permission){
- $user_permissions[] = $permission->id_permission;
- }
- $_SESSION['user_permissions'] = $user_permissions;
-
- header("Location: /dashboard");
- exit();
+$login = function (&$vars) {
+ $missing_fields = Utils::missing_fields($_POST, [login, pwd]);
+
+ if(sizeof($missing_fields) > 0) {
+ $vars["msg"] = "<p style=\"color:red;\">Incorrect username or password.</p>";
+ return "views/login.html";
+ }
+
+
+ //create a SQLDatabase clas
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "panda");
+ //create a Database object class, with the table User
+ $u = $db->get(Model\User::class);
+
+ //check if the email exists in db
+ if(!$u->load($_POST["email"])) {
+ $vars["msg"] = "<p style=\"color:red;\">Invalid E-Mail.</p>";
+ return "views/login.html";
+ }
+
+ if(!password_verify($_POST[pwd], $u->{pwd})) {
+ $vars["msg"] = "<p style=\"color:red;\">Invalid Password.</p>";
+ return "views/login.html";
+ }
+
+ foreach($u->getData() as $key => $data) {
+ if($key != pwd) {
+ $_SESSION[$key] = $data;
+ }
+ }
+ //get permissions form db and set sessions_permissions
+ $p = $db->all_where(Model\Permission_user::class, [login => $u->{login}]);
+ $user_permissions = [];
+ foreach($p as $permission) {
+ $user_permissions[] = $permission->id_permission;
+ }
+ $_SESSION['user_permissions'] = $user_permissions;
+
+ header("Location: /dashboard");
+ exit();
};
-$logout = function(){
+$logout = function () {
// Start the session
session_start();
@@ -54,7 +54,7 @@ $logout = function(){
// Destroy the session
session_destroy();
-
+
header("Location: /");
exit();
-};
-\ No newline at end of file
+};
diff --git a/routing/user_add.php b/routing/user_add.php
@@ -1,36 +1,36 @@
<?php
-$add_user = function(&$vars){
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "panda");
- $u = $db->get(Model\User::class);
-
- $missing_fields = Utils::missing_fields($_POST , $u->not_nullable);
-
- if(sizeof($missing_fields) > 0){
- foreach($missing_fields as $key => $data){
- if($_POST[$key] == "")
- $key .= "_error";
- $_POST[$key] = $data;
- }
- return $_POST;
- }
-
- if($u->load($_POST[$u->get_primary()])){
- return ["msg" => "<p style=\"color:red;\">this email address is already taken: {$_POST[$u->get_primary()]} </p>"];
- }else{
- if($_POST["password"]){
- $_POST["password"] = password_hash($_POST["password"], PASSWORD_DEFAULT);
- }
- foreach($u->column_names as $col){
- if($_POST[$col] != ""){
- $u->$col = $_POST[$col];
- }
- }
- if($u->add())
- $vars["msg"] = "<p style=\"color:green;\">succes</p>";
- else
- $vars["msg"] = "<p style=\"color:red;\">could not add user to database</p>";
- }
-}
+$add_user = function (&$vars) {
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "panda");
+ $u = $db->get(Model\User::class);
+ $missing_fields = Utils::missing_fields($_POST, $u->not_nullable);
+ if(sizeof($missing_fields) > 0) {
+ foreach($missing_fields as $key => $data) {
+ if($_POST[$key] == "") {
+ $key .= "_error";
+ }
+ $_POST[$key] = $data;
+ }
+ return $_POST;
+ }
+
+ if($u->load($_POST[$u->get_primary()])) {
+ return ["msg" => "<p style=\"color:red;\">this email address is already taken: {$_POST[$u->get_primary()]} </p>"];
+ } else {
+ if($_POST["password"]) {
+ $_POST["password"] = password_hash($_POST["password"], PASSWORD_DEFAULT);
+ }
+ foreach($u->column_names as $col) {
+ if($_POST[$col] != "") {
+ $u->$col = $_POST[$col];
+ }
+ }
+ if($u->add()) {
+ $vars["msg"] = "<p style=\"color:green;\">succes</p>";
+ } else {
+ $vars["msg"] = "<p style=\"color:red;\">could not add user to database</p>";
+ }
+ }
+};
diff --git a/utils/autoloader.php b/utils/autoloader.php
@@ -1,8 +1,9 @@
<?php
spl_autoload_register(function ($class_name) {
- if (DIRECTORY_SEPARATOR != "\\")
+ if (DIRECTORY_SEPARATOR != "\\") {
$class_name = str_replace("\\", DIRECTORY_SEPARATOR, $class_name);
+ }
$sr = DIRECTORY_SEPARATOR;
$filename = $class_name . '.php';
@@ -16,4 +17,4 @@ spl_autoload_register(function ($class_name) {
} else {
include $class_name . '.php';
}
-});
-\ No newline at end of file
+});
