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

Revert "refactor global array"

Browse Source 
This reverts commit c5a58e3f36.
This commit is contained in:
Michael Kaufmann
2018-12-22 08:15:31 +01:00
parent 7e39a7bc60
commit 0401e6971a
68 changed files with 613 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/formfields/admin/admin/formfield.admin_edit.php
View File

@@ -40,26 +40,26 @@ return array(
'value' => array(
$result['deactivated']
),
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
),
'admin_password' => array(
'label' => $lng['login']['password'] . ' (' . $lng['panel']['emptyfornochanges'] . ')',
'type' => 'password',
'autocomplete' => 'off',
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
),
'admin_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword(),
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
),
'def_language' => array(
'label' => $lng['login']['language'],
'type' => 'select',
'select_var' => $language_options,
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
)
)
),
@@ -106,7 +106,7 @@ return array(
'section_c' => array(
'title' => $lng['admin']['servicedata'],
'image' => 'icons/user_add.png',
'visible' => ($result['adminid'] != \Froxlor\User::getAll()['userid'] ? true : false),
'visible' => ($result['adminid'] != $userinfo['userid'] ? true : false),
'fields' => array(
'ipaddress' => array(
'label' => $lng['serversettings']['ipaddress']['title'],