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

Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev

Browse Source
This commit is contained in:
envoyr
2022-02-23 18:28:13 +01:00
parent c4940897a3 af50eb5462
commit 92ba16aa7f
4 changed files with 104 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Froxlor/UI/Collection.php
View File

@@ -1,4 +1,5 @@
<?php
namespace Froxlor\UI;
/**
@@ -23,7 +24,7 @@ class Collection
private array $params;
private string $class;
public function __construct($class, $userInfo, $params = [])
public function __construct(string $class, array $userInfo, array $params = [])
{
$this->class = $class;
$this->params = $params;
@@ -57,16 +58,20 @@ class Collection
return json_encode($this->get());
}
public function has($column, $class, $parentKey = 'id', $childKey = 'id', $params = [])
public function has($column, $class, $parentKey = 'id', $childKey = 'id', $params = []): Collection
{
$attributes = $this->getListing($class, $params);
// check if the api result contains any items (not the overall listingCount as we might be in a search-resultset)
if (count($this->items) > 0) {
$attributes = $this->getListing($class, $params);
foreach ($this->items['data']['list'] as $key => $item) {
foreach ($attributes['data']['list'] as $list) {
if ($item[$parentKey] == $list[$childKey]) {
$this->items['data']['list'][$key][$column] = $list;
foreach ($this->items['data']['list'] as $key => $item) {
foreach ($attributes['data']['list'] as $list) {
if ($item[$parentKey] == $list[$childKey]) {
$this->items['data']['list'][$key][$column] = $list;
}
}
}
}
return $this;
}
}
}

77
lib/tablelisting/admin/tablelisting.ipsandports.php Normal file
View File

@@ -0,0 +1,77 @@
<?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-)
* @author Maurice Preuß <hello@envoyr.com>
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Tabellisting
*
*/
return [
'ipsandports_list' => [
'title' => $lng['admin']['ipsandports']['ipsandports'],
'icon' => 'fa-solid fa-user',
'columns' => [
'ip' => [
'label' => $lng['admin']['ipsandports']['ip'],
'column' => 'ip',
],
'port' => [
'label' => $lng['admin']['ipsandports']['port'],
'column' => 'port',
],
'listen' => [
'label' => 'Listen',
'column' => 'listen_statement',
'format_callback' => [\Froxlor\UI\Callbacks\Text::class, 'boolean'],
'visible' => \Froxlor\Settings::Get('system.webserver') != 'nginx'
],
'namevirtualhost' => [
'label' => 'NameVirtualHost',
'column' => 'namevirtualhost_statement',
'format_callback' => [\Froxlor\UI\Callbacks\Text::class, 'boolean'],
'visible' => \Froxlor\Settings::Get('system.webserver') == 'apache2' && (int) \Froxlor\Settings::Get('system.apache24') == 0
],
'vhostcontainer' => [
'label' => 'vHost-Container',
'column' => 'vhostcontainer',
'format_callback' => [\Froxlor\UI\Callbacks\Text::class, 'boolean']
],
'specialsettings' => [
'label' => 'Specialsettings',
'column' => 'specialsettings',
'format_callback' => [\Froxlor\UI\Callbacks\Text::class, 'boolean']
],
'servername' => [
'label' => 'ServerName',
'column' => 'vhostcontainer_servername_statement',
'format_callback' => [\Froxlor\UI\Callbacks\Text::class, 'boolean'],
'visible' => \Froxlor\Settings::Get('system.webserver') == 'apache2'
],
'ssl' => [
'label' => 'SSL',
'column' => 'ssl',
'format_callback' => [\Froxlor\UI\Callbacks\Text::class, 'boolean']
],
],
'visible_columns' => \Froxlor\UI\Listing::getVisibleColumnsForListing('ipsandports_list', [
'ip',
'port',
'listen',
'namevirtualhost',
'vhostcontainer',
'specialsettings',
'servername',
'ssl'
]),
]
];