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

migrated admin_messages; minor fixes in admin-listing and ipsandports::add defaults

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-03-24 13:40:43 +01:00
parent 66f97738c2
commit 25b9e5b540
14 changed files with 99 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Froxlor/UI/Callbacks/Admin.php
View File

@@ -24,4 +24,9 @@ class Admin
{
return (bool)UI::getCurrentUser()['change_serversettings'];
}
public static function isNotMe(array $attributes)
{
return (UI::getCurrentUser()['adminid'] != $attributes['fields']['adminid']);
}
}

4
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@@ -47,14 +47,14 @@ return array(
'label' => $lng['admin']['ipsandports']['create_listen_statement'],
'type' => 'checkbox',
'value' => '1',
'checked' => true
'checked' => false
),
'namevirtualhost_statement' => array(
'visible' => \Froxlor\Settings::Get('system.webserver') == 'apache2' && (int) \Froxlor\Settings::Get('system.apache24') == 0,
'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'],
'type' => 'checkbox',
'value' => '1',
'checked' => true
'checked' => \Froxlor\Settings::Get('system.webserver') == 'apache2' && (int) \Froxlor\Settings::Get('system.apache24') == 0 ? true : false
),
'vhostcontainer' => array(
'label' => $lng['admin']['ipsandports']['create_vhostcontainer'],

45
lib/formfields/admin/messages/formfield.messages_add.php Normal file
View File

@@ -0,0 +1,45 @@
<?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 Formfields
*
*/
return array(
'messages_add' => array(
'title' => $lng['admin']['message'],
'image' => 'fa-solid fa-paper-plane',
'sections' => array(
'section_a' => array(
'fields' => array(
'recipient' => array(
'label' => $lng['admin']['recipient'],
'type' => 'select',
'select_var' => $recipients,
'selected' => 1
),
'subject' => array(
'label' => $lng['admin']['subject'],
'type' => 'text',
'value' => $lng['admin']['nosubject'],
'mandatory' => true
),
'message' => array(
'label' => $lng['admin']['text'],
'type' => 'textarea',
'mandatory' => true
)
)
)
)
)
);

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

@@ -16,6 +16,7 @@
*
*/
use Froxlor\UI\Callbacks\Admin;
use Froxlor\UI\Callbacks\ProgressBar;
use Froxlor\UI\Callbacks\Style;
use Froxlor\UI\Callbacks\Text;
@@ -93,6 +94,7 @@ return [
'action' => 'delete',
'id' => ':adminid'
],
'visible' => [Admin::class, 'isNotMe']
],
],
'format_callback' => [