commit 21639de2c3c958109bdacc6fb82c15e69b87e332
parent 3fb9bb661c264f676109f3dd35ee15b3302f9806
Author: MoiBaguette <[email protected]>
Date: Sat, 24 Jun 2023 16:28:25 +0200
user and course fully operational
Diffstat:
7 files changed, 86 insertions(+), 30 deletions(-)
diff --git a/Lollipop/DatabaseObject.php b/Lollipop/DatabaseObject.php
@@ -172,7 +172,7 @@ namespace Lollipop {
public function notNullable(){
//non-auto-increment not-nullable collumn names query
$col_names = [];
- $sql = " SELECT column_name, is_nullable
+ $sql = " SELECT column_name, is_nullable, extra
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = '{$this->table}'
AND TABLE_SCHEMA = '{$this->schema}'";
diff --git a/Lollipop/Utils.php b/Lollipop/Utils.php
@@ -19,5 +19,17 @@ namespace Lollipop{
}
return $missing;
}
+ static function missing_fields_sans_pw($not_nullable){
+ $missing = [];
+ foreach($not_nullable as $column){
+ if($_POST[$column] == NULL || $_POST[$column] == ""){
+ if($column != "password"){
+ $key = 'missing_' . $column;
+ $missing[$key] = "This field cannot be empty!";
+ }
+ }
+ }
+ return $missing;
+ }
}
}
\ No newline at end of file
diff --git a/Model/PermissionUser.php b/Model/PermissionUser.php
@@ -9,7 +9,7 @@ namespace Model {
static function get_primary(): string
{
- return 'id';
+ return 'email';
}
static function get_schema(): string
{
@@ -26,10 +26,19 @@ namespace Model {
}
return false;
}
- public function update_permissions(User $user):array{
-
-
- return $this->db->all_where($this->get_table(), ["email", $_POST["email"]]);
+ public function update_permissions(User $user):bool{
+ foreach($this->db->all_where(PermissionUser::class, [$this->get_primary() => $_POST[$this->get_primary()]]) as $permission){
+ $permission->delete();
+ }
+ if(array_key_exists('permissions', $_POST)){
+ foreach($_POST['permissions'] as $permission){
+ $this->{$user->get_primary()} = $user->{$user->get_primary()};
+ $this->id = $permission;
+ $this->add();
+ }
+ return true;
+ }
+ return false;
}
}
}
\ No newline at end of file
diff --git a/Model/User.php b/Model/User.php
@@ -127,5 +127,21 @@ namespace Model {
}
}
}
+ public function update_user():bool{
+ $missing_fields = \Lollipop\Utils::missing_fields_sans_pw($this->notNullable());
+ if(sizeof($missing_fields) == 0){
+ foreach($_POST as $key => $post){
+ if(in_array($key, $this->get_column_names())){
+ if($key == $this->get_password_field()){
+ $this->{$key} = password_hash($_POST[$key], PASSWORD_DEFAULT);
+ }else{
+ $this->{$key} = $post;
+ }
+ }
+ }
+ return $this->save();
+ }
+ return false;
+ }
}
}
\ No newline at end of file
diff --git a/controller/templates.php b/controller/templates.php
@@ -47,18 +47,28 @@ namespace controller{
}
function form_v2(string $action, array $values = [], array $extra = [], array $response = []): string{
-
/*auto-increment fields are automatically hidden*/
- $form = '<h1>Add '. $this->table->get_table() .'</h1>
+ if(sizeof($values) == 0){
+ $form_type = "Add";
+ }else{
+ $form_type = "Update";
+ }
+ $form = '<h1>'. $form_type .' '. $this->table->get_table() .'</h1>
<a href="/'. $this->table->get_table() .'">New</a>';
$form .= '<form method="POST" action="'. $action . '">';
foreach($this->table->get_col_info() as $col => $info){
- if($info["extra"] == "auto_increment"){
- $form .= '<input type="hidden" name="' . $col . '" placeholder="' . $col . '" value="' . $values[$col] . '">';
- }elseif($info["extra"] == "password"){
+ if(isset($info["extra"]) && $info["extra"] == "auto_increment"){
+ $form .= '<input type="hidden" name="' . $col . '" placeholder="' . $col . '" value="';
+ if(isset($values[$col]))
+ $form .= $values[$col];
+ $form .= '">';
+ }elseif(isset($info["extra"]) && $info["extra"] == "password"){
$form .= '<input type="password" name="' . $col . '" placeholder="' . $col . '">';
- }else{
- $form .= '<input type="'. $info["input_type"] .'" name="' . $col . '" placeholder="' . $col . '" value="' . $values[$col] . '">';
+ }elseif(isset($info["input_type"])){
+ $form .= '<input type="'. $info["input_type"] .'" name="' . $col . '" placeholder="' . $col . '" value="';
+ if(isset($values[$col]))
+ $form .= $values[$col];
+ $form .= '">';
}
$miss_key = 'missing_'.$col;
if(array_key_exists($miss_key, $response)){
@@ -68,11 +78,6 @@ namespace controller{
foreach($extra as $html){
$form.= $html;
}
- if(sizeof($values) == 0){
- $form_type = "Add";
- }else{
- $form_type = "Update";
- }
$form .= '<input type="hidden" name="form_type" " value="' . $form_type . '">';
$form .='
<input type="submit" value="'. $form_type .'">
@@ -89,7 +94,11 @@ namespace controller{
}
public function crud_table(string $action, string $search = "", string $search_key, \Model\PermissionUser $permissionUser = null):string{
- $search = '%' . $search . '%';
+ if($search == ""){
+ $search = "%";
+ }else{
+ $search = '%' . $search . '%';
+ }
$table = "<table> <thead> <tr>";
foreach($this->table->get_column_names() as $column){
$table .= "<th>$column</th>";
@@ -116,7 +125,11 @@ namespace controller{
<a class="delete" href="' . $action . '/'. $obj->{$this->table->get_primary()} .'/delete/">Delete</a>
</td>
<td>';
-
+ if($permissionUser != null){
+ foreach($this->db->all_where(\Model\PermissionUser::class, [$permissionUser->get_primary() => $obj->{$this->table->get_primary()}]) as $perm){
+ $table .= $perm->id . ' ';
+ }
+ }
$table .= '</td> </tr>';
}
diff --git a/routing/user.php b/routing/user.php
@@ -3,7 +3,7 @@ $user_get = function(&$vars){
global $db;
$user = $db->get(Model\User::class);
$permissions = $db->get(Model\Permission::class);
- $permissionUser = $db->get(Model\PermissionUser::class);
+ $permission_user = $db->get(Model\PermissionUser::class);
$templates = new controller\templates($db, $user);
if(isset($_POST["search"])){
@@ -12,7 +12,7 @@ $user_get = function(&$vars){
}
$vars["form"] = $templates->form_v2("/user", [], ["checkboxes" => $permissions->get_checkboxes()]);
$vars["search"] = $templates->search_form("/user/search");
- $vars["table"] = $templates->crud_table("/user", "" ,"email", $permissionUser);
+ $vars["table"] = $templates->crud_table("/user", "" ,"email", $permission_user);
return "views/user.html";
};
@@ -29,17 +29,19 @@ $user_post = function(&$vars){
if($user->add_user() && $permission_user->add_permissions($user)){
$vars["response"] = 'succesfully added: ' . $_POST["email"];
}
- } elseif($_POST["form_type"] == 'Update'){
- if($user->update_user()){
+ }elseif($_POST["form_type"] == 'Update'){
+ if($user->update_user() && $permission_user->update_permissions($user)){
$vars["response"] = 'succesfully updated: ' . $_POST["email"];
+ }else{
+ echo"something went wrong";
+ var_dump(\Lollipop\Utils::missing_fields($user->notNullable()));
}
}
- }
-
+ }
$vars["form"] = $templates->form_v2("/user", $data, ["checkboxes" => $permissions->get_checkboxes()]);
$vars["search"] = $templates->search_form("/user");
- $vars["table"] = $templates->crud_table("/user", "", "email");
+ $vars["table"] = $templates->crud_table("/user", "", "email", $permission_user);
return "views/user.html";
};
@@ -47,10 +49,11 @@ $user_query = function(&$vars){
global $db;
$user = $db->get(Model\User::class);
$permissions = $db->get(Model\Permission::class);
+ $permission_user = $db->get(Model\PermissionUser::class);
$templates = new controller\templates($db, $user);
$vars["form"] = $templates->form_v2("/user", [], ["checkboxes" => $permissions->get_checkboxes()]);
$vars["search"] = $templates->search_form("/user/search");
- $vars["table"] = $templates->crud_table("/user", $vars["search_query"], "email");
+ $vars["table"] = $templates->crud_table("/user", $vars["search_query"], "email", $permission_user);
return "views/user.html";
};
@@ -73,6 +76,7 @@ $user_edit = function(&$vars){
global $db;
$user = $db->get(Model\User::class);
$permissions = $db->get(Model\Permission::class);
+ $permission_user = $db->get(Model\PermissionUser::class);
$templates = new controller\templates($db, $user);
$data = [];
$user->load($vars["primary_key"]);
@@ -81,7 +85,7 @@ $user_edit = function(&$vars){
}
$vars["form"] = $templates->form_v2("/user", $data, ["checkboxes" => $permissions->get_checkboxes()]);
$vars["search"] = $templates->search_form("/user/search");
- $vars["table"] = $templates->crud_table("/user", "", "email");
+ $vars["table"] = $templates->crud_table("/user", "", "email", $permission_user);
return "views/user.html";
};
@@ -90,11 +94,12 @@ $user_delete = function(&$vars){
$user = $db->get(Model\User::class);
$permissions = $db->get(Model\Permission::class);
$templates = new controller\templates($db, $user);
+ $permission_user = $db->get(Model\PermissionUser::class);
$user->load($vars["primary_key"]);
$user->delete();
$vars["form"] = $templates->form_v2("/user", [], ["checkboxes" => $permissions->get_checkboxes()]);
$vars["search"] = $templates->search_form("/user");
- $vars["table"] = $templates->crud_table("/user" ,"", "email");
+ $vars["table"] = $templates->crud_table("/user" ,"", "email", $permission_user);
return "views/user.html";
};
diff --git a/views/user.html b/views/user.html
@@ -11,6 +11,7 @@
<div class ="side_bar">
<div class ="form_add">
{{$form}}
+ {{$response}}
</div>
</div>
<div class = "courses">
