major refactoring of almost all files

This commit is contained in:
envoyr
2022-04-28 20:48:00 +02:00
parent a2e95b960f
commit 4f4c71d79b
285 changed files with 21716 additions and 18766 deletions

View File

@@ -4,43 +4,55 @@
* 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
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'emails_accountchangepasswd' => array(
'title' => $lng['menue']['main']['changepassword'],
use Froxlor\Settings;
use Froxlor\System\Crypt;
return [
'emails_accountchangepasswd' => [
'title' => lng('menue.main.changepassword'),
'image' => 'icons/email_edit.png',
'sections' => array(
'section_a' => array(
'title' => $lng['menue']['main']['changepassword'],
'sections' => [
'section_a' => [
'title' => lng('menue.main.changepassword'),
'image' => 'icons/email_edit.png',
'fields' => array(
'email_full' => array(
'label' => $lng['emails']['emailaddress'],
'fields' => [
'email_full' => [
'label' => lng('emails.emailaddress'),
'type' => 'label',
'value' => $result['email_full']
),
'email_password' => array(
'label' => $lng['login']['password'],
],
'email_password' => [
'label' => lng('login.password'),
'type' => 'password',
'autocomplete' => 'off'
),
'email_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
],
'email_password_suggestion' => [
'label' => lng('customer.generated_pwd'),
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword()
)
)
)
)
)
);
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => Crypt::generatePassword()
]
]
]
]
]
];

View File

@@ -4,37 +4,46 @@
* 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
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'emails_accountchangequota' => array(
'title' => $lng['emails']['quota_edit'],
return [
'emails_accountchangequota' => [
'title' => lng('emails.quota_edit'),
'image' => 'icons/email_edit.png',
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['quota_edit'],
'sections' => [
'section_a' => [
'title' => lng('emails.quota_edit'),
'image' => 'icons/email_edit.png',
'fields' => array(
'email_full' => array(
'label' => $lng['emails']['emailaddress'],
'fields' => [
'email_full' => [
'label' => lng('emails.emailaddress'),
'type' => 'label',
'value' => $result['email_full']
),
'email_quota' => array(
'label' => $lng['emails']['quota'] . ' (MiB)',
],
'email_quota' => [
'label' => lng('emails.quota') . ' (MiB)',
'type' => 'text',
'value' => $result['quota']
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,28 +4,37 @@
* 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
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'emails_add' => array(
'title' => $lng['emails']['emails_add'],
return [
'emails_add' => [
'title' => lng('emails.emails_add'),
'image' => 'fa-solid fa-plus',
'self_overview' => ['section' => 'email', 'page' => 'emails'],
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['emails_add'],
'sections' => [
'section_a' => [
'title' => lng('emails.emails_add'),
'image' => 'icons/email_add.png',
'fields' => array(
'email_part' => array(
'label' => $lng['emails']['emailaddress'],
'fields' => [
'email_part' => [
'label' => lng('emails.emailaddress'),
'type' => 'text',
'next_to' => [
'domain' => [
@@ -34,15 +43,15 @@ return array(
'select_var' => $domains
]
]
),
'iscatchall' => array(
'label' => $lng['emails']['iscatchall'],
],
'iscatchall' => [
'label' => lng('emails.iscatchall'),
'type' => 'checkbox',
'value' => '1',
'checked' => false
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,58 +4,70 @@
* 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
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'emails_addaccount' => array(
'title' => $lng['emails']['account_add'],
use Froxlor\Settings;
use Froxlor\System\Crypt;
return [
'emails_addaccount' => [
'title' => lng('emails.account_add'),
'image' => 'fa-solid fa-plus',
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['account_add'],
'sections' => [
'section_a' => [
'title' => lng('emails.account_add'),
'image' => 'icons/email_add.png',
'fields' => array(
'emailaddr' => array(
'label' => $lng['emails']['emailaddress'],
'fields' => [
'emailaddr' => [
'label' => lng('emails.emailaddress'),
'type' => 'label',
'value' => $result['email_full']
),
'email_password' => array(
'label' => $lng['login']['password'],
],
'email_password' => [
'label' => lng('login.password'),
'type' => 'password',
'autocomplete' => 'off',
'next_to' => [
'admin_password_suggestion' => array(
'next_to_prefix' => $lng['customer']['generated_pwd'].':',
'admin_password_suggestion' => [
'next_to_prefix' => lng('customer.generated_pwd') . ':',
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword(),
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => Crypt::generatePassword(),
'readonly' => true
)
]
]
),
'email_quota' => array(
'visible' => \Froxlor\Settings::Get('system.mail_quota_enabled') == '1',
'label' => $lng['emails']['quota'],
],
'email_quota' => [
'visible' => Settings::Get('system.mail_quota_enabled') == '1',
'label' => lng('emails.quota'),
'desc' => "MiB",
'type' => 'number',
'value' => $quota
),
'alternative_email' => array(
'visible' => \Froxlor\Settings::Get('panel.sendalternativemail') == '1',
'label' => $lng['emails']['alternative_emailaddress'],
],
'alternative_email' => [
'visible' => Settings::Get('panel.sendalternativemail') == '1',
'label' => lng('emails.alternative_emailaddress'),
'type' => 'text'
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,36 +4,45 @@
* 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
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'emails_addforwarder' => array(
'title' => $lng['emails']['forwarder_add'],
return [
'emails_addforwarder' => [
'title' => lng('emails.forwarder_add'),
'image' => 'fa-solid fa-plus',
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['forwarder_add'],
'sections' => [
'section_a' => [
'title' => lng('emails.forwarder_add'),
'image' => 'icons/autoresponder_add.png',
'fields' => array(
'emailaddr' => array(
'label' => $lng['emails']['from'],
'fields' => [
'emailaddr' => [
'label' => lng('emails.from'),
'type' => 'label',
'value' => $result['email_full']
),
'destination' => array(
'label' => $lng['emails']['to'],
],
'destination' => [
'label' => lng('emails.to'),
'type' => 'email'
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,109 +4,120 @@
* 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
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
use Froxlor\Settings;
return array(
'emails_edit' => array(
'title' => $lng['emails']['emails_edit'],
'title' => lng('emails.emails_edit'),
'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'email', 'page' => 'emails'],
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['emails_edit'],
'title' => lng('emails.emails_edit'),
'image' => 'icons/email_edit.png',
'nobuttons' => true,
'fields' => array(
'email_full' => array(
'label' => $lng['emails']['emailaddress'],
'email_full' => [
'label' => lng('emails.emailaddress'),
'type' => 'label',
'value' => $result['email_full']
),
'account_yes' => array(
'visible' => (int) $result['popaccountid'] != 0,
'label' => $lng['emails']['account'],
],
'account_yes' => [
'visible' => (int)$result['popaccountid'] != 0,
'label' => lng('emails.account'),
'type' => 'label',
'value' => $lng['panel']['yes'],
'value' => lng('panel.yes'),
'next_to' => [
'edit_link' => [
'type' => 'link',
'href' => $filename . '?page=accounts&amp;action=changepw&amp;id=' . $result['id'],
'label' => $lng['menue']['main']['changepassword'],
'label' => lng('menue.main.changepassword'),
'classes' => 'btn btn-sm btn-secondary'
],
'del_link' => [
'type' => 'link',
'href' => $filename . '?page=accounts&amp;action=delete&amp;id=' . $result['id'],
'label' => $lng['emails']['account_delete'],
'label' => lng('emails.account_delete'),
'classes' => 'btn btn-sm btn-danger'
]
]
),
'account_no' => array(
'visible' => (int) $result['popaccountid'] == 0,
'label' => $lng['emails']['account'],
],
'account_no' => [
'visible' => (int)$result['popaccountid'] == 0,
'label' => lng('emails.account'),
'type' => 'label',
'value' => $lng['panel']['no'],
'value' => lng('panel.no'),
'next_to' => [
'add_link' => [
'type' => 'link',
'href' => $filename . '?page=accounts&amp;action=add&amp;id=' . $result['id'],
'label' => $lng['emails']['account_add'],
'label' => lng('emails.account_add'),
'classes' => 'btn btn-sm btn-primary'
]
]
),
'mail_quota' => array(
'visible' => ((int) $result['popaccountid'] != 0 && \Froxlor\Settings::Get('system.mail_quota_enabled')),
'label' => $lng['customer']['email_quota'],
],
'mail_quota' => [
'visible' => ((int)$result['popaccountid'] != 0 && Settings::Get('system.mail_quota_enabled')),
'label' => lng('customer.email_quota'),
'type' => 'label',
'value' => $result['quota'] . ' MiB',
'next_to' => [
'add_link' => [
'visible' => ((int)$result['popaccountid'] != 0 && \Froxlor\Settings::Get('system.mail_quota_enabled')),
'visible' => ((int)$result['popaccountid'] != 0 && Settings::Get('system.mail_quota_enabled')),
'type' => 'link',
'href' => $filename . '?page=accounts&amp;action=changequota&amp;id=' . $result['id'],
'label' => $lng['emails']['quota_edit'],
'label' => lng('emails.quota_edit'),
'classes' => 'btn btn-sm btn-secondary'
]
]
),
],
'mail_catchall' => array(
'label' => $lng['emails']['catchall'],
'label' => lng('emails.catchall'),
'type' => 'label',
'value' => ((int)$result['iscatchall'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']),
'value' => ((int)$result['iscatchall'] == 0 ? lng('panel.no'] : lng('panel')['yes')),
'next_to' => [
'add_link' => [
'type' => 'link',
'href' => $filename . '?page=' . $page . '&amp;action=togglecatchall&amp;id=' . $result['id'],
'label' => '<i class="fa-solid fa-arrow-right-arrow-left"></i> ' . $lng['panel']['toggle'],
'classes' => 'btn btn-sm btn-secondary'
]
]
'add_link' => [
'type' => 'link',
'href' => $filename . '?page=' . $page . '&amp;action=togglecatchall&amp;id=' . $result['id'],
'label' => '<i class="fa-solid fa-arrow-right-arrow-left"></i> ' . lng('panel.toggle'),
'classes' => 'btn btn-sm btn-secondary'
]
]
),
'mail_fwds' => array(
'label' => $lng['emails']['forwarders'] . ' (' . $forwarders_count . ')',
'type' => 'itemlist',
'values' => $forwarders,
'next_to' => [
'add_link' => [
'type' => 'link',
'href' => $filename . '?page=forwarders&amp;action=add&amp;id=' . $result['id'],
'label' => $lng['emails']['forwarder_add'],
'classes' => 'btn btn-sm btn-primary'
]
]
)
'mail_fwds' => [
'label' => lng('emails.forwarders') . ' (' . $forwarders_count . ')',
'type' => 'itemlist',
'values' => $forwarders,
'next_to' => [
'add_link' => [
'type' => 'link',
'href' => $filename . '?page=forwarders&amp;action=add&amp;id=' . $result['id'],
'label' => lng('emails.forwarder_add'),
'classes' => 'btn btn-sm btn-primary'
]
]
]
)
)
)
)
);
)