From fd6af01e313f441189c4cd69668766d2ded7ced3 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 30 May 2017 21:03:03 +0200 Subject: Several changes have been made in this commit, which together with the previous commits result in version 2.2 [changed template parameters]: + Implemented [core]: A new method called "getAll" has been added to the "Attribute" class which now returns all attributes as key->value array. The first parameter can be an array with attribute names which shall be excluded from returning. + Optimization [core]: The function "generateItemData" has been renamed to "generateItemTemplateData" and has been restructured to use the new implemented method "getAll" from the "Attribute" class. + Optimization [core]: The function "generateNaviTemplate" has been added and the functions "generatePageNaviTemplate", "generatePostNaviTemplate" and "generateUserNaviTemplate" have been restructured to make use of the new "generateNaviTemplate" function to reduce duplicate code. + Optimization [core]: Several files within the admin directory has been optimized to use the new "getAll" method of the "Attribute" class. + Optimization [core]: Several code optimizations have been made to the "HTTP" class. + Optimization [admin template]: All occurences of $PAGE['ID'], $POST['ID'] and $USER['ID'] have been replaced with $PAGE['ATTR']['ID'], $POST['ATTR']['ID'] and $USER['ATTR']['ID'] to make it more consistent. You now have to use ['ATTR']['ID'] instead of ['ID'] in your templates to get the ID of an item! Template upgrade to version 2.2 (only for customized templates): SEARCH: ['ID'] REPLACE: ['ATTR']['ID'] --- admin/page/delete.php | 7 +------ admin/page/insert.php | 11 +---------- admin/page/update.php | 11 +---------- admin/post/delete.php | 7 +------ admin/post/insert.php | 11 +---------- admin/post/update.php | 11 +---------- admin/user/delete.php | 7 +------ admin/user/insert.php | 13 +------------ admin/user/update.php | 13 +------------ 9 files changed, 9 insertions(+), 82 deletions(-) (limited to 'admin') diff --git a/admin/page/delete.php b/admin/page/delete.php index de9ac21..890188e 100644 --- a/admin/page/delete.php +++ b/admin/page/delete.php @@ -36,12 +36,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'DELETE', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'BODY' => $Attribute->get('body'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER), 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/page/insert.php b/admin/page/insert.php index 5731b6f..a360c1b 100644 --- a/admin/page/insert.php +++ b/admin/page/insert.php @@ -56,16 +56,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'INSERT', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'USER' => $Attribute->get('user'), - 'SLUG' => $Attribute->get('slug'), - 'NAME' => $Attribute->get('name'), - 'BODY' => $Attribute->get('body'), - 'ARGV' => $Attribute->get('argv'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER), 'USER_LIST' => $userAttributes ?? [], 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/page/update.php b/admin/page/update.php index dc92073..18c9785 100644 --- a/admin/page/update.php +++ b/admin/page/update.php @@ -58,16 +58,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'UPDATE', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'USER' => $Attribute->get('user'), - 'SLUG' => $Attribute->get('slug'), - 'NAME' => $Attribute->get('name'), - 'BODY' => $Attribute->get('body'), - 'ARGV' => $Attribute->get('argv'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER), 'USER_LIST' => $userAttributes ?? [], 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/post/delete.php b/admin/post/delete.php index a5151ff..80f3a70 100644 --- a/admin/post/delete.php +++ b/admin/post/delete.php @@ -36,12 +36,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'DELETE', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'BODY' => $Attribute->get('body'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER), 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/post/insert.php b/admin/post/insert.php index 4587a87..8e08fb3 100644 --- a/admin/post/insert.php +++ b/admin/post/insert.php @@ -56,16 +56,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'INSERT', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'USER' => $Attribute->get('user'), - 'SLUG' => $Attribute->get('slug'), - 'NAME' => $Attribute->get('name'), - 'BODY' => $Attribute->get('body'), - 'ARGV' => $Attribute->get('argv'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER), 'USER_LIST' => $userAttributes ?? [], 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/post/update.php b/admin/post/update.php index 7e3610f..af26835 100644 --- a/admin/post/update.php +++ b/admin/post/update.php @@ -58,16 +58,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'UPDATE', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'USER' => $Attribute->get('user'), - 'SLUG' => $Attribute->get('slug'), - 'NAME' => $Attribute->get('name'), - 'BODY' => $Attribute->get('body'), - 'ARGV' => $Attribute->get('argv'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER), 'USER_LIST' => $userAttributes ?? [], 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/user/delete.php b/admin/user/delete.php index 7023246..28d1b2a 100644 --- a/admin/user/delete.php +++ b/admin/user/delete.php @@ -36,12 +36,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'DELETE', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'BODY' => $Attribute->get('body'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(['password']), CASE_UPPER), 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/user/insert.php b/admin/user/insert.php index 81daf98..2d49322 100644 --- a/admin/user/insert.php +++ b/admin/user/insert.php @@ -47,18 +47,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'INSERT', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'SLUG' => $Attribute->get('slug'), - 'USERNAME' => $Attribute->get('username'), - 'PASSWORD' => NULL, - 'FULLNAME' => $Attribute->get('fullname'), - 'MAILADDR' => $Attribute->get('mailaddr'), - 'BODY' => $Attribute->get('body'), - 'ARGV' => $Attribute->get('argv'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(['password']), CASE_UPPER), 'TOKEN' => Application::getSecurityToken() ]); diff --git a/admin/user/update.php b/admin/user/update.php index cdacfa0..3ba6df8 100644 --- a/admin/user/update.php +++ b/admin/user/update.php @@ -50,18 +50,7 @@ try { $FormTemplate->set('FORM', [ 'TYPE' => 'UPDATE', 'INFO' => $messages ?? [], - 'DATA' => [ - 'ID' => $Attribute->get('id'), - 'SLUG' => $Attribute->get('slug'), - 'USERNAME' => $Attribute->get('username'), - 'PASSWORD' => NULL, - 'FULLNAME' => $Attribute->get('fullname'), - 'MAILADDR' => $Attribute->get('mailaddr'), - 'BODY' => $Attribute->get('body'), - 'ARGV' => $Attribute->get('argv'), - 'TIME_INSERT' => $Attribute->get('time_insert'), - 'TIME_UPDATE' => $Attribute->get('time_update'), - ], + 'DATA' => array_change_key_case($Attribute->getAll(['password']), CASE_UPPER), 'TOKEN' => Application::getSecurityToken() ]); -- cgit v1.2.3