commit e9908cbf92e6f0620c6ab4004386cfe2ebefeb7a
parent 025132f07e651c98fbd176b6b0cf26383b15a669
Author: Friedel Schon <[email protected]>
Date: Sun, 16 Apr 2023 13:17:52 +0200
prettify OOP
Diffstat:
13 files changed, 427 insertions(+), 426 deletions(-)
diff --git a/Lollipop/DatabaseObject.php b/Lollipop/DatabaseObject.php
@@ -32,19 +32,19 @@ namespace Lollipop {
return $this->data;
}
+ /** this fuction accepts an $id value for the primary key
+ * loads the row into data[]
+ * returns bool if row is found
+ */
public function load(string $id): bool
{
- /*this fuction accepts an $id value for the primary key
- * loads the row into data[]
- * returns bool if row is found
- */
$sql = "SELECT * FROM {$this->table} WHERE {$this->primary} = ?";
$stmt = $this->db->conn->prepare($sql);
$stmt->execute([$id]);
$result = $stmt->get_result();
- if ($result->num_rows == 0) {
+ if (!$result || $result->num_rows == 0) {
return false;
}
@@ -76,35 +76,35 @@ namespace Lollipop {
$this->changed_keys = [];
}
- public function add() : bool
- /* this function add the set variables to the database */
- {
- if (!$this->changed_keys)
- return false;
+ /** this function add the set variables to the database */
+ public function add(): bool
+ {
+ if (!$this->changed_keys)
+ return false;
- $sql = "INSERT INTO {$this->table} (";
- $sql_val = ") VALUES (";
- $values = [];
+ $sql = "INSERT INTO {$this->table} (";
+ $sql_val = ") VALUES (";
+ $values = [];
- foreach ($this->changed_keys as $index => $key) {
- if ($index > 0){
- $sql .= ', ';
- $sql_val .= ', ';
+ foreach ($this->changed_keys as $index => $key) {
+ if ($index > 0) {
+ $sql .= ', ';
+ $sql_val .= ', ';
+ }
+ $sql .= $key;
+ $sql_val .= "?";
+ $values[] = $this->data[$key];
}
- $sql .= $key;
- $sql_val .= "?";
- $values[] = $this->data[$key];
- }
- $sql .= $sql_val . ")";
- $stmt = $this->db->conn->prepare($sql);
-
- $this->changed_keys = [];
-
- if($stmt->execute($values))
- return true;
- else
- return false;
+ $sql .= $sql_val . ")";
+ $stmt = $this->db->conn->prepare($sql);
+
+ $this->changed_keys = [];
+
+ if ($stmt->execute($values))
+ return true;
+ else
+ return false;
}
public function delete()
{
diff --git a/Lollipop/SQLDatabase.php b/Lollipop/SQLDatabase.php
@@ -12,7 +12,7 @@ namespace Lollipop {
$this->conn = new mysqli($host, $username, $password, $database, $port);
}
- function loadtable(string $table_class)
+ function get(string $table_class)
{
/* this function accepts a $table_name creates a Database object with the class $table_name
* retuns a Database object
@@ -73,7 +73,7 @@ namespace Lollipop {
while ($row = $result->fetch_assoc()) {
$o = new $table_class($this);
$o->setData($row);
- $objects[] = $o;
+ $rows[] = $o;
}
return $rows;
}
diff --git a/Model/Permission.php b/Model/Permission.php
@@ -5,12 +5,12 @@ namespace Model {
{
static function get_table(): string
{
- return "permission_user";
+ return "permission";
}
static function get_primary(): string
{
- return "email";
+ return "id";
}
}
}
\ No newline at end of file
diff --git a/Model/Permission_user.php b/Model/Permission_user.php
@@ -0,0 +1,15 @@
+<?php
+namespace Model {
+ class PermissionUser extends \Lollipop\DatabaseObject
+ {
+ static function get_table(): string
+ {
+ return "permission_user";
+ }
+
+ static function get_primary(): string
+ {
+ return null;
+ }
+ }
+}
+\ No newline at end of file
diff --git a/add_user.php b/add_user.php
@@ -1,59 +1,61 @@
<!DOCTYPE html>
<html lang="eng">
- <head>
- <title>Add user</title>
- <!-- Bootstrap CSS -->
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
- </head>
- <?php
- include "navbar.php";
- include "utils/autoloader.php";
- if(!in_array(0, $_SESSION['permissions'])){
- header('Location: dashboard.php');
- exit;
- }
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- //select the available permissions from the database
- $all_p = $db->all(Permissions::class);
- $available_permissions = [];
- foreach($all_p as $tmp){
- $available_permissions[] = ['id' => $tmp->id, 'name' => $tmp->name];
- }
- ?>
- <body>
- <div class="container">
- <h1>Add user</h1>
- <form action="add_user.php" method="post">
- <div class="mb-3">
- <label for="voornaam" class="form-label"><b>Voornaam:</b></label>
- <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam">
- </div>
- <div class="mb-3">
- <label for="achternaam" class="form-label"><b>Achternaam:</b></label>
- <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam">
- </div>
- <div class="mb-3">
- <label for="email" class="form-label"><b>Email:</b></label>
- <input type="text" class="form-control" name="email" id="email" placeholder="Email">
- </div>
- <div class="mb-3">
- <label for="password" class="form-label"><b>Wachtwoord:</b></label>
- <input type="password" class="form-control" name="password" id="password" placeholder="******">
- </div>
- <p>Please select the user permissions:</p>
- <?php
- foreach($available_permissions as $db_permission){
- echo "<div class=\"mb-3 form-check\">
+<head>
+ <title>Add user</title>
+ <!-- Bootstrap CSS -->
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
+</head>
+<?php
+include "navbar.php";
+include "utils/autoloader.php";
+if (!in_array(0, $_SESSION['permissions'])) {
+ header('Location: dashboard.php');
+ exit;
+}
+$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
+//select the available permissions from the database
+$all_p = $db->all(Permissions::class);
+$available_permissions = [];
+foreach ($all_p as $tmp) {
+ $available_permissions[] = ['id' => $tmp->id, 'name' => $tmp->name];
+}
+?>
+
+<body>
+ <div class="container">
+ <h1>Add user</h1>
+
+ <form action="add_user.php" method="post">
+ <div class="mb-3">
+ <label for="voornaam" class="form-label"><b>Voornaam:</b></label>
+ <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam">
+ </div>
+ <div class="mb-3">
+ <label for="achternaam" class="form-label"><b>Achternaam:</b></label>
+ <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam">
+ </div>
+ <div class="mb-3">
+ <label for="email" class="form-label"><b>Email:</b></label>
+ <input type="text" class="form-control" name="email" id="email" placeholder="Email">
+ </div>
+ <div class="mb-3">
+ <label for="password" class="form-label"><b>Wachtwoord:</b></label>
+ <input type="password" class="form-control" name="password" id="password" placeholder="******">
+ </div>
+ <p>Please select the user permissions:</p>
+ <?php
+ foreach ($available_permissions as $db_permission) {
+ echo "<div class=\"mb-3 form-check\">
<input type=\"checkbox\" class=\"form-check-input\" name=\"permissions[]\" value=" . $db_permission['id'] . "\">
<label class=\"form-check-label\" for=" . $db_permission['name'] . ">" . $db_permission['name'] . "</label>
</div>";
- }
- ?>
- <button type="submit" class="btn btn-primary" name="submit">Add user</button>
- </form>
- </div>
- <?php
+ }
+ ?>
+ <button type="submit" class="btn btn-primary" name="submit">Add user</button>
+ </form>
+ </div>
+ <?php
if ($_SERVER["REQUEST_METHOD"] == "POST") {
$errors = array(); // initialize an empty array to store errors
@@ -63,35 +65,35 @@
} else {
$errors[] = "Voornaam is required";
}
-
+
// Check if achternaam is set and not empty
if (isset($_POST['achternaam']) && !empty($_POST['achternaam'])) {
$lname = $_POST['achternaam'];
} else {
$errors[] = "Achternaam is required";
}
-
+
// Check if email is set and not empty
if (isset($_POST['email']) && !empty($_POST['email'])) {
$email = $_POST['email'];
} else {
$errors[] = "E-mail is required";
}
-
+
// Check if password is set and not empty
if (isset($_POST['password']) && !empty($_POST['password'])) {
$password = $_POST['password'];
} else {
$errors[] = "Wachtwoord is required";
}
-
+
// Check if permissions is set
if (isset($_POST['permissions'])) {
$permissions = $_POST['permissions'];
} else {
$errors[] = "Permissies zijn vereist";
}
-
+
// Check if there are any errors
if (count($errors) > 0) {
// Print out the errors
@@ -101,43 +103,44 @@
} else {
// Pass the password through a hashing function
$hashed_pwd = password_hash($password, PASSWORD_DEFAULT);
-
+
//create a database object with table user
$u = $db->get(User::class);
//check if email already exists
- if($u->load($email)){
- echo"this email address is taken: " . $email;
- }else{
+ if ($u->load($email)) {
+ echo "this email address is taken: " . $email;
+ } else {
$succes = false;
//set new user data
$u->email = $email;
$u->fname = $fname;
$u->lname = $lname;
$u->pwd = $hashed_pwd;
-
+
//add user with the add function
- if($u->add()){
+ if ($u->add()) {
$succes = true;
- };
+ }
+ ;
//create a database object with table permission for each permission
//set the data and execute the add function
- foreach($permissions as $permission){
+ foreach ($permissions as $permission) {
$p = $db->get(Permission_user::class);
$p->email = $email;
$p->id = (int) $permission;
- if($p->add())
- {
+ if ($p->add()) {
$succes = true;
}
}
- if($succes){
- echo"succes!";
+ if ($succes) {
+ echo "succes!";
}
}
}
}
?>
- </body>
-</html>
+</body>
+
+</html>
+\ No newline at end of file
diff --git a/alter_user.php b/alter_user.php
@@ -9,168 +9,172 @@
<?php
use Lollipop\DatabaseObject;
use Lollipop\SQLDatabase;
- include "navbar.php";
- include "utils/autoloader.php";
- if(!in_array(0, $_SESSION['permissions'])){
+
+include "navbar.php";
+include "utils/autoloader.php";
+if (!in_array(0, $_SESSION['permissions'])) {
header('Location: dashboard.php');
exit;
- }
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
+}
+$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- //select the available permissions from the database
- $all_p = $db->all(Permissions::class);
- $available_permissions = [];
- foreach($all_p as $tmp){
- $available_permissions[] = ['id' => $tmp->id, 'name' => $tmp->name];
- }
- //if not found set to empty if not GET
- $fname = "";
- $lname = "";
- $email = "";
- $user_permissions = [];
+//select the available permissions from the database
+$all_p = $db->all(Permissions::class);
+$available_permissions = [];
+foreach ($all_p as $tmp) {
+ $available_permissions[] = ['id' => $tmp->id, 'name' => $tmp->name];
+}
+//if not found set to empty if not GET
+$fname = "";
+$lname = "";
+$email = "";
+$user_permissions = [];
- if($_SERVER["REQUEST_METHOD"] == "GET"){
- //if the get var isset and user is found in the database load data into forms
- if(!isset($_GET['email'])){
- echo"";
- }else{
- $get_email = $_GET['email'];
- $u = $db->get(User::class);
- if($u->load($get_email)){
- $fname = $u->fname;
- $lname = $u->lname;
- $email = $u->email;
- $p = $db->all_where(Permission_user::class, array('email' => $email));
- foreach($p as $permission){
- $user_permissions[] = $permission->id;
- }
+if ($_SERVER["REQUEST_METHOD"] == "GET") {
+ //if the get var isset and user is found in the database load data into forms
+ if (!isset($_GET['email'])) {
+ echo "";
+ } else {
+ $get_email = $_GET['email'];
+ $u = $db->get(User::class);
+ if ($u->load($get_email)) {
+ $fname = $u->fname;
+ $lname = $u->lname;
+ $email = $u->email;
+ $p = $db->where(Permission_user::class, array('email' => $email));
+ foreach ($p as $permission) {
+ $user_permissions[] = $permission->id;
}
}
}
- if ($_SERVER["REQUEST_METHOD"] == "POST") {
- $errors = array(); // initialize an empty array to store errors
-
- // Check if voornaam is set and not empty
- if (isset($_POST['voornaam']) && !empty($_POST['voornaam'])) {
- $fname = $_POST['voornaam'];
- } else {
- $errors[] = "Voornaam is required";
- }
-
- // Check if achternaam is set and not empty
- if (isset($_POST['achternaam']) && !empty($_POST['achternaam'])) {
- $lname = $_POST['achternaam'];
- } else {
- $errors[] = "Achternaam is required";
- }
-
- // Check if email is set and not empty
- if (isset($_POST['email']) && !empty($_POST['email'])) {
- $email = $_POST['email'];
- } else {
- $errors[] = "E-mail is required";
- }
-
- // Check if permissions is set
- if (isset($_POST['permissions'])) {
- $permissions = $_POST['permissions'];
- } else {
- $errors[] = "Permissies zijn vereist";
- }
-
- // Check if there are any errors
- if (count($errors) > 0) {
- // Print out the errors
- foreach ($errors as $error) {
- echo $error . "<br>";
- }
- } else {
- //create a database object with table user
- $u = $db->get(User::class);
+}
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ $errors = array(); // initialize an empty array to store errors
- //check if email already exists
- if(!$u->load($email)){
- echo"this user does not exist " . $email;
- }else{
- $succes = false;
- //set new user data
- $u->email = $email;
- $u->fname = $fname;
- $u->lname = $lname;
- echo $u->save();
- //add user with the add function
- if(true){
- $succes = true;
- };
+ // Check if voornaam is set and not empty
+ if (isset($_POST['voornaam']) && !empty($_POST['voornaam'])) {
+ $fname = $_POST['voornaam'];
+ } else {
+ $errors[] = "Voornaam is required";
+ }
- $p = $db->get(Permission_user::class);
- //delete all permissions
- foreach($available_permissions as $available){
- $p->email = $email;
- $p->id = $available['id'];
- $p->delete();
- }
+ // Check if achternaam is set and not empty
+ if (isset($_POST['achternaam']) && !empty($_POST['achternaam'])) {
+ $lname = $_POST['achternaam'];
+ } else {
+ $errors[] = "Achternaam is required";
+ }
- //add permissions
- foreach($permissions as $keep){
- $p->email = $email;
- $p->id = (int)$keep;
- $p->add();
- }
- if($succes){
- echo"succes!";
- }
- }
- }
- //if the get var isset and user is found in the database load data into forms
- if(!isset($_GET['email'])){
- echo"";
- }else{
- $get_email = $_GET['email'];
- $u = $db->get(User::class);
- if($u->load($get_email)){
- $fname = $u->fname;
- $lname = $u->lname;
- $email = $u->email;
- $p = $db->all_where(Permission_user::class, array('email' => $email));
- foreach($p as $permission){
- $user_permissions[] = $permission->id;
- }
+ // Check if email is set and not empty
+ if (isset($_POST['email']) && !empty($_POST['email'])) {
+ $email = $_POST['email'];
+ } else {
+ $errors[] = "E-mail is required";
+ }
+
+ // Check if permissions is set
+ if (isset($_POST['permissions'])) {
+ $permissions = $_POST['permissions'];
+ } else {
+ $errors[] = "Permissies zijn vereist";
+ }
+
+ // Check if there are any errors
+ if (count($errors) > 0) {
+ // Print out the errors
+ foreach ($errors as $error) {
+ echo $error . "<br>";
+ }
+ } else {
+ //create a database object with table user
+ $u = $db->get(User::class);
+
+ //check if email already exists
+ if (!$u->load($email)) {
+ echo "this user does not exist " . $email;
+ } else {
+ $succes = false;
+ //set new user data
+ $u->email = $email;
+ $u->fname = $fname;
+ $u->lname = $lname;
+ echo $u->save();
+ //add user with the add function
+ if (true) {
+ $succes = true;
+ }
+ ;
+
+ $p = $db->get(Permission_user::class);
+ //delete all permissions
+ foreach ($available_permissions as $available) {
+ $p->email = $email;
+ $p->id = $available['id'];
+ $p->delete();
+ }
+
+ //add permissions
+ foreach ($permissions as $keep) {
+ $p->email = $email;
+ $p->id = (int) $keep;
+ $p->add();
+ }
+ if ($succes) {
+ echo "succes!";
+ }
+ }
+ }
+ //if the get var isset and user is found in the database load data into forms
+ if (!isset($_GET['email'])) {
+ echo "";
+ } else {
+ $get_email = $_GET['email'];
+ $u = $db->get(User::class);
+ if ($u->load($get_email)) {
+ $fname = $u->fname;
+ $lname = $u->lname;
+ $email = $u->email;
+ $p = $db->where(Model\PermissionUser::class, array('email' => $email));
+ foreach ($p as $permission) {
+ $user_permissions[] = $permission->id;
}
}
- }
+ }
+}
?>
<body>
<div class="container">
<h1>Alter user</h1>
- <form action="alter_user.php?email=<?php echo $email;?>" method="post">
+ <form action="alter_user.php?email=<?php echo $email; ?>" method="post">
<div class="mb-3">
<label for="voornaam" class="form-label"><b>Voornaam:</b></label>
- <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam" value=<?php echo$fname?>>
+ <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam" value=<?php echo $fname ?>>
</div>
<div class="mb-3">
<label for="achternaam" class="form-label"><b>Achternaam:</b></label>
- <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam" value=<?php echo$lname?>>
+ <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam"
+ value=<?php echo $lname ?>>
</div>
<div class="mb-3">
<label for="email" class="form-label"><b>Email:</b></label>
- <input type="text" class="form-control" name="email" id="email" placeholder="Email" value=<?php echo$email?>>
+ <input type="text" class="form-control" name="email" id="email" placeholder="Email" value=<?php echo $email ?>>
</div>
<p>Please select the user permissions:</p>
- <?php
- foreach($available_permissions as $db_permission){
- echo "<div class=\"mb-3 form-check\">" .
+ <?php
+ foreach ($available_permissions as $db_permission) {
+ echo "<div class=\"mb-3 form-check\">" .
"<input type=\"checkbox\" class=\"form-check-input\" name=\"permissions[]\" value=" . $db_permission['id'] . "\"";
- if ($user_permissions != null && in_array($db_permission['id'], $user_permissions)) {
- echo " checked";
- }
- echo "><label class=\"form-check-label\" for=" . $db_permission['name'] . ">" . $db_permission['name'] . "</label>" .
- "</div>";
+ if ($user_permissions != null && in_array($db_permission['id'], $user_permissions)) {
+ echo " checked";
}
+ echo "><label class=\"form-check-label\" for=" . $db_permission['name'] . ">" . $db_permission['name'] . "</label>" .
+ "</div>";
+ }
?>
<button type="submit" class="btn btn-primary" name="submit">Alter user</button>
</form>
</div>
</body>
+
</html>
\ No newline at end of file
diff --git a/classes/Permission_user.php b/classes/Permission_user.php
@@ -1,14 +0,0 @@
-<?php
-class Permission_user extends Lollipop\DatabaseObject
-{
- static function get_table(): string
- {
- return "permission_user";
- }
-
- static function get_primary(): string
- {
- return "email";
- }
-}
-?>
-\ No newline at end of file
diff --git a/classes/Permissions.php b/classes/Permissions.php
@@ -1,14 +0,0 @@
-<?php
-class Permissions extends Lollipop\DatabaseObject
-{
- static function get_table(): string
- {
- return "permission";
- }
-
- static function get_primary(): string
- {
- return "id";
- }
-}
-?>
-\ No newline at end of file
diff --git a/crud_user.php b/crud_user.php
@@ -107,7 +107,7 @@
// Making a sql statement to add user to the database, preparing it and excuting
$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- $u = $db->loadtable(User::class);
+ $u = $db->get(User::class);
$data = array('email' => $email, 'fname' => $fname, 'lname' => $lname, 'pwd' => $hashed_pwd);
diff --git a/login.php b/login.php
@@ -2,89 +2,91 @@
<html>
<head>
- <title>Login Page</title>
- <!-- Add the Bootstrap CSS stylesheet -->
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
- <?php
- include "utils/autoloader.php";
- if(isset($_SESSION['email'])){
- header('Location: dashboard.php');
- }
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- ?>
- </head>
+ <title>Login Page</title>
+ <!-- Add the Bootstrap CSS stylesheet -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
+ integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+ <?php
+ include "utils/autoloader.php";
+ if (isset($_SESSION['email'])) {
+ header('Location: dashboard.php');
+ }
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
+ ?>
+</head>
+
<body>
- <div class="container mt-5">
- <div class="row justify-content-center">
- <div class="col-md-6">
- <div class="card">
- <div class="card-header">Login</div>
- <div class="card-body">
- <form method="POST" action="login.php">
- <div class="form-group">
- <label for="email">Email:</label>
- <input type="email" class="form-control" id="email" name="email" placeholder="Enter email">
- </div>
- <div class="form-group">
- <label for="password">Password:</label>
- <input type="password" class="form-control" id="password" name="password" placeholder="Enter password">
- </div>
- <button type="submit" name='login_btn' class="btn btn-primary">Login</button>
- </form>
- </div>
- </div>
- </div>
+ <div class="container mt-5">
+ <div class="row justify-content-center">
+ <div class="col-md-6">
+ <div class="card">
+ <div class="card-header">Login</div>
+ <div class="card-body">
+ <form method="POST" action="login.php">
+ <div class="form-group">
+ <label for="email">Email:</label>
+ <input type="email" class="form-control" id="email" name="email" placeholder="Enter email">
+ </div>
+ <div class="form-group">
+ <label for="password">Password:</label>
+ <input type="password" class="form-control" id="password" name="password" placeholder="Enter password">
+ </div>
+ <button type="submit" name='login_btn' class="btn btn-primary">Login</button>
+ </form>
+ </div>
</div>
</div>
</div>
- <?php
- // 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 "One of the forms was empty";
- } else {
- //store data from the form in a variable
- $email = $_POST['email'];
- $pwd = $_POST['password'];
+ </div>
+ </div>
+ <?php
+ // 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 "One of the forms was empty";
+ } else {
+ //store data from the form in a variable
+ $email = $_POST['email'];
+ $pwd = $_POST['password'];
- //create a User orm class
- $u = $db->get(User::class);
-
- if(!$u->load($email)){
- //user incorrect, but to give out as little person info as possible just show either is wrong
- echo"password or user incorrect";
- }else{
- //password verification logic
- if(password_verify($pwd, $u->pwd)){
- //start session and set session variables
- session_start();
- $_SESSION['email'] = $u->email;
- $_SESSION['first_name'] = $u->fname;
- $_SESSION['last_name'] = $u->lname;
+ //create a User orm class
+ $u = $db->get(Model\User::class);
- $p = $db->all_where(Permission_user::class, array('email' => $email));
- foreach($p as $permission){
- $user_permissions[] = $permission->id;
- };
- $_SESSION['user_permissions'] = $user_permissions;
+ if (!$u->load($email)) {
+ //user incorrect, but to give out as little person info as possible just show either is wrong
+ echo "password or user incorrect";
+ } else {
+ //password verification logic
+ if (password_verify($pwd, $u->pwd)) {
+ //start session and set session variables
+ session_start();
+ $_SESSION['email'] = $u->email;
+ $_SESSION['first_name'] = $u->fname;
+ $_SESSION['last_name'] = $u->lname;
- header('Location: dashboard.php');
- }else{
- //password incorrect, but to give out as little person info as possible just show either is wrong
- echo"password or user incorrect";
+ $p = $db->where(Model\PermissionUser::class, array('email' => $email));
+ foreach ($p as $permission) {
+ $user_permissions[] = $permission->id;
}
+ $_SESSION['user_permissions'] = $user_permissions;
+
+ header('Location: dashboard.php');
+ } else {
+ //password incorrect, but to give out as little person info as possible just show either is wrong
+ echo "password or user incorrect";
}
}
- ;
- $_SESSION['permissions'] = $permissions;
- header('Location: dashboard.php');
}
+ $_SESSION['permissions'] = $permissions;
+ header('Location: dashboard.php');
}
-
-
-
- ?>
- </body>
+ }
+
+
+
+ ?>
+</body>
+
</html>
\ No newline at end of file
diff --git a/search_user.php b/search_user.php
@@ -1,42 +1,45 @@
<!DOCTYPE html>
<html lang="eng">
- <head>
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
- <?php
- include "navbar.php";
- include "utils/autoloader.php";
- if(!in_array(0, $_SESSION['permissions'])){
- header('Location: dashboard.php');
- exit;
- }
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- ?>
- </head>
+
+<head>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
+ <?php
+ include "navbar.php";
+ include "utils/autoloader.php";
+ if (!in_array(0, $_SESSION['permissions'])) {
+ header('Location: dashboard.php');
+ exit;
+ }
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
+ ?>
+</head>
+
<body>
<form class="d-flex" action="search_user.php" method="post">
- <input class="form-control me-2" type="search" name="search" placeholder="Email" aria-label="Search">
- <button class="btn btn-outline-success" type="submit">Search</button>
-</form>
- <?php
- if ($_SERVER["REQUEST_METHOD"] == "POST"){
- if(isset($_POST['search'])) {
- //set $query
- $query = "%" . $_POST['search'] . "%";
- display_results($db, $query);
- }elseif(isset($_POST['delete'])){
- $u = $db->get(User::class);
- $u->load($_POST['delete']);
- $u->delete();
- display_results($db, $_POST['query']);
- }
+ <input class="form-control me-2" type="search" name="search" placeholder="Email" aria-label="Search">
+ <button class="btn btn-outline-success" type="submit">Search</button>
+ </form>
+ <?php
+ if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ if (isset($_POST['search'])) {
+ //set $query
+ $query = "%" . $_POST['search'] . "%";
+ display_results($db, $query);
+ } elseif (isset($_POST['delete'])) {
+ $u = $db->get(User::class);
+ $u->load($_POST['delete']);
+ $u->delete();
+ display_results($db, $_POST['query']);
}
- function display_results($db, $query){
- //create a User orm class and load all the records where user like query
- $results = $db->all_where(User::class, array('email' => $query));
+ }
+ function display_results(Lollipop\SQLDatabase $db, $query)
+ {
+ //create a User orm class and load all the records where user like query
+ $results = $db->where(User::class, array('email' => $query));
- // display results
- if($results != null){
- echo "<table class=\"table table-striped\">
+ // display results
+ if ($results != null) {
+ echo "<table class=\"table table-striped\">
<thead>
<tr>
<th>E-mail</th>
@@ -47,30 +50,30 @@
</tr>
</thead>
<tbody>";
- foreach($results as $data) {
- $link = "/alter_user.php?email=" . $data->email;
- echo "<tr>";
- echo "<td>" . $data->email . "</td>";
- echo "<td>" . $data->fname . "</td>";
- echo "<td>" . $data->lname . "</td>";
- echo "<td><a href='" . $link . "'>Edit</a></td>";
- echo "
+ foreach ($results as $data) {
+ $link = "/alter_user.php?email=" . $data->email;
+ echo "<tr>";
+ echo "<td>" . $data->email . "</td>";
+ echo "<td>" . $data->fname . "</td>";
+ echo "<td>" . $data->lname . "</td>";
+ echo "<td><a href='" . $link . "'>Edit</a></td>";
+ echo "
<td>
<form method=\"post\" action=\"search_user.php\">
- <input type=\"hidden\" name=\"query\" value=" . $query. ">
- <button type=\"submit\" name='delete' value=" . $data->email ." ' class=\"btn btn-primary\">delete</button>
+ <input type=\"hidden\" name=\"query\" value=" . $query . ">
+ <button type=\"submit\" name='delete' value=" . $data->email . " ' class=\"btn btn-primary\">delete</button>
</form>
</td>";
- echo "</tr>";
- }
- echo"
+ echo "</tr>";
+ }
+ echo "
</tbody>
</table>";
- }else{
- echo "No users with this email address were found.";
- }
+ } else {
+ echo "No users with this email address were found.";
}
+ }
?>
- </body>
-</html>
+</body>
+</html>
+\ No newline at end of file
diff --git a/searchuser.php b/searchuser.php
@@ -1,27 +1,27 @@
<?php
- include "navbar.php";
- include "utils/autoloader.php";
+include "navbar.php";
+include "utils/autoloader.php";
?>
<html>
- <head>
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
- </head>
+
+<head>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
+</head>
+
<body>
<form class="d-flex" action="searchuser.php" method="post">
- <input class="form-control me-2" type="search" name="search" placeholder="Search" aria-label="Search">
- <button class="btn btn-outline-success" type="submit">Search</button>
-</form>
- <?php
- if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['search'])) {
- $search = $_POST['search'];
- $search = array('email' => "%" . $search . "%");
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
- $u = $db->loadtable(User::class);
- $u->all_where($search);
- $data = $u->getData();
- // verification logic and $_SESSION start
- if(count($data) > 0){
- echo "<table class=\"table table-striped\">
+ <input class="form-control me-2" type="search" name="search" placeholder="Search" aria-label="Search">
+ <button class="btn btn-outline-success" type="submit">Search</button>
+ </form>
+ <?php
+ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['search'])) {
+ $search = $_POST['search'];
+ $search = array('email' => "%" . $search . "%");
+ $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
+ $u = $db->where(User::class, $search);
+ // verification logic and $_SESSION start
+ if (count($u) > 0) {
+ echo "<table class=\"table table-striped\">
<thead>
<tr>
<th>E-mail</th>
@@ -31,23 +31,23 @@
</tr>
</thead>
<tbody>";
- foreach ($data as $user) {
- $link = "/alteruser.php?email=" . $user['email'];
- echo "<tr>";
- echo "<td>" . $user['email'] . "</td>";
- echo "<td>" . $user['fname'] . "</td>";
- echo "<td>" . $user['lname'] . "</td>";
- echo "<td><a href='" . $link . "'>Edit</a></td>";
- echo "</tr>";
- }
- echo"
+ foreach ($u as $user) {
+ $link = "/alteruser.php?email=" . $user['email'];
+ echo "<tr>";
+ echo "<td>" . $user['email'] . "</td>";
+ echo "<td>" . $user['fname'] . "</td>";
+ echo "<td>" . $user['lname'] . "</td>";
+ echo "<td><a href='" . $link . "'>Edit</a></td>";
+ echo "</tr>";
+ }
+ echo "
</tbody>
- </table>";
- }else{
- echo "No users with this email address were found.";
- }
- }
- ?>
- </body>
-</html>
+ </table>";
+ } else {
+ echo "No users with this email address were found.";
+ }
+ }
+ ?>
+</body>
+</html>
+\ No newline at end of file
diff --git a/test_orm.php b/test_orm.php
@@ -12,7 +12,7 @@ $hashed_pwd = password_hash($pwd, PASSWORD_DEFAULT);
// Making a sql statement to add user to the database, preparing it and excuting
$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
-$u = $db->loadtable(User::class);
+$u = $db->get(User::class);
$data = array('email' => $email, 'fname' => $fname, 'lname' => $lname, 'pwd' => $hashed_pwd);
