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

removing more ticket-stuff; update all unit-tests

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-19 19:42:50 +01:00
parent 60f1db5caf
commit 26510f0745
63 changed files with 537 additions and 1579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/formfields/admin/admin/formfield.admin_add.php
View File

@@ -38,7 +38,7 @@ return array(
'admin_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'def_language' => array(
@@ -190,7 +190,7 @@ return array(
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'visible' => (\Froxlor\Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'mandatory' => true,
'ul_field' => $email_quota_ul
),
@@ -201,22 +201,6 @@ return array(
'maxlength' => 9,
'ul_field' => $ftps_ul
),
'tickets' => array(
'label' => $lng['customer']['tickets'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false),
'ul_field' => $tickets_ul
),
'tickets_see_all' => array(
'label' => $lng['admin']['tickets_see_all'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array()
),
'mysqls' => array(
'label' => $lng['customer']['mysqls'],
'type' => 'textul',

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

@@ -47,7 +47,7 @@ return array(
'admin_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
),
@@ -205,7 +205,7 @@ return array(
'type' => 'textul',
'value' => $result['email_quota'],
'maxlength' => 9,
'visible' => (Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'visible' => (\Froxlor\Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
'mandatory' => true,
'ul_field' => $email_quota_ul
),
@@ -216,22 +216,6 @@ return array(
'maxlength' => 9,
'ul_field' => $ftps_ul
),
'tickets' => array(
'label' => $lng['customer']['tickets'],
'type' => 'textul',
'value' => $result['tickets'],
'maxlength' => 9,
'visible' => (Settings::Get('ticket.enabled') == '1' ? true : false),
'ul_field' => $tickets_ul
),
'tickets_see_all' => array(
'label' => $lng['admin']['tickets_see_all'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array($result['tickets_see_all'])
),
'mysqls' => array(
'label' => $lng['customer']['mysqls'],
'type' => 'textul',