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

remove unused lib/version.inc.php file; added module-specific search to global-search; added new table for user-column-settings

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-04-03 18:42:49 +02:00
parent 07049909ef
commit 7779ec376a
11 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Froxlor/Ajax/GlobalSearch.php
View File

@@ -77,10 +77,17 @@ class GlobalSearch
$processed = [];
$stparts = explode(" ", $searchtext);
$module = "";
foreach ($stparts as $searchtext) {
$searchtext = trim($searchtext);
if (preg_match('/^([a-z]+):$/', $searchtext, $matches)) {
$module = $matches[1];
continue;
}
// admin
if (isset($userinfo['adminsession']) && $userinfo['adminsession'] == 1) {
@@ -262,6 +269,12 @@ class GlobalSearch
];
}
// module specific search
if (!empty($module)) {
$modSearch = $toSearch[$module] ?? [];
$toSearch = [$module => $modSearch];
}
foreach ($toSearch as $entity => $edata) {
$collection = (new Collection($edata['class'], $userinfo))

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

@@ -2,8 +2,10 @@
namespace Froxlor\UI;
use Froxlor\Database\Database;
use Froxlor\UI\Panel\UI;
use Exception;
use InvalidArgumentException;
use Froxlor\CurrentUser;
/**
* This file is part of the Froxlor project.
@@ -38,7 +40,8 @@ class Listing
'empty_msg' => $tabellisting['empty_msg'] ?? null,
'total_entries' => ($collection->getPagination() instanceof Pagination) ? $collection->getPagination()->getEntries() : 0,
'is_search' => ($collection->getPagination() instanceof Pagination) ? $collection->getPagination()->isSearchResult() : false,
'self_overview' => $tabellisting['self_overview'] ?? []
'self_overview' => $tabellisting['self_overview'] ?? [],
'available_columns' => self::getAvailableColumnsForListing($tabellisting)
];
}
@@ -110,7 +113,7 @@ class Listing
} elseif ($field) {
$rows[$row]['td'][$col]['data'] = $data;
} else {
throw new Exception('The visible column "' . $visible_column . '" has neither a "callback" nor a "field" set.');
throw new InvalidArgumentException('The visible column "' . $visible_column . '" has neither a "callback" nor a "field" set.');
}
// Set class for table-row if defined
@@ -173,12 +176,75 @@ class Listing
return $actions;
}
private static function getAvailableColumnsForListing(array $tabellisting): array
{
$result = [];
if (isset($tabellisting['columns'])) {
foreach ($tabellisting['columns'] as $column => $coldata) {
$result[$column] = $coldata['label'];
}
}
return $result;
}
/**
* store column listing selection of user to database
* the selection array should look like this:
* [
* 'section_name' => [
* 'column_name',
* 'column_name',
* 'column_name'
* ]
* ]
*
* @param array $tablelisting
*
* @return bool
*/
public static function storeColumnListingForUser(array $tabellisting): bool
{
$section = array_key_first($tabellisting);
if (empty($section) || !is_array($tabellisting[$section]) || empty($tabellisting[$section])) {
throw new InvalidArgumentException("Invalid selection array for " . __METHOD__);
}
$userid = 'customerid';
if (CurrentUser::isAdmin()) {
$userid = 'adminid';
}
// delete possible existing entry
$del_stmt = Database::prepare("
DELETE FROM `" . TABLE_PANEL_USERCOLUMNS . "` WHERE `" . $userid . "` = :uid AND `section` = :section
");
Database::pexecute($del_stmt, ['uid' => CurrentUser::getData($userid), 'section' => $section]);
// add new entry
$ins_stmt = Database::prepare("
INSERT INTO `" . TABLE_PANEL_USERCOLUMNS . "` SET
`" . $userid . "` = :uid,
`section` = :section,
`columns` = :cols
");
Database::pexecute($ins_stmt, [
'uid' => CurrentUser::getData($userid),
'section' => $section,
'cols' => json_encode($tabellisting[$section])
]);
return true;
}
public static function getVisibleColumnsForListing(string $listing, array $default_columns): array
{
// Here would come the logic that pulls this from the DB ...
// alternatively, it takes the $default_columns if no entry is
// defined in the DB
$userid = 'customerid';
if (CurrentUser::isAdmin()) {
$userid = 'adminid';
}
$sel_stmt = Database::prepare("
SELECT `columns` FROM `" . TABLE_PANEL_USERCOLUMNS . "` WHERE `" . $userid . "` = :uid AND `section` = :section
");
$columns_json = Database::pexecute_first($sel_stmt, ['uid' => CurrentUser::getData($userid), 'section' => $listing]);
if ($columns_json && isset($columns_json['columns'])) {
return json_decode($columns_json['columns'], true);
}
return $default_columns;
}

2
lib/tablelisting/admin/tablelisting.admins.php
View File

@@ -30,7 +30,7 @@ return [
'self_overview' => ['section' => 'admins', 'page' => 'admins'],
'columns' => [
'adminid' => [
'label' => '#',
'label' => 'ID',
'field' => 'adminid',
'sortable' => true,
],

3
lib/tables.inc.php
View File

@@ -50,5 +50,4 @@ const TABLE_DOMAIN_DNS = 'domain_dns_entries';
const TABLE_PANEL_FPMDAEMONS = 'panel_fpmdaemons';
const TABLE_PANEL_PLANS = 'panel_plans';
const TABLE_API_KEYS = 'api_keys';
require dirname(__FILE__) . '/version.inc.php';
const TABLE_PANEL_USERCOLUMNS = 'panel_usercolumns';

25
lib/version.inc.php
View File

@@ -1,25 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package System
*
*/
// Main version variable
$version = \Froxlor\Froxlor::VERSION;
// Database version (YYYYMMDDC where C is a daily counter)
$dbversion = \Froxlor\Froxlor::DBVERSION;
// Distribution branding-tag (used for Debian etc.)
$branding = \Froxlor\Froxlor::BRANDING;