maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

check for existing fields when setting/updating tablelisting-columns

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-02-14 11:36:11 +01:00
parent 89843d6f37
commit 4003a8d2b6
6 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Ajax/Ajax.php
View File

@@ -237,11 +237,11 @@ class Ajax
private function updateTablelisting()
{
$columns = [];
foreach ((Request::any('columns') ?? []) as $value) {
foreach ((Request::post('columns') ?? []) as $value) {
$columns[] = $value;
}
if (!empty($columns)) {
Listing::storeColumnListingForUser([Request::any('listing') => $columns]);
$columns = Listing::storeColumnListingForUser([Request::post('listing') => $columns]);
return $this->jsonResponse($columns);
}
return $this->errorResponse('At least one column must be selected', 406);
@@ -249,7 +249,7 @@ class Ajax
private function resetTablelisting()
{
Listing::deleteColumnListingForUser([Request::any('listing') => []]);
Listing::deleteColumnListingForUser([Request::post('listing') => []]);
return $this->jsonResponse([]);
}

23
lib/Froxlor/UI/Listing.php
View File

@@ -27,6 +27,7 @@ namespace Froxlor\UI;
use Froxlor\CurrentUser;
use Froxlor\Database\Database;
use Froxlor\Froxlor;
use Froxlor\UI\Panel\UI;
use InvalidArgumentException;
@@ -247,9 +248,9 @@ class Listing
* ]
*
* @param array $tabellisting
* @return bool
* @return array
*/
public static function storeColumnListingForUser(array $tabellisting): bool
public static function storeColumnListingForUser(array $tabellisting): array
{
$section = array_key_first($tabellisting);
if (empty($section) || !is_array($tabellisting[$section]) || empty($tabellisting[$section])) {
@@ -259,6 +260,22 @@ class Listing
if (CurrentUser::isAdmin()) {
$userid = 'adminid';
}
// include all possible tablelisting-definitions to check for the right section
foreach(glob(Froxlor::getInstallDir().'lib/tablelisting/{,*/}*.php', GLOB_BRACE) as $tbl_file) {
$table_listings = include $tbl_file;
if (!isset($table_listings[$section])) {
continue;
} else {
break;
}
}
$columns_available = array_keys($table_listings[$section]['columns']);
// filter out unknown columns
foreach ($tabellisting[$section] as $index => $column_changed) {
if (!in_array($column_changed, $columns_available)) {
unset($tabellisting[$section][$index]);
}
}
// delete possible existing entry
self::deleteColumnListingForUser($tabellisting);
// add new entry
@@ -273,7 +290,7 @@ class Listing
'section' => $section,
'cols' => json_encode($tabellisting[$section])
]);
return true;
return $tabellisting[$section];
}
/**