sql text field corrections

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

.codecov.yml

@@ -1,4 +0,0 @@
-codecov:
-  notify:
-    require_ci_to_pass: no
-

.editorconfig

@@ -0,0 +1,19 @@
+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,57 +1,31 @@
-# Contributing
+# Contribution
-
-Before you start working on a PR, contact us via IRC in #froxlor on Freenode or
-the forum at 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.
-However, at this stage of the 0.9.x branch, we are not looking for new
-features or refactoring, especially not the kind which requires changes to a
-lot of files.
-Please focus on our API based version 0.10.x (current master).
-
 
+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.
 
+* 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...
-	* 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.
-
-### Webserver changes
-If you make changes to the functionality of webserver configuration, please
-make sure your implementation covers all supported webservers.
-
-
-
 
 ### l10n
 
-If you add new language strings, please make sure you add the english fallback
+If you add new language strings, please make sure you add the english fallback strings in `lng/en.php`.
-strings in
 
-* `lng/english.lng.php`
+### New settings and database-layout changes
-* `install/lng/english.lng.php` (if applicable)
 
+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))
-### New settings and database-layout changnes
-If you add new settings or layout changes, please make sure you add these to
-
-* `install/froxlor.sql`
-* and handle the update (see `install/updates/froxlor/0.10/update_0.10.inc.php`)
 * if you have any question on how update-process works, please contact us
-

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

@@ -1,24 +1,20 @@
 # 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 freenode
+* 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)
@@ -27,37 +23,26 @@ Please provide a concise summary of the problem you're experiencing...
 * 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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,40 @@
+---
+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

@@ -0,0 +1,20 @@
+---
+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

@@ -0,0 +1,22 @@
+/**
+ * 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

@@ -35,4 +35,3 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 - [ ] 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-apidocs.yml

@@ -0,0 +1,14 @@
+name: build-docs
+
+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-docs -f ref=${{github.ref_name}}

.github/workflows/build-mariadb.yml

@@ -0,0 +1,81 @@
+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

@@ -0,0 +1,59 @@
+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,5 +1,5 @@
 install/update.log
-templates/*
+install/*.json
 lib/userdata.inc.php
 lib/userdata.inc.php.bak
 logs/*
@@ -7,14 +7,21 @@ logs/*
 .buildpath
 .project
 .settings/
+.test/
 *.diff
 *~
 .well-known
 .idea
 *.iml
-
+img/
-!templates/Froxlor/
-!templates/Sparkle/
-!templates/misc/
-templates/Froxlor/assets/img/logo_custom.png
 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/

.travis.yml

@@ -1,67 +0,0 @@
-language: php
-dist: bionic
-services:
-  - docker
-php:
-  - 7.3
-
-branches:
-  only:
-  - master
-  - namespaces
-
-matrix:
-  include:
-    - php: 7.3
-      env: "DOCKER_MYSQL_TYPE=mysql DOCKER_MYSQL_VERSION=5.6"
-    - php: 7.3
-      env: "DOCKER_MYSQL_TYPE=mysql DOCKER_MYSQL_VERSION=5.7"
-    - php: 7.3
-      env: "DOCKER_MYSQL_TYPE=mysql DOCKER_MYSQL_VERSION=8.0 STARTCMD='mysqld --default-authentication-plugin=mysql_native_password'"
-    - php: 7.3
-      env: "DOCKER_MYSQL_TYPE=mariadb DOCKER_MYSQL_VERSION=10.3"
-    - php: 7.3
-      env: "DOCKER_MYSQL_TYPE=mariadb DOCKER_MYSQL_VERSION=10.4"
-
-addons:
-  apt:
-    update: true
-
-before_install:
-  - export MYSQL_DATABASE=froxlor010
-  - docker run -d --name mysql -e MYSQL_ROOT_PASSWORD=fr0xl0r.TravisCI -e MYSQL_DATABASE=$MYSQL_DATABASE -p 3306:3306 $DOCKER_MYSQL_TYPE:$DOCKER_MYSQL_VERSION $STARTCMD
-  - sudo apt-get install -y ant
-  - >
-    export tries=0;
-    export max_tries=20;
-    while [[ true ]]; do
-      tries=$((tries + 1));
-      echo "waiting for database server to start up... [$tries]";
-      sleep 5;
-      # Now see that today's table is there, which would indicate that the cron job ran.
-      mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -s -e 'SHOW VARIABLES LIKE "%version%";'
-      look_exit=$?;
-      if [[ "$look_exit" = "0" ]]; then echo "Database server successfully started"; break; fi;
-      if [[ "$tries" -ge "$max_tries" ]]; then echo "Database server did not start in time"; exit 1; break; fi;
-    done;
-
-install:
-  - mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI -e "CREATE DATABASE IF NOT EXISTS froxlor010;"
-  - 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'@'%';"
-  - mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < install/froxlor.sql
-
-script:
-  - ant phpunit
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash) -f "build/logs/clover.xml"
-
-notifications:
-  irc: "irc.freenode.org#froxlor"
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/bdf91d1c3f745e51f796
-    on_success: always
-    on_failure: always
-    on_start: never

2fa.php

@@ -1,32 +1,46 @@
 <?php
-if (! defined('AREA')) {
+
+/**
+ * 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') {
-	\Froxlor\UI\Response::dynamic_error("2FA not activated");
+	Response::dynamicError('2fa.2fa_not_activated');
 }
 
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2018 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> (2018-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Panel
- * @since 0.10.0
- *       
- */
-
 // This file is being included in admin_index and customer_index
 // and therefore does not need to require lib/init.php
 if (AREA == 'admin') {
@@ -38,53 +52,103 @@ if (AREA == 'admin') {
 }
 $success_message = "";
 
-$tfa = new \Froxlor\FroxlorTwoFactorAuth('Froxlor');
+$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, array(
+	Database::pexecute($upd_stmt, [
 		't2fa' => 0,
 		'd2fa' => "",
 		'id' => $uid
-	));
+	]);
-	\Froxlor\UI\Response::standard_success($lng['2fa']['2fa_removed']);
+	Response::standardSuccess('2fa.2fa_removed');
-} elseif ($action == 'add') {
+} elseif ($action == 'preadd') {
 	$type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0';
 
-	if ($type == 0 || $type == 1) {
 	$data = "";
-	}
+	if ($type > 0) {
-	if ($type == 2) {
 		// 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;
 			}
-	Database::pexecute($upd_stmt, array(
+
+			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
-	));
+		]);
-	\Froxlor\UI\Response::standard_success(sprintf($lng['2fa']['2fa_added'], $filename, $s));
+		Response::standardSuccess('2fa.2fa_added', $filename);
+	}
+	Response::dynamicError('Invalid/wrong code');
 }
 
-$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed 2fa::overview");
+$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 = array(
+	$type_select_values = [
 		0 => '-',
 		1 => 'E-Mail',
 		2 => 'Authenticator'
-	);
+	];
 	asort($type_select_values);
-	$type_select = "";
-	foreach ($type_select_values as $_val => $_type) {
-		$type_select .= \Froxlor\UI\HTML::makeoption($_type, $_val);
-	}
 } 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']);
 }
-eval("echo \"" . \Froxlor\UI\Template::getTemplate("2fa/overview", true) . "\";");
+
+UI::view('user/2fa.html.twig', [
+	'type_select_values' => $type_select_values,
+	'ga_qrcode' => $ga_qrcode
+]);

README.md

@@ -1,5 +1,6 @@
-[![Build Status](https://travis-ci.com/Froxlor/Froxlor.svg?branch=master)](https://travis-ci.com/Froxlor/Froxlor)
+[![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)
-[![Gitter](https://badges.gitter.im/Froxlor/community.svg)](https://gitter.im/Froxlor/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![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
 
@@ -9,27 +10,34 @@ Developed by experienced server administrators, this panel simplifies the effort
 ## Installation
 
 ### Fast install
-1. Ensure that your webserver serves /var/www
+1. Ensure that your webserver serves /var/www/html
-2. Extract froxlor into /var/www
+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. Adjust "System > Settings" according to your needs
+6. Have fun!
-7. Choose your distribution under "System > Configuration"
+
-8. Follow the steps for your services
+If you have chosen to do the configuration by hand during the installation, you have to complete some more steps:
-9. Have fun!
+
+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://github.com/Froxlor/Froxlor/wiki/Install-froxlor-from-tarball
+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 freenode.net, channel #froxlor:
+froxlor may be found on libera.chat, channel #froxlor:
-irc://chat.freenode.net/froxlor
+irc://irc.libera.chat/froxlor
 
 ### Forum
 
@@ -37,30 +45,37 @@ The community is located on https://forum.froxlor.org/
 
 ### Wiki
 
-More documentation may be found in the froxlor - wiki:
+More documentation may be found in the froxlor - documentation:
-https://github.com/Froxlor/Froxlor/wiki
+https://docs.froxlor.org/
 
 ## License
 
-May be found in COPYING
+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 repository
+### Debian / Ubutnu repository
 
-[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-debian)
+[HowTo](https://docs.froxlor.org/latest/general/installation/apt-package.html)
 
-/etc/apt/sources.list.d/froxlor.list
+#### Debian
-> deb http://debian.froxlor.org {stretch|buster} main
 
-### Gentoo repository
+```
+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'
+```
 
-[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-gentoo)
+#### Ubuntu
 
-https://files.froxlor.org/gentoo/repositories.xml
+```
+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
 

SECURITY.md

@@ -0,0 +1,47 @@
+# 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/100.panel.php

@@ -2,273 +2,342 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Language
  *
+ * 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(
+
-	'groups' => array(
+return [
-		'panel' => array(
+	'groups' => [
-			'title' => $lng['admin']['panelsettings'],
+		'panel' => [
-			'fields' => array(
+			'title' => lng('admin.panelsettings'),
-				'panel_standardlanguage' => array(
+			'icon' => 'fa-solid fa-chalkboard-user',
-					'label' => array(
+			'fields' => [
-						'title' => $lng['login']['language'],
+				'panel_standardlanguage' => [
-						'description' => $lng['serversettings']['language']['description']
+					'label' => [
-					),
+						'title' => lng('login.language'),
+						'description' => lng('serversettings.language.description')
+					],
 					'settinggroup' => 'panel',
 					'varname' => 'standardlanguage',
-					'type' => 'option',
+					'type' => 'select',
-					'default' => 'English',
+					'default' => 'en',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
+						'\\Froxlor\\Language',
-						'\\Froxlor\\User',
 						'getLanguages'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_default_theme' => array(
+				'panel_default_theme' => [
-					'label' => array(
+					'label' => [
-						'title' => $lng['panel']['theme'],
+						'title' => lng('panel.theme'),
-						'description' => $lng['serversettings']['default_theme']
+						'description' => lng('serversettings.default_theme')
-					),
+					],
 					'settinggroup' => 'panel',
 					'varname' => 'default_theme',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'Froxlor',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
+						'\\Froxlor\\UI\\Panel\\UI',
-						'\\Froxlor\\UI\\Template',
 						'getThemes'
-					),
+					],
 					'save_method' => 'storeSettingDefaultTheme'
-				),
+				],
-				'panel_allow_theme_change_customer' => array(
+				'panel_allow_theme_change_customer' => [
-					'label' => $lng['serversettings']['panel_allow_theme_change_customer'],
+					'label' => lng('serversettings.panel_allow_theme_change_customer'),
 					'settinggroup' => 'panel',
 					'varname' => 'allow_theme_change_customer',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_allow_theme_change_admin' => array(
+				'panel_allow_theme_change_admin' => [
-					'label' => $lng['serversettings']['panel_allow_theme_change_admin'],
+					'label' => lng('serversettings.panel_allow_theme_change_admin'),
 					'settinggroup' => 'panel',
 					'varname' => 'allow_theme_change_admin',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_natsorting' => array(
+				'panel_natsorting' => [
-					'label' => $lng['serversettings']['natsorting'],
+					'label' => lng('serversettings.natsorting'),
 					'settinggroup' => 'panel',
 					'varname' => 'natsorting',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_no_robots' => array(
+				],
-					'label' => $lng['serversettings']['no_robots'],
+				'panel_paging' => [
-					'settinggroup' => 'panel',
+					'label' => lng('serversettings.paging'),
-					'varname' => 'no_robots',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				),
-				'panel_paging' => array(
-					'label' => $lng['serversettings']['paging'],
 					'settinggroup' => 'panel',
 					'varname' => 'paging',
-					'type' => 'int',
+					'type' => 'number',
-					'int_min' => 0,
+					'min' => 0,
 					'default' => 0,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_pathedit' => array(
+				'panel_pathedit' => [
-					'label' => $lng['serversettings']['pathedit'],
+					'label' => lng('serversettings.pathedit'),
 					'settinggroup' => 'panel',
 					'varname' => 'pathedit',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'Manual',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
+						'Manual' => lng('serversettings.manual'),
-						'Manual' => $lng['serversettings']['manual'],
+						'Dropdown' => lng('serversettings.dropdown')
-						'Dropdown' => $lng['serversettings']['dropdown']
+					],
-					),
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_adminmail' => array(
+				'panel_adminmail' => [
-					'label' => $lng['serversettings']['adminmail'],
+					'label' => lng('serversettings.adminmail'),
 					'settinggroup' => 'panel',
 					'varname' => 'adminmail',
-					'type' => 'string',
+					'type' => 'email',
-					'string_type' => 'mail',
+					'string_emptyallowed' => true,
-					'string_emptyallowed' => false,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_adminmail_defname' => array(
+				'panel_adminmail_defname' => [
-					'label' => $lng['serversettings']['adminmail_defname'],
+					'label' => lng('serversettings.adminmail_defname'),
 					'settinggroup' => 'panel',
 					'varname' => 'adminmail_defname',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'Froxlor Administrator',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_adminmail_return' => array(
+				'panel_adminmail_return' => [
-					'label' => $lng['serversettings']['adminmail_return'],
+					'label' => lng('serversettings.adminmail_return'),
 					'settinggroup' => 'panel',
 					'varname' => 'adminmail_return',
-					'type' => 'string',
+					'type' => 'email',
-					'string_type' => 'mail',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_decimal_places' => array(
+				],
-					'label' => $lng['serversettings']['decimal_places'],
+				'panel_decimal_places' => [
+					'label' => lng('serversettings.decimal_places'),
 					'settinggroup' => 'panel',
 					'varname' => 'decimal_places',
-					'type' => 'int',
+					'type' => 'number',
-					'int_min' => 0,
+					'min' => 0,
-					'int_max' => 15,
+					'max' => 15,
 					'default' => 4,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_phpmyadmin_url' => array(
+				],
-					'label' => $lng['serversettings']['phpmyadmin_url'],
+				'panel_phpmyadmin_url' => [
+					'label' => lng('serversettings.phpmyadmin_url'),
 					'settinggroup' => 'panel',
 					'varname' => 'phpmyadmin_url',
-					'type' => 'string',
+					'type' => 'url',
-					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_webmail_url' => array(
+				'panel_webmail_url' => [
-					'label' => $lng['serversettings']['webmail_url'],
+					'label' => lng('serversettings.webmail_url'),
 					'settinggroup' => 'panel',
 					'varname' => 'webmail_url',
-					'type' => 'string',
+					'type' => 'url',
-					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_webftp_url' => array(
+				'panel_webftp_url' => [
-					'label' => $lng['serversettings']['webftp_url'],
+					'label' => lng('serversettings.webftp_url'),
 					'settinggroup' => 'panel',
 					'varname' => 'webftp_url',
-					'type' => 'string',
+					'type' => 'url',
-					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'admin_show_version_login' => array(
+				'admin_show_version_login' => [
-					'label' => $lng['admin']['show_version_login'],
+					'label' => lng('admin.show_version_login'),
 					'settinggroup' => 'admin',
 					'varname' => 'show_version_login',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'admin_show_version_footer' => array(
+				],
-					'label' => $lng['admin']['show_version_footer'],
+				'admin_show_version_footer' => [
+					'label' => lng('admin.show_version_footer'),
 					'settinggroup' => 'admin',
 					'varname' => 'show_version_footer',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'admin_show_news_feed' => array(
+				'admin_show_news_feed' => [
-					'label' => $lng['admin']['show_news_feed'],
+					'label' => lng('admin.show_news_feed'),
 					'settinggroup' => 'admin',
 					'varname' => 'show_news_feed',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'customer_show_news_feed' => array(
+				'customer_show_news_feed' => [
-					'label' => $lng['admin']['customer_show_news_feed'],
+					'label' => lng('admin.customer_show_news_feed'),
 					'settinggroup' => 'customer',
 					'varname' => 'show_news_feed',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'customer_news_feed_url' => array(
+				'customer_news_feed_url' => [
-					'label' => $lng['admin']['customer_news_feed_url'],
+					'label' => lng('admin.customer_news_feed_url'),
 					'settinggroup' => 'customer',
 					'varname' => 'news_feed_url',
-					'type' => 'string',
+					'type' => 'url',
-					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_allow_domain_change_admin' => array(
+				'panel_allow_domain_change_admin' => [
-					'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
+					'label' => lng('serversettings.panel_allow_domain_change_admin'),
 					'settinggroup' => 'panel',
 					'varname' => 'allow_domain_change_admin',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_allow_domain_change_customer' => array(
+				],
-					'label' => $lng['serversettings']['panel_allow_domain_change_customer'],
+				'panel_allow_domain_change_customer' => [
+					'label' => lng('serversettings.panel_allow_domain_change_customer'),
 					'settinggroup' => 'panel',
 					'varname' => 'allow_domain_change_customer',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_phpconfigs_hidestdsubdomain' => array(
+				],
-					'label' => $lng['serversettings']['panel_phpconfigs_hidestdsubdomain'],
+				'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' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_customer_hide_options' => array(
+				],
-					'label' => $lng['serversettings']['panel_customer_hide_options'],
+				'panel_customer_hide_options' => [
+					'label' => lng('serversettings.panel_customer_hide_options'),
 					'settinggroup' => 'panel',
 					'varname' => 'customer_hide_options',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '',
-					'option_mode' => 'multiple',
+					'select_mode' => 'multiple',
 					'option_emptyallowed' => true,
-					'option_options' => array(
+					'select_var' => [
-						'email' => $lng['menue']['email']['email'],
+						'email' => lng('menue.email.email'),
-						'mysql' => $lng['menue']['mysql']['mysql'],
+						'mysql' => lng('menue.mysql.mysql'),
-						'domains' => $lng['menue']['domains']['domains'],
+						'domains' => lng('menue.domains.domains'),
-						'ftp' => $lng['menue']['ftp']['ftp'],
+						'ftp' => lng('menue.ftp.ftp'),
-						'extras' => $lng['menue']['extras']['extras'],
+						'extras' => lng('menue.extras.extras'),
-						'extras.directoryprotection' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['directoryprotection'],
+						'extras.directoryprotection' => lng('menue.extras.extras') . " / " . lng('menue.extras.directoryprotection'),
-						'extras.pathoptions' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['pathoptions'],
+						'extras.pathoptions' => lng('menue.extras.extras') . " / " . lng('menue.extras.pathoptions'),
-						'extras.logger' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['logger']['logger'],
+						'extras.logger' => lng('menue.extras.extras') . " / " . lng('menue.logger.logger'),
-						'extras.backup' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['backup'],
+						'extras.backup' => lng('menue.extras.extras') . " / " . lng('menue.extras.backup'),
-						'traffic' => $lng['menue']['traffic']['traffic'],
+						'traffic' => lng('menue.traffic.traffic'),
-						'traffic.http' => $lng['menue']['traffic']['traffic'] . " / HTTP",
+						'traffic.http' => lng('menue.traffic.traffic') . " / HTTP",
-						'traffic.ftp' => $lng['menue']['traffic']['traffic'] . " / FTP",
+						'traffic.ftp' => lng('menue.traffic.traffic') . " / FTP",
-						'traffic.mail' => $lng['menue']['traffic']['traffic'] . " / Mail"
+						'traffic.mail' => lng('menue.traffic.traffic') . " / Mail"
-					),
+					],
+					'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,212 +2,236 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+return [
-		'accounts' => array(
+	'groups' => [
-			'title' => $lng['admin']['accountsettings'],
+		'accounts' => [
-			'fields' => array(
+			'title' => lng('admin.accountsettings'),
-				'session_sessiontimeout' => array(
+			'icon' => 'fa-solid fa-users-gear',
-					'label' => $lng['serversettings']['session_timeout'],
+			'fields' => [
+				'session_sessiontimeout' => [
+					'label' => lng('serversettings.session_timeout'),
 					'settinggroup' => 'session',
 					'varname' => 'sessiontimeout',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 60,
 					'default' => 600,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'session_allow_multiple_login' => array(
+				'session_allow_multiple_login' => [
-					'label' => $lng['serversettings']['session_allow_multiple_login'],
+					'label' => lng('serversettings.session_allow_multiple_login'),
 					'settinggroup' => 'session',
 					'varname' => 'allow_multiple_login',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'login_domain_login' => array(
+				'login_domain_login' => [
-					'label' => $lng['serversettings']['login_domain_login'],
+					'label' => lng('serversettings.login_domain_login'),
 					'settinggroup' => 'login',
 					'varname' => 'domain_login',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'login_maxloginattempts' => array(
+				'login_maxloginattempts' => [
-					'label' => $lng['serversettings']['maxloginattempts'],
+					'label' => lng('serversettings.maxloginattempts'),
 					'settinggroup' => 'login',
 					'varname' => 'maxloginattempts',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 1,
 					'default' => 3,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'login_deactivatetime' => array(
+				'login_deactivatetime' => [
-					'label' => $lng['serversettings']['deactivatetime'],
+					'label' => lng('serversettings.deactivatetime'),
 					'settinggroup' => 'login',
 					'varname' => 'deactivatetime',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 0,
 					'default' => 900,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'2fa_enabled' => array(
+				'2fa_enabled' => [
-					'label' => $lng['2fa']['2fa_enabled'],
+					'label' => lng('2fa.2fa_enabled'),
 					'settinggroup' => '2fa',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_min_length' => array(
+				'panel_password_min_length' => [
-					'label' => $lng['serversettings']['panel_password_min_length'],
+					'label' => lng('serversettings.panel_password_min_length'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_min_length',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 0,
 					'default' => 0,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_alpha_lower' => array(
+				'panel_password_alpha_lower' => [
-					'label' => $lng['serversettings']['panel_password_alpha_lower'],
+					'label' => lng('serversettings.panel_password_alpha_lower'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_alpha_lower',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_alpha_upper' => array(
+				'panel_password_alpha_upper' => [
-					'label' => $lng['serversettings']['panel_password_alpha_upper'],
+					'label' => lng('serversettings.panel_password_alpha_upper'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_alpha_upper',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_numeric' => array(
+				'panel_password_numeric' => [
-					'label' => $lng['serversettings']['panel_password_numeric'],
+					'label' => lng('serversettings.panel_password_numeric'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_numeric',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_special_char_required' => array(
+				'panel_password_special_char_required' => [
-					'label' => $lng['serversettings']['panel_password_special_char_required'],
+					'label' => lng('serversettings.panel_password_special_char_required'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_special_char_required',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_special_char' => array(
+				'panel_password_special_char' => [
-					'label' => $lng['serversettings']['panel_password_special_char'],
+					'label' => lng('serversettings.panel_password_special_char'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_special_char',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '!?<>§$%+#=@',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_password_regex' => array(
+				'panel_password_regex' => [
-					'label' => $lng['serversettings']['panel_password_regex'],
+					'label' => lng('serversettings.panel_password_regex'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_regex',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'customer_accountprefix' => array(
+				],
-					'label' => $lng['serversettings']['accountprefix'],
+				'customer_accountprefix' => [
+					'label' => lng('serversettings.accountprefix'),
 					'settinggroup' => 'customer',
 					'varname' => 'accountprefix',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkUsername'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'customer_mysqlprefix' => array(
+				'customer_mysqlprefix' => [
-					'label' => $lng['serversettings']['mysqlprefix'],
+					'label' => lng('serversettings.mysqlprefix'),
 					'settinggroup' => 'customer',
 					'varname' => 'mysqlprefix',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkUsername'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'customer_ftpprefix' => array(
+				'customer_ftpprefix' => [
-					'label' => $lng['serversettings']['ftpprefix'],
+					'label' => lng('serversettings.ftpprefix'),
 					'settinggroup' => 'customer',
 					'varname' => 'ftpprefix',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'customer_ftpatdomain' => array(
+				'customer_ftpatdomain' => [
-					'label' => $lng['serversettings']['ftpdomain'],
+					'label' => lng('serversettings.ftpdomain'),
 					'settinggroup' => 'customer',
 					'varname' => 'ftpatdomain',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'panel_allow_preset' => array(
+				'panel_allow_preset' => [
-					'label' => $lng['serversettings']['allow_password_reset'],
+					'label' => lng('serversettings.allow_password_reset'),
 					'settinggroup' => 'panel',
 					'varname' => 'allow_preset',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => array(
+					'dependency' => [
 						'fieldname' => 'panel_allow_preset_admin',
-						'fielddata' => array(
+						'fielddata' => [
 							'settinggroup' => 'panel',
 							'varname' => 'allow_preset_admin'
-						),
+						],
 						'onlyif' => 0
-					)
+					]
-				),
+				],
-				'panel_allow_preset_admin' => array(
+				'panel_allow_preset_admin' => [
-					'label' => $lng['serversettings']['allow_password_reset_admin'],
+					'label' => lng('serversettings.allow_password_reset_admin'),
 					'settinggroup' => 'panel',
 					'varname' => 'allow_preset_admin',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => array(
+					'dependency' => [
 						'fieldname' => 'panel_allow_preset',
-						'fielddata' => array(
+						'fielddata' => [
 							'settinggroup' => 'panel',
 							'varname' => 'allow_preset'
-						),
+						],
 						'onlyif' => 1
-					)
+					]
-				),
+				],
-				'system_backupenabled' => array(
+				'system_backupenabled' => [
-					'label' => $lng['serversettings']['backupenabled'],
+					'label' => lng('serversettings.backupenabled'),
 					'settinggroup' => 'system',
 					'varname' => 'backupenabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'cronmodule' => 'froxlor/backup',
 					'save_method' => 'storeSettingField'
-				)
+				],
-			)
+				'system_createstdsubdom_default' => [
-		)
+					'label' => lng('serversettings.createstdsubdom_default'),
-	)
+					'settinggroup' => 'system',
-);
+					'varname' => 'createstdsubdom_default',
-
+					'type' => 'select',
+					'default' => '1',
+					'select_var' => [
+						'0' => lng('panel.no'),
+						'1' => lng('panel.yes')
+					],
+					'save_method' => 'storeSettingField'
+				],
+			]
+		]
+	]
+];

actions/admin/settings/120.system.php

@@ -2,259 +2,321 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+return [
-		'system' => array(
+	'groups' => [
-			'title' => $lng['admin']['systemsettings'],
+		'system' => [
-			'fields' => array(
+			'title' => lng('admin.systemsettings'),
-				'system_documentroot_prefix' => array(
+			'icon' => 'fa-solid fa-gears',
-					'label' => $lng['serversettings']['documentroot_prefix'],
+			'fields' => [
+				'system_documentroot_prefix' => [
+					'label' => lng('serversettings.documentroot_prefix'),
 					'settinggroup' => 'system',
 					'varname' => 'documentroot_prefix',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkPathConflicts'
-					)
+					],
-				),
+					'requires_reconf' => ['http']
-				'system_documentroot_use_default_value' => array(
+				],
-					'label' => $lng['serversettings']['documentroot_use_default_value'],
+				'system_documentroot_use_default_value' => [
+					'label' => lng('serversettings.documentroot_use_default_value'),
 					'settinggroup' => 'system',
 					'varname' => 'documentroot_use_default_value',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_ipaddress' => array(
+				'system_ipaddress' => [
-					'label' => $lng['serversettings']['ipaddress'],
+					'label' => lng('serversettings.ipaddress'),
 					'settinggroup' => 'system',
 					'varname' => 'ipaddress',
-					'type' => 'option',
+					'type' => 'select',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
 						'\\Froxlor\\Domain\\IpAddr',
 						'getIpAddresses'
-					),
+					],
 					'default' => '',
 					'save_method' => 'storeSettingIpAddress'
-				),
+				],
-				'system_defaultip' => array(
+				'system_defaultip' => [
-					'label' => $lng['serversettings']['defaultip'],
+					'label' => lng('serversettings.defaultip'),
 					'settinggroup' => 'system',
 					'varname' => 'defaultip',
-					'type' => 'option',
+					'type' => 'select',
-					'option_mode' => 'multiple',
+					'select_mode' => 'multiple',
-					'option_options_method' => array(
+					'option_options_method' => [
 						'\\Froxlor\\Domain\\IpAddr',
 						'getIpPortCombinations'
-					),
+					],
 					'default' => '',
 					'save_method' => 'storeSettingDefaultIp'
-				),
+				],
-				'system_defaultsslip' => array(
+				'system_defaultsslip' => [
-					'label' => $lng['serversettings']['defaultsslip'],
+					'label' => lng('serversettings.defaultsslip'),
 					'settinggroup' => 'system',
 					'varname' => 'defaultsslip',
-					'type' => 'option',
+					'type' => 'select',
-					'option_mode' => 'multiple',
+					'select_mode' => 'multiple',
-					'option_options_method' => array(
+					'option_options_method' => [
 						'\\Froxlor\\Domain\\IpAddr',
 						'getSslIpPortCombinations'
-					),
+					],
 					'default' => '',
 					'save_method' => 'storeSettingDefaultSslIp'
-				),
+				],
-				'system_hostname' => array(
+				'system_hostname' => [
-					'label' => $lng['serversettings']['hostname'],
+					'label' => lng('serversettings.hostname'),
 					'settinggroup' => 'system',
 					'varname' => 'hostname',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkHostname'
-					)
+					]
-				),
+				],
-				'api_enabled' => array(
+				'api_enabled' => [
-					'label' => $lng['serversettings']['enable_api'],
+					'label' => lng('serversettings.enable_api'),
 					'settinggroup' => 'api',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_validatedomain' => array(
+				'update_channel' => [
-					'label' => $lng['serversettings']['validate_domain'],
+					'label' => lng('serversettings.update_channel'),
+					'settinggroup' => 'system',
+					'varname' => 'update_channel',
+					'type' => 'select',
+					'default' => 'stable',
+					'select_var' => [
+						'stable' => lng('serversettings.uc_stable'),
+						'testing' => lng('serversettings.uc_testing')
+					],
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_validatedomain' => [
+					'label' => lng('serversettings.validate_domain'),
 					'settinggroup' => 'system',
 					'varname' => 'validate_domain',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_stdsubdomain' => array(
+				'system_stdsubdomain' => [
-					'label' => $lng['serversettings']['stdsubdomainhost'],
+					'label' => lng('serversettings.stdsubdomainhost'),
 					'settinggroup' => 'system',
 					'varname' => 'stdsubdomain',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingHostname'
-				),
+				],
-				'system_mysql_access_host' => array(
+				'system_mysql_access_host' => [
-					'label' => $lng['serversettings']['mysql_access_host'],
+					'label' => lng('serversettings.mysql_access_host'),
 					'settinggroup' => 'system',
 					'varname' => 'mysql_access_host',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '127.0.0.1,localhost',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkMysqlAccessHost'
-					),
+					],
 					'save_method' => 'storeSettingMysqlAccessHost'
-				),
+				],
-				'system_nssextrausers' => array(
+				'system_nssextrausers' => [
-					'label' => $lng['serversettings']['nssextrausers'],
+					'label' => lng('serversettings.nssextrausers'),
 					'settinggroup' => 'system',
 					'varname' => 'nssextrausers',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_index_file_extension' => array(
+				'system_index_file_extension' => [
-					'label' => $lng['serversettings']['index_file_extension'],
+					'label' => lng('serversettings.index_file_extension'),
 					'settinggroup' => 'system',
 					'varname' => 'index_file_extension',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^[a-zA-Z0-9]{1,6}$/',
 					'default' => 'html',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_store_index_file_subs' => array(
+				],
-					'label' => $lng['serversettings']['system_store_index_file_subs'],
+				'system_store_index_file_subs' => [
+					'label' => lng('serversettings.system_store_index_file_subs'),
 					'settinggroup' => 'system',
 					'varname' => 'store_index_file_subs',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_httpuser' => array(
+				'system_httpuser' => [
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
 					'type' => 'hidden',
 					'default' => 'www-data'
-				),
+				],
-				'system_httpgroup' => array(
+				'system_httpgroup' => [
 					'settinggroup' => 'system',
 					'varname' => 'httpgroup',
 					'type' => 'hidden',
 					'default' => 'www-data'
-				),
+				],
-				'system_report_enable' => array(
+				'system_report_enable' => [
-					'label' => $lng['serversettings']['report']['report'],
+					'label' => lng('serversettings.report.report'),
 					'settinggroup' => 'system',
 					'varname' => 'report_enable',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'cronmodule' => 'froxlor/reports',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_report_webmax' => array(
+				'system_report_webmax' => [
-					'label' => $lng['serversettings']['report']['webmax'],
+					'label' => lng('serversettings.report.webmax'),
 					'settinggroup' => 'system',
 					'varname' => 'report_webmax',
-					'type' => 'int',
+					'type' => 'number',
-					'int_min' => 0,
+					'min' => 0,
-					'int_max' => 150,
+					'max' => 150,
 					'default' => 90,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_report_trafficmax' => array(
+				'system_report_trafficmax' => [
-					'label' => $lng['serversettings']['report']['trafficmax'],
+					'label' => lng('serversettings.report.trafficmax'),
 					'settinggroup' => 'system',
 					'varname' => 'report_trafficmax',
-					'type' => 'int',
+					'type' => 'number',
-					'int_min' => 0,
+					'min' => 0,
-					'int_max' => 150,
+					'max' => 150,
 					'default' => 90,
 					'save_method' => 'storeSettingField'
-				),
+				],
-
+				'system_mail_use_smtp' => [
-				'system_mail_use_smtp' => array(
+					'label' => lng('serversettings.mail_use_smtp'),
-					'label' => $lng['serversettings']['mail_use_smtp'],
 					'settinggroup' => 'system',
 					'varname' => 'mail_use_smtp',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_smtp_host' => array(
+				'system_mail_smtp_host' => [
-					'label' => $lng['serversettings']['mail_smtp_host'],
+					'label' => lng('serversettings.mail_smtp_host'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_smtp_host',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'localhost',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_smtp_port' => array(
+				'system_mail_smtp_port' => [
-					'label' => $lng['serversettings']['mail_smtp_port'],
+					'label' => lng('serversettings.mail_smtp_port'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_smtp_port',
-					'type' => 'int',
+					'type' => 'number',
-					'int_min' => 1,
+					'min' => 1,
-					'int_max' => 65535,
+					'max' => 65535,
 					'default' => 25,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_smtp_usetls' => array(
+				'system_mail_smtp_usetls' => [
-					'label' => $lng['serversettings']['mail_smtp_usetls'],
+					'label' => lng('serversettings.mail_smtp_usetls'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_smtp_usetls',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_smtp_auth' => array(
+				'system_mail_smtp_auth' => [
-					'label' => $lng['serversettings']['mail_smtp_auth'],
+					'label' => lng('serversettings.mail_smtp_auth'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_smtp_auth',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_smtp_user' => array(
+				'system_mail_smtp_user' => [
-					'label' => $lng['serversettings']['mail_smtp_user'],
+					'label' => lng('serversettings.mail_smtp_user'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_smtp_user',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_smtp_passwd' => array(
+				'system_mail_smtp_passwd' => [
-					'label' => $lng['serversettings']['mail_smtp_passwd'],
+					'label' => lng('serversettings.mail_smtp_passwd'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_smtp_passwd',
-					'type' => 'hiddenString',
+					'type' => 'password',
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				)
+				],
-			)
+				'system_apply_specialsettings_default' => [
-		)
+					'label' => lng('serversettings.apply_specialsettings_default'),
-	)
+					'settinggroup' => 'system',
-);
+					'varname' => 'apply_specialsettings_default',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_apply_phpconfigs_default' => [
+					'label' => lng('serversettings.apply_phpconfigs_default'),
+					'settinggroup' => 'system',
+					'varname' => 'apply_phpconfigs_default',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_domaindefaultalias' => [
+					'label' => lng('admin.domaindefaultalias'),
+					'settinggroup' => 'system',
+					'varname' => 'domaindefaultalias',
+					'type' => 'select',
+					'default' => '0',
+					'select_var' => [
+						'0' => lng('domains.serveraliasoption_wildcard'),
+						'1' => lng('domains.serveraliasoption_www'),
+						'2' => lng('domains.serveraliasoption_none')
+					],
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'hide_incompatible_settings' => [
+					'label' => lng('serversettings.hide_incompatible_settings'),
+					'settinggroup' => 'system',
+					'varname' => 'hide_incompatible_settings',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+			]
+		]
+	]
+];

actions/admin/settings/122.froxlorvhost.php

@@ -2,246 +2,296 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2016 the Froxlor Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * For the full copyright and license information, please view the COPYING
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2016-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    \Froxlor\Settings
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'froxlorvhost' => array(
+
-			'title' => $lng['admin']['froxlorvhost'] . (call_user_func(array('\Froxlor\Settings\FroxlorVhostSettings', 'hasVhostContainerEnabled')) == false ? $lng['admin']['novhostcontainer'] : ''),
+return [
-			'fields' => array(
+	'groups' => [
+		'froxlorvhost' => [
+			'title' => lng('admin.froxlorvhost') . (call_user_func([
+				'\Froxlor\Settings\FroxlorVhostSettings',
+				'hasVhostContainerEnabled'
+			]) == false ? lng('admin.novhostcontainer') : ''),
+			'icon' => 'fa-solid fa-wrench',
+			'fields' => [
 				/**
 				 * Webserver-Vhost
 				 */
-				'system_froxlordirectlyviahostname' => array(
+				'system_froxlordirectlyviahostname' => [
-					'label' => $lng['serversettings']['froxlordirectlyviahostname'],
+					'label' => lng('serversettings.froxlordirectlyviahostname'),
 					'settinggroup' => 'system',
 					'varname' => 'froxlordirectlyviahostname',
-					'type' => 'bool',
+					'type' => 'checkbox',
-					'default' => false,
+					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_froxloraliases' => array(
+				'system_froxloraliases' => [
-					'label' => $lng['serversettings']['froxloraliases'],
+					'label' => lng('serversettings.froxloraliases'),
 					'settinggroup' => 'system',
 					'varname' => 'froxloraliases',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^(([a-z0-9\-\._]+, ?)*[a-z0-9\-\._]+)?$/i',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
+				],
 				/**
 				 * SSL / Let's Encrypt
 				 */
-				'system_le_froxlor_enabled' => array(
+				'system_le_froxlor_enabled' => [
-					'label' => $lng['serversettings']['le_froxlor_enabled'],
+					'label' => lng('serversettings.le_froxlor_enabled'),
 					'settinggroup' => 'system',
 					'varname' => 'le_froxlor_enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingClearCertificates',
-					'visible' => \Froxlor\Settings::Get('system.leenabled') && call_user_func(array(
+					'visible' => Settings::Get('system.leenabled') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					), true)
+					], true),
-				),
+					'requires_reconf' => ['http']
-				'system_le_froxlor_redirect' => array(
+				],
-					'label' => $lng['serversettings']['le_froxlor_redirect'],
+				'system_le_froxlor_redirect' => [
+					'label' => lng('serversettings.le_froxlor_redirect'),
 					'settinggroup' => 'system',
 					'varname' => 'le_froxlor_redirect',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					), true)
+					], true)
-				),
+				],
-				'system_hsts_maxage' => array(
+				'system_hsts_maxage' => [
-					'label' => $lng['admin']['domain_hsts_maxage'],
+					'label' => lng('admin.domain_hsts_maxage'),
 					'settinggroup' => 'system',
 					'varname' => 'hsts_maxage',
-					'type' => 'int',
+					'type' => 'number',
-					'int_min' => 0,
+					'min' => 0,
-					'int_max' => 94608000, // 3-years
+					'max' => 94608000, // 3-years
-					'default' => 0,
+					'default' => 10368000,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					), true)
+					], true),
-				),
+					'advanced_mode' => true
-				'system_hsts_incsub' => array(
+				],
-					'label' => $lng['admin']['domain_hsts_incsub'],
+				'system_hsts_incsub' => [
+					'label' => lng('admin.domain_hsts_incsub'),
 					'settinggroup' => 'system',
 					'varname' => 'hsts_incsub',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					), true)
+					], true),
-				),
+					'advanced_mode' => true
-				'system_hsts_preload' => array(
+				],
-					'label' => $lng['admin']['domain_hsts_preload'],
+				'system_hsts_preload' => [
+					'label' => lng('admin.domain_hsts_preload'),
 					'settinggroup' => 'system',
 					'varname' => 'hsts_preload',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					), true)
+					], true),
-				),
+					'advanced_mode' => true
+				],
+				'system_honorcipherorder' => [
+					'label' => lng('admin.domain_honorcipherorder'),
+					'settinggroup' => 'system',
+					'varname' => 'honorcipherorder',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					], true),
+					'advanced_mode' => true
+				],
+				'system_sessiontickets' => [
+					'label' => lng('admin.domain_sessiontickets'),
+					'settinggroup' => 'system',
+					'varname' => 'sessiontickets',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					], true),
+					'advanced_mode' => true
+				],
 				/**
 				 * FCGID
 				 */
-				'system_mod_fcgid_enabled_ownvhost' => array(
+				'system_mod_fcgid_enabled_ownvhost' => [
-					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
+					'label' => lng('serversettings.mod_fcgid_ownvhost'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_ownvhost',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					),
+					],
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					]),
-				),
+					'requires_reconf' => ['system:fcgid']
-				'system_mod_fcgid_httpuser' => array(
+				],
-					'label' => $lng['admin']['mod_fcgid_user'],
+				'system_mod_fcgid_httpuser' => [
+					'label' => lng('admin.mod_fcgid_user'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_httpuser',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingWebserverFcgidFpmUser',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					),
+					],
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					]),
-				),
+					'requires_reconf' => ['system:fcgid']
-				'system_mod_fcgid_httpgroup' => array(
+				],
-					'label' => $lng['admin']['mod_fcgid_group'],
+				'system_mod_fcgid_httpgroup' => [
+					'label' => lng('admin.mod_fcgid_group'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_httpgroup',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					),
+					],
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					]),
-				),
+					'requires_reconf' => ['system:fcgid']
-				'system_mod_fcgid_defaultini_ownvhost' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+				'system_mod_fcgid_defaultini_ownvhost' => [
+					'label' => lng('serversettings.mod_fcgid.defaultini_ownvhost'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_defaultini_ownvhost',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '2',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
 						'\\Froxlor\\Http\\PhpConfig',
 						'getPhpConfigs'
-					),
+					],
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					),
+					],
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					])
-				),
+				],
 				/**
 				 * php-fpm
 				 */
-				'system_phpfpm_enabled_ownvhost' => array(
+				'system_phpfpm_enabled_ownvhost' => [
-					'label' => $lng['phpfpm']['ownvhost'],
+					'label' => lng('phpfpm.ownvhost'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'enabled_ownvhost',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					]),
-				),
+					'requires_reconf' => ['system:php-fpm']
-				'system_phpfpm_httpuser' => array(
+				],
-					'label' => $lng['phpfpm']['vhost_httpuser'],
+				'system_phpfpm_httpuser' => [
+					'label' => lng('phpfpm.vhost_httpuser'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'vhost_httpuser',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingWebserverFcgidFpmUser',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					]),
-				),
+					'requires_reconf' => ['system:php-fpm']
-				'system_phpfpm_httpgroup' => array(
+				],
-					'label' => $lng['phpfpm']['vhost_httpgroup'],
+				'system_phpfpm_httpgroup' => [
+					'label' => lng('phpfpm.vhost_httpgroup'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'vhost_httpgroup',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					]),
-				),
+					'requires_reconf' => ['system:php-fpm']
-				'system_phpfpm_defaultini_ownvhost' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+				'system_phpfpm_defaultini_ownvhost' => [
+					'label' => lng('serversettings.mod_fcgid.defaultini_ownvhost'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'vhost_defaultini',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '2',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
 						'\\Froxlor\\Http\\PhpConfig',
 						'getPhpConfigs'
-					),
+					],
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
 						'\Froxlor\Settings\FroxlorVhostSettings',
 						'hasVhostContainerEnabled'
-					))
+					])
-				),
+				],
 				/**
 				 * DNS
 				 */
-				'system_dns_createhostnameentry' => array(
+				'system_dns_createhostnameentry' => [
-					'label' => $lng['serversettings']['dns_createhostnameentry'],
+					'label' => lng('serversettings.dns_createhostnameentry'),
 					'settinggroup' => 'system',
 					'varname' => 'dns_createhostnameentry',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.bind_enable')
+					'visible' => Settings::Get('system.bind_enable')
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];

actions/admin/settings/125.cronjob.php

@@ -2,65 +2,70 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2014 the Froxlor Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * For the full copyright and license information, please view the COPYING
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Settings
+ * 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(
+
-	'groups' => array(
+return [
-		'crond' => array(
+	'groups' => [
-			'title' => $lng['admin']['cronsettings'],
+		'crond' => [
-			'fields' => array(
+			'title' => lng('admin.cronsettings'),
-				'system_cronconfig' => array(
+			'icon' => 'fa-solid fa-clock-rotate-left',
-					'label' => $lng['serversettings']['system_cronconfig'],
+			'advanced_mode' => true,
+			'fields' => [
+				'system_cronconfig' => [
+					'label' => lng('serversettings.system_cronconfig'),
 					'settinggroup' => 'system',
 					'varname' => 'cronconfig',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'default' => '/etc/cron.d/froxlor',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_croncmdline' => array(
+				'system_croncmdline' => [
-					'label' => $lng['serversettings']['system_croncmdline'],
+					'label' => lng('serversettings.system_croncmdline'),
 					'settinggroup' => 'system',
 					'varname' => 'croncmdline',
-					'type' => 'string',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\/\._\- ]+$/i',
 					'default' => '/usr/bin/nice -n 5 /usr/bin/php -q',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_crondreload' => array(
+				'system_crondreload' => [
-					'label' => $lng['serversettings']['system_crondreload'],
+					'label' => lng('serversettings.system_crondreload'),
 					'settinggroup' => 'system',
 					'varname' => 'crondreload',
-					'type' => 'string',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\/\._\- ]+$/i',
 					'default' => '/etc/init.d/cron reload',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_cron_allowautoupdate' => array(
+				'system_cron_allowautoupdate' => [
-					'label' => $lng['serversettings']['system_cron_allowautoupdate'],
+					'label' => lng('serversettings.system_cron_allowautoupdate'),
 					'settinggroup' => 'system',
 					'varname' => 'cron_allowautoupdate',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				]
-				'system_debug_cron' => array(
+			]
-					'label' => $lng['serversettings']['cron']['debug'],
+		]
-					'settinggroup' => 'system',
+	]
-					'varname' => 'debug_cron',
+];
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				)
-			)
-		)
-	)
-);

actions/admin/settings/130.webserver.php

@@ -2,203 +2,218 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    \Froxlor\Settings
  *
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'webserver' => array(
+
-			'title' => $lng['admin']['webserversettings'],
+return [
-			'fields' => array(
+	'groups' => [
-				'system_webserver' => array(
+		'webserver' => [
-					'label' => $lng['admin']['webserver'],
+			'title' => lng('admin.webserversettings'),
+			'icon' => 'fa-solid fa-server',
+			'fields' => [
+				'system_webserver' => [
+					'label' => lng('admin.webserver'),
 					'settinggroup' => 'system',
 					'varname' => 'webserver',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'apache2',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'apache2' => 'Apache 2',
 						'lighttpd' => 'ligHTTPd',
 						'nginx' => 'Nginx'
-					),
+					],
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkPhpInterfaceSetting'
-					),
+					],
-					'overview_option' => true
+					'requires_reconf' => ['http']
-				),
+				],
-				'system_apache_24' => array(
+				'system_apache_24' => [
-					'label' => $lng['serversettings']['apache_24'],
+					'label' => lng('serversettings.apache_24'),
 					'settinggroup' => 'system',
 					'varname' => 'apache24',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					]
-				),
+				],
-				'system_apache_itksupport' => array(
+				'system_apache_itksupport' => [
-					'label' => $lng['serversettings']['apache_itksupport'],
+					'label' => lng('serversettings.apache_itksupport'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheitksupport',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 0 && \Froxlor\Settings::Get('phpfpm.enabled') == 0),
+					'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'system_http2_support' => array(
+				],
-					'label' => $lng['serversettings']['http2_support'],
+				'system_http2_support' => [
+					'label' => lng('serversettings.http2_support'),
 					'settinggroup' => 'system',
 					'varname' => 'http2_support',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2',
 						'nginx'
-					),
+					],
-					'visible' => \Froxlor\Settings::Get('system.use_ssl')
+					'visible' => Settings::Get('system.use_ssl')
-				),
+				],
-				'system_dhparams_file' => array(
+				'system_dhparams_file' => [
-					'label' => $lng['serversettings']['dhparams_file'],
+					'label' => lng('serversettings.dhparams_file'),
 					'settinggroup' => 'system',
 					'varname' => 'dhparams_file',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl')
+					'visible' => Settings::Get('system.use_ssl'),
-				),
+					'advanced_mode' => true
-				'system_httpuser' => array(
+				],
-					'label' => $lng['admin']['webserver_user'],
+				'system_httpuser' => [
+					'label' => lng('admin.webserver_user'),
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'www-data',
 					'save_method' => 'storeSettingWebserverFcgidFpmUser'
-				),
+				],
-				'system_httpgroup' => array(
+				'system_httpgroup' => [
-					'label' => $lng['admin']['webserver_group'],
+					'label' => lng('admin.webserver_group'),
 					'settinggroup' => 'system',
 					'varname' => 'httpgroup',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'www-data',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_apacheconf_vhost' => array(
+				'system_apacheconf_vhost' => [
-					'label' => $lng['serversettings']['apacheconf_vhost'],
+					'label' => lng('serversettings.apacheconf_vhost'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_vhost',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'filedir',
 					'default' => '/etc/apache2/sites-enabled/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_apacheconf_diroptions' => array(
+				],
-					'label' => $lng['serversettings']['apacheconf_diroptions'],
+				'system_apacheconf_diroptions' => [
+					'label' => lng('serversettings.apacheconf_diroptions'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_diroptions',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'filedir',
 					'default' => '/etc/apache2/sites-enabled/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_apacheconf_htpasswddir' => array(
+				],
-					'label' => $lng['serversettings']['apacheconf_htpasswddir'],
+				'system_apacheconf_htpasswddir' => [
+					'label' => lng('serversettings.apacheconf_htpasswddir'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_htpasswddir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'confdir',
 					'default' => '/etc/apache2/htpasswd/',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_logfiles_directory' => array(
+				'system_logfiles_directory' => [
-					'label' => $lng['serversettings']['logfiles_directory'],
+					'label' => lng('serversettings.logfiles_directory'),
 					'settinggroup' => 'system',
 					'varname' => 'logfiles_directory',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/customers/logs/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_logfiles_script' => array(
+				],
-					'label' => $lng['serversettings']['logfiles_script'],
+				'system_logfiles_script' => [
+					'label' => lng('serversettings.logfiles_script'),
 					'settinggroup' => 'system',
 					'varname' => 'logfiles_script',
-					'type' => 'string',
+					'type' => 'text',
-					'string_type' => '',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'system_logfiles_piped' => array(
+				],
-					'label' => $lng['serversettings']['logfiles_piped'],
+				'system_logfiles_piped' => [
+					'label' => lng('serversettings.logfiles_piped'),
 					'settinggroup' => 'system',
 					'varname' => 'logfiles_piped',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'system_logfiles_format' => array(
+				],
-					'label' => $lng['serversettings']['logfiles_format'],
+				'system_logfiles_format' => [
+					'label' => lng('serversettings.logfiles_format'),
 					'settinggroup' => 'system',
 					'varname' => 'logfiles_format',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'string_emptyallowed' => true,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2',
 						'nginx'
-					)
+					],
-				),
+					'visible' => Settings::Get('system.traffictool') != 'webalizer',
-				'system_logfiles_type' => array(
+					'advanced_mode' => true
-					'label' => $lng['serversettings']['logfiles_type'],
+				],
+				'system_logfiles_type' => [
+					'label' => lng('serversettings.logfiles_type'),
 					'settinggroup' => 'system',
 					'varname' => 'logfiles_type',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '1',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'1' => 'combined',
 						'2' => 'vhost_combined'
-					),
+					],
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					]
-				),
+				],
-				'system_errorlog_level' => array(
+				'system_errorlog_level' => [
-					'label' => $lng['serversettings']['errorlog_level'],
+					'label' => lng('serversettings.errorlog_level'),
 					'settinggroup' => 'system',
 					'varname' => 'errorlog_level',
-					'type' => 'option',
+					'type' => 'select',
-					'default' => (\Froxlor\Settings::Get('system.webserver') == 'nginx' ? 'error' : 'warn'),
+					'default' => (Settings::Get('system.webserver') == 'nginx' ? 'error' : 'warn'),
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'emerg' => 'emerg',
 						'alert' => 'alert',
 						'crit' => 'crit',
@@ -207,174 +222,203 @@ return array(
 						'notice' => 'notice',
 						'info' => 'info',
 						'debug' => 'debug'
-					),
+					],
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2',
 						'nginx'
-					)
+					]
-				),
+				],
-				'system_customersslpath' => array(
+				'system_customersslpath' => [
-					'label' => $lng['serversettings']['customerssl_directory'],
+					'label' => lng('serversettings.customerssl_directory'),
 					'settinggroup' => 'system',
 					'varname' => 'customer_ssl_path',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'confdir',
 					'default' => '/etc/ssl/froxlor-custom/',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_phpappendopenbasedir' => array(
+				'system_phpappendopenbasedir' => [
-					'label' => $lng['serversettings']['phpappendopenbasedir'],
+					'label' => lng('serversettings.phpappendopenbasedir'),
 					'settinggroup' => 'system',
 					'varname' => 'phpappendopenbasedir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_deactivateddocroot' => array(
+				],
-					'label' => $lng['serversettings']['deactivateddocroot'],
+				'system_deactivateddocroot' => [
+					'label' => lng('serversettings.deactivateddocroot'),
 					'settinggroup' => 'system',
 					'varname' => 'deactivateddocroot',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_default_vhostconf' => array(
+				],
-					'label' => $lng['serversettings']['default_vhostconf'],
+				'system_default_vhostconf' => [
+					'label' => lng('serversettings.default_vhostconf'),
 					'settinggroup' => 'system',
 					'varname' => 'default_vhostconf',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_apache_globaldiropt' => array(
+				],
-					'label' => $lng['serversettings']['apache_globaldiropt'],
+				'system_default_sslvhostconf' => [
+					'label' => lng('serversettings.default_sslvhostconf'),
+					'settinggroup' => 'system',
+					'varname' => 'default_sslvhostconf',
+					'type' => 'textarea',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.use_ssl') == 1,
+					'advanced_mode' => true
+				],
+				'system_include_default_vhostconf' => [
+					'label' => lng('serversettings.includedefault_sslvhostconf'),
+					'settinggroup' => 'system',
+					'varname' => 'include_default_vhostconf',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_apache_globaldiropt' => [
+					'label' => lng('serversettings.apache_globaldiropt'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheglobaldiropt',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 0 && \Froxlor\Settings::Get('phpfpm.enabled') == 0),
+					'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'system_apachereload_command' => array(
+				],
-					'label' => $lng['serversettings']['apachereload_command'],
+				'system_apachereload_command' => [
+					'label' => lng('serversettings.apachereload_command'),
 					'settinggroup' => 'system',
 					'varname' => 'apachereload_command',
-					'type' => 'string',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\/\._\- ]+$/i',
 					'default' => '/etc/init.d/apache2 reload',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_phpreload_command' => array(
+				'system_phpreload_command' => [
-					'label' => $lng['serversettings']['phpreload_command'],
+					'label' => lng('serversettings.phpreload_command'),
 					'settinggroup' => 'system',
 					'varname' => 'phpreload_command',
-					'type' => 'string',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\/\._\- ]+$/i',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'nginx'
-					)
+					]
-				),
+				],
-				'system_nginx_php_backend' => array(
+				'system_nginx_php_backend' => [
-					'label' => $lng['serversettings']['nginx_php_backend'],
+					'label' => lng('serversettings.nginx_php_backend'),
 					'settinggroup' => 'system',
 					'varname' => 'nginx_php_backend',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '127.0.0.1:8888',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'nginx'
-					)
+					]
-				),
+				],
-				'nginx_fastcgiparams' => array(
+				'nginx_fastcgiparams' => [
-					'label' => $lng['serversettings']['nginx_fastcgiparams'],
+					'label' => lng('serversettings.nginx_fastcgiparams'),
 					'settinggroup' => 'nginx',
 					'varname' => 'fastcgiparams',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'default' => '/etc/nginx/fastcgi_params',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'nginx'
-					)
+					]
-				),
+				],
-				'defaultwebsrverrhandler_enabled' => array(
+				'defaultwebsrverrhandler_enabled' => [
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
+					'label' => lng('serversettings.defaultwebsrverrhandler_enabled'),
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'defaultwebsrverrhandler_err401' => array(
+				],
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
+				'defaultwebsrverrhandler_err401' => [
+					'label' => lng('serversettings.defaultwebsrverrhandler_err401'),
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err401',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2',
 						'nginx'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'defaultwebsrverrhandler_err403' => array(
+				],
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
+				'defaultwebsrverrhandler_err403' => [
+					'label' => lng('serversettings.defaultwebsrverrhandler_err403'),
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err403',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2',
 						'nginx'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'defaultwebsrverrhandler_err404' => array(
+				],
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
+				'defaultwebsrverrhandler_err404' => [
+					'label' => lng('serversettings.defaultwebsrverrhandler_err404'),
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err404',
-					'type' => 'string',
+					'type' => 'text',
-					'default' => '',
-					'save_method' => 'storeSettingField'
-				),
-				'defaultwebsrverrhandler_err500' => array(
-					'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
-					'settinggroup' => 'defaultwebsrverrhandler',
-					'varname' => 'err500',
-					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'advanced_mode' => true
+				],
+				'defaultwebsrverrhandler_err500' => [
+					'label' => lng('serversettings.defaultwebsrverrhandler_err500'),
+					'settinggroup' => 'defaultwebsrverrhandler',
+					'varname' => 'err500',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
 						'apache2',
 						'nginx'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'customredirect_enabled' => array(
+				],
-					'label' => $lng['serversettings']['customredirect_enabled'],
+				'customredirect_enabled' => [
+					'label' => lng('serversettings.customredirect_enabled'),
 					'settinggroup' => 'customredirect',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'customredirect_default' => array(
+				'customredirect_default' => [
-					'label' => $lng['serversettings']['customredirect_default'],
+					'label' => lng('serversettings.customredirect_default'),
 					'settinggroup' => 'customredirect',
 					'varname' => 'default',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '1',
-					'option_mode' => 'one',
+					'option_options_method' => ['\\Froxlor\\Domain\\Domain', 'getRedirectCodes'],
-					'option_options_method' => array('\\Froxlor\\Domain\\Domain', 'getRedirectCodes'),
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];

actions/admin/settings/131.ssl.php

@@ -2,218 +2,245 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    \Froxlor\Settings
  *
+ * 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(
+
-	'groups' => array(
+use Froxlor\Froxlor;
-		'ssl' => array(
+use Froxlor\Settings;
-			'title' => $lng['admin']['sslsettings'],
+
-			'fields' => array(
+return [
-				'system_ssl_enabled' => array(
+	'groups' => [
-					'label' => $lng['serversettings']['ssl']['use_ssl'],
+		'ssl' => [
+			'title' => lng('admin.sslsettings'),
+			'icon' => 'fa-solid fa-shield',
+			'fields' => [
+				'system_ssl_enabled' => [
+					'label' => lng('serversettings.ssl.use_ssl'),
 					'settinggroup' => 'system',
 					'varname' => 'use_ssl',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
+					'overview_option' => true,
-				),
+					'requires_reconf' => ['http']
-				'system_ssl_protocols' => array(
+				],
-					'label' => $lng['serversettings']['ssl']['ssl_protocols'],
+				'system_ssl_protocols' => [
+					'label' => lng('serversettings.ssl.ssl_protocols'),
 					'settinggroup' => 'system',
 					'varname' => 'ssl_protocols',
-					'type' => 'option',
+					'type' => 'select',
-					'default' => 'TLSv1,TLSv1.2',
+					'default' => 'TLSv1.2',
-					'option_mode' => 'multiple',
+					'select_mode' => 'multiple',
-					'option_options' => array(
+					'select_var' => [
 						'TLSv1' => 'TLSv1',
 						'TLSv1.1' => 'TLSv1.1',
 						'TLSv1.2' => 'TLSv1.2',
 						'TLSv1.3' => 'TLSv1.3'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_ssl_cipher_list' => array(
+				'system_ssl_cipher_list' => [
-					'label' => $lng['serversettings']['ssl']['ssl_cipher_list'],
+					'label' => lng('serversettings.ssl.ssl_cipher_list'),
 					'settinggroup' => 'system',
 					'varname' => 'ssl_cipher_list',
-					'type' => 'string',
+					'type' => 'text',
 					'string_emptyallowed' => false,
 					'default' => 'ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_tlsv13_cipher_list' => array(
+				],
-					'label' => $lng['serversettings']['ssl']['tlsv13_cipher_list'],
+				'system_tlsv13_cipher_list' => [
+					'label' => lng('serversettings.ssl.tlsv13_cipher_list'),
 					'settinggroup' => 'system',
 					'varname' => 'tlsv13_cipher_list',
-					'type' => 'string',
+					'type' => 'text',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'visible' => \Froxlor\Settings::Get('system.webserver') == "apache2" && \Froxlor\Settings::Get('system.apache24') == 1,
+					'visible' => Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
 					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_ssl_cert_file' => array(
+				],
-					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
+				'system_ssl_cert_file' => [
+					'label' => lng('serversettings.ssl.ssl_cert_file'),
 					'settinggroup' => 'system',
 					'varname' => 'ssl_cert_file',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
-					'default' => '/etc/apache2/apache2.pem',
+					'default' => '/etc/ssl/froxlor_selfsigned.pem',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_ssl_key_file' => array(
+				'system_ssl_key_file' => [
-					'label' => $lng['serversettings']['ssl']['ssl_key_file'],
+					'label' => lng('serversettings.ssl.ssl_key_file'),
 					'settinggroup' => 'system',
 					'varname' => 'ssl_key_file',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
-					'default' => '/etc/apache2/apache2.key',
+					'default' => '/etc/ssl/froxlor_selfsigned.key',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_ssl_cert_chainfile' => array(
+				'system_ssl_cert_chainfile' => [
-					'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
+					'label' => lng('admin.ipsandports.ssl_cert_chainfile'),
 					'settinggroup' => 'system',
 					'varname' => 'ssl_cert_chainfile',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_ssl_ca_file' => array(
+				'system_ssl_ca_file' => [
-					'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
+					'label' => lng('serversettings.ssl.ssl_ca_file'),
 					'settinggroup' => 'system',
 					'varname' => 'ssl_ca_file',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_apache24_ocsp_cache_path' => array(
+				'system_apache24_ocsp_cache_path' => [
-					'label' => $lng['serversettings']['ssl']['apache24_ocsp_cache_path'],
+					'label' => lng('serversettings.ssl.apache24_ocsp_cache_path'),
 					'settinggroup' => 'system',
 					'varname' => 'apache24_ocsp_cache_path',
-					'type' => 'string',
+					'type' => 'text',
-					'string_type' => 'string',
 					'string_emptyallowed' => false,
 					'default' => 'shmcb:/var/run/apache2/ocsp-stapling.cache(131072)',
-					'visible' => \Froxlor\Settings::Get('system.webserver') == "apache2" && \Froxlor\Settings::Get('system.apache24') == 1,
+					'visible' => Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_leenabled' => array(
+				],
-					'label' => $lng['serversettings']['leenabled'],
+				'system_sessionticketsenabled' => [
+					'label' => lng('admin.domain_sessionticketsenabled'),
+					'settinggroup' => 'system',
+					'varname' => 'sessionticketsenabled',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.use_ssl') && (Settings::Get('system.webserver') == "nginx" || (Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1)),
+					'advanced_mode' => true
+				],
+				'system_leenabled' => [
+					'label' => lng('serversettings.leenabled'),
 					'settinggroup' => 'system',
 					'varname' => 'leenabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'cronmodule' => 'froxlor/letsencrypt',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_letsencryptacmeconf' => array(
+				],
-					'label' => $lng['serversettings']['letsencryptacmeconf'],
+				'system_acmeshpath' => [
+					'label' => lng('serversettings.acmeshpath'),
+					'settinggroup' => 'system',
+					'varname' => 'acmeshpath',
+					'type' => 'text',
+					'string_type' => 'file',
+					'default' => '/root/.acme.sh/acme.sh',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_letsencryptacmeconf' => [
+					'label' => lng('serversettings.letsencryptacmeconf'),
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptacmeconf',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'default' => '/etc/apache2/conf-enabled/acme.conf',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_leapiversion' => array(
+				],
-					'label' => $lng['serversettings']['leapiversion'],
+				'system_letsencryptca' => [
-					'settinggroup' => 'system',
+					'label' => lng('serversettings.letsencryptca'),
-					'varname' => 'leapiversion',
-					'type' => 'option',
-					'default' => '2',
-					'option_mode' => 'one',
-					'option_options' => array(
-						'1' => 'ACME v1',
-						'2' => 'ACME v2'
-					),
-					'save_method' => 'storeSettingField'
-				),
-				'system_letsencryptca' => array(
-					'label' => $lng['serversettings']['letsencryptca'],
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptca',
-					'type' => 'option',
+					'type' => 'select',
-					'default' => 'testing',
+					'default' => 'letsencrypt',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
+						'letsencrypt_test' => 'Let\'s Encrypt (Test / Staging)',
-						'testing' => 'https://acme-staging' . (\Froxlor\Settings::Get('system.leapiversion') == '2' ? '-v02' : '') . '.api.letsencrypt.org (Test)',
+						'letsencrypt' => 'Let\'s Encrypt (Live)',
-						'production' => 'https://acme-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org (Live)'
+						'buypass_test' => 'Buypass (Test / Staging)',
-					),
+						'buypass' => 'Buypass (Live)',
+						'zerossl' => 'ZeroSSL (Live)'
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_letsencryptchallengepath' => array(
+				'system_letsencryptchallengepath' => [
-					'label' => $lng['serversettings']['letsencryptchallengepath'],
+					'label' => lng('serversettings.letsencryptchallengepath'),
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptchallengepath',
-					'type' => 'string',
+					'type' => 'text',
 					'string_emptyallowed' => false,
-					'default' => \Froxlor\Froxlor::getInstallDir(),
+					'default' => Froxlor::getInstallDir(),
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true,
-				'system_letsencryptkeysize' => array(
+					'requires_reconf' => ['http']
-					'label' => $lng['serversettings']['letsencryptkeysize'],
+				],
+				'system_letsencryptkeysize' => [
+					'label' => lng('serversettings.letsencryptkeysize'),
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptkeysize',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '2048',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'2048' => '2048',
 						'3072' => '3072',
 						'4096' => '4096',
 						'8192' => '8192'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_leecc' => array(
+				'system_leecc' => [
-					'label' => $lng['serversettings']['letsencryptecc'],
+					'label' => lng('serversettings.letsencryptecc'),
 					'settinggroup' => 'system',
 					'varname' => 'leecc',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '0',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'0' => '-',
 						'256' => 'ec-256',
 						'384' => 'ec-384'
-					),
+					],
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_letsencryptreuseold' => array(
+				],
-					'label' => $lng['serversettings']['letsencryptreuseold'],
+				'system_letsencryptreuseold' => [
+					'label' => lng('serversettings.letsencryptreuseold'),
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptreuseold',
-					'type' => 'bool',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_le_domain_dnscheck' => [
+					'label' => lng('serversettings.le_domain_dnscheck'),
+					'settinggroup' => 'system',
+					'varname' => 'le_domain_dnscheck',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				]
-				'system_disable_le_selfcheck' => array(
+			]
-					'label' => $lng['serversettings']['disable_le_selfcheck'],
+		]
-					'settinggroup' => 'system',
+	]
-					'varname' => 'disable_le_selfcheck',
+];
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				)
-			)
-		)
-	)
-);

actions/admin/settings/135.fcgid.php

@@ -4,125 +4,142 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Settings
+ * 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(
+
-	'groups' => array(
+return [
-		'fcgid' => array(
+	'groups' => [
-			'title' => $lng['admin']['fcgid_settings'],
+		'fcgid' => [
-			'websrv_avail' => array(
+			'title' => lng('admin.fcgid_settings'),
+			'icon' => 'fa-brands fa-php',
+			'websrv_avail' => [
 				'apache2',
 				'lighttpd'
-			),
+			],
-			'fields' => array(
+			'fields' => [
-				'system_mod_fcgid_enabled' => array(
+				'system_mod_fcgid_enabled' => [
-					'label' => $lng['serversettings']['mod_fcgid'],
+					'label' => lng('serversettings.mod_fcgid'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkFcgidPhpFpm'
-					),
+					],
-					'overview_option' => true
+					'overview_option' => true,
-				),
+					'requires_reconf' => ['http', 'system:fcgid']
-				'system_mod_fcgid_configdir' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
+				'system_mod_fcgid_configdir' => [
+					'label' => lng('serversettings.mod_fcgid.configdir'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_configdir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'confdir',
 					'default' => '/var/www/php-fcgi-scripts/',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkPathConflicts'
-					),
+					],
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['system:fcgid']
-				'system_mod_fcgid_tmpdir' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
+				'system_mod_fcgid_tmpdir' => [
+					'label' => lng('serversettings.mod_fcgid.tmpdir'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_tmpdir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/customers/tmp/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['http']
-				'system_mod_fcgid_peardir' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
+				'system_mod_fcgid_peardir' => [
+					'label' => lng('serversettings.mod_fcgid.peardir'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_peardir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'string_delimiter' => ':',
 					'string_emptyallowed' => true,
 					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mod_fcgid_wrapper' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['wrapper'],
+				'system_mod_fcgid_wrapper' => [
+					'label' => lng('serversettings.mod_fcgid.wrapper'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_wrapper',
-					'type' => 'option',
+					'type' => 'select',
-					'option_options' => array(
+					'select_var' => [
 						0 => 'ScriptAlias',
 						1 => 'FcgidWrapper'
-					),
+					],
 					'default' => 1,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'system_mod_fcgid_starter' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['starter'],
+				'system_mod_fcgid_starter' => [
+					'label' => lng('serversettings.mod_fcgid.starter'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_starter',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 0,
 					'default' => 0,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mod_fcgid_maxrequests' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['maxrequests'],
+				'system_mod_fcgid_maxrequests' => [
+					'label' => lng('serversettings.mod_fcgid.maxrequests'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_maxrequests',
-					'type' => 'int',
+					'type' => 'number',
 					'default' => 250,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mod_fcgid_defaultini' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
+				'system_mod_fcgid_defaultini' => [
+					'label' => lng('serversettings.mod_fcgid.defaultini'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_defaultini',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '1',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
 						'\\Froxlor\\Http\\PhpConfig',
-						'getPhpConfigs'),
+						'getPhpConfigs'
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mod_fcgid_idle_timeout' => array(
+				'system_mod_fcgid_idle_timeout' => [
-					'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'],
+					'label' => lng('serversettings.mod_fcgid.idle_timeout'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_idle_timeout',
-					'type' => 'int',
+					'type' => 'number',
 					'default' => 30,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				)
+					'advanced_mode' => true
-			)
+				]
-		)
+			]
-	)
+		]
-);
+	]
-
+];
-?>

actions/admin/settings/136.phpfpm.php

@@ -4,138 +4,158 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    \Froxlor\Settings
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'phpfpm' => array(
+
-			'title' => $lng['admin']['phpfpm_settings'],
+return [
-			'fields' => array(
+	'groups' => [
-				'system_phpfpm_enabled' => array(
+		'phpfpm' => [
-					'label' => $lng['serversettings']['phpfpm'],
+			'title' => lng('admin.phpfpm_settings'),
+			'icon' => 'fa-brands fa-php',
+			'fields' => [
+				'system_phpfpm_enabled' => [
+					'label' => lng('serversettings.phpfpm'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
+					'plausibility_check_method' => [
 						'\\Froxlor\\Validate\\Check',
 						'checkFcgidPhpFpm'
-					),
+					],
-					'overview_option' => true
+					'overview_option' => true,
-				),
+					'requires_reconf' => ['http', 'system:php-fpm']
-				'system_phpfpm_defaultini' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
+				'system_phpfpm_defaultini' => [
+					'label' => lng('serversettings.mod_fcgid.defaultini'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'defaultini',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '1',
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
 						'\\Froxlor\\Http\\PhpConfig',
 						'getPhpConfigs'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_phpfpm_aliasconfigdir' => array(
+				'system_phpfpm_aliasconfigdir' => [
-					'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'],
+					'label' => lng('serversettings.phpfpm_settings.aliasconfigdir'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'aliasconfigdir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'confdir',
 					'default' => '/var/www/php-fpm/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_tmpdir' => array(
+				],
-					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
+				'system_phpfpm_tmpdir' => [
+					'label' => lng('serversettings.mod_fcgid.tmpdir'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'tmpdir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/customers/tmp/',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_phpfpm_peardir' => array(
+				'system_phpfpm_peardir' => [
-					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
+					'label' => lng('serversettings.mod_fcgid.peardir'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'peardir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'string_delimiter' => ':',
 					'string_emptyallowed' => true,
 					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_envpath' => array(
+				],
-					'label' => $lng['serversettings']['phpfpm_settings']['envpath'],
+				'system_phpfpm_envpath' => [
+					'label' => lng('serversettings.phpfpm_settings.envpath'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'envpath',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'string_delimiter' => ':',
 					'string_emptyallowed' => true,
 					'default' => '/usr/local/bin:/usr/bin:/bin',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_fastcgi_ipcdir' => array(
+				],
-					'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'],
+				'system_phpfpm_fastcgi_ipcdir' => [
+					'label' => lng('serversettings.phpfpm_settings.ipcdir'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'fastcgi_ipcdir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/lib/apache2/fastcgi/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_use_mod_proxy' => array(
+				],
-					'label' => $lng['phpfpm']['use_mod_proxy'],
+				'system_phpfpm_use_mod_proxy' => [
+					'label' => lng('phpfpm.use_mod_proxy'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'use_mod_proxy',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
-					'visible' => \Froxlor\Settings::Get('system.apache24'),
+					'visible' => Settings::Get('system.apache24'),
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_phpfpm_ini_flags' => array(
+				'system_phpfpm_ini_flags' => [
-					'label' => $lng['phpfpm']['ini_flags'],
+					'label' => lng('phpfpm.ini_flags'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'ini_flags',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_ini_values' => array(
+				],
-					'label' => $lng['phpfpm']['ini_values'],
+				'system_phpfpm_ini_values' => [
+					'label' => lng('phpfpm.ini_values'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'ini_values',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_ini_admin_flags' => array(
+				],
-					'label' => $lng['phpfpm']['ini_admin_flags'],
+				'system_phpfpm_ini_admin_flags' => [
+					'label' => lng('phpfpm.ini_admin_flags'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'ini_admin_flags',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_phpfpm_ini_admin_values' => array(
+				],
-					'label' => $lng['phpfpm']['ini_admin_values'],
+				'system_phpfpm_ini_admin_values' => [
+					'label' => lng('phpfpm.ini_admin_values'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'ini_admin_values',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				)
+					'advanced_mode' => true
-			)
+				]
-		)
+			]
-	)
+		]
-);
+	]
+];

actions/admin/settings/137.perl.php

@@ -4,69 +4,77 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Settings
+ * 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(
+
-	'groups' => array(
+return [
-		'perl' => array(
+	'groups' => [
-			'title' => $lng['admin']['perl_settings'],
+		'perl' => [
-			'fields' => array(
+			'title' => lng('admin.perl_settings'),
-				'perl_path' => array(
+			'icon' => 'fa-solid fa-code',
-					'label' => $lng['serversettings']['perl_path'],
+			'fields' => [
+				'perl_path' => [
+					'label' => lng('serversettings.perl_path'),
 					'settinggroup' => 'system',
 					'varname' => 'perl_path',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '/usr/bin/perl',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'lighttpd'
-					)
+					]
-				),
+				],
-				'system_perl_suexecworkaround' => array(
+				'system_perl_suexecworkaround' => [
-					'label' => $lng['serversettings']['perl']['suexecworkaround'],
+					'label' => lng('serversettings.perl.suexecworkaround'),
 					'settinggroup' => 'perl',
 					'varname' => 'suexecworkaround',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					]
-				),
+				],
-				'system_perl_suexeccgipath' => array(
+				'system_perl_suexeccgipath' => [
-					'label' => $lng['serversettings']['perl']['suexeccgipath'],
+					'label' => lng('serversettings.perl.suexeccgipath'),
 					'settinggroup' => 'perl',
 					'varname' => 'suexecpath',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/www/cgi-bin/',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					]
-				),
+				],
-				'perl_server' => array(
+				'perl_server' => [
-					'label' => $lng['serversettings']['perl_server'],
+					'label' => lng('serversettings.perl_server'),
 					'settinggroup' => 'serversettings',
 					'varname' => 'perl_server',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'nginx'
-					)
+					]
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];
-
-?>

actions/admin/settings/140.statistics.php

@@ -2,86 +2,115 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'statistics' => array(
+
-			'title' => $lng['admin']['statisticsettings'],
+return [
-			'fields' => array(
+	'groups' => [
-				'system_webalizer_quiet' => array(
+		'statistics' => [
-					'label' => $lng['serversettings']['webalizer_quiet'],
+			'title' => lng('admin.statisticsettings'),
+			'icon' => 'fa-solid fa-chart-area',
+			'fields' => [
+				'system_traffictool' => [
+					'label' => lng('serversettings.traffictool.toolselect'),
+					'settinggroup' => 'system',
+					'varname' => 'traffictool',
+					'type' => 'select',
+					'default' => 'goaccess',
+					'select_var' => [
+						'webalizer' => lng('serversettings.traffictool.webalizer'),
+						'awstats' => lng('serversettings.traffictool.awstats'),
+						'goaccess' => lng('serversettings.traffictool.goaccess')
+					],
+					'save_method' => 'storeSettingUpdateTrafficTool',
+					'requires_reconf' => ['system']
+				],
+				'system_webalizer_quiet' => [
+					'label' => lng('serversettings.webalizer_quiet'),
 					'settinggroup' => 'system',
 					'varname' => 'webalizer_quiet',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 2,
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
+						0 => lng('admin.webalizer.normal'),
-						0 => $lng['admin']['webalizer']['normal'],
+						1 => lng('admin.webalizer.quiet'),
-						1 => $lng['admin']['webalizer']['quiet'],
+						2 => lng('admin.webalizer.veryquiet')
-						2 => $lng['admin']['webalizer']['veryquiet']
+					],
-					),
+					'save_method' => 'storeSettingField',
-					'save_method' => 'storeSettingField'
+					'visible' => Settings::Get('system.traffictool') == 'webalizer'
-				),
+				],
-				'system_awstats_enabled' => array(
+				'system_awstats_path' => [
-					'label' => $lng['serversettings']['awstats_enabled'],
+					'label' => lng('serversettings.awstats_path'),
-					'settinggroup' => 'system',
-					'varname' => 'awstats_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				),
-				'system_awstats_path' => array(
-					'label' => $lng['serversettings']['awstats_path'],
 					'settinggroup' => 'system',
 					'varname' => 'awstats_path',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'default' => '/usr/share/awstats/tools/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'visible' => Settings::Get('system.traffictool') == 'awstats'
-				'system_awstats_awstatspath' => array(
+				],
-					'label' => $lng['serversettings']['awstats_awstatspath'],
+				'system_awstats_awstatspath' => [
+					'label' => lng('serversettings.awstats_awstatspath'),
 					'settinggroup' => 'system',
 					'varname' => 'awstats_awstatspath',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
-					'default' => '/usr/bin/',
+					'default' => '/usr/lib/cgi-bin/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'visible' => Settings::Get('system.traffictool') == 'awstats'
-				'system_awstats_conf' => array(
+				],
-					'label' => $lng['serversettings']['awstats_conf'],
+				'system_awstats_conf' => [
+					'label' => lng('serversettings.awstats_conf'),
 					'settinggroup' => 'system',
 					'varname' => 'awstats_conf',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/etc/awstats/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'visible' => Settings::Get('system.traffictool') == 'awstats',
-				'system_awstats_icons' => array(
+					'requires_reconf' => ['system:awstats']
-					'label' => $lng['serversettings']['awstats_icons'],
+				],
+				'system_awstats_icons' => [
+					'label' => lng('serversettings.awstats_icons'),
 					'settinggroup' => 'system',
 					'varname' => 'awstats_icons',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/usr/share/awstats/icon/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				)
+					'visible' => Settings::Get('system.traffictool') == 'awstats'
-			)
+				],
-		)
+				'system_awstats_logformat' => [
-	)
+					'label' => lng('serversettings.awstats.logformat'),
-);
+					'settinggroup' => 'system',
-
+					'varname' => 'awstats_logformat',
-?>
+					'type' => 'text',
+					'default' => '1',
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.traffictool') == 'awstats',
+					'advanced_mode' => true
+				]
+			]
+		]
+	]
+];

actions/admin/settings/150.mail.php

@@ -2,153 +2,168 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+return [
-		'mail' => array(
+	'groups' => [
-			'title' => $lng['admin']['mailserversettings'],
+		'mail' => [
-			'fields' => array(
+			'title' => lng('admin.mailserversettings'),
-				'system_vmail_uid' => array(
+			'icon' => 'fa-solid fa-envelope',
-					'label' => $lng['serversettings']['vmail_uid'],
+			'fields' => [
+				'system_vmail_uid' => [
+					'label' => lng('serversettings.vmail_uid'),
 					'settinggroup' => 'system',
 					'varname' => 'vmail_uid',
-					'type' => 'int',
+					'type' => 'number',
 					'default' => 2000,
-					'int_min' => 1,
+					'min' => 2,
-					'int_max' => 65535,
+					'max' => 65535,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true,
-				'system_vmail_gid' => array(
+					'requires_reconf' => ['smtp']
-					'label' => $lng['serversettings']['vmail_gid'],
+				],
+				'system_vmail_gid' => [
+					'label' => lng('serversettings.vmail_gid'),
 					'settinggroup' => 'system',
 					'varname' => 'vmail_gid',
-					'type' => 'int',
+					'type' => 'number',
 					'default' => 2000,
-					'int_min' => 1,
+					'min' => 2,
-					'int_max' => 65535,
+					'max' => 65535,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true,
-				'system_vmail_homedir' => array(
+					'requires_reconf' => ['smtp']
-					'label' => $lng['serversettings']['vmail_homedir'],
+				],
+				'system_vmail_homedir' => [
+					'label' => lng('serversettings.vmail_homedir'),
 					'settinggroup' => 'system',
 					'varname' => 'vmail_homedir',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/var/customers/mail/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['smtp']
-				'system_vmail_maildirname' => array(
+				],
-					'label' => $lng['serversettings']['vmail_maildirname'],
+				'system_vmail_maildirname' => [
+					'label' => lng('serversettings.vmail_maildirname'),
 					'settinggroup' => 'system',
 					'varname' => 'vmail_maildirname',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => 'Maildir',
 					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'panel_sendalternativemail' => array(
+				],
-					'label' => $lng['serversettings']['sendalternativemail'],
+				'panel_sendalternativemail' => [
+					'label' => lng('serversettings.sendalternativemail'),
 					'settinggroup' => 'panel',
 					'varname' => 'sendalternativemail',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_quota_enabled' => array(
+				'system_mail_quota_enabled' => [
-					'label' => $lng['serversettings']['mail_quota_enabled'],
+					'label' => lng('serversettings.mail_quota_enabled'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_quota_enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mail_quota' => array(
+				'system_mail_quota' => [
-					'label' => $lng['serversettings']['mail_quota'],
+					'label' => lng('serversettings.mail_quota'),
 					'settinggroup' => 'system',
 					'varname' => 'mail_quota',
-					'type' => 'int',
+					'type' => 'number',
 					'default' => 100,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_catchall_enabled' => array(
+				'system_catchall_enabled' => [
-					'label' => $lng['serversettings']['catchall_enabled'],
+					'label' => lng('serversettings.catchall_enabled'),
 					'settinggroup' => 'catchall',
 					'varname' => 'catchall_enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingResetCatchall'
-				),
+				],
-				'system_mailtraffic_enabled' => array(
+				'system_mailtraffic_enabled' => [
-					'label' => $lng['serversettings']['mailtraffic_enabled'],
+					'label' => lng('serversettings.mailtraffic_enabled'),
 					'settinggroup' => 'system',
 					'varname' => 'mailtraffic_enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mdaserver' => array(
+				],
-					'label' => $lng['serversettings']['mdaserver'],
+				'system_mdaserver' => [
+					'label' => lng('serversettings.mdaserver'),
 					'settinggroup' => 'system',
 					'varname' => 'mdaserver',
-					'type' => 'option',
+					'type' => 'select',
-					'option_mode' => 'one',
 					'default' => 'dovecot',
-					'option_options' => array(
+					'select_var' => [
 						'courier' => 'Courier',
 						'dovecot' => 'Dovecot'
-					),
+					],
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mdalog' => array(
+				],
-					'label' => $lng['serversettings']['mdalog'],
+				'system_mdalog' => [
+					'label' => lng('serversettings.mdalog'),
 					'settinggroup' => 'system',
 					'varname' => 'mdalog',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'default' => '/var/log/mail.log',
 					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mtaserver' => array(
+				],
-					'label' => $lng['serversettings']['mtaserver'],
+				'system_mtaserver' => [
+					'label' => lng('serversettings.mtaserver'),
 					'settinggroup' => 'system',
 					'varname' => 'mtaserver',
-					'type' => 'option',
+					'type' => 'select',
-					'option_mode' => 'one',
 					'default' => 'postfix',
-					'option_options' => array(
+					'select_var' => [
 						'exim4' => 'Exim4',
 						'postfix' => 'Postfix'
-					),
+					],
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_mtalog' => array(
+				],
-					'label' => $lng['serversettings']['mtalog'],
+				'system_mtalog' => [
+					'label' => lng('serversettings.mtalog'),
 					'settinggroup' => 'system',
 					'varname' => 'mtalog',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'default' => '/var/log/mail.log',
 					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				)
+					'advanced_mode' => true
-			)
+				]
-		)
+			]
-	)
+		]
-);
+	]
-
+];
-?>

actions/admin/settings/155.ftpserver.php

@@ -2,41 +2,46 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+return [
-		'ftpserver' => array(
+	'groups' => [
-			'title' => $lng['admin']['ftpserversettings'],
+		'ftpserver' => [
-			'fields' => array(
+			'title' => lng('admin.ftpserversettings'),
-				'ftpserver' => array(
+			'icon' => 'fa-solid fa-arrow-right-arrow-left',
-					'label' => $lng['admin']['ftpserver'],
+			'fields' => [
+				'ftpserver' => [
+					'label' => lng('admin.ftpserver'),
 					'settinggroup' => 'system',
 					'varname' => 'ftpserver',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'proftpd',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'proftpd' => 'Proftpd',
 						'pureftpd' => 'Pureftpd'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];
-
-?>

actions/admin/settings/160.nameserver.php

@@ -2,138 +2,177 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'nameserver' => array(
+
-			'title' => $lng['admin']['nameserversettings'],
+return [
-			'fields' => array(
+	'groups' => [
-				'nameserver_enable' => array(
+		'nameserver' => [
-					'label' => $lng['serversettings']['bindenable'],
+			'title' => lng('admin.nameserversettings'),
+			'icon' => 'fa-solid fa-globe',
+			'fields' => [
+				'nameserver_enable' => [
+					'label' => lng('serversettings.bindenable'),
 					'settinggroup' => 'system',
 					'varname' => 'bind_enable',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField',
-					'overview_option' => true
+					'overview_option' => true,
-				),
+					'requires_reconf' => ['dns']
-				'system_dnsenabled' => array(
+				],
-					'label' => $lng['serversettings']['dnseditorenable'],
+				'system_dnsenabled' => [
+					'label' => lng('serversettings.dnseditorenable'),
 					'settinggroup' => 'system',
 					'varname' => 'dnsenabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_dns_server' => array(
+				'system_dns_server' => [
-					'label' => $lng['serversettings']['dns_server'],
+					'label' => lng('serversettings.dns_server'),
 					'settinggroup' => 'system',
 					'varname' => 'dns_server',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'Bind',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'Bind' => 'Bind9',
 						'PowerDNS' => 'PowerDNS'
-					),
+					],
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'requires_reconf' => ['dns']
-				'system_bindconf_directory' => array(
+				],
-					'label' => $lng['serversettings']['bindconf_directory'],
+				'system_bindconf_directory' => [
+					'label' => lng('serversettings.bindconf_directory'),
 					'settinggroup' => 'system',
 					'varname' => 'bindconf_directory',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/etc/bind/',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'visible' => Settings::Get('system.dns_server') == 'Bind',
-				'system_bindreload_command' => array(
+					'requires_reconf' => ['dns:bind']
-					'label' => $lng['serversettings']['bindreload_command'],
+				],
+				'system_bindreload_command' => [
+					'label' => lng('serversettings.bindreload_command'),
 					'settinggroup' => 'system',
 					'varname' => 'bindreload_command',
-					'type' => 'string',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\/\._\- ]+$/i',
 					'default' => '/etc/init.d/bind9 reload',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_nameservers' => array(
+				'system_nameservers' => [
-					'label' => $lng['serversettings']['nameservers'],
+					'label' => lng('serversettings.nameservers'),
 					'settinggroup' => 'system',
 					'varname' => 'nameservers',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^(([a-z0-9\-\._]+, ?)*[a-z0-9\-\._]+)?$/i',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingFieldInsertBindTask'
-				),
+				],
-				'system_mxservers' => array(
+				'system_mxservers' => [
-					'label' => $lng['serversettings']['mxservers'],
+					'label' => lng('serversettings.mxservers'),
 					'settinggroup' => 'system',
 					'varname' => 'mxservers',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^(([0-9]+ [a-z0-9\-\._]+, ?)*[0-9]+ [a-z0-9\-\._]+)?$/i',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_axfrservers' => array(
+				'system_axfrservers' => [
-					'label' => $lng['serversettings']['axfrservers'],
+					'label' => lng('serversettings.axfrservers'),
 					'settinggroup' => 'system',
 					'varname' => 'axfrservers',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'validate_ip_incl_private',
 					'string_delimiter' => ',',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_dns_createmailentry' => array(
+				'system_powerdns_mode' => [
-					'label' => $lng['serversettings']['mail_also_with_mxservers'],
+					'label' => lng('serversettings.powerdns_mode'),
+					'settinggroup' => 'system',
+					'varname' => 'powerdns_mode',
+					'type' => 'select',
+					'default' => 'Native',
+					'select_var' => [
+						'Native' => 'Native',
+						'Master' => 'Master'
+					],
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true,
+					'visible' => Settings::Get('system.dns_server') == 'PowerDNS',
+				],
+				'system_dns_createmailentry' => [
+					'label' => lng('serversettings.mail_also_with_mxservers'),
 					'settinggroup' => 'system',
 					'varname' => 'dns_createmailentry',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_dns_createcaaentry' => array(
+				'system_dns_createcaaentry' => [
-					'label' => $lng['serversettings']['caa_entry'],
+					'label' => lng('serversettings.caa_entry'),
 					'settinggroup' => 'system',
 					'varname' => 'dns_createcaaentry',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'caa_caa_entry' => array(
+				],
-					'label' => $lng['serversettings']['caa_entry_custom'],
+				'caa_caa_entry' => [
+					'label' => lng('serversettings.caa_entry_custom'),
 					'settinggroup' => 'caa',
 					'varname' => 'caa_entry',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_defaultttl' => array(
+				],
-					'label' => $lng['serversettings']['defaultttl'],
+				'system_defaultttl' => [
+					'label' => lng('serversettings.defaultttl'),
 					'settinggroup' => 'system',
 					'varname' => 'defaultttl',
-					'type' => 'int',
+					'type' => 'number',
 					'default' => 604800, /* 1 week */
-					'int_min' => 3600, /* 1 hour */
+					'min' => 3600, /* 1 hour */
-					'int_max' => 2147483647, /* integer max */
+					'max' => 2147483647, /* integer max */
 					'save_method' => 'storeSettingField'
-				)
+				],
-			)
+				'system_soaemail' => [
-		)
+					'label' => lng('serversettings.soaemail'),
-	)
+					'settinggroup' => 'system',
-);
+					'varname' => 'soaemail',
+					'type' => 'email',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				]
+			]
+		]
+	]
+];

actions/admin/settings/170.logger.php

@@ -2,88 +2,92 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+return [
-		'logging' => array(
+	'groups' => [
-			'title' => $lng['admin']['loggersettings'],
+		'logging' => [
-			'fields' => array(
+			'title' => lng('admin.loggersettings'),
-				'logger_enabled' => array(
+			'icon' => 'fa-solid fa-file-lines',
-					'label' => $lng['serversettings']['logger']['enable'],
+			'fields' => [
+				'logger_enabled' => [
+					'label' => lng('serversettings.logger.enable'),
 					'settinggroup' => 'logger',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-				),
+				],
-				'logger_severity' => array(
+				'logger_severity' => [
-					'label' => $lng['serversettings']['logger']['severity'],
+					'label' => lng('serversettings.logger.severity'),
 					'settinggroup' => 'logger',
 					'varname' => 'severity',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 1,
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
+						1 => lng('admin.logger.normal'),
-						1 => $lng['admin']['logger']['normal'],
+						2 => lng('admin.logger.paranoid')
-						2 => $lng['admin']['logger']['paranoid']
+					],
-					),
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'logger_logtypes' => array(
+				'logger_logtypes' => [
-					'label' => $lng['serversettings']['logger']['types'],
+					'label' => lng('serversettings.logger.types'),
 					'settinggroup' => 'logger',
 					'varname' => 'logtypes',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'syslog,mysql',
-					'option_mode' => 'multiple',
+					'select_mode' => 'multiple',
-					'option_options' => array(
+					'select_var' => [
 						'syslog' => 'syslog',
 						'file' => 'file',
 						'mysql' => 'mysql'
-					),
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'logger_logfile' => array(
+				'logger_logfile' => [
-					'label' => $lng['serversettings']['logger']['logfile'],
+					'label' => lng('serversettings.logger.logfile'),
 					'settinggroup' => 'logger',
 					'varname' => 'logfile',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'logger_log_cron' => array(
+				'logger_log_cron' => [
-					'label' => $lng['serversettings']['logger']['logcron'],
+					'label' => lng('serversettings.logger.logcron'),
 					'settinggroup' => 'logger',
 					'varname' => 'log_cron',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 0,
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
+						0 => lng('serversettings.logger.logcronoption.never'),
-						0 => $lng['serversettings']['logger']['logcronoption']['never'],
+						1 => lng('serversettings.logger.logcronoption.once'),
-						1 => $lng['serversettings']['logger']['logcronoption']['once'],
+						2 => lng('serversettings.logger.logcronoption.always')
-						2 => $lng['serversettings']['logger']['logcronoption']['always']
+					],
-					),
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];
-
-?>

actions/admin/settings/180.dkim.php

@@ -2,124 +2,144 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    \Froxlor\Settings
  *
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'dkim' => array(
+
-			'title' => $lng['admin']['dkimsettings'],
+return [
-			'fields' => array(
+	'groups' => [
-				'dkim_enabled' => array(
+		'dkim' => [
-					'label' => $lng['dkim']['use_dkim'],
+			'title' => lng('admin.dkimsettings'),
+			'icon' => 'fa-solid fa-fingerprint',
+			'fields' => [
+				'dkim_enabled' => [
+					'label' => lng('dkim.use_dkim'),
 					'settinggroup' => 'dkim',
 					'varname' => 'use_dkim',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingFieldInsertBindTask',
 					'overview_option' => true
-				),
+				],
-				'dkim_prefix' => array(
+				'dkim_prefix' => [
-					'label' => $lng['dkim']['dkim_prefix'],
+					'label' => lng('dkim.dkim_prefix'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_prefix',
-					'type' => 'string',
+					'type' => 'text',
 					'string_type' => 'dir',
 					'default' => '/etc/postfix/dkim/',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'dkim_domains' => array(
+				'dkim_privkeysuffix' => [
-					'label' => $lng['dkim']['dkim_domains'],
+					'label' => lng('dkim.privkeysuffix'),
+					'settinggroup' => 'dkim',
+					'varname' => 'privkeysuffix',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\._]+$/i',
+					'default' => '.priv',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'dkim_domains' => [
+					'label' => lng('dkim.dkim_domains'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_domains',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => 'domains',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'dkim_dkimkeys' => array(
+				'dkim_dkimkeys' => [
-					'label' => $lng['dkim']['dkim_dkimkeys'],
+					'label' => lng('dkim.dkim_dkimkeys'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_dkimkeys',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => 'dkim-keys.conf',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'dkim_algorithm' => array(
+				'dkim_algorithm' => [
-					'label' => $lng['dkim']['dkim_algorithm'],
+					'label' => lng('dkim.dkim_algorithm'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_algorithm',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => 'all',
-					'option_mode' => 'multiple',
+					'select_mode' => 'multiple',
-					'option_options' => array(
+					'select_var' => [
 						'all' => 'All',
 						'sha1' => 'SHA1',
 						'sha256' => 'SHA256'
-					),
+					],
-					'save_method' => 'storeSettingFieldInsertBindTask'
+					'save_method' => 'storeSettingFieldInsertBindTask',
-				),
+					'advanced_mode' => true
-				'dkim_servicetype' => array(
+				],
-					'label' => $lng['dkim']['dkim_servicetype'],
+				'dkim_servicetype' => [
+					'label' => lng('dkim.dkim_servicetype'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_servicetype',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '0',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'0' => 'All',
 						'1' => 'E-Mail'
-					),
+					],
-					'save_method' => 'storeSettingFieldInsertBindTask'
+					'save_method' => 'storeSettingFieldInsertBindTask',
-				),
+					'advanced_mode' => true
-				'dkim_keylength' => array(
+				],
-					'label' => array(
+				'dkim_keylength' => [
-						'title' => $lng['dkim']['dkim_keylength']['title'],
+					'label' => [
-						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], \Froxlor\Settings::Get('dkim.dkim_prefix'))
+						'title' => lng('dkim.dkim_keylength.title'),
-					),
+						'description' => lng('dkim.dkim_keylength.description', [Settings::Get('dkim.dkim_prefix')])
+					],
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_keylength',
-					'type' => 'option',
+					'type' => 'select',
 					'default' => '1024',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array(
 						'1024' => '1024 Bit',
 						'2048' => '2048 Bit'
-					),
+					],
 					'save_method' => 'storeSettingFieldInsertBindTask'
-				),
+				],
-				'dkim_notes' => array(
+				'dkim_notes' => [
-					'label' => $lng['dkim']['dkim_notes'],
+					'label' => lng('dkim.dkim_notes'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_notes',
-					'type' => 'string',
+					'type' => 'text',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => '',
-					'save_method' => 'storeSettingFieldInsertBindTask'
+					'save_method' => 'storeSettingFieldInsertBindTask',
-				),
+					'advanced_mode' => true
-				'dkimrestart_command' => array(
+				],
-					'label' => $lng['dkim']['dkimrestart_command'],
+				'dkimrestart_command' => [
+					'label' => lng('dkim.dkimrestart_command'),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkimrestart_command',
-					'type' => 'string',
+					'type' => 'text',
+					'string_regexp' => '/^[a-z0-9\/\._\- ]+$/i',
 					'default' => '/etc/init.d/dkim-filter restart',
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];
-
-?>

actions/admin/settings/185.spf.php

@@ -4,41 +4,49 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Settings
+ * 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(
+
-	'groups' => array(
+return [
-		'spf' => array(
+	'groups' => [
-			'title' => $lng['admin']['spfsettings'],
+		'spf' => [
-			'fields' => array(
+			'title' => lng('admin.spfsettings'),
-				'spf_enabled' => array(
+			'icon' => 'fa-solid fa-clipboard-check',
-					'label' => $lng['spf']['use_spf'],
+			'fields' => [
+				'use_spf' => [
+					'label' => lng('spf.use_spf'),
 					'settinggroup' => 'spf',
 					'varname' => 'use_spf',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-				),
+				],
-				'spf_entry' => array(
+				'spf_entry' => [
-					'label' => $lng['spf']['spf_entry'],
+					'label' => lng('spf.spf_entry'),
 					'settinggroup' => 'spf',
 					'varname' => 'spf_entry',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '"v=spf1 a mx -all"',
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];
-
-?>

actions/admin/settings/210.security.php

@@ -2,88 +2,115 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Settings
  *
+ * 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(
+
-	'groups' => array(
+use Froxlor\Settings;
-		'security' => array(
+
-			'title' => $lng['admin']['security_settings'],
+return [
-			'fields' => array(
+	'groups' => [
-				'panel_unix_names' => array(
+		'security' => [
-					'label' => $lng['serversettings']['unix_names'],
+			'title' => lng('admin.security_settings'),
+			'icon' => 'fa-solid fa-user-lock',
+			'fields' => [
+				'panel_unix_names' => [
+					'label' => lng('serversettings.unix_names'),
 					'settinggroup' => 'panel',
 					'varname' => 'unix_names',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_mailpwcleartext' => array(
+				'system_mailpwcleartext' => [
-					'label' => $lng['serversettings']['mailpwcleartext'],
+					'label' => lng('serversettings.mailpwcleartext'),
 					'settinggroup' => 'system',
 					'varname' => 'mailpwcleartext',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_passwordcryptfunc' => array(
+				],
-					'label' => $lng['serversettings']['passwordcryptfunc'],
+				'system_passwordcryptfunc' => [
+					'label' => lng('serversettings.passwordcryptfunc'),
 					'settinggroup' => 'system',
 					'varname' => 'passwordcryptfunc',
-					'type' => 'option',
+					'type' => 'select',
-					'default' => 0,
+					'default' => PASSWORD_DEFAULT,
-					'option_mode' => 'one',
+					'option_options_method' => [
-					'option_options_method' => array(
 						'\\Froxlor\\System\\Crypt',
 						'getAvailablePasswordHashes'
-					),
+					],
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_allow_error_report_admin' => array(
+				],
-					'label' => $lng['serversettings']['allow_error_report_admin'],
+				'system_allow_error_report_admin' => [
+					'label' => lng('serversettings.allow_error_report_admin'),
 					'settinggroup' => 'system',
 					'varname' => 'allow_error_report_admin',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_allow_error_report_customer' => array(
+				'system_allow_error_report_customer' => [
-					'label' => $lng['serversettings']['allow_error_report_customer'],
+					'label' => lng('serversettings.allow_error_report_customer'),
 					'settinggroup' => 'system',
 					'varname' => 'allow_error_report_customer',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_allow_customer_shell' => array(
+				'system_allow_customer_shell' => [
-					'label' => $lng['serversettings']['allow_allow_customer_shell'],
+					'label' => lng('serversettings.allow_allow_customer_shell'),
 					'settinggroup' => 'system',
 					'varname' => 'allow_customer_shell',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_available_shells' => array(
+				],
-					'label' => $lng['serversettings']['available_shells'],
+				'system_available_shells' => [
+					'label' => lng('serversettings.available_shells'),
 					'settinggroup' => 'system',
 					'varname' => 'available_shells',
-					'type' => 'string',
+					'type' => 'text',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				)
+					'advanced_mode' => true
-			)
+				],
-		)
+				'system_froxlorusergroup' => [
-	)
+					'label' => lng('serversettings.froxlorusergroup'),
-);
+					'settinggroup' => 'system',
+					'varname' => 'froxlorusergroup',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => [
+						'\\Froxlor\\Validate\\Check',
+						'checkLocalGroup'
+					],
+					'visible' => Settings::Get('system.nssextrausers'),
+					'advanced_mode' => true
+				],
+			]
+		]
+	]
+];

actions/admin/settings/220.quota.php

@@ -1,59 +1,69 @@
 <?php
+
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011- the Froxlor Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * For the full copyright and license information, please view the COPYING
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2011-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Settings
+ * 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(
+
-	'groups' => array(
+return [
-		'diskquota' => array(
+	'groups' => [
-			'title' => $lng['diskquota'],
+		'diskquota' => [
-			'fields' => array(
+			'title' => lng('diskquota'),
-				'diskquota_enabled' => array(
+			'icon' => 'fa-solid fa-sliders',
-					'label' => $lng['serversettings']['diskquota_enabled'],
+			'advanced_mode' => true,
+			'fields' => [
+				'diskquota_enabled' => [
+					'label' => lng('serversettings.diskquota_enabled'),
 					'settinggroup' => 'system',
 					'varname' => 'diskquota_enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-				),
+				],
-				'diskquota_repquota_path' => array(
+				'diskquota_repquota_path' => [
-					'label' => $lng['serversettings']['diskquota_repquota_path']['description'],
+					'label' => lng('serversettings.diskquota_repquota_path.description'),
 					'settinggroup' => 'system',
 					'varname' => 'diskquota_repquota_path',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '/usr/sbin/repquota',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'diskquota_quotatool_path' => array(
+				'diskquota_quotatool_path' => [
-					'label' => $lng['serversettings']['diskquota_quotatool_path']['description'],
+					'label' => lng('serversettings.diskquota_quotatool_path.description'),
 					'settinggroup' => 'system',
 					'varname' => 'diskquota_quotatool_path',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '/usr/bin/quotatool',
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'diskquota_customer_partition' => array(
+				'diskquota_customer_partition' => [
-					'label' => $lng['serversettings']['diskquota_customer_partition']['description'],
+					'label' => lng('serversettings.diskquota_customer_partition.description'),
 					'settinggroup' => 'system',
 					'varname' => 'diskquota_customer_partition',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '/dev/root',
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];
-
-?>

admin_admins.php

@@ -2,340 +2,195 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\Admins;
+use Froxlor\CurrentUser;
 use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
 use Froxlor\Settings;
-use Froxlor\Api\Commands\Admins as Admins;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
-
-if ($page == 'admins' && $userinfo['change_serversettings'] == '1') {
 
+if (($page == 'admins' || $page == 'overview') && $userinfo['change_serversettings'] == '1') {
 	if ($action == '') {
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_admins");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_admins");
-		$fields = array(
-			'loginname' => $lng['login']['username'],
-			'name' => $lng['customer']['name'],
-			'diskspace' => $lng['customer']['diskspace'],
-			'diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
-			'traffic' => $lng['customer']['traffic'],
-			'traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
-			'deactivated' => $lng['admin']['deactivated']
-		);
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_ADMINS, $fields);
-		$admins = '';
-		$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_ADMINS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$numrows_admins = Database::num_rows();
-		$paging->setEntries($numrows_admins);
-		$sortcode = $paging->getHtmlSortCode($lng, true);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-
-		$dec_places = Settings::Get('panel.decimal_places');
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if ($paging->checkDisplay($i)) {
-
-				$row['traffic_used'] = round($row['traffic_used'] / (1024 * 1024), $dec_places);
-				$row['traffic'] = round($row['traffic'] / (1024 * 1024), $dec_places);
-				$row['diskspace_used'] = round($row['diskspace_used'] / 1024, $dec_places);
-				$row['diskspace'] = round($row['diskspace'] / 1024, $dec_places);
-
-				// percent-values for progressbar
-				// For Disk usage
-				if ($row['diskspace'] > 0) {
-					$disk_percent = round(($row['diskspace_used'] * 100) / $row['diskspace'], 0);
-					$disk_doublepercent = round($disk_percent * 2, 2);
-				} else {
-					$disk_percent = 0;
-					$disk_doublepercent = 0;
-				}
-				// For Traffic usage
-				if ($row['traffic'] > 0) {
-					$traffic_percent = round(($row['traffic_used'] * 100) / $row['traffic'], 0);
-					$traffic_doublepercent = round($traffic_percent * 2, 2);
-				} else {
-					$traffic_percent = 0;
-					$traffic_doublepercent = 0;
-				}
-
-				// fix progress-bars if value is >100%
-				if ($disk_percent > 100) {
-					$disk_percent = 100;
-				}
-				if ($traffic_percent > 100) {
-					$traffic_percent = 100;
-				}
-
-				$row = \Froxlor\PhpHelper::strReplaceArray('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-
-				$row['custom_notes'] = ($row['custom_notes'] != '') ? nl2br($row['custom_notes']) : '';
-
-				eval("\$admins.=\"" . \Froxlor\UI\Template::getTemplate("admins/admins_admin") . "\";");
-				$count ++;
-			}
-			$i ++;
-		}
-
-		$admincount = $numrows_admins;
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("admins/admins") . "\";");
-	} elseif ($action == 'su') {
 
 		try {
-			$json_result = Admins::getLocal($userinfo, array(
+			$admin_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.admins.php';
-				'id' => $id
+			$collection = (new Collection(Admins::class, $userinfo))
-			))->get();
+				->withPagination($admin_list_data['admin_list']['columns'], $admin_list_data['admin_list']['default_sorting']);
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
+		}
+
+		UI::view('user/table.html.twig', [
+			'listing' => Listing::format($collection, $admin_list_data, 'admin_list'),
+			'actions_links' => [
+				[
+					'href' => $linker->getLink(['section' => 'admins', 'page' => $page, 'action' => 'add']),
+					'label' => lng('admin.admin_add')
+				]
+			]
+		]);
+	} elseif ($action == 'su') {
+		try {
+			$json_result = Admins::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 		$destination_admin = $result['loginname'];
 
 		if ($destination_admin != '' && $result['adminid'] != $userinfo['userid']) {
-			$result_stmt = Database::prepare("
+			$result['switched_user'] = CurrentUser::getData();
-				SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = :userid
+			$result['adminsession'] = 1;
-			");
+			$result['userid'] = $result['adminid'];
-			$result = Database::pexecute_first($result_stmt, array(
+			CurrentUser::setData($result);
-				'userid' => $userinfo['userid']
-			));
 
-			$s = md5(uniqid(microtime(), 1));
+			$log->logAction(
-			$ins_stmt = Database::prepare("
+                FroxlorLogger::ADM_ACTION,
-				INSERT INTO `" . TABLE_PANEL_SESSIONS . "` SET
+                LOG_INFO,
-				`hash` = :hash, `userid` = :userid, `ipaddress` = :ip,
+                "switched adminuser and is now '" . $destination_admin . "'"
-				`useragent` = :ua, `lastactivity` = :la,
-				`language` = :lang, `adminsession` = '1'
-			");
-			$ins_data = array(
-				'hash' => $s,
-				'userid' => $id,
-				'ip' => $result['ipaddress'],
-				'ua' => $result['useragent'],
-				'la' => time(),
-				'lang' => $result['language']
             );
-			Database::pexecute($ins_stmt, $ins_data);
+			Response::redirectTo('admin_index.php');
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "switched adminuser and is now '" . $destination_admin . "'");
-			\Froxlor\UI\Response::redirectTo('admin_index.php', array(
-				's' => $s
-			));
 		} else {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'action' => 'login'
-			));
+			]);
 		}
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = Admins::getLocal($userinfo, array(
+			$json_result = Admins::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if ($result['loginname'] != '') {
 			if ($result['adminid'] == $userinfo['userid']) {
-				\Froxlor\UI\Response::standard_error('youcantdeleteyourself');
+				Response::standardError('youcantdeleteyourself');
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				Admins::getLocal($userinfo, array(
+				Admins::getLocal($userinfo, [
 					'id' => $id
-				))->delete();
+				])->delete();
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('admin_admin_reallydelete', $filename, array(
+				HTML::askYesNo('admin_admin_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['loginname']);
+				], $result['loginname']);
 			}
 		}
 	} elseif ($action == 'add') {
-
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			try {
 				Admins::getLocal($userinfo, $_POST)->add();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-
+			$ipaddress = [];
-			$language_options = '';
+			$ipaddress[-1] = lng('admin.allips');
-			foreach ($languages as $language_file => $language_name) {
-				$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $userinfo['language'], true);
-			}
-
-			$ipaddress = \Froxlor\UI\HTML::makeoption($lng['admin']['allips'], "-1");
 			$ipsandports_stmt = Database::query("
 				SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip` ASC
 			");
-
 			while ($row = $ipsandports_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$ipaddress .= \Froxlor\UI\HTML::makeoption($row['ip'], $row['id']);
+				$ipaddress[$row['id']] = $row['ip'];
 			}
 
-			$customers_ul = \Froxlor\UI\HTML::makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$domains_ul = \Froxlor\UI\HTML::makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-
 			$admin_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/admin/formfield.admin_add.php';
-			$admin_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($admin_add_data);
 
-			$title = $admin_add_data['admin_add']['title'];
+			UI::view('user/form.html.twig', [
-			$image = $admin_add_data['admin_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'admins']),
-
+				'formdata' => $admin_add_data['admin_add']
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("admins/admins_add") . "\";");
+			]);
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = Admins::getLocal($userinfo, array(
+			$json_result = Admins::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if ($result['loginname'] != '') {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					Admins::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
 				$dec_places = Settings::Get('panel.decimal_places');
 				$result['traffic'] = round($result['traffic'] / (1024 * 1024), $dec_places);
 				$result['diskspace'] = round($result['diskspace'] / 1024, $dec_places);
 				$result['email'] = $idna_convert->decode($result['email']);
 
-				$customers_ul = \Froxlor\UI\HTML::makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, $result['customers'], true, true);
+				$ipaddress = [];
-				if ($result['customers'] == '-1') {
+				$ipaddress[-1] = lng('admin.allips');
-					$result['customers'] = '';
-				}
-
-				$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true);
-				if ($result['diskspace'] == '-1') {
-					$result['diskspace'] = '';
-				}
-
-				$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true);
-				if ($result['traffic'] == '-1') {
-					$result['traffic'] = '';
-				}
-
-				$domains_ul = \Froxlor\UI\HTML::makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, $result['domains'], true, true);
-				if ($result['domains'] == '-1') {
-					$result['domains'] = '';
-				}
-
-				$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true);
-				if ($result['subdomains'] == '-1') {
-					$result['subdomains'] = '';
-				}
-
-				$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true);
-				if ($result['emails'] == '-1') {
-					$result['emails'] = '';
-				}
-
-				$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true);
-				if ($result['email_accounts'] == '-1') {
-					$result['email_accounts'] = '';
-				}
-
-				$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true);
-				if ($result['email_forwarders'] == '-1') {
-					$result['email_forwarders'] = '';
-				}
-
-				$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
-				if ($result['email_quota'] == '-1') {
-					$result['email_quota'] = '';
-				}
-
-				$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
-				if ($result['ftps'] == '-1') {
-					$result['ftps'] = '';
-				}
-
-				$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true);
-				if ($result['mysqls'] == '-1') {
-					$result['mysqls'] = '';
-				}
-
-				$language_options = '';
-				foreach ($languages as $language_file => $language_name) {
-					$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $result['def_language'], true);
-				}
-
-				$ipaddress = \Froxlor\UI\HTML::makeoption($lng['admin']['allips'], "-1", $result['ip']);
 				$ipsandports_stmt = Database::query("
-					SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `id`, `ip` ORDER BY `ip`, `port` ASC
+					SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip` ASC
 				");
-
 				while ($row = $ipsandports_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$ipaddress .= \Froxlor\UI\HTML::makeoption($row['ip'], $row['id'], $result['ip']);
+					$ipaddress[$row['id']] = $row['ip'];
 				}
 
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = PhpHelper::htmlentitiesArray($result);
 
 				$admin_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/admin/formfield.admin_edit.php';
-				$admin_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($admin_edit_data);
 
-				$title = $admin_edit_data['admin_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $admin_edit_data['admin_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'admins', 'id' => $id]),
-
+					'formdata' => $admin_edit_data['admin_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("admins/admins_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

admin_apcuinfo.php

@@ -1,440 +1,234 @@
 <?php
 
-/*
+/**
- * +----------------------------------------------------------------------+
+ * This file is part of the Froxlor project.
- * | APC |
+ * Copyright (c) 2010 the Froxlor Team (see authors).
- * +----------------------------------------------------------------------+
- * | Copyright (c) 2006-2011 The PHP Group |
- * +----------------------------------------------------------------------+
- * | This source file is subject to version 3.01 of the PHP license, |
- * | that is bundled with this package in the file LICENSE, and is |
- * | available through the world-wide-web at the following url: |
- * | http://www.php.net/license/3_01.txt |
- * | If you did not receive a copy of the PHP license and are unable to |
- * | obtain it through the world-wide-web, please send a note to |
- * | license@php.net so we can mail you a copy immediately. |
- * +----------------------------------------------------------------------+
- * | Authors: Ralf Becker <beckerr@php.net> |
- * | Rasmus Lerdorf <rasmus@php.net> |
- * | Ilia Alshanetsky <ilia@prohost.org> |
- * +----------------------------------------------------------------------+
  *
- * All other licensing and usage conditions are those of the PHP Group.
+ * 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.
  *
- * Based on https://github.com/krakjoe/apcu/blob/master/apc.php
+ * This program is distributed in the hope that it will be useful,
- * Implemented into Froxlor: Janos Muzsi <muzsij@hypernics.hu>
+ * 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>
+ * @author     Janos Muzsi <muzsij@hypernics.hu>
+ * @author     Ralf Becker <beckerr@php.net>
+ * @author     Rasmus Lerdorf <rasmus@php.net>
+ * @author     Ilia Alshanetsky <ilia@prohost.org>
+ * @license    https://files.froxlor.org/misc/COPYING.txt GPLv2
+ *
+ * Based on https://github.com/krakjoe/apcu/blob/master/apc.php, which is
+ * licensed under the PHP licence (version 3.01), which can be viewed
+ * online at https://www.php.net/license/3_01.txt
  */
-define('AREA', 'admin');
+
-require './lib/init.php';
+use Froxlor\FroxlorLogger;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\UI\HTML;
+
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
 
 $horizontal_bar_size = 950; // 1280px window width
 
 if ($action == 'delete' && function_exists('apcu_clear_cache') && $userinfo['change_serversettings'] == '1') {
+	if ($_POST['send'] == 'send') {
 		apcu_clear_cache();
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "cleared APCu cache");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "cleared APCu cache");
-	header('Location: ' . $linker->getLink(array(
+		header('Location: ' . $linker->getLink([
 				'section' => 'apcuinfo',
 				'page' => 'showinfo'
-	)));
+			]));
 		exit();
+	} else {
+		HTML::askYesNo('cache_reallydelete', $filename, [
+			'page' => $page,
+			'action' => 'delete',
+		], '', [
+			'section' => 'apcuinfo',
+			'page' => 'showinfo'
+		]);
+	}
 }
 
-if (! function_exists('apcu_cache_info') || ! function_exists('apcu_sma_info')) {
+if (!function_exists('apcu_cache_info') || !function_exists('apcu_sma_info')) {
-	\Froxlor\UI\Response::standard_error($lng['error']['no_apcuinfo']);
+	Response::standardError(lng('error.no_apcuinfo'));
 }
 
-if ($page == 'showinfo') {
+if ($page == 'showinfo' && $userinfo['change_serversettings'] == '1') {
 	$cache = apcu_cache_info();
 	$mem = apcu_sma_info();
 	$time = time();
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_apcuinfo");
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_apcuinfo");
-
-	$passtime = $time - $cache['start_time'] > 0 ? $time - $cache['start_time'] : 1; // zero division
-	$mem_size = $mem['num_seg'] * $mem['seg_size'];
-	$mem_avail = $mem['avail_mem'];
-	$mem_used = $mem_size - $mem_avail;
-	$seg_size = bsize($mem['seg_size']);
-	$sharedmem = sprintf($lng['apcuinfo']['sharedmemval'], $mem['num_seg'], $seg_size, $cache['memory_type']);
-	$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'] + $cache['num_misses']) / $passtime) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']) / $passtime) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses']) / $passtime) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts']) / $passtime) : 0);
-	$apcversion = phpversion('apcu');
-	$phpversion = phpversion();
-	$number_vars = $cache['num_entries'];
-	$starttime = date('Y-m-d H:i:s', $cache['start_time']);
-	$uptime_duration = duration($cache['start_time']);
-	$size_vars = bsize($cache['mem_size']);
 
 	// check for possible empty values that are used in the templates
-	if (! isset($cache['file_upload_progress'])) {
+	if (!isset($cache['file_upload_progress'])) {
-		$cache['file_upload_progress'] = $lng['logger']['unknown'];
+		$cache['file_upload_progress'] = lng('logger.unknown');
 	}
 
-	if (! isset($cache['num_expunges'])) {
+	if (!isset($cache['num_expunges'])) {
-		$cache['num_expunges'] = $lng['logger']['unknown'];
+		$cache['num_expunges'] = lng('logger.unknown');
 	}
 
-	$runtimelines = '';
+	$overview = [
+		'mem_size' => $mem['num_seg'] * $mem['seg_size'],
+		'mem_avail' => $mem['avail_mem'],
+		'mem_used' => ($mem['num_seg'] * $mem['seg_size']) - $mem['avail_mem'],
+		'seg_size' => bsize($mem['seg_size']),
+		'num_hits' => $cache['num_hits'],
+		'num_misses' => $cache['num_misses'],
+		'num_inserts' => $cache['num_inserts'],
+		'req_rate_user' => sprintf("%.2f",
+			$cache['num_hits'] ? (($cache['num_hits'] + $cache['num_misses']) / ($time - $cache['start_time'])) : 0),
+		'hit_rate_user' => sprintf("%.2f",
+			$cache['num_hits'] ? (($cache['num_hits']) / ($time - $cache['start_time'])) : 0),
+		'miss_rate_user' => sprintf("%.2f",
+			$cache['num_misses'] ? (($cache['num_misses']) / ($time - $cache['start_time'])) : 0),
+		'insert_rate_user' => sprintf("%.2f",
+			$cache['num_inserts'] ? (($cache['num_inserts']) / ($time - $cache['start_time'])) : 0),
+		'apcversion' => phpversion('apcu'),
+		'phpversion' => phpversion(),
+		'number_vars' => $cache['num_entries'],
+		'size_vars' => bsize($cache['mem_size']),
+		'num_hits_and_misses' => 0 >= ($cache['num_hits'] + $cache['num_misses']) ? 1 : ($cache['num_hits'] + $cache['num_misses']),
+		'file_upload_progress' => $cache['file_upload_progress'],
+		'num_expunges' => $cache['num_expunges'],
+		'host' => (function_exists('gethostname')
+			? gethostname()
+			: (php_uname('n')
+				?: (empty($_SERVER['SERVER_NAME'])
+					? $_SERVER['HOST_NAME']
+					: $_SERVER['SERVER_NAME']
+				)
+			)
+		),
+		'server' => $_SERVER['SERVER_SOFTWARE'] ?: '',
+		'start_time' => $cache['start_time'],
+		'uptime' => duration($cache['start_time'])
+	];
+
+	$overview['mem_used_percentage'] = number_format(($overview['mem_used'] / $overview['mem_avail']) * 100, 1);
+	$overview['num_hits_percentage'] = number_format(($overview['num_hits'] / $overview['num_hits_and_misses']) * 100,
+		1);
+	$overview['num_misses_percentage'] = number_format(($overview['num_misses'] / $overview['num_hits_and_misses']) * 100,
+		1);
+	$overview['readable'] = [
+		'mem_size' => bsize($overview['mem_size']),
+		'mem_avail' => bsize($overview['mem_avail']),
+		'mem_used' => bsize($overview['mem_used']),
+		'num_hits' => number_format($overview['num_hits']),
+		'num_misses' => number_format($overview['num_misses']),
+		'number_vars' => number_format($overview['number_vars']),
+	];
+
+	$overview['runtimelines'] = [];
 	foreach (ini_get_all('apcu') as $name => $v) {
 		$value = $v['local_value'];
-		eval("\$runtimelines.=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/runtime_line") . "\";");
+		$overview['runtimelines'][$name] = $value;
 	}
 
-	$freemem = bsize($mem_avail) . sprintf(" (%.1f%%)", $mem_avail * 100 / $mem_size);
-	$usedmem = bsize($mem_used) . sprintf(" (%.1f%%)", $mem_used * 100 / $mem_size);
-	$hits = $cache['num_hits'] . @sprintf(" (%.1f%%)", $cache['num_hits'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
-	$misses = $cache['num_misses'] . @sprintf(" (%.1f%%)", $cache['num_misses'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
-
 	// Fragementation: (freeseg - 1) / total_seg
 	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for ($i = 0; $i < $mem['num_seg']; $i ++) {
+	for ($i = 0; $i < $mem['num_seg']; $i++) {
 		$ptr = 0;
 		foreach ($mem['block_lists'][$i] as $block) {
 			if ($block['offset'] != $ptr) {
-				++ $nseg;
+				++$nseg;
 			}
 			$ptr = $block['offset'] + $block['size'];
 			/* Only consider blocks <5M for the fragmentation % */
-			if ($block['size'] < (5 * 1024 * 1024))
+			if ($block['size'] < (5 * 1024 * 1024)) {
 				$fragsize += $block['size'];
+			}
 			$freetotal += $block['size'];
 		}
 		$freeseg += count($mem['block_lists'][$i]);
 	}
 
+	$overview['fragmentation'] = [];
 	if ($freeseg > 1) {
-		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize / $freetotal) * 100, bsize($fragsize), bsize($freetotal), $freeseg);
+		$overview['fragmentation']['used_percentage'] = number_format(($fragsize / $freetotal) * 100, 1);
+		$overview['fragmentation']['used_bytes'] = $fragsize;
+		$overview['fragmentation']['total_bytes'] = $freetotal;
+		$overview['fragmentation']['num_frags'] = $freeseg;
+		$overview['fragmentation']['readable'] = [
+			'used_bytes' => bsize($fragsize),
+			'total_bytes' => bsize($freetotal),
+			'num_frags' => number_format($freeseg)
+		];
 	} else {
-		$frag = "0%";
+		$overview['fragmentation'] = 0;
 	}
 
-	foreach (ini_get_all('apcu') as $name => $v) {
+	UI::view('settings/apcuinfo.html.twig', [
-		$value = $v['local_value'];
+		'apcuinfo' => $overview
-	}
+	]);
-
-	$img_src1 = '';
-	$img_src2 = '';
-	$img_src3 = '';
-	if (graphics_avail()) {
-		$img_src = $linker->getLink(array(
-			'section' => 'apcuinfo',
-			'page' => 'img1',
-			'action' => mt_rand(0, 1000000)
-		));
-		eval("\$img_src1=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/img_line") . "\";");
-		$img_src = $linker->getLink(array(
-			'section' => 'apcuinfo',
-			'page' => 'img2',
-			'action' => mt_rand(0, 1000000)
-		));
-		eval("\$img_src2=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/img_line") . "\";");
-		$img_src = $linker->getLink(array(
-			'section' => 'apcuinfo',
-			'page' => 'img3',
-			'action' => mt_rand(0, 1000000)
-		));
-		eval("\$img_src3=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/img_line") . "\";");
-	}
-
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/showinfo") . "\";");
-} elseif ($page == 'img1') {
-
-	$mem = apcu_sma_info();
-
-	$size = 460;
-	$image = imagecreate($size + 5, $size + 5);
-
-	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-	$col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
-	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$col_black = imagecolorallocate($image, 0, 0, 0);
-
-	imagecolortransparent($image, $col_white);
-
-	$s = $mem['num_seg'] * $mem['seg_size'];
-	$a = $mem['avail_mem'];
-	$x = $y = $size / 2;
-	$fuzz = 0.000001;
-
-	// This block of code creates the pie chart. It is a lot more complex than you
-	// would expect because we try to visualize any memory fragmentation as well.
-	$angle_from = 0;
-	$string_placement = array();
-	for ($i = 0; $i < $mem['num_seg']; $i ++) {
-		$ptr = 0;
-		$free = $mem['block_lists'][$i];
-		uasort($free, 'block_sort');
-		foreach ($free as $block) {
-			if ($block['offset'] != $ptr) { // Used block
-				$angle_to = $angle_from + ($block['offset'] - $ptr) / $s;
-				if (($angle_to + $fuzz) > 1)
-					$angle_to = 1;
-				if (($angle_to * 360) - ($angle_from * 360) >= 1) {
-					fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
-					if (($angle_to - $angle_from) > 0.05) {
-						array_push($string_placement, array(
-							$angle_from,
-							$angle_to
-						));
-					}
-				}
-				$angle_from = $angle_to;
-			}
-			$angle_to = $angle_from + ($block['size']) / $s;
-			if (($angle_to + $fuzz) > 1)
-				$angle_to = 1;
-			if (($angle_to * 360) - ($angle_from * 360) >= 1) {
-				fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_green);
-				if (($angle_to - $angle_from) > 0.05) {
-					array_push($string_placement, array(
-						$angle_from,
-						$angle_to
-					));
-				}
-			}
-			$angle_from = $angle_to;
-			$ptr = $block['offset'] + $block['size'];
-		}
-		if ($ptr < $mem['seg_size']) { // memory at the end
-			$angle_to = $angle_from + ($mem['seg_size'] - $ptr) / $s;
-			if (($angle_to + $fuzz) > 1)
-				$angle_to = 1;
-			fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
-			if (($angle_to - $angle_from) > 0.05) {
-				array_push($string_placement, array(
-					$angle_from,
-					$angle_to
-				));
-			}
-		}
-	}
-	foreach ($string_placement as $angle) {
-		text_arc($image, $x, $y, $size, $angle[0] * 360, $angle[1] * 360, $col_black, bsize($s * ($angle[1] - $angle[0])));
-	}
-
-	header("Content-type: image/png");
-	imagepng($image);
-	exit();
-} elseif ($page == 'img2') {
-
-	$cache = apcu_cache_info();
-
-	$size = $horizontal_bar_size;
-	$image = imagecreate($size + 5, 140);
-
-	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-	$col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
-	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$col_black = imagecolorallocate($image, 0, 0, 0);
-
-	imagecolortransparent($image, $col_white);
-
-	$s = $cache['num_hits'] + $cache['num_misses'];
-	$a = $cache['num_hits'];
-
-	fill_box($image, 1, 10, $s ? ($a * ($size - 21) / $s) : $size, 50, $col_black, $col_green /* , sprintf("%.1f%%", $s ? $cache['num_hits'] * 100 / $s : 0) */
-	);
-	fill_box($image, 1, 80, $s ? max(4, ($s - $a) * ($size - 21) / $s) : $size, 50, $col_black, $col_red /* , sprintf("%.1f%%", $s ? $cache['num_misses'] * 100 / $s : 0) */
-	);
-
-	header("Content-type: image/png");
-	imagepng($image);
-	exit();
-} elseif ($page == 'img3') {
-
-	$mem = apcu_sma_info();
-
-	$size = $horizontal_bar_size;
-	$image = imagecreate($size, 70);
-
-	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-	$col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
-	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$col_black = imagecolorallocate($image, 0, 0, 0);
-
-	imagecolortransparent($image, $col_white);
-
-	$s = $mem['num_seg'] * $mem['seg_size'];
-	$a = $mem['avail_mem'];
-	$x = 10;
-	$y = 0;
-
-	// This block of code creates the bar chart. It is a lot more complex than you
-	// would expect because we try to visualize any memory fragmentation as well.
-	for ($i = 0; $i < $mem['num_seg']; $i ++) {
-		$ptr = 0;
-		$free = $mem['block_lists'][$i];
-		uasort($free, 'block_sort');
-		foreach ($free as $block) {
-			if ($block['offset'] != $ptr) { // Used block
-				$h = ($size - 5) * ($block['offset'] - $ptr) / $s;
-				if ($h > 0) {
-					fill_box($image, $y, $x, $h, 50, $col_black, $col_red);
-				}
-				$y += $h;
-			}
-			$h = ($size - 5) * ($block['size']) / $s;
-			if ($h > 0) {
-				fill_box($image, $y, $x, $h, 50, $col_black, $col_green);
-			}
-			$y += $h;
-			$ptr = $block['offset'] + $block['size'];
-		}
-		if ($ptr < $mem['seg_size']) { // memory at the end
-			$h = ($size - 5) * ($mem['seg_size'] - $ptr) / $s;
-			if ($h > 0) {
-				fill_box($image, $y, $x, $h, 50, $col_black, $col_red, bsize($mem['seg_size'] - $ptr), $j ++);
-			}
-		}
-	}
-
-	header("Content-type: image/png");
-	imagepng($image);
-	exit();
 }
-
-function graphics_avail()
-{
-	return extension_loaded('gd');
-}
-
 // pretty printer for byte values
-//
+function bsize($size)
-function bsize($s)
 {
-	foreach (array(
+	$i = 0;
-		'',
+	$val = ['b', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-		'K',
+	while (($size / 1024) > 1) {
-		'M',
+		$size /= 1024;
-		'G'
+		++$i;
-	) as $i => $k) {
-		if ($s < 1024)
-			break;
-		$s /= 1024;
 	}
-	return sprintf("%5.1f %sBytes", $s, $k);
+	return sprintf(
+		'%.2f%s%s',
+		$size,
+		'',
+		$val[$i]
+	);
 }
 
 function duration($ts)
 {
 	global $time;
-	$years = (int) ((($time - $ts) / (7 * 86400)) / 52.177457);
+	$years = (int)((($time - $ts) / (7 * 86400)) / 52.177457);
-	$rem = (int) (($time - $ts) - ($years * 52.177457 * 7 * 86400));
+	$rem = (int)(($time - $ts) - ($years * 52.177457 * 7 * 86400));
-	$weeks = (int) (($rem) / (7 * 86400));
+	$weeks = (int)(($rem) / (7 * 86400));
-	$days = (int) (($rem) / 86400) - $weeks * 7;
+	$days = (int)(($rem) / 86400) - $weeks * 7;
-	$hours = (int) (($rem) / 3600) - $days * 24 - $weeks * 7 * 24;
+	$hours = (int)(($rem) / 3600) - $days * 24 - $weeks * 7 * 24;
-	$mins = (int) (($rem) / 60) - $hours * 60 - $days * 24 * 60 - $weeks * 7 * 24 * 60;
+	$mins = (int)(($rem) / 60) - $hours * 60 - $days * 24 * 60 - $weeks * 7 * 24 * 60;
 	$str = '';
-	if ($years == 1)
+	if ($years == 1) {
 		$str .= "$years year, ";
-	if ($years > 1)
+	}
+	if ($years > 1) {
 		$str .= "$years years, ";
-	if ($weeks == 1)
+	}
+	if ($weeks == 1) {
 		$str .= "$weeks week, ";
-	if ($weeks > 1)
+	}
+	if ($weeks > 1) {
 		$str .= "$weeks weeks, ";
-	if ($days == 1)
+	}
+	if ($days == 1) {
 		$str .= "$days day,";
-	if ($days > 1)
+	}
+	if ($days > 1) {
 		$str .= "$days days,";
-	if ($hours == 1)
+	}
+	if ($hours == 1) {
 		$str .= " $hours hour and";
-	if ($hours > 1)
+	}
+	if ($hours > 1) {
 		$str .= " $hours hours and";
-	if ($mins == 1)
+	}
+	if ($mins == 1) {
 		$str .= " 1 minute";
-	else
+	} else {
 		$str .= " $mins minutes";
+	}
 	return $str;
 }
-
-function block_sort($array1, $array2)
-{
-	if ($array1['offset'] > $array2['offset']) {
-		return 1;
-	} else {
-		return - 1;
-	}
-}
-
-function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $color2, $text = '', $placeindex = 0)
-{
-	$r = $diameter / 2;
-	$w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
-
-	if (function_exists("imagefilledarc")) {
-		// exists only if GD 2.0.1 is available
-		imagefilledarc($im, $centerX + 1, $centerY + 1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
-		imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
-		imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL | IMG_ARC_EDGED);
-	} else {
-		imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
-		imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-		imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start + 1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-		imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end - 1)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
-		imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
-		imagefill($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $color2);
-	}
-	if ($text) {
-		if ($placeindex > 0) {
-			imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
-			imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
-		} else {
-			imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
-		}
-	}
-}
-
-function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $text, $placeindex = 0)
-{
-	$r = $diameter / 2;
-	$w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
-
-	if ($placeindex > 0) {
-		imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
-		imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
-	} else {
-		imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
-	}
-}
-
-function fill_box($im, $x, $y, $w, $h, $color1, $color2, $text = '', $placeindex = '')
-{
-	global $col_black;
-	$x1 = $x + $w - 1;
-	$y1 = $y + $h - 1;
-
-	imagerectangle($im, $x, $y1, $x1 + 1, $y + 1, $col_black);
-	if ($y1 > $y)
-		imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
-	else
-		imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
-	imagerectangle($im, $x, $y1, $x1, $y, $color1);
-	if ($text) {
-		if ($placeindex > 0) {
-
-			if ($placeindex < 16) {
-				$px = 5;
-				$py = $placeindex * 12 + 6;
-				imagefilledrectangle($im, $px + 90, $py + 3, $px + 90 - 4, $py - 3, $color2);
-				imageline($im, $x, $y + $h / 2, $px + 90, $py, $color2);
-				imagestring($im, 2, $px, $py - 6, $text, $color1);
-			} else {
-				if ($placeindex < 31) {
-					$px = $x + 40 * 2;
-					$py = ($placeindex - 15) * 12 + 6;
-				} else {
-					$px = $x + 40 * 2 + 100 * intval(($placeindex - 15) / 15);
-					$py = ($placeindex % 15) * 12 + 6;
-				}
-				imagefilledrectangle($im, $px, $py + 3, $px - 4, $py - 3, $color2);
-				imageline($im, $x + $w, $y + $h / 2, $px, $py, $color2);
-				imagestring($im, 2, $px + 2, $py - 6, $text, $color1);
-			}
-		} else {
-			imagestring($im, 4, $x + 5, $y1 - 16, $text, $color1);
-		}
-	}
-}

admin_autoupdate.php

@@ -2,216 +2,197 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2016 the Froxlor Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * For the full copyright and license information, please view the COPYING
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Frontend
  *
- * @since      0.9.35
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Froxlor;
+use Froxlor\FroxlorLogger;
 use Froxlor\Http\HttpClient;
+use Froxlor\Install\AutoUpdate;
+use Froxlor\Settings;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
 
-// define update-uri
+if ($page != 'error') {
-define('UPDATE_URI', "https://version.froxlor.org/Froxlor/api/" . $version);
+	// check for webupdate to be enabled
-define('RELEASE_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip");
+	if (Settings::Config('enable_webupdate') != true) {
-define('CHECKSUM_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip.sha256");
+		Response::redirectTo($filename, [
-
-// check for archive-stuff
-if (! extension_loaded('zip')) {
-	\Froxlor\UI\Response::redirectTo($filename, array(
-		's' => $s,
 			'page' => 'error',
-		'errno' => 2
+			'errno' => 11
-	));
+		]);
+	}
 }
 
 // display initial version check
 if ($page == 'overview') {
-
 	// log our actions
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "checking auto-update");
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "checking auto-update");
 
 	// check for new version
 	try {
-		$latestversion = HttpClient::urlGet(UPDATE_URI, true, 3);
+		$result = AutoUpdate::checkVersion();
-	} catch (\Exception $e) {
+	} catch (Exception $e) {
-		\Froxlor\UI\Response::dynamic_error("Version-check currently unavailable, please try again later");
+		Response::dynamicError($e->getMessage());
 	}
-	$latestversion = explode('|', $latestversion);
 
-	if (is_array($latestversion) && count($latestversion) >= 1) {
+	if ($result == 1) {
-		$_version = $latestversion[0];
-		$_message = isset($latestversion[1]) ? $latestversion[1] : '';
-		$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
-
-		// add the branding so debian guys are not gettings confused
-		// about their version-number
-		$version_label = $_version . $branding;
-		$version_link = $_link;
-		$message_addinfo = $_message;
-
-		// not numeric -> error-message
-		if (! preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
-			// check for customized version to not output
-			// "There is a newer version of froxlor" besides the error-message
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s,
-				'page' => 'error',
-				'errno' => 3
-			));
-		} elseif (\Froxlor\Froxlor::versionCompare2($version, $_version) == - 1) {
-			// there is a newer version - yay
-			$isnewerversion = 1;
-		} else {
-			// nothing new
-			$isnewerversion = 0;
-		}
 
 		// anzeige über version-status mit ggfls. formular
 		// zum update schritt #1 -> download
-		if ($isnewerversion == 1) {
+		$text = lng('admin.newerversionavailable') . ' ' . lng('admin.newerversiondetails', [AutoUpdate::getFromResult('version'), Froxlor::VERSION]);
-			$text = 'There is a newer version available. Update to version <b>' . $_version . '</b> now?<br/>(Your current version is: ' . $version . ')';
+
-			$hiddenparams = '<input type="hidden" name="newversion" value="' . $_version . '" />';
+		$upd_formfield = [
-			$yesfile = $filename . '?s=' . $s . '&amp;page=getdownload';
+			'updates' => [
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("misc/question_yesno", true) . "\";");
+				'title' => lng('update.update'),
-			exit();
+				'image' => 'fa-solid fa-download',
-		} elseif ($isnewerversion == 0) {
+				'sections' => [
-			// all good
+					'section_autoupd' => [
-			\Froxlor\UI\Response::standard_success('noupdatesavail');
+						'fields' => [
+							'newversion' => ['type' => 'hidden', 'value' => AutoUpdate::getFromResult('version')]
+						]
+					]
+				],
+				'buttons' => [
+					[
+						'class' => 'btn-outline-secondary',
+						'label' => lng('panel.cancel'),
+						'type' => 'reset'
+					],
+					[
+						'label' => lng('update.proceed')
+					]
+				]
+			]
+		];
+
+		UI::view('user/form-note.html.twig', [
+			'formaction' => $linker->getLink(['section' => 'autoupdate', 'page' => 'getdownload']),
+			'formdata' => $upd_formfield['updates'],
+			// alert
+			'type' => 'warning',
+			'alert_msg' => $text
+		]);
+	} else if ($result < 0 || $result > 1) {
+		// remote errors
+		if ($result < 0) {
+			Response::dynamicError(AutoUpdate::getLastError());
 		} else {
-			\Froxlor\UI\Response::standard_error('customized_version');
+			Response::redirectTo($filename, [
+				'page' => 'error',
+				'errno' => $result
+			]);
 		}
+	} else {
+		// no new version
+		Response::standardSuccess('update.noupdatesavail', (Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') . ' ' : ''));
 	}
 } // download the new archive
 elseif ($page == 'getdownload') {
-
 	// retrieve the new version from the form
 	$newversion = isset($_POST['newversion']) ? $_POST['newversion'] : null;
 
+	$result = 6;
 	// valid?
 	if ($newversion !== null) {
-
+		$result = AutoUpdate::downloadZip($newversion);
-		// define files to get
+		if (!is_numeric($result)) {
-		$toLoad = str_replace('{version}', $newversion, RELEASE_URI);
-		$toCheck = str_replace('{version}', $newversion, CHECKSUM_URI);
-
-		// check for local destination folder
-		if (! is_dir(\Froxlor\Froxlor::getInstallDir() . '/updates/')) {
-			mkdir(\Froxlor\Froxlor::getInstallDir() . '/updates/');
-		}
-
-		// name archive
-		$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . basename($toLoad);
-
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Downloading " . $toLoad . " to " . $localArchive);
-
-		// remove old archive
-		if (file_exists($localArchive)) {
-			@unlink($localArchive);
-		}
-
-		// get archive data
-		try {
-			HttpClient::fileGet($toLoad, $localArchive);
-		} catch (Exception $e) {
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s,
-				'page' => 'error',
-				'errno' => 4
-			));
-		}
-
-		// validate the integrity of the downloaded file
-		$_shouldsum = HttpClient::urlGet($toCheck);
-		if (! empty($_shouldsum)) {
-			$_t = explode(" ", $_shouldsum);
-			$shouldsum = $_t[0];
-		} else {
-			$shouldsum = null;
-		}
-		$filesum = hash_file('sha256', $localArchive);
-
-		if ($filesum != $shouldsum) {
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s,
-				'page' => 'error',
-				'errno' => 9
-			));
-		}
-
 			// to the next step
-		\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-			's' => $s,
 				'page' => 'extract',
-			'archive' => basename($localArchive)
+				'archive' => $result
-		));
+			]);
 		}
-	\Froxlor\UI\Response::redirectTo($filename, array(
+	}
-		's' => $s,
+	Response::redirectTo($filename, [
 		'page' => 'error',
-		'errno' => 6
+		'errno' => $result
-	));
+	]);
 } // extract and install new version
 elseif ($page == 'extract') {
-
-	$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
-	$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . $toExtract;
-
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		// decompress from zip
+		$toExtract = isset($_POST['archive']) ? $_POST['archive'] : null;
-		$zip = new ZipArchive();
+		$localArchive = Froxlor::getInstallDir() . '/updates/' . $toExtract;
-		$res = $zip->open($localArchive);
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Extracting " . $localArchive . " to " . Froxlor::getInstallDir());
-		if ($res === true) {
+		$result = AutoUpdate::extractZip($localArchive);
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Extracting " . $localArchive . " to " . \Froxlor\Froxlor::getInstallDir());
+		if ($result > 0) {
-			$zip->extractTo(\Froxlor\Froxlor::getInstallDir());
-			$zip->close();
-			// success - remove unused archive
-			@unlink($localArchive);
-			// wait a bit before we redirect to be sure
-			sleep(2);
-		} else {
 			// error
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				's' => $s,
 				'page' => 'error',
-				'errno' => 8
+				'errno' => $result
-			));
+			]);
+		}
+		// redirect to update-page
+		Response::redirectTo('admin_updates.php');
+	} else {
+		$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
+		$localArchive = Froxlor::getInstallDir() . '/updates/' . $toExtract;
 	}
 
-		// redirect to update-page?
+	if (!file_exists($localArchive)) {
-		\Froxlor\UI\Response::redirectTo('admin_updates.php', array(
+		Response::redirectTo($filename, [
-			's' => $s
-		));
-	}
-
-	if (! file_exists($localArchive)) {
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s,
 			'page' => 'error',
 			'errno' => 7
-		));
+		]);
 	}
 
-	$text = 'Extract downloaded archive "' . $toExtract . '"?';
+	$text = lng('admin.extractdownloadedzip', [$toExtract]);
-	$hiddenparams = '';
+
-	$yesfile = $filename . '?s=' . $s . '&amp;page=extract&amp;archive=' . $toExtract;
+	$upd_formfield = [
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("misc/question_yesno", true) . "\";");
+		'updates' => [
+			'title' => lng('update.update'),
+			'image' => 'fa-solid fa-download',
+			'sections' => [
+				'section_autoupd' => [
+					'fields' => [
+						'archive' => ['type' => 'hidden', 'value' => $toExtract]
+					]
+				]
+			],
+			'buttons' => [
+				[
+					'class' => 'btn-outline-secondary',
+					'label' => lng('panel.cancel'),
+					'type' => 'reset'
+				],
+				[
+					'label' => lng('update.proceed')
+				]
+			]
+		]
+	];
+
+	UI::view('user/form-note.html.twig', [
+		'formaction' => $linker->getLink(['section' => 'autoupdate', 'page' => 'extract']),
+		'formdata' => $upd_formfield['updates'],
+		// alert
+		'type' => 'warning',
+		'alert_msg' => $text
+	]);
 } // display error
 elseif ($page == 'error') {
-
 	// retrieve error-number via url-parameter
-	$errno = isset($_GET['errno']) ? (int) $_GET['errno'] : 0;
+	$errno = isset($_GET['errno']) ? (int)$_GET['errno'] : 0;
 
 	// 2 = no Zlib
 	// 3 = custom version detected
@@ -221,5 +202,11 @@ elseif ($page == 'error') {
 	// 7 = local archive does not exist
 	// 8 = could not extract archive
 	// 9 = checksum mismatch
-	\Froxlor\UI\Response::standard_error('autoupdate_' . $errno);
+	// 10 = <php-7.4
+	// 11 = enable_webupdate = false
+	$errmsg = 'autoupdate_' . $errno;
+	if ($errno == 3) {
+		$errmsg = 'customized_version';
+	}
+	Response::standardError($errmsg);
 }

admin_configfiles.php

@@ -4,263 +4,178 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Panel
+ * GNU General Public License for more details.
  *
- * @since 0.9.34
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Config\ConfigParser;
+use Froxlor\FileDir;
+use Froxlor\Froxlor;
 use Froxlor\Settings;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
 if ($userinfo['change_serversettings'] == '1') {
-
 	if ($action == 'setconfigured') {
 		Settings::Set('panel.is_configured', '1', true);
-		\Froxlor\UI\Response::redirectTo('admin_configfiles.php', array(
+		Response::redirectTo('admin_configfiles.php');
-			's' => $s
-		));
 	}
 
-	$customer_tmpdir = '/tmp/';
-	if (Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_tmpdir') != '') {
-		$customer_tmpdir = Settings::Get('system.mod_fcgid_tmpdir');
-	} elseif (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.tmpdir') != '') {
-		$customer_tmpdir = Settings::Get('phpfpm.tmpdir');
-	}
-
-	// try to convert namserver hosts to ip's
-	$ns_ips = "";
-	if (Settings::Get('system.nameservers') != '') {
-		$nameservers = explode(',', Settings::Get('system.nameservers'));
-		foreach ($nameservers as $nameserver) {
-			$nameserver = trim($nameserver);
-			$nameserver_ips = \Froxlor\PhpHelper::gethostbynamel6($nameserver);
-			if (is_array($nameserver_ips) && count($nameserver_ips) > 0) {
-				$ns_ips .= implode(",", $nameserver_ips);
-			}
-		}
-	}
-
-	$replace_arr = Array(
-		'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
-		'<SQL_UNPRIVILEGED_PASSWORD>' => 'FROXLOR_MYSQL_PASSWORD',
-		'<SQL_DB>' => $sql['db'],
-		'<SQL_HOST>' => $sql['host'],
-		'<SQL_SOCKET>' => isset($sql['socket']) ? $sql['socket'] : null,
-		'<SERVERNAME>' => Settings::Get('system.hostname'),
-		'<SERVERIP>' => Settings::Get('system.ipaddress'),
-		'<NAMESERVERS>' => Settings::Get('system.nameservers'),
-		'<NAMESERVERS_IP>' => $ns_ips,
-		'<AXFRSERVERS>' => Settings::Get('system.axfrservers'),
-		'<VIRTUAL_MAILBOX_BASE>' => Settings::Get('system.vmail_homedir'),
-		'<VIRTUAL_UID_MAPS>' => Settings::Get('system.vmail_uid'),
-		'<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'),
-		'<SSLPROTOCOLS>' => (Settings::Get('system.use_ssl') == '1') ? 'imaps pop3s' : '',
-		'<CUSTOMER_TMP>' => \Froxlor\FileDir::makeCorrectDir($customer_tmpdir),
-		'<BASE_PATH>' => \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir()),
-		'<BIND_CONFIG_PATH>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.bindconf_directory')),
-		'<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
-		'<CUSTOMER_LOGS>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')),
-		'<FPM_IPCDIR>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
-		'<WEBSERVER_GROUP>' => Settings::Get('system.httpgroup')
-	);
-
 	// get distro from URL param
-	$distribution = (isset($_GET['distribution']) && $_GET['distribution'] != 'choose') ? $_GET['distribution'] : "";
+	$distribution = Request::any('distribution');
-	$service = (isset($_GET['service']) && $_GET['service'] != 'choose') ? $_GET['service'] : "";
+	$reselect = Request::any('reselect', 0);
-	$daemon = (isset($_GET['daemon']) && $_GET['daemon'] != 'choose') ? $_GET['daemon'] : "";
-	$distributions_select = "";
-	$services_select = "";
-	$daemons_select = "";
 
-	$configfiles = "";
+	// check for possible setting
-	$services = "";
+	if (empty($distribution)) {
-	$daemons = "";
+		$distribution = Settings::Get('system.distribution') ?? "";
+	}
+	if ($reselect == 1) {
+		$distribution = '';
+	}
 
-	$config_dir = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/');
+	$distributions_select = [];
 
-	if ($distribution != "") {
+	$services = [];
+	$config_dir = FileDir::makeCorrectDir(Froxlor::getInstallDir() . '/lib/configfiles/');
 
-		if (! file_exists($config_dir . '/' . $distribution . ".xml")) {
+	if (!empty($distribution)) {
-			trigger_error("Unknown distribution, are you playing around with the URL?");
+		if (!file_exists($config_dir . '/' . $distribution . ".xml")) {
-			exit();
+			Response::dynamicError("Unknown distribution");
+		}
+
+		// update setting if different
+		if ($distribution != Settings::Get('system.distribution')) {
+			Settings::Set('system.distribution', $distribution);
 		}
 
 		// create configparser object
-		$configfiles = new \Froxlor\Config\ConfigParser($config_dir . '/' . $distribution . ".xml");
+		$configfiles = new ConfigParser($config_dir . '/' . $distribution . ".xml");
 
 		// get distro-info
-		$dist_display = getCompleteDistroName($configfiles);
+		$dist_display = $configfiles->getCompleteDistroName();
 
 		// get all the services from the distro
 		$services = $configfiles->getServices();
-
-		if ($service != "") {
-
-			if (! isset($services[$service])) {
-				trigger_error("Unknown service, are you playing around with the URL?");
-				exit();
-			}
-
-			$daemons = $services[$service]->getDaemons();
-
-			if ($daemon == "") {
-				foreach ($daemons as $di => $dd) {
-					$title = $dd->title;
-					if ($dd->default) {
-						$title = $title . " (" . strtolower($lng['panel']['default']) . ")";
-					}
-					$daemons_select .= \Froxlor\UI\HTML::makeoption($title, $di);
-				}
-			}
 	} else {
-			foreach ($services as $si => $sd) {
-				$services_select .= \Froxlor\UI\HTML::makeoption($sd->title, $si);
-			}
-		}
-	} else {
-
 		// show list of available distro's
 		$distros = glob($config_dir . '*.xml');
-		// tmp array
-		$distributions_select_data = array();
 		// read in all the distros
 		foreach ($distros as $_distribution) {
 			// get configparser object
-			$dist = new \Froxlor\Config\ConfigParser($_distribution);
+			$dist = new ConfigParser($_distribution);
-			// get distro-info
-			$dist_display = getCompleteDistroName($dist);
 			// store in tmp array
-			$distributions_select_data[$dist_display] = str_replace(".xml", "", strtolower(basename($_distribution)));
+			$distributions_select[str_replace(".xml", "", strtolower(basename($_distribution)))] = $dist->getCompleteDistroName();
 		}
 
 		// sort by distribution name
-		ksort($distributions_select_data);
+		asort($distributions_select);
-
-		foreach ($distributions_select_data as $dist_display => $dist_index) {
-			// create select-box-option
-			$distributions_select .= \Froxlor\UI\HTML::makeoption($dist_display, $dist_index);
-		}
 	}
 
-	if ($distribution != "" && $service != "" && $daemon != "") {
+	if ($distribution != "" && isset($_POST['finish'])) {
+		unset($_POST['finish']);
+		$params = $_POST;
+		$params['distro'] = $distribution;
+		$params['system'] = [];
+		foreach ($_POST['system'] as $sysdaemon) {
+			$params['system'][] = $sysdaemon;
+		}
+		$params_content = json_encode($params);
+		$params_filename = FileDir::makeCorrectFile(Froxlor::getInstallDir() . 'install/' . Froxlor::genSessionId() . '.json');
+		file_put_contents($params_filename, $params_content);
 
-		if (! isset($daemons[$daemon])) {
+		UI::twigBuffer('settings/configuration-final.html.twig', [
-			trigger_error("Unknown daemon, are you playing around with the URL?");
+			'distribution' => $distribution,
-			exit();
+			// alert
-		}
+			'type' => 'info',
-
+			'alert_msg' => lng('admin.configfiles.finishnote'),
-		$confarr = $daemons[$daemon]->getConfig();
+			'basedir' => Froxlor::getInstallDir(),
-
+			'params_filename' => $params_filename
-		$configpage = '';
+		]);
-
-		$distro_editor = $configfiles->distributionEditor;
-
-		$commands_pre = "";
-		$commands_file = "";
-		$commands_post = "";
-
-		$lasttype = '';
-		$commands = '';
-		foreach ($confarr as $_action) {
-			if ($lasttype != '' && $lasttype != $_action['type']) {
-				$commands = trim($commands);
-				$numbrows = count(explode("\n", $commands));
-				eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
-				$lasttype = '';
-				$commands = '';
-			}
-			switch ($_action['type']) {
-				case "install":
-					$commands .= strtr($_action['content'], $replace_arr) . "\n";
-					$lasttype = "install";
-					break;
-				case "command":
-					$commands .= strtr($_action['content'], $replace_arr) . "\n";
-					$lasttype = "command";
-					break;
-				case "file":
-					if (array_key_exists('content', $_action)) {
-						$commands_file = getFileContentContainer($_action['content'], $replace_arr, $_action['name'], $distro_editor);
-					} elseif (array_key_exists('subcommands', $_action)) {
-						foreach ($_action['subcommands'] as $fileaction) {
-							if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") {
-								$commands_pre .= $fileaction['content'] . "\n";
-							} elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") {
-								$commands_post .= $fileaction['content'] . "\n";
-							} elseif ($fileaction['type'] == 'file') {
-								$commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $_action['name'], $distro_editor);
-							}
-						}
-					}
-					$realname = $_action['name'];
-					$commands = trim($commands_pre);
-					if ($commands != "") {
-						$numbrows = count(explode("\n", $commands));
-						eval("\$commands_pre=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
-					}
-					$commands = trim($commands_post);
-					if ($commands != "") {
-						$numbrows = count(explode("\n", $commands));
-						eval("\$commands_post=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
-					}
-					eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_subfileblock") . "\";");
-					$commands = '';
-					$commands_pre = '';
-					$commands_post = '';
-					break;
-			}
-		}
-		$commands = trim($commands);
-		if ($commands != '') {
-			$numbrows = count(explode("\n", $commands));
-			eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
-		}
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles") . "\";");
 	} else {
-		$basedir = \Froxlor\Froxlor::getInstallDir();
+		if (!empty($distribution)) {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("configfiles/wizard") . "\";");
+			// show available services to configure
+			$fields = $services;
+			$link_params = ['section' => 'configfiles', 'distribution' => $distribution];
+			UI::twigBuffer('settings/configuration.html.twig', [
+				'action' => $linker->getLink($link_params),
+				'fields' => $fields,
+				'distribution' => $distribution
+			]);
+		} else {
+			// @fixme check set distribution from settings
+
+			$cfg_formfield = [
+				'config' => [
+					'title' => lng('admin.configfiles.serverconfiguration'),
+					'image' => 'fa-solid fa-wrench',
+					'description' => lng('admin.configfiles.description'),
+					'sections' => [
+						'section_config' => [
+							'fields' => [
+								'distribution' => [
+									'type' => 'select',
+									'select_var' => $distributions_select,
+									'label' => lng('admin.configfiles.distribution'),
+									'selected' => Settings::Get('system.distribution') ?? ''
+								]
+							]
+						]
+					],
+					'buttons' => [
+						[
+							'class' => 'btn-outline-secondary',
+							'label' => lng('panel.cancel'),
+							'type' => 'reset'
+						],
+						[
+							'label' => lng('update.proceed')
+						]
+					]
+				]
+			];
+
+			UI::twigBuffer('user/form-note.html.twig', [
+				'formaction' => $linker->getLink(['section' => 'configfiles']),
+				'formdata' => $cfg_formfield['config'],
+				'actions_links' => (int)Settings::Get('panel.is_configured') == 0 ? [
+					[
+						'href' => $linker->getLink([
+							'section' => 'configfiles',
+							'page' => 'overview',
+							'action' => 'setconfigured'
+						]),
+						'label' => lng('panel.ihave_configured'),
+						'class' => 'btn-outline-warning',
+						'icon' => 'fa-solid fa-circle-check'
+					]
+				] : [],
+				// alert
+				'type' => 'warning',
+				'alert_msg' => lng('panel.settings_before_configuration') . ((int)Settings::Get('panel.is_configured') == 1 ? '<br><br>' . lng('panel.system_is_configured') : '')
+			]);
 		}
+	}
+
+	UI::twigOutputBuffer();
 } else {
-	\Froxlor\UI\Response::redirectTo('admin_index.php', array(
+	Response::redirectTo('admin_index.php');
-		's' => $s
-	));
-}
-
-// helper functions
-function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor)
-{
-	$files = "";
-	$file_content = trim($file_content);
-	if ($file_content != '') {
-		$file_content = strtr($file_content, $replace_arr);
-		$file_content = htmlspecialchars($file_content);
-		$numbrows = count(explode("\n", $file_content));
-		eval("\$files=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_file") . "\";");
-	}
-	return $files;
-}
-
-function getCompleteDistroName($cparser)
-{
-	// get distro-info
-	$dist_display = $cparser->distributionName;
-	if ($cparser->distributionCodename != '') {
-		$dist_display .= " " . $cparser->distributionCodename;
-	}
-	if ($cparser->distributionVersion != '') {
-		$dist_display .= " (" . $cparser->distributionVersion . ")";
-	}
-	if ($cparser->deprecated) {
-		$dist_display .= " [deprecated]";
-	}
-	return $dist_display;
 }

admin_cronjobs.php

@@ -4,86 +4,67 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Panel
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'admin';
-use Froxlor\Api\Commands\Cronjobs as Cronjobs;
+require __DIR__ . '/lib/init.php';
 
-if (isset($_POST['id'])) {
+use Froxlor\Api\Commands\Cronjobs;
-	$id = intval($_POST['id']);
+use Froxlor\FroxlorLogger;
-} elseif (isset($_GET['id'])) {
+use Froxlor\UI\Collection;
-	$id = intval($_GET['id']);
+use Froxlor\UI\Listing;
-}
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
-if ($page == 'cronjobs' || $page == 'overview') {
+$id = (int)Request::any('id');
+
+if (($page == 'cronjobs' || $page == 'overview') && $userinfo['change_serversettings'] == '1') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
 
-		$fields = array(
+		try {
-			'c.lastrun' => $lng['cron']['lastrun'],
+			$cron_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.cronjobs.php';
-			'c.interval' => $lng['cron']['interval'],
+			$collection = (new Collection(Cronjobs::class, $userinfo))
-			'c.isactive' => $lng['cron']['isactive']
+				->withPagination($cron_list_data['cron_list']['columns'], $cron_list_data['cron_list']['default_sorting']);
-		);
+		} catch (Exception $e) {
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_CRONRUNS, $fields);
+			Response::dynamicError($e->getMessage());
-
-		$crons = '';
-		$result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `module` ASC, `cronfile` ASC");
-		Database::pexecute($result_stmt);
-		$paging->setEntries(Database::num_rows());
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-
-		$i = 0;
-		$count = 0;
-		$cmod = '';
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($cmod != $row['module']) {
-				$_mod = explode("/", $row['module']);
-				$module = ucfirst($_mod[1]);
-				eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
-				$cmod = $row['module'];
-			}
-			if ($paging->checkDisplay($i)) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-
-				$row['lastrun'] = date('d.m.Y H:i', $row['lastrun']);
-				$row['isactive'] = ((int) $row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no'];
-
-				$description = $lng['crondesc'][$row['desc_lng_key']];
-
-				eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjob') . "\";");
-				$count ++;
 		}
 
-			$i ++;
+		UI::view('user/table-note.html.twig', [
-		}
+			'listing' => Listing::format($collection, $cron_list_data, 'cron_list'),
-
+			// alert-box
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs') . "\";");
+			'type' => 'warning',
+			'alert_msg' => lng('cron.changewarning')
+		]);
 	} elseif ($action == 'new') {
 		/*
 		 * @TODO later
 		 */
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = Cronjobs::getLocal($userinfo, array(
+			$json_result = Cronjobs::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 		if ($result['cronfile'] != '') {
@@ -91,38 +72,19 @@ if ($page == 'cronjobs' || $page == 'overview') {
 				try {
 					Cronjobs::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
-				// interval
-				$interval_nfo = explode(' ', $result['interval']);
-				$interval_value = $interval_nfo[0];
-
-				$interval_interval = '';
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
-				// end of interval
-
-				$change_cronfile = false;
-				if (substr($result['module'], 0, strpos($result['module'], '/')) != 'froxlor') {
-					$change_cronfile = true;
-				}
-
 				$cronjobs_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php';
-				$cronjobs_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($cronjobs_edit_data);
 
-				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'cronjobs', 'id' => $id]),
-
+					'formdata' => $cronjobs_edit_data['cronjobs_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjob_edit') . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	} elseif ($action == 'delete' && $id != 0) {

admin_customers.php

@@ -2,495 +2,330 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\Admins;
+use Froxlor\Api\Commands\Customers;
+use Froxlor\Api\Commands\MysqlServer;
+use Froxlor\CurrentUser;
 use Froxlor\Database\Database;
+use Froxlor\Froxlor;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
 use Froxlor\Settings;
-use Froxlor\Api\Commands\Customers as Customers;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
-if ($page == 'customers' && $userinfo['customers'] != '0') {
+if (($page == 'customers' || $page == 'overview') && $userinfo['customers'] != '0') {
 	if ($action == '') {
-		// clear request data
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_customers");
-		unset($_SESSION['requestData']);
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_customers");
+		try {
-		$fields = array(
+			$customer_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.customers.php';
-			'c.loginname' => $lng['login']['username'],
+			$collection = (new Collection(Customers::class, $userinfo, ['show_usages' => true]))
-			'a.loginname' => $lng['admin']['admin'],
+				->withPagination($customer_list_data['customer_list']['columns'], $customer_list_data['customer_list']['default_sorting']);
-			'c.name' => $lng['customer']['name'],
+			if ($userinfo['change_serversettings']) {
-			'c.email' => $lng['customer']['email'],
+				$collection->has('admin', Admins::class, 'adminid', 'adminid');
-			'c.firstname' => $lng['customer']['firstname'],
-			'c.company' => $lng['customer']['company'],
-			'c.diskspace' => $lng['customer']['diskspace'],
-			'c.diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
-			'c.traffic' => $lng['customer']['traffic'],
-			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')'
-		);
-
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_CUSTOMERS, $fields);
-		$customers = '';
-		$result_stmt = Database::prepare("
-			SELECT `c`.*, `a`.`loginname` AS `adminname`
-			FROM `" . TABLE_PANEL_CUSTOMERS . "` `c`, `" . TABLE_PANEL_ADMINS . "` `a`
-			WHERE " . ($userinfo['customers_see_all'] ? '' : " `c`.`adminid` = :adminid AND ") . "
-			`c`.`adminid` = `a`.`adminid` " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			'adminid' => $userinfo['adminid']
-		));
-		$num_rows = Database::num_rows();
-		$paging->setEntries($num_rows);
-		$sortcode = $paging->getHtmlSortCode($lng, true);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if ($paging->checkDisplay($i)) {
-
-				$domains_stmt = Database::prepare("
-					SELECT COUNT(`id`) AS `domains`
-					FROM `" . TABLE_PANEL_DOMAINS . "`
-					WHERE `customerid` = :cid
-					AND `parentdomainid` = '0'
-					AND `id`<> :stdd");
-				Database::pexecute($domains_stmt, array(
-					'cid' => $row['customerid'],
-					'stdd' => $row['standardsubdomain']
-				));
-				$domains = $domains_stmt->fetch(PDO::FETCH_ASSOC);
-				$row['domains'] = intval($domains['domains']);
-				$dec_places = Settings::Get('panel.decimal_places');
-
-				// get disk-space usages for web, mysql and mail
-				$usages_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DISKSPACE . "` WHERE `customerid` = :cid ORDER BY `stamp` DESC LIMIT 1");
-				$usages = Database::pexecute_first($usages_stmt, array(
-					'cid' => $row['customerid']
-				));
-
-				if ($usages)
-				{
-					$row['webspace_used'] = round($usages['webspace'] / 1024, $dec_places);
-					$row['mailspace_used'] = round($usages['mail'] / 1024, $dec_places);
-					$row['dbspace_used'] = round($usages['mysql'] / 1024, $dec_places);
-				} else {
-					$row['webspace_used'] = 0;
-					$row['mailspace_used'] = 0;
-					$row['dbspace_used'] = 0;
 			}
-				$row['traffic_used'] = round($row['traffic_used'] / (1024 * 1024), $dec_places);
+		} catch (Exception $e) {
-				$row['traffic'] = round($row['traffic'] / (1024 * 1024), $dec_places);
+			Response::dynamicError($e->getMessage());
-				$row['diskspace_used'] = round($row['diskspace_used'] / 1024, $dec_places);
-				$row['diskspace'] = round($row['diskspace'] / 1024, $dec_places);
-				$last_login = ((int) $row['lastlogin_succ'] == 0) ? $lng['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']);
-
-				/**
-				 * percent-values for progressbar
-				 */
-				// For Disk usage
-				if ($row['diskspace'] > 0) {
-					$disk_percent = round(($row['diskspace_used'] * 100) / $row['diskspace'], 0);
-					$disk_doublepercent = round($disk_percent * 2, 2);
-				} else {
-					$disk_percent = 0;
-					$disk_doublepercent = 0;
 		}
 
-				if ($row['traffic'] > 0) {
+		$actions_links = false;
-					$traffic_percent = round(($row['traffic_used'] * 100) / $row['traffic'], 0);
+		if (CurrentUser::canAddResource('customers')) {
-					$traffic_doublepercent = round($traffic_percent * 2, 2);
+			$actions_links = [
-				} else {
+				[
-					$traffic_percent = 0;
+					'href' => $linker->getLink(['section' => 'customers', 'page' => $page, 'action' => 'add']),
-					$traffic_doublepercent = 0;
+					'label' => lng('admin.customer_add')
+				]
+			];
 		}
 
-				$islocked = 0;
+		UI::view('user/table.html.twig', [
-				if ($row['loginfail_count'] >= Settings::Get('login.maxloginattempts') && $row['lastlogin_fail'] > (time() - Settings::Get('login.deactivatetime'))) {
+			'listing' => Listing::format($collection, $customer_list_data, 'customer_list'),
-					$islocked = 1;
+			'actions_links' => $actions_links
-				}
+		]);
-
-				$row = \Froxlor\PhpHelper::strReplaceArray('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps subdomains');
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-
-				// fix progress-bars if value is >100%
-				if ($disk_percent > 100) {
-					$disk_percent = 100;
-				}
-				if ($traffic_percent > 100) {
-					$traffic_percent = 100;
-				}
-
-				$row['custom_notes'] = ($row['custom_notes'] != '') ? nl2br($row['custom_notes']) : '';
-
-				eval("\$customers.=\"" . \Froxlor\UI\Template::getTemplate("customers/customers_customer") . "\";");
-				$count ++;
-			}
-
-			$i ++;
-		}
-
-		$customercount = $num_rows;
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("customers/customers") . "\";");
 	} elseif ($action == 'su' && $id != 0) {
 		try {
-			$json_result = Customers::getLocal($userinfo, array(
+			$json_result = Customers::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		$destination_user = $result['loginname'];
 
 		if ($destination_user != '') {
-
 			if ($result['deactivated'] == '1') {
-				\Froxlor\UI\Response::standard_error("usercurrentlydeactivated", $destination_user);
+				Response::standardError("usercurrentlydeactivated", $destination_user);
 			}
-			$result_stmt = Database::prepare("
-				SELECT * FROM `" . TABLE_PANEL_SESSIONS . "`
-				WHERE `userid` = :id
-				AND `hash` = :hash");
-			$result = Database::pexecute_first($result_stmt, array(
-				'id' => $userinfo['userid'],
-				'hash' => $s
-			));
 
-			$s = md5(uniqid(microtime(), 1));
+			$result['switched_user'] = CurrentUser::getData();
-			$insert = Database::prepare("
+			$result['adminsession'] = 0;
-				INSERT INTO `" . TABLE_PANEL_SESSIONS . "` SET
+			$result['userid'] = $result['customerid'];
-					`hash` = :hash,
+			CurrentUser::setData($result);
-					`userid` = :id,
+
-					`ipaddress` = :ip,
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "switched user and is now '" . $destination_user . "'");
-					`useragent` = :ua,
-					`lastactivity` = :lastact,
-					`language` = :lang,
-					`adminsession` = '0'");
-			Database::pexecute($insert, array(
-				'hash' => $s,
-				'id' => $id,
-				'ip' => $result['ipaddress'],
-				'ua' => $result['useragent'],
-				'lastact' => time(),
-				'lang' => $result['language']
-			));
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "switched user and is now '" . $destination_user . "'");
 
 			$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
 			$redirect = "customer_" . $target . ".php";
-			if (! file_exists(\Froxlor\Froxlor::getInstallDir() . "/" . $redirect)) {
+			if (!file_exists(Froxlor::getInstallDir() . "/" . $redirect)) {
 				$redirect = "customer_index.php";
 			}
-			\Froxlor\UI\Response::redirectTo($redirect, array(
+			Response::redirectTo($redirect, null, true);
-				's' => $s
-			), true);
 		} else {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'action' => 'login'
-			));
+			]);
 		}
 	} elseif ($action == 'unlock' && $id != 0) {
 		try {
-			$json_result = Customers::getLocal($userinfo, array(
+			$json_result = Customers::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			try {
-				$json_result = Customers::getLocal($userinfo, array(
+				$json_result = Customers::getLocal($userinfo, [
 					'id' => $id
-				))->unlock();
+				])->unlock();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			\Froxlor\UI\HTML::askYesNo('customer_reallyunlock', $filename, array(
+			HTML::askYesNo('customer_reallyunlock', $filename, [
 				'id' => $id,
 				'page' => $page,
 				'action' => $action
-			), $result['loginname']);
+			], $result['loginname']);
 		}
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = Customers::getLocal($userinfo, array(
+			$json_result = Customers::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			try {
-				$json_result = Customers::getLocal($userinfo, array(
+				$json_result = Customers::getLocal($userinfo, [
 					'id' => $id,
-					'delete_userfiles' => (isset($_POST['delete_userfiles']) ? (int) $_POST['delete_userfiles'] : 0)
+					'delete_userfiles' => (isset($_POST['delete_userfiles']) ? (int)$_POST['delete_userfiles'] : 0)
-				))->delete();
+				])->delete();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			\Froxlor\UI\HTML::askYesNoWithCheckbox('admin_customer_reallydelete', 'admin_customer_alsoremovefiles', $filename, array(
+			HTML::askYesNoWithCheckbox('admin_customer_reallydelete', 'admin_customer_alsoremovefiles', $filename, [
 				'id' => $id,
 				'page' => $page,
 				'action' => $action
-			), $result['loginname']);
+			], $result['loginname']);
 		}
 	} elseif ($action == 'add') {
-
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			try {
 				Customers::getLocal($userinfo, $_POST)->add();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			$language_options = '';
+			$mysql_servers = [];
-
+			try {
-			foreach ($languages as $language_file => $language_name) {
+				$result_json = MysqlServer::getLocal($userinfo)->listing();
-				$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true);
+				$result_decoded = json_decode($result_json, true)['data']['list'];
+				foreach ($result_decoded as $dbserver => $dbdata) {
+					$mysql_servers[] = [
+						'label' => $dbdata['caption'],
+						'value' => $dbserver
+					];
+				}
+			} catch (Exception $e) {
+				/* just none */
 			}
 
-			$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$phpconfigs = [];
-			$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-
-			$gender_options = \Froxlor\UI\HTML::makeoption($lng['gender']['undef'], 0, true, true, true);
-			$gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['male'], 1, null, true, true);
-			$gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['female'], 2, null, true, true);
-
-			$phpconfigs = array();
 			$configs = Database::query("
 				SELECT c.*, fc.description as interpreter
 				FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
 				LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
 			");
 			while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-				if ((int) Settings::Get('phpfpm.enabled') == 1) {
+				if ((int)Settings::Get('phpfpm.enabled') == 1) {
-					$phpconfigs[] = array(
+					$phpconfigs[] = [
-						'label' => $row['description'] . " [" . $row['interpreter'] . "]<br />",
+						'label' => $row['description'] . " [" . $row['interpreter'] . "]",
 						'value' => $row['id']
-					);
+					];
 				} else {
-					$phpconfigs[] = array(
+					$phpconfigs[] = [
-						'label' => $row['description'] . "<br />",
+						'label' => $row['description'],
 						'value' => $row['id']
-					);
+					];
 				}
 			}
 
 			// hosting plans
-			$hosting_plans = "";
+			$hosting_plans = [];
 			$plans = Database::query("
 				SELECT *
 				FROM `" . TABLE_PANEL_PLANS . "`
 				ORDER BY name ASC
 			");
-			if (Database::num_rows() > 0) {
+			$hosting_plans = [
-				$hosting_plans .= \Froxlor\UI\HTML::makeoption("---", 0, 0, true, true);
+				0 => "---"
-			}
+			];
 			while ($row = $plans->fetch(PDO::FETCH_ASSOC)) {
-				$hosting_plans .= \Froxlor\UI\HTML::makeoption($row['name'], $row['id'], 0, true, true);
+				$hosting_plans[$row['id']] = $row['name'];
 			}
 
 			$customer_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_add.php';
-			$customer_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($customer_add_data);
 
-			$title = $customer_add_data['customer_add']['title'];
+			UI::view('user/form.html.twig', [
-			$image = $customer_add_data['customer_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'customers']),
-
+				'formdata' => $customer_add_data['customer_add']
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("customers/customers_add") . "\";");
+			]);
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-
 		try {
-			$json_result = Customers::getLocal($userinfo, array(
+			$json_result = Customers::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
-		/*
-		 * information for moving customer
-		 */
-		$available_admins_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_ADMINS . "`
-			WHERE (`customers` = '-1' OR `customers` > `customers_used`)");
-		Database::pexecute($available_admins_stmt);
-		$admin_select = \Froxlor\UI\HTML::makeoption("-----", 0, true, true, true);
-		$admin_select_cnt = 0;
-		while ($available_admin = $available_admins_stmt->fetch()) {
-			$admin_select .= \Froxlor\UI\HTML::makeoption($available_admin['name'] . " (" . $available_admin['loginname'] . ")", $available_admin['adminid'], null, true, true);
-			$admin_select_cnt ++;
-		}
-		/*
-		 * end of moving customer stuff
-		 */
-
 		if ($result['loginname'] != '') {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					Customers::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				$language_options = '';
-
-				foreach ($languages as $language_file => $language_name) {
-					$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $result['def_language'], true);
-				}
-
 				$dec_places = Settings::Get('panel.decimal_places');
 				$result['traffic'] = round($result['traffic'] / (1024 * 1024), $dec_places);
 				$result['diskspace'] = round($result['diskspace'] / 1024, $dec_places);
 				$result['email'] = $idna_convert->decode($result['email']);
 
-				$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true);
+				$result = PhpHelper::htmlentitiesArray($result);
-				if ($result['diskspace'] == '-1') {
+
-					$result['diskspace'] = '';
+				$mysql_servers = [];
+				try {
+					$result_json = MysqlServer::getLocal($userinfo)->listing();
+					$result_decoded = json_decode($result_json, true)['data']['list'];
+					foreach ($result_decoded as $dbserver => $dbdata) {
+						$mysql_servers[] = [
+							'label' => $dbdata['caption'],
+							'value' => $dbserver
+						];
+					}
+				} catch (Exception $e) {
+					/* just none */
 				}
 
-				$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true);
+				$phpconfigs = [];
-				if ($result['traffic'] == '-1') {
-					$result['traffic'] = '';
-				}
-
-				$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true);
-				if ($result['subdomains'] == '-1') {
-					$result['subdomains'] = '';
-				}
-
-				$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true);
-				if ($result['emails'] == '-1') {
-					$result['emails'] = '';
-				}
-
-				$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true);
-				if ($result['email_accounts'] == '-1') {
-					$result['email_accounts'] = '';
-				}
-
-				$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true);
-				if ($result['email_forwarders'] == '-1') {
-					$result['email_forwarders'] = '';
-				}
-
-				$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
-				if ($result['email_quota'] == '-1') {
-					$result['email_quota'] = '';
-				}
-
-				$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
-				if ($result['ftps'] == '-1') {
-					$result['ftps'] = '';
-				}
-
-				$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true);
-				if ($result['mysqls'] == '-1') {
-					$result['mysqls'] = '';
-				}
-
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
-
-				$gender_options = \Froxlor\UI\HTML::makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true);
-				$gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['male'], 1, ($result['gender'] == '1' ? true : false), true, true);
-				$gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['female'], 2, ($result['gender'] == '2' ? true : false), true, true);
-
-				$phpconfigs = array();
 				$configs = Database::query("
 					SELECT c.*, fc.description as interpreter
 					FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
 					LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
 				");
 				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-					if ((int) Settings::Get('phpfpm.enabled') == 1) {
+					if ((int)Settings::Get('phpfpm.enabled') == 1) {
-						$phpconfigs[] = array(
+						$phpconfigs[] = [
-							'label' => $row['description'] . " [" . $row['interpreter'] . "]<br />",
+							'label' => $row['description'] . " [" . $row['interpreter'] . "]",
 							'value' => $row['id']
-						);
+						];
 					} else {
-						$phpconfigs[] = array(
+						$phpconfigs[] = [
-							'label' => $row['description'] . "<br />",
+							'label' => $row['description'],
 							'value' => $row['id']
-						);
+						];
 					}
 				}
 
 				// hosting plans
-				$hosting_plans = "";
 				$plans = Database::query("
 					SELECT *
 					FROM `" . TABLE_PANEL_PLANS . "`
 					ORDER BY name ASC
 				");
-				if (Database::num_rows() > 0) {
+				$hosting_plans = [
-					$hosting_plans .= \Froxlor\UI\HTML::makeoption("---", 0, 0, true, true);
+					0 => "---"
-				}
+				];
 				while ($row = $plans->fetch(PDO::FETCH_ASSOC)) {
-					$hosting_plans .= \Froxlor\UI\HTML::makeoption($row['name'], $row['id'], 0, true, true);
+					$hosting_plans[$row['id']] = $row['name'];
+				}
+
+				$available_admins_stmt = Database::prepare("
+					SELECT * FROM `" . TABLE_PANEL_ADMINS . "`
+					WHERE (`customers` = '-1' OR `customers` > `customers_used`)
+					AND adminid <> :currentadmin
+				");
+				Database::pexecute($available_admins_stmt, ['currentadmin' => $result['adminid']]);
+				$admin_select = [
+					0 => "---"
+				];
+				while ($available_admin = $available_admins_stmt->fetch()) {
+					$admin_select[$available_admin['adminid']] = $available_admin['name'] . " (" . $available_admin['loginname'] . ")";
 				}
 
 				$customer_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_edit.php';
-				$customer_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($customer_edit_data);
 
-				$title = $customer_edit_data['customer_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $customer_edit_data['customer_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'customers', 'id' => $id]),
-
+					'formdata' => $customer_edit_data['customer_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("customers/customers_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

admin_index.php

@@ -2,98 +2,119 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'admin';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
-use Froxlor\Api\Commands\Froxlor as Froxlor;
+
 use Froxlor\Api\Commands\Admins as Admins;
+use Froxlor\Api\Commands\Froxlor as Froxlor;
+use Froxlor\CurrentUser;
+use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\Settings;
+use Froxlor\System\Cronjob;
+use Froxlor\System\Crypt;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\Validate\Validate;
+use Froxlor\Language;
+
+$id = (int)Request::any('id');
 
 if ($action == 'logout') {
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "logged out");
+	unset($_SESSION['userinfo']);
+	CurrentUser::setData();
+	session_destroy();
 
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "logged out");
+	Response::redirectTo('index.php');
-
+} elseif ($action == 'suback') {
-	$params = array(
+	if (is_array(CurrentUser::getField('switched_user'))) {
-		'adminid' => (int) $userinfo['adminid']
+		$result = CurrentUser::getData();
-	);
+		$result = $result['switched_user'];
-
+		CurrentUser::setData($result);
-	if (Settings::Get('session.allow_multiple_login') == '1') {
+		$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		$redirect = "admin_" . $target . ".php";
-			WHERE `userid` = :adminid
+		if (!file_exists(\Froxlor\Froxlor::getInstallDir() . "/" . $redirect)) {
-			AND `adminsession` = '1'
+			$redirect = "admin_index.php";
-			AND `hash` = :hash");
+		}
-		$params['hash'] = $s;
+		Response::redirectTo($redirect, null, true);
-	} else {
+	} else {
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		Response::dynamicError("Cannot change back - You've never switched to another user :-)");
-			WHERE `userid` = :adminid
-			AND `adminsession` = '1'");
 	}
-	Database::pexecute($stmt, $params);
-
-	\Froxlor\UI\Response::redirectTo('index.php');
-}
-
-if (isset($_POST['id'])) {
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
 }
 
 if ($page == 'overview') {
-
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_index");
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_index");
+	$params = [];
+	if ($userinfo['customers_see_all'] == '0') {
+		$params = [
+			'adminid' => $userinfo['adminid']
+		];
+	}
 	$overview_stmt = Database::prepare("SELECT COUNT(*) AS `number_customers`,
+				SUM(case when `diskspace` > 0 then `diskspace` else 0 end) AS `diskspace_assigned`,
 				SUM(`diskspace_used`) AS `diskspace_used`,
+				SUM(case when `mysqls` > 0 then `mysqls` else 0 end) AS `mysqls_assigned`,
 				SUM(`mysqls_used`) AS `mysqls_used`,
+				SUM(case when `emails` > 0 then `emails` else 0 end) AS `emails_assigned`,
 				SUM(`emails_used`) AS `emails_used`,
+				SUM(case when `email_accounts` > 0 then `email_accounts` else 0 end) AS `email_accounts_assigned`,
 				SUM(`email_accounts_used`) AS `email_accounts_used`,
+				SUM(case when `email_forwarders` > 0 then `email_forwarders` else 0 end) AS `email_forwarders_assigned`,
 				SUM(`email_forwarders_used`) AS `email_forwarders_used`,
+				SUM(case when `email_quota` > 0 then `email_quota` else 0 end) AS `email_quota_assigned`,
 				SUM(`email_quota_used`) AS `email_quota_used`,
+				SUM(case when `ftps` > 0 then `ftps` else 0 end) AS `ftps_assigned`,
 				SUM(`ftps_used`) AS `ftps_used`,
+				SUM(case when `subdomains` > 0 then `subdomains` else 0 end) AS `subdomains_assigned`,
 				SUM(`subdomains_used`) AS `subdomains_used`,
+				SUM(case when `traffic` > 0 then `traffic` else 0 end) AS `traffic_assigned`,
 				SUM(`traffic_used`) AS `traffic_used`
 				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid "));
-	$overview = Database::pexecute_first($overview_stmt, array(
+	$overview = Database::pexecute_first($overview_stmt, $params);
-		'adminid' => $userinfo['adminid']
-	));
 
-	$dec_places = Settings::Get('panel.decimal_places');
+	$userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1;
-	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $dec_places);
+	$overview['diskspace_bytes'] = $overview['diskspace_assigned'] * 1024;
-	$overview['diskspace_used'] = round($overview['diskspace_used'] / 1024, $dec_places);
+	$overview['diskspace_bytes_used'] = $overview['diskspace_used'] * 1024;
+
+	$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1;
+	$overview['traffic_bytes'] = $overview['traffic_assigned'] * 1024;
+	$overview['traffic_bytes_used'] = $overview['traffic_used'] * 1024;
 
 	$number_domains_stmt = Database::prepare("
 		SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "`
 		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid"));
-	$number_domains = Database::pexecute_first($number_domains_stmt, array(
+	$number_domains = Database::pexecute_first($number_domains_stmt, $params);
-		'adminid' => $userinfo['adminid']
-	));
 
 	$overview['number_domains'] = $number_domains['number_domains'];
 
-	$phpversion = phpversion();
-	$mysqlserverversion = Database::getAttribute(PDO::ATTR_SERVER_VERSION);
-	$webserverinterface = strtoupper(@php_sapi_name());
-
 	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes') || (isset($lookfornewversion) && $lookfornewversion == 'yes')) {
 		try {
 			$json_result = Froxlor::getLocal($userinfo)->checkUpdate();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -103,29 +124,20 @@ if ($page == 'overview') {
 		$lookfornewversion_addinfo = $result['additional_info'];
 		$isnewerversion = $result['isnewerversion'];
 	} else {
-		$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
+		$lookfornewversion_lable = lng('admin.lookfornewversion.clickhere');
-		$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
+		$lookfornewversion_link = htmlspecialchars($filename . '?page=' . urlencode($page) . '&lookfornewversion=yes');
 		$lookfornewversion_message = '';
 		$lookfornewversion_addinfo = '';
 		$isnewerversion = 0;
 	}
 
-	$dec_places = Settings::Get('panel.decimal_places');
+	$cron_last_runs = Cronjob::getCronjobsLastRun();
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $dec_places);
+	$outstanding_tasks = Cronjob::getOutstandingTasks();
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $dec_places);
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $dec_places);
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
-	$userinfo = \Froxlor\PhpHelper::strReplaceArray('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
 
-	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+	// additional sys-infos
-
-	$cron_last_runs = \Froxlor\System\Cronjob::getCronjobsLastRun();
-	$outstanding_tasks = \Froxlor\System\Cronjob::getOutstandingTasks();
-
-	$system_hostname = gethostname();
 	$meminfo = explode("\n", @file_get_contents("/proc/meminfo"));
 	$memory = "";
-	for ($i = 0; $i < sizeof($meminfo); ++ $i) {
+	for ($i = 0; $i < count($meminfo); ++$i) {
 		if (substr($meminfo[$i], 0, 3) === "Mem") {
 			$memory .= $meminfo[$i] . PHP_EOL;
 		}
@@ -136,25 +148,21 @@ if ($page == 'overview') {
 		$load = number_format($loadArray[0], 2, '.', '') . " / " . number_format($loadArray[1], 2, '.', '') . " / " . number_format($loadArray[2], 2, '.', '');
 	} else {
 		$load = @file_get_contents('/proc/loadavg');
-
+		if (!$load) {
-		if (! $load) {
+			$load = lng('admin.noloadavailable');
-			$load = $lng['admin']['noloadavailable'];
 		}
 	}
 
+	$kernel = '';
 	if (function_exists('posix_uname')) {
-		$showkernel = 1;
 		$kernel_nfo = posix_uname();
 		$kernel = $kernel_nfo['release'] . ' (' . $kernel_nfo['machine'] . ')';
-	} else {
-		$showkernel = 0;
-		$kernel = '';
 	}
 
 	// Try to get the uptime
 	// First: With exec (let's hope it's enabled for the Froxlor - vHost)
 	$uptime_array = explode(" ", @file_get_contents("/proc/uptime"));
-
+	$uptime = '';
 	if (is_array($uptime_array) && isset($uptime_array[0]) && is_numeric($uptime_array[0])) {
 		// Some calculatioon to get a nicly formatted display
 		$seconds = round($uptime_array[0], 0);
@@ -165,230 +173,136 @@ if ($page == 'overview') {
 		$minutes = floor($minutes - ($days * 24 * 60) - ($hours * 60));
 		$seconds = floor($seconds - ($days * 24 * 60 * 60) - ($hours * 60 * 60) - ($minutes * 60));
 		$uptime = "{$days}d, {$hours}h, {$minutes}m, {$seconds}s";
-
 		// Just cleanup
 		unset($uptime_array, $seconds, $minutes, $hours, $days);
-	} else {
-		// Nothing of the above worked, show an error :/
-		$uptime = '';
 	}
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/index") . "\";");
+	$sysinfo = [
+		'webserver' => $_SERVER['SERVER_SOFTWARE'] ?? 'unknown',
+		'phpversion' => phpversion(),
+		'mysqlserverversion' => Database::getAttribute(PDO::ATTR_SERVER_VERSION),
+		'phpsapi' => strtoupper(@php_sapi_name()),
+		'hostname' => gethostname(),
+		'memory' => $memory,
+		'load' => $load,
+		'kernel' => $kernel,
+		'uptime' => $uptime
+	];
+
+	UI::twig()->addGlobal('userinfo', $userinfo);
+	UI::view('user/index.html.twig', [
+		'sysinfo' => $sysinfo,
+		'overview' => $overview,
+		'outstanding_tasks' => $outstanding_tasks,
+		'cron_last_runs' => $cron_last_runs
+	]);
 } elseif ($page == 'change_password') {
-
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
+		$old_password = Validate::validate($_POST['old_password'], 'old password');
 
-		if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) {
+		if (!Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) {
-			\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
+			Response::standardError('oldpasswordnotcorrect');
 		}
 
-		$new_password = \Froxlor\Validate\Validate::validate($_POST['new_password'], 'new password');
+		try {
-		$new_password_confirm = \Froxlor\Validate\Validate::validate($_POST['new_password_confirm'], 'new password confirm');
+			$new_password = Crypt::validatePassword($_POST['new_password'], 'new password');
+			$new_password_confirm = Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
 
 		if ($old_password == '') {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'stringisempty',
-				'oldpassword'
+				'changepassword.old_password'
-			));
+			]);
 		} elseif ($new_password == '') {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'stringisempty',
-				'newpassword'
+				'changepassword.new_password'
-			));
+			]);
 		} elseif ($new_password_confirm == '') {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'stringisempty',
-				'newpasswordconfirm'
+				'changepassword.new_password_confirm'
-			));
+			]);
 		} elseif ($new_password != $new_password_confirm) {
-			\Froxlor\UI\Response::standard_error('newpasswordconfirmerror');
+			Response::standardError('newpasswordconfirmerror');
 		} else {
 			try {
-				Admins::getLocal($userinfo, array(
+				Admins::getLocal($userinfo, [
 					'id' => $userinfo['adminid'],
 					'admin_password' => $new_password
-				))->update();
+				])->update();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'changed password');
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'changed password');
-			\Froxlor\UI\Response::redirectTo($filename, Array(
+			Response::redirectTo($filename);
-				's' => $s
-			));
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_password") . "\";");
+		UI::view('user/change_password.html.twig');
 	}
 } elseif ($page == 'change_language') {
-
+	$languages = Language::getLanguages();
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$def_language = \Froxlor\Validate\Validate::validate($_POST['def_language'], 'default language');
+		$def_language = Validate::validate($_POST['def_language'], 'default language');
 
 		if (isset($languages[$def_language])) {
 			try {
-				Admins::getLocal($userinfo, array(
+				Admins::getLocal($userinfo, [
 					'id' => $userinfo['adminid'],
 					'def_language' => $def_language
-				))->update();
+				])->update();
+				CurrentUser::setField('language', $def_language);
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-
-			// also update current session
-			$lng_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `language`= :lng
-				WHERE `hash`= :hash");
-			Database::pexecute($lng_stmt, array(
-				'lng' => $def_language,
-				'hash' => $s
-			));
 		}
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename);
-			's' => $s
-		));
 	} else {
-
-		$language_options = '';
-
 		$default_lang = Settings::Get('panel.standardlanguage');
 		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
-		foreach ($languages as $language_file => $language_name) {
+		UI::view('user/change_language.html.twig', [
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $default_lang, true);
+			'languages' => $languages,
-		}
+			'default_lang' => $default_lang
-
+		]);
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_language") . "\";");
 	}
 } elseif ($page == 'change_theme') {
-
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$theme = \Froxlor\Validate\Validate::validate($_POST['theme'], 'theme');
+		$theme = Validate::validate($_POST['theme'], 'theme');
 		try {
-			Admins::getLocal($userinfo, array(
+			Admins::getLocal($userinfo, [
 				'id' => $userinfo['adminid'],
 				'theme' => $theme
-			))->update();
+			])->update();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 
-		// also update current session
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		$theme_stmt = Database::prepare("
+		Response::redirectTo($filename);
-				UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `theme`= :theme
-				WHERE `hash`= :hash");
-		Database::pexecute($theme_stmt, array(
-			'theme' => $theme,
-			'hash' => $s
-		));
-
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
 	} else {
-
-		$theme_options = '';
-
 		$default_theme = Settings::Get('panel.default_theme');
 		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
-		$themes_avail = \Froxlor\UI\Template::getThemes();
+		$themes_avail = UI::getThemes();
-		foreach ($themes_avail as $t => $d) {
-			$theme_options .= \Froxlor\UI\HTML::makeoption($d, $t, $default_theme, true);
-		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_theme") . "\";");
+		UI::view('user/change_theme.html.twig', [
+			'themes' => $themes_avail,
+			'default_theme' => $default_theme
+		]);
 	}
 } elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_admin') == '1') {
-
+	require_once __DIR__ . '/error_report.php';
-	// only show this if we really have an exception to report
-	if (isset($_GET['errorid']) && $_GET['errorid'] != '') {
-
-		$errid = $_GET['errorid'];
-		// read error file
-		$err_dir = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . "/logs/");
-		$err_file = \Froxlor\FileDir::makeCorrectFile($err_dir . "/" . $errid . "_sql-error.log");
-
-		if (file_exists($err_file)) {
-
-			$error_content = file_get_contents($err_file);
-			$error = explode("|", $error_content);
-
-			$_error = array(
-				'code' => str_replace("\n", "", substr($error[1], 5)),
-				'message' => str_replace("\n", "", substr($error[2], 4)),
-				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(\Froxlor\Froxlor::getInstallDir()))),
-				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(\Froxlor\Froxlor::getInstallDir(), "", substr($error[5], 6))
-			);
-
-			// build mail-content
-			$mail_body = "Dear froxlor-team,\n\n";
-			$mail_body .= "the following error has been reported by a user:\n\n";
-			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
-			$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
-			$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
-			$mail_body .= "-------------------------------------------------------------\n\n";
-			$mail_body .= "Froxlor-version: " . $version . "\n";
-			$mail_body .= "DB-version: " . $dbversion . "\n\n";
-			$mail_body .= "End of report";
-			$mail_html = nl2br($mail_body);
-
-			// send actual report to dev-team
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// send mail and say thanks
-				$_mailerror = false;
-				try {
-					$mail->Subject = '[Froxlor] Error report by user';
-					$mail->AltBody = $mail_body;
-					$mail->MsgHTML($mail_html);
-					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
-					$mail->Send();
-				} catch (\PHPMailer\PHPMailer\Exception $e) {
-					$mailerr_msg = $e->errorMessage();
-					$_mailerror = true;
-				} catch (Exception $e) {
-					$mailerr_msg = $e->getMessage();
-					$_mailerror = true;
-				}
-
-				if ($_mailerror) {
-					// error when reporting an error...LOLFUQ
-					\Froxlor\UI\Response::standard_error('send_report_error', $mailerr_msg);
-				}
-
-				// finally remove error from fs
-				@unlink($err_file);
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					's' => $s
-				));
-			}
-			// show a nice summary of the error-report
-			// before actually sending anything
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/send_error_report") . "\";");
-		} else {
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s
-			));
-		}
-	} else {
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
-	}
 } elseif ($page == 'apikeys' && Settings::Get('api.enabled') == 1) {
 	require_once __DIR__ . '/api_keys.php';
-} elseif ($page == 'apihelp' && Settings::Get('api.enabled') == 1) {
-	require_once __DIR__ . '/apihelp.php';
 } elseif ($page == '2fa' && Settings::Get('2fa.enabled') == 1) {
 	require_once __DIR__ . '/2fa.php';
 }

admin_ipsandports.php

@@ -2,103 +2,92 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'admin';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
-use Froxlor\Api\Commands\IpsAndPorts as IpsAndPorts;
 
-if (isset($_POST['id'])) {
+use Froxlor\Api\Commands\IpsAndPorts;
-	$id = intval($_POST['id']);
+use Froxlor\FroxlorLogger;
-} elseif (isset($_GET['id'])) {
+use Froxlor\PhpHelper;
-	$id = intval($_GET['id']);
+use Froxlor\UI\Collection;
-}
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
-if ($page == 'ipsandports' || $page == 'overview') {
+$id = (int)Request::any('id');
-	// Do not display attributes that are not used by the current webserver
-	$websrv = Settings::Get('system.webserver');
-	$is_nginx = ($websrv == 'nginx');
-	$is_apache = ($websrv == 'apache2');
-	$is_apache24 = $is_apache && (Settings::Get('system.apache24') === '1');
 
+if (($page == 'ipsandports' || $page == 'overview') && $userinfo['change_serversettings'] == '1') {
 	if ($action == '') {
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
+		try {
-		$fields = array(
+			$ipsandports_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.ipsandports.php';
-			'ip' => $lng['admin']['ipsandports']['ip'],
+			$collection = (new Collection(IpsAndPorts::class, $userinfo))
-			'port' => $lng['admin']['ipsandports']['port']
+				->withPagination($ipsandports_list_data['ipsandports_list']['columns'], $ipsandports_list_data['ipsandports_list']['default_sorting']);
-		);
+		} catch (Exception $e) {
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_IPSANDPORTS, $fields);
+			Response::dynamicError($e->getMessage());
-		$ipsandports = '';
+		}
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt);
-		$paging->setEntries(Database::num_rows());
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
 
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		UI::view('user/table.html.twig', [
-
+			'listing' => Listing::format($collection, $ipsandports_list_data, 'ipsandports_list'),
-			if ($paging->checkDisplay($i)) {
+			'actions_links' => [
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+				[
-				if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					'href' => $linker->getLink(['section' => 'ipsandports', 'page' => $page, 'action' => 'add']),
-					$row['ip'] = '[' . $row['ip'] . ']';
+					'label' => lng('admin.ipsandports.add')
-				}
+				]
-				eval("\$ipsandports.=\"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_ipandport") . "\";");
+			]
-				$count ++;
+		]);
-			}
-			$i ++;
-		}
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports") . "\";");
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = IpsAndPorts::getLocal($userinfo, array(
+			$json_result = IpsAndPorts::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['id']) && $result['id'] == $id) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
 				try {
-					IpsAndPorts::getLocal($userinfo, array(
+					IpsAndPorts::getLocal($userinfo, [
 						'id' => $id
-					))->delete();
+					])->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
 
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('admin_ip_reallydelete', $filename, array(
+				HTML::askYesNo('admin_ip_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['ip'] . ':' . $result['port']);
+				], $result['ip'] . ':' . $result['port']);
 			}
 		}
 	} elseif ($action == 'add') {
@@ -106,56 +95,59 @@ if ($page == 'ipsandports' || $page == 'overview') {
 			try {
 				IpsAndPorts::getLocal($userinfo, $_POST)->add();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-
 			$ipsandports_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
-			$ipsandports_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($ipsandports_add_data);
 
-			$title = $ipsandports_add_data['ipsandports_add']['title'];
+			UI::view('user/form.html.twig', [
-			$image = $ipsandports_add_data['ipsandports_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'ipsandports']),
-
+				'formdata' => $ipsandports_add_data['ipsandports_add']
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_add") . "\";");
+			]);
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = IpsAndPorts::getLocal($userinfo, array(
+			$json_result = IpsAndPorts::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if ($result['ip'] != '') {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					IpsAndPorts::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
+				$result = PhpHelper::htmlentitiesArray($result);
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
 				$ipsandports_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
-				$ipsandports_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($ipsandports_edit_data);
 
-				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'ipsandports', 'id' => $id]),
-
+					'formdata' => $ipsandports_edit_data['ipsandports_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
+	} elseif ($action == 'jqCheckIP') {
+		$ip = $_POST['ip'] ?? "";
+		if ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) && filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE | FILTER_FLAG_NO_PRIV_RANGE) == false) {
+			// returns notice if private network detected so we can display it
+			echo json_encode(lng('admin.ipsandports.ipnote'));
+		} else {
+			echo 0;
+		}
+		exit();
 	}
 }

admin_logger.php

@@ -2,130 +2,75 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\SysLog;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
 
 if ($page == 'log' && $userinfo['change_serversettings'] == '1') {
 	if ($action == '') {
-		$fields = array(
+		try {
-			'date' => $lng['logger']['date'],
+			$syslog_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.syslog.php';
-			'type' => $lng['logger']['type'],
+			$collection = (new Collection(SysLog::class, $userinfo))
-			'user' => $lng['logger']['user'],
+				->withPagination($syslog_list_data['syslog_list']['columns'], $syslog_list_data['syslog_list']['default_sorting']);
-			'text' => $lng['logger']['action']
+		} catch (Exception $e) {
-		);
+			Response::dynamicError($e->getMessage());
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc', 30);
-		$query = 'SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy();
-		$result_stmt = Database::query($query . ' ' . $paging->getSqlLimit());
-		$result_cnt_stmt = Database::query($query);
-		$logs_count = $result_cnt_stmt->rowCount();
-		$paging->setEntries($logs_count);
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$clog = array();
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if (! isset($clog[$row['action']]) || ! is_array($clog[$row['action']])) {
-				$clog[$row['action']] = array();
-			}
-			$clog[$row['action']][$row['logid']] = $row;
 		}
 
-		if ($paging->sortfield == 'date' && $paging->sortorder == 'desc') {
+		UI::view('user/table.html.twig', [
-			krsort($clog);
+			'listing' => Listing::format($collection, $syslog_list_data, 'syslog_list'),
-		} else {
+			'actions_links' => [
-			ksort($clog);
+				[
-		}
+					'href' => $linker->getLink(['section' => 'logger', 'page' => 'log', 'action' => 'truncate']),
-
+					'label' => lng('logger.truncate'),
-		$i = 0;
+					'icon' => 'fa-solid fa-recycle',
-		$count = 0;
+					'class' => 'btn-warning'
-		$log_count = 0;
+				]
-		$log = '';
+			]
-		foreach ($clog as $action => $logrows) {
+		]);
-			$_action = 0;
-			foreach ($logrows as $row) {
-				// if ($paging->checkDisplay($i)) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				$row['date'] = date("d.m.y H:i:s", $row['date']);
-
-				if ($_action != $action) {
-					switch ($action) {
-						case \Froxlor\FroxlorLogger::USR_ACTION:
-							$_action = $lng['admin']['customer'];
-							break;
-						case \Froxlor\FroxlorLogger::RES_ACTION:
-							$_action = $lng['logger']['reseller'];
-							break;
-						case \Froxlor\FroxlorLogger::ADM_ACTION:
-							$_action = $lng['logger']['admin'];
-							break;
-						case \Froxlor\FroxlorLogger::CRON_ACTION:
-							$_action = $lng['logger']['cron'];
-							break;
-						case \Froxlor\FroxlorLogger::LOGIN_ACTION:
-							$_action = $lng['logger']['login'];
-							break;
-						case \Froxlor\FroxlorLogger::LOG_ERROR:
-							$_action = $lng['logger']['intern'];
-							break;
-						default:
-							$_action = $lng['logger']['unknown'];
-							break;
-					}
-
-					$row['action'] = $_action;
-					eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_action') . "\";");
-				}
-
-				$log_count ++;
-				$row['type'] = \Froxlor\FroxlorLogger::getInstanceOf()->getLogLevelDesc($row['type']);
-				eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_log') . "\";");
-				$count ++;
-				$_action = $action;
-				// }
-				$i ++;
-			}
-			$i ++;
-		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('logger/logger') . "\";");
 	} elseif ($action == 'truncate') {
-
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$truncatedate = time() - (60 * 10);
+			try {
-			$trunc_stmt = Database::prepare("
+				SysLog::getLocal($userinfo, [
-				DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < :trunc");
+					'min_to_keep' => 10
-			Database::pexecute($trunc_stmt, array(
+				])->delete();
-				'trunc' => $truncatedate
+			} catch (Exception $e) {
-			));
+				Response::dynamicError($e->getMessage());
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
+			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			\Froxlor\UI\HTML::askYesNo('logger_reallytruncate', $filename, array(
+			HTML::askYesNo('logger_reallytruncate', $filename, [
 				'page' => $page,
 				'action' => $action
-			), TABLE_PANEL_LOG);
+			], TABLE_PANEL_LOG);
 		}
 	}
 }

admin_message.php

@@ -2,126 +2,149 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
+
-require './lib/init.php';
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
 
 use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\User;
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
+
-} elseif (isset($_GET['id'])) {
+$note_type = null;
-	$id = intval($_GET['id']);
+$note_msg = null;
-}
 
 if ($page == 'message') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
 
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			if ($_POST['receipient'] == 0 && $userinfo['customers_see_all'] == '1') {
+			if ($_POST['recipient'] == 0 && $userinfo['customers_see_all'] == '1') {
-				$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
+				$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
 				$result = Database::query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
-			} elseif ($_POST['receipient'] == 1) {
+			} elseif ($_POST['recipient'] == 1) {
 				if ($userinfo['customers_see_all'] == '1') {
-					$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
+					$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
 					$result = Database::query('SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
 				} else {
-					$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
+					$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
 					$result = Database::prepare('
 						SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`
 						WHERE `adminid` = :adminid");
-					Database::pexecute($result, array(
+					Database::pexecute($result, [
 						'adminid' => $userinfo['adminid']
-					));
+					]);
 				}
 			} else {
-				\Froxlor\UI\Response::standard_error('noreceipientsgiven');
+				Response::standardError('norecipientsgiven');
 			}
 
 			$subject = $_POST['subject'];
 			$message = wordwrap($_POST['message'], 70);
 
-			if (! empty($message)) {
+			if (!empty($message)) {
 				$mailcounter = 0;
 				$mail->Body = $message;
 				$mail->Subject = $subject;
 
 				while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-
 					$row['firstname'] = isset($row['firstname']) ? $row['firstname'] : '';
 					$row['company'] = isset($row['company']) ? $row['company'] : '';
-					$mail->AddAddress($row['email'], \Froxlor\User::getCorrectUserSalutation(array(
+					$mail->AddAddress($row['email'], User::getCorrectUserSalutation([
 						'firstname' => $row['firstname'],
 						'name' => $row['name'],
 						'company' => $row['company']
-					)));
+					]));
 					$mail->From = $userinfo['email'];
 					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];
 
-					if (! $mail->Send()) {
+					if (!$mail->Send()) {
 						if ($mail->ErrorInfo != '') {
 							$mailerr_msg = $mail->ErrorInfo;
 						} else {
 							$mailerr_msg = $row['email'];
 						}
 
-						$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
+						$log->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
-						\Froxlor\UI\Response::standard_error('errorsendingmail', $row['email']);
+						Response::standardError('errorsendingmail', $row['email']);
 					}
 
-					$mailcounter ++;
+					$mailcounter++;
 					$mail->ClearAddresses();
 				}
 
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
 					'page' => $page,
-					's' => $s,
 					'action' => 'showsuccess',
 					'sentitems' => $mailcounter
-				));
+				]);
 			} else {
-				\Froxlor\UI\Response::standard_error('nomessagetosend');
+				Response::standardError('nomessagetosend');
 			}
 		}
-	}
+	} elseif ($action == 'showsuccess') {
-
+		$sentitems = isset($_GET['sentitems']) ? (int)$_GET['sentitems'] : 0;
-	if ($action == 'showsuccess') {
-
-		$success = 1;
-		$sentitems = isset($_GET['sentitems']) ? (int) $_GET['sentitems'] : 0;
 
 		if ($sentitems == 0) {
-			$successmessage = $lng['message']['noreceipients'];
+			$note_type = 'info';
+			$note_msg = lng('message.norecipients');
 		} else {
-			$successmessage = str_replace('%s', $sentitems, $lng['message']['success']);
+			$note_type = 'success';
+			$note_msg = str_replace('%s', $sentitems, lng('message.success'));
 		}
-	} else {
-		$success = 0;
-		$sentitems = 0;
-		$successmessage = '';
 	}
 
-	$action = '';
+	$recipients = [];
-	$receipients = '';
 
 	if ($userinfo['customers_see_all'] == '1') {
-		$receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['reseller'], 0);
+		$recipients[0] = lng('panel.reseller');
 	}
+	$recipients[1] = lng('panel.customer');
 
-	$receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['customer'], 1);
+	$messages_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/messages/formfield.messages_add.php';
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('message/message') . "\";");
+
+	UI::view('user/form-note.html.twig', [
+		'formaction' => $linker->getLink(['section' => 'message']),
+		'formdata' => $messages_add_data['messages_add'],
+		'actions_links' => [
+			[
+				'href' => $linker->getLink([
+					'section' => 'settings',
+					'page' => 'overview',
+					'part' => 'system',
+					'em' => 'system_mail_use_smtp'
+				]),
+				'label' => lng('admin.smtpsettings'),
+				'icon' => 'fa-solid fa-gears',
+				'class' => 'btn-outline-secondary'
+			]
+		],
+		// alert-box
+		'type' => $note_type,
+		'alert_msg' => $note_msg
+	]);
 }

admin_mysqlserver.php

@@ -0,0 +1,144 @@
+<?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
+ */
+
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\MysqlServer;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+
+$id = (int)Request::any('id');
+
+if (($page == 'mysqlserver' || $page == 'overview') && $userinfo['change_serversettings'] == '1') {
+	if ($action == '') {
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_mysqlserver");
+
+		try {
+			$mysqlserver_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.mysqlserver.php';
+			$collection = (new Collection(MysqlServer::class, $userinfo))
+				->withPagination($mysqlserver_list_data['mysqlserver_list']['columns'], $mysqlserver_list_data['mysqlserver_list']['default_sorting']);
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+
+		UI::view('user/table.html.twig', [
+			'listing' => Listing::format($collection, $mysqlserver_list_data, 'mysqlserver_list'),
+			'actions_links' => [
+				[
+					'href' => $linker->getLink(['section' => 'mysqlserver', 'page' => $page, 'action' => 'add']),
+					'label' => lng('admin.mysqlserver.add')
+				]
+			]
+		]);
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = MysqlServer::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if (isset($result['id']) && $result['id'] == $id) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					MysqlServer::getLocal($userinfo, [
+						'id' => $id
+					])->delete();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				HTML::askYesNo('admin_mysqlserver_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['caption'] . ' (' . $result['host'] . ')');
+			}
+		}
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				MysqlServer::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				Response::dynamicError($e->getMessage());
+			}
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
+		} else {
+			$mysqlserver_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/mysqlserver/formfield.mysqlserver_add.php';
+
+			UI::view('user/form.html.twig', [
+				'formaction' => $linker->getLink(['section' => 'mysqlserver']),
+				'formdata' => $mysqlserver_add_data['mysqlserver_add']
+			]);
+		}
+	} elseif ($action == 'edit' && $id >= 0) {
+		try {
+			$json_result = MysqlServer::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if (isset($result['id']) && $result['id'] == $id) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					MysqlServer::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				$result = PhpHelper::htmlentitiesArray($result);
+
+				$mysqlserver_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/mysqlserver/formfield.mysqlserver_edit.php';
+
+				UI::view('user/form.html.twig', [
+					'formaction' => $linker->getLink(['section' => 'mysqlserver', 'id' => $id]),
+					'formdata' => $mysqlserver_edit_data['mysqlserver_edit'],
+					'editid' => $id
+				]);
+			}
+		}
+	}
+}

admin_opcacheinfo.php

@@ -4,153 +4,305 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Janos Muzsi <muzsij@hypernics.hu> (2016)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
- * Based on https://github.com/amnuts/opcache-gui
+ * 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>
+ * @author     Janos Muzsi <muzsij@hypernics.hu>
+ * @author     Andrew Collington <andy@amnuts.com>
+ * @license    https://files.froxlor.org/misc/COPYING.txt GPLv2
+ *
+ * Based on https://github.com/amnuts/opcache-gui, which is
+ * licensed under the MIT licence, which can be viewed
+ * online at https://acollington.mit-license.org/
  */
-define('AREA', 'admin');
+
-require './lib/init.php';
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\FroxlorLogger;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\UI\HTML;
 
 if ($action == 'reset' && function_exists('opcache_reset') && $userinfo['change_serversettings'] == '1') {
+	if ($_POST['send'] == 'send') {
 		opcache_reset();
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "reseted OPcache");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "reset OPcache");
-	header('Location: ' . $linker->getLink(array(
+		header('Location: ' . $linker->getLink([
 				'section' => 'opcacheinfo',
 				'page' => 'showinfo'
-	)));
+			]));
 		exit();
+	} else {
+		HTML::askYesNo('cache_reallydelete', $filename, [
+			'page' => $page,
+			'action' => 'reset',
+		], '', [
+			'section' => 'opcacheinfo',
+			'page' => 'showinfo'
+		]);
+	}
 }
 
-if (! function_exists('opcache_get_configuration')) {
+if (!function_exists('opcache_get_configuration')) {
-	\Froxlor\UI\Response::standard_error($lng['error']['no_opcacheinfo']);
+	Response::standardError(lng('error.no_opcacheinfo'));
 }
 
-if ($page == 'showinfo') {
+if ($page == 'showinfo' && $userinfo['change_serversettings'] == '1') {
-
-	$opcache_info = opcache_get_configuration();
-	$opcache_status = opcache_get_status(false);
 	$time = time();
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed OPcache info");
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed OPcache info");
 
-	$runtimelines = '';
+	$optimizationLevels = [
-	if (isset($opcache_info['directives']) && is_array($opcache_info['directives'])) {
+		1 << 0 => 'CSE, STRING construction',
-		foreach ($opcache_info['directives'] as $name => $value) {
+		1 << 1 => 'Constant conversion and jumps',
-			$linkname = str_replace('_', '-', $name);
+		1 << 2 => '++, +=, series of jumps',
-			if ($name == 'opcache.optimization_level' && is_integer($value)) {
+		1 << 3 => 'INIT_FCALL_BY_NAME -> DO_FCALL',
-				$value = '0x' . dechex($value);
+		1 << 4 => 'CFG based optimization',
-			}
+		1 << 5 => 'DFA based optimization',
-			if ($name == 'opcache.memory_consumption' && is_integer($value) && $value % (1024 * 1024) == 0) {
+		1 << 6 => 'CALL GRAPH optimization',
-				$value = $value / (1024 * 1024);
+		1 << 7 => 'SCCP (constant propagation)',
-			}
+		1 << 8 => 'TMP VAR usage',
-			if ($value === null || $value === '') {
+		1 << 9 => 'NOP removal',
-				$value = $lng['opcacheinfo']['novalue'];
+		1 << 10 => 'Merge equal constants',
-			}
+		1 << 11 => 'Adjust used stack',
-			if ($value === true) {
+		1 << 12 => 'Remove unused variables',
-				$value = $lng['opcacheinfo']['true'];
+		1 << 13 => 'DCE (dead code elimination)',
-			}
+		1 << 14 => '(unsafe) Collect constants',
-			if ($value === false) {
+		1 << 15 => 'Inline functions'
-				$value = $lng['opcacheinfo']['false'];
+	];
-			}
+
-			if (is_integer($value)) {
+	$jitModes = [
-				$value = number_format($value, 0, '.', ' ');
+		[
-			}
+			'flag' => 'CPU-specific optimization',
-			$name = str_replace('_', ' ', $name);
+			'value' => [
-			eval("\$runtimelines.=\"" . \Froxlor\UI\Template::getTemplate("settings/opcacheinfo/runtime_line") . "\";");
+				'Disable CPU-specific optimization',
-		}
+				'Enable use of AVX, if the CPU supports it'
+			]
+		],
+		[
+			'flag' => 'Register allocation',
+			'value' => [
+				'Do not perform register allocation',
+				'Perform block-local register allocation',
+				'Perform global register allocation'
+			]
+		],
+		[
+			'flag' => 'Trigger',
+			'value' => [
+				'Compile all functions on script load',
+				'Compile functions on first execution',
+				'Profile functions on first request and compile the hottest functions afterwards',
+				'Profile on the fly and compile hot functions',
+				'Currently unused',
+				'Use tracing JIT. Profile on the fly and compile traces for hot code segments'
+			]
+		],
+		[
+			'flag' => 'Optimization level',
+			'value' => [
+				'No JIT',
+				'Minimal JIT (call standard VM handlers)',
+				'Inline VM handlers',
+				'Use type inference',
+				'Use call graph',
+				'Optimize whole script'
+			]
+		]
+	];
+
+	$jitModeMapping = [
+		'tracing' => 1254,
+		'on' => 1254,
+		'function' => 1205
+	];
+
+	$status = opcache_get_status(false);
+	$config = opcache_get_configuration();
+	$missingConfig = array_diff_key(ini_get_all('zend opcache', false), $config['directives']);
+	if (!empty($missingConfig)) {
+		$config['directives'] = array_merge($config['directives'], $missingConfig);
 	}
 
-	$cachehits = @$opcache_status['opcache_statistics']['hits'] ?: 0;
+	$files = [];
-	$cachemiss = @$opcache_status['opcache_statistics']['misses'] ?: 0;
+	if (!empty($status['scripts'])) {
-	$blacklistmiss = @$opcache_status['opcache_statistics']['blacklist_misses'] ?: 0;
+		uasort($status['scripts'], static function ($a, $b) {
-	$cachetotal = $cachehits + $cachemiss + $blacklistmiss;
+			return $a['hits'] <=> $b['hits'];
+		});
+		foreach ($status['scripts'] as &$file) {
+			$file['full_path'] = str_replace('\\', '/', $file['full_path']);
+			$file['readable'] = [
+				'hits' => number_format($file['hits']),
+				'memory_consumption' => bsize($file['memory_consumption'])
+			];
+		}
+		$files = array_values($status['scripts']);
+	}
 
-	$general = array(
+	if ($config['directives']['opcache.file_cache_only'] || !empty($status['file_cache_only'])) {
-		'version' => (isset($opcache_info['version']['opcache_product_name']) ? $opcache_info['version']['opcache_product_name'] . ' ' : '') . $opcache_info['version']['version'],
+		$overview = false;
-		'phpversion' => phpversion(),
+	} else {
-		'start_time' => @$opcache_status['opcache_statistics']['start_time'] ? date('Y-m-d H:i:s', $opcache_status['opcache_statistics']['start_time']) : '',
+		$status['opcache_statistics']['start_time'] = $status['opcache_statistics']['start_time'] ?? time();
-		'last_restart_time' => @$opcache_status['opcache_statistics']['last_restart_time'] ? date('Y-m-d H:i:s', $opcache_status['opcache_statistics']['last_restart_time']) : $lng['opcacheinfo']['never'],
+		$status['opcache_statistics']['last_restart_time'] = $status['opcache_statistics']['last_restart_time'] ?? time();
-		'oom_restarts' => number_format(@$opcache_status['opcache_statistics']['oom_restarts'] ?: 0, 0, '.', ' '),
-		'hash_restarts' => number_format(@$opcache_status['opcache_statistics']['hash_restarts'] ?: 0, 0, '.', ' '),
-		'manual_restarts' => number_format(@$opcache_status['opcache_statistics']['manual_restarts'] ?: 0, 0, '.', ' '),
-		'status' => (@$opcache_status['restart_in_progress'] ? $lng['opcacheinfo']['restartinprogress'] : (@$opcache_status['restart_pending'] ? $lng['opcacheinfo']['restartpending'] : (@$opcache_status['cache_full'] ? $lng['opcacheinfo']['cachefull'] : (@$opcache_status['opcache_enabled'] ? $lng['opcacheinfo']['enabled'] : $lng['opcacheinfo']['novalue'])))),
-		'cachedscripts' => number_format(@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0, 0, '.', ' '),
-		'cachehits' => number_format($cachehits, 0, '.', ' ') . ($cachetotal > 0 ? sprintf(" (%.1f %%)", $cachehits / ($cachetotal) * 100) : ''),
-		'cachemiss' => number_format($cachemiss, 0, '.', ' ') . ($cachetotal > 0 ? sprintf(" (%.1f %%)", $cachemiss / ($cachetotal) * 100) : ''),
-		'blacklistmiss' => number_format($blacklistmiss, 0, '.', ' ') . ($cachetotal > 0 ? sprintf(" (%.1f %%)", $blacklistmiss / ($cachetotal) * 100) : '')
-	);
 
-	$usedmem = @$opcache_status['memory_usage']['used_memory'] ?: 0;
+		$overview = array_merge(
-	$usedmemstr = bsize($usedmem);
+			$status['memory_usage'],
-	$freemem = @$opcache_status['memory_usage']['free_memory'] ?: 0;
+			$status['opcache_statistics'],
-	$freememstr = bsize($freemem);
+			[
-	$totalmem = $usedmem + $freemem;
+				'total_memory' => $config['directives']['opcache.memory_consumption'],
-	$wastedmem = @$opcache_status['memory_usage']['wasted_memory'] ?: 0;
+				'used_memory_percentage' => round(100 * (
-	$wastedmemstr = bsize($wastedmem);
+						($status['memory_usage']['used_memory'] + $status['memory_usage']['wasted_memory'])
-	if ($totalmem) {
+						/ $config['directives']['opcache.memory_consumption']
-		$memory = array(
+					)),
-			'total' => bsize($totalmem),
+				'hit_rate_percentage' => round($status['opcache_statistics']['opcache_hit_rate']),
-			'used' => $usedmemstr . ($totalmem > 0 ? sprintf(" (%.1f %%)", $usedmem / ($totalmem) * 100) : ''),
+				'used_key_percentage' => round(100 * ($status['opcache_statistics']['num_cached_keys']
-			'free' => $freememstr . ($totalmem > 0 ? sprintf(" (%.1f %%)", $freemem / ($totalmem) * 100) : ''),
+						/ $status['opcache_statistics']['max_cached_keys']
-			'wasted' => $wastedmemstr . ($totalmem > 0 ? sprintf(" (%.1f %%)", $wastedmem / ($totalmem) * 100) : '')
+					)),
+				'wasted_percentage' => round($status['memory_usage']['current_wasted_percentage'], 2),
+				'readable' => [
+					'total_memory' => bsize($config['directives']['opcache.memory_consumption']),
+					'used_memory' => bsize($status['memory_usage']['used_memory']),
+					'free_memory' => bsize($status['memory_usage']['free_memory']),
+					'wasted_memory' => bsize($status['memory_usage']['wasted_memory']),
+					'num_cached_scripts' => number_format($status['opcache_statistics']['num_cached_scripts']),
+					'hits' => number_format($status['opcache_statistics']['hits']),
+					'misses' => number_format($status['opcache_statistics']['misses']),
+					'blacklist_miss' => number_format($status['opcache_statistics']['blacklist_misses']),
+					'num_cached_keys' => number_format($status['opcache_statistics']['num_cached_keys']),
+					'max_cached_keys' => number_format($status['opcache_statistics']['max_cached_keys']),
+					'interned' => null,
+					'start_time' => (new DateTimeImmutable("@{$status['opcache_statistics']['start_time']}"))
+						->setTimezone(new DateTimeZone(date_default_timezone_get()))
+						->format('Y-m-d H:i:s'),
+					'last_restart_time' => ($status['opcache_statistics']['last_restart_time'] == 0
+						? 'never'
+						: (new DateTimeImmutable("@{$status['opcache_statistics']['last_restart_time']}"))
+							->setTimezone(new DateTimeZone(date_default_timezone_get()))
+							->format('Y-m-d H:i:s')
+					)
+				]
+			]
 		);
 	}
 
-	if (isset($opcache_status['interned_strings_usage'])) {
+	$preload = [];
-		$usedstring = @$opcache_status['interned_strings_usage']['used_memory'] ?: 0;
+	if (!empty($status['preload_statistics']['scripts'])) {
-		$usedstringstr = bsize($usedstring);
+		$preload = $status['preload_statistics']['scripts'];
-		$freestring = @$opcache_status['interned_strings_usage']['free_memory'] ?: 0;
+		sort($preload, SORT_STRING);
-		$freestringstr = bsize($freestring);
+		if ($overview) {
-		$totalstring = $usedstring + $freestring;
+			$overview['preload_memory'] = $status['preload_statistics']['memory_consumption'];
-		$stringbuffer = array(
+			$overview['readable']['preload_memory'] = bsize($status['preload_statistics']['memory_consumption']);
-			'total' => bsize($totalstring),
+		}
-			'used' => $usedstringstr . ($totalstring > 0 ? sprintf(" (%.1f %%)", $usedstring / $totalstring * 100) : ''),
+	}
-			'free' => $freestringstr . ($totalstring > 0 ? sprintf(" (%.1f %%)", $freestring / $totalstring * 100) : ''),
+
-			'strcount' => number_format(@$opcache_status['interned_strings_usage']['number_of_strings'] ?: 0, 0, '.', ' ')
+	if (!empty($status['interned_strings_usage'])) {
+		$overview['readable']['interned'] = [
+			'buffer_size' => bsize($status['interned_strings_usage']['buffer_size']),
+			'strings_used_memory' => bsize($status['interned_strings_usage']['used_memory']),
+			'strings_free_memory' => bsize($status['interned_strings_usage']['free_memory']),
+			'number_of_strings' => number_format($status['interned_strings_usage']['number_of_strings'])
+		];
+	}
+
+	if ($overview && !empty($status['jit'])) {
+		$overview['jit_buffer_used_percentage'] = ($status['jit']['buffer_size']
+			? round(100 * (($status['jit']['buffer_size'] - $status['jit']['buffer_free']) / $status['jit']['buffer_size']))
+			: 0
 		);
+		$overview['readable'] = array_merge($overview['readable'], [
+			'jit_buffer_size' => bsize($status['jit']['buffer_size']),
+			'jit_buffer_free' => bsize($status['jit']['buffer_free'])
+		]);
 	}
 
-	$usedkey = @$opcache_status['opcache_statistics']['num_cached_keys'] ?: 0;
+	$directives = [];
-	$usedkeystr = number_format($usedkey, 0, '.', ' ');
+	ksort($config['directives']);
-	$totalkey = @$opcache_status['opcache_statistics']['max_cached_keys'] ?: 0;
+	foreach ($config['directives'] as $k => $v) {
-	$wastedkey = $usedkey - (@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0);
+		if (in_array($k, ['opcache.max_file_size', 'opcache.memory_consumption', 'opcache.jit_buffer_size']) && $v) {
-	if (isset($opcache_status['opcache_statistics'])) {
+			$v = bsize($v) . " ({$v})";
-		$keystat = array(
+		} elseif ($k === 'opcache.optimization_level') {
-			'total' => number_format($totalkey, 0, '.', ' '),
+			$levels = [];
-			'used' => $usedkeystr . ($totalkey > 0 ? sprintf(" (%.1f %%)", $usedkey / ($totalkey) * 100) : ''),
+			foreach ($optimizationLevels as $level => $info) {
-			'wasted' => number_format($wastedkey, 0, '.', ' ') . ($totalkey > 0 ? sprintf(" (%.1f %%)", $wastedkey / ($totalkey) * 100) : '')
+				if ($level & $v) {
+					$levels[] = "{$info} [{$level}]";
+				}
+			}
+			$v = $levels ?: 'none';
+		} elseif ($k === 'opcache.jit') {
+			if ($v === '1') {
+				$v = 'on';
+			}
+			if (isset($jitModeMapping[$v]) || is_numeric($v)) {
+				$levels = [];
+				foreach (str_split((string)($jitModeMapping[$v] ?? $v)) as $type => $level) {
+					$levels[] = "{$level}: {$jitModes[$type]['value'][$level]} ({$jitModes[$type]['flag']})";
+				}
+				$v = [$v, $levels];
+			} elseif (empty($v) || strtolower($v) === 'off') {
+				$v = 'Off';
+			}
+		}
+		$directives[] = [
+			'k' => $k,
+			'v' => $v
+		];
+	}
+
+	$version = array_merge(
+		$config['version'],
+		[
+			'php' => phpversion(),
+			'server' => $_SERVER['SERVER_SOFTWARE'] ?: '',
+			'host' => (function_exists('gethostname')
+				? gethostname()
+				: (php_uname('n')
+					?: (empty($_SERVER['SERVER_NAME'])
+						? $_SERVER['HOST_NAME']
+						: $_SERVER['SERVER_NAME']
+					)
+				)
+			)
+		]
 	);
-	}
 
-	$blacklistlines = '';
+	UI::view('settings/opcacheinfo.html.twig', [
-	if (isset($opcache_info['blacklist']) && is_array($opcache_info['blacklist'])) {
+		'opcacheinfo' => [
-		foreach ($opcache_info['blacklist'] as $value) {
+			'version' => $version,
-			eval("\$blacklistlines.=\"" . \Froxlor\UI\Template::getTemplate("settings/opcacheinfo/blacklist_line") . "\";");
+			'overview' => $overview,
-		}
+			'files' => $files,
-	}
+			'preload' => $preload,
-
+			'directives' => $directives,
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/opcacheinfo/showinfo") . "\";");
+			'blacklist' => $config['blacklist'],
+			'functions' => get_extension_funcs('Zend OPcache')
+		]
+	]);
 }
 
-function bsize($s)
+function bsize($size)
 {
-	foreach (array(
+	$i = 0;
-		'',
+	$val = ['b', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-		'K',
+	while (($size / 1024) > 1) {
-		'M',
+		$size /= 1024;
-		'G'
+		++$i;
-	) as $i => $k) {
-		if ($s < 1024)
-			break;
-		$s /= 1024;
 	}
-	return sprintf("%5.1f %sBytes", $s, $k);
+	return sprintf(
+		'%.2f%s%s',
+		$size,
+		'',
+		$val[$i]
+	);
 }

admin_phpsettings.php

@@ -2,333 +2,296 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\FpmDaemons;
+use Froxlor\Api\Commands\PhpSettings;
 use Froxlor\Database\Database;
-use Froxlor\Api\Commands\PhpSettings as PhpSettings;
+use Froxlor\Froxlor;
-use Froxlor\Api\Commands\FpmDaemons as FpmDaemons;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
 if ($page == 'overview') {
-
 	if ($action == '') {
-
 		try {
-			$json_result = PhpSettings::getLocal($userinfo, array(
+			$phpconf_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.phpconfigs.php';
-				'with_subdomains' => true
+			$collection = (new Collection(PhpSettings::class, $userinfo, ['with_subdomains' => true]))
-			))->listing();
+				->withPagination($phpconf_list_data['phpconf_list']['columns'], $phpconf_list_data['phpconf_list']['default_sorting']);
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
-		}
-		$result = json_decode($json_result, true)['data'];
-
-		$tablecontent = '';
-		$count = 0;
-		if (isset($result['count']) && $result['count'] > 0) {
-			foreach ($result['list'] as $row) {
-				if (isset($row['is_default']) && $row['is_default'] == true) {
-					$row['description'] = "<b>" . $row['description'] . "</b>";
-				}
-				$domains = "";
-				$subdomains_count = count($row['subdomains']);
-				foreach ($row['domains'] as $configdomain) {
-					$domains .= $configdomain . "<br>";
-				}
-				$count ++;
-				if ($subdomains_count == 0 && empty($domains)) {
-					$domains = $lng['admin']['phpsettings']['notused'];
-				}
-				eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_overview") . "\";");
-			}
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview") . "\";");
+		UI::view('user/table.html.twig', [
+			'listing' => Listing::format($collection, $phpconf_list_data, 'phpconf_list'),
+			'actions_links' => (bool)$userinfo['change_serversettings'] ? [
+				[
+					'href' => $linker->getLink(['section' => 'phpsettings', 'page' => $page, 'action' => 'add']),
+					'label' => lng('admin.phpsettings.addnew')
+				]
+			] : []
+		]);
 	}
 
 	if ($action == 'add') {
-
+		if ((int)$userinfo['change_serversettings'] == 1) {
-		if ((int) $userinfo['change_serversettings'] == 1) {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					PhpSettings::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
+				if (file_exists(Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php')) {
+					include Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php';
+					$result = [
+						'phpsettings' => $phpini
+					];
+				} else {
+					// use first php-config as fallback
 					$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
 					$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+				}
 
-				$fpmconfigs = '';
+				$fpmconfigs = [];
 				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
 				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-					$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], 1, true, true);
+					$fpmconfigs[$row['id']] = $row['description'];
 				}
 
-				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', 'static', true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'static', true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', 'static', true, true);
-
 				$phpconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
-				$phpconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_add_data);
 
-				$title = $phpconfig_add_data['phpconfig_add']['title'];
+				UI::view('user/form-replacers.html.twig', [
-				$image = $phpconfig_add_data['phpconfig_add']['image'];
+					'formaction' => $linker->getLink(['section' => 'phpsettings']),
-
+					'formdata' => $phpconfig_add_data['phpconfig_add'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_add") . "\";");
+					'replacers' => $phpconfig_add_data['phpconfig_replacers']
+				]);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 
 	if ($action == 'delete') {
-
 		try {
-			$json_result = PhpSettings::getLocal($userinfo, array(
+			$json_result = PhpSettings::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
-		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
+		if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
 		{
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
-					PhpSettings::getLocal($userinfo, array(
+					PhpSettings::getLocal($userinfo, [
 						'id' => $id
-					))->delete();
+					])->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('phpsetting_reallydelete', $filename, array(
+				HTML::askYesNo('phpsetting_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['description']);
+				], $result['description']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 
 	if ($action == 'edit') {
-
 		try {
-			$json_result = PhpSettings::getLocal($userinfo, array(
+			$json_result = PhpSettings::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
-		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1) {
+		if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1) {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					PhpSettings::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
+				$fpmconfigs = [];
-				$fpmconfigs = '';
 				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
 				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-					$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], $result['fpmsettingid'], true, true);
+					$fpmconfigs[$row['id']] = $row['description'];
 				}
 
-				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', $result['pm'], true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', $result['pm'], true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', $result['pm'], true, true);
-
 				$phpconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
-				$phpconfig_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_edit_data);
 
-				$title = $phpconfig_edit_data['phpconfig_edit']['title'];
+				UI::view('user/form-replacers.html.twig', [
-				$image = $phpconfig_edit_data['phpconfig_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'phpsettings', 'id' => $id]),
-
+					'formdata' => $phpconfig_edit_data['phpconfig_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_edit") . "\";");
+					'replacers' => $phpconfig_edit_data['phpconfig_replacers'],
+					'editid' => $id
+				]);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 } elseif ($page == 'fpmdaemons') {
-
 	if ($action == '') {
-
 		try {
-			$json_result = FpmDaemons::getLocal($userinfo)->listing();
+			$fpmconf_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.fpmconfigs.php';
+			$collection = (new Collection(FpmDaemons::class, $userinfo))
+				->withPagination($fpmconf_list_data['fpmconf_list']['columns'], $fpmconf_list_data['fpmconf_list']['default_sorting']);
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
-		$result = json_decode($json_result, true)['data'];
 
-		$tablecontent = '';
+		UI::view('user/table.html.twig', [
-		$count = 0;
+			'listing' => Listing::format($collection, $fpmconf_list_data, 'fpmconf_list'),
-		if (isset($result['count']) && $result['count'] > 0) {
+			'actions_links' => (bool)$userinfo['change_serversettings'] ? [
-			foreach ($result['list'] as $row) {
+				[
-				$configs = "";
+					'href' => $linker->getLink(['section' => 'phpsettings', 'page' => $page, 'action' => 'add']),
-				foreach ($row['configs'] as $configused) {
+					'label' => lng('admin.fpmsettings.addnew')
-					$configs .= $configused . "<br>";
+				]
-				}
+			] : []
-				$count ++;
+		]);
-				eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons_overview") . "\";");
-			}
-		}
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons") . "\";");
 	}
 
 	if ($action == 'add') {
-
+		if ((int)$userinfo['change_serversettings'] == 1) {
-		if ((int) $userinfo['change_serversettings'] == 1) {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					FpmDaemons::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
-				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', 'static', true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'static', true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', 'static', true, true);
-
 				$fpmconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php';
-				$fpmconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_add_data);
 
-				$title = $fpmconfig_add_data['fpmconfig_add']['title'];
+				UI::view('user/form-replacers.html.twig', [
-				$image = $fpmconfig_add_data['fpmconfig_add']['image'];
+					'formaction' => $linker->getLink(['section' => 'phpsettings', 'page' => 'fpmdaemons']),
-
+					'formdata' => $fpmconfig_add_data['fpmconfig_add'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmconfig_add") . "\";");
+					'replacers' => $fpmconfig_add_data['fpmconfig_replacers']
+				]);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 
 	if ($action == 'delete') {
-
 		try {
-			$json_result = FpmDaemons::getLocal($userinfo, array(
+			$json_result = FpmDaemons::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if ($id == 1) {
-			\Froxlor\UI\Response::standard_error('cannotdeletedefaultphpconfig');
+			Response::standardError('cannotdeletedefaultphpconfig');
 		}
 
-		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
+		if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
 		{
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					FpmDaemons::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('fpmsetting_reallydelete', $filename, array(
+				HTML::askYesNo('fpmsetting_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['description']);
+				], $result['description']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 
 	if ($action == 'edit') {
-
 		try {
-			$json_result = FpmDaemons::getLocal($userinfo, array(
+			$json_result = FpmDaemons::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
-		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1) {
+		if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1) {
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					FpmDaemons::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
-				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', $result['pm'], true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', $result['pm'], true, true);
-				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', $result['pm'], true, true);
-
 				$fpmconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php';
-				$fpmconfig_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_edit_data);
 
-				$title = $fpmconfig_edit_data['fpmconfig_edit']['title'];
+				UI::view('user/form-replacers.html.twig', [
-				$image = $fpmconfig_edit_data['fpmconfig_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'phpsettings', 'page' => 'fpmdaemons', 'id' => $id]),
-
+					'formdata' => $fpmconfig_edit_data['fpmconfig_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmconfig_edit") . "\";");
+					'replacers' => $fpmconfig_edit_data['fpmconfig_replacers'],
+					'editid' => $id
+				]);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 }

admin_plans.php

@@ -4,184 +4,172 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Panel
+ * 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
  */
-define('AREA', 'admin');
+
-require './lib/init.php';
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
 
 use Froxlor\Api\Commands\HostingPlans;
+use Froxlor\Api\Commands\MysqlServer;
 use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
 use Froxlor\Settings;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
 if ($page == '' || $page == 'overview') {
-
 	if ($action == '') {
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_plans");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_plans");
-		$fields = array(
-			'p.name' => $lng['admin']['plans']['name'],
-			'p.description' => $lng['admin']['plans']['description'],
-			'adminname' => $lng['admin']['admin'],
-			'p.ts' => $lng['admin']['plans']['last_update']
-		);
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_PLANS, $fields);
-		$plans = '';
-		$result_stmt = Database::prepare("
-			SELECT p.*, a.loginname as adminname
-			FROM `" . TABLE_PANEL_PLANS . "` p, `" . TABLE_PANEL_ADMINS . "` a
-			WHERE " . ($userinfo['customers_see_all'] ? '' : " `p`.`adminid` = :adminid AND ") . "
-			`p`.`adminid` = `a`.`adminid` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			'adminid' => $userinfo['adminid']
-		));
-		$paging->setEntries(Database::num_rows());
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if ($paging->checkDisplay($i)) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				$row['ts_format'] = date("d.m.Y H:i", $row['ts']);
-				eval("\$plans.=\"" . \Froxlor\UI\Template::getTemplate("plans/plans_plan") . "\";");
-				$count ++;
-			}
-			$i ++;
-		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans") . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
 
 		try {
-			$json_result = HostingPlans::getLocal($userinfo, array(
+			$plan_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.plans.php';
-				'id' => $id
+			$collection = (new Collection(HostingPlans::class, $userinfo))
-			))->get();
+				->withPagination($plan_list_data['plan_list']['columns'], $plan_list_data['plan_list']['default_sorting']);
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
+		}
+
+		UI::view('user/table.html.twig', [
+			'listing' => Listing::format($collection, $plan_list_data, 'plan_list'),
+			'actions_links' => [
+				[
+					'href' => $linker->getLink(['section' => 'plans', 'page' => $page, 'action' => 'add']),
+					'label' => lng('admin.plans.add')
+				]
+			]
+		]);
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = HostingPlans::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
-		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['adminid'] == $result['adminid']) {
+		if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['adminid'] == $result['adminid']) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
 				try {
-					HostingPlans::getLocal($userinfo, array(
+					HostingPlans::getLocal($userinfo, [
 						'id' => $id
-					))->delete();
+					])->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
 
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('plan_reallydelete', $filename, array(
+				HTML::askYesNo('plan_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['name']);
+				], $result['name']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	} elseif ($action == 'add') {
-
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			try {
 				HostingPlans::getLocal($userinfo, $_POST)->add();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
+			$mysql_servers = [];
+			try {
+				$result_json = MysqlServer::getLocal($userinfo)->listing();
+				$result_decoded = json_decode($result_json, true)['data']['list'];
+				foreach ($result_decoded as $dbserver => $dbdata) {
+					$mysql_servers[] = [
+						'label' => $dbdata['caption'],
+						'value' => $dbserver
+					];
+				}
+			} catch (Exception $e) {
+				/* just none */
+			}
 
-			$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$phpconfigs = [];
-			$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-
-			$phpconfigs = array();
 			$configs = Database::query("
 					SELECT c.*, fc.description as interpreter
 					FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
 					LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
 				");
 			while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-				if ((int) Settings::Get('phpfpm.enabled') == 1) {
+				if ((int)Settings::Get('phpfpm.enabled') == 1) {
-					$phpconfigs[] = array(
+					$phpconfigs[] = [
-						'label' => $row['description'] . " [" . $row['interpreter'] . "]<br />",
+						'label' => $row['description'] . " [" . $row['interpreter'] . "]",
 						'value' => $row['id']
-					);
+					];
 				} else {
-					$phpconfigs[] = array(
+					$phpconfigs[] = [
-						'label' => $row['description'] . "<br />",
+						'label' => $row['description'],
 						'value' => $row['id']
-					);
+					];
 				}
 			}
 
 			// dummy to avoid unknown variables
-			$language_options = null;
-			$gender_options = null;
 			$hosting_plans = null;
 
-			$plans_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/plans/formfield.plans_add.php';
+			$plans_add_data = include_once __DIR__ . '/lib/formfields/admin/plans/formfield.plans_add.php';
-			$cust_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_add.php';
+			$cust_add_data = include_once __DIR__ . '/lib/formfields/admin/customer/formfield.customer_add.php';
 			// unset unneeded stuff
 			unset($cust_add_data['customer_add']['sections']['section_a']);
 			unset($cust_add_data['customer_add']['sections']['section_b']);
 			unset($cust_add_data['customer_add']['sections']['section_cpre']);
 			// merge
 			$plans_add_data['plans_add']['sections'] = array_merge($plans_add_data['plans_add']['sections'], $cust_add_data['customer_add']['sections']);
-			$plans_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($plans_add_data);
 
-			$title = $plans_add_data['plans_add']['title'];
+			UI::view('user/form.html.twig', [
-			$image = $plans_add_data['plans_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'plans']),
-
+				'formdata' => $plans_add_data['plans_add']
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans_add") . "\";");
+			]);
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = HostingPlans::getLocal($userinfo, array(
+			$json_result = HostingPlans::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if ($result['name'] != '') {
-
 			$result['value'] = json_decode($result['value'], true);
-			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+			$result = PhpHelper::htmlentitiesArray($result);
 
 			foreach ($result['value'] as $index => $value) {
 				$result[$index] = $value;
@@ -189,82 +177,46 @@ if ($page == '' || $page == 'overview') {
 			$result['allowed_phpconfigs'] = json_encode($result['allowed_phpconfigs']);
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
 				try {
-					HostingPlans::getLocal($userinfo, array(
+					HostingPlans::getLocal($userinfo, $_POST)->update();
-						'id' => $id
-					))->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
+				$mysql_servers = [];
-				$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true);
+				try {
-				if ($result['diskspace'] == '-1') {
+					$result_json = MysqlServer::getLocal($userinfo)->listing();
-					$result['diskspace'] = '';
+					$result_decoded = json_decode($result_json, true)['data']['list'];
+					foreach ($result_decoded as $dbserver => $dbdata) {
+						$mysql_servers[] = [
+							'label' => $dbdata['caption'],
+							'value' => $dbserver
+						];
+					}
+				} catch (Exception $e) {
+					/* just none */
 				}
 
-				$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true);
+				$phpconfigs = [];
-				if ($result['traffic'] == '-1') {
-					$result['traffic'] = '';
-				}
-
-				$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true);
-				if ($result['subdomains'] == '-1') {
-					$result['subdomains'] = '';
-				}
-
-				$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true);
-				if ($result['emails'] == '-1') {
-					$result['emails'] = '';
-				}
-
-				$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true);
-				if ($result['email_accounts'] == '-1') {
-					$result['email_accounts'] = '';
-				}
-
-				$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true);
-				if ($result['email_forwarders'] == '-1') {
-					$result['email_forwarders'] = '';
-				}
-
-				$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
-				if ($result['email_quota'] == '-1') {
-					$result['email_quota'] = '';
-				}
-
-				$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
-				if ($result['ftps'] == '-1') {
-					$result['ftps'] = '';
-				}
-
-				$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true);
-				if ($result['mysqls'] == '-1') {
-					$result['mysqls'] = '';
-				}
-
-				$phpconfigs = array();
 				$configs = Database::query("
 					SELECT c.*, fc.description as interpreter
 					FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
 					LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
 				");
 				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-					if ((int) Settings::Get('phpfpm.enabled') == 1) {
+					if ((int)Settings::Get('phpfpm.enabled') == 1) {
-						$phpconfigs[] = array(
+						$phpconfigs[] = [
-							'label' => $row['description'] . " [" . $row['interpreter'] . "]<br />",
+							'label' => $row['description'] . " [" . $row['interpreter'] . "]",
 							'value' => $row['id']
-						);
+						];
 					} else {
-						$phpconfigs[] = array(
+						$phpconfigs[] = [
-							'label' => $row['description'] . "<br />",
+							'label' => $row['description'],
 							'value' => $row['id']
-						);
+						];
 					}
 				}
 
@@ -276,9 +228,9 @@ if ($page == '' || $page == 'overview') {
 				$result['documentroot'] = null;
 				$result['standardsubdomain'] = null;
 				$result['deactivated'] = null;
-				$language_options = null;
+				$result['def_language'] = null;
 				$result['firstname'] = null;
-				$gender_options = null;
+				$result['gender'] = null;
 				$result['company'] = null;
 				$result['street'] = null;
 				$result['zipcode'] = null;
@@ -289,34 +241,35 @@ if ($page == '' || $page == 'overview') {
 				$result['customernumber'] = null;
 				$result['custom_notes'] = null;
 				$result['custom_notes_show'] = null;
+				$result['api_allowed'] = null;
 				$hosting_plans = null;
-				$admin_select_cnt = null;
+				$admin_select = [];
-				$admin_select = null;
 
-				$plans_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/plans/formfield.plans_edit.php';
+				$plans_edit_data = include_once __DIR__ . '/lib/formfields/admin/plans/formfield.plans_edit.php';
-				$cust_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_edit.php';
+				$cust_edit_data = include_once __DIR__ . '/lib/formfields/admin/customer/formfield.customer_edit.php';
 				// unset unneeded stuff
 				unset($cust_edit_data['customer_edit']['sections']['section_a']);
 				unset($cust_edit_data['customer_edit']['sections']['section_b']);
 				unset($cust_edit_data['customer_edit']['sections']['section_cpre']);
+				unset($cust_edit_data['customer_edit']['sections']['section_d']);
 				// merge
 				$plans_edit_data['plans_edit']['sections'] = array_merge($plans_edit_data['plans_edit']['sections'], $cust_edit_data['customer_edit']['sections']);
-				$plans_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($plans_edit_data);
 
-				$title = $plans_edit_data['plans_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $plans_edit_data['plans_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'plans', 'id' => $id]),
-
+					'formdata' => $plans_edit_data['plans_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	} elseif ($action == 'jqGetPlanValues') {
-		$planid = isset($_POST['planid']) ? (int) $_POST['planid'] : 0;
+		$planid = (int)Request::any('planid', 0);
 		try {
-			$json_result = HostingPlans::getLocal($userinfo, array(
+			$json_result = HostingPlans::getLocal($userinfo, [
 				'id' => $planid
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 		echo $result['value'];

admin_settings.php

@@ -2,26 +2,46 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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\Database\Database;
-use Froxlor\Settings;
-use Froxlor\Api\Commands\Froxlor;
 
-define('AREA', 'admin');
+use Froxlor\Api\Commands\Froxlor;
-require './lib/init.php';
+use Froxlor\Cron\TaskId;
+use Froxlor\Database\Database;
+use Froxlor\Database\IntegrityCheck;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
+use Froxlor\Settings;
+use Froxlor\System\Cronjob;
+use Froxlor\UI\Form;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\User;
+use PHPMailer\PHPMailer\PHPMailer;
+
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
 
 // get sql-root access data
 Database::needRoot(true);
@@ -30,11 +50,10 @@ $sql_root = Database::getSqlData();
 Database::needRoot(false);
 
 if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
-	$settings_data = \Froxlor\PhpHelper::loadConfigArrayDir('./actions/admin/settings/');
+	$settings_data = PhpHelper::loadConfigArrayDir('./actions/admin/settings/');
 	Settings::loadSettingsInto($settings_data);
 
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
 		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
@@ -57,163 +76,127 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 
 		// check if the session timeout is too low #815
 		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] < 60) {
-			\Froxlor\UI\Response::standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
+			Response::standardError(lng('error.session_timeout'), lng('error.session_timeout_desc'));
 		}
 
-		if (\Froxlor\UI\Form::processFormEx($settings_data, $_POST, array(
+		try {
+			if (Form::processForm($settings_data, $_POST, [
 				'filename' => $filename,
 				'action' => $action,
 				'page' => $page
-		), $_part, $settings_all, $settings_part, $only_enabledisable)) {
+			], $_part, $settings_all, $settings_part, $only_enabledisable)) {
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
+				$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
-			\Froxlor\System\Cronjob::inserttask('1');
+				Cronjob::inserttask(TaskId::REBUILD_VHOST);
 				// Using nameserver, insert a task which rebuilds the server config
-			\Froxlor\System\Cronjob::inserttask('4');
+				Cronjob::inserttask(TaskId::REBUILD_DNS);
 				// cron.d file
-			\Froxlor\System\Cronjob::inserttask('99');
+				Cronjob::inserttask(TaskId::REBUILD_CRON);
 
-			\Froxlor\UI\Response::standard_success('settingssaved', '', array(
+				Response::standardSuccess('settingssaved', '', [
 					'filename' => $filename,
 					'action' => $action,
 					'page' => $page
-			));
+				]);
+			}
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage(), $e->getCode());
 		}
 	} else {
-
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
 		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
 		}
 
-		$fields = \Froxlor\UI\Form::buildFormEx($settings_data, $_part);
+		$fields = Form::buildForm($settings_data, $_part);
 
-		$settings_page = '';
+		if ($_part == '' || $_part == 'all') {
-		if ($_part == '') {
+			UI::view('settings/index.html.twig', ['fields' => $fields]);
-			eval("\$settings_page .= \"" . \Froxlor\UI\Template::getTemplate("settings/settings_overview") . "\";");
 		} else {
-			eval("\$settings_page .= \"" . \Froxlor\UI\Template::getTemplate("settings/settings") . "\";");
+			$em = Request::any('em', '');
+			UI::view('settings/detailpart.html.twig', ['fields' => $fields, 'em' => $em]);
 		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/settings_form_begin") . "\";");
-		eval("echo \$settings_page;");
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/settings_form_end") . "\";");
 	}
 } elseif ($page == 'phpinfo' && $userinfo['change_serversettings'] == '1') {
 	ob_start();
 	phpinfo();
-	$phpinfo = array(
+	$phpinfo = [
-		'phpinfo' => array()
+		'phpinfo' => []
-	);
+	];
 	if (preg_match_all('#(?:<h2>(?:<a name=".*?">)?(.*?)(?:</a>)?</h2>)|(?:<tr(?: class=".*?")?><t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>)?)?</tr>)#s', ob_get_clean(), $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
 			$end = array_keys($phpinfo);
 			$end = end($end);
 			if (strlen($match[1])) {
-				$phpinfo[$match[1]] = array();
+				$phpinfo[$match[1]] = [];
 			} elseif (isset($match[3])) {
-				$phpinfo[$end][$match[2]] = isset($match[4]) ? array(
+				$phpinfo[$end][$match[2]] = isset($match[4]) ? [
 					$match[3],
 					$match[4]
-				) : $match[3];
+				] : $match[3];
 			} else {
 				$phpinfo[$end][] = $match[2];
 			}
 		}
-		$phpinfohtml = '';
-		foreach ($phpinfo as $name => $section) {
-			$phpinfoentries = "";
-			foreach ($section as $key => $val) {
-				if (is_array($val)) {
-					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_3") . "\";");
-				} elseif (is_string($key)) {
-					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_2") . "\";");
 	} else {
-					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_1") . "\";");
+		Response::standardError(lng('error.no_phpinfo'));
 	}
-			}
+	UI::view('settings/phpinfo.html.twig', [
-			// first header -> show actual php version
+		'phpversion' => PHP_VERSION,
-			if (strtolower($name) == "phpinfo") {
+		'phpinfo' => $phpinfo
-				$name = "PHP " . PHP_VERSION;
+	]);
-			}
-			eval("\$phpinfohtml .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_table") . "\";");
-		}
-		$phpinfo = $phpinfohtml;
-	} else {
-		\Froxlor\UI\Response::standard_error($lng['error']['no_phpinfo']);
-	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo") . "\";");
 } elseif ($page == 'rebuildconfigs' && $userinfo['change_serversettings'] == '1') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles");
+		Cronjob::inserttask(TaskId::REBUILD_VHOST);
-		\Froxlor\System\Cronjob::inserttask('1');
+		Cronjob::inserttask(TaskId::CREATE_QUOTA);
-		\Froxlor\System\Cronjob::inserttask('10');
 		// Using nameserver, insert a task which rebuilds the server config
-		\Froxlor\System\Cronjob::inserttask('4');
+		Cronjob::inserttask(TaskId::REBUILD_DNS);
 		// cron.d file
-		\Froxlor\System\Cronjob::inserttask('99');
+		Cronjob::inserttask(TaskId::REBUILD_CRON);
 
-		\Froxlor\UI\Response::standard_success('rebuildingconfigs', '', array(
+		Response::standardSuccess('rebuildingconfigs', '', [
 			'filename' => 'admin_index.php'
-		));
+		]);
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_configs_reallyrebuild', $filename, array(
+		HTML::askYesNo('admin_configs_reallyrebuild', $filename, [
 			'page' => $page
-		));
+		]);
 	}
 } elseif ($page == 'updatecounters' && $userinfo['change_serversettings'] == '1') {
-
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "updated resource-counters");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "updated resource-counters");
+		$updatecounters = User::updateCounters(true);
-		$updatecounters = \Froxlor\User::updateCounters(true);
+		UI::view('user/resource-counter.html.twig', [
-		$customers = '';
+			'counters' => $updatecounters
-		foreach ($updatecounters['customers'] as $customerid => $customer) {
+		]);
-			eval("\$customers.=\"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters_row_customer") . "\";");
-		}
-
-		$admins = '';
-		foreach ($updatecounters['admins'] as $adminid => $admin) {
-			eval("\$admins.=\"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters_row_admin") . "\";");
-		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters") . "\";");
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_counters_reallyupdate', $filename, array(
+		HTML::askYesNo('admin_counters_reallyupdate', $filename, [
 			'page' => $page
-		));
+		]);
 	}
 } elseif ($page == 'wipecleartextmailpws' && $userinfo['change_serversettings'] == '1') {
-
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
 		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password` = '';");
 		Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '0' WHERE `settinggroup` = 'system' AND `varname` = 'mailpwcleartext'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename);
-			's' => $s
-		));
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_cleartextmailpws_reallywipe', $filename, array(
+		HTML::askYesNo('admin_cleartextmailpws_reallywipe', $filename, [
 			'page' => $page
-		));
+		]);
 	}
 } elseif ($page == 'wipequotas' && $userinfo['change_serversettings'] == '1') {
-
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
 
 		// Set the quota to 0 which means unlimited
 		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = '0';");
 		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota_used` = '0'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename);
-			's' => $s
-		));
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_quotas_reallywipe', $filename, array(
+		HTML::askYesNo('admin_quotas_reallywipe', $filename, [
 			'page' => $page
-		));
+		]);
 	}
 } elseif ($page == 'enforcequotas' && $userinfo['change_serversettings'] == '1') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
@@ -221,7 +204,6 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		$result_stmt = Database::query("SELECT `quota`, `customerid` FROM `" . TABLE_MAIL_USERS . "`");
 
 		if (Database::num_rows() > 0) {
-
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
 				`email_quota_used` = `email_quota_used` + :diff
@@ -230,10 +212,10 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 
 			while ($array = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$difference = Settings::Get('system.mail_quota') - $array['quota'];
-				Database::pexecute($upd_stmt, array(
+				Database::pexecute($upd_stmt, [
 					'diff' => $difference,
 					'customerid' => $customerid
-				));
+				]);
 			}
 		}
 
@@ -241,43 +223,59 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		$upd_stmt = Database::prepare("
 			UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = :quota
 		");
-		Database::pexecute($upd_stmt, array(
+		Database::pexecute($upd_stmt, [
 			'quota' => Settings::Get('system.mail_quota')
-		));
+		]);
 
 		// Update the Customer, if the used quota is bigger than the allowed quota
 		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota` = `email_quota_used` WHERE `email_quota` < `email_quota_used`");
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . Settings::Get('system.mail_quota') . ' MB');
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . Settings::Get('system.mail_quota') . ' MB');
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename);
-			's' => $s
-		));
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_quotas_reallyenforce', $filename, array(
+		HTML::askYesNo('admin_quotas_reallyenforce', $filename, [
 			'page' => $page
-		));
+		]);
 	}
 } elseif ($page == 'integritycheck' && $userinfo['change_serversettings'] == '1') {
-	$integrity = new \Froxlor\Database\IntegrityCheck();
+	$integrity = new IntegrityCheck();
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$integrity->fixAll();
 	} elseif (isset($_GET['action']) && $_GET['action'] == "fix") {
-		\Froxlor\UI\HTML::askYesNo('admin_integritycheck_reallyfix', $filename, array(
+		HTML::askYesNo('admin_integritycheck_reallyfix', $filename, [
 			'page' => $page
-		));
+		]);
 	}
 
-	$integritycheck = '';
+	$integritycheck = [];
 	foreach ($integrity->available as $id => $check) {
-		$displayid = $id + 1;
+		$integritycheck[] = [
-		$result = $integrity->$check();
+			'displayid' => $id + 1,
-		$checkdesc = $lng['integrity_check'][$check];
+			'result' => $integrity->$check(),
-		eval("\$integritycheck.=\"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck_row") . "\";");
+			'checkdesc' => lng('integrity_check.' . $check)
+		];
 	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck") . "\";");
+
+	$integrity_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.integrity.php';
+	$collection = [
+		'data' => $integritycheck,
+		'pagination' => []
+	];
+
+	UI::view('user/table.html.twig', [
+		'listing' => Listing::formatFromArray($collection, $integrity_list_data['integrity_list'], 'integrity_list'),
+		'actions_links' => [
+			[
+				'href' => $linker->getLink(['section' => 'settings', 'page' => $page, 'action' => 'fix']),
+				'label' => lng('admin.integrityfix'),
+				'icon' => 'fa-solid fa-screwdriver-wrench',
+				'class' => 'btn-warning'
+			]
+		]
+	]);
 } elseif ($page == 'importexport' && $userinfo['change_serversettings'] == '1') {
 	// check for json-stuff
-	if (! extension_loaded('json')) {
+	if (!extension_loaded('json')) {
-		\Froxlor\UI\Response::standard_error('jsonextensionnotfound');
+		Response::standardError('jsonextensionnotfound');
 	}
 
 	if (isset($_GET['action']) && $_GET['action'] == "export") {
@@ -286,9 +284,9 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 			$json_result = Froxlor::getLocal($userinfo)->exportSettings();
 			$json_export = json_decode($json_result, true)['data'];
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
-		header('Content-disposition: attachment; filename=Froxlor_settings-' . $version . '-' . $dbversion . '_' . date('d.m.Y') . '.json');
+		header('Content-disposition: attachment; filename=Froxlor_settings-' . \Froxlor\Froxlor::VERSION . '-' . \Froxlor\Froxlor::DBVERSION . '_' . date('d.m.Y') . '.json');
 		header('Content-type: application/json');
 		echo $json_export;
 		exit();
@@ -299,35 +297,55 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 			if (isset($_FILES["import_file"]["tmp_name"])) {
 				$imp_content = file_get_contents($_FILES["import_file"]["tmp_name"]);
 				try {
-					Froxlor::getLocal($userinfo, array(
+					Froxlor::getLocal($userinfo, [
 						'json_str' => $imp_content
-					))->importSettings();
+					])->importSettings();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::standard_success('settingsimported', '', array(
+				Response::standardSuccess('settingsimported', '', [
 					'filename' => 'admin_settings.php'
-				));
+				]);
 			}
-			\Froxlor\UI\Response::dynamic_error("Upload failed");
+			Response::dynamicError("Upload failed");
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/importexport/index") . "\";");
+		$settings_data = include_once dirname(__FILE__) . '/lib/formfields/admin/settings/formfield.settings_import.php';
+
+		UI::view('user/form.html.twig', [
+			'formaction' => $linker->getLink(['section' => 'settings', 'page' => $page, 'action' => 'import']),
+			'formdata' => $settings_data['settings_import'],
+			'actions_links' => [
+				[
+					'class' => 'btn-outline-primary',
+					'href' => $linker->getLink(['section' => 'settings', 'page' => 'overview']),
+					'label' => lng('admin.configfiles.overview'),
+					'icon' => 'fa-solid fa-grip'
+				],
+				[
+					'class' => 'btn-outline-secondary',
+					'href' => $linker->getLink(['section' => 'settings', 'page' => $page, 'action' => 'export']),
+					'label' => 'Download/export ' . lng('admin.serversettings'),
+					'icon' => 'fa-solid fa-file-import'
+				]
+			]
+		]);
 	}
 } elseif ($page == 'testmail') {
+	$note_type = 'info';
+	$note_msg = lng('admin.smtptestnote');
+
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$test_addr = isset($_POST['test_addr']) ? $_POST['test_addr'] : null;
 
-		/**
+		// Initialize the mailingsystem
-		 * Initialize the mailingsystem
+		$testmail = new PHPMailer(true);
-		 */
-		$testmail = new \PHPMailer\PHPMailer\PHPMailer(true);
 		$testmail->CharSet = "UTF-8";
 
 		if (Settings::Get('system.mail_use_smtp')) {
 			$testmail->isSMTP();
 			$testmail->Host = Settings::Get('system.mail_smtp_host');
-			$testmail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
+			$testmail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1';
 			$testmail->Username = Settings::Get('system.mail_smtp_user');
 			$testmail->Password = Settings::Get('system.mail_smtp_passwd');
 			if (Settings::Get('system.mail_smtp_usetls')) {
@@ -339,7 +357,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		}
 
 		$_mailerror = false;
-		if (\PHPMailer\PHPMailer\PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
+		if (PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
 			// set return-to address and custom sender-name, see #76
 			$testmail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
 			if (Settings::Get('panel.adminmail_return') != '') {
@@ -354,31 +372,56 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 				$testmail->AddAddress($test_addr);
 				$testmail->Send();
 			} catch (\PHPMailer\PHPMailer\Exception $e) {
-				$mailerr_msg = $e->errorMessage();
+				$note_type = 'danger';
+				$note_msg = $e->getMessage();
 				$_mailerror = true;
 			} catch (Exception $e) {
-				$mailerr_msg = $e->getMessage();
+				$note_type = 'danger';
+				$note_msg = $e->getMessage();
 				$_mailerror = true;
 			}
 
-			if (! $_mailerror) {
+			if (!$_mailerror) {
 				// success
 				$mail->ClearAddresses();
-				\Froxlor\UI\Response::standard_success('testmailsent', '', array(
+				Response::standardSuccess('testmailsent', '', [
 					'filename' => 'admin_settings.php',
 					'page' => 'testmail'
-				));
+				]);
 			}
 		} else {
 			// invalid sender e-mail
-			$mailerr_msg = "Invalid sender e-mail address: " . Settings::Get('panel.adminmail');
+			$note_type = 'warning';
-			$_mailerror = true;
+			$note_msg = "Invalid sender e-mail address: " . Settings::Get('panel.adminmail');
 		}
 	}
 
-	$mail_smtp_user = Settings::Get('system.mail_smtp_user');
+	$mailtest_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/settings/formfield.settings_mailtest.php';
-	$mail_smtp_host = Settings::Get('system.mail_smtp_host');
-	$mail_smtp_port = Settings::Get('system.mail_smtp_port');
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/testmail") . "\";");
+	UI::view('user/form-note.html.twig', [
+		'formaction' => $linker->getLink(['section' => 'settings']),
+		'formdata' => $mailtest_add_data['mailtest'],
+		'actions_links' => [
+			[
+				'href' => $linker->getLink([
+					'section' => 'settings',
+					'page' => 'overview',
+					'part' => 'system',
+					'em' => 'system_mail_use_smtp'
+				]),
+				'label' => lng('admin.smtpsettings'),
+				'icon' => 'fa-solid fa-gears',
+				'class' => 'btn-outline-secondary'
+			]
+		],
+		// alert-box
+		'type' => $note_type,
+		'alert_msg' => $note_msg
+	]);
+} elseif ($page == 'toggleSettingsMode') {
+	if ($userinfo['change_serversettings'] == '1') {
+		$cmode = Settings::Get('panel.settings_mode');
+		Settings::Set('panel.settings_mode', (int)(!(bool)$cmode));
+	}
+	Response::redirectTo($filename);
 }

admin_templates.php

@@ -2,139 +2,192 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'admin');
+
-require './lib/init.php';
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
 
 use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\Language;
+use Froxlor\PhpHelper;
 use Froxlor\Settings;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\Validate\Validate;
+use Froxlor\CurrentUser;
 
-if (isset($_POST['subjectid'])) {
+$id = (int)Request::any('id');
-	$subjectid = intval($_POST['subjectid']);
+$subjectid = intval(Request::any('subjectid'));
-	$mailbodyid = intval($_POST['mailbodyid']);
+$mailbodyid = intval(Request::any('mailbodyid'));
-} elseif (isset($_GET['subjectid'])) {
-	$subjectid = intval($_GET['subjectid']);
-	$mailbodyid = intval($_GET['mailbodyid']);
-}
 
-if (isset($_POST['id'])) {
+$available_templates = [
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
-
-$available_templates = array(
 	'createcustomer',
 	'pop_success',
 	'new_database_by_customer',
 	'new_ftpaccount_by_customer',
 	'password_reset'
-);
+];
 
 // only show templates of features that are enabled #1191
-if ((int) Settings::Get('system.report_enable') == 1) {
+if ((int)Settings::Get('system.report_enable') == 1) {
 	array_push($available_templates, 'trafficmaxpercent', 'diskmaxpercent');
 }
+if (Settings::Get('panel.sendalternativemail') == 1) {
+	array_push($available_templates, 'pop_success_alternative');
+}
 
-$file_templates = array(
+$file_templates = [
 	'index_html'
-);
+];
+
+$languages = Language::getLanguages();
 
 if ($action == '') {
 	// email templates
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
 
-	if (Settings::Get('panel.sendalternativemail') == 1) {
+	$templates_array = [];
-		$available_templates[] = 'pop_success_alternative';
-	}
-
-	$templates_array = array();
 	$result_stmt = Database::prepare("
 		SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 		WHERE `adminid` = :adminid AND `templategroup`='mails'
-		ORDER BY `language`, `varname`");
+		ORDER BY `language`, `varname`
-	Database::pexecute($result_stmt, array(
+	");
+	Database::pexecute($result_stmt, [
 		'adminid' => $userinfo['adminid']
-	));
+	]);
 
 	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-		$parts = array();
+		$parts = [];
 		preg_match('/^([a-z]([a-z_]+[a-z])*)_(mailbody|subject)$/', $row['varname'], $parts);
 		$templates_array[$row['language']][$parts[1]][$parts[3]] = $row['id'];
 	}
 
-	$templates = '';
+	$templates = [];
 	foreach ($templates_array as $language => $template_defs) {
 		foreach ($template_defs as $action => $email) {
-			$subjectid = $email['subject'];
+			$templates[] = [
-			$mailbodyid = $email['mailbody'];
+				'subjectid' => $email['subject'],
-			$template = $lng['admin']['templates'][$action];
+				'mailbodyid' => $email['mailbody'],
-			eval("\$templates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_template") . "\";");
+				'template' => lng('admin.templates.' . $action),
+				'language' => $language
+			];
 		}
 	}
 
-	$add = false;
+	$mail_actions_links = false;
 	foreach ($languages as $language_file => $language_name) {
-
+		$templates_done = [];
-		$templates_done = array();
 		$result_stmt = Database::prepare("
 			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 			WHERE `adminid` = :adminid AND `language`= :lang
-			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'
-		Database::pexecute($result_stmt, array(
+		");
+		Database::pexecute($result_stmt, [
 			'adminid' => $userinfo['adminid'],
 			'lang' => $language_name
-		));
+		]);
 
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			$templates_done[] = str_replace('_subject', '', $row['varname']);
 		}
 
 		if (count(array_diff($available_templates, $templates_done)) > 0) {
-			$add = true;
+			$mail_actions_links = [
+				[
+					'href' => $linker->getLink(['section' => 'templates', 'page' => $page, 'action' => 'add']),
+					'label' => lng('admin.templates.template_add')
+				]
+			];
 		}
 	}
 
+	$mailtpl_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.mailtemplates.php';
+	$collection_mail = [
+		'data' => $templates,
+		'pagination' => []
+	];
+
 	// filetemplates
-	$filetemplates = '';
-	$filetemplateadd = false;
 	$result_stmt = Database::prepare("
 		SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 		WHERE `adminid` = :adminid AND `templategroup`='files'");
-	Database::pexecute($result_stmt, array(
+	Database::pexecute($result_stmt, [
 		'adminid' => $userinfo['adminid']
-	));
+	]);
-
-	if (Database::num_rows() != count($file_templates)) {
-		$filetemplateadd = true;
-	}
 
+	$filetemplates = [];
 	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-		eval("\$filetemplates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_filetemplate") . "\";");
+		$filetemplates[] = [
+			'id' => $row['id'],
+			'template' => lng('admin.templates.' . $row['varname'])
+		];
 	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates") . "\";");
+
+	$file_actions_links = false;
+	if (Database::num_rows() != count($file_templates)) {
+		$file_actions_links = [
+			[
+				'href' => $linker->getLink([
+					'section' => 'templates',
+					'page' => $page,
+					'action' => 'add',
+					'files' => 'files'
+				]),
+				'label' => lng('admin.templates.template_fileadd')
+			]
+		];
+	}
+
+	$filetpl_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.filetemplates.php';
+	$collection_file = [
+		'data' => $filetemplates,
+		'pagination' => []
+	];
+
+	if ($mail_actions_links === false) {
+		$mail_actions_links = [];
+	}
+	if ($file_actions_links === false) {
+		$file_actions_links = [];
+	}
+
+	UI::view('user/table-tpl.html.twig', [
+		'maillisting' => Listing::formatFromArray($collection_mail, $mailtpl_list_data['mailtpl_list'], 'mailtpl_list'),
+		'filelisting' => Listing::formatFromArray($collection_file, $filetpl_list_data['filetpl_list'], 'filetpl_list'),
+		'actions_links' => array_merge($mail_actions_links, $file_actions_links)
+	]);
 } elseif ($action == 'delete' && $subjectid != 0 && $mailbodyid != 0) {
 	// email templates
 	$result_stmt = Database::prepare("
 		SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 		WHERE `adminid` = :adminid AND `id` = :id");
-	Database::pexecute($result_stmt, array(
+	Database::pexecute($result_stmt, [
 		'adminid' => $userinfo['adminid'],
 		'id' => $subjectid
-	));
+	]);
 	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 	if ($result['varname'] != '') {
@@ -143,23 +196,22 @@ if ($action == '') {
 				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
 				WHERE `adminid` = :adminid
 				AND (`id` = :ida OR `id` = :idb)");
-			Database::pexecute($del_stmt, array(
+			Database::pexecute($del_stmt, [
 				'adminid' => $userinfo['adminid'],
 				'ida' => $subjectid,
 				'idb' => $mailbodyid
-			));
+			]);
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'");
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . lng('admin.templates.' . str_replace('_subject', '', $result['varname'])) . "'");
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			\Froxlor\UI\HTML::askYesNo('admin_template_reallydelete', $filename, array(
+			HTML::askYesNo('admin_template_reallydelete', $filename, [
 				'subjectid' => $subjectid,
 				'mailbodyid' => $mailbodyid,
 				'page' => $page,
 				'action' => $action
-			), $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]);
+			], $result['language'] . ' - ' . lng('admin.templates.' . str_replace('_subject', '', $result['varname'])));
 		}
 	}
 } elseif ($action == 'deletef' && $id != 0) {
@@ -167,94 +219,95 @@ if ($action == '') {
 	$result_stmt = Database::prepare("
 		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
 		WHERE `adminid` = :adminid AND `id` = :id");
-	Database::pexecute($result_stmt, array(
+	Database::pexecute($result_stmt, [
 		'adminid' => $userinfo['adminid'],
 		'id' => $id
-	));
+	]);
 
 	if (Database::num_rows() > 0) {
-
 		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
 			$del_stmt = Database::prepare("
 				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
 				WHERE `adminid` = :adminid AND `id` = :id");
-			Database::pexecute($del_stmt, array(
+			Database::pexecute($del_stmt, [
 				'adminid' => $userinfo['adminid'],
 				'id' => $id
-			));
+			]);
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . lng('admin.templates.' . $row['varname']) . "'");
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			\Froxlor\UI\HTML::askYesNo('admin_template_reallydelete', $filename, array(
+			HTML::askYesNo('admin_template_reallydelete', $filename, [
 				'id' => $id,
 				'page' => $page,
 				'action' => $action
-			), $lng['admin']['templates'][$row['varname']]);
+			], lng('admin.templates.' . $row['varname']));
 		}
 	} else {
-		\Froxlor\UI\Response::standard_error('templatenotfound');
+		Response::standardError('templatenotfound');
 	}
 } elseif ($action == 'add') {
-
-	if (Settings::Get('panel.sendalternativemail') == 1) {
-		$available_templates[] = 'pop_success_alternative';
-	}
-
 	if (isset($_POST['prepare']) && $_POST['prepare'] == 'prepare') {
 		// email templates
-		$language = htmlentities(\Froxlor\Validate\Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$language = htmlentities(Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
+		$template = Validate::validate($_POST['template'], 'template');
 
-		$lng_bak = $lng;
+		$result_stmt = Database::prepare("
-		foreach ($langs['English'] as $key => $value) {
+			SELECT COUNT(*) as def FROM `" . TABLE_PANEL_TEMPLATES . "`
-			include_once \Froxlor\FileDir::makeSecurePath($value['file']);
+			WHERE `adminid` = :adminid AND `language` = :lang
-		}
+			AND `templategroup` = 'mails' AND `varname` LIKE :template
-		if ($language != 'English') {
+		");
-			foreach ($langs[$language] as $key => $value) {
+		$result = Database::pexecute_first($result_stmt, [
-				include \Froxlor\FileDir::makeSecurePath($value['file']);
+			'adminid' => $userinfo['adminid'],
-			}
+			'lang' => $language,
+			'template' => $template . '%'
+		]);
+		if ($result && $result['def'] > 0) {
+			Response::standardError('templatelanguagecombodefined');
 		}
 
-		$subject = $lng['mails'][$template]['subject'];
+		// set target language
-		$body = str_replace('\n', "\n", $lng['mails'][$template]['mailbody']);
+		Language::setLanguage($language);
 
-		$lng = $lng_bak;
+		$subject = lng('mails.' . $template . '.subject');
+		$body = str_replace('\n', "\n", lng('mails.' . $template . '.mailbody'));
+
+		// re set language to user
+		Language::setLanguage(CurrentUser::getField('def_language'));
 
 		$template_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_add.php';
-		$template_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($template_add_data);
 
-		$title = $template_add_data['template_add']['title'];
+		UI::view('user/form-replacers.html.twig', [
-		$image = $template_add_data['template_add']['image'];
+			'formaction' => $linker->getLink(['section' => 'templates']),
-
+			'formdata' => $template_add_data['template_add'],
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_add_2") . "\";");
+			'replacers' => $template_add_data['template_replacers']
-	} elseif (isset($_POST['send']) && $_POST['send'] == 'send') {
+		]);
+	} elseif (isset($_POST['send']) && $_POST['send'] == 'send' && !isset($_POST['filesend'])) {
 		// email templates
-		$language = htmlentities(\Froxlor\Validate\Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$language = htmlentities(Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
+		$template = Validate::validate($_POST['template'], 'template');
-		$subject = \Froxlor\Validate\Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+		$subject = Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-		$mailbody = \Froxlor\Validate\Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		$mailbody = Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
-		$templates = array();
+		$templates = [];
 		$result_stmt = Database::prepare("
 			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 			WHERE `adminid` = :adminid AND `language` = :lang
 			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
-		Database::pexecute($result_stmt, array(
+		Database::pexecute($result_stmt, [
 			'adminid' => $userinfo['adminid'],
 			'lang' => $language
-		));
+		]);
 
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			$templates[] = str_replace('_subject', '', $row['varname']);
 		}
 
 		$templates = array_diff($available_templates, $templates);
-		if (array_search($template, $templates) === false) {
+		if (!in_array($template, $templates)) {
-			\Froxlor\UI\Response::standard_error('templatenotfound');
+			Response::standardError('templatenotfound');
 		} else {
 			$ins_stmt = Database::prepare("
 				INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
@@ -265,33 +318,32 @@ if ($action == '') {
 					`value` = :value");
 
 			// mail-subject
-			$ins_data = array(
+			$ins_data = [
 				'adminid' => $userinfo['adminid'],
 				'lang' => $language,
 				'var' => $template . '_subject',
 				'value' => $subject
-			);
+			];
 			Database::pexecute($ins_stmt, $ins_data);
 
 			// mail-body
-			$ins_data = array(
+			$ins_data = [
 				'adminid' => $userinfo['adminid'],
 				'lang' => $language,
 				'var' => $template . '_mailbody',
 				'value' => $mailbody
-			);
+			];
 			Database::pexecute($ins_stmt, $ins_data);
 
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		}
 	} elseif (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
 		// file templates
-		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
+		$template = Validate::validate($_POST['template'], 'template');
-		$filecontent = \Froxlor\Validate\Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
+		$filecontent = Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 
 		$ins_stmt = Database::prepare("
 			INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
@@ -301,35 +353,33 @@ if ($action == '') {
 				`varname` = :var,
 				`value` = :value");
 
-		$ins_data = array(
+		$ins_data = [
 			'adminid' => $userinfo['adminid'],
 			'var' => $template,
 			'value' => $filecontent
-		);
+		];
 		Database::pexecute($ins_stmt, $ins_data);
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename, [
-			'page' => $page,
+			'page' => $page
-			's' => $s
+		]);
-		));
+	} elseif (!isset($_GET['files'])) {
-	} elseif (! isset($_GET['files'])) {
-
 		// email templates
 		$add = false;
-		$language_options = '';
+		$language_options = [];
-		$template_options = '';
+		$template_options = [];
 
 		foreach ($languages as $language_file => $language_name) {
-			$templates = array();
+			$templates = [];
 			$result_stmt = Database::prepare("
 				SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 				WHERE `adminid` = :adminid AND `language` = :lang
 				AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
-			Database::pexecute($result_stmt, array(
+			Database::pexecute($result_stmt, [
 				'adminid' => $userinfo['adminid'],
 				'lang' => $language_name
-			));
+			]);
 
 			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$templates[] = str_replace('_subject', '', $row['varname']);
@@ -337,52 +387,81 @@ if ($action == '') {
 
 			if (count(array_diff($available_templates, $templates)) > 0) {
 				$add = true;
-				$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $userinfo['language'], true, true);
+				$language_options[$language_file] = $language_name;
 
 				$templates = array_diff($available_templates, $templates);
 
 				foreach ($templates as $template) {
-					$template_options .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n";
+					$template_options[$template] = lng('admin.templates.' . $template);
 				}
 			}
 		}
 
 		if ($add) {
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_add_1") . "\";");
+			UI::view('user/form.html.twig', [
+				'formaction' => $linker->getLink(['section' => 'templates']),
+				'formdata' => [
+					'title' => lng('admin.templates.template_add'),
+					'image' => 'fa-solid fa-plus',
+					'self_overview' => ['section' => 'templates', 'page' => 'email'],
+					'sections' => [
+						'section_a' => [
+							'title' => lng('admin.templates.template_add'),
+							'fields' => [
+								'language' => [
+									'label' => lng('login.language'),
+									'type' => 'select',
+									'select_var' => $language_options,
+									'selected' => $userinfo['language']
+								],
+								'template' => [
+									'label' => lng('admin.templates.action'),
+									'type' => 'select',
+									'select_var' => $template_options
+								],
+								'prepare' => [
+									'type' => 'hidden',
+									'value' => 'prepare'
+								]
+							]
+						]
+					]
+				],
+				'editid' => $id
+			]);
 		} else {
-			\Froxlor\UI\Response::standard_error('alltemplatesdefined');
+			Response::standardError('alltemplatesdefined');
 		}
 	} else {
 		// filetemplates
 		$result_stmt = Database::prepare("
 			SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
 			WHERE `adminid` = :adminid AND `templategroup`='files'");
-		Database::pexecute($result_stmt, array(
+		Database::pexecute($result_stmt, [
 			'adminid' => $userinfo['adminid']
-		));
+		]);
 
 		if (Database::num_rows() == count($file_templates)) {
-			\Froxlor\UI\Response::standard_error('alltemplatesdefined');
+			Response::standardError('alltemplatesdefined');
 		} else {
-
+			$templatesdefined = [];
-			$templatesdefined = array();
+			$free_templates = [];
-			$free_templates = '';
 
 			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$templatesdefined[] = $row['varname'];
 			}
 
 			foreach (array_diff($file_templates, $templatesdefined) as $template) {
-				$free_templates .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, '', true);
+				$free_templates[$template] = lng('admin.templates.' . $template);
 			}
 
 			$filetemplate_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_add.php';
-			$filetemplate_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($filetemplate_add_data);
 
-			$title = $filetemplate_add_data['filetemplate_add']['title'];
+			UI::view('user/form-replacers.html.twig', [
-			$image = $filetemplate_add_data['filetemplate_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'templates']),
-
+				'formdata' => $filetemplate_add_data['filetemplate_add'],
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/filetemplates_add") . "\";");
+				'replacers' => $filetemplate_add_data['filetemplate_replacers']
+			]);
 		}
 	}
 } elseif ($action == 'edit' && $subjectid != 0 && $mailbodyid != 0) {
@@ -390,68 +469,65 @@ if ($action == '') {
 	$result_stmt = Database::prepare("
 		SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
 		WHERE `adminid` = :adminid AND `id` = :subjectid");
-	Database::pexecute($result_stmt, array(
+	Database::pexecute($result_stmt, [
 		'adminid' => $userinfo['adminid'],
 		'subjectid' => $subjectid
-	));
+	]);
 	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 	if ($result['varname'] != '') {
-
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$subject = \Froxlor\Validate\Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+			$subject = Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-			$mailbody = \Froxlor\Validate\Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+			$mailbody = Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
 
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
 					`value` = :value
 				WHERE `adminid` = :adminid AND `id` = :id");
 			// subject
-			Database::pexecute($upd_stmt, array(
+			Database::pexecute($upd_stmt, [
 				'value' => $subject,
 				'adminid' => $userinfo['adminid'],
 				'id' => $subjectid
-			));
+			]);
 			// same query but mailbody
-			Database::pexecute($upd_stmt, array(
+			Database::pexecute($upd_stmt, [
 				'value' => $mailbody,
 				'adminid' => $userinfo['adminid'],
 				'id' => $mailbodyid
-			));
+			]);
 
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-
+			$result = PhpHelper::htmlentitiesArray($result);
-			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+			$template_name = lng('admin.templates.' . str_replace('_subject', '', $result['varname']));
-			$template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])];
 			$subject = $result['value'];
 			$result_stmt = Database::prepare("
 				SELECT `language`, `varname`, `value`
 				FROM `" . TABLE_PANEL_TEMPLATES . "`
 				WHERE `id` = :id");
-			Database::pexecute($result_stmt, array(
+			Database::pexecute($result_stmt, [
 				'id' => $mailbodyid
-			));
+			]);
 			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-			$template_name = str_replace('_mailbody', '', $result['varname']);
+			$template = str_replace('_mailbody', '', $result['varname']);
 
 			// don't escape the already escaped language-string so save up before htmlentities()
 			$language = $result['language'];
-			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+			$result = PhpHelper::htmlentitiesArray($result);
 			$mailbody = $result['value'];
 
 			$template_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_edit.php';
-			$template_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($template_edit_data);
 
-			$title = $template_edit_data['template_edit']['title'];
+			UI::view('user/form-replacers.html.twig', [
-			$image = $template_edit_data['template_edit']['image'];
+				'formaction' => $linker->getLink(['section' => 'templates']),
-
+				'formdata' => $template_edit_data['template_edit'],
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_edit") . "\";");
+				'replacers' => $template_edit_data['template_replacers']
+			]);
 		}
 	}
 } elseif ($action == 'editf' && $id != 0) {
@@ -459,45 +535,44 @@ if ($action == '') {
 	$result_stmt = Database::prepare("
 		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
 		WHERE `adminid` = :adminid AND `id` = :id");
-	Database::pexecute($result_stmt, array(
+	Database::pexecute($result_stmt, [
 		'adminid' => $userinfo['adminid'],
 		'id' => $id
-	));
+	]);
 
 	if (Database::num_rows() > 0) {
-
 		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		// filetemplates
 		if (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
-			$filecontent = \Froxlor\Validate\Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
+			$filecontent = Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
 					`value` = :value
 				WHERE `adminid` = :adminid AND `id` = :id");
-			Database::pexecute($upd_stmt, array(
+			Database::pexecute($upd_stmt, [
 				'value' => $filecontent,
 				'adminid' => $userinfo['adminid'],
 				'id' => $id
-			));
+			]);
 
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			$row = PhpHelper::htmlentitiesArray($row);
 
 			$filetemplate_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
-			$filetemplate_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($filetemplate_edit_data);
 
-			$title = $filetemplate_edit_data['filetemplate_edit']['title'];
+			UI::view('user/form-replacers.html.twig', [
-			$image = $filetemplate_edit_data['filetemplate_edit']['image'];
+				'formaction' => $linker->getLink(['section' => 'templates']),
-
+				'formdata' => $filetemplate_edit_data['filetemplate_edit'],
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/filetemplates_edit") . "\";");
+				'replacers' => $filetemplate_edit_data['filetemplate_replacers'],
+				'editid' => $id
+			]);
 		}
 	} else {
-		\Froxlor\UI\Response::standard_error('templatenotfound');
+		Response::standardError('templatenotfound');
 	}
 }

admin_traffic.php

@@ -2,134 +2,47 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Morton Jonuschat <m.jonuschat@chrome-it.de>
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Panel
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'admin';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
 
-if (isset($_POST['id'])) {
+use Froxlor\Traffic\Traffic;
-	$id = intval($_POST['id']);
+use Froxlor\UI\Panel\UI;
-} elseif (isset($_GET['id'])) {
+use Froxlor\UI\Request;
-	$id = intval($_GET['id']);
+use Froxlor\UI\Response;
-}
 
-$months = array(
+$range = Request::any('range', 'currentmonth');
-	'0' => 'empty',
-	'1' => 'jan',
-	'2' => 'feb',
-	'3' => 'mar',
-	'4' => 'apr',
-	'5' => 'may',
-	'6' => 'jun',
-	'7' => 'jul',
-	'8' => 'aug',
-	'9' => 'sep',
-	'10' => 'oct',
-	'11' => 'nov',
-	'12' => 'dec'
-);
 
 if ($page == 'overview' || $page == 'customers') {
-
+	try {
-	$customerview = 1;
+		$context = Traffic::getCustomerStats($userinfo, $range);
-	$stats_tables = '';
+	} catch (Exception $e) {
-	$minyear_stmt = Database::query("SELECT `year` FROM `" . TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
+		if ($e->getCode() === 405) {
-	$minyear = $minyear_stmt->fetch(PDO::FETCH_ASSOC);
+			Response::dynamicError(lng('traffic.nocustomers'));
-
+		}
-	if (! isset($minyear['year']) || $minyear['year'] == 0) {
+		Response::dynamicError($e->getMessage());
-		$maxyears = 0;
-	} else {
-		$maxyears = date("Y") - $minyear['year'];
 	}
 
-	for ($years = 0; $years <= $maxyears; $years ++) {
+	// pass metrics to the view
-
+	UI::view('user/traffic.html.twig', $context);
-		$overview['year'] = date("Y") - $years;
-		$overview['type'] = $lng['traffic']['customer'];
-		$domain_list = '';
-		$totals = array(
-			'jan' => 0,
-			'feb' => 0,
-			'mar' => 0,
-			'apr' => 0,
-			'may' => 0,
-			'jun' => 0,
-			'jul' => 0,
-			'aug' => 0,
-			'sep' => 0,
-			'oct' => 0,
-			'nov' => 0,
-			'dec' => 0
-		);
-
-		$customer_name_list_stmt = Database::prepare("
-			SELECT `customerid`,`company`,`name`,`firstname`
-			FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `deactivated`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :id") . "
-			ORDER BY name");
-		Database::pexecute($customer_name_list_stmt, array(
-			'id' => $userinfo['adminid']
-		));
-
-		while ($customer_name = $customer_name_list_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$virtual_host = array(
-				'name' => ($customer_name['company'] == '' ? $customer_name['name'] . ", " . $customer_name['firstname'] : $customer_name['company']),
-				'customerid' => $customer_name['customerid'],
-				'jan' => '-',
-				'feb' => '-',
-				'mar' => '-',
-				'apr' => '-',
-				'may' => '-',
-				'jun' => '-',
-				'jul' => '-',
-				'aug' => '-',
-				'sep' => '-',
-				'oct' => '-',
-				'nov' => '-',
-				'dec' => '-'
-			);
-
-			$traffic_list_stmt = Database::prepare("
-				SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic
-				FROM `" . TABLE_PANEL_TRAFFIC . "`
-				WHERE year = :year AND `customerid` = :id
-				GROUP BY month ORDER BY month");
-			Database::pexecute($traffic_list_stmt, array(
-				'year' => (date("Y") - $years),
-				'id' => $customer_name['customerid']
-			));
-
-			while ($traffic_month = $traffic_list_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$virtual_host[$months[(int) $traffic_month['month']]] = \Froxlor\PhpHelper::sizeReadable($traffic_month['traffic'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-				$totals[$months[(int) $traffic_month['month']]] += $traffic_month['traffic'];
-			}
-			eval("\$domain_list .= sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table_row") . "\");");
-		}
-		// sum up totals
-		$virtual_host = array(
-			'name' => $lng['traffic']['months']['total']
-		);
-		foreach ($totals as $month => $bytes) {
-			$virtual_host[$month] = ($bytes == 0 ? '-' : \Froxlor\PhpHelper::sizeReadable($bytes, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'));
-		}
-		$customerview = 0;
-		eval("\$total_list = sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table_row") . "\");");
-		eval("\$stats_tables .= sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table") . "\");");
-	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("traffic/index") . "\";");
 }

admin_updates.php

@@ -4,109 +4,113 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    Panel
+ * 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
  */
-define('AREA', 'admin');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'admin';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Cron\TaskId;
+use Froxlor\Froxlor;
+use Froxlor\FroxlorLogger;
+use Froxlor\Install\Preconfig;
+use Froxlor\Install\Update;
 use Froxlor\Settings;
+use Froxlor\System\Cronjob;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\User;
 
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
 
-	/**
+	if (!Froxlor::isFroxlor()) {
-	 * this is a dirty hack but syscp 1.4.2.1 does not
+		throw new Exception('SysCP/customized upgrades are not supported');
-	 * have any version/dbversion in the database (don't know why)
-	 * so we have to set them both to run a correct upgrade
-	 */
-	if (! \Froxlor\Froxlor::isFroxlor()) {
-		if (Settings::Get('panel.version') == null || Settings::Get('panel.version') == '') {
-			Settings::Set('panel.version', '1.4.2.1');
-		}
-		if (Settings::Get('system.dbversion') == null || Settings::Get('system.dbversion') == '') {
-			/**
-			 * for syscp-stable (1.4.2.1) this value has to be 0
-			 * so the required table-fields are added correctly
-			 * and the svn-version has its value in the database
-			 * -> bug #54
-			 */
-			$result_stmt = Database::query("
-				SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
-			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-			if (isset($result['value'])) {
-				Settings::Set('system.dbversion', (int) $result['value'], false);
-			} else {
-				Settings::Set('system.dbversion', 0, false);
-			}
-		}
 	}
 
-	if (\Froxlor\Froxlor::hasDbUpdates() || \Froxlor\Froxlor::hasUpdates()) {
+	if (Froxlor::hasDbUpdates() || Froxlor::hasUpdates()) {
 		$successful_update = false;
 		$message = '';
 
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			if ((isset($_POST['update_preconfig']) && isset($_POST['update_changesagreed']) && intval($_POST['update_changesagreed']) != 0) || ! isset($_POST['update_preconfig'])) {
+			if ((isset($_POST['update_preconfig']) && isset($_POST['update_changesagreed']) && intval($_POST['update_changesagreed']) != 0) || !isset($_POST['update_preconfig'])) {
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/update_start') . "\";");
+				include_once Froxlor::getInstallDir() . 'install/updatesql.php';
 
-				include_once \Froxlor\Froxlor::getInstallDir() . 'install/updatesql.php';
+				User::updateCounters();
+				Cronjob::inserttask(TaskId::REBUILD_VHOST);
+				@chmod(Froxlor::getInstallDir() . '/lib/userdata.inc.php', 0400);
 
-				$redirect_url = 'admin_index.php?s=' . $s;
+				UI::view('install/update.html.twig', [
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/update_end') . "\";");
+					'checks' => Update::getUpdateTasks()
-
+				]);
-				\Froxlor\User::updateCounters();
+				exit;
-				\Froxlor\System\Cronjob::inserttask('1');
-				@chmod(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php', 0440);
-
-				$successful_update = true;
 			} else {
-				$message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>';
+				$message = '<br><br><strong>You have to agree that you have read the update notifications.</strong>';
 			}
 		}
 
-		if (! $successful_update) {
 		$current_version = Settings::Get('panel.version');
 		$current_db_version = Settings::Get('panel.db_version');
 		if (empty($current_db_version)) {
 			$current_db_version = "0";
 		}
-			$new_version = $version;
+		$new_version = Froxlor::VERSION;
-			$new_db_version = $dbversion;
+		$new_db_version = Froxlor::DBVERSION;
 
-			$ui_text = $lng['update']['update_information']['part_a'];
+		if (Froxlor::VERSION != $current_version) {
-			if ($version != $current_version) {
+			$replacer_currentversion = $current_version;
-				$ui_text = str_replace('%curversion', $current_version, $ui_text);
+			$replacer_newversion = $new_version;
-				$ui_text = str_replace('%newversion', $new_version, $ui_text);
 		} else {
 			// show db version
-				$ui_text = str_replace('%curversion', $current_db_version, $ui_text);
+			$replacer_currentversion = $current_db_version;
-				$ui_text = str_replace('%newversion', $new_db_version, $ui_text);
+			$replacer_newversion = $new_db_version;
 		}
-			$update_information = $ui_text;
+		$ui_text = lng('update.update_information.part_a', [$replacer_newversion, $replacer_currentversion]);
+		$ui_text .= lng('update.update_information.part_b');
 
-			include_once \Froxlor\Froxlor::getInstallDir() . '/install/updates/preconfig.php';
+		$upd_formfield = [
-			$preconfig = getPreConfig($current_version, $current_db_version);
+			'updates' => [
-			if ($preconfig != '') {
+				'title' => lng('update.update'),
-				$update_information .= '<br />' . $preconfig . $message;
+				'image' => 'fa-solid fa-download',
+				'description' => lng('update.description'),
+				'sections' => [],
+				'buttons' => [
+					[
+						'label' => lng('update.proceed')
+					]
+				]
+			]
+		];
+
+		$preconfig = Preconfig::getPreConfig();
+		if (!empty($preconfig)) {
+			$upd_formfield['updates']['sections'] = $preconfig;
 		}
 
-			$update_information .= $lng['update']['update_information']['part_b'];
+		UI::view('user/form-note.html.twig', [
-
+			'formaction' => $linker->getLink(['section' => 'updates']),
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/index') . "\";");
+			'formdata' => $upd_formfield['updates'],
-		}
+			// alert
+			'type' => !empty($message) ? 'danger' : 'info',
+			'alert_msg' => $ui_text . $message
+		]);
 	} else {
-		$success_message = $lng['update']['noupdatesavail'];
+		Response::standardSuccess('update.noupdatesavail', Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') . ' ' : '');
-		$redirect_url = 'admin_index.php?s=' . $s;
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/noupdatesavail') . "\";");
 	}
 }

api.php

@@ -1,74 +1,44 @@
 <?php
-require __DIR__ . '/vendor/autoload.php';
-
-require \Froxlor\Froxlor::getInstallDir() . '/lib/tables.inc.php';
-
-// check whether API interface is enabled after all
-if (\Froxlor\Settings::Get('api.enabled') != 1) {
-	// not enabled
-	header("Status: 404 Not found", 404);
-	header($_SERVER["SERVER_PROTOCOL"] . " 404 Not found", 404);
-	exit();
-}
-
-// we're talking json here
-header("Content-Type:application/json");
-
-// get our request
-$request = @file_get_contents('php://input');
-
-// check if present
-if (empty($request)) {
-	json_response(400, "Invalid request");
-}
-
-// decode json request
-$decoded_request = json_decode(stripslashes($request), true);
-
-// is it valid?
-if (is_null($decoded_request)) {
-	json_response(400, "Invalid JSON");
-}
-
-// validate content
-try {
-	$request = \Froxlor\Api\FroxlorRPC::validateRequest($decoded_request);
-	// now actually do it
-	$cls = "\\Froxlor\\Api\\Commands\\" . $request['command']['class'];
-	$method = $request['command']['method'];
-	$apiObj = new $cls($decoded_request['header'], $request['params']);
-	// call the method with the params if any
-	echo $apiObj->$method();
-} catch (Exception $e) {
-	json_response($e->getCode(), $e->getMessage());
-}
-
-exit();
 
 /**
- * output json result
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * @param int $status
+ * This program is free software; you can redistribute it and/or
- * @param string $status_message
+ * modify it under the terms of the GNU General Public License
- * @param mixed $data
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @return void
+ * 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
  */
-function json_response($status, $status_message = '', $data = null)
-{
-	if (isset($_SERVER["SERVER_PROTOCOL"]) && ! empty($_SERVER["SERVER_PROTOCOL"])) {
-		$resheader = $_SERVER["SERVER_PROTOCOL"] . " " . $status;
-		if (! empty($status_message)) {
-			$resheader .= ' ' . str_replace("\n", " ", $status_message);
-		}
-		header($resheader);
-	}
-	$response = array();
-	$response['status'] = $status;
-	$response['status_message'] = $status_message;
-	$response['data'] = $data;
 
-	$json_response = json_encode($response, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+use Froxlor\Api\Api;
-	echo $json_response;
+use Froxlor\Api\Response;
-	exit();
+
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/lib/functions.php';
+require __DIR__ . '/lib/tables.inc.php';
+
+// set error-handler
+@set_error_handler([
+	'\\Froxlor\\Api\\Api',
+	'phpErrHandler'
+]);
+
+// Return response
+try {
+	echo (new Api)->formatMiddleware(@file_get_contents('php://input'))->handle();
+} catch (Exception $e) {
+	echo Response::jsonErrorResponse($e->getMessage(), $e->getCode());
 }

api_keys.php

@@ -1,38 +1,67 @@
 <?php
-if (! defined('AREA')) {
+
+/**
+ * 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();
 }
 
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2018 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> (2018-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Panel
- * @since 0.10.0
- *       
- */
-
 use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+
+// redirect if this customer has no permission for API usage
+if ($userinfo['adminsession'] == 0 && $userinfo['api_allowed'] == 0) {
+	Response::redirectTo('customer_index.php');
+}
+// redirect if this admin has no permission for API usage
+if ($userinfo['adminsession'] == 1 && $userinfo['api_allowed'] == 0) {
+	Response::redirectTo('admin_index.php');
+}
 
 // This file is being included in admin_index and customer_index
 // and therefore does not need to require lib/init.php
 
 $del_stmt = Database::prepare("DELETE FROM `" . TABLE_API_KEYS . "` WHERE id = :id");
-$success_message = "";
+$id = (int)Request::any('id');
-$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
-$area = AREA;
 
 // do the delete and then just show a success-message and the apikeys list again
-if ($action == 'delete') {
+if ($action == 'delete' && $id > 0) {
-	if ($id > 0) {
+	HTML::askYesNo('apikey_reallydelete', $filename, [
+		'id' => $id,
+		'page' => $page,
+		'action' => 'deletesure'
+	], '', [
+		'section' => 'index',
+		'page' => $page
+	]);
+} elseif (isset($_POST['send']) && $_POST['send'] == 'send' && $action == 'deletesure' && $id > 0) {
 	$chk = (AREA == 'admin' && $userinfo['customers_see_all'] == '1') ? true : false;
 	if (AREA == 'customer') {
 		$chk_stmt = Database::prepare("
@@ -40,29 +69,32 @@ if ($action == 'delete') {
 				LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.customerid = c.customerid
 				WHERE ak.`id` = :id AND c.`customerid` = :cid
 			");
-			$chk = Database::pexecute_first($chk_stmt, array(
+		$chk = Database::pexecute_first($chk_stmt, [
 			'id' => $id,
 			'cid' => $userinfo['customerid']
-			));
+		]);
 	} elseif (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
 		$chk_stmt = Database::prepare("
 				SELECT a.adminid FROM `" . TABLE_PANEL_ADMINS . "` a
 				LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.adminid = a.adminid
 				WHERE ak.`id` = :id AND a.`adminid` = :aid
 			");
-			$chk = Database::pexecute_first($chk_stmt, array(
+		$chk = Database::pexecute_first($chk_stmt, [
 			'id' => $id,
 			'aid' => $userinfo['adminid']
-			));
+		]);
 	}
 	if ($chk !== false) {
-			Database::pexecute($del_stmt, array(
+		Database::pexecute($del_stmt, [
 			'id' => $id
-			));
+		]);
-			$success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
+		Response::standardSuccess('apikeys.apikey_removed', $id, [
-		}
+			'filename' => $filename,
+			'page' => $page
+		]);
 	}
 } elseif ($action == 'add') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$ins_stmt = Database::prepare("
 			INSERT INTO `" . TABLE_API_KEYS . "` SET
 			`apikey` = :key, `secret` = :secret, `adminid` = :aid, `customerid` = :cid, `valid_until` = '-1', `allowed_from` = ''
@@ -75,161 +107,80 @@ if ($action == 'delete') {
 		}
 		$key = hash('sha256', openssl_random_pseudo_bytes(64 * 64));
 		$secret = hash('sha512', openssl_random_pseudo_bytes(64 * 64 * 4));
-	Database::pexecute($ins_stmt, array(
+		Database::pexecute($ins_stmt, [
 			'key' => $key,
 			'secret' => $secret,
 			'aid' => $userinfo['adminid'],
 			'cid' => $cid
-	));
+		]);
-	$success_message = $lng['apikeys']['apikey_added'];
+		Response::standardSuccess('apikeys.apikey_added', '', [
-} elseif ($action == 'jqEditApiKey') {
+			'filename' => $filename,
-	$keyid = isset($_POST['id']) ? (int) $_POST['id'] : 0;
+			'page' => $page
-	$allowed_from = isset($_POST['allowed_from']) ? $_POST['allowed_from'] : "";
+		]);
-	$valid_until = isset($_POST['valid_until']) ? (int) $_POST['valid_until'] : - 1;
-
-	// validate allowed_from
-	if (! empty($allowed_from)) {
-		$ip_list = array_map('trim', explode(",", $allowed_from));
-		$_check_list = $ip_list;
-		foreach ($_check_list as $idx => $ip) {
-			if (\Froxlor\Validate\Validate::validate_ip2($ip, true, 'invalidip', true, true) == false) {
-				unset($ip_list[$idx]);
 	}
-		}
+	HTML::askYesNo('apikey_reallyadd', $filename, [
-		$ip_list = array_map('inet_ntop', array_map('inet_pton', $ip_list));
+		'id' => $id,
-		$allowed_from = implode(",", array_unique($ip_list));
+		'page' => $page,
-	}
+		'action' => $action
-
+	], '', [
-	if ($valid_until <= 0 || ! is_numeric($valid_until)) {
+		'section' => 'index',
-		$valid_until = - 1;
+		'page' => $page
-	}
+	]);
-
+	exit;
-	$upd_stmt = Database::prepare("
-		UPDATE `" . TABLE_API_KEYS . "` SET
-		`valid_until` = :vu, `allowed_from` = :af
-		WHERE `id` = :keyid AND `adminid` = :aid AND `customerid` = :cid
-	");
-	if (AREA == 'admin') {
-		$cid = 0;
-	} elseif (AREA == 'customer') {
-		$cid = $userinfo['customerid'];
-	}
-	Database::pexecute($upd_stmt, array(
-		'keyid' => $keyid,
-		'af' => $allowed_from,
-		'vu' => $valid_until,
-		'aid' => $userinfo['adminid'],
-		'cid' => $cid
-	));
-	echo json_encode(true);
-	exit();
 }
 
-$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed api::api_keys");
+$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed api::api_keys");
 
-// select all my (accessable) certificates
+// select all my (accessible) api-keys
 $keys_stmt_query = "SELECT ak.*, c.loginname, a.loginname as adminname
 	FROM `" . TABLE_API_KEYS . "` ak
 	LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` c ON `c`.`customerid` = `ak`.`customerid`
 	LEFT JOIN `" . TABLE_PANEL_ADMINS . "` a ON `a`.`adminid` = `ak`.`adminid`
 	WHERE ";
 
-$qry_params = array();
+$qry_params = [];
 if (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
 	// admin with only customer-specific permissions
 	$keys_stmt_query .= "ak.adminid = :adminid ";
 	$qry_params['adminid'] = $userinfo['adminid'];
-	$fields = array(
+	$fields = [
-		'a.loginname' => $lng['login']['username']
+		'a.loginname' => lng('login.username')
-	);
+	];
 } elseif (AREA == 'customer') {
 	// customer-area
 	$keys_stmt_query .= "ak.customerid = :cid ";
 	$qry_params['cid'] = $userinfo['customerid'];
-	$fields = array(
+	$fields = [
-		'c.loginname' => $lng['login']['username']
+		'c.loginname' => lng('login.username')
-	);
+	];
 } else {
 	// admin who can see all customers / reseller / admins
 	$keys_stmt_query .= "1 ";
-	$fields = array(
+	$fields = [
-		'a.loginname' => $lng['login']['username']
+		'a.loginname' => lng('login.username')
-	);
+	];
 }
 
-$paging = new \Froxlor\UI\Paging($userinfo, TABLE_API_KEYS, $fields);
+//$keys_stmt_query .= $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit();
-$keys_stmt_query .= $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit();
 
 $keys_stmt = Database::prepare($keys_stmt_query);
 Database::pexecute($keys_stmt, $qry_params);
 $all_keys = $keys_stmt->fetchAll(PDO::FETCH_ASSOC);
-$apikeys = "";
 
-if (count($all_keys) == 0) {
+$apikeys_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.apikeys.php';
-	$count = 0;
+$collection = [
-	$message = $lng['apikeys']['no_api_keys'];
+	'data' => $all_keys,
-	$sortcode = "";
+	'pagination' => []
-	$searchcode = "";
+];
-	$pagingcode = "";
-	eval("\$apikeys.=\"" . \Froxlor\UI\Template::getTemplate("api_keys/keys_error", true) . "\";");
-} else {
-	$count = count($all_keys);
-	$paging->setEntries($count);
-	$sortcode = $paging->getHtmlSortCode($lng);
-	$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-	$searchcode = $paging->getHtmlSearchCode($lng);
-	$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 
-	foreach ($all_keys as $idx => $key) {
+$tpl = 'user/table.html.twig';
-		if ($paging->checkDisplay($idx)) {
 
-			// my own key
+UI::view($tpl, [
-			$isMyKey = false;
+	'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikeys_list'),
-			if ($key['adminid'] == $userinfo['adminid'] && ((AREA == 'admin' && $key['customerid'] == 0) || (AREA == 'customer' && $key['customerid'] == $userinfo['customerid']))) {
+	'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [
-				// this is mine
+		[
-				$isMyKey = true;
+			'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']),
-			}
+			'label' => lng('apikeys.key_add')
-
+		]
-			$adminCustomerLink = "";
+	] : null,
-			if (AREA == 'admin') {
+]);
-				if ($isMyKey) {
-					$adminCustomerLink = $key['adminname'];
-				} else {
-					$adminCustomerLink = '<a href="' . $linker->getLink(array(
-						'section' => (empty($key['customerid']) ? 'admins' : 'customers'),
-						'page' => (empty($key['customerid']) ? 'admins' : 'customers'),
-						'action' => 'su',
-						'id' => (empty($key['customerid']) ? $key['adminid'] : $key['customerid'])
-					)) . '" rel="external">' . (empty($key['customerid']) ? $key['adminname'] : $key['loginname']) . '</a>';
-				}
-			} else {
-				// customer do not need links
-				$adminCustomerLink = $key['loginname'];
-			}
-
-			// escape stuff
-			$row = \Froxlor\PhpHelper::htmlentitiesArray($key);
-
-			// shorten keys
-			$row['_apikey'] = substr($row['apikey'], 0, 20) . '...';
-			$row['_secret'] = substr($row['secret'], 0, 20) . '...';
-
-			// check whether the api key is not valid anymore
-			$isValid = true;
-			if ($row['valid_until'] >= 0) {
-				if ($row['valid_until'] < time()) {
-					$isValid = false;
-				}
-				// format
-				$row['valid_until'] = date('Y-m-d', $row['valid_until']);
-			} else {
-				// infinity
-				$row['valid_until'] = "";
-			}
-			eval("\$apikeys.=\"" . \Froxlor\UI\Template::getTemplate("api_keys/keys_key", true) . "\";");
-		} else {
-			continue;
-		}
-	}
-}
-eval("echo \"" . \Froxlor\UI\Template::getTemplate("api_keys/keys_list", true) . "\";");

bin/froxlor-cli

@@ -0,0 +1,62 @@
+#!/usr/bin/env php
+<?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
+ */
+
+declare(strict_types=1);
+
+use Symfony\Component\Console\Application;
+use Froxlor\Cli\RunApiCommand;
+use Froxlor\Cli\ConfigServices;
+use Froxlor\Cli\PhpSessionclean;
+use Froxlor\Cli\SwitchServerIp;
+use Froxlor\Cli\UpdateCommand;
+use Froxlor\Cli\InstallCommand;
+use Froxlor\Cli\MasterCron;
+use Froxlor\Cli\UserCommand;
+use Froxlor\Froxlor;
+
+// validate correct php version
+if (version_compare("7.4.0", PHP_VERSION, ">=")) {
+	die('Froxlor requires at least php-7.4. Please validate that your php-cli version is suitable.');
+}
+
+// ensure that default timezone is set
+if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get")) {
+	@date_default_timezone_set(@date_default_timezone_get());
+}
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+require dirname(__DIR__) . '/lib/tables.inc.php';
+
+$application = new Application('froxlor-cli', Froxlor::getFullVersion());
+$application->add(new RunApiCommand());
+$application->add(new ConfigServices());
+$application->add(new PhpSessionclean());
+$application->add(new SwitchServerIp());
+$application->add(new UpdateCommand());
+$application->add(new InstallCommand());
+$application->add(new MasterCron());
+$application->add(new UserCommand());
+$application->run();

build.xml

@@ -6,21 +6,20 @@
 	<property name="pdepend" value="${basedir}/vendor/bin/pdepend" />
 	<property name="phpcpd" value="${basedir}/vendor/bin/phpcpd" />
 	<property name="phpcs" value="${basedir}/vendor/bin/phpcs" />
-	<property name="phpdox" value="${basedir}/vendor/bin/phpdox" />
 	<property name="phploc" value="${basedir}/vendor/bin/phploc" />
 	<property name="phpmd" value="${basedir}/vendor/bin/phpmd" />
 	<property name="phpunit" value="${basedir}/vendor/bin/phpunit" />
 
 	<target name="full-build"
-		depends="prepare,composer,static-analysis,phpunit,phpdox,-check-failure"
+		depends="prepare,composer,static-analysis,phpunit,-check-failure"
 		description="Performs static analysis, runs the tests, and generates project documentation" />
 
 	<target name="full-build-parallel"
-		depends="prepare,composer,static-analysis-parallel,phpunit,phpdox,-check-failure"
+		depends="prepare,composer,static-analysis-parallel,phpunit,-check-failure"
 		description="Performs static analysis (executing the tools in parallel), runs the tests, and generates project documentation" />
 
 	<target name="quick-build"
-		depends="prepare,composer,lint,phpunit-no-coverage"
+		depends="prepare,composer,lint,phpunit-no-coverage,-check-failure"
 		description="Performs a lint check and runs the tests (without generating code coverage reports)" />
 
 	<target name="static-analysis"
@@ -49,7 +48,6 @@
 		<delete dir="${basedir}/build/coverage" />
 		<delete dir="${basedir}/build/logs" />
 		<delete dir="${basedir}/build/pdepend" />
-		<delete dir="${basedir}/build/phpdox" />
 		<property name="clean.done" value="true" />
 	</target>
 
@@ -59,7 +57,6 @@
 		<mkdir dir="${basedir}/build/coverage" />
 		<mkdir dir="${basedir}/build/logs" />
 		<mkdir dir="${basedir}/build/pdepend" />
-		<mkdir dir="${basedir}/build/phpdox" />
 
 		<property name="prepare.done" value="true" />
 	</target>
@@ -257,7 +254,7 @@
 	<target name="phpunit-no-coverage" unless="phpunit.done"
 		depends="composer"
 		description="Run unit tests with PHPUnit (without generating code coverage reports)">
-		<exec executable="${phpunit}" failonerror="true"
+		<exec executable="${phpunit}" failonerror="true" resultproperty="result.phpunit"
 			taskname="phpunit">
 			<arg value="--configuration" />
 			<arg path="${basedir}/phpunit.xml" />
@@ -269,18 +266,6 @@
 		<property name="phpunit.done" value="true" />
 	</target>
 
-	<target name="phpdox" unless="phpdox.done"
-		depends="phploc-ci,phpcs-ci,phpcompat-ci,phpmd-ci"
-		description="Generate project documentation using phpDox">
-		<exec executable="${phpdox}" dir="${basedir}/build"
-			taskname="phpdox">
-			<arg value="--file" />
-			<arg path="${basedir}/phpdox.xml" />
-		</exec>
-
-		<property name="phpdox.done" value="true" />
-	</target>
-
 	<target name="-check-failure">
 		<fail message="PHPUnit did not finish successfully">
 			<condition>

cache/.gitignore

@@ -0,0 +1,2 @@
+!.gitignore
+*

composer.json

@@ -13,24 +13,24 @@
 			"name": "Michael Kaufmann",
 			"email": "team@froxlor.org",
 			"role": "Lead Developer"
-		},
-		{
-			"name": "Robert Förster",
-			"email": "team@froxlor.org",
-			"role": "Package Maintainer"
 		}
 	],
 	"support": {
 		"email": "team@froxlor.org",
 		"issues": "https://github.com/Froxlor/Froxlor/issues",
 		"forum": "https://forum.froxlor.org/",
-		"wiki": "https://github.com/Froxlor/Froxlor/wiki",
-		"irc": "irc://chat.freenode.net/froxlor",
 		"source": "https://github.com/Froxlor/Froxlor",
-		"docs": "https://github.com/Froxlor/Froxlor/wiki"
+		"docs": "https://docs.froxlor.org/",
+		"chat": "https://discord.froxlor.org/"
 	},
+	"funding": [
+		{
+			"type": "github",
+			"url": "https://github.com/sponsors/d00p"
+		}
+	],
 	"require": {
-		"php": ">=7.0",
+		"php": "^7.4 || ^8.0",
 		"ext-session": "*",
 		"ext-ctype": "*",
 		"ext-pdo": "*",
@@ -43,22 +43,28 @@
 		"ext-curl": "*",
 		"ext-json": "*",
 		"ext-openssl": "*",
+		"ext-fileinfo": "*",
+		"ext-gmp": "*",
 		"phpmailer/phpmailer": "~6.0",
 		"monolog/monolog": "^1.24",
 		"robthree/twofactorauth": "^1.6",
-		"algo26-matthias/idna-convert": "^2.1"
+		"froxlor/idna-convert-legacy": "^2.1",
+		"voku/anti-xss": "^4.1",
+		"twig/twig": "^3.3",
+		"erusev/parsedown": "^1.7",
+		"symfony/console": "^5.4"
     },
 	"require-dev": {
-		"phpunit/phpunit": "^8",
+		"phpunit/phpunit": "^9",
-		"php": ">=7.3",
 		"ext-pcntl": "*",
 		"phpcompatibility/php-compatibility": "*",
 		"squizlabs/php_codesniffer": "*",
-		"pdepend/pdepend": "^2.5",
+		"pdepend/pdepend": "^2.9",
-		"sebastian/phpcpd": "^4.1",
+		"sebastian/phpcpd": "^6.0",
-		"theseer/phpdox": "^0.12.0",
+		"phploc/phploc": "^7.0",
-		"phploc/phploc": "^5.0",
+		"phpmd/phpmd": "^2.10",
-		"phpmd/phpmd": "^2.6"
+		"phpunit/php-timer" : "^5",
+		"phpstan/phpstan": "^1.8"
 	},
 	"suggest": {
 		"ext-bcmath": "*",

customer_domains.php

@@ -2,224 +2,117 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
+
 use Froxlor\Api\Commands\SubDomains as SubDomains;
-use Froxlor\Api\Commands\Certificates as Certificates;
+use Froxlor\Database\Database;
+use Froxlor\Domain\Domain;
+use Froxlor\FileDir;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
+use Froxlor\Settings;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\Validate\Validate;
+use Froxlor\CurrentUser;
 
 // redirect if this customer page is hidden via settings
 if (Settings::IsInList('panel.customer_hide_options', 'domains')) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
-if ($page == 'overview') {
+if ($page == 'overview' || $page == 'domains') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains");
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domains") . "\";");
-} elseif ($page == 'domains') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains");
-		$fields = array(
-			'd.domain' => $lng['domains']['domainname']
-		);
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_DOMAINS, $fields);
-		$domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`letsencrypt`, `d`.`registration_date`, `d`.`termination_date`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d`
-			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id`
-			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id`
-			WHERE `d`.`customerid`= :customerid
-			AND `d`.`email_only`='0'
-			AND `d`.`id` <> :standardsubdomain " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($domains_stmt, array(
-			"customerid" => $userinfo['customerid'],
-			"standardsubdomain" => $userinfo['standardsubdomain']
-		));
-		$paging->setEntries(Database::num_rows());
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$domains = '';
-		$parentdomains_count = 0;
-		$domains_count = 0;
-		$domain_array = array();
 
-		while ($row = $domains_stmt->fetch(PDO::FETCH_ASSOC)) {
+		$parentdomain_id = (int)Request::any('pid', '0');
-			$row['domain'] = $idna_convert->decode($row['domain']);
-			$row['aliasdomain'] = $idna_convert->decode($row['aliasdomain']);
-			$row['domainalias'] = $idna_convert->decode($row['domainalias']);
 
-			if ($row['parentdomainid'] == '0' && $row['caneditdomain'] == '1') {
+		try {
-				$parentdomains_count ++;
+			$domain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.domains.php';
+			$collection = (new Collection(SubDomains::class, $userinfo))
+				->withPagination($domain_list_data['domain_list']['columns'], $domain_list_data['domain_list']['default_sorting']);
+			$parentDomainCollection = (new Collection(SubDomains::class, $userinfo, ['sql_search' => ['d.parentdomainid' => 0]]));
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
 		}
 
-			/**
+		$actions_links = false;
-			 * check for set ssl-certs to show different state-icons
+		if (CurrentUser::canAddResource('subdomains')) {
-			 */
+			$actions_links = [
-			// nothing (ssl_global)
+				[
-			$row['domain_hascert'] = 0;
+					'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains', 'action' => 'add']),
-			$ssl_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` WHERE `domainid` = :domainid");
+					'label' => lng('domains.subdomain_add')
-			Database::pexecute($ssl_stmt, array(
+				]
-				"domainid" => $row['id']
+			];
-			));
-			$ssl_result = $ssl_stmt->fetch(PDO::FETCH_ASSOC);
-			if (is_array($ssl_result) && isset($ssl_result['ssl_cert_file']) && $ssl_result['ssl_cert_file'] != '') {
-				// own certificate (ssl_customer_green)
-				$row['domain_hascert'] = 1;
-			} else {
-				// check if it's parent has one set (shared)
-				if ($row['parentdomainid'] != 0) {
-					$ssl_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` WHERE `domainid` = :domainid");
-					Database::pexecute($ssl_stmt, array(
-						"domainid" => $row['parentdomainid']
-					));
-					$ssl_result = $ssl_stmt->fetch(PDO::FETCH_ASSOC);
-					if (is_array($ssl_result) && isset($ssl_result['ssl_cert_file']) && $ssl_result['ssl_cert_file'] != '') {
-						// parent has a certificate (ssl_shared)
-						$row['domain_hascert'] = 2;
-					}
-				}
 		}
 
-			$row['termination_date'] = str_replace("0000-00-00", "", $row['termination_date']);
+		UI::view('user/table.html.twig', [
-			if ($row['termination_date'] != "") {
+			'listing' => Listing::format($collection, $domain_list_data, 'domain_list'),
-				$cdate = strtotime($row['termination_date'] . " 23:59:59");
+			'actions_links' => $actions_links,
-				$today = time();
+			'entity_info' => lng('domains.description')
-
+		]);
-				if ($cdate < $today) {
-					$row['termination_css'] = 'domain-expired';
-				} else {
-					$row['termination_css'] = 'domain-canceled';
-				}
-			}
-
-			$domains_count ++;
-			$domain_array[$row['domain']] = $row;
-		}
-
-		ksort($domain_array);
-		$domain_id_array = array();
-		foreach ($domain_array as $sortkey => $row) {
-			$domain_id_array[$row['id']] = $sortkey;
-		}
-
-		$domain_sort_array = array();
-		foreach ($domain_array as $sortkey => $row) {
-			if ($row['parentdomainid'] == 0) {
-				$domain_sort_array[$sortkey][$sortkey] = $row;
-			} else {
-				// when searching and the results are subdomains only, we need to get
-				// the parent domain to this subdomain
-				if (! isset($domain_id_array[$row['parentdomainid']])) {
-					$domain_id_array[$row['parentdomainid']] = "[parent-domain]";
-				}
-				$domain_sort_array[$domain_id_array[$row['parentdomainid']]][$sortkey] = $row;
-			}
-		}
-
-		$domain_array = array();
-
-		if ($paging->sortfield == 'd.domain' && $paging->sortorder == 'asc') {
-			ksort($domain_sort_array);
-		} elseif ($paging->sortfield == 'd.domain' && $paging->sortorder == 'desc') {
-			krsort($domain_sort_array);
-		}
-
-		$i = 0;
-		foreach ($domain_sort_array as $sortkey => $domain_array) {
-			if ($paging->checkDisplay($i)) {
-
-				if (isset($domain_array[$sortkey])) {
-					$row = \Froxlor\PhpHelper::htmlentitiesArray($domain_array[$sortkey]);
-					if (Settings::Get('system.awstats_enabled') == '1') {
-						$statsapp = 'awstats';
-					} else {
-						$statsapp = 'webalizer';
-					}
-					eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_delimiter") . "\";");
-				}
-
-				if ($paging->sortfield == 'd.domain' && $paging->sortorder == 'asc') {
-					ksort($domain_array);
-				} elseif ($paging->sortfield == 'd.domain' && $paging->sortorder == 'desc') {
-					krsort($domain_array);
-				}
-
-				foreach ($domain_array as $row) {
-					if (strpos($row['documentroot'], $userinfo['documentroot']) === 0) {
-						$row['documentroot'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['documentroot']));
-					}
-
-					// get ssl-ips if activated
-					$show_ssledit = false;
-					if (Settings::Get('system.use_ssl') == '1' && \Froxlor\Domain\Domain::domainHasSslIpPort($row['id']) && $row['caneditdomain'] == '1' && $row['letsencrypt'] == 0) {
-						$show_ssledit = true;
-					}
-					$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-					eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_domain") . "\";");
-				}
-			}
-
-			$i += count($domain_array);
-		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domainlist") . "\";");
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = SubDomains::getLocal($userinfo, array(
+			$json_result = SubDomains::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		$alias_stmt = Database::prepare("SELECT COUNT(`id`) AS `count` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `aliasdomain` = :aliasdomain");
-		$alias_check = Database::pexecute_first($alias_stmt, array(
+		$alias_check = Database::pexecute_first($alias_stmt, [
 			"aliasdomain" => $id
-		));
+		]);
 
 		if (isset($result['parentdomainid']) && $result['parentdomainid'] != '0' && $alias_check['count'] == 0) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					SubDomains::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('domains_reallydelete', $filename, array(
+				HTML::askYesNo('domains_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $idna_convert->decode($result['domain']));
+				], $idna_convert->decode($result['domain']));
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('domains_cantdeletemaindomain');
+			Response::standardError('domains_cantdeletemaindomain');
 		}
 	} elseif ($action == 'add') {
 		if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') {
@@ -227,12 +120,11 @@ if ($page == 'overview') {
 				try {
 					SubDomains::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				$stmt = Database::prepare("SELECT `id`, `domain`, `documentroot`, `ssl_redirect`,`isemaildomain`,`letsencrypt` FROM `" . TABLE_PANEL_DOMAINS . "`
 					WHERE `customerid` = :customerid
@@ -240,16 +132,15 @@ if ($page == 'overview') {
 					AND `email_only` = '0'
 					AND `caneditdomain` = '1'
 					ORDER BY `domain` ASC");
-				Database::pexecute($stmt, array(
+				Database::pexecute($stmt, [
 					"customerid" => $userinfo['customerid']
-				));
+				]);
-				$domains = '';
+				$domains = [];
-
 				while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-					$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row['domain']), $row['domain']);
+					$domains[$row['domain']] = $idna_convert->decode($row['domain']);
 				}
 
-				$aliasdomains = \Froxlor\UI\HTML::makeoption($lng['domains']['noaliasdomain'], 0, NULL, true);
+				$aliasdomains[0] = lng('domains.noaliasdomain');
 				$domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c`
 					WHERE `d`.`aliasdomain` IS NULL
 					AND `d`.`id` <> `c`.`standardsubdomain`
@@ -258,24 +149,24 @@ if ($page == 'overview') {
 					AND `d`.`email_only`='0'
 					AND `d`.`customerid`= :customerid
 					ORDER BY `d`.`domain` ASC");
-				Database::pexecute($domains_stmt, array(
+				Database::pexecute($domains_stmt, [
 					"customerid" => $userinfo['customerid']
-				));
+				]);
 
 				while ($row_domain = $domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$aliasdomains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']);
+					$aliasdomains[$row_domain['id']] = $idna_convert->decode($row_domain['domain']);
 				}
 
-				$redirectcode = '';
+				$redirectcode = [];
 				if (Settings::Get('customredirect.enabled') == '1') {
-					$codes = \Froxlor\Domain\Domain::getRedirectCodesArray();
+					$codes = Domain::getRedirectCodesArray();
 					foreach ($codes as $rc) {
-						$redirectcode .= \Froxlor\UI\HTML::makeoption($rc['code'] . ' (' . $lng['redirect_desc'][$rc['desc']] . ')', $rc['id']);
+						$redirectcode[$rc['id']] = $rc['code'] . ' (' . lng('redirect_desc.' . $rc['desc']) . ')';
 					}
 				}
 
 				// check if we at least have one ssl-ip/port, #1179
-				$ssl_ipsandports = '';
+				$ssl_ipsandports = false;
 				$ssl_ip_stmt = Database::prepare("
 					SELECT COUNT(*) as countSSL
 					FROM `" . TABLE_PANEL_IPSANDPORTS . "` pip
@@ -284,17 +175,19 @@ if ($page == 'overview') {
 				");
 				Database::pexecute($ssl_ip_stmt);
 				$resultX = $ssl_ip_stmt->fetch(PDO::FETCH_ASSOC);
-				if (isset($resultX['countSSL']) && (int) $resultX['countSSL'] > 0) {
+				if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) {
-					$ssl_ipsandports = 'notempty';
+					$ssl_ipsandports = true;
 				}
 
-				$openbasedir = \Froxlor\UI\HTML::makeoption($lng['domain']['docroot'], 0, NULL, true) . \Froxlor\UI\HTML::makeoption($lng['domain']['homedir'], 1, NULL, true);
+				$openbasedir = [
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+					0 => lng('domain.docroot'),
+					1 => lng('domain.homedir'),
+					2 => lng('domain.docparent')
+				];
+				$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 
-				$phpconfigs = '';
+				$phpconfigs = [];
-				$has_phpconfigs = false;
+				if (isset($userinfo['allowed_phpconfigs']) && !empty($userinfo['allowed_phpconfigs'])) {
-				if (isset($userinfo['allowed_phpconfigs']) && ! empty($userinfo['allowed_phpconfigs'])) {
-					$has_phpconfigs = true;
 					$allowed_cfg = json_decode($userinfo['allowed_phpconfigs'], JSON_OBJECT_AS_ARRAY);
 					$phpconfigs_result_stmt = Database::query("
 						SELECT c.*, fc.description as interpreter
@@ -303,49 +196,51 @@ if ($page == 'overview') {
 						WHERE c.id IN (" . implode(", ", $allowed_cfg) . ")
 					");
 					while ($phpconfigs_row = $phpconfigs_result_stmt->fetch(PDO::FETCH_ASSOC)) {
-						if ((int) Settings::Get('phpfpm.enabled') == 1) {
+						if ((int)Settings::Get('phpfpm.enabled') == 1) {
-							$phpconfigs .= \Froxlor\UI\HTML::makeoption($phpconfigs_row['description'] . " [" . $phpconfigs_row['interpreter'] . "]", $phpconfigs_row['id'], Settings::Get('phpfpm.defaultini'), true, true);
+							$phpconfigs[$phpconfigs_row['id']] = $phpconfigs_row['description'] . " [" . $phpconfigs_row['interpreter'] . "]";
 						} else {
-							$phpconfigs .= \Froxlor\UI\HTML::makeoption($phpconfigs_row['description'], $phpconfigs_row['id'], Settings::Get('system.mod_fcgid_defaultini'), true, true);
+							$phpconfigs[$phpconfigs_row['id']] = $phpconfigs_row['description'];
 						}
 					}
 				}
 
 				$subdomain_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/domains/formfield.domains_add.php';
-				$subdomain_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($subdomain_add_data);
 
-				$title = $subdomain_add_data['domain_add']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $subdomain_add_data['domain_add']['image'];
+					'formaction' => $linker->getLink(['section' => 'domains']),
-
+					'formdata' => $subdomain_add_data['domain_add']
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domains_add") . "\";");
+				]);
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-
 		try {
-			$json_result = SubDomains::getLocal($userinfo, array(
+			$json_result = SubDomains::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['customerid']) && $result['customerid'] == $userinfo['customerid']) {
+
+			if ((int) $result['caneditdomain'] == 0) {
+				Response::standardError('domaincannotbeedited', $result['domain']);
+			}
+
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					SubDomains::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				$result['domain'] = $idna_convert->decode($result['domain']);
 
-				$domains = \Froxlor\UI\HTML::makeoption($lng['domains']['noaliasdomain'], 0, $result['aliasdomain'], true);
+				$domains[0] = lng('domains.noaliasdomain');
 				// also check ip/port combination to be the same, #176
 				$domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d` , `" . TABLE_PANEL_CUSTOMERS . "` `c` , `" . TABLE_DOMAINTOIP . "` `dip`
 					WHERE `d`.`aliasdomain` IS NULL
@@ -360,88 +255,90 @@ if ($page == 'overview') {
 						WHERE `id_domain` = :id)
 					GROUP BY `d`.`id`, `d`.`domain`
 					ORDER BY `d`.`domain` ASC");
-				Database::pexecute($domains_stmt, array(
+				Database::pexecute($domains_stmt, [
 					"id" => $result['id'],
 					"customerid" => $userinfo['customerid']
-				));
+				]);
 
 				while ($row_domain = $domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id'], $result['aliasdomain']);
+					$domains[$row_domain['id']] = $idna_convert->decode($row_domain['domain']);
 				}
 
-				if (preg_match('/^https?\:\/\//', $result['documentroot']) && \Froxlor\Validate\Validate::validateUrl($result['documentroot'])) {
+				if (preg_match('/^https?\:\/\//', $result['documentroot']) && Validate::validateUrl($result['documentroot'])) {
 					if (Settings::Get('panel.pathedit') == 'Dropdown') {
 						$urlvalue = $result['documentroot'];
-						$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+						$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 					} else {
 						$urlvalue = '';
-						$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $result['documentroot'], true);
+						$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $result['documentroot'], true);
 					}
 				} else {
 					$urlvalue = '';
-					$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $result['documentroot']);
+					$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $result['documentroot']);
 				}
 
-				$redirectcode = '';
+				$redirectcode = [];
 				if (Settings::Get('customredirect.enabled') == '1') {
-					$def_code = \Froxlor\Domain\Domain::getDomainRedirectId($id);
+					$def_code = Domain::getDomainRedirectId($id);
-					$codes = \Froxlor\Domain\Domain::getRedirectCodesArray();
+					$codes = Domain::getRedirectCodesArray();
 					foreach ($codes as $rc) {
-						$redirectcode .= \Froxlor\UI\HTML::makeoption($rc['code'] . ' (' . $lng['redirect_desc'][$rc['desc']] . ')', $rc['id'], $def_code);
+						$redirectcode[$rc['id']] = $rc['code'] . ' (' . lng('redirect_desc.' . $rc['desc']) . ')';
 					}
 				}
 
 				// check if we at least have one ssl-ip/port, #1179
-				$ssl_ipsandports = '';
+				$ssl_ipsandports = false;
 				$ssl_ip_stmt = Database::prepare("
 					SELECT COUNT(*) as countSSL
 					FROM `" . TABLE_PANEL_IPSANDPORTS . "` pip
 					LEFT JOIN `" . TABLE_DOMAINTOIP . "` dti ON dti.id_ipandports = pip.id
 					WHERE `dti`.`id_domain` = :id_domain AND pip.`ssl`='1'
 				");
-				Database::pexecute($ssl_ip_stmt, array(
+				Database::pexecute($ssl_ip_stmt, [
 					"id_domain" => $result['id']
-				));
+				]);
 				$resultX = $ssl_ip_stmt->fetch(PDO::FETCH_ASSOC);
-				if (isset($resultX['countSSL']) && (int) $resultX['countSSL'] > 0) {
+				if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) {
-					$ssl_ipsandports = 'notempty';
+					$ssl_ipsandports = true;
 				}
 
 				// Fudge the result for ssl_redirect to hide the Let's Encrypt steps
 				$result['temporary_ssl_redirect'] = $result['ssl_redirect'];
 				$result['ssl_redirect'] = ($result['ssl_redirect'] == 0 ? 0 : 1);
 
-				$openbasedir = \Froxlor\UI\HTML::makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . \Froxlor\UI\HTML::makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true);
+				$openbasedir = [
+					0 => lng('domain.docroot'),
+					1 => lng('domain.homedir'),
+					2 => lng('domain.docparent')
+				];
 
 				// create serveralias options
-				$serveraliasoptions = "";
+				$serveraliasoptions = [];
-				$_value = '2';
+				$serveraliasoptions_selected = '2';
 				if ($result['iswildcarddomain'] == '1') {
-					$_value = '0';
+					$serveraliasoptions_selected = '0';
 				} elseif ($result['wwwserveralias'] == '1') {
-					$_value = '1';
+					$serveraliasoptions_selected = '1';
 				}
-				$serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_wildcard'], '0', $_value, true, true);
+				$serveraliasoptions[0] = lng('domains.serveraliasoption_wildcard');
-				$serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_www'], '1', $_value, true, true);
+				$serveraliasoptions[1] = lng('domains.serveraliasoption_www');
-				$serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_none'], '2', $_value, true, true);
+				$serveraliasoptions[2] = lng('domains.serveraliasoption_none');
 
 				$ips_stmt = Database::prepare("SELECT `p`.`ip` AS `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` `p`
 					LEFT JOIN `" . TABLE_DOMAINTOIP . "` `dip`
 					ON ( `dip`.`id_ipandports` = `p`.`id` )
 					WHERE `dip`.`id_domain` = :id_domain
 					GROUP BY `p`.`ip`");
-				Database::pexecute($ips_stmt, array(
+				Database::pexecute($ips_stmt, [
 					"id_domain" => $result['id']
-				));
+				]);
-				$result_ipandport['ip'] = '';
+				$domainips = [];
 				while ($rowip = $ips_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$result_ipandport['ip'] .= $rowip['ip'] . "<br />";
+					$domainips[] = ['item' => $rowip['ip']];
 				}
 
-				$phpconfigs = '';
+				$phpconfigs = [];
-				$has_phpconfigs = false;
+				if (isset($userinfo['allowed_phpconfigs']) && !empty($userinfo['allowed_phpconfigs'])) {
-				if (isset($userinfo['allowed_phpconfigs']) && ! empty($userinfo['allowed_phpconfigs'])) {
-					$has_phpconfigs = true;
 					$allowed_cfg = json_decode($userinfo['allowed_phpconfigs'], JSON_OBJECT_AS_ARRAY);
 					$phpconfigs_result_stmt = Database::query("
 						SELECT c.*, fc.description as interpreter
@@ -450,100 +347,40 @@ if ($page == 'overview') {
 						WHERE c.id IN (" . implode(", ", $allowed_cfg) . ")
 					");
 					while ($phpconfigs_row = $phpconfigs_result_stmt->fetch(PDO::FETCH_ASSOC)) {
-						if ((int) Settings::Get('phpfpm.enabled') == 1) {
+						if ((int)Settings::Get('phpfpm.enabled') == 1) {
-							$phpconfigs .= \Froxlor\UI\HTML::makeoption($phpconfigs_row['description'] . " [" . $phpconfigs_row['interpreter'] . "]", $phpconfigs_row['id'], $result['phpsettingid'], true, true);
+							$phpconfigs[$phpconfigs_row['id']] = $phpconfigs_row['description'] . " [" . $phpconfigs_row['interpreter'] . "]";
 						} else {
-							$phpconfigs .= \Froxlor\UI\HTML::makeoption($phpconfigs_row['description'], $phpconfigs_row['id'], $result['phpsettingid'], true, true);
+							$phpconfigs[$phpconfigs_row['id']] = $phpconfigs_row['description'];
 						}
 					}
 				}
 
 				$alias_stmt = Database::prepare("SELECT COUNT(`id`) AS count FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `aliasdomain`= :aliasdomain");
-				$alias_check = Database::pexecute_first($alias_stmt, array("aliasdomain" => $result['id']));
+				$alias_check = Database::pexecute_first($alias_stmt, [
+					"aliasdomain" => $result['id']
+				]);
 				$alias_check = $alias_check['count'];
 
-				$domainip = $result_ipandport['ip'];
+				$result = PhpHelper::htmlentitiesArray($result);
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
 				$subdomain_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/domains/formfield.domains_edit.php';
-				$subdomain_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($subdomain_edit_data);
 
-				$title = $subdomain_edit_data['domain_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $subdomain_edit_data['domain_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'domains', 'id' => $id]),
-
+					'formdata' => $subdomain_edit_data['domain_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domains_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('domains_canteditdomain');
+			Response::standardError('domains_canteditdomain');
 		}
 	}
 } elseif ($page == 'domainssleditor') {
-
+	require_once __DIR__ . '/ssl_editor.php';
-	if ($action == '' || $action == 'view') {
-
-		// get domain
-		try {
-			$json_result = SubDomains::getLocal($userinfo, array(
-				'id' => $id
-			))->get();
-		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
-		}
-		$result_domain = json_decode($json_result, true)['data'];
-
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$do_insert = isset($_POST['do_insert']) ? (($_POST['do_insert'] == 1) ? true : false) : false;
-			try {
-				if ($do_insert) {
-					Certificates::getLocal($userinfo, $_POST)->add();
-				} else {
-					Certificates::getLocal($userinfo, $_POST)->update();
-				}
-			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
-			}
-			// back to domain overview
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				'page' => 'domains',
-				's' => $s
-			));
-		}
-
-		$stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
-			WHERE `domainid`= :domainid");
-		$result = Database::pexecute_first($stmt, array(
-			"domainid" => $id
-		));
-
-		$do_insert = false;
-		// if no entry can be found, behave like we have empty values
-		if (! is_array($result) || ! isset($result['ssl_cert_file'])) {
-			$result = array(
-				'ssl_cert_file' => '',
-				'ssl_key_file' => '',
-				'ssl_ca_file' => '',
-				'ssl_cert_chainfile' => ''
-			);
-			$do_insert = true;
-		}
-
-		$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
-
-		$ssleditor_data = include_once dirname(__FILE__) . '/lib/formfields/customer/domains/formfield.domain_ssleditor.php';
-		$ssleditor_form = \Froxlor\UI\HtmlForm::genHTMLForm($ssleditor_data);
-
-		$title = $ssleditor_data['domain_ssleditor']['title'];
-		$image = $ssleditor_data['domain_ssleditor']['image'];
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domain_ssleditor") . "\";");
-	}
 } elseif ($page == 'domaindnseditor' && $userinfo['dnsenabled'] == '1' && Settings::Get('system.dnsenabled') == '1') {
-
 	require_once __DIR__ . '/dns_editor.php';
 } elseif ($page == 'sslcertificates') {
-
 	require_once __DIR__ . '/ssl_certificates.php';
 } elseif ($page == 'logfiles') {
-
 	require_once __DIR__ . '/logfiles_viewer.php';
 }

customer_email.php

@@ -2,177 +2,124 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
-use Froxlor\Api\Commands\Emails as Emails;
+
 use Froxlor\Api\Commands\EmailAccounts as EmailAccounts;
 use Froxlor\Api\Commands\EmailForwarders as EmailForwarders;
+use Froxlor\Api\Commands\Emails as Emails;
+use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
+use Froxlor\Settings;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\Validate\Check;
+use Froxlor\CurrentUser;
 
 // redirect if this customer page is hidden via settings
-if (Settings::IsInList('panel.customer_hide_options', 'email')) {
+if (Settings::IsInList('panel.customer_hide_options', 'email') || $userinfo['emails'] == 0) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
-if ($page == 'overview') {
+if ($page == 'overview' || $page == 'emails') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_email");
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/email") . "\";");
-} elseif ($page == 'emails') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_email::emails");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_email::emails");
-		$fields = array(
-			'd.domain' => $lng['domains']['domainname'],
-			'm.email_full' => $lng['emails']['emailaddress'],
-			'm.destination' => $lng['emails']['forwarders']
-		);
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_MAIL_VIRTUAL, $fields);
-		$result_stmt = Database::prepare('SELECT `m`.`id`, `m`.`domainid`, `m`.`email`, `m`.`email_full`, `m`.`iscatchall`, `u`.`quota`, `m`.`destination`, `m`.`popaccountid`, `d`.`domain`, `u`.`mboxsize` FROM `' . TABLE_MAIL_VIRTUAL . '` `m`
-			LEFT JOIN `' . TABLE_PANEL_DOMAINS . '` `d` ON (`m`.`domainid` = `d`.`id`)
-			LEFT JOIN `' . TABLE_MAIL_USERS . '` `u` ON (`m`.`popaccountid` = `u`.`id`)
-			WHERE `m`.`customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			"customerid" => $userinfo['customerid']
-		));
-		$emailscount = Database::num_rows();
-		$paging->setEntries($emailscount);
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$emails = array();
 
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		try {
-			if (! isset($emails[$row['domain']]) || ! is_array($emails[$row['domain']])) {
+			$email_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.emails.php';
-				$emails[$row['domain']] = array();
+			$collection = (new Collection(Emails::class, $userinfo))
+				->withPagination($email_list_data['email_list']['columns'], $email_list_data['email_list']['default_sorting']);
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
 		}
 
-			$emails[$row['domain']][$row['email_full']] = $row;
+		$result_stmt = Database::prepare("
+			SELECT COUNT(`id`) as emaildomains
+			FROM `" . TABLE_PANEL_DOMAINS . "`
+			WHERE `customerid`= :cid AND `isemaildomain` = '1'
+		");
+		$result2 = Database::pexecute_first($result_stmt, [
+			"cid" => $userinfo['customerid']
+		]);
+		$emaildomains_count = $result2['emaildomains'];
+
+		$actions_links = false;
+		if (CurrentUser::canAddResource('emails')) {
+			$actions_links = [
+				[
+					'href' => $linker->getLink(['section' => 'email', 'page' => $page, 'action' => 'add']),
+					'label' => lng('emails.emails_add')
+				]
+			];
 		}
 
-		if ($paging->sortfield == 'd.domain' && $paging->sortorder == 'desc') {
+		UI::view('user/table.html.twig', [
-			krsort($emails);
+			'listing' => Listing::format($collection, $email_list_data, 'email_list'),
-		} else {
+			'actions_links' => $actions_links,
-			ksort($emails);
+			'entity_info' => lng('emails.description')
-		}
+		]);
-
-		$i = 0;
-		$count = 0;
-		$accounts = '';
-		$emails_count = 0;
-		$domainname = '';
-		foreach ($emails as $domainid => $emailaddresses) {
-			if ($paging->sortfield == 'm.email_full' && $paging->sortorder == 'desc') {
-				krsort($emailaddresses);
-			} else {
-				ksort($emailaddresses);
-			}
-
-			foreach ($emailaddresses as $row) {
-				if ($paging->checkDisplay($i)) {
-					if ($domainname != $idna_convert->decode($row['domain'])) {
-						$domainname = $idna_convert->decode($row['domain']);
-						eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate("email/emails_domain") . "\";");
-					}
-
-					$emails_count ++;
-					$row['email'] = $idna_convert->decode($row['email']);
-					$row['email_full'] = $idna_convert->decode($row['email_full']);
-					$row['destination'] = explode(' ', $row['destination']);
-					uasort($row['destination'], 'strcasecmp');
-
-					$dest_list = $row['destination'];
-					foreach ($dest_list as $dest_id => $destination) {
-						$row['destination'][$dest_id] = $idna_convert->decode($row['destination'][$dest_id]);
-
-						if ($row['destination'][$dest_id] == $row['email_full']) {
-							unset($row['destination'][$dest_id]);
-						}
-					}
-
-					$destinations_count = count($row['destination']);
-					$row['destination'] = implode(', ', $row['destination']);
-
-					if (strlen($row['destination']) > 35) {
-						$row['destination'] = substr($row['destination'], 0, 32) . '... (' . $destinations_count . ')';
-					}
-
-					$row['mboxsize'] = \Froxlor\PhpHelper::sizeReadable($row['mboxsize'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-
-					$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-					eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate("email/emails_email") . "\";");
-					$count ++;
-				}
-
-				$i ++;
-			}
-		}
-
-		$emaildomains_count_stmt = Database::prepare("SELECT COUNT(`id`) AS `count` FROM `" . TABLE_PANEL_DOMAINS . "`
-			WHERE `customerid`= :customerid
-			AND `isemaildomain`='1' ORDER BY `domain` ASC");
-		Database::pexecute($emaildomains_count_stmt, array(
-			"customerid" => $userinfo['customerid']
-		));
-		$emaildomains_count = $emaildomains_count_stmt->fetch(PDO::FETCH_ASSOC);
-		$emaildomains_count = $emaildomains_count['count'];
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/emails") . "\";");
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['email']) && $result['email'] != '') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
-					Emails::getLocal($userinfo, array(
+					Emails::getLocal($userinfo, [
-						'id' => $id
+						'id' => $id,
-					))->delete();
+						'delete_userfiles' => ($_POST['delete_userfiles'] ?? 0)
+					])->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				if ($result['popaccountid'] != '0') {
 					$show_checkbox = true;
 				} else {
 					$show_checkbox = false;
 				}
-				\Froxlor\UI\HTML::askYesNoWithCheckbox('email_reallydelete', 'admin_customer_alsoremovemail', $filename, array(
+				HTML::askYesNoWithCheckbox('email_reallydelete', 'admin_customer_alsoremovemail', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $idna_convert->decode($result['email_full']), $show_checkbox);
+				], $idna_convert->decode($result['email_full']), $show_checkbox);
 			}
 		}
 	} elseif ($action == 'add') {
@@ -181,78 +128,89 @@ if ($page == 'overview') {
 				try {
 					$json_result = Emails::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
 				$result = json_decode($json_result, true)['data'];
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
 					'page' => $page,
 					'action' => 'edit',
-					'id' => $result['id'],
+					'id' => $result['id']
-					's' => $s
+				]);
-				));
 			} else {
 				$result_stmt = Database::prepare("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
 					WHERE `customerid`= :cid
 					AND `isemaildomain`='1'
-					ORDER BY `domain` ASC");
+					ORDER BY `domain_ace` ASC");
-				Database::pexecute($result_stmt, array(
+				Database::pexecute($result_stmt, [
 					"cid" => $userinfo['customerid']
-				));
+				]);
-				$domains = '';
+				$domains = [];
-
 				while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row['domain']), $row['domain']);
+					$domains[$row['domain']] = $idna_convert->decode($row['domain']);
 				}
 
-				// $iscatchall = \Froxlor\UI\HTML::makeyesno('iscatchall', '1', '0', '0');
+				if (count($domains) > 0) {
-
 					$email_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/email/formfield.emails_add.php';
 
 					if (Settings::Get('catchall.catchall_enabled') != '1') {
 						unset($email_add_data['emails_add']['sections']['section_a']['fields']['iscatchall']);
 					}
-
+					UI::view('user/form.html.twig', [
-				$email_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($email_add_data);
+						'formaction' => $linker->getLink(['section' => 'email']),
-
+						'formdata' => $email_add_data['emails_add']
-				$title = $email_add_data['emails_add']['title'];
+					]);
-				$image = $email_add_data['emails_add']['image'];
+				} else {
-
+					Response::standardError('emails.noemaildomainaddedyet');
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/emails_add") . "\";");
+				}
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('allresourcesused');
+			Response::standardError('allresourcesused');
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['email']) && $result['email'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			}
 			$result['email'] = $idna_convert->decode($result['email']);
 			$result['email_full'] = $idna_convert->decode($result['email_full']);
 			$result['destination'] = explode(' ', $result['destination']);
 			uasort($result['destination'], 'strcasecmp');
-			$forwarders = '';
+			$forwarders = [];
 			$forwarders_count = 0;
 
 			foreach ($result['destination'] as $dest_id => $destination) {
 				$destination = $idna_convert->decode($destination);
-
 				if ($destination != $result['email_full'] && $destination != '') {
-					eval("\$forwarders.=\"" . \Froxlor\UI\Template::getTemplate("email/emails_edit_forwarder") . "\";");
+					$forwarders[] = [
-					$forwarders_count ++;
+						'item' => $destination,
+						'href' => $linker->getLink([
+							'section' => 'email',
+							'page' => 'forwarders',
+							'action' => 'delete',
+							'id' => $id,
+							'forwarderid' => $dest_id
+						]),
+						'label' => lng('panel.delete'),
+						'classes' => 'btn btn-sm btn-danger'
+					];
+					$forwarders_count++;
 				}
-
 				$result['destination'][$dest_id] = $destination;
 			}
 
 			$destinations_count = count($result['destination']);
-			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+			$result = PhpHelper::htmlentitiesArray($result);
 
 			$email_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/email/formfield.emails_edit.php';
 
@@ -260,47 +218,45 @@ if ($page == 'overview') {
 				unset($email_edit_data['emails_edit']['sections']['section_a']['fields']['mail_catchall']);
 			}
 
-			$email_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($email_edit_data);
+			UI::view('user/form.html.twig', [
-
+				'formaction' => $linker->getLink(['section' => 'email']),
-			$title = $email_edit_data['emails_edit']['title'];
+				'formdata' => $email_edit_data['emails_edit'],
-			$image = $email_edit_data['emails_edit']['image'];
+				'editid' => $id
-
+			]);
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/emails_edit") . "\";");
 		}
 	} elseif ($action == 'togglecatchall' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		try {
-			Emails::getLocal($userinfo, array(
+			Emails::getLocal($userinfo, [
 				'id' => $id,
 				'iscatchall' => ($result['iscatchall'] == '1' ? 0 : 1)
-			))->update();
+			])->update();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename, [
 			'page' => $page,
 			'action' => 'edit',
-			'id' => $id,
+			'id' => $id
-			's' => $s
+		]);
-		));
 	}
 } elseif ($page == 'accounts') {
 	if ($action == 'add' && $id != 0) {
 		if ($userinfo['email_accounts'] == '-1' || ($userinfo['email_accounts_used'] < $userinfo['email_accounts'])) {
 			try {
-				$json_result = Emails::getLocal($userinfo, array(
+				$json_result = Emails::getLocal($userinfo, [
 					'id' => $id
-				))->get();
+				])->get();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
 			$result = json_decode($json_result, true)['data'];
 
@@ -308,47 +264,63 @@ if ($page == 'overview') {
 				try {
 					EmailAccounts::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
 					'page' => 'emails',
 					'action' => 'edit',
-					'id' => $id,
+					'id' => $id
-					's' => $s
+				]);
-				));
 			} else {
-
+				if (Check::checkMailAccDeletionState($result['email_full'])) {
-				if (\Froxlor\Validate\Check::checkMailAccDeletionState($result['email_full'])) {
+					Response::standardError([
-					\Froxlor\UI\Response::standard_error(array(
 						'mailaccistobedeleted'
-					), $result['email_full']);
+					], $result['email_full']);
 				}
 
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = PhpHelper::htmlentitiesArray($result);
 				$quota = Settings::Get('system.mail_quota');
 
 				$account_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/email/formfield.emails_addaccount.php';
-				$account_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($account_add_data);
 
-				$title = $account_add_data['emails_addaccount']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $account_add_data['emails_addaccount']['image'];
+					'formaction' => $linker->getLink(['section' => 'email', 'id' => $id]),
-
+					'formdata' => $account_add_data['emails_addaccount'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/account_add") . "\";");
+					'actions_links' => [
+						[
+							'class' => 'btn-secondary',
+							'href' => $linker->getLink([
+								'section' => 'email',
+								'page' => 'emails',
+								'action' => 'edit',
+								'id' => $id
+							]),
+							'label' => lng('emails.emails_edit'),
+							'icon' => 'fa-solid fa-pen'
+						],
+						[
+							'class' => 'btn-secondary',
+							'href' => $linker->getLink(['section' => 'email', 'page' => 'emails']),
+							'label' => lng('menue.email.emails'),
+							'icon' => 'fa-solid fa-envelope'
+						]
+					],
+				]);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'allresourcesused',
 				'allocatetoomuchquota'
-			), $quota);
+			], $quota);
 		}
 	} elseif ($action == 'changepw' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -357,34 +329,51 @@ if ($page == 'overview') {
 				try {
 					EmailAccounts::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
 					'page' => 'emails',
 					'action' => 'edit',
-					'id' => $id,
+					'id' => $id
-					's' => $s
+				]);
-				));
 			} else {
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = PhpHelper::htmlentitiesArray($result);
 
 				$account_changepw_data = include_once dirname(__FILE__) . '/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php';
-				$account_changepw_form = \Froxlor\UI\HtmlForm::genHTMLForm($account_changepw_data);
 
-				$title = $account_changepw_data['emails_accountchangepasswd']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $account_changepw_data['emails_accountchangepasswd']['image'];
+					'formaction' => $linker->getLink(['section' => 'email', 'id' => $id]),
-
+					'formdata' => $account_changepw_data['emails_accountchangepasswd'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/account_changepw") . "\";");
+					'actions_links' => [
+						[
+							'class' => 'btn-secondary',
+							'href' => $linker->getLink([
+								'section' => 'email',
+								'page' => 'emails',
+								'action' => 'edit',
+								'id' => $id
+							]),
+							'label' => lng('emails.emails_edit'),
+							'icon' => 'fa-solid fa-pen'
+						],
+						[
+							'class' => 'btn-secondary',
+							'href' => $linker->getLink(['section' => 'email', 'page' => 'emails']),
+							'label' => lng('menue.email.emails'),
+							'icon' => 'fa-solid fa-envelope'
+						]
+					],
+				]);
 			}
 		}
 	} elseif ($action == 'changequota' && Settings::Get('system.mail_quota_enabled') == '1' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -393,34 +382,51 @@ if ($page == 'overview') {
 				try {
 					EmailAccounts::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
 					'page' => 'emails',
 					'action' => 'edit',
-					'id' => $id,
+					'id' => $id
-					's' => $s
+				]);
-				));
 			} else {
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = PhpHelper::htmlentitiesArray($result);
 
 				$quota_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/email/formfield.emails_accountchangequota.php';
-				$quota_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($quota_edit_data);
 
-				$title = $quota_edit_data['emails_accountchangequota']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $quota_edit_data['emails_accountchangequota']['image'];
+					'formaction' => $linker->getLink(['section' => 'email', 'id' => $id]),
-
+					'formdata' => $quota_edit_data['emails_accountchangequota'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/account_changequota") . "\";");
+					'actions_links' => [
+						[
+							'class' => 'btn-secondary',
+							'href' => $linker->getLink([
+								'section' => 'email',
+								'page' => 'emails',
+								'action' => 'edit',
+								'id' => $id
+							]),
+							'label' => lng('emails.emails_edit'),
+							'icon' => 'fa-solid fa-pen'
+						],
+						[
+							'class' => 'btn-secondary',
+							'href' => $linker->getLink(['section' => 'email', 'page' => 'emails']),
+							'label' => lng('menue.email.emails'),
+							'icon' => 'fa-solid fa-envelope'
+						]
+					],
+				]);
 			}
 		}
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -429,20 +435,19 @@ if ($page == 'overview') {
 				try {
 					EmailAccounts::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
 					'page' => 'emails',
 					'action' => 'edit',
-					'id' => $id,
+					'id' => $id
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNoWithCheckbox('email_reallydelete_account', 'admin_customer_alsoremovemail', $filename, array(
+				HTML::askYesNoWithCheckbox('email_reallydelete_account', 'admin_customer_alsoremovemail', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $idna_convert->decode($result['email_full']));
+				], $idna_convert->decode($result['email_full']));
 			}
 		}
 	}
@@ -450,11 +455,11 @@ if ($page == 'overview') {
 	if ($action == 'add' && $id != 0) {
 		if ($userinfo['email_forwarders_used'] < $userinfo['email_forwarders'] || $userinfo['email_forwarders'] == '-1') {
 			try {
-				$json_result = Emails::getLocal($userinfo, array(
+				$json_result = Emails::getLocal($userinfo, [
 					'id' => $id
-				))->get();
+				])->get();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
 			$result = json_decode($json_result, true)['data'];
 
@@ -463,37 +468,54 @@ if ($page == 'overview') {
 					try {
 						EmailForwarders::getLocal($userinfo, $_POST)->add();
 					} catch (Exception $e) {
-						\Froxlor\UI\Response::dynamic_error($e->getMessage());
+						Response::dynamicError($e->getMessage());
 					}
-					\Froxlor\UI\Response::redirectTo($filename, array(
+					Response::redirectTo($filename, [
 						'page' => 'emails',
 						'action' => 'edit',
-						'id' => $id,
+						'id' => $id
-						's' => $s
+					]);
-					));
 				} else {
 					$result['email_full'] = $idna_convert->decode($result['email_full']);
-					$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+					$result = PhpHelper::htmlentitiesArray($result);
 
 					$forwarder_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/email/formfield.emails_addforwarder.php';
-					$forwarder_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($forwarder_add_data);
 
-					$title = $forwarder_add_data['emails_addforwarder']['title'];
+					UI::view('user/form.html.twig', [
-					$image = $forwarder_add_data['emails_addforwarder']['image'];
+						'formaction' => $linker->getLink(['section' => 'email', 'id' => $id]),
-
+						'formdata' => $forwarder_add_data['emails_addforwarder'],
-					eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/forwarder_add") . "\";");
+						'actions_links' => [
+							[
+								'class' => 'btn-secondary',
+								'href' => $linker->getLink([
+									'section' => 'email',
+									'page' => 'emails',
+									'action' => 'edit',
+									'id' => $id
+								]),
+								'label' => lng('emails.emails_edit'),
+								'icon' => 'fa-solid fa-pen'
+							],
+							[
+								'class' => 'btn-secondary',
+								'href' => $linker->getLink(['section' => 'email', 'page' => 'emails']),
+								'label' => lng('menue.email.emails'),
+								'icon' => 'fa-solid fa-envelope'
+							]
+						],
+					]);
 				}
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('allresourcesused');
+			Response::standardError('allresourcesused');
 		}
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = Emails::getLocal($userinfo, array(
+			$json_result = Emails::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -515,21 +537,20 @@ if ($page == 'overview') {
 					try {
 						EmailForwarders::getLocal($userinfo, $_POST)->delete();
 					} catch (Exception $e) {
-						\Froxlor\UI\Response::dynamic_error($e->getMessage());
+						Response::dynamicError($e->getMessage());
 					}
-					\Froxlor\UI\Response::redirectTo($filename, array(
+					Response::redirectTo($filename, [
 						'page' => 'emails',
 						'action' => 'edit',
-						'id' => $id,
+						'id' => $id
-						's' => $s
+					]);
-					));
 				} else {
-					\Froxlor\UI\HTML::askYesNo('email_reallydelete_forwarder', $filename, array(
+					HTML::askYesNo('email_reallydelete_forwarder', $filename, [
 						'id' => $id,
 						'forwarderid' => $forwarderid,
 						'page' => $page,
 						'action' => $action
-					), $idna_convert->decode($result['email_full']) . ' -> ' . $idna_convert->decode($forwarder));
+					], $idna_convert->decode($result['email_full']) . ' -> ' . $idna_convert->decode($forwarder));
 				}
 			}
 		}

customer_extras.php

@@ -2,93 +2,89 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\CustomerBackups as CustomerBackups;
 use Froxlor\Api\Commands\DirOptions as DirOptions;
 use Froxlor\Api\Commands\DirProtections as DirProtections;
-use Froxlor\Api\Commands\CustomerBackups as CustomerBackups;
+use Froxlor\Customer\Customer;
+use Froxlor\FileDir;
+use Froxlor\FroxlorLogger;
+use Froxlor\PhpHelper;
+use Froxlor\Settings;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
 // redirect if this customer page is hidden via settings
 if (Settings::IsInList('panel.customer_hide_options', 'extras')) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
-
-if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras");
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/extras") . "\";");
-} elseif ($page == 'htpasswds') {
 
+if ($page == 'overview' || $page == 'htpasswds') {
 	// redirect if this customer sub-page is hidden via settings
 	if (Settings::IsInList('panel.customer_hide_options', 'extras.directoryprotection')) {
-		\Froxlor\UI\Response::redirectTo('customer_index.php');
+		Response::redirectTo('customer_index.php');
 	}
 
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
-		$fields = array(
+		$fields = [
-			'username' => $lng['login']['username'],
+			'username' => lng('login.username'),
-			'path' => $lng['panel']['path']
+			'path' => lng('panel.path')
-		);
+		];
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_HTPASSWDS, $fields);
+		try {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			$htpasswd_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.htpasswd.php';
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+			$collection = (new Collection(DirProtections::class, $userinfo))
-		Database::pexecute($result_stmt, array(
+				->withPagination($htpasswd_list_data['htpasswd_list']['columns'], $htpasswd_list_data['htpasswd_list']['default_sorting']);
-			"customerid" => $userinfo['customerid']
+		} catch (Exception $e) {
-		));
+			Response::dynamicError($e->getMessage());
-		$paging->setEntries(Database::num_rows());
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-		$htpasswds = '';
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
-					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
-				}
-				$row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']);
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				eval("\$htpasswds.=\"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_htpasswd") . "\";");
-				$count ++;
 		}
 
-			$i ++;
+		UI::view('user/table.html.twig', [
-		}
+			'listing' => Listing::format($collection, $htpasswd_list_data, 'htpasswd_list'),
-
+			'actions_links' => [
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds") . "\";");
+				[
+					'href' => $linker->getLink(['section' => 'extras', 'page' => 'htpasswds', 'action' => 'add']),
+					'label' => lng('extras.directoryprotection_add')
+				]
+			],
+			'entity_info' => lng('extras.description')
+		]);
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = DirProtections::getLocal($userinfo, array(
+			$json_result = DirProtections::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -97,22 +93,21 @@ if ($page == 'overview') {
 				try {
 					DirProtections::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
 					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
-				\Froxlor\UI\HTML::askYesNo('extras_reallydelete', $filename, array(
+				HTML::askYesNo('extras_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['username'] . ' (' . $result['path'] . ')');
+				], $result['username'] . ' (' . $result['path'] . ')');
 			}
 		}
 	} elseif ($action == 'add') {
@@ -120,30 +115,28 @@ if ($page == 'overview') {
 			try {
 				DirProtections::getLocal($userinfo, $_POST)->add();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+			$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 
 			$htpasswd_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_add.php';
-			$htpasswd_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($htpasswd_add_data);
 
-			$title = $htpasswd_add_data['htpasswd_add']['title'];
+			UI::view('user/form.html.twig', [
-			$image = $htpasswd_add_data['htpasswd_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'extras']),
-
+				'formdata' => $htpasswd_add_data['htpasswd_add']
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_add") . "\";");
+			]);
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = DirProtections::getLocal($userinfo, array(
+			$json_result = DirProtections::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -152,89 +145,63 @@ if ($page == 'overview') {
 				try {
 					DirProtections::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
 					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
-
+				$result = PhpHelper::htmlentitiesArray($result);
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
 				$htpasswd_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
-				$htpasswd_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($htpasswd_edit_data);
 
-				$title = $htpasswd_edit_data['htpasswd_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $htpasswd_edit_data['htpasswd_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'extras', 'id' => $id]),
-
+					'formdata' => $htpasswd_edit_data['htpasswd_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}
 } elseif ($page == 'htaccess') {
-
 	// redirect if this customer sub-page is hidden via settings
 	if (Settings::IsInList('panel.customer_hide_options', 'extras.pathoptions')) {
-		\Froxlor\UI\Response::redirectTo('customer_index.php');
+		Response::redirectTo('customer_index.php');
 	}
 
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
-		$fields = array(
-			'path' => $lng['panel']['path'],
-			'options_indexes' => $lng['extras']['view_directory'],
-			'error404path' => $lng['extras']['error404path'],
-			'error403path' => $lng['extras']['error403path'],
-			'error500path' => $lng['extras']['error500path'],
-			'options_cgi' => $lng['extras']['execute_perl']
-		);
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_HTACCESS, $fields);
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			"customerid" => $userinfo['customerid']
-		));
-		$paging->setEntries(Database::num_rows());
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-		$htaccess = '';
 
-		$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
+		$cperlenabled = Customer::customerHasPerlEnabled($userinfo['customerid']);
 
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		try {
-			if ($paging->checkDisplay($i)) {
+			$htaccess_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.htaccess.php';
-				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+			$collection = (new Collection(DirOptions::class, $userinfo))
-					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+				->withPagination($htaccess_list_data['htaccess_list']['columns'], $htaccess_list_data['htaccess_list']['default_sorting']);
-				}
+		} catch (Exception $e) {
-				$row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']);
+			Response::dynamicError($e->getMessage());
-				$row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']);
-				$row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']);
-				$row['options_cgi'] = str_replace('1', $lng['panel']['yes'], $row['options_cgi']);
-				$row['options_cgi'] = str_replace('0', $lng['panel']['no'], $row['options_cgi']);
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				eval("\$htaccess.=\"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_htaccess") . "\";");
-				$count ++;
 		}
 
-			$i ++;
+		UI::view('user/table.html.twig', [
-		}
+			'listing' => Listing::format($collection, $htaccess_list_data, 'htaccess_list'),
-
+			'actions_links' => [
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess") . "\";");
+				[
+					'href' => $linker->getLink(['section' => 'extras', 'page' => 'htaccess', 'action' => 'add']),
+					'label' => lng('extras.pathoptions_add')
+				]
+			],
+			'entity_info' => lng('extras.description')
+		]);
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = DirOptions::getLocal($userinfo, array(
+			$json_result = DirOptions::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -243,18 +210,17 @@ if ($page == 'overview') {
 				try {
 					DirOptions::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('extras_reallydelete_pathoptions', $filename, array(
+				HTML::askYesNo('extras_reallydelete_pathoptions', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), str_replace($userinfo['documentroot'], '/', $result['path']));
+				], str_replace($userinfo['documentroot'], '/', $result['path']));
 			}
 		}
 	} elseif ($action == 'add') {
@@ -262,31 +228,29 @@ if ($page == 'overview') {
 			try {
 				DirOptions::getLocal($userinfo, $_POST)->add();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename, [
-				'page' => $page,
+				'page' => $page
-				's' => $s
+			]);
-			));
 		} else {
-			$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+			$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-			$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
+			$cperlenabled = Customer::customerHasPerlEnabled($userinfo['customerid']);
 
 			$htaccess_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_add.php';
-			$htaccess_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($htaccess_add_data);
 
-			$title = $htaccess_add_data['htaccess_add']['title'];
+			UI::view('user/form.html.twig', [
-			$image = $htaccess_add_data['htaccess_add']['image'];
+				'formaction' => $linker->getLink(['section' => 'extras']),
-
+				'formdata' => $htaccess_add_data['htaccess_add']
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_add") . "\";");
+			]);
 		}
 	} elseif (($action == 'edit') && ($id != 0)) {
 		try {
-			$json_result = DirOptions::getLocal($userinfo, array(
+			$json_result = DirOptions::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -295,106 +259,86 @@ if ($page == 'overview') {
 				try {
 					DirOptions::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
 					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
+				$cperlenabled = Customer::customerHasPerlEnabled($userinfo['customerid']);
 
-				$result['error404path'] = $result['error404path'];
+				$result = PhpHelper::htmlentitiesArray($result);
-				$result['error403path'] = $result['error403path'];
-				$result['error500path'] = $result['error500path'];
-				$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
-				/*
-				 * $options_indexes = \Froxlor\UI\HTML::makeyesno('options_indexes', '1', '0', $result['options_indexes']);
-				 * $options_cgi = \Froxlor\UI\HTML::makeyesno('options_cgi', '1', '0', $result['options_cgi']);
-				 */
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
 				$htaccess_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_edit.php';
-				$htaccess_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($htaccess_edit_data);
 
-				$title = $htaccess_edit_data['htaccess_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $htaccess_edit_data['htaccess_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'extras', 'id' => $id]),
-
+					'formdata' => $htaccess_edit_data['htaccess_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}
 } elseif ($page == 'backup') {
-
 	// redirect if this customer sub-page is hidden via settings
 	if (Settings::IsInList('panel.customer_hide_options', 'extras.backup')) {
-		\Froxlor\UI\Response::redirectTo('customer_index.php');
+		Response::redirectTo('customer_index.php');
 	}
 
 	if (Settings::Get('system.backupenabled') == 1) {
-		if ($action == 'abort' && isset($_POST['send']) && $_POST['send'] == 'send') {
+		if ($action == 'abort') {
-			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "customer_extras::backup - aborted scheduled backupjob");
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "customer_extras::backup - aborted scheduled backupjob");
 				try {
 					CustomerBackups::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-			\Froxlor\UI\Response::standard_success('backupaborted');
+				Response::redirectTo($filename, [
-			\Froxlor\UI\Response::redirectTo($filename, array(
 					'page' => $page,
-				'action' => '',
+					'action' => ''
-				's' => $s
+				]);
-			));
+			} else {
+				HTML::askYesNo('extras_reallydelete_backup', $filename, [
+					'backup_job_entry' => $id,
+					'section' => 'extras',
+					'page' => $page,
+					'action' => $action
+				]);
 			}
-		if ($action == '') {
+		} elseif ($action == '') {
-			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::backup");
+			$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::backup");
 
 			// check whether there is a backup-job for this customer
 			try {
-				$json_result = CustomerBackups::getLocal($userinfo)->listing();
+				$backup_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.backups.php';
+				$collection = (new Collection(CustomerBackups::class, $userinfo));
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
-			}
-			$result = json_decode($json_result, true)['data'];
-			$existing_backupJob = null;
-			if ($result['count'] > 0) {
-				$existing_backupJob = array_shift($result['list']);
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					CustomerBackups::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::standard_success('backupscheduled');
+				Response::standardSuccess('backupscheduled');
 			} else {
-
+				$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-				if (! empty($existing_backupJob)) {
-					$action = "abort";
-					$row = $existing_backupJob['data'];
-
-					$row['path'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['destdir']));
-					$row['backup_web'] = ($row['backup_web'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
-					$row['backup_mail'] = ($row['backup_mail'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
-					$row['backup_dbs'] = ($row['backup_dbs'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
-				}
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 				$backup_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.backup.php';
-				$backup_form = \Froxlor\UI\HtmlForm::genHTMLForm($backup_data);
-				$title = $backup_data['backup']['title'];
-				$image = $backup_data['backup']['image'];
 
-				if (! empty($existing_backupJob)) {
+				UI::view('user/form-datatable.html.twig', [
-					// overwrite backup_form after we took everything from it we needed
+					'formaction' => $linker->getLink(['section' => 'extras']),
-					eval("\$backup_form = \"" . \Froxlor\UI\Template::getTemplate("extras/backup_listexisting") . "\";");
+					'formdata' => $backup_data['backup'],
-				}
+					'tabledata' => Listing::format($collection, $backup_list_data, 'backup_list'),
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/backup") . "\";");
+				]);
 			}
 		}
 	} else {
-		\Froxlor\UI\Response::standard_error('backupfunctionnotenabled');
+		Response::standardError('backupfunctionnotenabled');
 	}
 }

customer_ftp.php

@@ -2,93 +2,83 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
+
 use Froxlor\Api\Commands\Ftps as Ftps;
+use Froxlor\Database\Database;
+use Froxlor\FileDir;
+use Froxlor\FroxlorLogger;
+use Froxlor\Settings;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\CurrentUser;
 
 // redirect if this customer page is hidden via settings
-if (Settings::IsInList('panel.customer_hide_options', 'ftp')) {
+if (Settings::IsInList('panel.customer_hide_options', 'ftp') || $userinfo['ftps'] == 0) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
-$id = 0;
+$id = (int)Request::any('id', 0);
-if (isset($_POST['id'])) {
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
-if ($page == 'overview') {
+if ($page == 'overview' || $page == 'accounts') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/ftp') . "\";");
-} elseif ($page == 'accounts') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
-		$fields = array(
+		try {
-			'username' => $lng['login']['username'],
+			$ftp_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.ftps.php';
-			'homedir' => $lng['panel']['path'],
+			$collection = (new Collection(Ftps::class, $userinfo))
-			'description' => $lng['panel']['ftpdesc']
+				->withPagination($ftp_list_data['ftp_list']['columns'], $ftp_list_data['ftp_list']['default_sorting']);
-		);
+		} catch (Exception $e) {
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_FTP_USERS, $fields);
+			Response::dynamicError($e->getMessage());
-
-		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir`, `shell` FROM `" . TABLE_FTP_USERS . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			"customerid" => $userinfo['customerid']
-		));
-		$ftps_count = Database::num_rows();
-		$paging->setEntries($ftps_count);
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-		$accounts = '';
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
-					$row['documentroot'] = str_replace($userinfo['documentroot'], "/", $row['homedir']);
-				} else {
-					$row['documentroot'] = $row['homedir'];
 		}
 
-				$row['documentroot'] = \Froxlor\FileDir::makeCorrectDir($row['documentroot']);
+		$actions_links = false;
-
+		if (CurrentUser::canAddResource('ftps')) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			$actions_links = [
-				eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_account') . "\";");
+				[
-				$count ++;
+					'href' => $linker->getLink(['section' => 'ftp', 'page' => 'accounts', 'action' => 'add']),
+					'label' => lng('ftp.account_add')
+				]
+			];
 		}
 
-			$i ++;
+		UI::view('user/table.html.twig', [
-		}
+			'listing' => Listing::format($collection, $ftp_list_data, 'ftp_list'),
-
+			'actions_links' => $actions_links,
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts') . "\";");
+			'entity_info' => lng('ftp.description')
+		]);
 	} elseif ($action == 'delete' && $id != 0) {
 		try {
-			$json_result = Ftps::getLocal($userinfo, array(
+			$json_result = Ftps::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -97,21 +87,20 @@ if ($page == 'overview') {
 				try {
 					Ftps::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				\Froxlor\UI\HTML::askYesNoWithCheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array(
+				HTML::askYesNoWithCheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $result['username']);
+				], $result['username']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('ftp_cantdeletemainaccount');
+			Response::standardError('ftp_cantdeletemainaccount');
 		}
 	} elseif ($action == 'add') {
 		if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') {
@@ -119,68 +108,55 @@ if ($page == 'overview') {
 				try {
 					Ftps::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
+				$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
 
 				if (Settings::Get('customer.ftpatdomain') == '1') {
-					$domainlist = array();
+					$domainlist = [];
-					$domains = '';
-
 					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
 						WHERE `customerid`= :customerid");
-					Database::pexecute($result_domains_stmt, array(
+					Database::pexecute($result_domains_stmt, [
 						"customerid" => $userinfo['customerid']
-					));
+					]);
 
 					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$domainlist[] = $row_domain['domain'];
+						$domainlist[$row_domain['domain']] = $idna_convert->decode($row_domain['domain']);
 					}
-
 					sort($domainlist);
-
-					if (isset($domainlist[0]) && $domainlist[0] != '') {
-						foreach ($domainlist as $dom) {
-							$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($dom), $dom);
-						}
-					}
 				}
 
 				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shells = \Froxlor\UI\HTML::makeoption("/bin/false", "/bin/false", "/bin/false");
+					$shells['/bin/false'] = "/bin/false";
 					$shells_avail = Settings::Get('system.available_shells');
-					if (! empty($shells_avail)) {
+					if (!empty($shells_avail)) {
-						$shells_avail = explode(",", $shells_avail);
+						$shells_avail_arr = explode(",", $shells_avail);
-						$shells_avail = array_map("trim", $shells_avail);
+						$shells_avail_arr = array_map("trim", $shells_avail_arr);
-						foreach ($shells_avail as $_shell) {
+						foreach ($shells_avail_arr as $shell) {
-							$shells .= \Froxlor\UI\HTML::makeoption($_shell, $_shell, "/bin/false");
+							$shells[$shell] = $shell;
 						}
 					}
 				}
 
-				// $sendinfomail = \Froxlor\UI\HTML::makeyesno('sendinfomail', '1', '0', '0');
-
 				$ftp_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/ftp/formfield.ftp_add.php';
-				$ftp_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($ftp_add_data);
 
-				$title = $ftp_add_data['ftp_add']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $ftp_add_data['ftp_add']['image'];
+					'formaction' => $linker->getLink(['section' => 'ftp']),
-
+					'formdata' => $ftp_add_data['ftp_add']
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_add') . "\";");
+				]);
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = Ftps::getLocal($userinfo, array(
+			$json_result = Ftps::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -189,55 +165,40 @@ if ($page == 'overview') {
 				try {
 					Ftps::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
 					$homedir = str_replace($userinfo['documentroot'], "/", $result['homedir']);
 				} else {
 					$homedir = $result['homedir'];
 				}
-				$homedir = \Froxlor\FileDir::makeCorrectDir($homedir);
+				$homedir = FileDir::makeCorrectDir($homedir);
 
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
+				$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
-
-				if (Settings::Get('customer.ftpatdomain') == '1') {
-					$domains = '';
-
-					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `customerid` = :customerid");
-					Database::pexecute($result_domains_stmt, array(
-						"customerid" => $userinfo['customerid']
-					));
-
-					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
-					}
-				}
 
 				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shells = \Froxlor\UI\HTML::makeoption("/bin/false", "/bin/false", $result['shell']);
+					$shells['/bin/false'] = "/bin/false";
 					$shells_avail = Settings::Get('system.available_shells');
-					if (! empty($shells_avail)) {
+					if (!empty($shells_avail)) {
-						$shells_avail = explode(",", $shells_avail);
+						$shells_avail_arr = explode(",", $shells_avail);
-						$shells_avail = array_map("trim", $shells_avail);
+						$shells_avail_arr = array_map("trim", $shells_avail_arr);
-						foreach ($shells_avail as $_shell) {
+						foreach ($shells_avail_arr as $shell) {
-							$shells .= \Froxlor\UI\HTML::makeoption($_shell, $_shell, $result['shell']);
+							$shells[$shell] = $shell;
 						}
 					}
 				}
 
 				$ftp_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/ftp/formfield.ftp_edit.php';
-				$ftp_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($ftp_edit_data);
 
-				$title = $ftp_edit_data['ftp_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $ftp_edit_data['ftp_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'ftp', 'id' => $id]),
-
+					'formdata' => $ftp_edit_data['ftp_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_edit') . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

customer_index.php

@@ -2,71 +2,86 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
-use Froxlor\Settings;
+require __DIR__ . '/lib/init.php';
+
 use Froxlor\Api\Commands\Customers as Customers;
+use Froxlor\CurrentUser;
+use Froxlor\Database\Database;
+use Froxlor\Froxlor;
+use Froxlor\FroxlorLogger;
+use Froxlor\Settings;
+use Froxlor\System\Crypt;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\Validate\Validate;
+use Froxlor\Language;
+use Froxlor\System\Cronjob;
+use Froxlor\Cron\TaskId;
 
 if ($action == 'logout') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'logged out');
+	$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'logged out');
 
-	$params = array(
+	unset($_SESSION['userinfo']);
-		"customerid" => $userinfo['customerid']
+	CurrentUser::setData();
-	);
+	session_destroy();
-	if (Settings::Get('session.allow_multiple_login') == '1') {
+
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+	Response::redirectTo('index.php');
-			WHERE `userid` = :customerid
+} elseif ($action == 'suback') {
-			AND `adminsession` = '0'
+	if (is_array(CurrentUser::getField('switched_user'))) {
-			AND `hash` = :hash");
+		$result = CurrentUser::getData();
-		$params["hash"] = $s;
+		$result = $result['switched_user'];
-	} else {
+		CurrentUser::setData($result);
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
-			WHERE `userid` = :customerid
+		$redirect = "admin_" . $target . ".php";
-			AND `adminsession` = '0'");
+		if (!file_exists(Froxlor::getInstallDir() . "/" . $redirect)) {
+			$redirect = "admin_index.php";
+		}
+		Response::redirectTo($redirect, null, true);
+	} else {
+		Response::dynamicError("Cannot change back - You've never switched to another user :-)");
 	}
-	Database::pexecute($stmt, $params);
-
-	\Froxlor\UI\Response::redirectTo('index.php');
 }
 
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_index");
+	$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_index");
 
 	$domain_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
 		WHERE `customerid` = :customerid
 		AND `parentdomainid` = '0'
 		AND `id` <> :standardsubdomain
 	");
-	Database::pexecute($domain_stmt, array(
+	Database::pexecute($domain_stmt, [
 		"customerid" => $userinfo['customerid'],
 		"standardsubdomain" => $userinfo['standardsubdomain']
-	));
+	]);
-
-	$domains = '';
-	$domainArray = array();
 
+	$domainArray = [];
 	while ($row = $domain_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$domainArray[] = $idna_convert->decode($row['domain']);
 	}
-
 	natsort($domainArray);
-	$domains = implode(',<br />', $domainArray);
 
 	// standard-subdomain
 	$stdsubdomain = '';
@@ -76,10 +91,10 @@ if ($page == 'overview') {
 			WHERE `customerid` = :customerid
 			AND `id` = :standardsubdomain
 		");
-		$std_domain = Database::pexecute_first($std_domain_stmt, array(
+		$std_domain = Database::pexecute_first($std_domain_stmt, [
 			"customerid" => $userinfo['customerid'],
 			"standardsubdomain" => $userinfo['standardsubdomain']
-		));
+		]);
 		$stdsubdomain = $std_domain['domain'];
 	}
 
@@ -89,278 +104,169 @@ if ($page == 'overview') {
 
 	// get disk-space usages for web, mysql and mail
 	$usages_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DISKSPACE . "` WHERE `customerid` = :cid ORDER BY `stamp` DESC LIMIT 1");
-	$usages = Database::pexecute_first($usages_stmt, array(
+	$usages = Database::pexecute_first($usages_stmt, [
 		'cid' => $userinfo['customerid']
-	));
+	]);
 
-	if ($usages)
+	// get everything in bytes for the percentage calculation on the dashboard
-	{
+	$userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1;
-		$userinfo['diskspace_used'] = round($usages['webspace'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1;
-		$userinfo['mailspace_used'] = round($usages['mail'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['traffic_bytes_used'] = $userinfo['traffic_used'] * 1024;
-		$userinfo['dbspace_used'] = round($usages['mysql'] / 1024, Settings::Get('panel.decimal_places'));
+
+	if ($usages) {
+		$userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024;
+		$userinfo['total_bytes_used'] = ($usages['webspace'] + $usages['mail'] + $usages['mysql']) * 1024;
 	} else {
-		$userinfo['diskspace_used'] = 0;
+		$userinfo['diskspace_bytes_used'] = 0;
-		$userinfo['mailspace_used'] = 0;
+		$userinfo['total_bytes_used'] = 0;
-		$userinfo['dbspace_used'] = 0;
 	}
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, Settings::Get('panel.decimal_places'));
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
-	$userinfo = \Froxlor\PhpHelper::strReplaceArray('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
 
-	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+	UI::twig()->addGlobal('userinfo', $userinfo);
-
+	UI::view('user/index.html.twig', [
-	$services_enabled = "";
+		'domains' => $domainArray,
-	$se = array();
+		'stdsubdomain' => $stdsubdomain
-	if ($userinfo['imap'] == '1')
+	]);
-		$se[] = "IMAP";
-	if ($userinfo['pop3'] == '1')
-		$se[] = "POP3";
-	if ($userinfo['phpenabled'] == '1')
-		$se[] = "PHP";
-	if ($userinfo['perlenabled'] == '1')
-		$se[] = "Perl/CGI";
-	$services_enabled = implode(", ", $se);
-
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/index') . "\";");
 } elseif ($page == 'change_password') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
+		$old_password = Validate::validate($_POST['old_password'], 'old password');
-		if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_CUSTOMERS, 'customerid')) {
+
-			\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
+		if (!Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_CUSTOMERS, 'customerid')) {
+			Response::standardError('oldpasswordnotcorrect');
 		}
 
-		$new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], 'new password');
+		try {
-		$new_password_confirm = \Froxlor\System\Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
+			$new_password = Crypt::validatePassword($_POST['new_password'], 'new password');
+			$new_password_confirm = Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
 
 		if ($old_password == '') {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'stringisempty',
-				'oldpassword'
+				'changepassword.old_password'
-			));
+			]);
 		} elseif ($new_password == '') {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'stringisempty',
-				'newpassword'
+				'changepassword.new_password'
-			));
+			]);
 		} elseif ($new_password_confirm == '') {
-			\Froxlor\UI\Response::standard_error(array(
+			Response::standardError([
 				'stringisempty',
-				'newpasswordconfirm'
+				'changepassword.new_password_confirm'
-			));
+			]);
 		} elseif ($new_password != $new_password_confirm) {
-			\Froxlor\UI\Response::standard_error('newpasswordconfirmerror');
+			Response::standardError('newpasswordconfirmerror');
 		} else {
 			// Update user password
 			try {
-				Customers::getLocal($userinfo, array(
+				Customers::getLocal($userinfo, [
 					'id' => $userinfo['customerid'],
 					'new_customer_password' => $new_password
-				))->update();
+				])->update();
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed password');
+			$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed password');
 
 			// Update ftp password
 			if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') {
-				$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($new_password);
+				$cryptPassword = Crypt::makeCryptPassword($new_password);
 				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
 					SET `password` = :password
 					WHERE `customerid` = :customerid
 					AND `username` = :username");
-				$params = array(
+				$params = [
 					"password" => $cryptPassword,
 					"customerid" => $userinfo['customerid'],
 					"username" => $userinfo['loginname']
-				);
+				];
 				Database::pexecute($stmt, $params);
-				$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed main ftp password');
+				$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}
 
 			// Update statistics password
 			if (isset($_POST['change_stats']) && $_POST['change_stats'] == 'true') {
-				$new_stats_password = \Froxlor\System\Crypt::makeCryptPassword($new_password, true);
+				$new_stats_password = Crypt::makeCryptPassword($new_password, true);
 
 				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
 					SET `password` = :password
 					WHERE `customerid` = :customerid
 					AND `username` = :username");
-				$params = array(
+				$params = [
 					"password" => $new_stats_password,
 					"customerid" => $userinfo['customerid'],
 					"username" => $userinfo['loginname']
-				);
+				];
 				Database::pexecute($stmt, $params);
+				Cronjob::inserttask(TaskId::REBUILD_VHOST);
 			}
 
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			Response::redirectTo($filename);
-				's' => $s
-			));
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_password') . "\";");
+		UI::view('user/change_password.html.twig');
 	}
 } elseif ($page == 'change_language') {
+	$languages = Language::getLanguages();
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$def_language = \Froxlor\Validate\Validate::validate($_POST['def_language'], 'default language');
+		$def_language = Validate::validate($_POST['def_language'], 'default language');
 		if (isset($languages[$def_language])) {
 			try {
-				Customers::getLocal($userinfo, array(
+				Customers::getLocal($userinfo, [
 					'id' => $userinfo['customerid'],
 					'def_language' => $def_language
-				))->update();
+				])->update();
+				CurrentUser::setField('language', $def_language);
 			} catch (Exception $e) {
-				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				Response::dynamicError($e->getMessage());
 			}
-
-			// also update current session
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `language` = :lang
-				WHERE `hash` = :hash");
-			Database::pexecute($stmt, array(
-				"lang" => $def_language,
-				"hash" => $s
-			));
 		}
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		Response::redirectTo($filename);
-			's' => $s
-		));
 	} else {
 		$default_lang = Settings::Get('panel.standardlanguage');
 		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
-		$language_options = '';
+		UI::view('user/change_language.html.twig', [
-		foreach ($languages as $language_file => $language_name) {
+			'languages' => $languages,
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $default_lang, true);
+			'default_lang' => $default_lang
-		}
+		]);
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_language') . "\";");
 	}
 } elseif ($page == 'change_theme') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$theme = \Froxlor\Validate\Validate::validate($_POST['theme'], 'theme');
+		$theme = Validate::validate($_POST['theme'], 'theme');
 		try {
-			Customers::getLocal($userinfo, array(
+			Customers::getLocal($userinfo, [
 				'id' => $userinfo['customerid'],
 				'theme' => $theme
-			))->update();
+			])->update();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 
-		// also update current session
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
+		Response::redirectTo($filename);
-			SET `theme` = :theme
-			WHERE `hash` = :hash");
-		Database::pexecute($stmt, array(
-			"theme" => $theme,
-			"hash" => $s
-		));
-
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
 	} else {
 		$default_theme = Settings::Get('panel.default_theme');
 		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
-		$theme_options = '';
+		$themes_avail = UI::getThemes();
-		$themes_avail = \Froxlor\UI\Template::getThemes();
-		foreach ($themes_avail as $t => $d) {
-			$theme_options .= \Froxlor\UI\HTML::makeoption($d, $t, $default_theme, true);
-		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_theme') . "\";");
+		UI::view('user/change_theme.html.twig', [
+			'themes' => $themes_avail,
+			'default_theme' => $default_theme
+		]);
 	}
 } elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_customer') == '1') {
-
+	require_once __DIR__ . '/error_report.php';
-	// only show this if we really have an exception to report
-	if (isset($_GET['errorid']) && $_GET['errorid'] != '') {
-
-		$errid = $_GET['errorid'];
-		// read error file
-		$err_dir = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . "/logs/");
-		$err_file = \Froxlor\FileDir::makeCorrectFile($err_dir . "/" . $errid . "_sql-error.log");
-
-		if (file_exists($err_file)) {
-
-			$error_content = file_get_contents($err_file);
-			$error = explode("|", $error_content);
-
-			$_error = array(
-				'code' => str_replace("\n", "", substr($error[1], 5)),
-				'message' => str_replace("\n", "", substr($error[2], 4)),
-				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(\Froxlor\Froxlor::getInstallDir()))),
-				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(\Froxlor\Froxlor::getInstallDir(), "", substr($error[5], 6))
-			);
-
-			// build mail-content
-			$mail_body = "Dear froxlor-team,\n\n";
-			$mail_body .= "the following error has been reported by a user:\n\n";
-			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
-			$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
-			$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
-			$mail_body .= "-------------------------------------------------------------\n\n";
-			$mail_body .= "Froxlor-version: " . $version . "\n";
-			$mail_body .= "DB-version: " . $dbversion . "\n\n";
-			$mail_body .= "End of report";
-			$mail_html = str_replace("\n", "<br />", $mail_body);
-
-			// send actual report to dev-team
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// send mail and say thanks
-				$_mailerror = false;
-				try {
-					$mail->Subject = '[Froxlor] Error report by user';
-					$mail->AltBody = $mail_body;
-					$mail->MsgHTML($mail_html);
-					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
-					$mail->Send();
-				} catch (\PHPMailer\PHPMailer\Exception $e) {
-					$mailerr_msg = $e->errorMessage();
-					$_mailerror = true;
-				} catch (Exception $e) {
-					$mailerr_msg = $e->getMessage();
-					$_mailerror = true;
-				}
-
-				if ($_mailerror) {
-					// error when reporting an error...LOLFUQ
-					\Froxlor\UI\Response::standard_error('send_report_error', $mailerr_msg);
-				}
-
-				// finally remove error from fs
-				@unlink($err_file);
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					's' => $s
-				));
-			}
-			// show a nice summary of the error-report
-			// before actually sending anything
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/send_error_report") . "\";");
-		} else {
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s
-			));
-		}
-	} else {
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
-	}
 } elseif ($page == 'apikeys' && Settings::Get('api.enabled') == 1) {
 	require_once __DIR__ . '/api_keys.php';
-} elseif ($page == 'apihelp' && Settings::Get('api.enabled') == 1) {
-	require_once __DIR__ . '/apihelp.php';
 } elseif ($page == '2fa' && Settings::Get('2fa.enabled') == 1) {
 	require_once __DIR__ . '/2fa.php';
 }

customer_logger.php

@@ -2,123 +2,53 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\SysLog;
 use Froxlor\Settings;
+use Froxlor\UI\Collection;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
 
 // redirect if this customer page is hidden via settings
 if (Settings::IsInList('panel.customer_hide_options', 'extras.logger')) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
 if ($page == 'log') {
 	if ($action == '') {
-		$fields = array(
+		try {
-			'date' => $lng['logger']['date'],
+			$syslog_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.syslog.php';
-			'type' => $lng['logger']['type'],
+			$collection = (new Collection(SysLog::class, $userinfo))
-			'user' => $lng['logger']['user'],
+				->withPagination($syslog_list_data['syslog_list']['columns'], $syslog_list_data['syslog_list']['default_sorting']);
-			'text' => $lng['logger']['action']
+		} catch (Exception $e) {
-		);
+			Response::dynamicError($e->getMessage());
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc', 30);
-		$query = 'SELECT * FROM `' . TABLE_PANEL_LOG . '` WHERE `user` = :loginname ' . $paging->getSqlWhere(true) . ' ' . $paging->getSqlOrderBy();
-		$result_stmt = Database::prepare($query . ' ' . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			"loginname" => $userinfo['loginname']
-		));
-		$result_cnt_stmt = Database::prepare($query);
-		Database::pexecute($result_cnt_stmt, array(
-			"loginname" => $userinfo['loginname']
-		));
-		$res_cnt = $result_cnt_stmt->fetch(PDO::FETCH_ASSOC);
-		$logs_count = $result_cnt_stmt->rowCount();
-		$paging->setEntries($logs_count);
-		$sortcode = $paging->getHtmlSortCode($lng);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$clog = array();
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if (! isset($clog[$row['action']]) || ! is_array($clog[$row['action']])) {
-				$clog[$row['action']] = array();
 		}
-			$clog[$row['action']][$row['logid']] = $row;
+		UI::view('user/table.html.twig', [
-		}
+			'listing' => Listing::format($collection, $syslog_list_data, 'syslog_list')
-
+		]);
-		if ($paging->sortfield == 'date' && $paging->sortorder == 'desc') {
-			krsort($clog);
-		} else {
-			ksort($clog);
-		}
-
-		$i = 0;
-		$count = 0;
-		$log_count = 0;
-		$log = '';
-		foreach ($clog as $action => $logrows) {
-			$_action = 0;
-			foreach ($logrows as $row) {
-				// if ($paging->checkDisplay($i)) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				$row['date'] = date("d.m.y H:i:s", $row['date']);
-
-				if ($_action != $action) {
-					switch ($action) {
-						case \Froxlor\FroxlorLogger::USR_ACTION:
-							$_action = $lng['admin']['customer'];
-							break;
-						case \Froxlor\FroxlorLogger::RES_ACTION:
-							$_action = $lng['logger']['reseller'];
-							break;
-						case \Froxlor\FroxlorLogger::ADM_ACTION:
-							$_action = $lng['logger']['admin'];
-							break;
-						case \Froxlor\FroxlorLogger::CRON_ACTION:
-							$_action = $lng['logger']['cron'];
-							break;
-						case \Froxlor\FroxlorLogger::LOGIN_ACTION:
-							$_action = $lng['logger']['login'];
-							break;
-						case \Froxlor\FroxlorLogger::LOG_ERROR:
-							$_action = $lng['logger']['intern'];
-							break;
-						default:
-							$_action = $lng['logger']['unknown'];
-							break;
-					}
-
-					$row['action'] = $_action;
-					eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_action') . "\";");
-				}
-
-				$log_count ++;
-				$row['type'] = \Froxlor\FroxlorLogger::getInstanceOf()->getLogLevelDesc($row['type']);
-				eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_log') . "\";");
-				$count ++;
-				$_action = $action;
-				// }
-				$i ++;
-			}
-			$i ++;
-		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('logger/logger') . "\";");
 	}
 }

customer_mysql.php

@@ -2,30 +2,46 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-require './lib/init.php';
 
+const AREA = 'customer';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Api\Commands\Mysqls;
+use Froxlor\Api\Commands\MysqlServer;
 use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
 use Froxlor\Settings;
-use Froxlor\Api\Commands\Mysqls as Mysqls;
+use Froxlor\UI\Collection;
+use Froxlor\UI\HTML;
+use Froxlor\UI\Listing;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+use Froxlor\CurrentUser;
 
-// redirect if this customer page is hidden via settings
+// redirect if this customer page is hidden via settings or no resources given
-if (Settings::IsInList('panel.customer_hide_options', 'mysql')) {
+if (Settings::IsInList('panel.customer_hide_options', 'mysql') || $userinfo['mysqls'] == 0) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
 // get sql-root access data
@@ -34,87 +50,54 @@ Database::needSqlData();
 $sql_root = Database::getSqlData();
 Database::needRoot(false);
 
-if (isset($_POST['id'])) {
+$id = (int)Request::any('id');
-	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
 
-if ($page == 'overview') {
+if ($page == 'overview' || $page == 'mysqls') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
-	Database::needSqlData();
-	$sql = Database::getSqlData();
-	$lng['mysql']['description'] = str_replace('<SQL_HOST>', $sql['host'], $lng['mysql']['description']);
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysql') . "\";");
-} elseif ($page == 'mysqls') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
-		$fields = array(
-			'databasename' => $lng['mysql']['databasename'],
-			'description' => $lng['mysql']['databasedescription']
-		);
-		$paging = new \Froxlor\UI\Paging($userinfo, TABLE_PANEL_DATABASES, $fields);
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DATABASES . "`
-			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		Database::pexecute($result_stmt, array(
-			"customerid" => $userinfo['customerid']
-		));
-		$mysqls_count = Database::num_rows();
-		$paging->setEntries($mysqls_count);
 
-		$sortcode = $paging->getHtmlSortCode($lng);
+		$multiple_mysqlservers = count(json_decode($userinfo['allowed_mysqlserver'] ?? '[]', true)) > 1;
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$i = 0;
-		$count = 0;
-		$mysqls = '';
-
-		$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `" . TABLE_PANEL_DATABASES . "`");
-		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
-		$count_mysqlservers = $dbserver['numservers'];
-
-		// Begin root-session
-		Database::needRoot(true);
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				$mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES
-					WHERE table_schema = :table_schema
-					GROUP BY table_schema");
-				Database::pexecute($mbdata_stmt, array(
-					"table_schema" => $row['databasename']
-				));
-				$mbdata = $mbdata_stmt->fetch(PDO::FETCH_ASSOC);
-				$row['size'] = \Froxlor\PhpHelper::sizeReadable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-				eval("\$mysqls.=\"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_database') . "\";");
-				$count ++;
-			}
-			$i ++;
-		}
-		Database::needRoot(false);
-		// End root-session
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls') . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
 
 		try {
-			$json_result = Mysqls::getLocal($userinfo, array(
+			$mysql_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.mysqls.php';
-				'id' => $id
+			$collection = (new Collection(Mysqls::class, $userinfo))
-			))->get();
+				->withPagination($mysql_list_data['mysql_list']['columns'], $mysql_list_data['mysql_list']['default_sorting']);
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
+		}
+
+		$actions_links = false;
+		if (CurrentUser::canAddResource('mysqls')) {
+			$actions_links = [
+				[
+					'href' => $linker->getLink(['section' => 'mysql', 'page' => 'mysqls', 'action' => 'add']),
+					'label' => lng('mysql.database_create')
+				]
+			];
+		}
+
+		UI::view('user/table.html.twig', [
+			'listing' => Listing::format($collection, $mysql_list_data, 'mysql_list'),
+			'actions_links' => $actions_links,
+			'entity_info' => lng('mysql.description')
+		]);
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = Mysqls::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['databasename']) && $result['databasename'] != '') {
-
 			Database::needRoot(true, $result['dbserver']);
 			Database::needSqlData();
 			$sql_root = Database::getSqlData();
 			Database::needRoot(false);
 
-			if (! isset($sql_root[$result['dbserver']]) || ! is_array($sql_root[$result['dbserver']])) {
+			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
@@ -122,22 +105,21 @@ if ($page == 'overview') {
 				try {
 					Mysqls::getLocal($userinfo, $_POST)->delete();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
 				$dbnamedesc = $result['databasename'];
 				if (isset($result['description']) && $result['description'] != '') {
 					$dbnamedesc .= ' (' . $result['description'] . ')';
 				}
-				\Froxlor\UI\HTML::askYesNo('mysql_reallydelete', $filename, array(
+				HTML::askYesNo('mysql_reallydelete', $filename, [
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
-				), $dbnamedesc);
+				], $dbnamedesc);
 			}
 		}
 	} elseif ($action == 'add') {
@@ -146,42 +128,38 @@ if ($page == 'overview') {
 				try {
 					Mysqls::getLocal($userinfo, $_POST)->add();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
+				$mysql_servers = [];
-				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`");
+				try {
-				$mysql_servers = '';
+					$result_json = MysqlServer::getLocal($userinfo)->listing();
-				$count_mysqlservers = 0;
+					$result_decoded = json_decode($result_json, true)['data']['list'];
-				while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) {
+					foreach ($result_decoded as $dbserver => $dbdata) {
-					Database::needRoot(true, $dbserver['dbserver']);
+						$mysql_servers[$dbserver] = $dbdata['caption'];
-					Database::needSqlData();
+					}
-					$sql_root = Database::getSqlData();
+				} catch (Exception $e) {
-					$mysql_servers .= \Froxlor\UI\HTML::makeoption($sql_root['caption'], $dbserver['dbserver']);
+					/* just none */
-					$count_mysqlservers ++;
 				}
-				Database::needRoot(false);
 
 				$mysql_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/mysql/formfield.mysql_add.php';
-				$mysql_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($mysql_add_data);
 
-				$title = $mysql_add_data['mysql_add']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $mysql_add_data['mysql_add']['image'];
+					'formaction' => $linker->getLink(['section' => 'mysql']),
-
+					'formdata' => $mysql_add_data['mysql_add']
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_add') . "\";");
+				]);
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
 		try {
-			$json_result = Mysqls::getLocal($userinfo, array(
+			$json_result = Mysqls::getLocal($userinfo, [
 				'id' => $id
-			))->get();
+			])->get();
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			Response::dynamicError($e->getMessage());
 		}
 		$result = json_decode($json_result, true)['data'];
 
@@ -190,30 +168,30 @@ if ($page == 'overview') {
 				try {
 					$json_result = Mysqls::getLocal($userinfo, $_POST)->update();
 				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					Response::dynamicError($e->getMessage());
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				Response::redirectTo($filename, [
-					'page' => $page,
+					'page' => $page
-					's' => $s
+				]);
-				));
 			} else {
-
+				$mysql_servers = [];
-				$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `" . TABLE_PANEL_DATABASES . "`");
+				try {
-				$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+					$result_json = MysqlServer::getLocal($userinfo)->listing();
-				$count_mysqlservers = $dbserver['numservers'];
+					$result_decoded = json_decode($result_json, true)['data']['list'];
-
+					foreach ($result_decoded as $dbserver => $dbdata) {
-				Database::needRoot(true, $result['dbserver']);
+						$mysql_servers[$dbserver] = $dbdata['caption'] . ' (' . $dbdata['host'] . (isset($dbdata['port']) && !empty($dbdata['port']) ? ':' . $dbdata['port'] : '').')';
-				Database::needSqlData();
+					}
-				$sql_root = Database::getSqlData();
+				} catch (Exception $e) {
-				Database::needRoot(false);
+					/* just none */
+				}
 
 				$mysql_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/mysql/formfield.mysql_edit.php';
-				$mysql_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($mysql_edit_data);
 
-				$title = $mysql_edit_data['mysql_edit']['title'];
+				UI::view('user/form.html.twig', [
-				$image = $mysql_edit_data['mysql_edit']['image'];
+					'formaction' => $linker->getLink(['section' => 'mysql', 'id' => $id]),
-
+					'formdata' => $mysql_edit_data['mysql_edit'],
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_edit') . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

customer_traffic.php

@@ -2,165 +2,52 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'customer');
-$intrafficpage = 1;
-require './lib/init.php';
 
-use Froxlor\Database\Database;
+const AREA = 'customer';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\Traffic\Traffic;
 use Froxlor\Settings;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
 
 // redirect if this customer page is hidden via settings
 if (Settings::IsInList('panel.customer_hide_options', 'traffic')) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
-$traffic = '';
+$range = Request::any('range', 'currentyear');
-$month = null;
-$year = null;
 
-if (isset($_POST['month']) && isset($_POST['year'])) {
+if ($page == 'current') {
-	$month = intval($_POST['month']);
+	$range = 'currentmonth';
-	$year = intval($_POST['year']);
-} elseif (isset($_GET['month']) && isset($_GET['year'])) {
-	$month = intval($_GET['month']);
-	$year = intval($_GET['year']);
-} // BAM! $_GET???
-elseif (isset($_GET['page']) && $_GET['page'] == 'current') {
-	if (date('d') != '01') {
-		$month = date('m');
-		$year = date('Y');
-	} else {
-		if (date('m') == '01') {
-			$month = 12;
-			$year = date('Y') - 1;
-		} else {
-			$month = date('m') - 1;
-			$year = date('Y');
-		}
-	}
 }
 
-if (! is_null($month) && ! is_null($year)) {
+try {
-	$traf['byte'] = 0;
+	$context = Traffic::getCustomerStats($userinfo, $range);
-	$result_stmt = Database::prepare("SELECT SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail', `day`, `month`, `year`
+} catch (Exception $e) {
-		FROM `" . TABLE_PANEL_TRAFFIC . "`
+	Response::dynamicError($e->getMessage());
-		WHERE `customerid`= :customerid
-		AND `month` = :month
-		AND `year` = :year
-		GROUP BY `day`
-		ORDER BY `day` DESC");
-	$params = array(
-		"customerid" => $userinfo['customerid'],
-		"month" => $month,
-		"year" => $year
-	);
-	Database::pexecute($result_stmt, $params);
-	$traffic_complete['http'] = 0;
-	$traffic_complete['ftp'] = 0;
-	$traffic_complete['mail'] = 0;
-	$show = '';
-
-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-		$http = $row['http'];
-		$ftp = $row['ftp_up'] + $row['ftp_down'];
-		$mail = $row['mail'];
-		$traf['byte'] = $http + $ftp + $mail;
-		$traffic_complete['http'] += $http;
-		$traffic_complete['ftp'] += $ftp;
-		$traffic_complete['mail'] += $mail;
-		$traf['day'] = $row['day'] . '.';
-
-		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($row['ftp_down'], 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['ftp'] = bcdiv($ftp, 1024, Settings::Get('panel.decimal_places'));
-			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = bcdiv($traf['byte'], 1024, Settings::Get('panel.decimal_places'));
-		} else {
-			$traf['ftptext'] = round($row['ftp_up'] / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($row['ftp_down'] / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['http'] = round($http, Settings::Get('panel.decimal_places'));
-			$traf['ftp'] = round($ftp, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = round($mail, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = round($traf['byte'] / 1024, Settings::Get('panel.decimal_places'));
-		}
-
-		eval("\$traffic.=\"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_month') . "\";");
-		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
-	}
-
-	$traffic_complete['http'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['ftp'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['mail'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_details') . "\";");
-} else {
-	$result_stmt = Database::prepare("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
-		FROM `" . TABLE_PANEL_TRAFFIC . "`
-		WHERE `customerid` = :customerid
-		GROUP BY `year` DESC, `month` DESC
-		LIMIT 12");
-	Database::pexecute($result_stmt, array(
-		"customerid" => $userinfo['customerid']
-	));
-	$traffic_complete['http'] = 0;
-	$traffic_complete['ftp'] = 0;
-	$traffic_complete['mail'] = 0;
-
-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-		$http = $row['http'];
-		$ftp_up = $row['ftp_up'];
-		$ftp_down = $row['ftp_down'];
-		$mail = $row['mail'];
-		$traffic_complete['http'] += $http;
-		$traffic_complete['ftp'] += $ftp_up + $ftp_down;
-		$traffic_complete['mail'] += $mail;
-		$traf['month'] = $row['month'];
-		$traf['year'] = $row['year'];
-		$traf['monthname'] = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
-		$traf['byte'] = $http + $ftp_up + $ftp_down + $mail;
-
-		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($ftp_up, 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($ftp_down, 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, Settings::Get('panel.decimal_places'));
-			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, Settings::Get('panel.decimal_places'));
-		} else {
-			$traf['ftptext'] = round($ftp_up / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($ftp_down / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
-			$traf['ftp'] = round(($ftp_up + $ftp_down) / 1024, Settings::Get('panel.decimal_places'));
-			$traf['http'] = round($http / 1024, Settings::Get('panel.decimal_places'));
-			$traf['mail'] = round($mail / 1024, Settings::Get('panel.decimal_places'));
-			$traf['byte'] = round($traf['byte'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
-		}
-
-		eval("\$traffic.=\"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_traffic') . "\";");
-	}
-
-	$traffic_complete['http'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['ftp'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['mail'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('traffic/traffic') . "\";");
 }
+
+// pass metrics to the view
+UI::view('user/traffic.html.twig', $context);

dns_editor.php

@@ -1,139 +1,149 @@
 <?php
-if (! defined('AREA')) {
+
+/**
+ * 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\Api\Commands\DomainZones;
- * This file is part of the Froxlor project.
+use Froxlor\Dns\Dns;
- * Copyright (c) 2016 the Froxlor Team (see authors).
+use Froxlor\UI\Collection;
- *
+use Froxlor\UI\HTML;
- * For the full copyright and license information, please view the COPYING
+use Froxlor\UI\Listing;
- * file that was distributed with this source code. You can also view the
+use Froxlor\UI\Panel\UI;
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+use Froxlor\UI\Request;
- *
+use Froxlor\UI\Response;
- * @copyright (c) the authors
- * @author Froxlor team <team@froxlor.org> (2016-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Panel
- *         
- */
-
-use Froxlor\Database\Database;
-use Froxlor\Api\Commands\DomainZones as DomainZones;
 
 // This file is being included in admin_domains and customer_domains
 // and therefore does not need to require lib/init.php
 
-$domain_id = isset($_GET['domain_id']) ? (int) $_GET['domain_id'] : null;
+$domain_id = (int)Request::any('domain_id');
 
-$record = isset($_POST['record']['record']) ? trim($_POST['record']['record']) : null;
+$record = isset($_POST['dns_record']) ? trim($_POST['dns_record']) : null;
-$type = isset($_POST['record']['type']) ? $_POST['record']['type'] : 'A';
+$type = isset($_POST['dns_type']) ? $_POST['dns_type'] : 'A';
-$prio = isset($_POST['record']['prio']) ? (int) $_POST['record']['prio'] : null;
+$prio = isset($_POST['dns_mxp']) ? (int)$_POST['dns_mxp'] : null;
-$content = isset($_POST['record']['content']) ? trim($_POST['record']['content']) : null;
+$content = isset($_POST['dns_content']) ? trim($_POST['dns_content']) : null;
-$ttl = isset($_POST['record']['ttl']) ? (int) $_POST['record']['ttl'] : 18000;
+$ttl = isset($_POST['dns_ttl']) ? (int)$_POST['dns_ttl'] : 18000;
 
 // get domain-name
-$domain = \Froxlor\Dns\Dns::getAllowedDomainEntry($domain_id, AREA, $userinfo);
+$domain = Dns::getAllowedDomainEntry($domain_id, AREA, $userinfo);
-
-// select all entries
-$sel_stmt = Database::prepare("SELECT * FROM `" . TABLE_DOMAIN_DNS . "` WHERE domain_id = :did");
-Database::pexecute($sel_stmt, array(
-	'did' => $domain_id
-));
-$dom_entries = $sel_stmt->fetchAll(PDO::FETCH_ASSOC);
 
 $errors = "";
 $success_message = "";
 
 // action for adding a new entry
-if ($action == 'add_record' && ! empty($_POST)) {
+if ($action == 'add_record' && !empty($_POST)) {
 	try {
-		DomainZones::getLocal($userinfo, array(
+		DomainZones::getLocal($userinfo, [
 			'id' => $domain_id,
 			'record' => $record,
 			'type' => $type,
 			'prio' => $prio,
 			'content' => $content,
 			'ttl' => $ttl
-		))->add();
+		])->add();
-		$success_message = $lng['success']['dns_record_added'];
+		$success_message = lng('success.dns_record_added');
-	} catch (Exception $e) {
+		$record = $prio = $content = "";
-		\Froxlor\UI\Response::dynamic_error($e->getMessage());
-	}
-} elseif ($action == 'delete') {
-	// remove entry
-	$entry_id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
-	if ($entry_id > 0) {
-		try {
-			DomainZones::getLocal($userinfo, array(
-				'entry_id' => $entry_id,
-				'id' => $domain_id
-			))->delete();
 	} catch (Exception $e) {
 		$errors = str_replace("\n", "<br>", $e->getMessage());
 	}
-
+} elseif ($action == 'delete') {
-		if (empty($errors)) {
+	$entry_id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-			// remove deleted entry from internal data array (no reread of DB necessary)
+	HTML::askYesNo('dnsentry_reallydelete', $filename, [
-			$_t = $dom_entries;
+		'id' => $entry_id,
-			foreach ($_t as $idx => $entry) {
+		'domain_id' => $domain_id,
-				if ($entry['id'] == $entry_id) {
+		'page' => $page,
-					unset($dom_entries[$idx]);
+		'action' => 'deletesure'
-					break;
+	], '', [
-				}
+		'section' => 'domains',
-			}
+		'page' => $page,
-			unset($_t);
+		'domain_id' => $domain_id
+	]);
+} elseif (isset($_POST['send']) && $_POST['send'] == 'send' && $action == 'deletesure' && !empty($_POST)) {
+	$entry_id = isset($_POST['id']) ? (int)$_POST['id'] : 0;
+	$domain_id = isset($_POST['domain_id']) ? (int)$_POST['domain_id'] : 0;
+	// remove entry
+	if ($entry_id > 0 && $domain_id > 0) {
+		try {
+			DomainZones::getLocal($userinfo, [
+				'entry_id' => $entry_id,
+				'id' => $domain_id
+			])->delete();
 			// success message (inline)
-			$success_message = $lng['success']['dns_record_deleted'];
+			$success_message = lng('success.dns_record_deleted');
+		} catch (Exception $e) {
+			$errors = str_replace("\n", "<br>", $e->getMessage());
 		}
 	}
 }
 
-// show editor
+// select all entries
-$record_list = "";
+try {
-$existing_entries = "";
+	$dns_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.dns.php';
-$type_select = "";
+	$collection = (new Collection(DomainZones::class, $userinfo, ['id' => $domain_id]))
-$entriescount = 0;
+		->withPagination($dns_list_data['dns_list']['columns'], $dns_list_data['dns_list']['default_sorting']);
-
+} catch (Exception $e) {
-if (! empty($dom_entries)) {
+	Response::dynamicError($e->getMessage());
-	$entriescount = count($dom_entries);
-	foreach ($dom_entries as $entry) {
-		$entry['content'] = wordwrap($entry['content'], 100, '<br>', true);
-		eval("\$existing_entries.=\"" . \Froxlor\UI\Template::getTemplate("dns_editor/entry_bit", true) . "\";");
-	}
 }
 
-// available types
-$type_select_values = array(
-	'A',
-	'AAAA',
-	'CAA',
-	'CNAME',
-	'DNAME',
-	'LOC',
-	'MX',
-	'NS',
-	'RP',
-	'SRV',
-	'SSHFP',
-	'TXT',
-);
-asort($type_select_values);
-foreach ($type_select_values as $_type) {
-	$type_select .= \Froxlor\UI\HTML::makeoption($_type, $_type, $type);
-}
-
-eval("\$record_list=\"" . \Froxlor\UI\Template::getTemplate("dns_editor/list", true) . "\";");
-
 try {
-	$json_result = DomainZones::getLocal($userinfo, array(
+	$json_result = DomainZones::getLocal($userinfo, [
 		'id' => $domain_id
-	))->get();
+	])->get();
 } catch (Exception $e) {
-	\Froxlor\UI\Response::dynamic_error($e->getMessage());
+	Response::dynamicError($e->getMessage());
 }
 $result = json_decode($json_result, true)['data'];
 $zonefile = implode("\n", $result);
 
-eval("echo \"" . \Froxlor\UI\Template::getTemplate("dns_editor/index", true) . "\";");
+$dns_add_data = include_once dirname(__FILE__) . '/lib/formfields/formfield.dns_add.php';
+
+UI::view('user/dns-editor.html.twig', [
+	'listing' => Listing::format($collection, $dns_list_data, 'dns_list', ['domain_id' => $domain_id]),
+	'actions_links' => [
+		[
+			'href' => $linker->getLink([
+				'section' => 'domains',
+				'page' => 'domains',
+				'action' => 'edit',
+				'id' => $domain_id
+			]),
+			'label' => lng('admin.domain_edit'),
+			'icon' => 'fa-solid fa-pen'
+		],
+		[
+			'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains']),
+			'label' => lng('panel.backtooverview'),
+			'icon' => 'fa-solid fa-reply'
+		]
+	],
+	'formaction' => $linker->getLink(['section' => 'domains', 'action' => 'add_record', 'domain_id' => $domain_id]),
+	'formdata' => $dns_add_data['dns_add'],
+	// alert-box
+	'type' => (!empty($errors) ? 'danger' : (!empty($success_message) ? 'success' : 'warning')),
+	'alert_msg' => (!empty($errors) ? $errors : (!empty($success_message) ? $success_message : lng('dns.howitworks'))),
+	'zonefile' => $zonefile,
+]);

doc/example/FroxlorAPI.php

@@ -2,212 +2,66 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2018 the Froxlor Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
  *
- * For the full copyright and license information, please view the COPYING
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Froxlor team <team@froxlor.org> (2018-)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @package    API-example
+ * GNU General Public License for more details.
- * @since      0.10.0
  *
+ * 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
  */
+
 class FroxlorAPI
 {
+    private string $url;
+    private string $key;
+    private string $secret;
+    private ?array $lastError = null;
+    private ?string $lastStatusCode = null;
 
-	/**
+    public function __construct($url, $key, $secret)
-	 * URL to api.php of your froxlor installation
-	 *
-	 * @var string
-	 */
-	private $host = "";
-
-	/**
-	 * your api-key
-	 *
-	 * @var string
-	 */
-	private $api_key = "";
-
-	/**
-	 * your api-secret
-	 *
-	 * @var string
-	 */
-	private $api_secret = "";
-
-	/**
-	 * last cURL error message
-	 *
-	 * @var string
-	 */
-	private $last_error = "";
-
-	/**
-	 * last response header received
-	 *
-	 * @var array
-	 */
-	private $last_header = array();
-
-	/**
-	 * last response data received
-	 *
-	 * @var array
-	 */
-	private $last_body = array();
-
-	/**
-	 * create FroxlorAPI object
-	 *
-	 * @param string $host
-	 *        	URL to api.php of your froxlor installation
-	 * @param string $api_key
-	 *        	your api-key
-	 * @param string $api_secret
-	 *        	your api-secret
-	 *
-	 * @return FroxlorAPI
-	 */
-	public function __construct(string $host, string $api_key, string $api_secret)
     {
-		$this->host = $host;
+        $this->url = $url;
-		$this->api_key = $api_key;
+        $this->key = $key;
-		$this->api_secret = $api_secret;
+        $this->secret = $secret;
     }
 
-	/**
+    public function request($command, array $data = [])
-	 * send request to froxlor api
-	 *
-	 * @param string $command
-	 * @param array $params
-	 *
-	 * @return FroxlorAPI
-	 */
-	public function request(string $command, array $params = array()): FroxlorAPI
     {
-	// build request array
+        $payload = [
-	$request = [
+            'command' => $command,
-		'header' => [
+            'params' => $data
-			'apikey' => $this->api_key,
-			'secret' => $this->api_secret
-		],
-		'body' => [
-			'command' => $command
-		]
         ];
 
-	// add parameter to request-body if any
+        $ch = curl_init($this->url);
-	if (! empty($params)) {
+        curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
-		$request['body']['params'] = $params;
+        curl_setopt($ch, CURLOPT_HEADER, 0);
-	}
+        curl_setopt($ch, CURLOPT_USERPWD, $this->key . ":" . $this->secret);
-
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-	// reset last data
-	$this->last_header = array();
-	$this->last_body = array();
-
-	// send actual request
-	$response = $this->requestCurl(json_encode($request));
-
-	// decode response
-	$resp = json_decode($response[1], true);
-	// set body to data-part of response
-	$this->last_body = $resp['data'];
-	// set header of response
-	$this->last_header = [
-		'status' => $resp['status'],
-		'status_message' => $resp['status_message']
-	];
-
-	// check for error in api response
-	if (isset($this->last_header['status']) && $this->last_header['status'] >= 400) {
-		// set last-error message
-		$this->last_error .= "[" . $this->last_header['status'] . "] " . $this->last_header['status_message'];
-	}
-
-	return $this;
-}
-
-	/**
-	 * returns last response header
-	 *
-	 * @return array status|status_message
-	 */
-	public function getLastHeader(): array
-	{
-		return $this->last_header;
-	}
-
-	/**
-	 * returns last response data
-	 *
-	 * @return array
-	 */
-	public function getLastResponse(): array
-	{
-		if (!empty($this->getLastError())) {
-			// nothing is returned when the last call
-			// was not successful
-			return [];
-		}
-		return $this->last_body;
-	}
-
-	/**
-	 * return last known error message
-	 *
-	 * @return string
-	 */
-	public function getLastError(): string
-	{
-		return $this->last_error;
-	}
-
-	/**
-	 * send cURL request to api
-	 *
-	 * @param string $data
-	 *        	json array
-	 *        	
-	 * @return array header|body
-	 */
-	private function requestCurl(string $data): array
-	{
-		// reset last error message
-		$this->last_error = "";
-
-		$ch = curl_init($this->host);
         curl_setopt($ch, CURLOPT_POST, 1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+        $result = curl_exec($ch);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-			'Content-type: application/json'
-		));
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-		curl_setopt($ch, CURLOPT_VERBOSE, true);
-		curl_setopt($ch, CURLOPT_HEADER, 1);
-		$verbose = fopen('php://temp', 'w+');
-		curl_setopt($ch, CURLOPT_STDERR, $verbose);
 
-		if (! $data = curl_exec($ch)) {
+        $this->lastStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			$this->last_error = 'Curl execution error: ' . curl_error($ch) . "\n";
+
-			rewind($verbose);
+        return json_decode($result ?? curl_error($ch), true);
-			$verboseLog = stream_get_contents($verbose);
-			$this->last_error .= "Verbose information: " . htmlspecialchars($verboseLog) . "\n";
     }
 
-		$header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+    public function getLastStatusCode(): ?string
-		$header = substr($data, 0, $header_size);
+    {
-		$body = substr($data, $header_size);
+        return $this->lastStatusCode;
-
-		curl_close($ch);
-		return array(
-			$header,
-			$body
-		);
     }
 }

doc/example/create_customer.php

@@ -4,7 +4,7 @@
 require __DIR__ . '/FroxlorAPI.php';
 
 // create object of FroxlorAPI with URL, apikey and apisecret
-$fapi = new FroxlorAPI('https://froxlor.your-host.tld/api.php', 'your-api-key', 'your-api-secret');
+$fapi = new FroxlorAPI('http://127.0.0.1/api.php', 'your-api-key', 'your-api-secret');
 
 // customer data
 $data = [
@@ -16,19 +16,17 @@ $data = [
 	'new_customer_password' => 's0mEcRypt1cpassword' . uniqid()
 ];
 // send request
-$fapi->request('Customers.add', $data);
+$response = $fapi->request('Customers.add', $data);
 
 // check for error
-if (! empty($fapi->getLastError())) {
+if ($fapi->getLastStatusCode() != 200) {
-	echo "Error: " . $fapi->getLastError();
+	echo "HTTP-STATUS: " . $fapi->getLastStatusCode() . PHP_EOL;
+    echo "Description: "  . $response['message'] . PHP_EOL;
     exit();
 }
 
-// get response of request
-$request = $fapi->getLastResponse();
-
 // view response data
-var_dump($request);
+var_dump($response);
 
 /*
 array(60) {

doc/example/list_functions.php

@@ -4,19 +4,17 @@
 require __DIR__ . '/FroxlorAPI.php';
 
 // create object of FroxlorAPI with URL, apikey and apisecret
-$fapi = new FroxlorAPI('https://froxlor.your-host.tld/api.php', 'your-api-key', 'your-api-secret');
+$fapi = new FroxlorAPI('http://localhost/api.php', 'your-api-key', 'your-api-secret');
 
 // send request
-$fapi->request('Froxlor.listFunctions');
+$response = $fapi->request('Froxlor.listFunctions');
 
 // check for error
-if (! empty($fapi->getLastError())) {
+if ($fapi->getLastStatusCode() != 200) {
-	echo "Error: " . $fapi->getLastError();
+    echo "HTTP-STATUS: " . $fapi->getLastStatusCode() . PHP_EOL;
+    echo "Description: "  . $response['message'] . PHP_EOL;
     exit();
 }
 
-// get response of request
-$request = $fapi->getLastResponse();
-
 // view response data
-var_dump($request);
+var_dump($response);

error_report.php

@@ -0,0 +1,111 @@
+<?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\FileDir;
+use Froxlor\Froxlor;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Request;
+use Froxlor\UI\Response;
+
+// This file is being included in admin_domains and customer_domains
+// and therefore does not need to require lib/init.php
+
+$errid = Request::any('errorid');
+
+if (!empty($errid)) {
+	// read error file
+	$err_dir = FileDir::makeCorrectDir(Froxlor::getInstallDir() . "/logs/");
+	$err_file = FileDir::makeCorrectFile($err_dir . "/" . $errid . "_sql-error.log");
+
+	if (file_exists($err_file)) {
+		$error_content = file_get_contents($err_file);
+		$error = explode("|", $error_content);
+
+		$_error = [
+			'code' => str_replace("\n", "", substr($error[1], 5)),
+			'message' => str_replace("\n", "", substr($error[2], 4)),
+			'file' => str_replace("\n", "", substr($error[3], 5 + strlen(Froxlor::getInstallDir()))),
+			'line' => str_replace("\n", "", substr($error[4], 5)),
+			'trace' => str_replace(Froxlor::getInstallDir(), "", substr($error[5], 6))
+		];
+
+		// build mail-content
+		$mail_body = "Dear froxlor-team,\n\n";
+		$mail_body .= "the following error has been reported by a user:\n\n";
+		$mail_body .= "-------------------------------------------------------------\n";
+		$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
+		$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
+		$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
+		$mail_body .= "-------------------------------------------------------------\n\n";
+		$mail_body .= "User-Area: " . AREA . "\n";
+		$mail_body .= "Froxlor-version: " . Froxlor::VERSION . "\n";
+		$mail_body .= "DB-version: " . Froxlor::DBVERSION . "\n\n";
+		$mail_body .= "End of report";
+		$mail_html = nl2br($mail_body);
+
+		// send actual report to dev-team
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			// send mail and say thanks
+			$_mailerror = false;
+			try {
+				$mail->Subject = '[Froxlor] Error report by user';
+				$mail->AltBody = $mail_body;
+				$mail->MsgHTML($mail_html);
+				$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
+				$mail->Send();
+			} catch (\PHPMailer\PHPMailer\Exception $e) {
+				$mailerr_msg = $e->errorMessage();
+				$_mailerror = true;
+			} catch (Exception $e) {
+				$mailerr_msg = $e->getMessage();
+				$_mailerror = true;
+			}
+
+			if ($_mailerror) {
+				// error when reporting an error...LOLFUQ
+				Response::standardError('send_report_error', $mailerr_msg);
+			}
+
+			// finally remove error from fs
+			@unlink($err_file);
+			Response::standardSuccess('sent_error_report', '', ['filename' => 'index.php']);
+		}
+		// show a nice summary of the error-report
+		// before actually sending anything
+		UI::view('user/error_report.html.twig', [
+			'mail_html' => $mail_body,
+			'errorid' => $errid
+		]);
+	} else {
+		Response::redirectTo($filename);
+	}
+} else {
+	Response::redirectTo($filename);
+}

index.php

@@ -2,54 +2,71 @@
 
 /**
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Panel
  *
+ * 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
  */
-define('AREA', 'login');
-require './lib/init.php';
 
+const AREA = 'login';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\CurrentUser;
+use Froxlor\Customer\Customer;
 use Froxlor\Database\Database;
-use Froxlor\Settings;
+use Froxlor\FileDir;
+use Froxlor\Froxlor;
 use Froxlor\FroxlorLogger;
+use Froxlor\FroxlorTwoFactorAuth;
+use Froxlor\PhpHelper;
+use Froxlor\Settings;
+use Froxlor\System\Crypt;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\User;
+use Froxlor\Validate\Validate;
+use Froxlor\Language;
 
 if ($action == '') {
 	$action = 'login';
 }
 
-if (session_status() == PHP_SESSION_NONE) {
-	session_start();
-}
-
 if ($action == '2fa_entercode') {
 	// page for entering the 2FA code after successful login
-	if (! isset($_SESSION) || ! isset($_SESSION['secret_2fa'])) {
+	if (!isset($_SESSION) || !isset($_SESSION['secret_2fa'])) {
 		// no session - redirect to index
-		\Froxlor\UI\Response::redirectTo('index.php');
+		Response::redirectTo('index.php');
 		exit();
 	}
 	// show template to enter code
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('2fa/entercode', true) . "\";");
+	UI::view('login/enter2fa.html.twig', [
+		'pagetitle' => lng('login.2fa')
+	]);
 } elseif ($action == '2fa_verify') {
 	// verify code from 2fa code-enter form
-	if (! isset($_SESSION) || ! isset($_SESSION['secret_2fa'])) {
+	if (!isset($_SESSION) || !isset($_SESSION['secret_2fa'])) {
 		// no session - redirect to index
-		\Froxlor\UI\Response::redirectTo('index.php');
+		Response::redirectTo('index.php');
 		exit();
 	}
 	$code = isset($_POST['2fa_code']) ? $_POST['2fa_code'] : null;
 	// verify entered code
-	$tfa = new \Froxlor\FroxlorTwoFactorAuth('Froxlor');
+	$tfa = new FroxlorTwoFactorAuth('Froxlor ' . Settings::Get('system.hostname'));
 	$result = ($_SESSION['secret_2fa'] == 'email' ? true : $tfa->verifyCode($_SESSION['secret_2fa'], $code, 3));
 	// either the code is valid when using authenticator-app, or we will select userdata by id and entered code
 	// which is temporarily stored for the customer when using email-2fa
@@ -59,9 +76,9 @@ if ($action == '2fa_entercode') {
 		$field = $_SESSION['uidfield_2fa'];
 		$uid = $_SESSION['uid_2fa'];
 		$isadmin = $_SESSION['unfo_2fa'];
-		$sel_param = array(
+		$sel_param = [
 			'uid' => $uid
-		);
+		];
 		if ($_SESSION['secret_2fa'] == 'email') {
 			// verify code by selecting user by id and the temp. stored code,
 			// so only if it's the correct code, we get the user-data
@@ -74,75 +91,75 @@ if ($action == '2fa_entercode') {
 		$userinfo = Database::pexecute_first($sel_stmt, $sel_param);
 		// whoops, no (valid) user? Start again
 		if (empty($userinfo)) {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'showmessage' => '2'
-			));
+			]);
 		}
 		// set fields in $userinfo required for finishLogin()
 		$userinfo['adminsession'] = $isadmin;
 		$userinfo['userid'] = $uid;
 
 		// if not successful somehow - start again
-		if (! finishLogin($userinfo)) {
+		if (!finishLogin($userinfo)) {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'showmessage' => '2'
-			));
+			]);
 		}
 
 		// when using email-2fa, remove the one-time-code
 		if ($userinfo['type_2fa'] == '1') {
 			$del_stmt = Database::prepare("UPDATE $table SET `data_2fa` = '' WHERE `" . $field . "` = :uid");
-			$userinfo = Database::pexecute_first($del_stmt, array(
+			$userinfo = Database::pexecute_first($del_stmt, [
 				'uid' => $uid
-			));
+			]);
 		}
 		exit();
 	}
-	\Froxlor\UI\Response::redirectTo('index.php', array(
+	Response::redirectTo('index.php', [
 		'showmessage' => '2'
-	));
+	]);
 	exit();
 } elseif ($action == 'login') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$loginname = \Froxlor\Validate\Validate::validate($_POST['loginname'], 'loginname');
+		$loginname = Validate::validate($_POST['loginname'], 'loginname');
-		$password = \Froxlor\Validate\Validate::validate($_POST['password'], 'password');
+		$password = Validate::validate($_POST['password'], 'password');
 
 		$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
 			WHERE `loginname`= :loginname");
-		Database::pexecute($stmt, array(
+		Database::pexecute($stmt, [
 			"loginname" => $loginname
-		));
+		]);
 		$row = $stmt->fetch(PDO::FETCH_ASSOC);
 
-		if ($row['customer'] == $loginname) {
+		if ($row && $row['customer'] == $loginname) {
 			$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 			$uid = 'customerid';
 			$adminsession = '0';
 			$is_admin = false;
 		} else {
 			$is_admin = true;
-			if ((int) Settings::Get('login.domain_login') == 1) {
+			if ((int)Settings::Get('login.domain_login') == 1) {
-				$domainname = $idna_convert->encode(preg_replace(array(
+				$domainname = $idna_convert->encode(preg_replace([
 					'/\:(\d)+$/',
 					'/^https?\:\/\//'
-				), '', $loginname));
+				], '', $loginname));
 				$stmt = Database::prepare("SELECT `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
 					WHERE `domain` = :domain");
-				Database::pexecute($stmt, array(
+				Database::pexecute($stmt, [
 					"domain" => $domainname
-				));
+				]);
 				$row2 = $stmt->fetch(PDO::FETCH_ASSOC);
 
 				if (isset($row2['customerid']) && $row2['customerid'] > 0) {
-					$loginname = \Froxlor\Customer\Customer::getCustomerDetail($row2['customerid'], 'loginname');
+					$loginname = Customer::getCustomerDetail($row2['customerid'], 'loginname');
 					if ($loginname !== false) {
 						$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
 							WHERE `loginname`= :loginname");
-						Database::pexecute($stmt, array(
+						Database::pexecute($stmt, [
 							"loginname" => $loginname
-						));
+						]);
 						$row3 = $stmt->fetch(PDO::FETCH_ASSOC);
-						if ($row3['customer'] == $loginname) {
+						if ($row3 && $row3['customer'] == $loginname) {
 							$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 							$uid = 'customerid';
 							$adminsession = '0';
@@ -153,72 +170,72 @@ if ($action == '2fa_entercode') {
 			}
 		}
 
-		if ((\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) && $is_admin == false) {
+		if ((Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) && $is_admin == false) {
-			\Froxlor\UI\Response::redirectTo('index.php');
+			Response::redirectTo('index.php');
 			exit();
 		}
 
 		if ($is_admin) {
-			if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+			if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
 				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
 					WHERE `loginname`= :loginname
 					AND `change_serversettings` = '1'");
-				Database::pexecute($stmt, array(
+				Database::pexecute($stmt, [
 					"loginname" => $loginname
-				));
+				]);
 				$row = $stmt->fetch(PDO::FETCH_ASSOC);
-				if (! isset($row['admin'])) {
+				if (!isset($row['admin'])) {
 					// not an admin who can see updates
-					\Froxlor\UI\Response::redirectTo('index.php');
+					Response::redirectTo('index.php');
 					exit();
 				}
 			} else {
 				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
 					WHERE `loginname`= :loginname");
-				Database::pexecute($stmt, array(
+				Database::pexecute($stmt, [
 					"loginname" => $loginname
-				));
+				]);
 				$row = $stmt->fetch(PDO::FETCH_ASSOC);
 			}
 
-			if ($row['admin'] == $loginname) {
+			if ($row && $row['admin'] == $loginname) {
 				$table = "`" . TABLE_PANEL_ADMINS . "`";
 				$uid = 'adminid';
 				$adminsession = '1';
 			} else {
 				// Log failed login
-				$rstlog = FroxlorLogger::getInstanceOf(array(
+				$rstlog = FroxlorLogger::getInstanceOf([
 					'loginname' => $_SERVER['REMOTE_ADDR']
-				));
+				]);
-				$rstlog->logAction(\Froxlor\FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
+				$rstlog->logAction(FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
 
-				\Froxlor\UI\Response::redirectTo('index.php', array(
+				Response::redirectTo('index.php', [
 					'showmessage' => '2'
-				));
+				]);
 				exit();
 			}
 		}
 
 		$userinfo_stmt = Database::prepare("SELECT * FROM $table
 			WHERE `loginname`= :loginname");
-		Database::pexecute($userinfo_stmt, array(
+		Database::pexecute($userinfo_stmt, [
 			"loginname" => $loginname
-		));
+		]);
 		$userinfo = $userinfo_stmt->fetch(PDO::FETCH_ASSOC);
 
 		if ($userinfo['loginfail_count'] >= Settings::Get('login.maxloginattempts') && $userinfo['lastlogin_fail'] > (time() - Settings::Get('login.deactivatetime'))) {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'showmessage' => '3'
-			));
+			]);
 			exit();
-		} elseif (\Froxlor\System\Crypt::validatePasswordLogin($userinfo, $password, $table, $uid)) {
+		} elseif (Crypt::validatePasswordLogin($userinfo, $password, $table, $uid)) {
 			// only show "you're banned" if the login was successful
 			// because we don't want to publish that the user does exist
 			if ($userinfo['deactivated']) {
 				unset($userinfo);
-				\Froxlor\UI\Response::redirectTo('index.php', array(
+				Response::redirectTo('index.php', [
 					'showmessage' => '5'
-				));
+				]);
 				exit();
 			} else {
 				// login correct
@@ -226,10 +243,10 @@ if ($action == '2fa_entercode') {
 				$stmt = Database::prepare("UPDATE $table
 					  SET `lastlogin_succ`= :lastlogin_succ, `loginfail_count`='0'
 					  WHERE `$uid`= :uid");
-				Database::pexecute($stmt, array(
+				Database::pexecute($stmt, [
 					"lastlogin_succ" => time(),
 					"uid" => $userinfo[$uid]
-				));
+				]);
 				$userinfo['userid'] = $userinfo[$uid];
 				$userinfo['adminsession'] = $adminsession;
 			}
@@ -238,21 +255,21 @@ if ($action == '2fa_entercode') {
 			$stmt = Database::prepare("UPDATE $table
 				SET `lastlogin_fail`= :lastlogin_fail, `loginfail_count`=`loginfail_count`+1
 				WHERE `$uid`= :uid");
-			Database::pexecute($stmt, array(
+			Database::pexecute($stmt, [
 				"lastlogin_fail" => time(),
 				"uid" => $userinfo[$uid]
-			));
+			]);
 
 			// Log failed login
-			$rstlog = FroxlorLogger::getInstanceOf(array(
+			$rstlog = FroxlorLogger::getInstanceOf([
 				'loginname' => $_SERVER['REMOTE_ADDR']
-			));
+			]);
-			$rstlog->logAction(\Froxlor\FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");
+			$rstlog->logAction(FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");
 
 			unset($userinfo);
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'showmessage' => '2'
-			));
+			]);
 			exit();
 		}
 
@@ -267,27 +284,27 @@ if ($action == '2fa_entercode') {
 			// send mail if type_2fa = 1 (email)
 			if ($userinfo['type_2fa'] == 1) {
 				// generate code
-				$tfa = new \Froxlor\FroxlorTwoFactorAuth('Froxlor');
+				$tfa = new FroxlorTwoFactorAuth('Froxlor ' . Settings::Get('system.hostname'));
 				$code = $tfa->getCode($tfa->createSecret());
 				// set code for user
 				$stmt = Database::prepare("UPDATE $table SET `data_2fa` = :d2fa WHERE `$uid` = :uid");
-				Database::pexecute($stmt, array(
+				Database::pexecute($stmt, [
 					"d2fa" => $code,
 					"uid" => $userinfo[$uid]
-				));
+				]);
 				// build up & send email
 				$_mailerror = false;
 				$mailerr_msg = "";
-				$replace_arr = array(
+				$replace_arr = [
 					'CODE' => $code
-				);
+				];
-				$mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables($lng['mails']['2fa']['mailbody'], $replace_arr));
+				$mail_body = html_entity_decode(PhpHelper::replaceVariables(lng('mails.2fa.mailbody'), $replace_arr));
 
 				try {
-					$mail->Subject = $lng['mails']['2fa']['subject'];
+					$mail->Subject = lng('mails.2fa.subject');
 					$mail->AltBody = $mail_body;
 					$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-					$mail->AddAddress($userinfo['email'], \Froxlor\User::getCorrectUserSalutation($userinfo));
+					$mail->AddAddress($userinfo['email'], User::getCorrectUserSalutation($userinfo));
 					$mail->Send();
 				} catch (\PHPMailer\PHPMailer\Exception $e) {
 					$mailerr_msg = $e->errorMessage();
@@ -298,82 +315,76 @@ if ($action == '2fa_entercode') {
 				}
 
 				if ($_mailerror) {
-					$rstlog = FroxlorLogger::getInstanceOf(array(
+					$rstlog = FroxlorLogger::getInstanceOf([
 						'loginname' => '2fa code-sending'
-					));
+					]);
-					$rstlog->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+					$rstlog->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-					\Froxlor\UI\Response::redirectTo('index.php', array(
+					Response::redirectTo('index.php', [
 						'showmessage' => '4',
 						'customermail' => $userinfo['email']
-					));
+					]);
 					exit();
 				}
 
 				$mail->ClearAddresses();
 			}
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'action' => '2fa_entercode'
-			));
+			]);
 			exit();
 		}
 
-		if (! finishLogin($userinfo)) {
+		if (!finishLogin($userinfo)) {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				'showmessage' => '2'
-			));
+			]);
 		}
 		exit();
 	} else {
-		$language_options = '';
+		$smessage = isset($_GET['showmessage']) ? (int)$_GET['showmessage'] : 0;
-		$language_options .= \Froxlor\UI\HTML::makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
-
-		foreach ($languages as $language_file => $language_name) {
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, 'profile', true);
-		}
-
-		$smessage = isset($_GET['showmessage']) ? (int) $_GET['showmessage'] : 0;
 		$message = '';
 		$successmessage = '';
 
 		switch ($smessage) {
 			case 1:
-				$successmessage = $lng['pwdreminder']['success'];
+				$successmessage = lng('pwdreminder.success');
 				break;
 			case 2:
-				$message = $lng['error']['login'];
+				$message = lng('error.login');
 				break;
 			case 3:
-				$message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime'));
+				$message = lng('error.login_blocked', [Settings::Get('login.deactivatetime')]);
 				break;
 			case 4:
-				$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
+				$message = lng('error.errorsendingmailpub');
-				$message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']);
 				break;
 			case 5:
-				$message = $lng['error']['user_banned'];
+				$message = lng('error.user_banned');
 				break;
 			case 6:
-				$successmessage = $lng['pwdreminder']['changed'];
+				$successmessage = lng('pwdreminder.changed');
 				break;
 			case 7:
-				$message = $lng['pwdreminder']['wrongcode'];
+				$message = lng('pwdreminder.wrongcode');
 				break;
 			case 8:
-				$message = $lng['pwdreminder']['notallowed'];
+				$message = lng('pwdreminder.notallowed');
 				break;
 		}
 
-		$update_in_progress = '';
+		$update_in_progress = false;
-		if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+		if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
-			$update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
+			$update_in_progress = true;
 		}
 
 		// Pass the last used page if needed
 		$lastscript = "";
 		if (isset($_REQUEST['script']) && $_REQUEST['script'] != "") {
 			$lastscript = $_REQUEST['script'];
+			$lastscript = str_replace("..", "", $lastscript);
+			$lastscript = htmlspecialchars($lastscript, ENT_QUOTES);
 
-			if (! file_exists(__DIR__ . "/" . $lastscript)) {
+			if (!file_exists(__DIR__ . "/" . $lastscript)) {
 				$lastscript = "";
 			}
 		}
@@ -382,7 +393,14 @@ if ($action == '2fa_entercode') {
 			$lastqrystr = htmlspecialchars($_REQUEST['qrystr'], ENT_QUOTES);
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('login') . "\";");
+		UI::view('login/login.html.twig', [
+			'pagetitle' => 'Login',
+			'lastscript' => $lastscript,
+			'lastqrystr' => $lastqrystr,
+			'upd_in_progress' => $update_in_progress,
+			'message' => $message,
+			'successmsg' => $successmessage
+		]);
 	}
 }
 
@@ -391,24 +409,24 @@ if ($action == 'forgotpwd') {
 	$message = '';
 
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$loginname = \Froxlor\Validate\Validate::validate($_POST['loginname'], 'loginname');
+		$loginname = Validate::validate($_POST['loginname'], 'loginname');
-		$email = \Froxlor\Validate\Validate::validateEmail($_POST['loginemail'], 'email');
+		$email = Validate::validateEmail($_POST['loginemail']);
-		$result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+		$result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `customernumber`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
 			WHERE `loginname`= :loginname
 			AND `email`= :email");
-		Database::pexecute($result_stmt, array(
+		Database::pexecute($result_stmt, [
 			"loginname" => $loginname,
 			"email" => $email
-		));
+		]);
 
 		if (Database::num_rows() == 0) {
 			$result_stmt = Database::prepare("SELECT `adminid`, `name`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_ADMINS . "`
 				WHERE `loginname`= :loginname
 				AND `email`= :email");
-			Database::pexecute($result_stmt, array(
+			Database::pexecute($result_stmt, [
 				"loginname" => $loginname,
 				"email" => $email
-			));
+			]);
 
 			if (Database::num_rows() > 0) {
 				$adminchecked = true;
@@ -417,51 +435,59 @@ if ($action == 'forgotpwd') {
 			}
 		}
 
+		if ($adminchecked) {
+			if (Settings::Get('panel.allow_preset_admin') != '1') {
+				$message = lng('pwdreminder.notallowed');
+				unset($adminchecked);
+			}
+		} else {
+			if (Settings::Get('panel.allow_preset') != '1') {
+				$message = lng('pwdreminder.notallowed');
+			}
+		}
+
+		if (empty($message)) {
 			if ($result_stmt !== null) {
 				$user = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 				/* Check whether user is banned */
 				if ($user['deactivated']) {
-				\Froxlor\UI\Response::redirectTo('index.php', array(
+					$message = lng('pwdreminder.notallowed');
-					'showmessage' => '8'
+				} else {
-				));
-				exit();
-			}
-
 					if (($adminchecked && Settings::Get('panel.allow_preset_admin') == '1') || $adminchecked == false) {
 						if ($user !== false) {
 							// build a activation code
 							$timestamp = time();
-					$first = substr(md5($user['loginname'] . $timestamp . \Froxlor\PhpHelper::randomStr(16)), 0, 15);
+							$first = substr(md5($user['loginname'] . $timestamp . PhpHelper::randomStr(16)), 0, 15);
-					$third = substr(md5($user['email'] . $timestamp . \Froxlor\PhpHelper::randomStr(16)), - 15);
+							$third = substr(md5($user['email'] . $timestamp . PhpHelper::randomStr(16)), -15);
 							$activationcode = $first . $timestamp . $third . substr(md5($third . $timestamp), 0, 10);
 
 							// Drop all existing activation codes for this user
 							$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
 								WHERE `userid` = :userid
 								AND `admin` = :admin");
-					$params = array(
+							$params = [
 								"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
 								"admin" => $adminchecked ? 1 : 0
-					);
+							];
 							Database::pexecute($stmt, $params);
 
 							// Add new activation code to database
 							$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_ACTIVATION . "`
 								(userid, admin, creation, activationcode)
 								VALUES (:userid, :admin, :creation, :activationcode)");
-					$params = array(
+							$params = [
 								"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
 								"admin" => $adminchecked ? 1 : 0,
 								"creation" => $timestamp,
 								"activationcode" => $activationcode
-					);
+							];
 							Database::pexecute($stmt, $params);
 
-					$rstlog = FroxlorLogger::getInstanceOf(array(
+							$rstlog = FroxlorLogger::getInstanceOf([
 								'loginname' => 'password_reset'
-					));
+							]);
-					$rstlog->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "User '" . $user['loginname'] . "' requested a link for setting a new password.");
+							$rstlog->logAction(FroxlorLogger::USR_ACTION, LOG_WARNING, "User '" . $user['loginname'] . "' requested a link for setting a new password.");
 
 							// Set together our activation link
 							$protocol = empty($_SERVER['HTTPS']) ? 'http' : 'https';
@@ -475,15 +501,19 @@ if ($action == 'forgotpwd') {
 							// there can be only one script to handle this so we can use a fixed value here
 							$script = "/index.php"; // $_SERVER['SCRIPT_NAME'];
 							if (Settings::Get('system.froxlordirectlyviahostname') == 0) {
-						$script = \Froxlor\FileDir::makeCorrectFile("/" . basename(__DIR__) . "/" . $script);
+								$script = FileDir::makeCorrectFile("/" . basename(__DIR__) . "/" . $script);
 							}
 							$activationlink = $protocol . '://' . $host . $port . $script . '?action=resetpwd&resetcode=' . $activationcode;
 
-					$replace_arr = array(
+							$replace_arr = [
-						'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($user),
+								'SALUTATION' => User::getCorrectUserSalutation($user),
+								'NAME' => $user['name'],
+								'FIRSTNAME' => $user['firstname'] ?? "",
+								'COMPANY' => $user['company'] ?? "",
+								'CUSTOMER_NO' => $user['customernumber'] ?? 0,
 								'USERNAME' => $loginname,
 								'LINK' => $activationlink
-					);
+							];
 
 							$def_language = ($user['def_language'] != '') ? $user['def_language'] : Settings::Get('panel.standardlanguage');
 							$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
@@ -491,24 +521,24 @@ if ($action == 'forgotpwd') {
 								AND `language`= :lang
 								AND `templategroup`=\'mails\'
 								AND `varname`=\'password_reset_subject\'');
-					Database::pexecute($result_stmt, array(
+							Database::pexecute($result_stmt, [
 								"adminid" => $user['adminid'],
 								"lang" => $def_language
-					));
+							]);
 							$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['subject']), $replace_arr));
+							$mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : lng('mails.password_reset.subject')), $replace_arr));
 
 							$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
 								WHERE `adminid`= :adminid
 								AND `language`= :lang
 								AND `templategroup`=\'mails\'
 								AND `varname`=\'password_reset_mailbody\'');
-					Database::pexecute($result_stmt, array(
+							Database::pexecute($result_stmt, [
 								"adminid" => $user['adminid'],
 								"lang" => $def_language
-					));
+							]);
 							$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['mailbody']), $replace_arr));
+							$mail_body = html_entity_decode(PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : lng('mails.password_reset.mailbody')), $replace_arr));
 
 							$_mailerror = false;
 							$mailerr_msg = "";
@@ -516,7 +546,7 @@ if ($action == 'forgotpwd') {
 								$mail->Subject = $mail_subject;
 								$mail->AltBody = $mail_body;
 								$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-						$mail->AddAddress($user['email'], \Froxlor\User::getCorrectUserSalutation($user));
+								$mail->AddAddress($user['email'], User::getCorrectUserSalutation($user));
 								$mail->Send();
 							} catch (\PHPMailer\PHPMailer\Exception $e) {
 								$mailerr_msg = $e->errorMessage();
@@ -527,49 +557,44 @@ if ($action == 'forgotpwd') {
 							}
 
 							if ($_mailerror) {
-						$rstlog = FroxlorLogger::getInstanceOf(array(
+								$rstlog = FroxlorLogger::getInstanceOf([
 									'loginname' => 'password_reset'
-						));
+								]);
-						$rstlog->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+								$rstlog->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-						\Froxlor\UI\Response::redirectTo('index.php', array(
+								Response::redirectTo('index.php', [
 									'showmessage' => '4',
 									'customermail' => $user['email']
-						));
+								]);
 								exit();
 							}
 
 							$mail->ClearAddresses();
-					\Froxlor\UI\Response::redirectTo('index.php', array(
+							Response::redirectTo('index.php', [
 								'showmessage' => '1'
-					));
+							]);
 							exit();
 						} else {
-					$rstlog = FroxlorLogger::getInstanceOf(array(
+							$rstlog = FroxlorLogger::getInstanceOf([
 								'loginname' => 'password_reset'
-					));
+							]);
-					$rstlog->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
+							$rstlog->logAction(FroxlorLogger::USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
-					$message = $lng['login']['combination_not_found'];
+							$message = lng('login.usernotfound');
 						}
 
 						unset($user);
 					}
+				}
 			} else {
-			$message = $lng['login']['usernotfound'];
+				$message = lng('pwdreminder.notallowed');
+			}
 		}
 	}
 
-	if ($adminchecked) {
+	UI::view('login/fpwd.html.twig', [
-		if (Settings::Get('panel.allow_preset_admin') != '1') {
+		'pagetitle' => lng('login.presend'),
-			$message = $lng['pwdreminder']['notallowed'];
+		'action' => $action,
-			unset($adminchecked);
+		'message' => $message,
-		}
+	]);
-	} else {
-		if (Settings::Get('panel.allow_preset') != '1') {
-			$message = $lng['pwdreminder']['notallowed'];
-		}
-	}
-
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('fpwd') . "\";");
 }
 
 if ($action == 'resetpwd') {
@@ -578,9 +603,9 @@ if ($action == 'resetpwd') {
 	// Remove old activation codes
 	$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
 		WHERE creation < :oldest");
-	Database::pexecute($stmt, array(
+	Database::pexecute($stmt, [
 		"oldest" => time() - 86400
-	));
+	]);
 
 	if (isset($_GET['resetcode']) && strlen($_GET['resetcode']) == 50) {
 		// Check if activation code is valid
@@ -593,26 +618,23 @@ if ($action == 'resetpwd') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				$stmt = Database::prepare("SELECT `userid`, `admin` FROM `" . TABLE_PANEL_ACTIVATION . "`
 					WHERE `activationcode` = :activationcode");
-				$result = Database::pexecute_first($stmt, array(
+				$result = Database::pexecute_first($stmt, [
 					"activationcode" => $activationcode
-				));
+				]);
 
 				if ($result !== false) {
-					if ($result['admin'] == 1) {
+					try {
-						$new_password = \Froxlor\Validate\Validate::validate($_POST['new_password'], 'new password');
+						$new_password = Crypt::validatePassword($_POST['new_password'], true);
-						$new_password_confirm = \Froxlor\Validate\Validate::validate($_POST['new_password_confirm'], 'new password confirm');
+						$new_password_confirm = Crypt::validatePassword($_POST['new_password_confirm'], true);
-					} else {
+					} catch (Exception $e) {
-						$new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], 'new password');
+						$message = $e->getMessage();
-						$new_password_confirm = \Froxlor\System\Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
 					}
 
-					if ($new_password == '') {
+					if (empty($message) && (empty($new_password) || $new_password != $new_password_confirm)) {
-						$message = $new_password;
+						$message = lng('error.newpasswordconfirmerror');
-					} elseif ($new_password_confirm == '') {
+					}
-						$message = $new_password_confirm;
+
-					} elseif ($new_password != $new_password_confirm) {
+					if (empty($message)) {
-						$message = $new_password . " != " . $new_password_confirm;
-					} else {
 						// Update user password
 						if ($result['admin'] == 1) {
 							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_ADMINS . "`
@@ -623,140 +645,91 @@ if ($action == 'resetpwd') {
 								SET `password` = :newpassword
 								WHERE `customerid` = :userid");
 						}
-						Database::pexecute($stmt, array(
+						Database::pexecute($stmt, [
-							"newpassword" => \Froxlor\System\Crypt::makeCryptPassword($new_password),
+							"newpassword" => Crypt::makeCryptPassword($new_password),
 							"userid" => $result['userid']
-						));
+						]);
 
-						$rstlog = FroxlorLogger::getInstanceOf(array(
+						$rstlog = FroxlorLogger::getInstanceOf([
 							'loginname' => 'password_reset'
-						));
+						]);
-						$rstlog->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed password using password reset.");
+						$rstlog->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed password using password reset.");
 
 						// Remove activation code from DB
 						$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
 							WHERE `activationcode` = :activationcode
 							AND `userid` = :userid");
-						Database::pexecute($stmt, array(
+						Database::pexecute($stmt, [
 							"activationcode" => $activationcode,
 							"userid" => $result['userid']
-						));
+						]);
-						\Froxlor\UI\Response::redirectTo('index.php', array(
+						Response::redirectTo('index.php', [
 							"showmessage" => '6'
-						));
+						]);
 					}
 				} else {
-					\Froxlor\UI\Response::redirectTo('index.php', array(
+					Response::redirectTo('index.php', [
 						"showmessage" => '7'
-					));
+					]);
 				}
 			}
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate('rpwd') . "\";");
+			UI::view('login/rpwd.html.twig', [
+				'pagetitle' => lng('pwdreminder.choosenew'),
+				'formaction' => 'index.php?action=resetpwd&resetcode=' . $activationcode,
+				'message' => $message,
+			]);
 		} else {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
+			Response::redirectTo('index.php', [
 				"showmessage" => '7'
-			));
+			]);
 		}
 	} else {
-		\Froxlor\UI\Response::redirectTo('index.php');
+		Response::redirectTo('index.php');
 	}
 }
 
 function finishLogin($userinfo)
 {
-	global $version, $dbversion, $remote_addr, $http_user_agent, $languages;
-
 	if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
-		$s = md5(uniqid(microtime(), 1));
+		CurrentUser::setData($userinfo);
 
-		if (isset($_POST['language'])) {
+		$language = $userinfo['def_language'] ?? Settings::Get('panel.standardlanguage');
-			$language = \Froxlor\Validate\Validate::validate($_POST['language'], 'language');
+		CurrentUser::setField('language', $language);
-			if ($language == 'profile') {
-				$language = $userinfo['def_language'];
-			} elseif (! isset($languages[$language])) {
-				$language = Settings::Get('panel.standardlanguage');
-			}
-		} else {
-			$language = Settings::Get('panel.standardlanguage');
-		}
 
 		if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
 			$theme = $userinfo['theme'];
 		} else {
 			$theme = Settings::Get('panel.default_theme');
+			CurrentUser::setField('theme', $theme);
 		}
 
-		if (Settings::Get('session.allow_multiple_login') != '1') {
+		$qryparams = [];
-			$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
-					WHERE `userid` = :uid
-					AND `adminsession` = :adminsession");
-			Database::pexecute($stmt, array(
-				"uid" => $userinfo['userid'],
-				"adminsession" => $userinfo['adminsession']
-			));
-		}
-
-		// check for field 'theme' in session-table, refs #607
-		// Changed with #1287 to new method
-		$stmt = Database::query("SHOW COLUMNS FROM panel_sessions LIKE 'theme'");
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($row['Field'] == "theme") {
-				$has_theme = true;
-			}
-		}
-
-		$params = array(
-			"hash" => $s,
-			"userid" => $userinfo['userid'],
-			"ipaddress" => $remote_addr,
-			"useragent" => $http_user_agent,
-			"lastactivity" => time(),
-			"language" => $language,
-			"adminsession" => $userinfo['adminsession']
-		);
-
-		if ($has_theme) {
-			$params["theme"] = $theme;
-			$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
-					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`)
-					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession, :theme)");
-		} else {
-			$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
-					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`)
-					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession)");
-		}
-		Database::pexecute($stmt, $params);
-
-		$qryparams = array();
 		if (isset($_POST['qrystr']) && $_POST['qrystr'] != "") {
 			parse_str(urldecode($_POST['qrystr']), $qryparams);
 		}
-		$qryparams['s'] = $s;
 
 		if ($userinfo['adminsession'] == '1') {
-			if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+			if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
-				\Froxlor\UI\Response::redirectTo('admin_updates.php', array(
+				Response::redirectTo('admin_updates.php?page=overview');
-					's' => $s
-				));
 			} else {
 				if (isset($_POST['script']) && $_POST['script'] != "") {
 					if (preg_match("/customer\_/", $_POST['script']) === 1) {
-						\Froxlor\UI\Response::redirectTo('admin_customers.php', array(
+						Response::redirectTo('admin_customers.php', [
 							"page" => "customers"
-						));
+						]);
 					} else {
-						\Froxlor\UI\Response::redirectTo($_POST['script'], $qryparams);
+						Response::redirectTo($_POST['script'], $qryparams);
 					}
 				} else {
-					\Froxlor\UI\Response::redirectTo('admin_index.php', $qryparams);
+					Response::redirectTo('admin_index.php', $qryparams);
 				}
 			}
 		} else {
 			if (isset($_POST['script']) && $_POST['script'] != "") {
-				\Froxlor\UI\Response::redirectTo($_POST['script'], $qryparams);
+				Response::redirectTo($_POST['script'], $qryparams);
 			} else {
-				\Froxlor\UI\Response::redirectTo('customer_index.php', $qryparams);
+				Response::redirectTo('customer_index.php', $qryparams);
 			}
 		}
 	}

install/froxlor.sql.php

@@ -1,3 +1,29 @@
+<?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
+ */
+
+return <<<'FROXLORSQL'
 DROP TABLE IF EXISTS `ftp_groups`;
 CREATE TABLE `ftp_groups` (
   `id` int(20) NOT NULL auto_increment,
@@ -10,15 +36,13 @@ CREATE TABLE `ftp_groups` (
   KEY `customerid` (`customerid`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
-
-
 DROP TABLE IF EXISTS `ftp_users`;
 CREATE TABLE `ftp_users` (
   `id` int(20) NOT NULL auto_increment,
-  `username` varchar(255) NOT NULL default '',
+  `username` varchar(255) NOT NULL,
   `uid` int(5) NOT NULL default '0',
   `gid` int(5) NOT NULL default '0',
-  `password` varchar(128) NOT NULL default '',
+  `password` varchar(255) NOT NULL,
   `homedir` varchar(255) NOT NULL default '',
   `shell` varchar(255) NOT NULL default '/bin/false',
   `login_enabled` enum('N','Y') NOT NULL default 'N',
@@ -36,14 +60,13 @@ CREATE TABLE `ftp_users` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `mail_users`;
 CREATE TABLE `mail_users` (
   `id` int(11) NOT NULL auto_increment,
   `email` varchar(255) NOT NULL default '',
   `username` varchar(255) NOT NULL default '',
-  `password` varchar(128) NOT NULL default '',
+  `password` varchar(255) NOT NULL default '',
-  `password_enc` varchar(128) NOT NULL default '',
+  `password_enc` varchar(255) NOT NULL default '',
   `uid` int(11) NOT NULL default '0',
   `gid` int(11) NOT NULL default '0',
   `homedir` varchar(255) NOT NULL default '',
@@ -60,7 +83,6 @@ CREATE TABLE `mail_users` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `mail_virtual`;
 CREATE TABLE `mail_virtual` (
   `id` int(11) NOT NULL auto_increment,
@@ -71,6 +93,7 @@ CREATE TABLE `mail_virtual` (
   `customerid` int(11) NOT NULL default '0',
   `popaccountid` int(11) NOT NULL default '0',
   `iscatchall` tinyint(1) unsigned NOT NULL default '0',
+  `description` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY  (`id`),
   KEY `email` (`email`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
@@ -90,18 +113,17 @@ CREATE TABLE `panel_activation` (
 DROP TABLE IF EXISTS `panel_admins`;
 CREATE TABLE `panel_admins` (
   `adminid` int(11) unsigned NOT NULL auto_increment,
-  `loginname` varchar(50) NOT NULL default '',
+  `loginname` varchar(50) NOT NULL,
-  `password` varchar(255) NOT NULL default '',
+  `password` varchar(255) NOT NULL,
   `name` varchar(255) NOT NULL default '',
   `email` varchar(255) NOT NULL default '',
-  `def_language` varchar(255) NOT NULL default '',
+  `def_language` varchar(100) NOT NULL default '',
   `ip` varchar(500) NOT NULL default '-1',
   `customers` int(15) NOT NULL default '0',
   `customers_used` int(15) NOT NULL default '0',
   `customers_see_all` tinyint(1) NOT NULL default '0',
   `domains` int(15) NOT NULL default '0',
   `domains_used` int(15) NOT NULL default '0',
-  `domains_see_all` tinyint(1) NOT NULL default '0',
   `caneditphpsettings` tinyint(1) NOT NULL default '0',
   `change_serversettings` tinyint(1) NOT NULL default '0',
   `diskspace` int(15) NOT NULL default '0',
@@ -127,22 +149,21 @@ CREATE TABLE `panel_admins` (
   `lastlogin_fail` int(11) unsigned NOT NULL default '0',
   `loginfail_count` int(11) unsigned NOT NULL default '0',
   `reportsent` tinyint(4) unsigned NOT NULL default '0',
-  `theme` varchar(255) NOT NULL default 'Sparkle',
+  `theme` varchar(50) NOT NULL default 'Froxlor',
   `custom_notes` text,
   `custom_notes_show` tinyint(1) NOT NULL default '0',
   `type_2fa` tinyint(1) NOT NULL default '0',
-  `data_2fa` varchar(500) NOT NULL default '',
+  `data_2fa` varchar(25) NOT NULL default '',
   `api_allowed` tinyint(1) NOT NULL default '1',
    PRIMARY KEY  (`adminid`),
    UNIQUE KEY `loginname` (`loginname`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_customers`;
 CREATE TABLE `panel_customers` (
   `customerid` int(11) unsigned NOT NULL auto_increment,
-  `loginname` varchar(50) NOT NULL default '',
+  `loginname` varchar(50) NOT NULL,
   `password` varchar(255) NOT NULL default '',
   `adminid` int(11) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL default '',
@@ -150,13 +171,13 @@ CREATE TABLE `panel_customers` (
   `gender` int(1) NOT NULL DEFAULT '0',
   `company` varchar(255) NOT NULL default '',
   `street` varchar(255) NOT NULL default '',
-  `zipcode` varchar(255) NOT NULL default '',
+  `zipcode` varchar(25) NOT NULL default '',
   `city` varchar(255) NOT NULL default '',
-  `phone` varchar(255) NOT NULL default '',
+  `phone` varchar(50) NOT NULL default '',
-  `fax` varchar(255) NOT NULL default '',
+  `fax` varchar(50) NOT NULL default '',
   `email` varchar(255) NOT NULL default '',
-  `customernumber` varchar(255) NOT NULL default '',
+  `customernumber` varchar(100) NOT NULL default '',
-  `def_language` varchar(255) NOT NULL default '',
+  `def_language` varchar(100) NOT NULL default '',
   `diskspace` bigint(30) NOT NULL default '0',
   `diskspace_used` bigint(30) NOT NULL default '0',
   `mysqls` int(15) NOT NULL default '0',
@@ -190,24 +211,23 @@ CREATE TABLE `panel_customers` (
   `imap` tinyint(1) NOT NULL default '1',
   `perlenabled` tinyint(1) NOT NULL default '0',
   `dnsenabled` tinyint(1) NOT NULL default '0',
-  `theme` varchar(255) NOT NULL default 'Sparkle',
+  `theme` varchar(50) NOT NULL default 'Froxlor',
   `custom_notes` text,
   `custom_notes_show` tinyint(1) NOT NULL default '0',
   `lepublickey` mediumtext default NULL,
   `leprivatekey` mediumtext default NULL,
   `leregistered` tinyint(1) NOT NULL default '0',
-  `leaccount` varchar(255) default '',
+  `allowed_phpconfigs` text NOT NULL,
-  `allowed_phpconfigs` varchar(500) NOT NULL default '',
   `type_2fa` tinyint(1) NOT NULL default '0',
-  `data_2fa` varchar(500) NOT NULL default '',
+  `data_2fa` varchar(25) NOT NULL default '',
   `api_allowed` tinyint(1) NOT NULL default '1',
   `logviewenabled` tinyint(1) NOT NULL default '0',
+  `allowed_mysqlserver` text NOT NULL,
    PRIMARY KEY  (`customerid`),
    UNIQUE KEY `loginname` (`loginname`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_databases`;
 CREATE TABLE `panel_databases` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -220,11 +240,11 @@ CREATE TABLE `panel_databases` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_domains`;
 CREATE TABLE `panel_domains` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `domain` varchar(255) NOT NULL default '',
+  `domain` varchar(255) NOT NULL,
+  `domain_ace` varchar(255) NOT NULL default '',
   `adminid` int(11) unsigned NOT NULL default '0',
   `customerid` int(11) unsigned NOT NULL default '0',
   `aliasdomain` int(11) unsigned NULL,
@@ -248,6 +268,8 @@ CREATE TABLE `panel_domains` (
   `speciallogfile` tinyint(1) NOT NULL default '0',
   `ssl_redirect` tinyint(4) NOT NULL default '0',
   `specialsettings` text,
+  `ssl_specialsettings` text,
+  `include_specialsettings` tinyint(1) NOT NULL default '0',
   `deactivated` tinyint(1) NOT NULL default '0',
   `bindserial` varchar(10) NOT NULL default '2000010100',
   `add_date` int( 11 ) NOT NULL default '0',
@@ -266,6 +288,14 @@ CREATE TABLE `panel_domains` (
   `notryfiles` tinyint(1) DEFAULT '0',
   `writeaccesslog` tinyint(1) DEFAULT '1',
   `writeerrorlog` tinyint(1) DEFAULT '1',
+  `override_tls` tinyint(1) DEFAULT '0',
+  `ssl_protocols` varchar(255) NOT NULL DEFAULT '',
+  `ssl_cipher_list` varchar(500) NOT NULL DEFAULT '',
+  `tlsv13_cipher_list` varchar(500) NOT NULL DEFAULT '',
+  `ssl_enabled` tinyint(1) DEFAULT '1',
+  `ssl_honorcipherorder` tinyint(1) DEFAULT '0',
+  `ssl_sessiontickets` tinyint(1) DEFAULT '1',
+  `description` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`),
   KEY `parentdomain` (`parentdomainid`),
@@ -273,11 +303,10 @@ CREATE TABLE `panel_domains` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_ipsandports`;
 CREATE TABLE `panel_ipsandports` (
   `id` int(11) unsigned NOT NULL auto_increment,
-  `ip` varchar(39) NOT NULL default '',
+  `ip` varchar(39) NOT NULL,
   `port` int(5) NOT NULL default '80',
   `listen_statement` tinyint(1) NOT NULL default '0',
   `namevirtualhost_statement` tinyint(1) NOT NULL default '0',
@@ -291,12 +320,15 @@ CREATE TABLE `panel_ipsandports` (
   `default_vhostconf_domain` text,
   `ssl_cert_chainfile` varchar(255) NOT NULL default '',
   `docroot` varchar(255) NOT NULL default '',
+  `ssl_specialsettings` text,
+  `include_specialsettings` tinyint(1) NOT NULL default '0',
+  `ssl_default_vhostconf_domain` text,
+  `include_default_vhostconf_domain` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `ip_port` (`ip`,`port`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_htaccess`;
 CREATE TABLE `panel_htaccess` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -312,7 +344,6 @@ CREATE TABLE `panel_htaccess` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_htpasswds`;
 CREATE TABLE `panel_htpasswds` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -326,7 +357,6 @@ CREATE TABLE `panel_htpasswds` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_sessions`;
 CREATE TABLE `panel_sessions` (
   `hash` varchar(32) NOT NULL default '',
@@ -344,7 +374,6 @@ CREATE TABLE `panel_sessions` (
 ) ENGINE=HEAP;
 
 
-
 DROP TABLE IF EXISTS `panel_settings`;
 CREATE TABLE `panel_settings` (
   `settingid` int(11) unsigned NOT NULL auto_increment,
@@ -373,7 +402,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('dkim', 'dkim_prefix', '/etc/postfix/dkim/'),
 	('dkim', 'dkim_domains', 'domains'),
 	('dkim', 'dkim_dkimkeys', 'dkim-keys.conf'),
-	('dkim', 'dkimrestart_command', '/etc/init.d/dkim-filter restart'),
+	('dkim', 'dkimrestart_command', 'service dkim-filter restart'),
+	('dkim', 'privkeysuffix', '.priv'),
 	('admin', 'show_news_feed', '0'),
 	('admin', 'show_version_login', '0'),
 	('admin', 'show_version_footer', '0'),
@@ -479,7 +509,6 @@ opcache.load_comments
 opcache.revalidate_path
 opcache.save_comments
 opcache.use_cwd
-opcache.validate_timestamps
 opcache.fast_shutdown'),
 	('phpfpm', 'ini_admin_values', 'cgi.redirect_status_env
 date.timezone
@@ -503,22 +532,23 @@ opcache.restrict_api
 opcache.revalidate_freq
 opcache.max_accelerated_files
 opcache.memory_consumption
-opcache.interned_strings_buffer'),
+opcache.interned_strings_buffer
+opcache.validate_timestamps'),
 	('nginx', 'fastcgiparams', '/etc/nginx/fastcgi_params'),
 	('system', 'lastaccountnumber', '0'),
 	('system', 'lastguid', '9999'),
 	('system', 'documentroot_prefix', '/var/customers/webs/'),
 	('system', 'logfiles_directory', '/var/customers/logs/'),
 	('system', 'ipaddress', 'SERVERIP'),
-	('system', 'apachereload_command', '/etc/init.d/apache2 reload'),
+	('system', 'apachereload_command', 'service apache2 reload'),
 	('system', 'last_traffic_run', '000000'),
 	('system', 'vmail_uid', '2000'),
 	('system', 'vmail_gid', '2000'),
 	('system', 'vmail_homedir', '/var/customers/mail/'),
 	('system', 'vmail_maildirname', 'Maildir'),
-	('system', 'bind_enable', '1'),
+	('system', 'bind_enable', '0'),
 	('system', 'bindconf_directory', '/etc/bind/'),
-	('system', 'bindreload_command', '/etc/init.d/bind9 reload'),
+	('system', 'bindreload_command', 'service bind9 reload'),
 	('system', 'hostname', 'SERVERNAME'),
 	('system', 'mysql_access_host', 'localhost'),
 	('system', 'lastcronrun', ''),
@@ -538,13 +568,12 @@ opcache.interned_strings_buffer'),
 	('system', 'last_archive_run', '000000'),
 	('system', 'mod_fcgid_configdir', '/var/www/php-fcgi-scripts'),
 	('system', 'mod_fcgid_tmpdir', '/var/customers/tmp'),
-	('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'),
+	('system', 'ssl_cert_file', '/etc/ssl/froxlor_selfsigned.pem'),
 	('system', 'use_ssl', '0'),
 	('system', 'default_vhostconf', ''),
+	('system', 'default_sslvhostconf', ''),
 	('system', 'mail_quota_enabled', '0'),
 	('system', 'mail_quota', '100'),
-	('system', 'webalizer_enabled', '1'),
-	('system', 'awstats_enabled', '0'),
 	('system', 'httpuser', 'www-data'),
 	('system', 'httpgroup', 'www-data'),
 	('system', 'webserver', 'apache2'),
@@ -553,19 +582,20 @@ opcache.interned_strings_buffer'),
 	('system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/'),
 	('system', 'index_file_extension', 'html'),
 	('system', 'mod_fcgid_maxrequests', '250'),
-	('system', 'ssl_key_file','/etc/apache2/apache2.key'),
+	('system', 'ssl_key_file','/etc/ssl/froxlor_selfsigned.key'),
 	('system', 'ssl_ca_file', ''),
 	('system', 'debug_cron', '0'),
 	('system', 'store_index_file_subs', '1'),
 	('system', 'stdsubdomain', ''),
-	('system', 'awstats_path', '/usr/bin/'),
+	('system', 'awstats_path', '/usr/share/awstats/tools/'),
 	('system', 'awstats_conf', '/etc/awstats/'),
+	('system', 'awstats_logformat', '1'),
 	('system', 'defaultttl', '604800'),
 	('system', 'mod_fcgid_defaultini', '1'),
 	('system', 'ftpserver', 'proftpd'),
 	('system', 'dns_createmailentry', '0'),
 	('system', 'dns_createcaaentry', '1'),
-	('system', 'froxlordirectlyviahostname', '0'),
+	('system', 'froxlordirectlyviahostname', '1'),
 	('system', 'report_enable', '1'),
 	('system', 'report_webmax', '90'),
 	('system', 'report_trafficmax', '90'),
@@ -579,7 +609,7 @@ opcache.interned_strings_buffer'),
 	('system', 'mod_fcgid_ownvhost', '0'),
 	('system', 'mod_fcgid_httpuser', 'froxlorlocal'),
 	('system', 'mod_fcgid_httpgroup', 'froxlorlocal'),
-	('system', 'awstats_awstatspath', '/usr/bin/'),
+	('system', 'awstats_awstatspath', '/usr/lib/cgi-bin/'),
 	('system', 'mod_fcgid_defaultini_ownvhost', '2'),
 	('system', 'awstats_icons', '/usr/share/awstats/icon/'),
 	('system', 'ssl_cert_chainfile', ''),
@@ -591,8 +621,9 @@ opcache.interned_strings_buffer'),
 	('system', 'apache24', '1'),
 	('system', 'apache24_ocsp_cache_path', 'shmcb:/var/run/apache2/ocsp-stapling.cache(131072)'),
 	('system', 'documentroot_use_default_value', '0'),
-	('system', 'passwordcryptfunc', '3'),
+	('system', 'passwordcryptfunc', '2y'),
 	('system', 'axfrservers', ''),
+	('system', 'powerdns_mode', 'Native'),
 	('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'),
 	('system', 'allow_error_report_admin', '1'),
 	('system', 'allow_error_report_customer', '0'),
@@ -602,7 +633,7 @@ opcache.interned_strings_buffer'),
 	('system', 'mtaserver', 'postfix'),
 	('system', 'mailtraffic_enabled', '1'),
 	('system', 'cronconfig', '/etc/cron.d/froxlor'),
-	('system', 'crondreload', '/etc/init.d/cron reload'),
+	('system', 'crondreload', 'service cron reload'),
 	('system', 'croncmdline', '/usr/bin/nice -n 5 /usr/bin/php -q'),
 	('system', 'cron_allowautoupdate', '0'),
 	('system', 'dns_createhostnameentry', '0'),
@@ -610,9 +641,7 @@ opcache.interned_strings_buffer'),
 	('system', 'apacheitksupport', '0'),
 	('system', 'leprivatekey', 'unset'),
 	('system', 'lepublickey', 'unset'),
-	('system', 'letsencryptca', 'production'),
+	('system', 'letsencryptca', 'letsencrypt'),
-	('system', 'letsencryptcountrycode', 'DE'),
-	('system', 'letsencryptstate', 'Hessen'),
 	('system', 'letsencryptchallengepath', '/var/www/froxlor'),
 	('system', 'letsencryptkeysize', '4096'),
 	('system', 'letsencryptreuseold', 0),
@@ -634,15 +663,18 @@ opcache.interned_strings_buffer'),
 	('system', 'mail_smtp_auth', '1'),
 	('system', 'mail_smtp_user', ''),
 	('system', 'mail_smtp_passwd', ''),
-	('system', 'hsts_maxage', '0'),
+	('system', 'hsts_maxage', '10368000'),
 	('system', 'hsts_incsub', '0'),
 	('system', 'hsts_preload', '0'),
 	('system', 'leregistered', '0'),
 	('system', 'leaccount', ''),
-	('system', 'nssextrausers', '0'),
+	('system', 'nssextrausers', '1'),
-	('system', 'disable_le_selfcheck', '0'),
+	('system', 'le_domain_dnscheck', '1'),
-	('system', 'ssl_protocols', 'TLSv1,TLSv1.2'),
+	('system', 'ssl_protocols', 'TLSv1.2'),
 	('system', 'tlsv13_cipher_list', ''),
+	('system', 'honorcipherorder', '0'),
+	('system', 'sessiontickets', '1'),
+	('system', 'sessionticketsenabled', '1'),
 	('system', 'logfiles_format', ''),
 	('system', 'logfiles_type', '1'),
 	('system', 'logfiles_piped', '0'),
@@ -651,6 +683,21 @@ opcache.interned_strings_buffer'),
 	('system', 'errorlog_level', 'warn'),
 	('system', 'leecc', '0'),
 	('system', 'froxloraliases', ''),
+	('system', 'apply_specialsettings_default', '1'),
+	('system', 'apply_phpconfigs_default', '1'),
+	('system', 'hide_incompatible_settings', '1'),
+	('system', 'include_default_vhostconf', '0'),
+	('system', 'soaemail', ''),
+	('system', 'domaindefaultalias', '0'),
+	('system', 'createstdsubdom_default', '1'),
+	('system', 'froxlorusergroup', ''),
+	('system', 'froxlorusergroup_gid', ''),
+	('system', 'acmeshpath', '/root/.acme.sh/acme.sh'),
+	('system', 'distribution', ''),
+	('system', 'update_channel', 'stable'),
+	('system', 'updatecheck_data', ''),
+	('system', 'update_notify_last', '2.0.1'),
+	('system', 'traffictool', 'goaccess'),
 	('api', 'enabled', '0'),
 	('2fa', 'enabled', '1'),
 	('panel', 'decimal_places', '4'),
@@ -658,16 +705,15 @@ opcache.interned_strings_buffer'),
 	('panel', 'phpmyadmin_url', ''),
 	('panel', 'webmail_url', ''),
 	('panel', 'webftp_url', ''),
-	('panel', 'standardlanguage', 'English'),
+	('panel', 'standardlanguage', 'en'),
 	('panel', 'pathedit', 'Manual'),
 	('panel', 'paging', '20'),
 	('panel', 'natsorting', '1'),
 	('panel', 'sendalternativemail', '0'),
-	('panel', 'no_robots', '1'),
 	('panel', 'allow_domain_change_admin', '0'),
 	('panel', 'allow_domain_change_customer', '0'),
 	('panel', 'frontend', 'froxlor'),
-	('panel', 'default_theme', 'Sparkle'),
+	('panel', 'default_theme', 'Froxlor'),
 	('panel', 'password_min_length', '0'),
 	('panel', 'adminmail_defname', 'Froxlor Administrator'),
 	('panel', 'adminmail_return', ''),
@@ -676,6 +722,7 @@ opcache.interned_strings_buffer'),
 	('panel', 'allow_preset_admin', '0'),
 	('panel', 'password_regex', ''),
 	('panel', 'phpconfigs_hidestdsubdomain', '0'),
+	('panel', 'phpconfigs_hidesubdomains', '1'),
 	('panel', 'allow_theme_change_admin', '1'),
 	('panel', 'allow_theme_change_customer', '1'),
 	('panel', 'password_alpha_lower', '1'),
@@ -685,8 +732,16 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
 	('panel', 'is_configured', '0'),
-	('panel', 'version', '0.10.1'),
+	('panel', 'imprint_url', ''),
-	('panel', 'db_version', '201910090');
+	('panel', 'terms_url', ''),
+	('panel', 'privacy_url', ''),
+	('panel', 'logo_image_header', ''),
+	('panel', 'logo_image_login', ''),
+	('panel', 'logo_overridetheme', '0'),
+	('panel', 'logo_overridecustom', '0'),
+	('panel', 'settings_mode', '0'),
+	('panel', 'version', '2.0.1'),
+	('panel', 'db_version', '202212060');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
@@ -697,6 +752,7 @@ CREATE TABLE `panel_tasks` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
+
 INSERT INTO `panel_tasks` (`type`) VALUES ('99');
 
 
@@ -713,7 +769,6 @@ CREATE TABLE `panel_templates` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_traffic`;
 CREATE TABLE `panel_traffic` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -731,7 +786,6 @@ CREATE TABLE `panel_traffic` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_traffic_admins`;
 CREATE TABLE `panel_traffic_admins` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -749,7 +803,6 @@ CREATE TABLE `panel_traffic_admins` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_diskspace`;
 CREATE TABLE `panel_diskspace` (
   `id` int(11) unsigned NOT NULL auto_increment,
@@ -766,45 +819,6 @@ CREATE TABLE `panel_diskspace` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
-DROP TABLE IF EXISTS `panel_diskspace_admins`;
-CREATE TABLE `panel_diskspace_admins` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `adminid` int(11) unsigned NOT NULL default '0',
-  `year` int(4) unsigned zerofill NOT NULL default '0000',
-  `month` int(2) unsigned zerofill NOT NULL default '00',
-  `day` int(2) unsigned zerofill NOT NULL default '00',
-  `stamp` int(11) unsigned NOT NULL default '0',
-  `webspace` bigint(30) unsigned NOT NULL default '0',
-  `mail` bigint(30) unsigned NOT NULL default '0',
-  `mysql` bigint(30) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  KEY `adminid` (`adminid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
-
-
-
-DROP TABLE IF EXISTS `panel_languages`;
-CREATE TABLE `panel_languages` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `language` varchar(30) NOT NULL DEFAULT '',
-  `iso` char(3) NOT NULL DEFAULT 'foo',
-  `file` varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
-
-
-
-INSERT INTO `panel_languages` (`id`, `language`, `iso`, `file`) VALUES
-    (1, 'Deutsch', 'de', 'lng/german.lng.php'),
-    (2, 'English', 'en', 'lng/english.lng.php'),
-    (3, 'Fran&ccedil;ais', 'fr', 'lng/french.lng.php'),
-    (4, 'Portugu&ecirc;s', 'pt', 'lng/portugues.lng.php'),
-    (5, 'Italiano', 'it', 'lng/italian.lng.php'),
-    (6, 'Nederlands', 'nl', 'lng/dutch.lng.php'),
-    (7, 'Svenska', 'sv', 'lng/swedish.lng.php');
-
-
 DROP TABLE IF EXISTS `panel_syslog`;
 CREATE TABLE IF NOT EXISTS `panel_syslog` (
   `logid` bigint(20) NOT NULL auto_increment,
@@ -817,31 +831,29 @@ CREATE TABLE IF NOT EXISTS `panel_syslog` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `panel_fpmdaemons`;
 CREATE TABLE `panel_fpmdaemons` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `description` varchar(50) NOT NULL,
   `reload_cmd` varchar(255) NOT NULL,
   `config_dir` varchar(255) NOT NULL,
-  `pm` varchar(15) NOT NULL DEFAULT 'static',
+  `pm` varchar(15) NOT NULL DEFAULT 'dynamic',
-  `max_children` int(4) NOT NULL DEFAULT '1',
+  `max_children` int(4) NOT NULL DEFAULT '5',
-  `start_servers` int(4) NOT NULL DEFAULT '20',
+  `start_servers` int(4) NOT NULL DEFAULT '2',
-  `min_spare_servers` int(4) NOT NULL DEFAULT '5',
+  `min_spare_servers` int(4) NOT NULL DEFAULT '1',
-  `max_spare_servers` int(4) NOT NULL DEFAULT '35',
+  `max_spare_servers` int(4) NOT NULL DEFAULT '3',
   `max_requests` int(4) NOT NULL DEFAULT '0',
-  `idle_timeout` int(4) NOT NULL DEFAULT '30',
+  `idle_timeout` int(4) NOT NULL DEFAULT '10',
   `limit_extensions` varchar(255) NOT NULL default '.php',
+  `custom_config` text,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `reload` (`reload_cmd`),
   UNIQUE KEY `config` (`config_dir`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 INSERT INTO `panel_fpmdaemons` (`id`, `description`, `reload_cmd`, `config_dir`) VALUES
-(1, 'System default', 'service php7.0-fpm restart', '/etc/php/7.0/fpm/pool.d/');
+(1, 'System default', 'service php7.4-fpm restart', '/etc/php/7.4/fpm/pool.d/');
-
 
 
 DROP TABLE IF EXISTS `panel_phpconfigs`;
@@ -860,23 +872,22 @@ CREATE TABLE `panel_phpconfigs` (
   `fpmsettingid` int(11) NOT NULL DEFAULT '1',
   `pass_authorizationheader` tinyint(1) NOT NULL default '0',
   `override_fpmconfig` tinyint(1) NOT NULL DEFAULT '0',
-  `pm` varchar(15) NOT NULL DEFAULT 'static',
+  `pm` varchar(15) NOT NULL DEFAULT 'dynamic',
-  `max_children` int(4) NOT NULL DEFAULT '1',
+  `max_children` int(4) NOT NULL DEFAULT '5',
-  `start_servers` int(4) NOT NULL DEFAULT '20',
+  `start_servers` int(4) NOT NULL DEFAULT '2',
-  `min_spare_servers` int(4) NOT NULL DEFAULT '5',
+  `min_spare_servers` int(4) NOT NULL DEFAULT '1',
-  `max_spare_servers` int(4) NOT NULL DEFAULT '35',
+  `max_spare_servers` int(4) NOT NULL DEFAULT '3',
   `max_requests` int(4) NOT NULL DEFAULT '0',
-  `idle_timeout` int(4) NOT NULL DEFAULT '30',
+  `idle_timeout` int(4) NOT NULL DEFAULT '10',
   `limit_extensions` varchar(255) NOT NULL default '.php',
   PRIMARY KEY  (`id`),
   KEY `fpmsettingid` (`fpmsettingid`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
+INSERT INTO `panel_phpconfigs` (`id`, `description`, `binary`, `file_extensions`, `mod_fcgid_starter`, `mod_fcgid_maxrequests`, `pass_authorizationheader`, `phpsettings`) VALUES
-INSERT INTO `panel_phpconfigs` (`id`, `description`, `binary`, `file_extensions`, `mod_fcgid_starter`, `mod_fcgid_maxrequests`, `phpsettings`) VALUES
+(1, 'Default Config', '/usr/bin/php-cgi', 'php', '-1', '-1', '1', 'allow_url_fopen = Off\r\nallow_url_include = Off\r\nauto_append_file =\r\nauto_globals_jit = On\r\nauto_prepend_file =\r\nbcmath.scale = 0\r\ncli_server.color = On\r\ndefault_charset = "UTF-8"\r\ndefault_mimetype = "text/html"\r\ndefault_socket_timeout = 60\r\nasp_tags = Off\r\ndisable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,curl_exec,curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\ndoc_root =\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\nhtml_errors = On\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nimplicit_flush = Off\r\nldap.max_links = -1\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmail.add_x_header = Off\r\nmax_execution_time = 30\r\nmax_file_uploads = 20\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\n{OPEN_BASEDIR_C}open_basedir = "{OPEN_BASEDIR}"\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nreport_memleaks = On\r\nrequest_order = "GP"\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nserialize_precision = -1\r\nsession.auto_start = 0\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_httponly =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.cookie_samesite =\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 0\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.sid_bits_per_character = 5\r\nsession.sid_length = 26\r\nsession.trans_sid_tags = "a=href,area=href,frame=src,form="\r\nsession.use_cookies = 1\r\nsession.use_only_cookies = 1\r\nsession.use_strict_mode = 0\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\nopcache.restrict_api = "{DOCUMENT_ROOT}"\r\n'),
-(1, 'Default Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_call_time_pass_reference = Off\r\nallow_url_fopen = Off\r\nasp_tags = Off\r\ndisable_classes =\r\ndisable_functions = curl_exec,curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\ncgi.force_redirect = 1\r\ngpc_order = "GPC"\r\nhtml_errors = Off\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\nmax_execution_time = 30\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\n{OPEN_BASEDIR_C}open_basedir = "{OPEN_BASEDIR}"\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nregister_globals = Off\r\nreport_memleaks = On\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nsession.auto_start = 0\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.entropy_file = /dev/urandom\r\nsession.entropy_length = 16\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 1\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.use_cookies = 1\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nsuhosin.mail.protect = 1\r\nsuhosin.simulation = Off\r\ntrack_errors = Off\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\n;mail.add_x_header = On\r\n;mail.log = "/var/log/phpmail.log"\r\nopcache.restrict_api = "{DOCUMENT_ROOT}"\r\n'),
+(2, 'Froxlor Vhost Config', '/usr/bin/php-cgi', 'php', '-1', '-1', '1', 'allow_url_fopen = On\r\nallow_url_include = Off\r\nauto_append_file =\r\nauto_globals_jit = On\r\nauto_prepend_file =\r\nbcmath.scale = 0\r\ncli_server.color = On\r\ndefault_charset = "UTF-8"\r\ndefault_mimetype = "text/html"\r\ndefault_socket_timeout = 60\r\nasp_tags = Off\r\ndisable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,curl_multi_exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\ndoc_root =\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\nhtml_errors = On\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nimplicit_flush = Off\r\nldap.max_links = -1\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmail.add_x_header = Off\r\nmax_execution_time = 60\r\nmax_file_uploads = 20\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nreport_memleaks = On\r\nrequest_order = "GP"\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nserialize_precision = -1\r\nsession.auto_start = 0\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_httponly =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.cookie_samesite =\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 0\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.sid_bits_per_character = 5\r\nsession.sid_length = 26\r\nsession.trans_sid_tags = "a=href,area=href,frame=src,form="\r\nsession.use_cookies = 1\r\nsession.use_only_cookies = 1\r\nsession.use_strict_mode = 0\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\nopcache.restrict_api = ""\r\n');
-(2, 'Froxlor Vhost Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_call_time_pass_reference = Off\r\nallow_url_fopen = On\r\nasp_tags = Off\r\ndisable_classes =\r\ndisable_functions = curl_multi_exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\ncgi.force_redirect = 1\r\ngpc_order = "GPC"\r\nhtml_errors = Off\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\nmax_execution_time = 60\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nregister_globals = Off\r\nreport_memleaks = On\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nsession.auto_start = 0\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.entropy_file = /dev/urandom\r\nsession.entropy_length = 16\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 1\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.use_cookies = 1\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nsuhosin.mail.protect = 1\r\nsuhosin.simulation = Off\r\ntrack_errors = Off\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\n;mail.add_x_header = On\r\n;mail.log = "/var/log/phpmail.log"\r\nopcache.restrict_api = ""\r\n');
 
 
 DROP TABLE IF EXISTS `cronjobs_run`;
@@ -899,13 +910,12 @@ INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `cronclass`, `interval`,
 	(3, 'froxlor/reports', 'usage_report', '\\Froxlor\\Cron\\Traffic\\ReportsCron', '1 DAY', '1', 'cron_usage_report'),
 	(4, 'froxlor/core', 'mailboxsize', '\\Froxlor\\Cron\\System\\MailboxsizeCron', '6 HOUR', '1', 'cron_mailboxsize'),
 	(5, 'froxlor/letsencrypt', 'letsencrypt', '\\Froxlor\\Cron\\Http\\LetsEncrypt\\AcmeSh', '5 MINUTE', '0', 'cron_letsencrypt'),
-	(6, 'froxlor/backup', 'backup', '\\Froxlor\\Cron\\System\\BackupCron', '1 DAY', '1', 'cron_backup');
+	(6, 'froxlor/backup', 'backup', '\\Froxlor\\Cron\\System\\BackupCron', '1 DAY', '0', 'cron_backup');
-
 
 
 DROP TABLE IF EXISTS `ftp_quotalimits`;
 CREATE TABLE IF NOT EXISTS `ftp_quotalimits` (
-  `name` varchar(30) default NULL,
+  `name` varchar(255) default NULL,
   `quota_type` enum('user','group','class','all') NOT NULL default 'user',
   `per_session` enum('false','true') NOT NULL default 'false',
   `limit_type` enum('soft','hard') NOT NULL default 'hard',
@@ -918,15 +928,13 @@ CREATE TABLE IF NOT EXISTS `ftp_quotalimits` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 INSERT INTO `ftp_quotalimits` (`name`, `quota_type`, `per_session`, `limit_type`, `bytes_in_avail`, `bytes_out_avail`, `bytes_xfer_avail`, `files_in_avail`, `files_out_avail`, `files_xfer_avail`) VALUES
 	('froxlor', 'user', 'false', 'hard', 0, 0, 0, 0, 0, 0);
 
 
-
 DROP TABLE IF EXISTS `ftp_quotatallies`;
 CREATE TABLE IF NOT EXISTS `ftp_quotatallies` (
-  `name` varchar(30) NOT NULL,
+  `name` varchar(255) NOT NULL,
   `quota_type` enum('user','group','class','all') NOT NULL,
   `bytes_in_used` float NOT NULL,
   `bytes_out_used` float NOT NULL,
@@ -937,7 +945,6 @@ CREATE TABLE IF NOT EXISTS `ftp_quotatallies` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 DROP TABLE IF EXISTS `redirect_codes`;
 CREATE TABLE IF NOT EXISTS `redirect_codes` (
   `id` int(5) NOT NULL auto_increment,
@@ -948,7 +955,6 @@ CREATE TABLE IF NOT EXISTS `redirect_codes` (
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-
 INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES
 	(1, '---', 'rc_default', 1),
 	(2, '301', 'rc_movedperm', 1),
@@ -957,7 +963,6 @@ INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES
 	(5, '307', 'rc_tempred', 1);
 
 
-
 DROP TABLE IF EXISTS `domain_redirect_codes`;
 CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
   `rid` int(5) NOT NULL,
@@ -977,7 +982,8 @@ CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
   `ssl_csr_file` mediumtext,
   `ssl_fullchain_file` mediumtext,
   `expirationdate` datetime DEFAULT NULL,
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY (`domainid`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
@@ -1029,3 +1035,15 @@ CREATE TABLE `api_keys` (
   KEY customerid (customerid)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
 
+
+DROP TABLE IF EXISTS `panel_usercolumns`;
+CREATE TABLE `panel_usercolumns` (
+  `adminid` int(11) NOT NULL default '0',
+  `customerid` int(11) NOT NULL default '0',
+  `section` varchar(500) NOT NULL default '',
+  `columns` text NOT NULL,
+  UNIQUE KEY `user_section` (`adminid`, `customerid`, `section`),
+  KEY adminid (adminid),
+  KEY customerid (customerid)
+) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+FROXLORSQL;

install/install.php

@@ -4,27 +4,64 @@
  * 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
+ * This program is free software; you can redistribute it and/or
- * file that was distributed with this source code. You can also view the
+ * modify it under the terms of the GNU General Public License
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
- * @copyright  (c) the authors
+ * This program is distributed in the hope that it will be useful,
- * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * GNU General Public License for more details.
- * @package    Install
  *
+ * 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 (! file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
-	// get hint-template
-	$vendor_hint = file_get_contents(dirname(__DIR__) . '/templates/Sparkle/misc/vendormissinghint.tpl');
-	// replace values
-	$vendor_hint = str_replace("<FROXLOR_INSTALL_DIR>", dirname(__DIR__), $vendor_hint);
-	$vendor_hint = str_replace("<CURRENT_YEAR>", date('Y', time()), $vendor_hint);
-	die($vendor_hint);
-}
-require dirname(__DIR__) . '/vendor/autoload.php';
-require __DIR__ . '/lib/class.FroxlorInstall.php';
 
-$frxinstall = new FroxlorInstall();
+use Froxlor\UI\Panel\UI;
-$frxinstall->run();
+use Froxlor\Install\Install;
+
+require dirname(__DIR__) . '/lib/functions.php';
+
+// define default theme for configurehint, etc.
+$_deftheme = 'Froxlor';
+
+// validate correct php version
+if (version_compare("7.4.0", PHP_VERSION, ">=")) {
+	die(view($_deftheme . '/misc/phprequirementfailed.html.twig', [
+		'{{ basehref }}' => '../',
+		'{{ froxlor_min_version }}' => '7.4.0',
+		'{{ current_version }}' => PHP_VERSION,
+		'{{ current_year }}' => date('Y', time()),
+	]));
+}
+
+// validate vendor autoloader
+if (!file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
+	die(view($_deftheme . '/misc/vendormissinghint.html.twig', [
+		'{{ basehref }}' => '../',
+		'{{ froxlor_install_dir }}' => dirname(__DIR__),
+		'{{ current_year }}' => date('Y', time()),
+	]));
+}
+
+// check installation status
+if (file_exists(dirname(__DIR__) . '/lib/userdata.inc.php')) {
+	header("Location: ../");
+	exit;
+}
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+require dirname(__DIR__) . '/lib/tables.inc.php';
+
+// init twig
+UI::initTwig(true);
+UI::sendHeaders();
+
+$installer = new Install();
+$installer->handle();

install/lib/updateFunctions.php

@@ -1,89 +0,0 @@
-<?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    Functions
- *
- */
-
-/**
- * Function showUpdateStep
- *
- * outputs and logs the current
- * update progress
- *
- * @param
- *        	string task/status
- * @param
- *        	bool needs_status (if false, a linebreak will be added)
- *        	
- * @return string formatted output and log-entry
- */
-function showUpdateStep($task = null, $needs_status = true)
-{
-	if (! $needs_status)
-		echo "<b>";
-
-	// output
-	echo $task;
-
-	if (! $needs_status) {
-		echo "</b><br />";
-	}
-
-	\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, $task);
-	\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, $task);
-}
-
-/**
- * Function lastStepStatus
- *
- * outputs [OK] (success), [??] (warning) or [!!] (failure)
- * of the last update-step
- *
- * @param
- *        	int status (0 = success, 1 = warning, 2 = failure)
- *        	
- * @return string formatted output and log-entry
- */
-function lastStepStatus($status = -1, $message = '')
-{
-	switch ($status) {
-
-		case 0:
-			$status_sign = ($message != '') ? '[' . $message . ']' : '[OK]';
-			$status_color = 'ok';
-			break;
-		case 1:
-			$status_sign = ($message != '') ? '[' . $message . ']' : '[??]';
-			$status_color = 'warn';
-			break;
-		case 2:
-			$status_sign = ($message != '') ? '[' . $message . ']' : '[!!]';
-			$status_color = 'err';
-			break;
-		default:
-			$status_sign = '[unknown]';
-			$status_color = 'unknown';
-			break;
-	}
-
-	// output
-	echo "<span class=\"update-step update-step-" . $status_color . "\">" . $status_sign . "</span><br />";
-
-	if ($status == - 1 || $status == 2) {
-		\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');
-		\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');
-	} elseif ($status == 0 || $status == 1) {
-		\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'Success');
-	}
-}

install/lng/english.lng.php

@@ -1,96 +0,0 @@
-<?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    Language
- *
- */
-$lng['requirements']['title'] = 'Checking system requirements...';
-$lng['requirements']['installed'] = 'installed';
-$lng['requirements']['not_true'] = 'no';
-$lng['requirements']['notfound'] = 'not found';
-$lng['requirements']['notinstalled'] = 'not installed';
-$lng['requirements']['activated'] = 'enabled';
-$lng['requirements']['phpversion'] = 'PHP version >= 7.0';
-$lng['requirements']['newerphpprefered'] = 'Good, but php-7.1 is prefered.';
-$lng['requirements']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...';
-$lng['requirements']['phpsession'] = 'PHP session-extension...';
-$lng['requirements']['phpctype'] = 'PHP ctype-extension...';
-$lng['requirements']['phpsimplexml'] = 'PHP SimpleXML-extension...';
-$lng['requirements']['phpxml'] = 'PHP XML-extension...';
-$lng['requirements']['phpfilter'] = 'PHP filter-extension...';
-$lng['requirements']['phpposix'] = 'PHP posix-extension...';
-$lng['requirements']['phpbcmath'] = 'PHP bcmath-extension...';
-$lng['requirements']['phpcurl'] = 'PHP curl-extension...';
-$lng['requirements']['phpmbstring'] = 'PHP mbstring-extension...';
-$lng['requirements']['phpzip'] = 'PHP zip-extension...';
-$lng['requirements']['phpjson'] = 'PHP json-extension...';
-$lng['requirements']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!';
-$lng['requirements']['zipdescription'] = 'The auto-update feature requires the zip extension.';
-$lng['requirements']['openbasedir'] = 'open_basedir...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the coresponding php.ini';
-$lng['requirements']['mysqldump'] = 'MySQL dump tool';
-$lng['requirements']['mysqldumpmissing'] = 'Automatic backup of possible existing database is not possible. Please install mysql-client tools';
-$lng['requirements']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Try to fix them and retry.';
-$lng['requirements']['froxlor_succ_checks'] = 'All requirements are satisfied';
-
-$lng['install']['lngtitle'] = 'Froxlor install - choose language';
-$lng['install']['language'] = 'Installation language';
-$lng['install']['lngbtn_go'] = 'Change language';
-$lng['install']['title'] = 'Froxlor install - setup';
-$lng['install']['welcometext'] = 'Thank you for choosing Froxlor. Please fill out the following fields with the required information to start the installation.<br /><b>Attention:</b> If the database you chose for Froxlor already exists on your System, it will be erased with all containing data!';
-$lng['install']['database'] = 'Database connection';
-$lng['install']['mysql_host'] = 'MySQL-Hostname';
-$lng['install']['mysql_database'] = 'Database name';
-$lng['install']['mysql_unpriv_user'] = 'Username for the unprivileged MySQL-account';
-$lng['install']['mysql_unpriv_pass'] = 'Password for the unprivileged MySQL-account';
-$lng['install']['mysql_root_user'] = 'Username for the MySQL-root-account';
-$lng['install']['mysql_root_pass'] = 'Password for the MySQL-root-account';
-$lng['install']['admin_account'] = 'Administrator Account';
-$lng['install']['admin_user'] = 'Administrator Username';
-$lng['install']['admin_pass1'] = 'Administrator Password';
-$lng['install']['admin_pass2'] = 'Administrator-Password (confirm)';
-$lng['install']['activate_newsfeed'] = 'Enable the official newsfeed<br><small>(https://inside.froxlor.org/news/)</small>';
-$lng['install']['serversettings'] = 'Server settings';
-$lng['install']['servername'] = 'Server name (FQDN, no ip-address)';
-$lng['install']['serverip'] = 'Server IP';
-$lng['install']['webserver'] = 'Webserver';
-$lng['install']['apache2'] = 'Apache 2.2';
-$lng['install']['apache24'] = 'Apache 2.4';
-$lng['install']['lighttpd'] = 'LigHTTPd';
-$lng['install']['nginx'] = 'NGINX';
-$lng['install']['httpuser'] = 'HTTP username';
-$lng['install']['httpgroup'] = 'HTTP groupname';
-
-$lng['install']['testing_mysql'] = 'Checking MySQL-root access...';
-$lng['install']['testing_mysql_fail'] = 'There seems to be a problem with the database-connection. Cannot continue. Please go back and check your credentials.';
-$lng['install']['backup_old_db'] = 'Creating backup of old database...';
-$lng['install']['backup_binary_missing'] = 'Could not find mysqldump';
-$lng['install']['backup_failed'] = 'Could not backup database';
-$lng['install']['prepare_db'] = 'Preparing database...';
-$lng['install']['create_mysqluser_and_db'] = 'Creating database and username...';
-$lng['install']['testing_new_db'] = 'Testing if database and user have been created correctly...';
-$lng['install']['importing_data'] = 'Importing data...';
-$lng['install']['changing_data'] = 'Adjusting settings...';
-$lng['install']['creating_entries'] = 'Inserting new values...';
-$lng['install']['adding_admin_user'] = 'Creating admin-account...';
-$lng['install']['creating_configfile'] = 'Creating configfile...';
-$lng['install']['creating_configfile_temp'] = 'File was saved in /tmp/userdata.inc.php, please move to ' . dirname(dirname(__DIR__)) . '/lib/.';
-$lng['install']['creating_configfile_failed'] = 'Could not create ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php, please create it manually with the following content:';
-$lng['install']['froxlor_succ_installed'] = 'Froxlor was installed successfully.';
-
-$lng['click_here_to_refresh'] = 'Click here to check again';
-$lng['click_here_to_goback'] = 'Click here to go back';
-$lng['click_here_to_continue'] = 'Click here to continue';
-$lng['click_here_to_login'] = 'Click here to login.';

install/lng/french.lng.php

@@ -1,86 +0,0 @@
-<?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    Language
- *
- */
-$lng['requirements']['title'] = 'Vérification des prérequis système...';
-$lng['requirements']['installed'] = 'installé';
-$lng['requirements']['not_true'] = 'non';
-$lng['requirements']['notfound'] = 'introuvable';
-$lng['requirements']['notinstalled'] = 'non installé';
-$lng['requirements']['activated'] = 'activé';
-$lng['requirements']['phpversion'] = 'PHP version >= 7.0';
-$lng['requirements']['phppdo'] = 'extension PHP PDO et pilote PDO-MySQL ...';
-$lng['requirements']['phpxml'] = 'extension PHP XML...';
-$lng['requirements']['phpfilter'] = 'extension PHP filter ...';
-$lng['requirements']['phpposix'] = 'extension PHP posix ...';
-$lng['requirements']['phpbcmath'] = 'extension PHP bcmath ...';
-$lng['requirements']['phpcurl'] = 'extension PHP curl...';
-$lng['requirements']['phpmbstring'] = 'extension PHP mbstring...';
-$lng['requirements']['bcmathdescription'] = 'Les fonctions de calcul de traffic ne fonctionneront pas correctement!';
-$lng['requirements']['openbasedir'] = 'open_basedir...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor ne fonctionnera pas correctement avec open_basedir activé. Merci de désactiver open_basedir pour Froxlor dans le php.ini correspondant';
-$lng['requirements']['diedbecauseofrequirements'] = 'Impossible d\'installer Froxlor sans ces prérequis! Essayez de les corriger et essayez à nouveau.';
-$lng['requirements']['froxlor_succ_checks'] = 'Tous les prérequis sont vérifiés';
-
-$lng['install']['lngtitle'] = 'Installation de Froxlor - choisisez la langue';
-$lng['install']['language'] = 'Langue d\'installation';
-$lng['install']['lngbtn_go'] = 'Changer la langue';
-$lng['install']['title'] = 'Installation de Froxlor - paramètrage';
-$lng['install']['welcometext'] = 'Merci d\'avoir choisi Froxlor. Merci de remplir les champs suivant avec les informations nécessaires pour démarrer l\'installation.<br /><b>Attention:</b> Si la base de données que vous choisissez existe déjà sur votre système, elle sera écrasée ainsi que les données contenues!';
-$lng['install']['database'] = 'Connexion à la base de données';
-$lng['install']['mysql_host'] = 'Nom d\'hôte MySQL';
-$lng['install']['mysql_database'] = 'Nom de la base de données';
-$lng['install']['mysql_unpriv_user'] = 'Nom d\'utilisateur pour le compte non priviligié MySQL';
-$lng['install']['mysql_unpriv_pass'] = 'Mot de passe pour le compte non priviligié MySQL';
-$lng['install']['mysql_root_user'] = 'Nom d\'utilisateur pour le compte MySQL root';
-$lng['install']['mysql_root_pass'] = 'Mot de passe pour le compte MySQL root';
-$lng['install']['admin_account'] = 'Compte administrateur';
-$lng['install']['admin_user'] = 'Nom d\'utilisateur administrateur';
-$lng['install']['admin_pass1'] = 'Mot de passe administrateur';
-$lng['install']['admin_pass2'] = 'Mot de passe administrateur (confirmez)';
-$lng['install']['serversettings'] = 'Réglages serveur';
-$lng['install']['servername'] = 'Nom du serveur (FQDN, pas d\'adresse IP)';
-$lng['install']['serverip'] = 'Adresse IP du serveur';
-$lng['install']['webserver'] = 'Serveur Web';
-$lng['install']['apache2'] = 'Apache 2';
-$lng['install']['apache24'] = 'Apache 2.4';
-$lng['install']['lighttpd'] = 'LigHTTPd';
-$lng['install']['nginx'] = 'NGINX';
-$lng['install']['httpuser'] = 'Nom d\'utilisateur HTTP';
-$lng['install']['httpgroup'] = 'Nom de groupe HTTP';
-
-$lng['install']['testing_mysql'] = 'Vérification de l\'accès root MySQL...';
-$lng['install']['testing_mysql_fail'] = 'Il semble y avoir un problème avec la connexion à la base de données. Impossible de continuer. Merci de revenir en arrière et de vérifier les informations d\'identification.';
-$lng['install']['backup_old_db'] = 'Création des sauvegardes de l\'ancienne base de données...';
-$lng['install']['backup_binary_missing'] = 'Impossible de trouver mysqldump';
-$lng['install']['backup_failed'] = 'Impossible de sauvegarde la base de données';
-$lng['install']['prepare_db'] = 'Préparation de la base de données...';
-$lng['install']['create_mysqluser_and_db'] = 'Création de la base de données et l\'utilisateur...';
-$lng['install']['testing_new_db'] = 'Teste si la base de données et l\'utilisateur ont été créés correctement...';
-$lng['install']['importing_data'] = 'Import des données...';
-$lng['install']['changing_data'] = 'Ajustement des paramètres...';
-$lng['install']['creating_entries'] = 'Insertion des nouvelles valeurs...';
-$lng['install']['adding_admin_user'] = 'Création du compte administrateur...';
-$lng['install']['creating_configfile'] = 'Création du fichier de configuration...';
-$lng['install']['creating_configfile_temp'] = 'Le fichier a été enregistré dans /tmp/userdata.inc.php, merci de le déplacer dans ' . dirname(dirname(__DIR__)) . '/lib/.';
-$lng['install']['creating_configfile_failed'] = 'Impossible de créer ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php, merci de le créer manuellement avec le contenu suivant:';
-$lng['install']['froxlor_succ_installed'] = 'Froxlor a été installé avec succès.';
-
-$lng['click_here_to_refresh'] = 'Cliquez ici pour vérifier à nouveau';
-$lng['click_here_to_goback'] = 'Cliquez ici pour revenir';
-$lng['click_here_to_continue'] = 'Cliquez ici pour continuer';
-$lng['click_here_to_login'] = 'Cliquez ici pour vous connecter.';

install/lng/german.lng.php

@@ -1,96 +0,0 @@
-<?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    Language
- *
- */
-$lng['requirements']['title'] = 'Prüfe Systemvoraussetzungen...';
-$lng['requirements']['installed'] = 'installiert';
-$lng['requirements']['not_true'] = 'nein';
-$lng['requirements']['notfound'] = 'nicht gefunden';
-$lng['requirements']['notinstalled'] = 'nicht installiert';
-$lng['requirements']['activated'] = 'ist aktiviert.';
-$lng['requirements']['phpversion'] = 'PHP Version >= 7.0';
-$lng['requirements']['newerphpprefered'] = 'Passt, aber php-7.1 wird bevorzugt.';
-$lng['requirements']['phppdo'] = 'PHP PDO Erweiterung und PDO-MySQL Treiber...';
-$lng['requirements']['phpsession'] = 'PHP session-Erweiterung...';
-$lng['requirements']['phpctype'] = 'PHP ctype-Erweiterung...';
-$lng['requirements']['phpsimplexml'] = 'PHP SimpleXML-Erweiterung...';
-$lng['requirements']['phpxml'] = 'PHP XML-Erweiterung...';
-$lng['requirements']['phpfilter'] = 'PHP filter-Erweiterung...';
-$lng['requirements']['phpposix'] = 'PHP posix-Erweiterung...';
-$lng['requirements']['phpbcmath'] = 'PHP bcmath-Erweiterung...';
-$lng['requirements']['phpcurl'] = 'PHP curl-Erweiterung...';
-$lng['requirements']['phpmbstring'] = 'PHP mbstring-Erweiterung...';
-$lng['requirements']['phpzip'] = 'PHP zip-Erweiterung...';
-$lng['requirements']['phpjson'] = 'PHP json-Erweiterung...';
-$lng['requirements']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollständig zur Verfügung!';
-$lng['requirements']['zipdescription'] = 'Die Auto-Update Funktion benötigt die zip Erweiterung.';
-$lng['requirements']['openbasedir'] = 'open_basedir genutzt wird...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor wird mit aktiviertem open_basedir nicht vollständig funktionieren. Bitte deaktivieren Sie open_basedir für Froxlor in der entsprechenden php.ini';
-$lng['requirements']['mysqldump'] = 'MySQL dump Tool';
-$lng['requirements']['mysqldumpmissing'] = 'Ein automatisches Backup einer möglicherweise schon existierenden Datenbank nicht möglich. Bitte mysql-client installieren';
-$lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Beheben Sie die angezeigten Probleme und versuchen Sie es erneut.';
-$lng['requirements']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüllt';
-
-$lng['install']['lngtitle'] = 'Froxlor Installation - Sprache auswählen';
-$lng['install']['language'] = 'Sprache für die Installation';
-$lng['install']['lngbtn_go'] = 'Sprache ändern';
-$lng['install']['title'] = 'Froxlor Installation - Einrichtung';
-$lng['install']['welcometext'] = 'Vielen Dank dass Sie sich für Froxlor entschieden haben. Um die Installation von Froxlor zu starten, füllen Sie bitte alle Felder mit den geforderten Angaben aus.<br /><b>Achtung:</b> Eine eventuell existierende Datenbank, die den selben Namen hat wie den Gewählten, wird mit allen enthaltenen Daten gelöscht!';
-$lng['install']['database'] = 'Datenbankverbindung';
-$lng['install']['mysql_host'] = 'MySQL-Hostname';
-$lng['install']['mysql_database'] = 'Datenbank Name';
-$lng['install']['mysql_unpriv_user'] = 'Benutzername für den unprivilegierten MySQL-Account';
-$lng['install']['mysql_unpriv_pass'] = 'Passwort für den unprivilegierten MySQL-Account';
-$lng['install']['mysql_root_user'] = 'Benutzername für den MySQL-Root-Account';
-$lng['install']['mysql_root_pass'] = 'Passwort für den MySQL-Root-Account';
-$lng['install']['admin_account'] = 'Admin-Zugang';
-$lng['install']['admin_user'] = 'Administrator-Benutzername';
-$lng['install']['admin_pass1'] = 'Administrator-Passwort';
-$lng['install']['admin_pass2'] = 'Administrator-Passwort (Bestätigung)';
-$lng['install']['activate_newsfeed'] = 'Aktiviere das offizielle Newsfeed<br><small>(https://inside.froxlor.org/news/)</small>';
-$lng['install']['serversettings'] = 'Servereinstellungen';
-$lng['install']['servername'] = 'Servername (FQDN, keine IP-Adresse)';
-$lng['install']['serverip'] = 'Server-IP';
-$lng['install']['webserver'] = 'Webserver';
-$lng['install']['apache2'] = 'Apache 2';
-$lng['install']['apache24'] = 'Apache 2.4';
-$lng['install']['lighttpd'] = 'LigHTTPd';
-$lng['install']['nginx'] = 'NGINX';
-$lng['install']['httpuser'] = 'HTTP Username';
-$lng['install']['httpgroup'] = 'HTTP Gruppenname';
-
-$lng['install']['testing_mysql'] = 'Teste MySQL-Root Zugang...';
-$lng['install']['testing_mysql_fail'] = 'Bei der Verwendung der Datenbank gibt es scheinbar Probleme. Installation kann nicht fortgesetzt werden. Bitte Zugangsdaten prüfen und erneut versuchen.';
-$lng['install']['backup_old_db'] = 'Sicherung vorheriger Datenbank...';
-$lng['install']['backup_binary_missing'] = 'Konnte mysqldump nicht finden';
-$lng['install']['backup_failed'] = 'Sicherung fehlgeschlagen';
-$lng['install']['prepare_db'] = 'Datenbank wird vorbereitet...';
-$lng['install']['create_mysqluser_and_db'] = 'Erstelle Datenbank und Benutzer...';
-$lng['install']['testing_new_db'] = 'Teste, ob Datenbank und Benutzer korrekt angelegt wurden...';
-$lng['install']['importing_data'] = 'Importiere Daten...';
-$lng['install']['changing_data'] = 'Einstellungen anpassen...';
-$lng['install']['creating_entries'] = 'Trage neue Werte ein...';
-$lng['install']['adding_admin_user'] = 'Erstelle Admin-Benutzer...';
-$lng['install']['creating_configfile'] = 'Erstelle Konfigurationsdatei...';
-$lng['install']['creating_configfile_temp'] = 'Datei wurde in /tmp/userdata.inc.php gespeichert, bitte nach ' . dirname(dirname(__DIR__)) . '/lib/ verschieben.';
-$lng['install']['creating_configfile_failed'] = 'Konnte ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php nicht erstellen, bitte manuell mit folgendem Inhalt anlegen:';
-$lng['install']['froxlor_succ_installed'] = 'Froxlor wurde erfolgreich installiert.';
-
-$lng['click_here_to_refresh'] = 'Hier klicken, um erneut zu prüfen';
-$lng['click_here_to_goback'] = 'Einen Schritt zurück';
-$lng['click_here_to_continue'] = 'Installation fortführen';
-$lng['click_here_to_login'] = 'Hier geht es weiter zum Login-Fenster.';

install/scripts/config-services.php

@@ -1,31 +0,0 @@
-#!/usr/bin/php
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2018 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> (2018-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *         
- */
-
-// Check if we're in the CLI
-if (@php_sapi_name() !== 'cli') {
-	die('This script will only work in the shell.');
-}
-
-require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
-
-// give control to command line handler
-try {
-	\Froxlor\Cli\ConfigServicesCmd::processParameters($argc, $argv);
-} catch (Exception $e) {
-	\Froxlor\Cli\ConfigServicesCmd::printerr($e->getMessage());
-}

install/scripts/switch-server-ip.php

@@ -1,31 +0,0 @@
-#!/usr/bin/php
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2016 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> (2016-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *         
- */
-
-// Check if we're in the CLI
-if (@php_sapi_name() !== 'cli') {
-	die('This script will only work in the shell.');
-}
-
-require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
-
-// give control to command line handler
-try {
-	\Froxlor\Cli\SwitchServerIpCmd::processParameters($argc, $argv);
-} catch (Exception $e) {
-	\Froxlor\Cli\SwitchServerIpCmd::printerr($e->getMessage());
-}

install/templates/assets/css/install.css

@@ -1,637 +0,0 @@
-@charset "UTF-8";
-/* RESET */
-html, body, div, ul, ol, li, dl, dt, dd, h1, h2, h3, h4, h5, h6, pre,
-	form, p, blockquote, fieldset, input {
-	margin: 0;
-	padding: 0;
-}
-
-h1, h2, h3, h4, h5, h6, pre, code, address, caption, cite, code, em,
-	strong, th {
-	font-size: 1em;
-	font-weight: 400;
-	font-style: normal;
-}
-
-ul, ol {
-	list-style: none;
-}
-
-fieldset, img {
-	border: none;
-}
-
-caption, th {
-	text-align: left;
-}
-
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-
-article, aside, details, figcaption, figure, footer, header, hgroup,
-	menu, nav, section {
-	display: block;
-}
-
-/* TYPE */
-html, body {
-	font: 12px/18px 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial,
-		Verdana, sans-serif;
-	background-color: #f5f5f5;
-	color: #444;
-	-webkit-font-smoothing: subpixel-antialiased;
-}
-
-body {
-	margin: 0;
-	padding: 0;
-}
-
-.dark {
-	background-color: #e9edf0;
-	border-bottom: 1px solid #d1d5d8;
-}
-
-header img {
-	padding: 10px 0 10px 10px;
-}
-
-h1 {
-	display: none;
-}
-
-h2, h3 {
-	margin: 0 0 1em 0;
-	padding: 0;
-	font-weight: bold;
-}
-
-h2 {
-	font-size: 17px;
-}
-
-h3 {
-	font-size: 15px;
-}
-
-img {
-	border: 0;
-	vertical-align: middle;
-}
-
-td a {
-	text-decoration: none;
-}
-
-.bradius {
-	border-radius: 5px 5px 5px 5px;
-	box-shadow: rgba(0, 0, 0, 0.34902) 0 1px 3px 0;
-}
-
-/* FOOTER */
-footer {
-	clear: both;
-	text-align: center;
-	color: #888;
-	font-size: 10px !important;
-	margin: 10px 0;
-}
-
-footer a, footer a:active, footer a:visited {
-	color: #888;
-}
-
-.install {
-	background-color: #fff;
-	margin: 20px auto 12px;
-	width: 800px;
-}
-
-p {
-	margin: 0 10px !important;
-}
-
-.installsec {
-	margin-top: 10px;
-	padding: 0;
-	text-align: left;
-}
-
-.installsec table {
-	width: 100%;
-	padding: 0 10px;
-	margin: 15px 0 15px 0;
-}
-
-.installsec h2 {
-	display: block;
-	border-bottom: 1px solid #d1d5d8;
-	margin: 0;
-	padding: 5px 15px 15px 15px;
-}
-
-.installsec form {
-	width: 800px;
-	margin: 0 auto;
-	padding: 10px 0 0;
-	text-align: left;
-}
-
-.installsec fieldset {
-	border: 0;
-	float: left;
-	clear: left;
-	width: 600px;
-	margin: 0 100px 10px;
-	padding: 0;
-}
-
-.installsec fieldset p, .installsec fieldset h3 {
-	clear: both;
-}
-
-.installsec legend {
-	display: none;
-}
-
-.installsec label {
-	float: left;
-	margin-right: 0;
-	margin-top: 8px;
-	text-align: left;
-}
-
-p.submit {
-	text-align: right;
-	padding-right: 46px;
-}
-
-.installsec aside {
-	border-top: 1px solid #d1d5d8;
-	clear: both;
-	float: none;
-	width: auto;
-	text-align: right;
-	padding: 10px;
-}
-
-.line {
-	border: 0;
-	width: 800px;
-	border-bottom: 1px solid #d1d5d8;
-}
-
-.messagewrapper {
-	width: 650px;
-	margin: 0 auto;
-	padding: 120px 0 0;
-	overflow: hidden;
-}
-
-.messagewrapperfull {
-	width: 100%;
-	margin: 0 auto;
-	padding: 0;
-	overflow: hidden;
-}
-
-.overviewsearch {
-	position: absolute;
-	top: 155px;
-	right: 36px;
-	font-size: 80%;
-}
-
-.overviewadd {
-	padding: 10px;
-	font-weight: 700;
-}
-
-/*
- * error message display
- */
-.errorcontainer {
-	background: url(../img/icons/error_big.png) 10px center no-repeat
-		#ffedef;
-	border: 1px solid #ffc2ca;
-	padding: 10px 10px 10px 68px !important;
-	margin: 10px 0 10px 0 !important;
-	text-align: left !important;
-	overflow: hidden;
-	box-shadow: 0 0 0 black;
-}
-
-.errortitle {
-	font-weight: 700;
-	color: #c00 !important;
-}
-
-.error {
-	font-weight: 400 !important;
-	color: #c00 !important;
-}
-
-/*
- * warning message display
- */
-.warningcontainer, .ui-dialog {
-	background: url(../img/icons/warning_big.png) 10px center no-repeat
-		#fffecc;
-	border: 1px solid #f3c37e;
-	padding: 10px 10px 10px 68px !important;
-	margin: 10px 0 10px 0 !important;
-	text-align: left !important;
-	overflow: hidden;
-	box-shadow: 0 0 0 black;
-}
-
-.ui-dialog {
-	padding: 10px !important;
-}
-
-.warningtitle, .ui-dialog-titlebar {
-	font-weight: 700;
-	color: #D57D00;
-}
-
-.warning, .ui-dialog-content {
-	color: #D57D00 !important;
-}
-
-/*
- * success message display
- */
-.successcontainer {
-	background: url(../img/icons/ok_big.png) 10px center no-repeat #E2F9E3;
-	border: 1px solid #9C9;
-	padding: 10px 10px 10px 68px !important;
-	margin: 10px 0 10px 0 !important;
-	text-align: left !important;
-	overflow: hidden;
-	box-shadow: 0 0 0 black;
-}
-
-.successtitle {
-	font-weight: 700;
-	color: #060 !important;
-}
-
-.success {
-	font-weight: 400 !important;
-}
-
-/*
- * neutral/info message display
- */
-.neutralcontainer {
-	background: url(../img/icons/info_big.png) 10px center no-repeat #d2eaf6;
-	border: 1px solid #b7d8ed;
-	padding: 10px 10px 10px 68px !important;
-	margin: 10px 0 10px 0 !important;
-	text-align: left !important;
-	overflow: hidden;
-	box-shadow: 0 0 0 black;
-}
-
-.neutraltitle {
-	font-weight: 700;
-	color: #3188c1 !important;
-}
-
-.neutral {
-	font-weight: 400 !important;
-	color: #3188c1 !important;
-}
-
-/* std hyperlink */
-a, a:active, a:visited {
-	color: #176fa1;
-	text-decoration: none;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-.infotext {
-	font-size: 11px;
-}
-
-/*
- * main container
- */
-.main {
-	margin: 105px 10px 0 240px;
-	background-color: #fff;
-	padding: 30px 30px 30px 30px;
-	min-height: 400px;
-}
-
-.noborder {
-	width: 100%;
-	border-spacing: 0;
-	border-collapse: separate;
-	border: 0;
-}
-
-.noborder td {
-	border: 0;
-}
-
-table {
-	width: 100%;
-	border-spacing: 0;
-	border: 1px solid #d1d5d8;
-	border-collapse: separate;
-	box-shadow: 0 0 0 black !important;
-}
-
-table thead th, table th {
-	border-top: 1px solid #d1d5d8;
-	border-bottom: 1px solid #d1d5d8;
-	height: 25px !important;
-	padding: 5px 0 5px 8px;
-	background-color: #e9edf0;
-	font-weight: bold;
-}
-
-table thead:first-child th, table:first-child th {
-	border-top: none !important;
-}
-
-table th {
-	border-top: 0;
-}
-
-th a:hover {
-	text-decoration: none;
-}
-
-th a img {
-	
-}
-
-th a:nth-child(odd) img {
-	position: relative;
-	top: -5px;
-	left: 4px;
-}
-
-th a:nth-child(even) img {
-	position: relative;
-	top: 3px;
-	left: -7px;
-}
-
-table thead:first-child th {
-	border-top: 0;
-}
-
-.disabled td, .disabled td a {
-	color: #cfcfcf;
-}
-
-table tbody td {
-	border-bottom: 1px dotted #ccc;
-}
-
-table tbody tr:last-child td {
-	border-bottom: 0;
-}
-
-.formtable {
-	width: 100%;
-	border-spacing: 0;
-	border: 0;
-	border-collapse: separate;
-	margin: 0 0 0;
-}
-
-.formtable tbody td {
-	border: 0;
-	border-bottom: 1px dotted #ccc;
-	min-height: 20px;
-}
-
-.formtable label {
-	float: none;
-	display: block;
-	padding: 0;
-	margin: 0;
-	width: 100%;
-	text-align: left;
-}
-
-td {
-	padding: 5px 10px;
-	min-height: 20px;
-}
-
-table tfoot td {
-	height: 25px;
-	border-top: 1px solid #d1d5d8;
-	background-color: #f2f8fa;
-}
-
-.tfootleft {
-	text-align: left;
-}
-
-.maintitle {
-	padding-top: 20px;
-}
-
-/* input elements */
-input {
-	background: #fff url(../img/text_align_left.png) no-repeat 5px 4px;
-	color: #333;
-	padding: 2px 4px 2px 24px;
-	height: 22px;
-	border: 1px solid #d9d9d9;
-	margin-bottom: 5px;
-	border-radius: 3px;
-}
-
-textarea {
-	background: #fff url(../img/text_align_left.png) no-repeat 5px 4px;
-	color: #333;
-	padding: 4px 4px 2px 24px;
-	border: 1px solid #d9d9d9;
-	margin-bottom: 5px;
-	border-radius: 3px;
-}
-
-input[type="password"] {
-	background: #fff url(../img/password.png) no-repeat 5px 4px;
-}
-
-/*
- *  BUTTONS
- */
-input[type="button"], input[type="submit"], input[type="reset"] {
-	margin: 0 5px;
-	padding: 5px 14px;
-	outline: 0;
-	border: 0;
-	background-color: #eee;
-	min-width: 80px;
-	height: 26px;
-	background-image: none;
-}
-
-.loginsec input[type="button"], .loginsec input[type="submit"],
-	.loginsec input[type="reset"] {
-	margin: 0 1px;
-}
-
-input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover
-	{
-	color: #333;
-	background-color: #dcdcdc;
-}
-
-input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active
-	{
-	-webkit-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-	-moz-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-	box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-	color: white !important;
-}
-
-input[type="submit"], input[class="yesbutton"] {
-	color: white;
-	background-color: #35aa47;
-}
-
-input[type="submit"]:hover, input[class="yesbutton"]:hover {
-	color: white;
-	background-color: #1d943b;
-}
-
-input[class="submit"]:active, input[class="yesbutton"]:active {
-	background-color: #35aa47;
-}
-
-input[class="nobutton"], input[type="reset"] {
-	color: white;
-	background-color: #d84a38;
-}
-
-input[class="nobutton"]:hover, input[type="reset"]:hover {
-	color: white;
-	background-color: #c53727;
-}
-
-input[class="nobutton"]:active, input[type="reset"]:active {
-	background-color: #dd4b39;
-}
-
-input[type="checkbox"] {
-	background: #dae7ee;
-	padding: 0;
-	margin: 0 5px 0 0;
-	vertical-align: middle;
-	height: 26px;
-}
-
-input[type="radio"] {
-	vertical-align: middle;
-	margin: 0 10px 0 10px;
-	height: 22px;
-}
-
-select {
-	background: #fff;
-	padding: 4px;
-	color: #333;
-	border: 1px solid #d9d9d9;
-	margin-bottom: 5px;
-	min-width: 100px;
-}
-
-select.dropdown {
-	padding: 2px 4px 2px 24px;
-	height: 26px;
-	border: 1px solid #d9d9d9;
-	margin-bottom: 5px;
-	border-radius: 3px;
-	background: url(../../../../templates/Sparkle/assets/img/icons/down.png)
-		no-repeat 9px;
-	-webkit-appearance: none;
-	-moz-appearance: none;
-	appearance: none;
-}
-
-.maintable {
-	width: 90%;
-}
-
-.update_progess {
-	padding: 2em;
-	text-align: left;
-}
-
-.preconfig {
-	text-align: left;
-	margin-top: 20px;
-	margin-bottom: 5px;
-	margin-right: 15px;
-	margin-left: 15px;
-}
-
-.preconfigitem {
-	padding: .15em;
-	border-bottom: 1px solid #ccc;
-}
-
-.preconfdesc {
-	display: block;
-	margin-bottom: .5em;
-	font-size: 120%;
-}
-
-.installprogress {
-	width: 100%;
-	background-color: #e4e4e4;
-	height: 5px;
-	border-bottom: 1px solid #d1d5d8;
-}
-
-.installprogress .bar {
-	background-color: #35aa47;
-	height: 5px;
-}
-
-.red {
-	color: #ff0000;
-}
-
-.green {
-	color: green;
-}
-
-.orange {
-	color: orange;
-}
-
-.blue {
-	color: blue;
-}
-
-.install-block {
-	width: 65%;
-}
-
-.install-step {
-	width: 250px;
-}
-
-.install-h3 {
-	text-align: center;
-}
-
-.install-text {
-	margin: 20px 20px 0 !important;
-}