Tagging release 0.9.1

.drone.yml

@@ -1,50 +0,0 @@
-kind: pipeline
-name: deploy-froxlor
-type: docker
-
-platform:
-  os: linux
-  arch: arm64
-
-trigger:
-  branch:
-    - upgrade-2.0
-  event:
-    include:
-     - push
-     
-steps:
-- name: deploy
-  image: cr.wks/drone/drone-rsync:latest
-  settings:
-    hosts: ["rechner02.maketank.net"]
-    source: ./
-    target: ~/froxlor-test
-    user: www-data
-    exclude: ['vendor', '.git*', '*drone.yml', '.settings', '.buildpath', '.editorconfig', '.project', '.travis.yml']
-    args: '-v --delete'
-    log_level: quiet
-    key: 
-      from_secret: ssh-www-data-maketank-rsa
-    command_timeout: 10m
-    
-- name: compose
-  image: appleboy/drone-ssh
-  settings:
-    host:
-        - rechner02.maketank.net
-    username: www-data
-    key:
-        from_secret: ssh-www-data-maketank-rsa
-    script:
-        - cd ~/froxlor-test && composer install --no-dev
-- name: npm
-  image: appleboy/drone-ssh
-  settings:
-    host:
-        - rechner02.maketank.net
-    username: www-data
-    key:
-        from_secret: ssh-www-data-maketank-rsa
-    script:
-        - cd ~/froxlor-test && npm install && npm run build

.editorconfig

@@ -1,19 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_style = space
-indent_size = 2
-
-[docker-compose.yml]
-indent_size = 4

.github/CONTRIBUTING.md

@@ -1,31 +0,0 @@
-# Contribution
-
-Before you start working on a PR, contact us via [Discord](https://discord.froxlor.org) or the forum at [https://forum.froxlor.org](https://forum.froxlor.org) to get a clue whether someone else isn't already working on it or if we don not want/need this certain change. Of course, bugfixes are always welcome.
-
-Please always focus on the **main** branch of our [Github repository](https://github.com/Froxlor/Froxlor).
-
-## Checklist
-
-General rules for PRs are:
-
-* Please save us all some trouble and unnecessary round-trips by _testing_ your changes.
-* Re-write your commit history to provide a CLEAN history!
-    * i.e. do not provide PRs which contain a commit that changes something, the next changes it back, a third one changes it again, only a little differently...
-
-Thanks!
-
-### Service changes
-
-If you make changes to the functionality of service configurations, please make sure your implementation covers all supported services and distributions.
-
-### l10n
-
-If you add new language strings, please make sure you add the english fallback strings in `lng/en.php`.
-
-### New settings and database-layout changes
-
-If you add new settings or implement database-changes, please make sure you add these to
-
-* `install/froxlor.sql.php`
-* handle the update (see [`install/updates/froxlor/update_2.x.inc.php`](https://github.com/Froxlor/Froxlor/blob/main/install/updates/froxlor/update_2.x.inc.php))
-* if you have any question on how update-process works, please contact us

.github/FUNDING.yml

@@ -1,4 +0,0 @@
-# These are supported funding model platforms
-
-github: d00p
-custom: ['https://paypal.me/Froxlor']

.github/ISSUE_TEMPLATE.md

@@ -1,49 +0,0 @@
-# Bug report vs. support request
-
-If you're unsure of whether your problem is a bug or a configuration error
-* contact us via IRC in #froxlor on irc.libera.chat
-* or post a thread in our forum at https://forum.froxlor.org
-
-As a rule of thumb: before reporting an issue
-
-* see if it hasn't been [reported](https://github.com/Froxlor/froxlor/issues) (and possibly already been [fixed](https://github.com/Froxlor/froxlor/issues?utf8=✓&q=is:issue%20is:closed)) first
-* try with the git master
-
-# Summary
-
-Please provide a concise summary of the problem you're experiencing...
-
-# System information
-
-* Froxlor version: $version/$gitSHA1
-* Web server: apache2/nginx/lighttpd
-* DNS server: Bind/PowerDNS (standalone)/PowerDNS (Bind-backend)
-* POP/IMAP server: Courier/Dovecot
-* SMTP server: postfix/exim
-* FTP server: proftpd/pureftpd
-* OS/Version: ...
-
-# Steps to reproduce
-
-1.
-2.
-3.
-
-# Expected behavior
-
-1.
-2.
-3.
-
-# Actual behavior
-
-1.
-2.
-3.
-
-# Log files/log entries
-
-syslog:
-<pre>
-example
-</pre>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**As a rule of thumb: before reporting an issue**
-* see if it hasn't been [reported](https://github.com/Froxlor/froxlor/issues) (and possibly already been [fixed](https://github.com/Froxlor/froxlor/issues?utf8=✓&q=is:issue%20is:closed)) first
-* try with the git master
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**System information**
-* Froxlor version: $version/$gitSHA1
-* Web server: apache2/nginx/lighttpd
-* DNS server: Bind/PowerDNS (standalone)/PowerDNS (Bind-backend)
-* POP/IMAP server: Courier/Dovecot
-* SMTP server: postfix/exim
-* FTP server: proftpd/pureftpd
-* OS/Version: ...
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Logfiles**
-If applicable, add log-entries to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/LICENSE_HEADER

@@ -1,22 +0,0 @@
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * 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.
- *
- * 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
- */

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,37 +0,0 @@
-# Description
-
-Please include a summary of the change and which issue is fixed if any. Please also include relevant motivation and context. List any dependencies that are required for this change.
-
-Fixes # (issue)
-
-## Type of change
-
-Please delete options that are not relevant.
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] This change requires a documentation update
-
-# How Has This Been Tested?
-
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
-
-- [ ] Test A
-- [ ] Test B
-
-**Test Configuration**:
-
-* Distribution:
-* Webserver:
-* PHP:
-* etc.etc.:
-
-# Checklist:
-
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made corresponding changes to the documentation
-- [ ] My changes generate no new warnings
-- [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] New and existing unit tests pass locally with my changes

.github/workflows/build-docs.yml

@@ -1,14 +0,0 @@
-name: build-documentation
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build_docs:
-    runs-on: ubuntu-latest
-    steps:
-      - env:
-          GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_TOKEN }}
-        run: |
-          gh workflow run --repo Froxlor/Documentation build-and-deploy.yml -f type=tags ref=${{github.ref_name}}

.github/workflows/build-mariadb.yml

@@ -1,81 +0,0 @@
-name: Froxlor-CI-MariaDB
-on: ['push', 'pull_request', 'create']
-
-jobs:
-  froxlor:
-    name: Froxlor (PHP ${{ matrix.php-versions }}, MariaDB ${{ matrix.mariadb-version }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.1']
-        mariadb-version: [10.5, 10.4]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: composer:v2
-          extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp
-
-      - name: Install tools
-        run: sudo apt-get install -y ant
-
-      - name: Adjust firewall
-        run: |
-          sudo ufw allow out 3306/tcp
-          sudo ufw allow in 3306/tcp
-
-      - name: Setup MariaDB
-        uses: getong/mariadb-action@v1.1
-        with:
-          mariadb version: ${{ matrix.mariadb-version }}
-          mysql database: 'froxlor010'
-          mysql root password: 'fr0xl0r.TravisCI'
-
-      - name: Wait for database
-        run: sleep 15
-
-      - name: Setup databases
-        run: |
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "CREATE USER 'froxlor010'@'%' IDENTIFIED BY 'fr0xl0r.TravisCI';"
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "GRANT ALL ON froxlor010.* TO 'froxlor010'@'%';"
-          php -r "echo include('install/froxlor.sql.php');" > /tmp/froxlor.sql
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < /tmp/froxlor.sql
-
-      - name: Run testing
-        run: ant quick-build
-
-#      - name: irc push
-#        uses: rectalogic/notify-irc@v1
-#        if: github.event_name == 'push'
-#        with:
-#          channel: "#froxlor"
-#          server: "irc.libera.chat"
-#          nickname: froxlor-ci
-#          message: |
-#            ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }}
-#            ${{ join(github.event.commits.*.message) }}
-
-#      - name: irc pull request
-#        uses: rectalogic/notify-irc@v1
-#        if: github.event_name == 'pull_request'
-#        with:
-#          channel: "#froxlor"
-#          server: "irc.libera.chat"
-#          nickname: froxlor-ci
-#          message: |
-#            ${{ github.actor }} opened PR ${{ github.event.pull_request.html_url }}
-
-#      - name: irc tag created
-#        uses: rectalogic/notify-irc@v1
-#        if: github.event_name == 'create' && github.event.ref_type == 'tag'
-#        with:
-#          channel: "#froxlor"
-#          server: "irc.libera.chat"
-#          nickname: froxlor-ci
-#          message: |
-#            ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }}

.github/workflows/build-mysql.yml

@@ -1,59 +0,0 @@
-name: Froxlor-CI-MySQL
-on: ['push', 'pull_request', 'create']
-
-jobs:
-  froxlor:
-    name: Froxlor (PHP ${{ matrix.php-versions }}, MySQL ${{ matrix.mysql-version }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.1']
-        mysql-version: [8.0, 5.7]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: composer:v2
-          extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp
-
-      - name: Install tools
-        run: sudo apt-get install -y ant
-
-      - name: Adjust firewall
-        run: |
-          sudo ufw allow out 3306/tcp
-          sudo ufw allow in 3306/tcp
-
-      - name: Setup MySQL
-        uses: samin/mysql-action@v1.3
-        with:
-          mysql version: ${{ matrix.mysql-version }}
-          mysql database: 'froxlor010'
-          mysql root password: 'fr0xl0r.TravisCI'
-
-      - name: Wait for database
-        run: sleep 15
-
-      - name: Setup database (8.0)
-        if: matrix.mysql-version == '8.0'
-        run: |
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "CREATE USER 'froxlor010'@'%' IDENTIFIED WITH mysql_native_password BY 'fr0xl0r.TravisCI';"
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "GRANT ALL ON froxlor010.* TO 'froxlor010'@'%';"
-          php -r "echo include('install/froxlor.sql.php');" > /tmp/froxlor.sql
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < /tmp/froxlor.sql
-
-      - name: Setup database (5.7)
-        if: matrix.mysql-version == '5.7'
-        run: |
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "CREATE USER 'froxlor010'@'%' IDENTIFIED BY 'fr0xl0r.TravisCI';"
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "GRANT ALL ON froxlor010.* TO 'froxlor010'@'%';"
-          php -r "echo include('install/froxlor.sql.php');" > /tmp/froxlor.sql
-          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < /tmp/froxlor.sql
-
-      - name: Run testing
-        run: ant quick-build

.gitignore

@@ -1,28 +0,0 @@
-install/update.log
-install/*.json
-lib/userdata.inc.php
-lib/userdata.inc.php.bak
-lib/config.inc.php
-logs/*
-!logs/index.html
-.buildpath
-.project
-.settings/
-.test/
-*.diff
-*~
-.well-known
-.idea
-*.iml
-img/
-vendor/
-node_modules/
-fonts/
-templates/*
-!templates/index.html
-!templates/Froxlor/
-templates/Froxlor/assets/mix-manifest.json
-templates/Froxlor/assets/css/
-templates/Froxlor/assets/js/
-templates/Froxlor/assets/webfonts/
-!templates/misc/

2fa.php

@@ -1,154 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * 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.
- *
- * 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
- */
-
-if (!defined('AREA')) {
-	header("Location: index.php");
-	exit();
-}
-
-use Froxlor\Database\Database;
-use Froxlor\FroxlorLogger;
-use Froxlor\FroxlorTwoFactorAuth;
-use Froxlor\Settings;
-use Froxlor\UI\Panel\UI;
-use Froxlor\UI\Response;
-use Froxlor\PhpHelper;
-use Froxlor\User;
-
-if (Settings::Get('2fa.enabled') != '1') {
-	Response::dynamicError('2fa.2fa_not_activated');
-}
-
-// This file is being included in admin_index and customer_index
-// and therefore does not need to require lib/init.php
-if (AREA == 'admin') {
-	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `type_2fa` = :t2fa, `data_2fa` = :d2fa WHERE adminid = :id");
-	$uid = $userinfo['adminid'];
-} elseif (AREA == 'customer') {
-	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `type_2fa` = :t2fa, `data_2fa` = :d2fa WHERE customerid = :id");
-	$uid = $userinfo['customerid'];
-}
-$success_message = "";
-
-$tfa = new FroxlorTwoFactorAuth('Froxlor ' . Settings::Get('system.hostname'));
-
-// do the delete and then just show a success-message
-if ($action == 'delete') {
-	Database::pexecute($upd_stmt, [
-		't2fa' => 0,
-		'd2fa' => "",
-		'id' => $uid
-	]);
-	Response::standardSuccess('2fa.2fa_removed');
-} elseif ($action == 'preadd') {
-	$type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0';
-
-	$data = "";
-	if ($type > 0) {
-		// generate secret for TOTP
-		$data = $tfa->createSecret();
-
-		$userinfo['type_2fa'] = $type;
-		$userinfo['data_2fa'] = $data;
-		$userinfo['2fa_unsaved'] = true;
-
-		// if type = email, send a code there for confirmation
-		if ($type == 1) {
-			$code = $tfa->getCode($data);
-			$_mailerror = false;
-			$mailerr_msg = "";
-			$replace_arr = [
-				'CODE' => $code
-			];
-			$mail_body = html_entity_decode(PhpHelper::replaceVariables(lng('mails.2fa.mailbody'), $replace_arr));
-
-			try {
-				$mail->Subject = lng('mails.2fa.subject');
-				$mail->AltBody = $mail_body;
-				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-				$mail->AddAddress($userinfo['email'], User::getCorrectUserSalutation($userinfo));
-				$mail->Send();
-			} catch (\PHPMailer\PHPMailer\Exception $e) {
-				$mailerr_msg = $e->errorMessage();
-				$_mailerror = true;
-			} catch (Exception $e) {
-				$mailerr_msg = $e->getMessage();
-				$_mailerror = true;
-			}
-
-			if ($_mailerror) {
-				Response::dynamicError($mailerr_msg);
-			}
-		}
-		UI::twig()->addGlobal('userinfo', $userinfo);
-	} else {
-		Response::dynamicError('Select one of the possible values for 2FA');
-	}
-} elseif ($action == 'add') {
-	$type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0';
-	$data = isset($_POST['data_2fa']) ? $_POST['data_2fa'] : '';
-	$code = isset($_POST['codevalidation']) ? $_POST['codevalidation'] : '';
-
-	// validate
-	$result = $tfa->verifyCode($data, $code, 3);
-
-	if ($result) {
-		if ($type == 0 || $type == 1) {
-			// no fixed secret for email validation, the validation code will be set on the fly
-			$data = "";
-		}
-		Database::pexecute($upd_stmt, [
-			't2fa' => $type,
-			'd2fa' => $data,
-			'id' => $uid
-		]);
-		Response::standardSuccess('2fa.2fa_added', $filename);
-	}
-	Response::dynamicError('Invalid/wrong code');
-}
-
-$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed 2fa::overview");
-
-$type_select_values = [];
-$ga_qrcode = '';
-if ($userinfo['type_2fa'] == '0') {
-	// available types
-	$type_select_values = [
-		0 => '-',
-		1 => 'E-Mail',
-		2 => 'Authenticator'
-	];
-	asort($type_select_values);
-} elseif ($userinfo['type_2fa'] == '1') {
-	// email 2fa enabled
-} elseif ($userinfo['type_2fa'] == '2') {
-	// authenticator 2fa enabled
-	$ga_qrcode = $tfa->getQRCodeImageAsDataUri($userinfo['loginname'], $userinfo['data_2fa']);
-}
-
-UI::view('user/2fa.html.twig', [
-	'type_select_values' => $type_select_values,
-	'ga_qrcode' => $ga_qrcode
-]);

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+                          675 Mass Ave, Cambridge, MA 02139, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,3 +278,4 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
+

README.md

@@ -1,82 +0,0 @@
-[![Froxlor-CI](https://github.com/Froxlor/Froxlor/actions/workflows/build-mariadb.yml/badge.svg?branch=main)](https://github.com/Froxlor/Froxlor/actions/workflows/build-mariadb.yml)
-[![Froxlor-CI](https://github.com/Froxlor/Froxlor/actions/workflows/build-mysql.yml/badge.svg?branch=main)](https://github.com/Froxlor/Froxlor/actions/workflows/build-mysql.yml)
-[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.froxlor.org)
-
-# Froxlor
-
-The server administration software for your needs.
-Developed by experienced server administrators, this panel simplifies the effort of managing your hosting platform.
-
-## Installation
-
-### Fast install
-1. Ensure that your webserver serves /var/www/html
-2. Extract froxlor into /var/www/html
-3. Point your browser to http://[ip-of-webserver]/froxlor
-4. Follow the installer
-5. Login as administrator
-6. Have fun!
-
-If you have chosen to do the configuration by hand during the installation, you have to complete some more steps:
-
-1. Adjust "System > Settings" according to your needs
-2. Choose your distribution under "System > Configuration"
-3. Follow the steps for your services
-
-### Detailed installation
-https://docs.froxlor.org/latest/general/installation/
-
-## Help
-
-You may find help in the following places:
-
-### Discord
-
-The froxlor community discord server can be found here: https://discord.froxlor.org
-
-### IRC
-
-froxlor may be found on libera.chat, channel #froxlor:
-irc://irc.libera.chat/froxlor
-
-### Forum
-
-The community is located on https://forum.froxlor.org/
-
-### Wiki
-
-More documentation may be found in the froxlor - documentation:
-https://docs.froxlor.org/
-
-## License
-
-May be found in [COPYING](COPYING)
-
-## Downloads
-
-### Tarball
-https://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](https://files.froxlor.org/releases/froxlor-latest.tar.gz.md5) [SHA1](https://files.froxlor.org/releases/froxlor-latest.tar.gz.sha1)
-
-### Debian / Ubuntu repository
-
-[HowTo](https://docs.froxlor.org/latest/general/installation/apt-package.html)
-
-#### Debian
-
-```
-apt-get -y install apt-transport-https lsb-release ca-certificates curl
-curl -sSLo /usr/share/keyrings/deb.froxlor.org-froxlor.gpg https://deb.froxlor.org/froxlor.gpg
-echo sh -c '"deb [signed-by=/usr/share/keyrings/deb.froxlor.org-froxlor.gpg] https://deb.froxlor.org/debian $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list'
-```
-
-#### Ubuntu
-
-```
-apt-get -y install apt-transport-https lsb-release ca-certificates curl
-curl -sSLo /usr/share/keyrings/deb.froxlor.org-froxlor.gpg https://deb.froxlor.org/froxlor.gpg
-echo sh -c '"deb [signed-by=/usr/share/keyrings/deb.froxlor.org-froxlor.gpg] https://deb.froxlor.org/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list'
-```
-
-## Contributing
-
-[see here](.github/CONTRIBUTING.md)

SECURITY.md

@@ -1,47 +0,0 @@
-# froxlor's Security Policy
-
-Welcome and thanks for taking interest in [froxlor](https://www.froxlor.org)!
-
-We are mostly interested in reports by actual froxlor users but all high quality contributions are welcome.
-
-Please try your best to describe a clear and realistic impact for your report and please don't open any public issues on GitHub or social media, we're doing our best to respond through huntr as quickly as we can.
-
-With that, good luck hacking us ;)
-
-## Supported versions
-
-- ️✅ **2.x**  (`main` git-branch)
-- ❌ 0.10.x (`0.10.x` git-branch)
-- ❌ 0.9.x (`0.9.x`git-branch)
-
-## Qualifying Vulnerabilities
-
-### Vulnerabilities we really care about
-- SQL injection bugs
-- server-side code execution bugs
-- cross-site scripting vulnerabilities
-- cross-site request forgery vulnerabilities
-- authentication and authorization flaws
-- sensitive information disclosure
-
-### Vulnerabilities we accept
-
-Only reproducable issues on a default/clean setup from the latest stable release of a supported version will be accepted.
-
-## Non-Qualifying Vulnerabilities
-
-- Reports from automated tools or scanners
-- Theoretical attacks without proof of exploitability
-- Attacks that are the result of a third party library should be reported to the library maintainers
-- Social engineering
-- Reflected file download
-- Physical attacks
-- Weak SSL/TLS/SSH algorithms or protocols
-- Attacks involving physical access to a user’s device, or involving a device or network that’s already seriously compromised (eg man-in-the-middle).
-- The user attacks themselves
-- anything in `/doc`
-- anything in `/tests`
-
-## Reporting a Vulnerability
-
-If you think you have found a vulnerability in froxlor, please head over to [https://huntr.dev/repos/froxlor/froxlor](https://huntr.dev/repos/froxlor/froxlor) and use the reporting possibilities there as we are funding the prize-pot for froxlor on this platform. Also, please give us appropriate time to fix the issue and build update-packages before publishing anything into the wild. Alternatively you can send us an email to [team@froxlor.org](team@froxlor.org).

actions/admin/settings/000.version.php

@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * 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     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ * @version    $Id$
+ */
+
+return array(
+	'groups' => array(
+		'version' => array(
+			'fields' => array(
+				'panel_version' => array(
+					'settinggroup' => 'panel',
+					'varname' => 'version',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				'panel_frontend' => array(
+					'settinggroup' => 'panel',
+					'varname' => 'frontend',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				'system_last_tasks_run' => array(
+					'settinggroup' => 'system',
+					'varname' => 'last_tasks_run',
+					'type' => 'hidden',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'system_last_traffic_run' => array(
+					'settinggroup' => 'system',
+					'varname' => 'last_traffic_run',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				'system_lastcronrun' => array(
+					'settinggroup' => 'system',
+					'varname' => 'lastcronrun',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				'system_lastguid' => array(
+					'settinggroup' => 'system',
+					'varname' => 'lastguid',
+					'type' => 'hidden',
+					'default' => 9999,
+					),
+				'system_lastaccountnumber' => array(
+					'settinggroup' => 'system',
+					'varname' => 'lastaccountnumber',
+					'type' => 'hidden',
+					'default' => 0,
+					),
+				),
+			),
+		),
+	);
+
+?>

actions/admin/settings/100.panel.php

@@ -2,343 +2,164 @@
 
 /**
  * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
  * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * 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.
+ * 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 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
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Language
+ * @version    $Id$
  */
 
-return [
-	'groups' => [
-		'panel' => [
-			'title' => lng('admin.panelsettings'),
-			'icon' => 'fa-solid fa-chalkboard-user',
-			'fields' => [
-				'panel_standardlanguage' => [
-					'label' => [
-						'title' => lng('login.language'),
-						'description' => lng('serversettings.language.description')
-					],
+return array(
+	'groups' => array(
+		'panel' => array(
+			'title' => $lng['admin']['panelsettings'],
+			'fields' => array(
+				'panel_standardlanguage' => array(
+					'label' => array('title' => $lng['login']['language'], 'description' => $lng['serversettings']['language']['description']),
 					'settinggroup' => 'panel',
 					'varname' => 'standardlanguage',
-					'type' => 'select',
-					'default' => 'en',
-					'option_options_method' => [
-						'\\Froxlor\\Language',
-						'getLanguages'
-					],
-					'save_method' => 'storeSettingField'
-				],
-				'panel_default_theme' => [
-					'label' => [
-						'title' => lng('panel.theme'),
-						'description' => lng('serversettings.default_theme')
-					],
-					'settinggroup' => 'panel',
-					'varname' => 'default_theme',
-					'type' => 'select',
-					'default' => 'Froxlor',
-					'option_options_method' => [
-						'\\Froxlor\\UI\\Panel\\UI',
-						'getThemes'
-					],
-					'save_method' => 'storeSettingDefaultTheme'
-				],
-				'panel_allow_theme_change_customer' => [
-					'label' => lng('serversettings.panel_allow_theme_change_customer'),
-					'settinggroup' => 'panel',
-					'varname' => 'allow_theme_change_customer',
-					'type' => 'checkbox',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_allow_theme_change_admin' => [
-					'label' => lng('serversettings.panel_allow_theme_change_admin'),
-					'settinggroup' => 'panel',
-					'varname' => 'allow_theme_change_admin',
-					'type' => 'checkbox',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_natsorting' => [
-					'label' => lng('serversettings.natsorting'),
+					'type' => 'option',
+					'default' => 'English',
+					'option_mode' => 'one',
+					'option_options_method' => 'getLanguages',
+					'save_method' => 'storeSettingField',
+					),
+				'panel_natsorting' => array(
+					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
 					'varname' => 'natsorting',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_paging' => [
-					'label' => lng('serversettings.paging'),
+					),
+				'panel_no_robots' => array(
+					'label' => $lng['serversettings']['no_robots'],
+					'settinggroup' => 'panel',
+					'varname' => 'no_robots',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'panel_paging' => array(
+					'label' => $lng['serversettings']['paging'],
 					'settinggroup' => 'panel',
 					'varname' => 'paging',
-					'type' => 'number',
-					'min' => 0,
+					'type' => 'int',
+					'int_min' => 0,
 					'default' => 0,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_pathedit' => [
-					'label' => lng('serversettings.pathedit'),
+					'save_method' => 'storeSettingField',
+					),
+				'panel_pathedit' => array(
+					'label' => $lng['serversettings']['pathedit'],
 					'settinggroup' => 'panel',
 					'varname' => 'pathedit',
-					'type' => 'select',
+					'type' => 'option',
 					'default' => 'Manual',
-					'select_var' => [
-						'Manual' => lng('serversettings.manual'),
-						'Dropdown' => lng('serversettings.dropdown')
-					],
-					'save_method' => 'storeSettingField'
-				],
-				'panel_adminmail' => [
-					'label' => lng('serversettings.adminmail'),
+					'option_mode' => 'one',
+					'option_options' => array('Manual' => 'Manual', 'Dropdown' => 'Dropdown'),
+					'save_method' => 'storeSettingField',
+					),
+				'panel_adminmail' => array(
+					'label' => $lng['serversettings']['adminmail'],
 					'settinggroup' => 'panel',
 					'varname' => 'adminmail',
-					'type' => 'email',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_adminmail_defname' => [
-					'label' => lng('serversettings.adminmail_defname'),
-					'settinggroup' => 'panel',
-					'varname' => 'adminmail_defname',
-					'type' => 'text',
-					'default' => 'Froxlor Administrator',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_adminmail_return' => [
-					'label' => lng('serversettings.adminmail_return'),
-					'settinggroup' => 'panel',
-					'varname' => 'adminmail_return',
-					'type' => 'email',
-					'string_emptyallowed' => true,
+					'type' => 'string',
+					'string_type' => 'mail',
+					'string_emptyallowed' => false,
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_decimal_places' => [
-					'label' => lng('serversettings.decimal_places'),
+					),
+				'panel_decimal_places' => array(
+					'label' => $lng['serversettings']['decimal_places'],
 					'settinggroup' => 'panel',
 					'varname' => 'decimal_places',
-					'type' => 'number',
-					'min' => 0,
-					'max' => 15,
+					'type' => 'int',
+					'int_min' => 0,
+					'int_max' => 15,
 					'default' => 4,
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_phpmyadmin_url' => [
-					'label' => lng('serversettings.phpmyadmin_url'),
+					),
+				'panel_phpmyadmin_url' => array(
+					'label' => $lng['serversettings']['phpmyadmin_url'],
 					'settinggroup' => 'panel',
 					'varname' => 'phpmyadmin_url',
-					'type' => 'url',
+					'type' => 'string',
+					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_webmail_url' => [
-					'label' => lng('serversettings.webmail_url'),
+					'save_method' => 'storeSettingField',
+					),
+				'panel_webmail_url' => array(
+					'label' => $lng['serversettings']['webmail_url'],
 					'settinggroup' => 'panel',
 					'varname' => 'webmail_url',
-					'type' => 'url',
+					'type' => 'string',
+					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_webftp_url' => [
-					'label' => lng('serversettings.webftp_url'),
+					'save_method' => 'storeSettingField',
+					),
+				'panel_webftp_url' => array(
+					'label' => $lng['serversettings']['webftp_url'],
 					'settinggroup' => 'panel',
 					'varname' => 'webftp_url',
-					'type' => 'url',
+					'type' => 'string',
+					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'admin_show_version_login' => [
-					'label' => lng('admin.show_version_login'),
+					'save_method' => 'storeSettingField',
+					),
+				'admin_show_version_login' => array(
+					'label' => $lng['admin']['show_version_login'],
 					'settinggroup' => 'admin',
 					'varname' => 'show_version_login',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'admin_show_version_footer' => [
-					'label' => lng('admin.show_version_footer'),
+					),
+				'admin_show_version_footer' => array(
+					'label' => $lng['admin']['show_version_footer'],
 					'settinggroup' => 'admin',
 					'varname' => 'show_version_footer',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'admin_show_news_feed' => [
-					'label' => lng('admin.show_news_feed'),
+					'save_method' => 'storeSettingField',
+					),
+				'admin_froxlor_graphic' => array(
+					'label' => $lng['admin']['froxlor_graphic'],
 					'settinggroup' => 'admin',
-					'varname' => 'show_news_feed',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'customer_show_news_feed' => [
-					'label' => lng('admin.customer_show_news_feed'),
-					'settinggroup' => 'customer',
-					'varname' => 'show_news_feed',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'customer_news_feed_url' => [
-					'label' => lng('admin.customer_news_feed_url'),
-					'settinggroup' => 'customer',
-					'varname' => 'news_feed_url',
-					'type' => 'url',
-					'string_emptyallowed' => true,
+					'varname' => 'froxlor_graphic',
+					'type' => 'string',
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_allow_domain_change_admin' => [
-					'label' => lng('serversettings.panel_allow_domain_change_admin'),
+					'save_method' => 'storeSettingField',
+					),
+				'panel_allow_domain_change_admin' => array(
+					'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_domain_change_admin',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_allow_domain_change_customer' => [
-					'label' => lng('serversettings.panel_allow_domain_change_customer'),
+					),
+				'panel_allow_domain_change_customer' => array(
+					'label' => $lng['serversettings']['panel_allow_domain_change_customer'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_domain_change_customer',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_phpconfigs_hidesubdomains' => [
-					'label' => lng('serversettings.panel_phpconfigs_hidesubdomains'),
-					'settinggroup' => 'panel',
-					'varname' => 'phpconfigs_hidesubdomains',
-					'type' => 'checkbox',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_phpconfigs_hidestdsubdomain' => [
-					'label' => lng('serversettings.panel_phpconfigs_hidestdsubdomain'),
-					'settinggroup' => 'panel',
-					'varname' => 'phpconfigs_hidestdsubdomain',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_customer_hide_options' => [
-					'label' => lng('serversettings.panel_customer_hide_options'),
-					'settinggroup' => 'panel',
-					'varname' => 'customer_hide_options',
-					'type' => 'select',
-					'default' => '',
-					'select_mode' => 'multiple',
-					'option_emptyallowed' => true,
-					'select_var' => [
-						'email' => lng('menue.email.email'),
-						'mysql' => lng('menue.mysql.mysql'),
-						'domains' => lng('menue.domains.domains'),
-						'ftp' => lng('menue.ftp.ftp'),
-						'extras' => lng('menue.extras.extras'),
-						'extras.directoryprotection' => lng('menue.extras.extras') . " / " . lng('menue.extras.directoryprotection'),
-						'extras.pathoptions' => lng('menue.extras.extras') . " / " . lng('menue.extras.pathoptions'),
-						'extras.logger' => lng('menue.extras.extras') . " / " . lng('menue.logger.logger'),
-						'extras.backup' => lng('menue.extras.extras') . " / " . lng('menue.extras.backup'),
-						'traffic' => lng('menue.traffic.traffic'),
-						'traffic.http' => lng('menue.traffic.traffic') . " / HTTP",
-						'traffic.ftp' => lng('menue.traffic.traffic') . " / FTP",
-						'traffic.mail' => lng('menue.traffic.traffic') . " / Mail",
-						'misc.documentation' => lng('admin.documentation'),
-					],
-					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'panel_imprint_url' => [
-					'label' => lng('serversettings.imprint_url'),
-					'settinggroup' => 'panel',
-					'varname' => 'imprint_url',
-					'type' => 'url',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_terms_url' => [
-					'label' => lng('serversettings.terms_url'),
-					'settinggroup' => 'panel',
-					'varname' => 'terms_url',
-					'type' => 'url',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_privacy_url' => [
-					'label' => lng('serversettings.privacy_url'),
-					'settinggroup' => 'panel',
-					'varname' => 'privacy_url',
-					'type' => 'url',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_logo_overridetheme' => [
-					'label' => lng('serversettings.logo_overridetheme'),
-					'settinggroup' => 'panel',
-					'varname' => 'logo_overridetheme',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_logo_overridecustom' => [
-					'label' => lng('serversettings.logo_overridecustom'),
-					'settinggroup' => 'panel',
-					'varname' => 'logo_overridecustom',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_logo_image_header' => [
-					'label' => lng('serversettings.logo_image_header'),
-					'settinggroup' => 'panel',
-					'varname' => 'logo_image_header',
-					'type' => 'image',
-					'accept' => 'image/jpeg, image/jpg, image/png, image/gif',
-					'image_name' => 'logo_header',
-					'default' => '',
-					'save_method' => 'storeSettingImage'
-				],
-				'panel_logo_image_login' => [
-					'label' => lng('serversettings.logo_image_login'),
-					'settinggroup' => 'panel',
-					'varname' => 'logo_image_login',
-					'type' => 'image',
-					'accept' => 'image/jpeg, image/jpg, image/png, image/gif',
-					'image_name' => 'logo_login',
-					'default' => '',
-					'save_method' => 'storeSettingImage'
-				]
-			]
-		]
-	]
-];
+					),
+				),
+			),
+		),
+	);
+
+?>

actions/admin/settings/110.accounts.php

@@ -2,256 +2,111 @@
 
 /**
  * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
  * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * 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.
+ * 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 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
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ * @version    $Id$
  */
 
-return [
-	'groups' => [
-		'accounts' => [
-			'title' => lng('admin.accountsettings'),
-			'icon' => 'fa-solid fa-users-gear',
-			'fields' => [
-				'session_sessiontimeout' => [
-					'label' => lng('serversettings.session_timeout'),
+return array(
+	'groups' => array(
+		'accounts' => array(
+			'title' => $lng['admin']['accountsettings'],
+			'fields' => array(
+				'session_sessiontimeout' => array(
+					'label' => $lng['serversettings']['session_timeout'],
 					'settinggroup' => 'session',
 					'varname' => 'sessiontimeout',
-					'type' => 'number',
-					'min' => 60,
+					'type' => 'int',
 					'default' => 600,
-					'save_method' => 'storeSettingField'
-				],
-				'session_allow_multiple_login' => [
-					'label' => lng('serversettings.session_allow_multiple_login'),
+					'save_method' => 'storeSettingField',
+					),
+				'session_allow_multiple_login' => array(
+					'label' => $lng['serversettings']['session_allow_multiple_login'],
 					'settinggroup' => 'session',
 					'varname' => 'allow_multiple_login',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'login_domain_login' => [
-					'label' => lng('serversettings.login_domain_login'),
-					'settinggroup' => 'login',
-					'varname' => 'domain_login',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'login_maxloginattempts' => [
-					'label' => lng('serversettings.maxloginattempts'),
+					'save_method' => 'storeSettingField',
+					),
+				'login_maxloginattempts' => array(
+					'label' => $lng['serversettings']['maxloginattempts'],
 					'settinggroup' => 'login',
 					'varname' => 'maxloginattempts',
-					'type' => 'number',
-					'min' => 1,
+					'type' => 'int',
 					'default' => 3,
-					'save_method' => 'storeSettingField'
-				],
-				'login_deactivatetime' => [
-					'label' => lng('serversettings.deactivatetime'),
+					'save_method' => 'storeSettingField',
+					),
+				'login_deactivatetime' => array(
+					'label' => $lng['serversettings']['deactivatetime'],
 					'settinggroup' => 'login',
 					'varname' => 'deactivatetime',
-					'type' => 'number',
-					'min' => 0,
+					'type' => 'int',
 					'default' => 900,
-					'save_method' => 'storeSettingField'
-				],
-				'2fa_enabled' => [
-					'label' => lng('2fa.2fa_enabled'),
-					'settinggroup' => '2fa',
-					'varname' => 'enabled',
-					'type' => 'checkbox',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_min_length' => [
-					'label' => lng('serversettings.panel_password_min_length'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_min_length',
-					'type' => 'number',
-					'min' => 0,
-					'default' => 0,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_alpha_lower' => [
-					'label' => lng('serversettings.panel_password_alpha_lower'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_alpha_lower',
-					'type' => 'checkbox',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_alpha_upper' => [
-					'label' => lng('serversettings.panel_password_alpha_upper'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_alpha_upper',
-					'type' => 'checkbox',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_numeric' => [
-					'label' => lng('serversettings.panel_password_numeric'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_numeric',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_special_char_required' => [
-					'label' => lng('serversettings.panel_password_special_char_required'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_special_char_required',
-					'type' => 'checkbox',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_special_char' => [
-					'label' => lng('serversettings.panel_password_special_char'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_special_char',
-					'type' => 'text',
-					'default' => '!?<>§$%+#=@',
-					'save_method' => 'storeSettingField'
-				],
-				'panel_password_regex' => [
-					'label' => lng('serversettings.panel_password_regex'),
-					'settinggroup' => 'panel',
-					'varname' => 'password_regex',
-					'type' => 'text',
-					'default' => '',
 					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'system_req_limit_per_interval' => [
-					'label' => lng('serversettings.req_limit_per_interval'),
-					'settinggroup' => 'system',
-					'varname' => 'req_limit_per_interval',
-					'type' => 'number',
-					'min' => 30,
-					'default' => 60,
-					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'system_req_limit_interval' => [
-					'label' => lng('serversettings.req_limit_interval'),
-					'settinggroup' => 'system',
-					'varname' => 'req_limit_interval',
-					'type' => 'number',
-					'min' => 5,
-					'default' => 60,
-					'save_method' => 'storeSettingField',
-					'advanced_mode' => true
-				],
-				'customer_accountprefix' => [
-					'label' => lng('serversettings.accountprefix'),
+					),
+				'customer_accountprefix' => array(
+					'label' => $lng['serversettings']['accountprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'accountprefix',
-					'type' => 'text',
+					'type' => 'string',
 					'default' => '',
-					'plausibility_check_method' => [
-						'\\Froxlor\\Validate\\Check',
-						'checkUsername'
-					],
-					'save_method' => 'storeSettingField'
-				],
-				'customer_mysqlprefix' => [
-					'label' => lng('serversettings.mysqlprefix'),
+					'plausibility_check_method' => 'checkUsername',
+					'save_method' => 'storeSettingField',
+					),
+				'customer_mysqlprefix' => array(
+					'label' => $lng['serversettings']['mysqlprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'mysqlprefix',
-					'type' => 'text',
+					'type' => 'string',
 					'default' => '',
-					'plausibility_check_method' => [
-						'\\Froxlor\\Validate\\Check',
-						'checkUsername'
-					],
-					'save_method' => 'storeSettingField'
-				],
-				'customer_ftpprefix' => [
-					'label' => lng('serversettings.ftpprefix'),
+					'plausibility_check_method' => 'checkUsername',
+					'save_method' => 'storeSettingField',
+					),
+				'customer_ftpprefix' => array(
+					'label' => $lng['serversettings']['ftpprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'ftpprefix',
-					'type' => 'text',
+					'type' => 'string',
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				],
-				'customer_ftpatdomain' => [
-					'label' => lng('serversettings.ftpdomain'),
+					'save_method' => 'storeSettingField',
+					),
+				'customer_ftpatdomain' => array(
+					'label' => $lng['serversettings']['ftpdomain'],
 					'settinggroup' => 'customer',
 					'varname' => 'ftpatdomain',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField'
-				],
-				'panel_allow_preset' => [
-					'label' => lng('serversettings.allow_password_reset'),
+					'save_method' => 'storeSettingField',
+					),
+				'panel_allow_preset' => array(
+					'label' => $lng['serversettings']['allow_password_reset'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_preset',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => [
-						'fieldname' => 'panel_allow_preset_admin',
-						'fielddata' => [
-							'settinggroup' => 'panel',
-							'varname' => 'allow_preset_admin'
-						],
-						'onlyif' => 0
-					]
-				],
-				'panel_allow_preset_admin' => [
-					'label' => lng('serversettings.allow_password_reset_admin'),
+					),
+				'panel_allow_preset_admin' => array(
+					'label' => $lng['serversettings']['allow_password_reset_admin'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_preset_admin',
-					'type' => 'checkbox',
+					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => [
-						'fieldname' => 'panel_allow_preset',
-						'fielddata' => [
-							'settinggroup' => 'panel',
-							'varname' => 'allow_preset'
-						],
-						'onlyif' => 1
-					]
-				],
-				'system_backupenabled' => [
-					'label' => lng('serversettings.backupenabled'),
-					'settinggroup' => 'system',
-					'varname' => 'backupenabled',
-					'type' => 'checkbox',
-					'default' => false,
-					'cronmodule' => 'froxlor/backup',
-					'save_method' => 'storeSettingField'
-				],
-				'system_createstdsubdom_default'