set version to 2.0.14 for upcoming release

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

.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

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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

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

.github/workflows/build-docs.yml

@@ -0,0 +1,14 @@
+name: build-documentation
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build_docs:
+    runs-on: ubuntu-latest
+    steps:
+      - env:
+          GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_TOKEN }}
+        run: |
+          gh workflow run --repo Froxlor/Documentation build-and-deploy -f type=tags 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,17 +1,28 @@
 install/update.log
-templates/*
+install/*.json
 lib/userdata.inc.php
+lib/userdata.inc.php.bak
+lib/config.inc.php
 logs/*
+!logs/index.html
 .buildpath
 .project
 .settings/
+.test/
 *.diff
 *~
 .well-known
 .idea
 *.iml
-
+img/
+vendor/
+node_modules/
+fonts/
+templates/*
+!templates/index.html
 !templates/Froxlor/
-!templates/Sparkle/
+templates/Froxlor/assets/mix-manifest.json
+templates/Froxlor/assets/css/
+templates/Froxlor/assets/js/
+templates/Froxlor/assets/webfonts/
 !templates/misc/
-templates/Froxlor/assets/img/logo_custom.png

2fa.php

@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can also view it online at
+ * https://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  the authors
+ * @author     Froxlor team <team@froxlor.org>
+ * @license    https://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
+if (!defined('AREA')) {
+	header("Location: index.php");
+	exit();
+}
+
+use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\FroxlorTwoFactorAuth;
+use Froxlor\Settings;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\PhpHelper;
+use Froxlor\User;
+
+if (Settings::Get('2fa.enabled') != '1') {
+	Response::dynamicError('2fa.2fa_not_activated');
+}
+
+// This file is being included in admin_index and customer_index
+// and therefore does not need to require lib/init.php
+if (AREA == 'admin') {
+	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `type_2fa` = :t2fa, `data_2fa` = :d2fa WHERE adminid = :id");
+	$uid = $userinfo['adminid'];
+} elseif (AREA == 'customer') {
+	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `type_2fa` = :t2fa, `data_2fa` = :d2fa WHERE customerid = :id");
+	$uid = $userinfo['customerid'];
+}
+$success_message = "";
+
+$tfa = new FroxlorTwoFactorAuth('Froxlor ' . Settings::Get('system.hostname'));
+
+// do the delete and then just show a success-message
+if ($action == 'delete') {
+	Database::pexecute($upd_stmt, [
+		't2fa' => 0,
+		'd2fa' => "",
+		'id' => $uid
+	]);
+	Response::standardSuccess('2fa.2fa_removed');
+} elseif ($action == 'preadd') {
+	$type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0';
+
+	$data = "";
+	if ($type > 0) {
+		// generate secret for TOTP
+		$data = $tfa->createSecret();
+
+		$userinfo['type_2fa'] = $type;
+		$userinfo['data_2fa'] = $data;
+		$userinfo['2fa_unsaved'] = true;
+
+		// if type = email, send a code there for confirmation
+		if ($type == 1) {
+			$code = $tfa->getCode($data);
+			$_mailerror = false;
+			$mailerr_msg = "";
+			$replace_arr = [
+				'CODE' => $code
+			];
+			$mail_body = html_entity_decode(PhpHelper::replaceVariables(lng('mails.2fa.mailbody'), $replace_arr));
+
+			try {
+				$mail->Subject = lng('mails.2fa.subject');
+				$mail->AltBody = $mail_body;
+				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+				$mail->AddAddress($userinfo['email'], User::getCorrectUserSalutation($userinfo));
+				$mail->Send();
+			} catch (\PHPMailer\PHPMailer\Exception $e) {
+				$mailerr_msg = $e->errorMessage();
+				$_mailerror = true;
+			} catch (Exception $e) {
+				$mailerr_msg = $e->getMessage();
+				$_mailerror = true;
+			}
+
+			if ($_mailerror) {
+				Response::dynamicError($mailerr_msg);
+			}
+		}
+		UI::twig()->addGlobal('userinfo', $userinfo);
+	} else {
+		Response::dynamicError('Select one of the possible values for 2FA');
+	}
+} elseif ($action == 'add') {
+	$type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0';
+	$data = isset($_POST['data_2fa']) ? $_POST['data_2fa'] : '';
+	$code = isset($_POST['codevalidation']) ? $_POST['codevalidation'] : '';
+
+	// validate
+	$result = $tfa->verifyCode($data, $code, 3);
+
+	if ($result) {
+		if ($type == 0 || $type == 1) {
+			// no fixed secret for email validation, the validation code will be set on the fly
+			$data = "";
+		}
+		Database::pexecute($upd_stmt, [
+			't2fa' => $type,
+			'd2fa' => $data,
+			'id' => $uid
+		]);
+		Response::standardSuccess('2fa.2fa_added', $filename);
+	}
+	Response::dynamicError('Invalid/wrong code');
+}
+
+$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed 2fa::overview");
+
+$type_select_values = [];
+$ga_qrcode = '';
+if ($userinfo['type_2fa'] == '0') {
+	// available types
+	$type_select_values = [
+		0 => '-',
+		1 => 'E-Mail',
+		2 => 'Authenticator'
+	];
+	asort($type_select_values);
+} elseif ($userinfo['type_2fa'] == '1') {
+	// email 2fa enabled
+} elseif ($userinfo['type_2fa'] == '2') {
+	// authenticator 2fa enabled
+	$ga_qrcode = $tfa->getQRCodeImageAsDataUri($userinfo['loginname'], $userinfo['data_2fa']);
+}
+
+UI::view('user/2fa.html.twig', [
+	'type_select_values' => $type_select_values,
+	'ga_qrcode' => $ga_qrcode
+]);

README.md

@@ -1,3 +1,7 @@
+[![Froxlor-CI](https://github.com/Froxlor/Froxlor/actions/workflows/build-mariadb.yml/badge.svg?branch=main)](https://github.com/Froxlor/Froxlor/actions/workflows/build-mariadb.yml)
+[![Froxlor-CI](https://github.com/Froxlor/Froxlor/actions/workflows/build-mysql.yml/badge.svg?branch=main)](https://github.com/Froxlor/Froxlor/actions/workflows/build-mysql.yml)
+[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.froxlor.org)
+
 # Froxlor
 
 The server administration software for your needs.
@@ -6,69 +10,73 @@ 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 "Server > Settings" according to your needs
+6. Have fun!
-7. Choose your distribution under "Server > 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
-http://redmine.froxlor.org/projects/froxlor/wiki/Installationtarball
+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
 
-The community is located on http://forum.froxlor.org
+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:
-http://redmine.froxlor.org/projects/froxlor/wiki
+https://docs.froxlor.org/
 
 ## License
 
-May be found in COPYING
+May be found in [COPYING](COPYING)
 
 ## Downloads
 
 ### Tarball
-http://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](http://files.froxlor.org/releases/froxlor-latest.tar.gz.md5) [SHA1](http://files.froxlor.org/releases/froxlor-latest.tar.gz.sha1)
+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 / Ubuntu repository
 
-[HowTo](http://redmine.froxlor.org/projects/froxlor/wiki/Installationdebian)
+[HowTo](https://docs.froxlor.org/latest/general/installation/apt-package.html)
 
-/etc/apt/sources.list.d/froxlor.list
+#### Debian
-> deb http://debian.froxlor.org {wheezy|jessie} 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](http://redmine.froxlor.org/projects/froxlor/wiki/Installationgentoo)
+#### Ubuntu
 
-http://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'
+```
 
-## Let's Encrypt support
+## Contributing
-
-This version of Froxlor contains a test implementation of support for [Let's Encrypt](https://letsencrypt.org). This is (as Let's Encrypt is in itself)
-still a beta version and may break your system. The way it currently works is by creating a (sub-)domain with the default system - certificate,
-after which the Let's Encrypt cronjob orders the certificate for this (sub-)domain and inserts the certificates in the database. With the next run
-of the default cronjob, the certificates will be updated on the disk and the webserver reloaded.
-
-This has 2 known side-effects at the moment:
-* The basic ip/port combinations don't work with the Froxlor - integration of Let's Encrypt, since it needs a certificate for the very first creation
-* After creating a domain, it will have the default certificate for a short time (by default 5 minutes until the cronjob runs the next time)
-
-It may be possible to fix these issues, but they are not a priority at the moment
 
+[see here](.github/CONTRIBUTING.md)

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/000.version.php

@@ -1,72 +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    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'version' => array(
-			'fields' => array(
-				'panel_version' => array(
-					'settinggroup' => 'panel',
-					'varname' => 'version',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'panel_frontend' => array(
-					'settinggroup' => 'panel',
-					'varname' => 'frontend',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'system_last_tasks_run' => array(
-					'settinggroup' => 'system',
-					'varname' => 'last_tasks_run',
-					'type' => 'hidden',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'system_last_traffic_run' => array(
-					'settinggroup' => 'system',
-					'varname' => 'last_traffic_run',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'system_lastcronrun' => array(
-					'settinggroup' => 'system',
-					'varname' => 'lastcronrun',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'system_lastguid' => array(
-					'settinggroup' => 'system',
-					'varname' => 'lastguid',
-					'type' => 'hidden',
-					'default' => 9999,
-					),
-				'system_lastaccountnumber' => array(
-					'settinggroup' => 'system',
-					'varname' => 'lastaccountnumber',
-					'type' => 'hidden',
-					'default' => 0,
-					),
-				),
-			),
-		),
-	);
-
-?>

actions/admin/settings/100.panel.php

@@ -2,259 +2,343 @@
 
 /**
  * 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(
+return [
-	'groups' => array(
+	'groups' => [
-		'panel' => array(
+		'panel' => [
-			'title' => $lng['admin']['panelsettings'],
+			'title' => lng('admin.panelsettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-chalkboard-user',
-				'panel_standardlanguage' => array(
+			'fields' => [
-					'label' => array('title' => $lng['login']['language'], 'description' => $lng['serversettings']['language']['description']),
+				'panel_standardlanguage' => [
+					'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' => 'getLanguages',
+						'\\Froxlor\\Language',
-					'save_method' => 'storeSettingField',
+						'getLanguages'
-					),
+					],
-				'panel_default_theme' => array(
+					'save_method' => 'storeSettingField'
-					'label' => array('title' => $lng['panel']['theme'], 'description' => $lng['serversettings']['default_theme']),
+				],
+				'panel_default_theme' => [
+					'label' => [
+						'title' => lng('panel.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' => 'getThemes',
+						'\\Froxlor\\UI\\Panel\\UI',
-					'save_method' => 'storeSettingDefaultTheme',
+						'getThemes'
-					),
+					],
-				'panel_allow_theme_change_customer' => array(
+					'save_method' => 'storeSettingDefaultTheme'
-					'label' => $lng['serversettings']['panel_allow_theme_change_customer'],
+				],
+				'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(
-					'label' => $lng['serversettings']['panel_allow_theme_change_admin'],
-					'settinggroup' => 'panel',
-					'varname' => 'allow_theme_change_admin',
-					'type' => 'bool',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-					),
+				],
-				'panel_natsorting' => array(
+				'panel_allow_theme_change_admin' => [
-					'label' => $lng['serversettings']['natsorting'],
+					'label' => lng('serversettings.panel_allow_theme_change_admin'),
+					'settinggroup' => 'panel',
+					'varname' => 'allow_theme_change_admin',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				],
+				'panel_natsorting' => [
+					'label' => lng('serversettings.natsorting'),
 					'settinggroup' => 'panel',
 					'varname' => 'natsorting',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'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' => false,
-					'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',
+					'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'], 'Dropdown' => $lng['serversettings']['dropdown']),
+						'Manual' => lng('serversettings.manual'),
-					'save_method' => 'storeSettingField',
+						'Dropdown' => lng('serversettings.dropdown')
-					),
+					],
-				'panel_adminmail' => array(
+					'save_method' => 'storeSettingField'
-					'label' => $lng['serversettings']['adminmail'],
+				],
+				'panel_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',
+					'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',
+					'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',
-					),
+					'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',
-					),
+					'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',
+					'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',
+					'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',
+					'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',
-					),
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
-					),
+					'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',
-					),
+					'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',
-					),
+					'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",
-					),
+						'misc.documentation' => lng('admin.documentation'),
+					],
 					'save_method' => 'storeSettingField',
-					),
+					'advanced_mode' => true
-				),
+				],
-			),
+				'panel_imprint_url' => [
-		),
+					'label' => lng('serversettings.imprint_url'),
-	);
+					'settinggroup' => 'panel',
-
+					'varname' => 'imprint_url',
-?>
+					'type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				],
+				'panel_terms_url' => [
+					'label' => lng('serversettings.terms_url'),
+					'settinggroup' => 'panel',
+					'varname' => 'terms_url',
+					'type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				],
+				'panel_privacy_url' => [
+					'label' => lng('serversettings.privacy_url'),
+					'settinggroup' => 'panel',
+					'varname' => 'privacy_url',
+					'type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				],
+				'panel_logo_overridetheme' => [
+					'label' => lng('serversettings.logo_overridetheme'),
+					'settinggroup' => 'panel',
+					'varname' => 'logo_overridetheme',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				],
+				'panel_logo_overridecustom' => [
+					'label' => lng('serversettings.logo_overridecustom'),
+					'settinggroup' => 'panel',
+					'varname' => 'logo_overridecustom',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				],
+				'panel_logo_image_header' => [
+					'label' => lng('serversettings.logo_image_header'),
+					'settinggroup' => 'panel',
+					'varname' => 'logo_image_header',
+					'type' => 'image',
+					'accept' => 'image/jpeg, image/jpg, image/png, image/gif',
+					'image_name' => 'logo_header',
+					'default' => '',
+					'save_method' => 'storeSettingImage'
+				],
+				'panel_logo_image_login' => [
+					'label' => lng('serversettings.logo_image_login'),
+					'settinggroup' => 'panel',
+					'varname' => 'logo_image_login',
+					'type' => 'image',
+					'accept' => 'image/jpeg, image/jpg, image/png, image/gif',
+					'image_name' => 'logo_login',
+					'default' => '',
+					'save_method' => 'storeSettingImage'
+				]
+			]
+		]
+	]
+];

actions/admin/settings/110.accounts.php

@@ -2,200 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'accounts' => array(
+		'accounts' => [
-			'title' => $lng['admin']['accountsettings'],
+			'title' => lng('admin.accountsettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-users-gear',
-				'session_sessiontimeout' => array(
+			'fields' => [
-					'label' => $lng['serversettings']['session_timeout'],
+				'session_sessiontimeout' => [
+					'label' => lng('serversettings.session_timeout'),
 					'settinggroup' => 'session',
 					'varname' => 'sessiontimeout',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 60,
 					'default' => 600,
-					'save_method' => 'storeSettingField',
+					'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',
+					'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',
+					'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',
+					'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',
+					'save_method' => 'storeSettingField'
-					),
+				],
-				'panel_password_min_length' => array(
+				'2fa_enabled' => [
-					'label' => $lng['serversettings']['panel_password_min_length'],
+					'label' => lng('2fa.2fa_enabled'),
+					'settinggroup' => '2fa',
+					'varname' => 'enabled',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				],
+				'panel_password_min_length' => [
+					'label' => lng('serversettings.panel_password_min_length'),
 					'settinggroup' => 'panel',
 					'varname' => 'password_min_length',
-					'type' => 'int',
+					'type' => 'number',
+					'min' => 0,
 					'default' => 0,
-					'save_method' => 'storeSettingField',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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' => '',
-					/* 'plausibility_check_method' => 'checkValidRegEx', */
 					'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' => 'checkUsername',
+					'plausibility_check_method' => [
-					'save_method' => 'storeSettingField',
+						'\\Froxlor\\Validate\\Check',
-					),
+						'checkUsername'
-				'customer_mysqlprefix' => array(
+					],
-					'label' => $lng['serversettings']['mysqlprefix'],
+					'save_method' => 'storeSettingField'
+				],
+				'customer_mysqlprefix' => [
+					'label' => lng('serversettings.mysqlprefix'),
 					'settinggroup' => 'customer',
 					'varname' => 'mysqlprefix',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
-					'plausibility_check_method' => 'checkUsername',
+					'plausibility_check_method' => [
-					'save_method' => 'storeSettingField',
+						'\\Froxlor\\Validate\\Check',
-					),
+						'checkUsername'
-				'customer_ftpprefix' => array(
+					],
-					'label' => $lng['serversettings']['ftpprefix'],
+					'save_method' => 'storeSettingField'
+				],
+				'customer_ftpprefix' => [
+					'label' => lng('serversettings.ftpprefix'),
 					'settinggroup' => 'customer',
 					'varname' => 'ftpprefix',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
-					'save_method' => 'storeSettingField',
+					'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',
+					'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',
+							'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',
+							'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,216 +2,333 @@
 
 /**
  * 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(
+return [
-	'groups' => array(
+	'groups' => [
-		'system' => array(
+		'system' => [
-			'title' => $lng['admin']['systemsettings'],
+			'title' => lng('admin.systemsettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-gears',
-				'system_documentroot_prefix' => array(
+			'fields' => [
-					'label' => $lng['serversettings']['documentroot_prefix'],
+				'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' => 'checkPathConflicts'
+					'plausibility_check_method' => [
-					),
+						'\\Froxlor\\Validate\\Check',
-				'system_documentroot_use_default_value' => array(
+						'checkPathConflicts'
-					'label' => $lng['serversettings']['documentroot_use_default_value'],
+					],
+					'requires_reconf' => ['http']
+				],
+				'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',
+					'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' => 'getIpAddresses',
+						'\\Froxlor\\Domain\\IpAddr',
+						'getIpAddresses'
+					],
 					'default' => '',
-					'save_method' => 'storeSettingIpAddress',
+					'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' => 'getIpPortCombinations',
+					'option_options_method' => [
+						'\\Froxlor\\Domain\\IpAddr',
+						'getIpPortCombinations'
+					],
 					'default' => '',
-					'save_method' => 'storeSettingDefaultIp',
+					'save_method' => 'storeSettingDefaultIp'
-					),
+				],
-				'system_hostname' => array(
+				'system_defaultsslip' => [
-					'label' => $lng['serversettings']['hostname'],
+					'label' => lng('serversettings.defaultsslip'),
+					'settinggroup' => 'system',
+					'varname' => 'defaultsslip',
+					'type' => 'select',
+					'select_mode' => 'multiple',
+					'option_options_method' => [
+						'\\Froxlor\\Domain\\IpAddr',
+						'getSslIpPortCombinations'
+					],
+					'default' => '',
+					'save_method' => 'storeSettingDefaultSslIp'
+				],
+				'system_hostname' => [
+					'label' => lng('serversettings.hostname'),
 					'settinggroup' => 'system',
 					'varname' => 'hostname',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
-					'plausibility_check_method' => 'checkHostname',
+					'plausibility_check_method' => [
-					),
+						'\\Froxlor\\Validate\\Check',
-				'system_validatedomain' => array(
+						'checkHostname'
-					'label' => $lng['serversettings']['validate_domain'],
+					]
+				],
+				'api_enabled' => [
+					'label' => lng('serversettings.enable_api'),
+					'settinggroup' => 'api',
+					'varname' => 'enabled',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				],
+				'api_customer_default' => [
+					'label' => lng('serversettings.api_customer_default'),
+					'settinggroup' => 'api',
+					'varname' => 'customer_default',
+					'type' => 'select',
+					'default' => 1,
+					'select_var' => [
+						1 => lng('panel.yes'),
+						0 => lng('panel.no')
+					],
+					'save_method' => 'storeSettingField'
+				],
+				'system_update_channel' => [
+					'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_validate_domain' => [
+					'label' => lng('serversettings.validate_domain'),
 					'settinggroup' => 'system',
 					'varname' => 'validate_domain',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => true,
-					'save_method' => 'storeSettingField',
+					'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',
+					'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' => 'checkMysqlAccessHost',
+					'plausibility_check_method' => [
-					'save_method' => 'storeSettingMysqlAccessHost',
+						'\\Froxlor\\Validate\\Check',
-					),
+						'checkMysqlAccessHost'
-				'system_index_file_extension' => array(
+					],
-					'label' => $lng['serversettings']['index_file_extension'],
+					'save_method' => 'storeSettingMysqlAccessHost'
+				],
+				'system_nssextrausers' => [
+					'label' => lng('serversettings.nssextrausers'),
+					'settinggroup' => 'system',
+					'varname' => 'nssextrausers',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				],
+				'system_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',
-					),
+					'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',
+					'save_method' => 'storeSettingField'
-					),
+				],
-				'system_httpuser' => array(
+				'system_httpuser' => [
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
 					'type' => 'hidden',
-					'default' => 'www-data',
+					'default' => 'www-data'
-					),
+				],
-				'system_httpgroup' => array(
+				'system_httpgroup' => [
 					'settinggroup' => 'system',
 					'varname' => 'httpgroup',
 					'type' => 'hidden',
-					'default' => 'www-data',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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',
+					'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
+				],
+				'system_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,162 +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    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'],
+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' => [
+					'label' => lng('serversettings.froxloraliases'),
+					'settinggroup' => 'system',
+					'varname' => 'froxloraliases',
+					'type' => 'text',
+					'string_regexp' => '/^(([a-z0-9\-\._]+, ?)*[a-z0-9\-\._]+)?$/i',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingClearCertificates',
+					'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' => Settings::Get('system.leenabled')
+					'visible' => Settings::Get('system.leenabled') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_le_froxlor_redirect' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['serversettings']['le_froxlor_redirect'],
+					], true),
+					'requires_reconf' => ['http']
+				],
+				'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' => Settings::Get('system.leenabled')
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					], true)
+				],
+				'system_hsts_maxage' => [
+					'label' => lng('admin.domain_hsts_maxage'),
+					'settinggroup' => 'system',
+					'varname' => 'hsts_maxage',
+					'type' => 'number',
+					'min' => 0,
+					'max' => 94608000, // 3-years
+					'default' => 10368000,
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.use_ssl') && call_user_func([
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					], true),
+					'advanced_mode' => true
+				],
+				'system_hsts_incsub' => [
+					'label' => lng('admin.domain_hsts_incsub'),
+					'settinggroup' => 'system',
+					'varname' => 'hsts_incsub',
+					'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_hsts_preload' => [
+					'label' => lng('admin.domain_hsts_preload'),
+					'settinggroup' => 'system',
+					'varname' => 'hsts_preload',
+					'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_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_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' => Settings::Get('system.mod_fcgid')
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_mod_fcgid_httpuser' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['admin']['mod_fcgid_user'],
+					]),
+					'requires_reconf' => ['system:fcgid']
+				],
+				'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' => Settings::Get('system.mod_fcgid')
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_mod_fcgid_httpgroup' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['admin']['mod_fcgid_group'],
+					]),
+					'requires_reconf' => ['system:fcgid']
+				],
+				'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' => Settings::Get('system.mod_fcgid')
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_mod_fcgid_defaultini_ownvhost' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+					]),
+					'requires_reconf' => ['system:fcgid']
+				],
+				'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' => 'getPhpConfigs',
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'
+					],
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					),
+					],
-					'visible' => Settings::Get('system.mod_fcgid')
+					'visible' => Settings::Get('system.mod_fcgid') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					])
+				],
 				/**
 				 * php-fpm
 				 */
-				'system_phpfpm_enabled_ownvhost' => array(
+				'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' => Settings::Get('phpfpm.enabled')
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_phpfpm_httpuser' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['phpfpm']['vhost_httpuser'],
+					]),
+					'requires_reconf' => ['system:php-fpm']
+				],
+				'phpfpm_vhost_httpuser' => [
+					'label' => lng('phpfpm.vhost_httpuser'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'vhost_httpuser',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingWebserverFcgidFpmUser',
-					'visible' => Settings::Get('phpfpm.enabled')
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_phpfpm_httpgroup' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['phpfpm']['vhost_httpgroup'],
+					]),
+					'requires_reconf' => ['system:php-fpm']
+				],
+				'phpfpm_vhost_httpgroup' => [
+					'label' => lng('phpfpm.vhost_httpgroup'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'vhost_httpgroup',
-					'type' => 'string',
+					'type' => 'text',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField',
-					'visible' => Settings::Get('phpfpm.enabled')
+					'visible' => Settings::Get('phpfpm.enabled') && call_user_func([
-				),
+						'\Froxlor\Settings\FroxlorVhostSettings',
-				'system_phpfpm_defaultini_ownvhost' => array(
+						'hasVhostContainerEnabled'
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+					]),
+					'requires_reconf' => ['system:php-fpm']
+				],
+				'phpfpm_vhost_defaultini' => [
+					'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' => 'getPhpConfigs',
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'
+					],
 					'save_method' => 'storeSettingField',
-					'visible' => Settings::Get('phpfpm.enabled')
+					'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' => Settings::Get('system.bind_enable')
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];

actions/admin/settings/125.cronjob.php

@@ -2,66 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'crond' => array(
+		'crond' => [
-			'title' => $lng['admin']['cronsettings'],
+			'title' => lng('admin.cronsettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-clock-rotate-left',
-				'system_cronconfig' => array(
+			'advanced_mode' => true,
-					'label' => $lng['serversettings']['system_cronconfig'],
+			'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',
+					'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',
+					'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',
+					'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',
+					'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,277 +2,423 @@
 
 /**
  * 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;
-		'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' => 'checkPhpInterfaceSetting',
+					'plausibility_check_method' => [
-					'overview_option' => true
+						'\\Froxlor\\Validate\\Check',
-				),
+						'checkPhpInterfaceSetting'
-				'system_apache_24' => array(
+					],
-					'label' => $lng['serversettings']['apache_24'],
+					'requires_reconf' => ['http']
+				],
+				'system_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_apacheitksupport' => [
-					'label' => $lng['serversettings']['apache_itksupport'],
+					'label' => lng('serversettings.apache_itksupport'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheitksupport',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
-					'websrv_avail' => array(
+					'websrv_avail' => [
 						'apache2'
-					)
+					],
-				),
+					'advanced_mode' => true
-				'system_httpuser' => array(
+				],
-					'label' => $lng['admin']['webserver_user'],
+				'system_http2_support' => [
+					'label' => lng('serversettings.http2_support'),
+					'settinggroup' => 'system',
+					'varname' => 'http2_support',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
+						'apache2',
+						'nginx'
+					],
+					'visible' => Settings::Get('system.use_ssl')
+				],
+				'system_dhparams_file' => [
+					'label' => lng('serversettings.dhparams_file'),
+					'settinggroup' => 'system',
+					'varname' => 'dhparams_file',
+					'type' => 'text',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'visible' => Settings::Get('system.use_ssl'),
+					'advanced_mode' => true
+				],
+				'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_customersslpath' => array(
+				],
-					'label' => $lng['serversettings']['customerssl_directory'],
+				'system_logfiles_script' => [
+					'label' => lng('serversettings.logfiles_script'),
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_script',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
+						'apache2'
+					],
+					'advanced_mode' => true
+				],
+				'system_logfiles_piped' => [
+					'label' => lng('serversettings.logfiles_piped'),
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_piped',
+					'type' => 'checkbox',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
+						'apache2'
+					],
+					'advanced_mode' => true
+				],
+				'system_logfiles_format' => [
+					'label' => lng('serversettings.logfiles_format'),
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_format',
+					'type' => 'text',
+					'default' => '',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
+						'apache2',
+						'nginx'
+					],
+					'visible' => Settings::Get('system.traffictool') != 'webalizer',
+					'advanced_mode' => true
+				],
+				'system_logfiles_type' => [
+					'label' => lng('serversettings.logfiles_type'),
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_type',
+					'type' => 'select',
+					'default' => '1',
+					'select_var' => [
+						'1' => 'combined',
+						'2' => 'vhost_combined'
+					],
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
+						'apache2'
+					]
+				],
+				'system_errorlog_level' => [
+					'label' => lng('serversettings.errorlog_level'),
+					'settinggroup' => 'system',
+					'varname' => 'errorlog_level',
+					'type' => 'select',
+					'default' => (Settings::Get('system.webserver') == 'nginx' ? 'error' : 'warn'),
+					'select_var' => [
+						'emerg' => 'emerg',
+						'alert' => 'alert',
+						'crit' => 'crit',
+						'error' => 'error',
+						'warn' => 'warn',
+						'notice' => 'notice',
+						'info' => 'info',
+						'debug' => 'debug'
+					],
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => [
+						'apache2',
+						'nginx'
+					]
+				],
+				'system_customer_ssl_path' => [
+					'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_apacheglobaldiropt' => [
+					'label' => lng('serversettings.apache_globaldiropt'),
 					'settinggroup' => 'system',
 					'varname' => 'apacheglobaldiropt',
-					'type' => 'text',
+					'type' => 'textarea',
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					'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' => 'getRedirectCodes',
 					'save_method' => 'storeSettingField'
-				)
+				]
-			)
+			]
-		)
+		]
-	)
+	]
-);
+];

actions/admin/settings/131.ssl.php

@@ -2,185 +2,257 @@
 
 /**
  * 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\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_use_ssl' => [
+					'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_cipher_list' => array(
+				],
-					'label' => $lng['serversettings']['ssl']['ssl_cipher_list'],
+				'system_ssl_protocols' => [
+					'label' => lng('serversettings.ssl.ssl_protocols'),
+					'settinggroup' => 'system',
+					'varname' => 'ssl_protocols',
+					'type' => 'select',
+					'default' => 'TLSv1.2',
+					'select_mode' => 'multiple',
+					'select_var' => [
+						'TLSv1' => 'TLSv1',
+						'TLSv1.1' => 'TLSv1.1',
+						'TLSv1.2' => 'TLSv1.2',
+						'TLSv1.3' => 'TLSv1.3'
+					],
+					'save_method' => 'storeSettingField'
+				],
+				'system_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_ssl_cert_file' => array(
+				],
-					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
+				'system_tlsv13_cipher_list' => [
+					'label' => lng('serversettings.ssl.tlsv13_cipher_list'),
+					'settinggroup' => 'system',
+					'varname' => 'tlsv13_cipher_list',
+					'type' => 'text',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'visible' => Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'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_leenabled' => array(
+				'system_apache24_ocsp_cache_path' => [
-					'label' => $lng['serversettings']['leenabled'],
+					'label' => lng('serversettings.ssl.apache24_ocsp_cache_path'),
+					'settinggroup' => 'system',
+					'varname' => 'apache24_ocsp_cache_path',
+					'type' => 'text',
+					'string_emptyallowed' => false,
+					'default' => 'shmcb:/var/run/apache2/ocsp-stapling.cache(131072)',
+					'visible' => Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'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',
-				),
+					'requires_reconf' => ['http']
-				'system_letsencryptca' => array(
+				],
-					'label' => $lng['serversettings']['letsencryptca'],
+				'system_letsencryptca' => [
+					'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.api.letsencrypt.org (Test)',
+						'letsencrypt' => 'Let\'s Encrypt (Live)',
-						'production' => 'https://acme-v01.api.letsencrypt.org (Live)'
+						'buypass_test' => 'Buypass (Test / Staging)',
-					),
+						'buypass' => 'Buypass (Live)',
+						'zerossl' => 'ZeroSSL (Live)',
+						'google' => 'Google (Live)',
+						'google_test' => 'Google (Test / Staging)',
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_letsencryptcountrycode' => array(
+				'system_letsencryptchallengepath' => [
-					'label' => $lng['serversettings']['letsencryptcountrycode'],
+					'label' => lng('serversettings.letsencryptchallengepath'),
-					'settinggroup' => 'system',
-					'varname' => 'letsencryptcountrycode',
-					'type' => 'string',
-					'string_emptyallowed' => false,
-					'default' => 'DE',
-					'save_method' => 'storeSettingField'
-				),
-				'system_letsencryptstate' => array(
-					'label' => $lng['serversettings']['letsencryptstate'],
-					'settinggroup' => 'system',
-					'varname' => 'letsencryptstate',
-					'type' => 'string',
-					'string_emptyallowed' => false,
-					'default' => 'Hessen',
-					'save_method' => 'storeSettingField'
-				),
-				'system_letsencryptchallengepath' => array(
-					'label' => $lng['serversettings']['letsencryptchallengepath'],
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptchallengepath',
-					'type' => 'string',
+					'type' => 'text',
 					'string_emptyallowed' => false,
-					'default' => FROXLOR_INSTALL_DIR,
+					'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' => 'int',
+					'type' => 'select',
-					'int_min' => 2048,
+					'default' => '2048',
-					'default' => 4096,
+					'select_var' => [
+						'2048' => '2048',
+						'3072' => '3072',
+						'4096' => '4096',
+						'8192' => '8192'
+					],
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_letsencryptreuseold' => array(
+				'system_leecc' => [
-					'label' => $lng['serversettings']['letsencryptreuseold'],
+					'label' => lng('serversettings.letsencryptecc'),
+					'settinggroup' => 'system',
+					'varname' => 'leecc',
+					'type' => 'select',
+					'default' => '0',
+					'select_var' => [
+						'0' => '-',
+						'256' => 'ec-256',
+						'384' => 'ec-384'
+					],
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'system_letsencryptreuseold' => [
+					'label' => lng('serversettings.letsencryptreuseold'),
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptreuseold',
-					'type' => 'bool',
+					'type' => 'checkbox',
-					'default' => false,
+					'default' => true,
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
-				),
+					'advanced_mode' => true
-				'system_hsts_maxage' => array(
+				],
-					'label' => $lng['admin']['domain_hsts_maxage'],
+				'system_le_domain_dnscheck' => [
+					'label' => lng('serversettings.le_domain_dnscheck'),
 					'settinggroup' => 'system',
-					'varname' => 'hsts_maxage',
+					'varname' => 'le_domain_dnscheck',
-					'type' => 'int',
+					'type' => 'checkbox',
-					'int_min' => 0,
+					'default' => true,
-					'int_max' => 94608000, // 3-years
-					'default' => 0,
 					'save_method' => 'storeSettingField'
-				),
+				],
-				'system_hsts_incsub' => array(
+				'system_le_domain_dnscheck_resolver' => [
-					'label' => $lng['admin']['domain_hsts_incsub'],
+					'label' => lng('serversettings.le_domain_dnscheck_resolver'),
 					'settinggroup' => 'system',
-					'varname' => 'hsts_incsub',
+					'varname' => 'le_domain_dnscheck_resolver',
-					'type' => 'bool',
+					'type' => 'text',
-					'default' => false,
+					'string_regexp' => '/^(([0-9]+ [a-z0-9\-\._]+, ?)*[0-9]+ [a-z0-9\-\._]+)?$/i',
+					'string_emptyallowed' => true,
+					'default' => '',
 					'save_method' => 'storeSettingField'
-				),
+				]
-				'system_hsts_preload' => array(
+			]
-					'label' => $lng['admin']['domain_hsts_preload'],
+		]
-					'settinggroup' => 'system',
+	]
-					'varname' => 'hsts_preload',
+];
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-				),
-			)
-		)
-	)
-);

actions/admin/settings/135.fcgid.php

@@ -4,110 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'fcgid' => array(
+		'fcgid' => [
-			'title' => $lng['admin']['fcgid_settings'],
+			'title' => lng('admin.fcgid_settings'),
-			'websrv_avail' => array('apache2', 'lighttpd'),
+			'icon' => 'fa-brands fa-php',
-			'fields' => array(
+			'websrv_avail' => [
-				'system_mod_fcgid_enabled' => array(
+				'apache2',
-					'label' => $lng['serversettings']['mod_fcgid'],
+				'lighttpd'
+			],
+			'fields' => [
+				'system_mod_fcgid' => [
+					'label' => lng('serversettings.mod_fcgid'),
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkFcgidPhpFpm',
+					'plausibility_check_method' => [
-					'overview_option' => true
+						'\\Froxlor\\Validate\\Check',
-					),
+						'checkFcgidPhpFpm'
-				'system_mod_fcgid_configdir' => array(
+					],
-					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
+					'overview_option' => true,
+					'requires_reconf' => ['http', 'system:fcgid']
+				],
+				'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' => 'checkPathConflicts',
+					'plausibility_check_method' => [
+						'\\Froxlor\\Validate\\Check',
+						'checkPathConflicts'
+					],
 					'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',
-					),
+					'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',
-					),
+					'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(0 => 'ScriptAlias', 1=> 'FcgidWrapper'),
+					'select_var' => [
+						0 => 'ScriptAlias',
+						1 => 'FcgidWrapper'
+					],
 					'default' => 1,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
+					'websrv_avail' => [
-					),
+						'apache2'
-				'system_mod_fcgid_starter' => array(
+					],
-					'label' => $lng['serversettings']['mod_fcgid']['starter'],
+					'advanced_mode' => true
+				],
+				'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',
-					),
+					'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',
-					),
+					'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' => 'getPhpConfigs',
+						'\\Froxlor\\Http\\PhpConfig',
-					'save_method' => 'storeSettingField',
+						'getPhpConfigs'
-					),
+					],
-				'system_mod_fcgid_idle_timeout' => array(
+					'save_method' => 'storeSettingField'
-					'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'],
+				],
+				'system_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,163 +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    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(
+use Froxlor\Settings;
-	'groups' => array(
+
-		'phpfpm' => array(
+return [
-			'title' => $lng['admin']['phpfpm_settings'],
+	'groups' => [
-			'fields' => array(
+		'phpfpm' => [
-				'system_phpfpm_enabled' => array(
+			'title' => lng('admin.phpfpm_settings'),
-					'label' => $lng['serversettings']['phpfpm'],
+			'icon' => 'fa-brands fa-php',
+			'fields' => [
+				'phpfpm_enabled' => [
+					'label' => lng('serversettings.phpfpm'),
 					'settinggroup' => 'phpfpm',
 					'varname' => 'enabled',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkFcgidPhpFpm',
+					'plausibility_check_method' => [
-					'overview_option' => true
+						'\\Froxlor\\Validate\\Check',
-					),
+						'checkFcgidPhpFpm'
-				'system_phpfpm_defaultini' => array(
+					],
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
+					'overview_option' => true,
+					'requires_reconf' => ['http', 'system:php-fpm']
+				],
+				'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' => 'getPhpConfigs',
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'
+					],
 					'save_method' => 'storeSettingField'
-					),
+				],
-				'system_phpfpm_configdir' => array(
+				'phpfpm_aliasconfigdir' => [
-					'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
+					'label' => lng('serversettings.phpfpm_settings.aliasconfigdir'),
-					'settinggroup' => 'phpfpm',
-					'varname' => 'configdir',
-					'type' => 'string',
-					'string_type' => 'confdir',
-					'default' => '/etc/php-fpm.d/',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_aliasconfigdir' => array(
-					'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'],
+				'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(
+				'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_fastcgi_ipcdir' => array(
+				],
-					'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'],
+				'phpfpm_envpath' => [
+					'label' => lng('serversettings.phpfpm_settings.envpath'),
+					'settinggroup' => 'phpfpm',
+					'varname' => 'envpath',
+					'type' => 'text',
+					'string_type' => 'dir',
+					'string_delimiter' => ':',
+					'string_emptyallowed' => true,
+					'default' => '/usr/local/bin:/usr/bin:/bin',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'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_reload' => array(
+				],
-					'label' => $lng['serversettings']['phpfpm_settings']['reload'],
+				'phpfpm_use_mod_proxy' => [
-					'settinggroup' => 'phpfpm',
+					'label' => lng('phpfpm.use_mod_proxy'),
-					'varname' => 'reload',
-					'type' => 'string',
-					'default' => '/etc/init.d/php-fpm restart',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_pm' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['pm'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'pm',
-					'type' => 'option',
-					'default' => 'static',
-					'option_mode' => 'one',
-					'option_options' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand'),
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_max_children' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['max_children'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'max_children',
-					'type' => 'int',
-					'default' => 1,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_start_servers' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['start_servers'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'start_servers',
-					'type' => 'int',
-					'default' => 20,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_min_spare_servers' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'min_spare_servers',
-					'type' => 'int',
-					'default' => 5,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_max_spare_servers' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'max_spare_servers',
-					'type' => 'int',
-					'default' => 35,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_max_requests' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['max_requests'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'max_requests',
-					'type' => 'int',
-					'default' => 0,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_idle_timeout' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'idle_timeout',
-					'type' => 'int',
-					'default' => 30,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_use_mod_proxy' => array(
-					'label' => $lng['phpfpm']['use_mod_proxy'],
 					'settinggroup' => 'phpfpm',
 					'varname' => 'use_mod_proxy',
-					'type' => 'bool',
+					'type' => 'checkbox',
-					'default' => false,
+					'default' => true,
 					'visible' => Settings::Get('system.apache24'),
 					'save_method' => 'storeSettingField'
-					),
+				],
-				),
+				'phpfpm_ini_flags' => [
-			),
+					'label' => lng('phpfpm.ini_flags'),
-		),
+					'settinggroup' => 'phpfpm',
-	);
+					'varname' => 'ini_flags',
+					'type' => 'textarea',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'phpfpm_ini_values' => [
+					'label' => lng('phpfpm.ini_values'),
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_values',
+					'type' => 'textarea',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'phpfpm_ini_admin_flags' => [
+					'label' => lng('phpfpm.ini_admin_flags'),
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_admin_flags',
+					'type' => 'textarea',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'phpfpm_ini_admin_values' => [
+					'label' => lng('phpfpm.ini_admin_values'),
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_admin_values',
+					'type' => 'textarea',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				]
+			]
+		]
+	]
+];

actions/admin/settings/137.perl.php

@@ -4,62 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'perl' => array(
+		'perl' => [
-			'title' => $lng['admin']['perl_settings'],
+			'title' => lng('admin.perl_settings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-code',
-				'perl_path' => array(
+			'fields' => [
-					'label' => $lng['serversettings']['perl_path'],
+				'system_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('lighttpd')
+					'websrv_avail' => [
-					),	
+						'lighttpd'
-				'system_perl_suexecworkaround' => array(
+					]
-					'label' => $lng['serversettings']['perl']['suexecworkaround'],
+				],
+				'perl_suexecworkaround' => [
+					'label' => lng('serversettings.perl.suexecworkaround'),
 					'settinggroup' => 'perl',
 					'varname' => 'suexecworkaround',
-					'type' => 'bool',
+					'type' => 'checkbox',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
+					'websrv_avail' => [
-					),
+						'apache2'
-				'system_perl_suexeccgipath' => array(
+					]
-					'label' => $lng['serversettings']['perl']['suexeccgipath'],
+				],
+				'perl_suexecpath' => [
+					'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('apache2')
+					'websrv_avail' => [
-					),
+						'apache2'
-				'perl_server' => array(
+					]
-					'label' => $lng['serversettings']['perl_server'],
+				],
+				'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('nginx')
+					'websrv_avail' => [
-					),
+						'nginx'
-				),
+					]
-			),
+				]
-		),
+			]
-	);
+		]
-
+	]
-?>
+];

actions/admin/settings/140.statistics.php

@@ -2,83 +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(
+use Froxlor\Settings;
-	'groups' => array(
+
-		'statistics' => array(
+return [
-			'title' => $lng['admin']['statisticsettings'],
+	'groups' => [
-			'fields' => array(
+		'statistics' => [
-				'system_webalizer_quiet' => array(
+			'title' => lng('admin.statisticsettings'),
-					'label' => $lng['serversettings']['webalizer_quiet'],
+			'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'], 1 => $lng['admin']['webalizer']['quiet'], 2 => $lng['admin']['webalizer']['veryquiet']),
+						0 => lng('admin.webalizer.normal'),
+						1 => lng('admin.webalizer.quiet'),
+						2 => lng('admin.webalizer.veryquiet')
+					],
 					'save_method' => 'storeSettingField',
-					),
+					'visible' => Settings::Get('system.traffictool') == 'webalizer'
-				'system_awstats_enabled' => array(
+				],
-					'label' => $lng['serversettings']['awstats_enabled'],
+				'system_awstats_path' => [
-					'settinggroup' => 'system',
+					'label' => lng('serversettings.awstats_path'),
-					'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',
-					),
+					'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',
-					),
+					'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',
-					),
+					'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',
-					)
+					'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,148 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'mail' => array(
+		'mail' => [
-			'title' => $lng['admin']['mailserversettings'],
+			'title' => lng('admin.mailserversettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-envelope',
-				'system_vmail_uid' => array(
+			'fields' => [
-					'label' => $lng['serversettings']['vmail_uid'],
+				'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',
-					),
+					'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',
-					),
+					'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',
-					),
+					'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',
-					),
+					'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',
+					'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',
+					'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',
+					'save_method' => 'storeSettingField'
-					),
+				],
-				'system_catchall_enabled' => array(
+				'catchall_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',
+					'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',
-					),
+					'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('courier' => 'Courier', 'dovecot' => 'Dovecot'),
+					'select_var' => [
+						'courier' => 'Courier',
+						'dovecot' => 'Dovecot'
+					],
 					'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',
-					),
+					'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('exim4' => 'Exim4', 'postfix' => 'Postfix'),
+					'select_var' => [
+						'exim4' => 'Exim4',
+						'postfix' => 'Postfix'
+					],
 					'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',
-					),
+					'advanced_mode' => true
-				),
+				]
-			),
+			]
-		),
+		]
-	);
+	]
-
+];
-?>

actions/admin/settings/155.ftpserver.php

@@ -2,39 +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(
+return [
-	'groups' => array(
+	'groups' => [
-	'ftpserver' => array(
+		'ftpserver' => [
-			'title' => $lng['admin']['ftpserversettings'],
+			'title' => lng('admin.ftpserversettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-arrow-right-arrow-left',
-				'ftpserver' => array(
+			'fields' => [
-					'label' => $lng['admin']['ftpserver'],
+				'system_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'),
+						'proftpd' => 'Proftpd',
-					'save_method' => 'storeSettingField',
+						'pureftpd' => 'Pureftpd'
-				),
+					],
-			),
+					'save_method' => 'storeSettingField'
-		),
+				]
-	)
+			]
-);
+		]
-
+	]
-?>
+];

actions/admin/settings/160.nameserver.php

@@ -2,120 +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(
+use Froxlor\Settings;
-	'groups' => array(
+
-		'nameserver' => array(
+return [
-			'title' => $lng['admin']['nameserversettings'],
+	'groups' => [
-			'fields' => array(
+		'nameserver' => [
-				'nameserver_enable' => array(
+			'title' => lng('admin.nameserversettings'),
-					'label' => $lng['serversettings']['bindenable'],
+			'icon' => 'fa-solid fa-globe',
+			'fields' => [
+				'system_bind_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',
+					'default' => 'Bind',
-					'option_mode' => 'one',
+					'select_var' => [
-					'option_options' => array('bind' => 'Bind9', 'pdns' => 'PowerDNS'),
+						'Bind' => 'Bind9',
-					'save_method' => 'storeSettingField'
+						'PowerDNS' => 'PowerDNS'
-				),
+					],
-				'system_bindconf_directory' => array(
+					'save_method' => 'storeSettingField',
-					'label' => $lng['serversettings']['bindconf_directory'],
+					'requires_reconf' => ['dns']
+				],
+				'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',
-					),
+					'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',
+					'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',
+					'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',
+					'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_powerdns_mode' => [
+					'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,
-				'system_dns_createmailentry' => array(
+					'visible' => Settings::Get('system.dns_server') == 'PowerDNS',
-					'label' => $lng['serversettings']['mail_also_with_mxservers'],
+				],
+				'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_defaultttl' => array(
+				'system_dns_createcaaentry' => [
-					'label' => $lng['serversettings']['defaultttl'],
+					'label' => lng('serversettings.caa_entry'),
+					'settinggroup' => 'system',
+					'varname' => 'dns_createcaaentry',
+					'type' => 'checkbox',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'caa_caa_entry' => [
+					'label' => lng('serversettings.caa_entry_custom'),
+					'settinggroup' => 'caa',
+					'varname' => 'caa_entry',
+					'type' => 'textarea',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'advanced_mode' => true
+				],
+				'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',
+					'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,82 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'logging' => array(
+		'logging' => [
-			'title' => $lng['admin']['loggersettings'],
+			'title' => lng('admin.loggersettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-file-lines',
-				'logger_enabled' => array(
+			'fields' => [
-					'label' => $lng['serversettings']['logger']['enable'],
+				'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'], 2 => $lng['admin']['logger']['paranoid']),
+						1 => lng('admin.logger.normal'),
-					'save_method' => 'storeSettingField',
+						2 => lng('admin.logger.paranoid')
-					),
+					],
-				'logger_logtypes' => array(
+					'save_method' => 'storeSettingField'
-					'label' => $lng['serversettings']['logger']['types'],
+				],
+				'logger_logtypes' => [
+					'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('syslog' => 'syslog', 'file' => 'file', 'mysql' => 'mysql'),
+					'select_var' => [
-					'save_method' => 'storeSettingField',
+						'syslog' => 'syslog',
-					),
+						'file' => 'file',
-				'logger_logfile' => array(
+						'mysql' => 'mysql'
-					'label' => $lng['serversettings']['logger']['logfile'],
+					],
+					'save_method' => 'storeSettingField'
+				],
+				'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',
+					'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'
-					'save_method' => 'storeSettingField',
+				]
-					),
+			]
-				),
+		]
-			),
+	]
-		)
+];
-	);
-
-?>

actions/admin/settings/180.dkim.php

@@ -2,133 +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    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(
+use Froxlor\Settings;
-	'groups' => array(
+
-		'dkim' => array(
+return [
-			'title' => $lng['admin']['dkimsettings'],
+	'groups' => [
-			'fields' => array(
+		'dkim' => [
-				'dkim_enabled' => array(
+			'title' => lng('admin.dkimsettings'),
-					'label' => $lng['dkim']['use_dkim'],
+			'icon' => 'fa-solid fa-fingerprint',
+			'fields' => [
+				'dkim_use_dkim' => [
+					'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_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_privkeysuffix' => [
+					'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' => array(
+				],
-					'label' => $lng['dkim']['dkim_domains'],
+				'dkim_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',
+					'save_method' => 'storeSettingField'
-					),
+				],
-				'dkim_dkimkeys' => array(
+				'dkim_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',
+					'save_method' => 'storeSettingField'
-					),
+				],
-				'dkim_algorithm' => array(
+				'dkim_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('all' => 'All', 'sha1' => 'SHA1', 'sha256' => 'SHA256'),
+					'select_var' => [
+						'all' => 'All',
+						'sha1' => 'SHA1',
+						'sha256' => 'SHA256'
+					],
 					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
+					'advanced_mode' => true
-				'dkim_servicetype' => array(
+				],
-					'label' => $lng['dkim']['dkim_servicetype'],
+				'dkim_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'),
+						'0' => 'All',
+						'1' => 'E-Mail'
+					],
 					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
+					'advanced_mode' => true
-				'dkim_keylength' => array(
+				],
-					'label' => array(
+				'dkim_dkim_keylength' => [
-						'title' => $lng['dkim']['dkim_keylength']['title'],
+					'label' => [
-						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], 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'),
+						'1024' => '1024 Bit',
-					'save_method' => 'storeSettingFieldInsertBindTask',
+						'2048' => '2048 Bit'
-					),
+					],
-				'dkim_notes' => array(
+					'save_method' => 'storeSettingFieldInsertBindTask'
-					'label' => $lng['dkim']['dkim_notes'],
+				],
+				'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',
-					),
+					'advanced_mode' => true
-				'dkim_add_adsp' => array(
+				],
-					'label' => $lng['dkim']['dkim_add_adsp'],
+				'dkim_dkimrestart_command' => [
-					'settinggroup' => 'dkim',
+					'label' => lng('dkim.dkimrestart_command'),
-					'varname' => 'dkim_add_adsp',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_add_adsppolicy' => array(
-					'label' => $lng['dkim']['dkim_add_adsppolicy'],
-					'settinggroup' => 'dkim',
-					'varname' => 'dkim_add_adsppolicy',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options' => array('0' => 'Unknown', '1' => 'All', '2' => 'Discardable'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkimrestart_command' => array(
-					'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',
+					'save_method' => 'storeSettingField'
-					),
+				]
-				),
+			]
-			),
+		]
-		),
+	]
-	);
+];
-
-?>

actions/admin/settings/185.spf.php

@@ -4,42 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'spf' => array(
+		'spf' => [
-			'title' => $lng['admin']['spfsettings'],
+			'title' => lng('admin.spfsettings'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-clipboard-check',
-				'spf_enabled' => array(
+			'fields' => [
-					'label' => $lng['spf']['use_spf'],
+				'spf_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_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/190.ticket.php

@@ -1,144 +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    Settings
- *
- */
-
-return array(
-	'groups' => array(
-		'ticket' => array(
-			'title' => $lng['admin']['ticketsettings'],
-			'fields' => array(
-				'ticket_enabled' => array(
-					'label' => $lng['serversettings']['ticket']['enable'],
-					'settinggroup' => 'ticket',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'cronmodule' => 'froxlor/ticket',
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-					),
-				'ticket_noreply_email' => array(
-					'label' => $lng['serversettings']['ticket']['noreply_email'],
-					'settinggroup' => 'ticket',
-					'varname' => 'noreply_email',
-					'type' => 'string',
-					'string_type' => 'mail',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_noreply_name' => array(
-					'label' => $lng['serversettings']['ticket']['noreply_name'],
-					'settinggroup' => 'ticket',
-					'varname' => 'noreply_name',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_reset_cycle' => array(
-					'label' => $lng['serversettings']['ticket']['reset_cycle'],
-					'settinggroup' => 'ticket',
-					'varname' => 'reset_cycle',
-					'type' => 'option',
-					'default' => 1,
-					'option_mode' => 'one',
-					'option_options' => array(0 => html_entity_decode($lng['admin']['tickets']['daily']), 1 => html_entity_decode($lng['admin']['tickets']['weekly']), 2 => html_entity_decode($lng['admin']['tickets']['monthly']), 3 => html_entity_decode($lng['admin']['tickets']['yearly'])),
-					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'setCycleOfCronjob',
-					),
-				'ticket_concurrently_open' => array(
-					'label' => $lng['serversettings']['ticket']['concurrentlyopen'],
-					'settinggroup' => 'ticket',
-					'varname' => 'concurrently_open',
-					'type' => 'int',
-					'default' => 5,
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_archiving_days' => array(
-					'label' => $lng['serversettings']['ticket']['archiving_days'],
-					'settinggroup' => 'ticket',
-					'varname' => 'archiving_days',
-					'type' => 'int',
-					'int_min' => 1,
-					'int_max' => 99,
-					'default' => 5,
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_worktime_all' => array(
-					'label' => $lng['serversettings']['ticket']['worktime_all'],
-					'settinggroup' => 'ticket',
-					'varname' => 'worktime_all',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_worktime_begin' => array(
-					'label' => $lng['serversettings']['ticket']['worktime_begin'],
-					'settinggroup' => 'ticket',
-					'varname' => 'worktime_begin',
-					'type' => 'string',
-					'string_regexp' => '/^[012][0-9]:[0-6][0-9]$/',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_worktime_end' => array(
-					'label' => $lng['serversettings']['ticket']['worktime_end'],
-					'settinggroup' => 'ticket',
-					'varname' => 'worktime_end',
-					'type' => 'string',
-					'string_regexp' => '/^[012][0-9]:[0-6][0-9]$/',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_worktime_sat' => array(
-					'label' => $lng['serversettings']['ticket']['worktime_sat'],
-					'settinggroup' => 'ticket',
-					'varname' => 'worktime_sat',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'ticket_worktime_sun' => array(
-					'label' => $lng['serversettings']['ticket']['worktime_sun'],
-					'settinggroup' => 'ticket',
-					'varname' => 'worktime_sun',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'system_last_archive_run' => array(
-					'settinggroup' => 'system',
-					'varname' => 'last_archive_run',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'ticket_default_priority' => array(
-					'label' => $lng['serversettings']['ticket']['default_priority'],
-					'settinggroup' => 'ticket',
-					'varname' => 'default_priority',
-					'type' => 'option',
-					'default' => 2,
-					'option_mode' => 'one',
-					'option_options' => array(1 => $lng['ticket']['high'], 2 => $lng['ticket']['normal'], 3 => $lng['ticket']['low']),
-					'save_method' => 'storeSettingField', 
-					),
-				),
-			),
-		)
-	);
-
-?>

actions/admin/settings/210.security.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(
+use Froxlor\Settings;
-	'groups' => array(
+
-		'security' => array(
+return [
-			'title' => $lng['admin']['security_settings'],
+	'groups' => [
-			'fields' => array(
+		'security' => [
-				'panel_unix_names' => array(
+			'title' => lng('admin.security_settings'),
-					'label' => $lng['serversettings']['unix_names'],
+			'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',
+					'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' => true,
+					'default' => false,
 					'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' => 'getAvailablePasswordHashes',
+						'\\Froxlor\\System\\Crypt',
+						'getAvailablePasswordHashes'
+					],
 					'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',
+					'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',
+					'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',
-					),
+					'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',
-					)
+					'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,60 +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(
+return [
-	'groups' => array(
+	'groups' => [
-		'diskquota' => array(
+		'diskquota' => [
-			'title' => $lng['diskquota'],
+			'title' => lng('diskquota'),
-			'fields' => array(
+			'icon' => 'fa-solid fa-sliders',
-				'diskquota_enabled' => array(
+			'advanced_mode' => true,
-					'label' => $lng['serversettings']['diskquota_enabled'],
+			'fields' => [
+				'system_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(
+				'system_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',
+					'save_method' => 'storeSettingField'
-				),
+				],
-				'diskquota_quotatool_path' => array(
+				'system_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',
+					'save_method' => 'storeSettingField'
-				),
+				],
-				'diskquota_customer_partition' => array(
+				'system_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',
+					'save_method' => 'storeSettingField'
-				),
+				]
-				),
+			]
-			),
+		]
-		),
+	]
-	);
+];
-
-?>

admin_admins.php

@@ -2,866 +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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-if (isset($_POST['id'])) {
+use Froxlor\Api\Commands\Admins;
-	$id = intval($_POST['id']);
+use Froxlor\CurrentUser;
-} elseif(isset($_GET['id'])) {
+use Froxlor\Database\Database;
-	$id = intval($_GET['id']);
+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 ($page == 'admins'
+$id = (int)Request::any('id');
-	&& $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(ADM_ACTION, LOG_NOTICE, "viewed admin_admins");
+		try {
-		$fields = array(
+			$admin_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.admins.php';
-			'loginname' => $lng['login']['username'],
+			$collection = (new Collection(Admins::class, $userinfo))
-			'name' => $lng['customer']['name'],
+				->withPagination($admin_list_data['admin_list']['columns'], $admin_list_data['admin_list']['default_sorting']);
-			'diskspace' => $lng['customer']['diskspace'],
+		} catch (Exception $e) {
-			'diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
+			Response::dynamicError($e->getMessage());
-			'traffic' => $lng['customer']['traffic'],
-			'traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
-			'deactivated' => $lng['admin']['deactivated']
-		);
-		$paging = new 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%
+		UI::view('user/table.html.twig', [
-				if ($disk_percent > 100) {
+			'listing' => Listing::format($collection, $admin_list_data, 'admin_list'),
-					$disk_percent = 100;
+			'actions_links' => [
-				}
+				[
-				if ($traffic_percent > 100) {
+					'href' => $linker->getLink(['section' => 'admins', 'page' => $page, 'action' => 'add']),
-					$traffic_percent = 100;
+					'label' => lng('admin.admin_add')
-				}
+				]
-
+			]
-				$row = str_replace_array('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains tickets');
+		]);
-				$row = htmlentities_array($row);
-
-				$row['custom_notes'] = ($row['custom_notes'] != '') ? nl2br($row['custom_notes']) : '';
-
-				eval("\$admins.=\"" . getTemplate("admins/admins_admin") . "\";");
-				$count++;
-			}
-			$i++;
-		}
-
-		$admincount = $numrows_admins;
-		eval("echo \"" . getTemplate("admins/admins") . "\";");
-
 	} elseif ($action == 'su') {
-
+		try {
-		$result_stmt = Database::prepare("
+			$json_result = Admins::getLocal($userinfo, [
-			SELECT * FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :adminid
+				'id' => $id
-		");
+			])->get();
-		$result = Database::pexecute_first($result_stmt, array('adminid' => $id));
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 		$destination_admin = $result['loginname'];
 
-		if ($destination_admin != ''
+		if ($destination_admin != '' && $result['adminid'] != $userinfo['userid']) {
-			&& $result['adminid'] != $userinfo['userid']
+			$result['switched_user'] = CurrentUser::getData();
-		) {
+			$result['adminsession'] = 1;
-			$result_stmt = Database::prepare("
+			$result['userid'] = $result['adminid'];
-				SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = :userid
+			CurrentUser::setData($result);
-			");
-			$result = Database::pexecute_first($result_stmt, array('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(ADM_ACTION, LOG_INFO, "switched adminuser and is now '" . $destination_admin . "'");
-			redirectTo('admin_index.php', array('s' => $s));
-
 		} else {
-			redirectTo('index.php', array('action' => 'login'));
+			Response::redirectTo('index.php', [
+				'action' => 'login'
+			]);
 		}
-
+	} elseif ($action == 'delete' && $id != 0) {
-	} elseif ($action == 'delete'
+		try {
-		&& $id != 0
+			$json_result = Admins::getLocal($userinfo, [
-	) {
+				'id' => $id
-		$result_stmt = Database::prepare("
+			])->get();
-			SELECT * FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :adminid
+		} catch (Exception $e) {
-		");
+			Response::dynamicError($e->getMessage());
-		$result = Database::pexecute_first($result_stmt, array('adminid' => $id));
+		}
+		$result = json_decode($json_result, true)['data'];
 
 		if ($result['loginname'] != '') {
 			if ($result['adminid'] == $userinfo['userid']) {
-				standard_error('youcantdeleteyourself');
+				Response::standardError('youcantdeleteyourself');
 			}
 
-			if (isset($_POST['send'])
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				&& $_POST['send'] == 'send'
+				Admins::getLocal($userinfo, [
-			) {
+					'id' => $id
-				$del_stmt = Database::prepare("
+				])->delete();
-					DELETE FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :adminid
+				Response::redirectTo($filename, [
-				");
+					'page' => $page
-				Database::pexecute($del_stmt, array('adminid' => $id));
+				]);
-
-				$del_stmt = Database::prepare("
-					DELETE FROM `" . TABLE_PANEL_TRAFFIC_ADMINS . "` WHERE `adminid` = :adminid
-				");
-				Database::pexecute($del_stmt, array('adminid' => $id));
-
-				$upd_stmt = Database::prepare("
-					UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
-					`adminid` = :userid WHERE `adminid` = :adminid
-				");
-				Database::pexecute($upd_stmt, array('userid' => $userinfo['userid'], 'adminid' => $id));
-
-				$upd_stmt = Database::prepare("
-					UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
-					`adminid` = :userid WHERE `adminid` = :adminid
-				");
-				Database::pexecute($upd_stmt, array('userid' => $userinfo['userid'], 'adminid' => $id));
-
-				$log->logAction(ADM_ACTION, LOG_INFO, "deleted admin '" . $result['loginname'] . "'");
-				updateCounters();
-				redirectTo($filename, array('page' => $page, 's' => $s));
-
 			} else {
-				ask_yesno('admin_admin_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['loginname']);
+				HTML::askYesNo('admin_admin_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['loginname']);
 			}
 		}
-
 	} elseif ($action == 'add') {
-
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		if (isset($_POST['send'])
+			try {
-			&& $_POST['send'] == 'send'
+				Admins::getLocal($userinfo, $_POST)->add();
-		) {
+			} catch (Exception $e) {
-
+				Response::dynamicError($e->getMessage());
-			$name = validate($_POST['name'], 'name');
-			$email = $idna_convert->encode(validate($_POST['email'], 'email'));
-
-			$custom_notes = validate(str_replace("\r\n", "\n", $_POST['custom_notes']), 'custom_notes', '/^[^\0]*$/');
-			$custom_notes_show = 0;
-			if (isset($_POST['custom_notes_show'])) {
-			    $custom_notes_show = intval_ressource($_POST['custom_notes_show']);
-			}
-
-			$loginname = validate($_POST['loginname'], 'loginname');
-			$password = validate($_POST['admin_password'], 'password');
-			$password = validatePassword($password);
-			$def_language = validate($_POST['def_language'], 'default language');
-
-			$customers = intval_ressource($_POST['customers']);
-			if (isset($_POST['customers_ul'])) {
-				$customers = -1;
-			}
-
-			$domains = intval_ressource($_POST['domains']);
-			if (isset($_POST['domains_ul'])) {
-				$domains = -1;
-			}
-
-			$subdomains = intval_ressource($_POST['subdomains']);
-			if (isset($_POST['subdomains_ul'])) {
-				$subdomains = -1;
-			}
-
-			$emails = intval_ressource($_POST['emails']);
-			if (isset($_POST['emails_ul'])) {
-				$emails = -1;
-			}
-
-			$email_accounts = intval_ressource($_POST['email_accounts']);
-			if (isset($_POST['email_accounts_ul'])) {
-				$email_accounts = -1;
-			}
-
-			$email_forwarders = intval_ressource($_POST['email_forwarders']);
-			if (isset($_POST['email_forwarders_ul'])) {
-				$email_forwarders = -1;
-			}
-
-			if (Settings::Get('system.mail_quota_enabled') == '1') {
-
-				$email_quota = validate($_POST['email_quota'], 'email_quota', '/^\d+$/', 'vmailquotawrong', array('0', ''));
-				if (isset($_POST['email_quota_ul'])) {
-					$email_quota = -1;
 			}
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
 		} else {
-				$email_quota = -1;
+			$ipaddress = [];
-			}
+			$ipaddress[-1] = lng('admin.allips');
-
-			$ftps = intval_ressource($_POST['ftps']);
-			if (isset($_POST['ftps_ul'])) {
-				$ftps = -1;
-			}
-
-			if (Settings::Get('ticket.enabled') == 1) {
-
-				$tickets = intval_ressource($_POST['tickets']);
-				if (isset($_POST['tickets_ul'])) {
-					$tickets = -1;
-				}
-			} else {
-				$tickets = 0;
-			}
-
-			$mysqls = intval_ressource($_POST['mysqls']);
-			if (isset($_POST['mysqls_ul'])) {
-				$mysqls = -1;
-			}
-
-			$customers_see_all = 0;
-			if (isset($_POST['customers_see_all'])) {
-				$customers_see_all = intval($_POST['customers_see_all']);
-			}
-
-			$domains_see_all = 0;
-			if (isset($_POST['domains_see_all'])) {
-				$domains_see_all = intval($_POST['domains_see_all']);
-			}
-
-			$caneditphpsettings = 0;
-			if (isset($_POST['caneditphpsettings'])) {
-				$caneditphpsettings = intval($_POST['caneditphpsettings']);
-			}
-
-			$change_serversettings = 0;
-			if (isset($_POST['change_serversettings'])) {
-				$change_serversettings = intval($_POST['change_serversettings']);
-			}
-
-			$diskspace = intval_ressource($_POST['diskspace']);
-			if (isset($_POST['diskspace_ul'])) {
-				$diskspace = -1;
-			}
-
-			$traffic = doubleval_ressource($_POST['traffic']);
-			if (isset($_POST['traffic_ul'])) {
-				$traffic = -1;
-			}
-
-			$tickets_see_all = 0;
-			if (isset($_POST['tickets_see_all'])) {
-				$tickets_see_all = intval($_POST['tickets_see_all']);
-			}
-
-			$diskspace = $diskspace * 1024;
-			$traffic = $traffic * 1024 * 1024;
-			$ipaddress = intval_ressource($_POST['ipaddress']);
-
-			// Check if the account already exists
-			$loginname_check_stmt = Database::prepare("
-				SELECT `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname` = :login
-			");
-			$loginname_check = Database::pexecute_first($loginname_check_stmt, array('login' => $loginname));
-
-			$loginname_check_admin_stmt = Database::prepare("
-				SELECT `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname` = :login
-			");
-			$loginname_check_admin = Database::pexecute_first($loginname_check_admin_stmt, array('login' => $loginname));
-
-			if ($loginname == '') {
-				standard_error(array('stringisempty', 'myloginname'));
-			}
-			elseif (strtolower($loginname_check['loginname']) == strtolower($loginname)
-				|| strtolower($loginname_check_admin['loginname']) == strtolower($loginname)
-			) {
-				standard_error('loginnameexists', $loginname);
-			}
-			// Accounts which match systemaccounts are not allowed, filtering them
-			elseif (preg_match('/^' . preg_quote(Settings::Get('customer.accountprefix'), '/') . '([0-9]+)/', $loginname)) {
-				standard_error('loginnameissystemaccount', Settings::Get('customer.accountprefix'));
-			}
-			elseif (!validateUsername($loginname)) {
-				standard_error('loginnameiswrong', $loginname);
-			}
-			elseif ($name == '') {
-				standard_error(array('stringisempty', 'myname'));
-			}
-			elseif ($email == '') {
-				standard_error(array('stringisempty', 'emailadd'));
-			}
-			elseif ($password == '') {
-				standard_error(array('stringisempty', 'mypassword'));
-			}
-			elseif (!validateEmail($email)) {
-				standard_error('emailiswrong', $email);
-
-			} else {
-
-				if ($customers_see_all != '1') {
-					$customers_see_all = '0';
-				}
-
-				if ($domains_see_all != '1') {
-					$domains_see_all = '0';
-				}
-
-				if ($caneditphpsettings != '1') {
-					$caneditphpsettings = '0';
-				}
-
-				if ($change_serversettings != '1') {
-					$change_serversettings = '0';
-				}
-
-				if ($tickets_see_all != '1') {
-					$tickets_see_all  = '0';
-				}
-
-				$_theme = Settings::Get('panel.default_theme');
-
-				$ins_data = array(
-					'loginname' => $loginname,
-					'password' => makeCryptPassword($password),
-					'name' => $name,
-					'email' => $email,
-					'lang' => $def_language,
-					'change_serversettings' => $change_serversettings,
-					'customers' => $customers,
-					'customers_see_all' => $customers_see_all,
-					'domains' => $domains,
-					'domains_see_all' => $domains_see_all,
-					'caneditphpsettings' => $caneditphpsettings,
-					'diskspace' => $diskspace,
-					'traffic' => $traffic,
-					'subdomains' => $subdomains,
-					'emails' => $emails,
-					'accounts' => $email_accounts,
-					'forwarders' => $email_forwarders,
-					'quota' => $email_quota,
-					'ftps' => $ftps,
-					'tickets' => $tickets,
-					'tickets_see_all' => $tickets_see_all,
-					'mysqls' => $mysqls,
-					'ip' => $ipaddress,
-					'theme' => $_theme,
-					'custom_notes' => $custom_notes,
-					'custom_notes_show' => $custom_notes_show
-				);
-
-				$ins_stmt = Database::prepare("
-					INSERT INTO `" . TABLE_PANEL_ADMINS . "` SET
-					`loginname` = :loginname,
-					`password` = :password,
-					`name` = :name,
-					`email` = :email,
-					`def_language` = :lang,
-					`change_serversettings` = :change_serversettings,
-					`customers` = :customers,
-					`customers_see_all` = :customers_see_all,
-					`domains` = :domains,
-					`domains_see_all` = :domains_see_all,
-					`caneditphpsettings` = :caneditphpsettings,
-					`diskspace` = :diskspace,
-					`traffic` = :traffic,
-					`subdomains` = :subdomains,
-					`emails` = :emails,
-					`email_accounts` = :accounts,
-					`email_forwarders` = :forwarders,
-					`email_quota` = :quota,
-					`ftps` = :ftps,
-					`tickets` = :tickets,
-					`tickets_see_all` = :tickets_see_all,
-					`mysqls` = :mysqls,
-					`ip` = :ip,
-					`theme` = :theme,
-					`custom_notes` = :custom_notes,
-					`custom_notes_show` = :custom_notes_show
-				");
-				Database::pexecute($ins_stmt, $ins_data);
-
-				$adminid = Database::lastInsertId();
-				$log->logAction(ADM_ACTION, LOG_INFO, "added admin '" . $loginname . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			}
-
-		} else {
-
-			$language_options = '';
-			while (list($language_file, $language_name) = each($languages)) {
-				$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true);
-			}
-
-			$ipaddress = 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.= makeoption($row['ip'], $row['id']);
+				$ipaddress[$row['id']] = $row['ip'];
 			}
 
-			$customers_ul = makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$domains_ul = makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$mysqls_ul = 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 = 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 \"" . getTemplate("admins/admins_add") . "\";");
+			]);
 		}
-
+	} elseif ($action == 'edit' && $id != 0) {
-	} elseif($action == 'edit'
+		try {
-		&& $id != 0
+			$json_result = Admins::getLocal($userinfo, [
-	) {
+				'id' => $id
-
+			])->get();
-		$result_stmt = Database::prepare("
+		} catch (Exception $e) {
-			SELECT * FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = :adminid
+			Response::dynamicError($e->getMessage());
-		");
+		}
-		$result = Database::pexecute_first($result_stmt, array('adminid' => $id));
+		$result = json_decode($json_result, true)['data'];
 
 		if ($result['loginname'] != '') {
-
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			if (isset($_POST['send'])
+				try {
-				&& $_POST['send'] == 'send'
+					Admins::getLocal($userinfo, $_POST)->update();
-			) {
+				} catch (Exception $e) {
-				$name = validate($_POST['name'], 'name');
+					Response::dynamicError($e->getMessage());
-				$email = $idna_convert->encode(validate($_POST['email'], 'email'));
-
-				$custom_notes = validate(str_replace("\r\n", "\n", $_POST['custom_notes']), 'custom_notes', '/^[^\0]*$/');
-				$custom_notes_show = $result['custom_notes_show'];
-				if (isset($_POST['custom_notes_show'])) {
-				    $custom_notes_show = intval_ressource($_POST['custom_notes_show']);
 				}
-
+				Response::redirectTo($filename, [
-				if ($result['adminid'] == $userinfo['userid']) {
+					'page' => $page
-
+				]);
-					$password = '';
-					$def_language = $result['def_language'];
-					$deactivated = $result['deactivated'];
-					$customers = $result['customers'];
-					$domains = $result['domains'];
-					$subdomains = $result['subdomains'];
-					$emails = $result['emails'];
-					$email_accounts = $result['email_accounts'];
-					$email_forwarders = $result['email_forwarders'];
-					$email_quota = $result['email_quota'];
-					$ftps = $result['ftps'];
-					$tickets = $result['tickets'];
-					$mysqls = $result['mysqls'];
-					$tickets_see_all = $result['tickets_see_all'];
-					$customers_see_all = $result['customers_see_all'];
-					$domains_see_all = $result['domains_see_all'];
-					$caneditphpsettings = $result['caneditphpsettings'];
-					$change_serversettings = $result['change_serversettings'];
-					$diskspace = $result['diskspace'];
-					$traffic = $result['traffic'];
-					$ipaddress = $result['ip'];
-
 			} else {
-
-					$password = validate($_POST['admin_password'], 'new password');
-					$def_language = validate($_POST['def_language'], 'default language');
-					$deactivated = isset($_POST['deactivated']) ? 1 : 0;
-
-					$customers = intval_ressource($_POST['customers']);
-					if (isset($_POST['customers_ul'])) {
-						$customers = -1;
-					}
-
-					$domains = intval_ressource($_POST['domains']);
-					if (isset($_POST['domains_ul'])) {
-						$domains = -1;
-					}
-
-					$subdomains = intval_ressource($_POST['subdomains']);
-					if (isset($_POST['subdomains_ul'])) {
-						$subdomains = -1;
-					}
-
-					$emails = intval_ressource($_POST['emails']);
-					if (isset($_POST['emails_ul'])) {
-						$emails = -1;
-					}
-
-					$email_accounts = intval_ressource($_POST['email_accounts']);
-					if (isset($_POST['email_accounts_ul'])) {
-						$email_accounts = -1;
-					}
-
-					$email_forwarders = intval_ressource($_POST['email_forwarders']);
-					if (isset($_POST['email_forwarders_ul'])) {
-						$email_forwarders = -1;
-					}
-
-					if (Settings::Get('system.mail_quota_enabled') == '1') {
-						$email_quota = validate($_POST['email_quota'], 'email_quota', '/^\d+$/', 'vmailquotawrong', array('0', ''));
-						if (isset($_POST['email_quota_ul'])) {
-							$email_quota = -1;
-						}
-					} else {
-						$email_quota = -1;
-					}
-
-					$ftps = intval_ressource($_POST['ftps']);
-					if (isset($_POST['ftps_ul'])) {
-						$ftps = -1;
-					}
-
-					if (Settings::Get('ticket.enabled') == 1) {
-						$tickets = intval_ressource($_POST['tickets']);
-						if (isset($_POST['tickets_ul'])) {
-							$tickets = -1;
-						}
-					} else {
-						$tickets = 0;
-					}
-
-					$mysqls = intval_ressource($_POST['mysqls']);
-					if (isset($_POST['mysqls_ul'])) {
-						$mysqls = -1;
-					}
-
-					$customers_see_all = 0;
-					if (isset($_POST['customers_see_all'])) {
-						$customers_see_all = intval($_POST['customers_see_all']);
-					}
-
-					$domains_see_all = 0;
-					if (isset($_POST['domains_see_all'])) {
-						$domains_see_all = intval($_POST['domains_see_all']);
-					}
-
-					$caneditphpsettings = 0;
-					if (isset($_POST['caneditphpsettings'])) {
-						$caneditphpsettings = intval($_POST['caneditphpsettings']);
-					}
-
-					$change_serversettings = 0;
-					if (isset($_POST['change_serversettings'])) {
-						$change_serversettings = isset($_POST['change_serversettings']) ? 1 : 0;
-					}
-
-					$tickets_see_all = 0;
-					if (isset($_POST['tickets_see_all'])) {
-						$tickets_see_all = intval($_POST['tickets_see_all']);
-					}
-
-					$diskspace = intval($_POST['diskspace']);
-					if (isset($_POST['diskspace_ul'])) {
-						$diskspace = -1;
-					}
-
-					$traffic = doubleval_ressource($_POST['traffic']);
-					if (isset($_POST['traffic_ul'])) {
-						$traffic = -1;
-					}
-
-					$diskspace = $diskspace * 1024;
-					$traffic = $traffic * 1024 * 1024;
-					$ipaddress = intval_ressource($_POST['ipaddress']);
-				}
-
-				if ($name == '') {
-					standard_error(array('stringisempty', 'myname'));
-				} elseif($email == '') {
-					standard_error(array('stringisempty', 'emailadd'));
-				} elseif(!validateEmail($email)) {
-					standard_error('emailiswrong', $email);
-				} else {
-					if ($password != '') {
-						$password = validatePassword($password);
-						$password = makeCryptPassword($password);
-					} else {
-						$password = $result['password'];
-					}
-
-					if ($deactivated != '1') {
-						$deactivated = '0';
-					}
-
-					if ($customers_see_all != '1') {
-						$customers_see_all = '0';
-					}
-
-					if ($domains_see_all != '1') {
-						$domains_see_all = '0';
-					}
-
-					if ($caneditphpsettings != '1') {
-						$caneditphpsettings = '0';
-					}
-
-					if ($change_serversettings != '1') {
-						$change_serversettings = '0';
-					}
-
-					if ($tickets_see_all != '1') {
-						$tickets_see_all = '0';
-					}
-
-					// check if a resource was set to something lower
-					// than actually used by the admin/reseller
-					$res_warning = "";
-					if ($customers != $result['customers'] && $customers != -1 && $customers < $result['customers_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'customers');
-					}
-					if ($domains != $result['domains'] && $domains != -1 && $domains < $result['domains_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'domains');
-					}
-					if ($diskspace != $result['diskspace'] && ($diskspace / 1024) != -1 && $diskspace < $result['diskspace_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'diskspace');
-					}
-					if ($traffic != $result['traffic'] && ($traffic / 1024 / 1024) != -1 && $traffic < $result['traffic_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'traffic');
-					}
-					if ($emails != $result['emails'] && $emails != -1 && $emails < $result['emails_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'emails');
-					}
-					if ($email_accounts != $result['email_accounts'] && $email_accounts != -1 && $email_accounts < $result['email_accounts_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email accounts');
-					}
-					if ($email_forwarders != $result['email_forwarders'] && $email_forwarders != -1 && $email_forwarders < $result['email_forwarders_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email forwarders');
-					}
-					if ($email_quota != $result['email_quota'] && $email_quota != -1 && $email_quota < $result['email_quota_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email quota');
-					}
-					if ($ftps != $result['ftps'] && $ftps != -1 && $ftps < $result['ftps_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'ftps');
-					}
-					if ($tickets != $result['tickets'] && $tickets != -1 && $tickets < $result['tickets_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'tickets');
-					}
-					if ($mysqls != $result['mysqls'] && $mysqls != -1 && $mysqls < $result['mysqls_used']) {
-						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'mysqls');
-					}
-
-					if ($res_warning != "") {
-						$link = '';
-						$error = $res_warning;
-						eval("echo \"" . getTemplate('misc/error', '1') . "\";");
-						exit;
-					}
-
-					$upd_data = array(
-						'password' => $password,
-						'name' => $name,
-						'email' => $email,
-						'lang' => $def_language,
-						'change_serversettings' => $change_serversettings,
-						'customers' => $customers,
-						'customers_see_all' => $customers_see_all,
-						'domains' => $domains,
-						'domains_see_all' => $domains_see_all,
-						'caneditphpsettings' => $caneditphpsettings,
-						'diskspace' => $diskspace,
-						'traffic' => $traffic,
-						'subdomains' => $subdomains,
-						'emails' => $emails,
-						'accounts' => $email_accounts,
-						'forwarders' => $email_forwarders,
-						'quota' => $email_quota,
-						'ftps' => $ftps,
-						'tickets' => $tickets,
-						'tickets_see_all' => $tickets_see_all,
-						'mysqls' => $mysqls,
-						'ip' => $ipaddress,
-						'deactivated' => $deactivated,
-						'custom_notes' => $custom_notes,
-						'custom_notes_show' => $custom_notes_show,
-						'adminid' => $id
-					);
-
-					$upd_stmt = Database::prepare("
-						UPDATE `" . TABLE_PANEL_ADMINS . "` SET
-						`password` = :password,
-						`name` = :name,
-						`email` = :email,
-						`def_language` = :lang,
-						`change_serversettings` = :change_serversettings,
-						`customers` = :customers,
-						`customers_see_all` = :customers_see_all,
-						`domains` = :domains,
-						`domains_see_all` = :domains_see_all,
-						`caneditphpsettings` = :caneditphpsettings,
-						`diskspace` = :diskspace,
-						`traffic` = :traffic,
-						`subdomains` = :subdomains,
-						`emails` = :emails,
-						`email_accounts` = :accounts,
-						`email_forwarders` = :forwarders,
-						`email_quota` = :quota,
-						`ftps` = :ftps,
-						`tickets` = :tickets,
-						`tickets_see_all` = :tickets_see_all,
-						`mysqls` = :mysqls,
-						`ip` = :ip,
-						`deactivated` = :deactivated,
-						`custom_notes` = :custom_notes,
-						`custom_notes_show` = :custom_notes_show
-						WHERE `adminid` = :adminid
-					");
-					Database::pexecute($upd_stmt, $upd_data);
-
-					$log->logAction(ADM_ACTION, LOG_INFO, "edited admin '#" . $id . "'");
-					redirectTo($filename, array('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 = 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 = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true);
-				if ($result['diskspace'] == '-1') {
-					$result['diskspace'] = '';
-				}
-
-				$traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true);
-				if ($result['traffic'] == '-1') {
-					$result['traffic'] = '';
-				}
-
-				$domains_ul = makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, $result['domains'], true, true);
-				if ($result['domains'] == '-1') {
-					$result['domains'] = '';
-				}
-
-				$subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true);
-				if ($result['subdomains'] == '-1') {
-					$result['subdomains'] = '';
-				}
-
-				$emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true);
-				if ($result['emails'] == '-1') {
-					$result['emails'] = '';
-				}
-
-				$email_accounts_ul = 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 = 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 = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
-				if ($result['email_quota'] == '-1') {
-					$result['email_quota'] = '';
-				}
-
-				$ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
-				if ($result['ftps'] == '-1') {
-					$result['ftps'] = '';
-				}
-
-				$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, $result['tickets'], true, true);
-				if ($result['tickets'] == '-1') {
-					$result['tickets'] = '';
-				}
-
-				$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true);
-				if ($result['mysqls'] == '-1') {
-					$result['mysqls'] = '';
-				}
-
-				$language_options = '';
-				while (list($language_file, $language_name) = each($languages)) {
-					$language_options.= makeoption($language_name, $language_file, $result['def_language'], true);
-				}
-
-				$ipaddress = makeoption($lng['admin']['allips'], "-1", $result['ip']);
 				$ipsandports_stmt = Database::query("
-					SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `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.= makeoption($row['ip'], $row['id'], $result['ip']);
+					$ipaddress[$row['id']] = $row['ip'];
 				}
 
-				$result = htmlentities_array($result);
+				$result = PhpHelper::htmlentitiesArray($result);
 
 				$admin_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/admin/formfield.admin_edit.php';
-				$admin_edit_form = 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 \"" . getTemplate("admins/admins_edit") . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

admin_apcuinfo.php

@@ -1,97 +1,142 @@
 <?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 program is free software; you can redistribute it and/or
-  +----------------------------------------------------------------------+
+ * modify it under the terms of the GNU General Public License
-  | This source file is subject to version 3.01 of the PHP license,      |
+ * as published by the Free Software Foundation; either version 2
-  | that is bundled with this package in the file LICENSE, and is        |
+ * of the License, or (at your option) any later version.
-  | available through the world-wide-web at the following url:           |
+ *
-  | http://www.php.net/license/3_01.txt                                  |
+ * This program is distributed in the hope that it will be useful,
-  | If you did not receive a copy of the PHP license and are unable to   |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  | obtain it through the world-wide-web, please send a note to          |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  | license@php.net so we can mail you a copy immediately.               |
+ * GNU General Public License for more details.
-  +----------------------------------------------------------------------+
+ *
-  | Authors: Ralf Becker <beckerr@php.net>                               |
+ * You should have received a copy of the GNU General Public License
-  |          Rasmus Lerdorf <rasmus@php.net>                             |
+ * along with this program; if not, you can also view it online at
-  |          Ilia Alshanetsky <ilia@prohost.org>                         |
+ * https://files.froxlor.org/misc/COPYING.txt
-  +----------------------------------------------------------------------+
+ *
-
+ * @copyright  the authors
-   All other licensing and usage conditions are those of the PHP Group.
+ * @author     Froxlor team <team@froxlor.org>
-
+ * @author     Janos Muzsi <muzsij@hypernics.hu>
-   Based on https://github.com/krakjoe/apcu/blob/master/apc.php
+ * @author     Ralf Becker <beckerr@php.net>
-   Implemented into Froxlor: Janos Muzsi <muzsij@hypernics.hu>
+ * @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');
+use Froxlor\FroxlorLogger;
-require './lib/init.php';
+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' &&
+if ($action == 'delete' && function_exists('apcu_clear_cache') && $userinfo['change_serversettings'] == '1') {
-        function_exists('apcu_clear_cache') &&
+	if ($_POST['send'] == 'send') {
-        $userinfo['change_serversettings'] == '1'
-) {
 		apcu_clear_cache();
-    $log->logAction(ADM_ACTION, LOG_INFO, "cleared APCu cache");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "cleared APCu cache");
-    header('Location: ' . $linker->getLink(array('section' => 'apcuinfo', 'page' => 'showinfo')));
+		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') ||
+if (!function_exists('apcu_cache_info') || !function_exists('apcu_sma_info')) {
-        !function_exists('apcu_sma_info')
+	Response::standardError(lng('error.no_apcuinfo'));
-) {
-    standard_error($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(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'])) {
-        $cache['file_upload_progress'] = $lng['logger']['unknown'];
+		$cache['file_upload_progress'] = lng('logger.unknown');
 	}
 
 	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.=\"" . 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++) {
@@ -102,201 +147,52 @@ if ($page == 'showinfo'
 			}
 			$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=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
-        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img2', 'action' => mt_rand(0, 1000000)));
-        eval("\$img_src2=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
-        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img3', 'action' => mt_rand(0, 1000000)));
-        eval("\$img_src3=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
-    }
-
-    eval("echo \"" . 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('', 'K', 'M', 'G') as $i => $k) {
+	$i = 0;
-        if ($s < 1024)
+	$val = ['b', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-            break;
+	while (($size / 1024) > 1) {
-        $s/=1024;
+		$size /= 1024;
+		++$i;
 	}
-    return sprintf("%5.1f %sBytes", $s, $k);
+	return sprintf(
+		'%.2f%s%s',
+		$size,
+		'',
+		$val[$i]
+	);
 }
 
-function duration($ts) {
+function duration($ts)
+{
 	global $time;
 	$years = (int)((($time - $ts) / (7 * 86400)) / 52.177457);
 	$rem = (int)(($time - $ts) - ($years * 52.177457 * 7 * 86400));
@@ -305,111 +201,34 @@ function duration($ts) {
 	$hours = (int)(($rem) / 3600) - $days * 24 - $weeks * 7 * 24;
 	$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,201 +2,198 @@
 
 /**
  * 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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-// define update-uri
+use Froxlor\Froxlor;
-define('UPDATE_URI', "https://version.froxlor.org/Froxlor/legacy/" . $version);
+use Froxlor\FroxlorLogger;
-define('RELEASE_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip");
+use Froxlor\Http\HttpClient;
-define('CHECKSUM_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip.sha256");
+use Froxlor\Install\AutoUpdate;
+use Froxlor\Settings;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
 
-// check for allow_url_fopen
+if ($page != 'error') {
-if (ini_get('allow_url_fopen') === false) {
+	// check for webupdate to be enabled
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 1));
+	if (Settings::Config('enable_webupdate') != true) {
+		Response::redirectTo($filename, [
+			'page' => 'error',
+			'errno' => 11
+		]);
 	}
-
-// check for archive-stuff
-if (! extension_loaded('zip')) {
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 2));
 }
 
 // display initial version check
 if ($page == 'overview') {
-
 	// log our actions
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "checking auto-update");
+	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "checking auto-update");
 
 	// check for new version
-	$latestversion = @file(UPDATE_URI);
+	try {
-
+		$result = AutoUpdate::checkVersion();
-	if (isset($latestversion[0])) {
+	} catch (Exception $e) {
-		$latestversion = explode('|', $latestversion[0]);
+		Response::dynamicError($e->getMessage());
-
-		if (is_array($latestversion)
-				&& count($latestversion) >= 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
-				redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 3));
-			} elseif (version_compare2($version, $_version) == -1) {
-				// there is a newer version - yay
-				$isnewerversion = 1;
-			} else {
-				// nothing new
-				$isnewerversion = 0;
 	}
 
+	if ($result == 1) {
+
 		// 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.'" />';
-				$yesfile = $filename.'?s='.$s.'&amp;page=getdownload';
-				eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
-				exit;
-			}
-			elseif ($isnewerversion == 0) {
-				// all good
-				standard_success ('noupdatesavail');
-			} else {
-				standard_error ('customized_version');
-			}
-		}
-	}
-	// error (something weird came from version.froxlor.org)
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 5));
-}
-// download the new archive
-elseif ($page == 'getdownload') {
 
+		$upd_formfield = [
+			'updates' => [
+				'title' => lng('update.update'),
+				'image' => 'fa-solid fa-download',
+				'sections' => [
+					'section_autoupd' => [
+						'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 {
+			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);
-
-		// get archive data
-		$newArchive = @file_get_contents($toLoad);
-
-		// check for local destination folder
-		if (!is_dir(FROXLOR_INSTALL_DIR.'/updates/')) {
-			mkdir(FROXLOR_INSTALL_DIR.'/updates/');
-		}
-
-		// name archive
-		$localArchive = FROXLOR_INSTALL_DIR.'/updates/'.basename($toLoad);
-
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "Downloading ".$toLoad." to ".$localArchive);
-
-		// remove old archive
-		if (file_exists($localArchive)) {
-			@unlink($localArchive);
-		}
-
-		// store archive
-		$fh = fopen($localArchive, 'w');
-		if (!fwrite($fh, $newArchive)) {
-			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 4));
-		}
-
-		// close file-handle
-		fclose($fh);
-
-		// validate the integrity of the downloaded file
-		$_shouldsum = @file_get_contents($toCheck);
-		if (!empty($_shouldsum)) {
-			$_t = explode(" ", $_shouldsum);
-			$shouldsum = $_t[0];
-		} else {
-			$shouldsum = null;
-		}
-		$filesum = hash_file('sha256', $localArchive);
-
-		if ($filesum != $shouldsum) {
-			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 9));
-		}
-
 			// to the next step
-		redirectTo($filename, array('s' => $s, 'page' => 'extract', 'archive' => basename($localArchive)));
+			Response::redirectTo($filename, [
+				'page' => 'extract',
+				'archive' => $result
+			]);
 		}
-	redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 6));
 	}
-// extract and install new version
+	Response::redirectTo($filename, [
+		'page' => 'error',
+		'errno' => $result
+	]);
+} // extract and install new version
 elseif ($page == 'extract') {
-
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-	$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
+		$toExtract = isset($_POST['archive']) ? $_POST['archive'] : null;
-	$localArchive = FROXLOR_INSTALL_DIR.'/updates/'.$toExtract;
+		$localArchive = Froxlor::getInstallDir() . '/updates/' . $toExtract;
-
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Extracting " . $localArchive . " to " . Froxlor::getInstallDir());
-	if (isset($_POST['send'])
+		$result = AutoUpdate::extractZip($localArchive);
-			&& $_POST['send'] == 'send'
+		if ($result > 0) {
-	) {
-		// decompress from zip
-		$zip = new ZipArchive;
-		$res = $zip->open($localArchive);
-		if ($res === true) {
-			$log->logAction(ADM_ACTION, LOG_NOTICE, "Extracting ".$localArchive." to ".FROXLOR_INSTALL_DIR);
-			$zip->extractTo(FROXLOR_INSTALL_DIR);
-			$zip->close();
-			// success - remove unused archive
-			@unlink($localArchive);
-		} else {
 			// error
-			redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 8));
+			Response::redirectTo($filename, [
+				'page' => 'error',
+				'errno' => $result
+			]);
 		}
-
+		// redirect to update-page
-		// redirect to update-page?
+		Response::redirectTo('admin_updates.php');
-		redirectTo('admin_updates.php', array('s' => $s));
+	} else {
+		$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
+		$localArchive = Froxlor::getInstallDir() . '/updates/' . $toExtract;
 	}
 
 	if (!file_exists($localArchive)) {
-		redirectTo($filename, array('s' => $s, 'page' => 'error', 'errno' => 7));
+		Response::redirectTo($filename, [
+			'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;
-	eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
-}
 
-// display error
+	$upd_formfield = [
+		'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;
 
-	// 1 = no allow_url_fopen
 	// 2 = no Zlib
 	// 3 = custom version detected
 	// 4 = could not store archive to local hdd
@@ -205,5 +202,11 @@ elseif ($page == 'error') {
 	// 7 = local archive does not exist
 	// 8 = could not extract archive
 	// 9 = checksum mismatch
-	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,224 +4,177 @@
  * 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') {
-	$customer_tmpdir = '/tmp/';
+		Settings::Set('panel.is_configured', '1', true);
-	if (Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_tmpdir') != '')
+		Response::redirectTo('admin_configfiles.php');
-	{
-		$customer_tmpdir = Settings::Get('system.mod_fcgid_tmpdir');
 	}
-	elseif (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.tmpdir') != '')
-	{
-		$customer_tmpdir = Settings::Get('phpfpm.tmpdir');
-	}
-
-	$replace_arr = Array(
-		'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
-		'<SQL_UNPRIVILEGED_PASSWORD>' => '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'),
-		'<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>' => makeCorrectDir($customer_tmpdir),
-		'<BASE_PATH>' => makeCorrectDir(FROXLOR_INSTALL_DIR),
-		'<BIND_CONFIG_PATH>' => makeCorrectDir(Settings::Get('system.bindconf_directory')),
-		'<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
-		'<CUSTOMER_LOGS>' => makeCorrectDir(Settings::Get('system.logfiles_directory')),
-		'<FPM_IPCDIR>' => 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 = makeCorrectDir(FROXLOR_INSTALL_DIR . '/lib/configfiles/');
+	$distributions_select = [];
+
+	$services = [];
+	$config_dir = FileDir::makeCorrectDir(Froxlor::getInstallDir() . '/lib/configfiles/');
+
+	if (!empty($distribution)) {
+		if (!file_exists($config_dir . '/' . $distribution . ".xml")) {
+			Response::dynamicError("Unknown distribution");
+		}
+
+		// update setting if different
+		if ($distribution != Settings::Get('system.distribution')) {
+			Settings::Set('system.distribution', $distribution);
+		}
 
-	if ($distribution != "") {
 		// create configparser object
 		$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 != "") {
-
-			$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 .= makeoption($title, $di);
-				}
-			}
 	} else {
-			foreach ($services as $si => $sd) {
-				$services_select .= 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 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 .= makeoption($dist_display, $dist_index);
-		}
 	}
 
-	if ($distribution != "" && $service != "" && $daemon != "") {
+	if ($distribution != "" && isset($_POST['finish'])) {
+		unset($_POST['finish']);
+		unset($_POST['csrf_token']);
+		$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);
 
-		$confarr = $daemons[$daemon]->getConfig();
+		UI::twigBuffer('settings/configuration-final.html.twig', [
-
+			'distribution' => $distribution,
-		$configpage = '';
+			// alert
-
+			'type' => 'info',
-		$distro_editor = $configfiles->distributionEditor;
+			'alert_msg' => lng('admin.configfiles.finishnote'),
-
+			'basedir' => Froxlor::getInstallDir(),
-		$commands_pre = "";
+			'params_filename' => $params_filename
-		$commands_file = "";
+		]);
-		$commands_post = "";
-
-		$lasttype = '';
-		$commands = '';
-		foreach ($confarr as $idx => $action) {
-			if ($lasttype != '' && $lasttype != $action['type']) {
-				$commands = trim($commands);
-				$numbrows = count(explode("\n", $commands));
-				eval("\$configpage.=\"" . 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=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-					}
-					$commands = trim($commands_post);
-					if ($commands != "") {
-						$numbrows = count(explode("\n", $commands));
-						eval("\$commands_post=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-					}
-					eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_subfileblock") . "\";");
-					$commands = '';
-					$commands_pre = '';
-					$commands_post = '';
-					break;
-			}
-		}
-		$commands = trim($commands);
-		if ($commands != '') {
-			$numbrows = count(explode("\n", $commands));
-			eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
-		}
-		eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
 	} else {
-		eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
+		if (!empty($distribution)) {
-	}
+			// 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 {
-	die('not allowed to see this page');
+			$cfg_formfield = [
-	// redirect or similar here
+				'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') : '')
+			]);
+		}
 	}
 
-// helper functions
+	UI::twigOutputBuffer();
-function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor)
+} else {
-{
+	Response::redirectTo('admin_index.php');
-	$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=\"" . 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,135 +4,90 @@
  * 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');
+const AREA = 'admin';
-require './lib/init.php';
+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(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 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.=\"" . getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
-				$cmod = $row['module'];
-			}
-			if ($paging->checkDisplay($i)) {
-				$row = htmlentities_array($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.=\"" . 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 \"" . getTemplate('cronjobs/cronjobs') . "\";");
+			'type' => 'warning',
-
+			'alert_msg' => lng('cron.changewarning')
+		]);
 	} elseif ($action == 'new') {
 		/*
 		 * @TODO later
 		 */
 	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`= :id");
+		try {
-		Database::pexecute($result_stmt, array('id' => $id));
+			$json_result = Cronjobs::getLocal($userinfo, [
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 		if ($result['cronfile'] != '') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$isactive = isset($_POST['isactive']) ? 1 : 0;
+				try {
-				$interval_value = validate($_POST['interval_value'], 'interval_value', '/^([0-9]+)$/Di', 'stringisempty');
+					Cronjobs::getLocal($userinfo, $_POST)->update();
-				$interval_interval = validate($_POST['interval_interval'], 'interval_interval');
+				} catch (Exception $e) {
-
+					Response::dynamicError($e->getMessage());
-				if ($isactive != 1) {
-					$isactive = 0;
 				}
-
+				Response::redirectTo($filename, [
-				$interval = $interval_value . ' ' . strtoupper($interval_interval);
+					'page' => $page
-
+				]);
-				$upd = Database::prepare("
-					UPDATE `" . TABLE_PANEL_CRONRUNS . "`
-					SET `isactive` = :isactive, `interval` = :int
-					WHERE `id` = :id"
-				);
-				Database::pexecute($upd, array('isactive' => $isactive, 'int' => $interval, 'id' => $id));
-
-				// insert task to re-generate the cron.d-file
-				inserttask('99');
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
-
-				// interval
-				$interval_nfo = explode(' ', $result['interval']);
-				$interval_value = $interval_nfo[0];
-
-				$interval_interval = '';
-				$interval_interval .= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
-				$interval_interval .= makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
-				$interval_interval .= 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 = 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 \"" . getTemplate('cronjobs/cronjob_edit') . "\";");
+					'editid' => $id
+				]);
 			}
 		}
-	}
+	} elseif ($action == 'delete' && $id != 0) {
-	elseif ($action == 'delete' && $id != 0) {
 		/*
 		 * @TODO later
 		 */

admin_index.php

@@ -2,152 +2,142 @@
 
 /**
  * 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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
+
+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(ADM_ACTION, LOG_NOTICE, "logged out");
+	Response::redirectTo('index.php');
-
+} elseif ($action == 'suback') {
-	$params = array('adminid' => (int)$userinfo['adminid']);
+	if (is_array(CurrentUser::getField('switched_user'))) {
-
+		$result = CurrentUser::getData();
-	if (Settings::Get('session.allow_multiple_login') == '1') {
+		$result = $result['switched_user'];
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		CurrentUser::setData($result);
-			WHERE `userid` = :adminid
+		$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
-			AND `adminsession` = '1'
+		$redirect = "admin_" . $target . ".php";
-			AND `hash` = :hash"
+		if (!file_exists(\Froxlor\Froxlor::getInstallDir() . "/" . $redirect)) {
-		);
+			$redirect = "admin_index.php";
-		$params['hash'] = $s;
+		}
+		Response::redirectTo($redirect, null, true);
 	} 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);
-
-	redirectTo('index.php');
-}
-
-if (isset($_POST['id'])) {
-	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
-	$id = intval($_GET['id']);
 }
 
 if ($page == 'overview') {
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_index");
+	$log->logAction(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(`tickets_used`) AS `tickets_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('adminid' => $userinfo['adminid']));
+	$overview = Database::pexecute_first($overview_stmt, $params);
 
-	$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")
+		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid"));
-	);
+	$number_domains = Database::pexecute_first($number_domains_stmt, $params);
-	$number_domains = Database::pexecute_first($number_domains_stmt, array('adminid' => $userinfo['adminid']));
 
 	$overview['number_domains'] = $number_domains['number_domains'];
 
-	$phpversion = phpversion();
+	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes') || (isset($lookfornewversion) && $lookfornewversion == 'yes')) {
-	$mysqlserverversion = Database::getAttribute(PDO::ATTR_SERVER_VERSION);
+		try {
-	$webserverinterface = strtoupper(@php_sapi_name());
+			$json_result = Froxlor::getLocal($userinfo)->checkUpdate();
-
+		} catch (Exception $e) {
-	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
+			Response::dynamicError($e->getMessage());
-		|| (isset($lookfornewversion) && $lookfornewversion == 'yes')
-	) {
-		$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;
-
-		if (ini_get('allow_url_fopen')) {
-			$latestversion = @file($update_check_uri);
-
-			if (isset($latestversion[0])) {
-				$latestversion = explode('|', $latestversion[0]);
-
-				if (is_array($latestversion)
-					&& count($latestversion) >= 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
-					$lookfornewversion_lable = $_version.$branding;
-					$lookfornewversion_link = $_link;
-					$lookfornewversion_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
-						$isnewerversion = 2;
-					} elseif (version_compare2($version, $_version) == -1) {
-						$isnewerversion = 1;
-					} else {
-						$isnewerversion = 0;
 		}
+		$result = json_decode($json_result, true)['data'];
+
+		$lookfornewversion_lable = $result['version'];
+		$lookfornewversion_link = $result['link'];
+		$lookfornewversion_message = $result['message'];
+		$lookfornewversion_addinfo = $result['additional_info'];
+		$isnewerversion = $result['isnewerversion'];
 	} else {
-					redirectTo($update_check_uri.'/pretty', NULL, false);
+		$lookfornewversion_lable = lng('admin.lookfornewversion.clickhere');
-				}
+		$lookfornewversion_link = htmlspecialchars($filename . '?page=' . urlencode($page) . '&lookfornewversion=yes');
-			} else {
+		$lookfornewversion_message = '';
-				redirectTo($update_check_uri.'/pretty', NULL, false);
-			}
-		} else {
-			redirectTo($update_check_uri.'/pretty', NULL, false);
-		}
-	} else {
-		$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
-		$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
 		$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 = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
-	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+	// additional sys-infos
-
-	$cron_last_runs = getCronjobsLastRun();
-	$outstanding_tasks = 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;
 		}
@@ -158,29 +148,22 @@ 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) {
-			$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)
+	if (is_array($uptime_array) && isset($uptime_array[0]) && is_numeric($uptime_array[0])) {
-		&& isset($uptime_array[0])
-		&& is_numeric($uptime_array[0])
-	) {
 		// Some calculatioon to get a nicly formatted display
 		$seconds = round($uptime_array[0], 0);
 		$minutes = $seconds / 60;
@@ -190,227 +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 \"" . 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 = Validate::validate($_POST['old_password'], 'old password');
 
-	if (isset($_POST['send'])
+		if (!Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) {
-		&& $_POST['send'] == 'send'
+			Response::standardError('oldpasswordnotcorrect');
-	) {
-		$old_password = validate($_POST['old_password'], 'old password');
-
-		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_ADMINS,'adminid')) {
-			standard_error('oldpasswordnotcorrect');
 		}
 
-		$new_password = validate($_POST['new_password'], 'new password');
+		try {
-		$new_password_confirm = 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 == '') {
-			standard_error(array('stringisempty', 'oldpassword'));
+			Response::standardError([
+				'stringisempty',
+				'changepassword.old_password'
+			]);
 		} elseif ($new_password == '') {
-			standard_error(array('stringisempty', 'newpassword'));
+			Response::standardError([
+				'stringisempty',
+				'changepassword.new_password'
+			]);
 		} elseif ($new_password_confirm == '') {
-			standard_error(array('stringisempty', 'newpasswordconfirm'));
+			Response::standardError([
+				'stringisempty',
+				'changepassword.new_password_confirm'
+			]);
 		} elseif ($new_password != $new_password_confirm) {
-			standard_error('newpasswordconfirmerror');
+			Response::standardError('newpasswordconfirmerror');
 		} else {
-			$chgpwd_stmt = Database::prepare("
+			try {
-				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				Admins::getLocal($userinfo, [
-				SET `password`= :newpasswd
+					'id' => $userinfo['adminid'],
-				WHERE `adminid`= :adminid"
+					'admin_password' => $new_password
-			);
+				])->update();
-			Database::pexecute($chgpwd_stmt, array(
+			} catch (Exception $e) {
-				'newpasswd' => makeCryptPassword($new_password),
+				Response::dynamicError($e->getMessage());
-				'adminid' => (int)$userinfo['adminid']
+			}
-			));
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'changed password');
-			$log->logAction(ADM_ACTION, LOG_NOTICE, 'changed password');
+			Response::redirectTo($filename);
-			redirectTo($filename, Array('s' => $s));
 		}
 	} else {
-		eval("echo \"" . getTemplate("index/change_password") . "\";");
+		UI::view('user/change_password.html.twig');
 	}
-
 } elseif ($page == 'change_language') {
-
+	$languages = Language::getLanguages();
-	if (isset($_POST['send'])
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		&& $_POST['send'] == 'send'
+		$def_language = Validate::validate($_POST['def_language'], 'default language');
-	) {
-		$def_language = validate($_POST['def_language'], 'default language');
 
 		if (isset($languages[$def_language])) {
-			$lng_stmt = Database::prepare("
+			try {
-				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				Admins::getLocal($userinfo, [
-				SET `def_language`= :deflng
+					'id' => $userinfo['adminid'],
-				WHERE `adminid`= :adminid"
+					'def_language' => $def_language
-			);
+				])->update();
-			Database::pexecute($lng_stmt, array(
+				CurrentUser::setField('language', $def_language);
-				'deflng' => $def_language,
+			} catch (Exception $e) {
-				'adminid' => (int)$userinfo['adminid']
+				Response::dynamicError($e->getMessage());
-			));
-
-			$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(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 . "'");
-		redirectTo($filename, array('s' => $s));
+		Response::redirectTo($filename);
-
 	} else {
-
-		$language_options = '';
-
 		$default_lang = Settings::Get('panel.standardlanguage');
 		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
-		while (list($language_file, $language_name) = each($languages)) {
+		UI::view('user/change_language.html.twig', [
-			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
+			'languages' => $languages,
+			'default_lang' => $default_lang
+		]);
 	}
-
-		eval("echo \"" . getTemplate("index/change_language") . "\";");
-	}
-
 } elseif ($page == 'change_theme') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$theme = Validate::validate($_POST['theme'], 'theme');
+		try {
+			Admins::getLocal($userinfo, [
+				'id' => $userinfo['adminid'],
+				'theme' => $theme
+			])->update();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
 
-	if (isset($_POST['send'])
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		&& $_POST['send'] == 'send'
+		Response::redirectTo($filename);
-	) {
-		$theme = validate($_POST['theme'], 'theme');
-
-		$theme_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_ADMINS . "`
-				SET `theme`= :theme
-				WHERE `adminid`= :adminid"
-		);
-		Database::pexecute($theme_stmt, array(
-			'theme' => $theme,
-			'adminid' => (int)$userinfo['adminid']
-		));
-
-		$theme_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_SESSIONS . "`
-				SET `theme`= :theme
-				WHERE `hash`= :hash"
-		);
-		Database::pexecute($theme_stmt, array(
-			'theme' => $theme,
-			'hash' => $s
-		));
-
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		redirectTo($filename, array('s' => $s));
-
 	} else {
-
-		$theme_options = '';
-
 		$default_theme = Settings::Get('panel.default_theme');
 		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
-		$themes_avail = getThemes();
+		$themes_avail = UI::getThemes();
-		foreach ($themes_avail as $t => $d) {
+
-			$theme_options.= makeoption($d, $t, $default_theme, true);
+		UI::view('user/change_theme.html.twig', [
-		}
+			'themes' => $themes_avail,
-
+			'default_theme' => $default_theme
-		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+		]);
-	}
-
-} elseif ($page == 'send_error_report'
-	&& Settings::Get('system.allow_error_report_admin') == '1'
-) {
-
-	// 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 = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
-		$err_file = 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_INSTALL_DIR))),
-				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", 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(phpmailerException $e) {
-					$mailerr_msg = $e->errorMessage();
-					$_mailerror = true;
-				} catch (Exception $e) {
-					$mailerr_msg = $e->getMessage();
-					$_mailerror = true;
-				}
-
-				if ($_mailerror) {
-					// error when reporting an error...LOLFUQ
-					standard_error('send_report_error', $mailerr_msg);
-				}
-
-				// finally remove error from fs
-				@unlink($err_file);
-				redirectTo($filename, array('s' => $s));
-			}
-			// show a nice summary of the error-report
-			// before actually sending anything
-			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
-
-		} else {
-			redirectTo($filename, array('s' => $s));
-		}
-	} else {
-		redirectTo($filename, array('s' => $s));
 	}
+} elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_admin') == '1') {
+	require_once __DIR__ . '/error_report.php';
+} elseif ($page == 'apikeys' && Settings::Get('api.enabled') == 1) {
+	require_once __DIR__ . '/api_keys.php';
+} elseif ($page == '2fa' && Settings::Get('2fa.enabled') == 1) {
+	require_once __DIR__ . '/2fa.php';
 }

admin_ipsandports.php

@@ -2,437 +2,152 @@
 
 /**
  * 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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-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'
+$id = (int)Request::any('id');
-	|| $page == 'overview'
-) {
-	// 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(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 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)) {
-
-			if ($paging->checkDisplay($i)) {
-				$row = htmlentities_array($row);
-				if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-					$row['ip'] = '[' . $row['ip'] . ']';
-				}
-				eval("\$ipsandports.=\"" . getTemplate("ipsandports/ipsandports_ipandport") . "\";");
-				$count++;
-			}
-			$i++;
 		}
 
-		eval("echo \"" . getTemplate("ipsandports/ipsandports") . "\";");
+		UI::view('user/table.html.twig', [
-
+			'listing' => Listing::format($collection, $ipsandports_list_data, 'ipsandports_list'),
-	} elseif($action == 'delete'
+			'actions_links' => [
-		&& $id != 0
+				[
-	) {
+					'href' => $linker->getLink(['section' => 'ipsandports', 'page' => $page, 'action' => 'add']),
-		$result_stmt = Database::prepare("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id");
+					'label' => lng('admin.ipsandports.add')
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+				]
-
+			]
-		if (isset($result['id'])
+		]);
-			&& $result['id'] == $id
+	} elseif ($action == 'delete' && $id != 0) {
-		) {
+		try {
-			$result_checkdomain_stmt = Database::prepare("
+			$json_result = IpsAndPorts::getLocal($userinfo, [
-				SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id"
-			);
-			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array('id' => $id));
-
-			if ($result_checkdomain['id'] == '') {
-				if (!in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
-
-					$result_sameipotherport_stmt = Database::prepare("
-						SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-						WHERE `ip` = :ip AND `id` <> :id"
-					);
-					$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('id' => $id, 'ip' => $result['ip']));
-
-					if (($result['ip'] != Settings::Get('system.ipaddress'))
-						|| ($result['ip'] == Settings::Get('system.ipaddress')
-						&& $result_sameipotherport['id'] != '')
-					) {
-						$result_stmt = Database::prepare("
-							SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-							WHERE `id` = :id"
-						);
-						$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-						if ($result['ip'] != '') {
-
-							if (isset($_POST['send'])
-								&& $_POST['send'] == 'send'
-							) {
-								$del_stmt = Database::prepare("
-									DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-									WHERE `id` = :id"
-								);
-								Database::pexecute($del_stmt, array('id' => $id));
-
-								// also, remove connections to domains (multi-stack)
-								$del_stmt = Database::prepare("
-									DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports` = :id"
-								);
-								Database::pexecute($del_stmt, array('id' => $id));
-
-								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
-								inserttask('1');
-								// Using nameserver, insert a task which rebuilds the server config
-								inserttask('4');
-
-								redirectTo($filename, array('page' => $page, 's' => $s));
-
-							} else {
-								ask_yesno('admin_ip_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['ip'] . ':' . $result['port']);
-							}
-						}
-					} else {
-						standard_error('cantdeletesystemip');
-					}
-				} else {
-					standard_error('cantdeletedefaultip');
-				}
-			} else {
-				standard_error('ipstillhasdomains');
-			}
-		}
-
-	} elseif($action == 'add') {
-
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-
-			$ip = validate_ip($_POST['ip']);
-			$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-			$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
-			$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
-			$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
-			$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-			$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
-			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
-			$docroot = validate($_POST['docroot'], 'docroot');
-
-			if ((int)Settings::Get('system.use_ssl') == 1) {
-				$ssl = isset($_POST['ssl']) ? intval($_POST['ssl']) : 0;
-				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-				$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
-			} else {
-				$ssl = 0;
-				$ssl_cert_file = '';
-				$ssl_key_file = '';
-				$ssl_ca_file = '';
-				$ssl_cert_chainfile = '';
-			}
-
-			if ($listen_statement != '1') {
-				$listen_statement = '0';
-			}
-
-			if ($namevirtualhost_statement != '1') {
-				$namevirtualhost_statement = '0';
-			}
-
-			if ($vhostcontainer != '1') {
-				$vhostcontainer = '0';
-			}
-
-			if ($vhostcontainer_servername_statement != '1') {
-				$vhostcontainer_servername_statement = '0';
-			}
-
-			if ($ssl != '1') {
-				$ssl = '0';
-			}
-
-			if ($ssl_cert_file != '') {
-				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
-			}
-
-			if ($ssl_key_file != '') {
-				$ssl_key_file = makeCorrectFile($ssl_key_file);
-			}
-
-			if ($ssl_ca_file != '') {
-				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
-			}
-
-			if ($ssl_cert_chainfile != '') {
-				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
-			}
-
-			if (strlen(trim($docroot)) > 0) {
-				$docroot = makeCorrectDir($docroot);
-			} else {
-				$docroot = '';
-			}
-
-			$result_checkfordouble_stmt = Database::prepare("
-				SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-				WHERE `ip` = :ip AND `port` = :port"
-			);
-			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
-
-			if ($result_checkfordouble['id'] != '') {
-				standard_error('myipnotdouble');
-			} else {
-				$ins_stmt = Database::prepare("
-					INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET
-						`ip` = :ip, `port` = :port, `listen_statement` = :ls,
-						`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
-						`vhostcontainer_servername_statement` = :vhcss,
-						`specialsettings` = :ss, `ssl` = :ssl,
-						`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
-						`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
-						`default_vhostconf_domain` = :dvhd, `docroot` = :docroot;
-				");
-				$ins_data = array(
-					'ip' => $ip,
-					'port' => $port,
-					'ls' => $listen_statement,
-					'nvhs' => $namevirtualhost_statement,
-					'vhc' => $vhostcontainer,
-					'vhcss' => $vhostcontainer_servername_statement,
-					'ss' => $specialsettings,
-					'ssl' => $ssl,
-					'ssl_cert' => $ssl_cert_file,
-					'ssl_key' => $ssl_key_file,
-					'ssl_ca' => $ssl_ca_file,
-					'ssl_chain' => $ssl_cert_chainfile,
-					'dvhd' => $default_vhostconf_domain,
-					'docroot' => $docroot
-				);
-				Database::pexecute($ins_stmt, $ins_data);
-
-				if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-					$ip = '[' . $ip . ']';
-				}
-
-				$log->logAction(ADM_ACTION, LOG_WARNING, "added IP/port '" . $ip . ":" . $port . "'");
-				inserttask('1');
-				// Using nameserver, insert a task which rebuilds the server config
-				inserttask('4');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-
-		} else {
-
-			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
-			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
-
-			$title = $ipsandports_add_data['ipsandports_add']['title'];
-			$image = $ipsandports_add_data['ipsandports_add']['image'];
-
-			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
-		}
-
-	} elseif($action == 'edit'
-		&& $id != 0
-	) {
-		$result_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id"
-		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-		if ($result['ip'] != '') {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-
-				$ip = validate_ip($_POST['ip']);
-				$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
-				$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
-				$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
-				$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
-				$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
-				$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
-				$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
-				$docroot =  validate($_POST['docroot'], 'docroot');
-
-				$result_checkfordouble_stmt = Database::prepare("
-					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-					WHERE `ip` = :ip AND `port` = :port"
-				);
-				$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
-
-				$result_sameipotherport_stmt = Database::prepare("
-					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
-					WHERE `ip` = :ip AND `id` <> :id"
-				);
-				$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('ip' => $ip, 'id' => $id));
-
-				if ((int)Settings::Get('system.use_ssl') == 1
-					&& isset($_POST['ssl'])
-					&& $_POST['ssl'] != 0
-				) {
-					$ssl = 1;
-					$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-					$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-					$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-					$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
-				} else {
-					$ssl = 0;
-					$ssl_cert_file = '';
-					$ssl_key_file = '';
-					$ssl_ca_file = '';
-					$ssl_cert_chainfile = '';
-				}
-
-				if ($listen_statement != '1') {
-					$listen_statement = '0';
-				}
-
-				if ($namevirtualhost_statement != '1') {
-					$namevirtualhost_statement = '0';
-				}
-
-				if ($vhostcontainer != '1') {
-					$vhostcontainer = '0';
-				}
-
-				if ($vhostcontainer_servername_statement != '1') {
-					$vhostcontainer_servername_statement = '0';
-				}
-
-				if ($ssl != '1') {
-					$ssl = '0';
-				}
-
-				if ($ssl_cert_file != '') {
-					$ssl_cert_file = makeCorrectFile($ssl_cert_file);
-				}
-
-				if ($ssl_key_file != '') {
-					$ssl_key_file = makeCorrectFile($ssl_key_file);
-				}
-
-				if ($ssl_ca_file != '') {
-					$ssl_ca_file = makeCorrectFile($ssl_ca_file);
-				}
-
-				if ($ssl_cert_chainfile != '') {
-					$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
-				}
-
-				if (strlen(trim($docroot)) > 0) {
-					$docroot = makeCorrectDir($docroot);
-				} else {
-					$docroot = '';
-				}
-
-				if ($result['ip'] != $ip
-					&& $result['ip'] == Settings::Get('system.ipaddress')
-					&& $result_sameipotherport['id'] == ''
-				) {
-					standard_error('cantchangesystemip');
-
-				} elseif($result_checkfordouble['id'] != ''
-					&& $result_checkfordouble['id'] != $id
-				) {
-					standard_error('myipnotdouble');
-
-				} else {
-
-					$upd_stmt = Database::prepare("
-						UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
-						SET
-							`ip` = :ip, `port` = :port, `listen_statement` = :ls,
-							`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
-							`vhostcontainer_servername_statement` = :vhcss,
-							`specialsettings` = :ss, `ssl` = :ssl,
-							`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
-							`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
-							`default_vhostconf_domain` = :dvhd, `docroot` = :docroot
-						WHERE `id` = :id;
-					");
-					$upd_data = array(
-						'ip' => $ip,
-						'port' => $port,
-						'ls' => $listen_statement,
-						'nvhs' => $namevirtualhost_statement,
-						'vhc' => $vhostcontainer,
-						'vhcss' => $vhostcontainer_servername_statement,
-						'ss' => $specialsettings,
-						'ssl' => $ssl,
-						'ssl_cert' => $ssl_cert_file,
-						'ssl_key' => $ssl_key_file,
-						'ssl_ca' => $ssl_ca_file,
-						'ssl_chain' => $ssl_cert_chainfile,
-						'dvhd' => $default_vhostconf_domain,
-						'docroot' => $docroot,
 				'id' => $id
-					);
+			])->get();
-					Database::pexecute($upd_stmt, $upd_data);
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
-					$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
+		if (isset($result['id']) && $result['id'] == $id) {
-					inserttask('1');
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
+				try {
-					// Using nameserver, insert a task which rebuilds the server config
+					IpsAndPorts::getLocal($userinfo, [
-					inserttask('4');
+						'id' => $id
-
+					])->delete();
-					redirectTo($filename, Array('page' => $page, 's' => $s));
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
 				}
 
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
 			} else {
+				HTML::askYesNo('admin_ip_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['ip'] . ':' . $result['port']);
+			}
+		}
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				IpsAndPorts::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				Response::dynamicError($e->getMessage());
+			}
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
+		} else {
+			$ipsandports_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
 
-				$result = htmlentities_array($result);
+			UI::view('user/form.html.twig', [
+				'formaction' => $linker->getLink(['section' => 'ipsandports']),
+				'formdata' => $ipsandports_add_data['ipsandports_add']
+			]);
+		}
+	} elseif ($action == 'edit' && $id != 0) {
+		try {
+			$json_result = IpsAndPorts::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			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) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				$result = PhpHelper::htmlentitiesArray($result);
 
 				$ipsandports_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
-				$ipsandports_edit_form = 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 \"" . 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,131 +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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-if ($page == 'log'
+use Froxlor\Api\Commands\SysLog;
-   && $userinfo['change_serversettings'] == '1'
+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 paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc');
-		$result_stmt = Database::query('
-			SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit()
-		);
-		$logs_count = Database::num_rows();
-		$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'
+		UI::view('user/table.html.twig', [
-			&& $paging->sortorder == 'desc'
+			'listing' => Listing::format($collection, $syslog_list_data, 'syslog_list'),
-		) {
+			'actions_links' => [
-			krsort($clog);
+				[
-		} else {
+					'href' => $linker->getLink(['section' => 'logger', 'page' => 'log', 'action' => 'truncate']),
-			ksort($clog);
+					'label' => lng('logger.truncate'),
-		}
+					'icon' => 'fa-solid fa-recycle',
-
+					'class' => 'btn-warning'
-		$i = 0;
+				]
-		$count = 0;
+			]
-		$log_count = 0;
+		]);
-		$log = '';
-		foreach ($clog as $action => $logrows) {
-			$_action = 0;
-			foreach ($logrows as $row) {
-				if ($paging->checkDisplay($i)) {
-					$row = htmlentities_array($row);
-					$row['date'] = date("d.m.y H:i:s", $row['date']);
-
-					if ($_action != $action) {
-						switch ($action) {
-							case USR_ACTION:
-								$_action = $lng['admin']['customer'];
-								break;
-							case RES_ACTION:
-								$_action = $lng['logger']['reseller'];
-								break;
-							case ADM_ACTION:
-								$_action = $lng['logger']['admin'];
-								break;
-							case CRON_ACTION:
-								$_action = $lng['logger']['cron'];
-								break;
-							case LOGIN_ACTION:
-								$_action = $lng['logger']['login'];
-								break;
-							case LOG_ERROR:
-								$_action = $lng['logger']['intern'];
-								break;
-							default:
-								$_action = $lng['logger']['unknown'];
-								break;
-						}
-
-						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
-					}
-
-					$log_count++;
-					$row['type'] = getLogLevelDesc($row['type']);
-					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
-					$count++;
-					$_action = $action;
-				}
-				$i++;
-			}
-			$i++;
-		}
-
-		eval("echo \"" . getTemplate('logger/logger') . "\";");
-
 	} elseif ($action == 'truncate') {
-
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		if (isset($_POST['send'])
+			try {
-		   && $_POST['send'] == 'send'
+				SysLog::getLocal($userinfo, [
-		) {
+					'min_to_keep' => 10
-			$truncatedate = time() - (60 * 10);
+				])->delete();
-			$trunc_stmt = Database::prepare("
+			} catch (Exception $e) {
-				DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < :trunc"
+				Response::dynamicError($e->getMessage());
-			);
+			}
-			Database::pexecute($trunc_stmt, array('trunc' => $truncatedate));
+			Response::redirectTo($filename, [
-			$log->logAction(ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
+				'page' => $page
-			redirectTo($filename, array('page' => $page, 's' => $s));
+			]);
 		} else {
-			ask_yesno('logger_reallytruncate', $filename, array('page' => $page, 'action' => $action), TABLE_PANEL_LOG);
+			HTML::askYesNo('logger_reallytruncate', $filename, [
+				'page' => $page,
+				'action' => $action
+			], TABLE_PANEL_LOG);
 		}
 	}
 }

admin_message.php

@@ -2,56 +2,65 @@
 
 /**
  * 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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-if (isset($_POST['id'])) {
+use Froxlor\Database\Database;
-	$id = intval($_POST['id']);
+use Froxlor\FroxlorLogger;
-} elseif (isset($_GET['id'])) {
+use Froxlor\UI\Panel\UI;
-	$id = intval($_GET['id']);
+use Froxlor\UI\Request;
-}
+use Froxlor\UI\Response;
+use Froxlor\User;
+
+$id = (int)Request::any('id');
+
+$note_type = null;
+$note_msg = null;
 
 if ($page == 'message') {
 	if ($action == '') {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
 
-		if (isset($_POST['send'])
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		   && $_POST['send'] == 'send'
+			if ($_POST['recipient'] == 0 && $userinfo['customers_see_all'] == '1') {
-		) {
+				$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
-			if ($_POST['receipient'] == 0
-			   && $userinfo['customers_see_all'] == '1'
-			) {
-				$log->logAction(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(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(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"
+						WHERE `adminid` = :adminid");
-					);
+					Database::pexecute($result, [
-					Database::pexecute($result, array('adminid' => $userinfo['adminid']));
+						'adminid' => $userinfo['adminid']
+					]);
 				}
 			} else {
-				standard_error('noreceipientsgiven');
+				Response::standardError('norecipientsgiven');
 			}
 
 			$subject = $_POST['subject'];
@@ -63,10 +72,13 @@ if ($page == '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'], getCorrectUserSalutation(array('firstname' => $row['firstname'], 'name' => $row['name'], 'company' => $row['company'])));
+					$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'];
 
@@ -77,45 +89,62 @@ if ($page == 'message') {
 							$mailerr_msg = $row['email'];
 						}
 
-						$log->logAction(ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
+						$log->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
-						standard_error('errorsendingmail', $row['email']);
+						Response::standardError('errorsendingmail', $row['email']);
 					}
 
 					$mailcounter++;
 					$mail->ClearAddresses();
 				}
 
-				redirectTo($filename, array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
+				Response::redirectTo($filename, [
+					'page' => $page,
+					'action' => 'showsuccess',
+					'sentitems' => $mailcounter
+				]);
 			} else {
-				standard_error('nomessagetosend');
+				Response::standardError('nomessagetosend');
 			}
 		}
-	}
+	} elseif ($action == 'showsuccess') {
-
-	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 {
+	$recipients = [];
-		$success = 0;
-		$sentitems = 0;
-		$successmessage = '';
-	}
-
-	$action = '';
-	$receipients = '';
 
 	if ($userinfo['customers_see_all'] == '1') {
-		$receipients.= makeoption($lng['panel']['reseller'], 0);
+		$recipients[0] = lng('panel.reseller');
 	}
+	$recipients[1] = lng('panel.customer');
 
-	$receipients .= makeoption($lng['panel']['customer'], 1);
+	$messages_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/messages/formfield.messages_add.php';
-	eval("echo \"" . 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,155 +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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
+use Froxlor\FroxlorLogger;
+use Froxlor\UI\Panel\UI;
+use Froxlor\UI\Response;
+use Froxlor\UI\HTML;
 
-if ($action == 'reset' &&
+if ($action == 'reset' && function_exists('opcache_reset') && $userinfo['change_serversettings'] == '1') {
-        function_exists('opcache_reset') &&
+	if ($_POST['send'] == 'send') {
-        $userinfo['change_serversettings'] == '1'
-) {
 		opcache_reset();
-    $log->logAction(ADM_ACTION, LOG_INFO, "reseted OPcache");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "reset OPcache");
-    header('Location: ' . $linker->getLink(array('section' => 'opcacheinfo', 'page' => 'showinfo')));
+		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')) {
-) {
+	Response::standardError(lng('error.no_opcacheinfo'));
-    standard_error($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(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.=\"" . 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'])
+		]);
+	}
+
+	$directives = [];
+	ksort($config['directives']);
+	foreach ($config['directives'] as $k => $v) {
+		if (in_array($k, ['opcache.max_file_size', 'opcache.memory_consumption', 'opcache.jit_buffer_size']) && $v) {
+			$v = bsize($v) . " ({$v})";
+		} elseif ($k === 'opcache.optimization_level') {
+			$levels = [];
+			foreach ($optimizationLevels as $level => $info) {
+				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']
+					)
+				)
+			)
+		]
+	);
+
+	UI::view('settings/opcacheinfo.html.twig', [
+		'opcacheinfo' => [
+			'version' => $version,
+			'overview' => $overview,
+			'files' => $files,
+			'preload' => $preload,
+			'directives' => $directives,
+			'blacklist' => $config['blacklist'],
+			'functions' => get_extension_funcs('Zend OPcache')
+		]
+	]);
+}
+
+function bsize($size)
+{
+	$i = 0;
+	$val = ['b', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+	while (($size / 1024) > 1) {
+		$size /= 1024;
+		++$i;
+	}
+	return sprintf(
+		'%.2f%s%s',
+		$size,
+		'',
+		$val[$i]
 	);
 }
-
-    $usedkey=@$opcache_status['opcache_statistics']['num_cached_keys'] ?: 0;
-    $usedkeystr=number_format($usedkey,0,'.',' ');
-    $totalkey=@$opcache_status['opcache_statistics']['max_cached_keys'] ?: 0;
-    $wastedkey=$usedkey - (@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0);
-    if (isset($opcache_status['opcache_statistics'])) {
-        $keystat=array(
-            'total' => number_format($totalkey,0,'.',' '),
-            'used' => $usedkeystr . ($totalkey>0 ? sprintf(" (%.1f %%)", $usedkey/($totalkey)*100) : ''),
-            'wasted' => number_format($wastedkey,0,'.',' ') . ($totalkey>0 ? sprintf(" (%.1f %%)", $wastedkey/($totalkey)*100) : ''),
-        );
-    }
-    
-    $blacklistlines = '';
-    if (isset($opcache_info['blacklist']) && is_array($opcache_info['blacklist'])) {
-        foreach ($opcache_info['blacklist'] as $value) {
-            eval("\$blacklistlines.=\"" . getTemplate("settings/opcacheinfo/blacklist_line") . "\";");
-        }
-    }
-    
-    eval("echo \"" . getTemplate("settings/opcacheinfo/showinfo") . "\";");
-    
-}
-
-function bsize($s) {
-    foreach (array('', 'K', 'M', 'G') as $i => $k) {
-        if ($s < 1024)
-            break;
-        $s/=1024;
-    }
-    return sprintf("%5.1f %sBytes", $s, $k);
-}

admin_phpsettings.php

@@ -2,343 +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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-if (isset($_POST['id'])) {
+use Froxlor\Api\Commands\FpmDaemons;
-	$id = intval($_POST['id']);
+use Froxlor\Api\Commands\PhpSettings;
-} elseif (isset($_GET['id'])) {
+use Froxlor\Database\Database;
-	$id = intval($_GET['id']);
+use Froxlor\Froxlor;
-}
+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 == 'overview') {
-
 	if ($action == '') {
-
+		try {
-		$tablecontent = '';
+			$phpconf_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.phpconfigs.php';
-		$count = 0;
+			$collection = (new Collection(PhpSettings::class, $userinfo, ['with_subdomains' => true]))
-		$result = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
+				->withPagination($phpconf_list_data['phpconf_list']['columns'], $phpconf_list_data['phpconf_list']['default_sorting']);
-
+		} catch (Exception $e) {
-		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+			Response::dynamicError($e->getMessage());
-
-			$domainresult = false;
-			$query_params = array('id' => $row['id']);
-
-			$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
-					WHERE `phpsettingid` = :id
-					AND `parentdomainid` = '0'";
-
-			if ((int)$userinfo['domains_see_all'] == 0) {
-				$query .= " AND `adminid` = :adminid";
-				$query_params['adminid'] = $userinfo['adminid'];
 		}
 
-			if ((int)Settings::Get('panel.phpconfigs_hidestdsubdomain') == 1) {
+		UI::view('user/table.html.twig', [
-				$ssdids_res = Database::query("
+			'listing' => Listing::format($collection, $phpconf_list_data, 'phpconf_list'),
-					SELECT DISTINCT `standardsubdomain` FROM `".TABLE_PANEL_CUSTOMERS."`
+			'actions_links' => (bool)$userinfo['change_serversettings'] ? [
-					WHERE `standardsubdomain` > 0 ORDER BY `standardsubdomain` ASC;"
+				[
-				);
+					'href' => $linker->getLink(['section' => 'phpsettings', 'page' => $page, 'action' => 'add']),
-				$ssdids = array();
+					'label' => lng('admin.phpsettings.addnew')
-				while ($ssd = $ssdids_res->fetch(PDO::FETCH_ASSOC)) {
+				]
-					$ssdids[] = $ssd['standardsubdomain'];
+			] : []
-				}
+		]);
-				if (count($ssdids) > 0) {
-					$query .= " AND `id` NOT IN (".implode(', ', $ssdids).")";
-				}
-			}
-
-			$domainresult_stmt = Database::prepare($query);
-			Database::pexecute($domainresult_stmt, $query_params);
-
-			$domains = '';
-			if (Database::num_rows() > 0) {
-				while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$domains.= $row2['domain'] . '<br/>';
-				}
-			}
-
-			// check whether we use that config as froxor-vhost config
-			if (Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $row['id']
-				|| Settings::Get('phpfpm.vhost_defaultini') == $row['id']
-			) {
-				$domains .= Settings::Get('system.hostname');
-			}
-
-			if ($domains == '') {
-				$domains = $lng['admin']['phpsettings']['notused'];
-			}
-
-			// check whether this is our default config
-			if ((Settings::Get('system.mod_fcgid') == '1'
-				&& Settings::Get('system.mod_fcgid_defaultini') == $row['id'])
-				|| (Settings::Get('phpfpm.enabled') == '1'
-				&& Settings::Get('phpfpm.defaultini') == $row['id'])
-			) {
-				$row['description'] = '<b>'.$row['description'].'</b>';
-			}
-
-			$count ++;
-			eval("\$tablecontent.=\"" . getTemplate("phpconfig/overview_overview") . "\";");
-		}
-
-		$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting overview has been viewed by '" . $userinfo['loginname'] . "'");
-		eval("echo \"" . getTemplate("phpconfig/overview") . "\";");
 	}
 
 	if ($action == 'add') {
-
 		if ((int)$userinfo['change_serversettings'] == 1) {
-
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			if (isset($_POST['send'])
+				try {
-				&& $_POST['send'] == 'send'
+					PhpSettings::getLocal($userinfo, $_POST)->add();
-			) {
+				} catch (Exception $e) {
-				$description = validate($_POST['description'], 'description');
+					Response::dynamicError($e->getMessage());
-				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
-
-				if (Settings::Get('system.mod_fcgid') == 1) {
-					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
-					// disable fpm stuff
-					$fpm_enableslowlog = 0;
-					$fpm_reqtermtimeout = 0;
-					$fpm_reqslowtimeout = 0;
 				}
-				elseif (Settings::Get('phpfpm.enabled') == 1) {
+				Response::redirectTo($filename, [
-					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0;
+					'page' => $page
-					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+				]);
-					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					// disable fcgid stuff
-					$binary = '/usr/bin/php-cgi';
-					$file_extensions = 'php';
-					$mod_fcgid_starter = 0;
-					$mod_fcgid_maxrequests = 0;
-					$mod_fcgid_umask = "022";
-				}
-
-				if (strlen($description) == 0
-					|| strlen($description) > 50
-				) {
-					standard_error('descriptioninvalid');
-				}
-
-				$ins_stmt = Database::prepare("
-					INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET
-						`description` = :desc,
-						`binary` = :binary,
-						`file_extensions` = :fext,
-						`mod_fcgid_starter` = :starter,
-						`mod_fcgid_maxrequests` = :mreq,
-						`mod_fcgid_umask` = :umask,
-						`fpm_slowlog` = :fpmslow,
-						`fpm_reqterm` = :fpmreqterm,
-						`fpm_reqslow` = :fpmreqslow,
-						`phpsettings` = :phpsettings"
-				);
-				$ins_data = array(
-					'desc' => $description,
-					'binary' => $binary,
-					'fext' => $file_extensions,
-					'starter' => $mod_fcgid_starter,
-					'mreq' => $mod_fcgid_maxrequests,
-					'umask' => $mod_fcgid_umask,
-					'fpmslow' => $fpm_enableslowlog,
-					'fpmreqterm' => $fpm_reqtermtimeout,
-					'fpmreqslow' => $fpm_reqslowtimeout,
-					'phpsettings' => $phpsettings
-				);
-				Database::pexecute($ins_stmt, $ins_data);
-
-				inserttask('1');
-				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been created by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, array('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);
-
-				$phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
-				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
-
-				$title = $phpconfig_add_data['phpconfig_add']['title'];
-				$image = $phpconfig_add_data['phpconfig_add']['image'];
-
-				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
 				}
 
+				$fpmconfigs = [];
+				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
+				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
+					$fpmconfigs[$row['id']] = $row['description'];
+				}
+
+				$phpconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
+
+				UI::view('user/form-replacers.html.twig', [
+					'formaction' => $linker->getLink(['section' => 'phpsettings']),
+					'formdata' => $phpconfig_add_data['phpconfig_add'],
+					'replacers' => $phpconfig_add_data['phpconfig_replacers']
+				]);
+			}
 		} else {
-			standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 
 	if ($action == 'delete') {
-
+		try {
-		$result_stmt = Database::prepare("
+			$json_result = PhpSettings::getLocal($userinfo, [
-			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
+				'id' => $id
-		);
+			])->get();
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+		} catch (Exception $e) {
-
+			Response::dynamicError($e->getMessage());
-		if ((Settings::Get('system.mod_fcgid') == '1'
-			&& Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $id)
-			|| (Settings::Get('phpfpm.enabled') == '1'
-			&& Settings::Get('phpfpm.vhost_defaultini') == $id)
-		) {
-			standard_error('cannotdeletehostnamephpconfig');
 		}
+		$result = json_decode($json_result, true)['data'];
 
-		if ((Settings::Get('system.mod_fcgid') == '1'
+		if ($result['id'] != 0 && $result['id'] == $id && (int)$userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
-			&& Settings::Get('system.mod_fcgid_defaultini') == $id)
+		{
-			|| (Settings::Get('phpfpm.enabled') == '1'
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			&& Settings::Get('phpfpm.defaultini') == $id)
+				try {
-		) {
+					PhpSettings::getLocal($userinfo, [
-			standard_error('cannotdeletedefaultphpconfig');
+						'id' => $id
+					])->delete();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
 				}
-
+				Response::redirectTo($filename, [
-		if ($result['id'] != 0
+					'page' => $page
-			&& $result['id'] == $id
+				]);
-			&& (int)$userinfo['change_serversettings'] == 1
-			&& $id != 1 // cannot delete the default php.config
-		) {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-				// set php-config to default for all domains using the
-				// config that is to be deleted
-				$upd_stmt = Database::prepare("
-					UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
-					`phpsettingid` = '1' WHERE `phpsettingid` = :id"
-				);
-				Database::pexecute($upd_stmt, array('id' => $id));
-
-				$del_stmt = Database::prepare("
-					DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
-				);
-				Database::pexecute($del_stmt, array('id' => $id));
-
-				inserttask('1');
-				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with id #" . (int)$id . " has been deleted by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-
 			} else {
-				ask_yesno('phpsetting_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['description']);
+				HTML::askYesNo('phpsetting_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['description']);
 			}
 		} else {
-			standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 
 	if ($action == 'edit') {
-
+		try {
-		$result_stmt = Database::prepare("
+			$json_result = PhpSettings::getLocal($userinfo, [
-			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id"
-		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id));
-
-		if ($result['id'] != 0
-			&& $result['id'] == $id
-			&& (int)$userinfo['change_serversettings'] == 1
-		) {
-
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-				$description = validate($_POST['description'], 'description');
-				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
-
-				if (Settings::Get('system.mod_fcgid') == 1) {
-					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
-					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
-					// disable fpm stuff
-					$fpm_enableslowlog = 0;
-					$fpm_reqtermtimeout = 0;
-					$fpm_reqslowtimeout = 0;
-				}
-				elseif (Settings::Get('phpfpm.enabled') == 1) {
-					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int)$_POST['phpfpm_enable_slowlog'] : 0;
-					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
-					// disable fcgid stuff
-					$binary = '/usr/bin/php-cgi';
-					$file_extensions = 'php';
-					$mod_fcgid_starter = 0;
-					$mod_fcgid_maxrequests = 0;
-					$mod_fcgid_umask = "022";
-				}
-
-				if (strlen($description) == 0
-					|| strlen($description) > 50
-				) {
-					standard_error('descriptioninvalid');
-				}
-
-				$upd_stmt = Database::prepare("
-					UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET
-						`description` = :desc,
-						`binary` = :binary,
-						`file_extensions` = :fext,
-						`mod_fcgid_starter` = :starter,
-						`mod_fcgid_maxrequests` = :mreq,
-						`mod_fcgid_umask` = :umask,
-						`fpm_slowlog` = :fpmslow,
-						`fpm_reqterm` = :fpmreqterm,
-						`fpm_reqslow` = :fpmreqslow,
-						`phpsettings` = :phpsettings
-					WHERE `id` = :id"
-				);
-				$upd_data = array(
-						'desc' => $description,
-						'binary' => $binary,
-						'fext' => $file_extensions,
-						'starter' => $mod_fcgid_starter,
-						'mreq' => $mod_fcgid_maxrequests,
-						'umask' => $mod_fcgid_umask,
-						'fpmslow' => $fpm_enableslowlog,
-						'fpmreqterm' => $fpm_reqtermtimeout,
-						'fpmreqslow' => $fpm_reqslowtimeout,
-						'phpsettings' => $phpsettings,
 				'id' => $id
-				);
+			])->get();
-				Database::pexecute($upd_stmt, $upd_data);
+		} catch (Exception $e) {
-
+			Response::dynamicError($e->getMessage());
-				inserttask('1');
+		}
-				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been changed by '" . $userinfo['loginname'] . "'");
+		$result = json_decode($json_result, true)['data'];
-				redirectTo($filename, array('page' => $page, 's' => $s));
 
+		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) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
 			} else {
+				$fpmconfigs = [];
+				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
+				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
+					$fpmconfigs[$row['id']] = $row['description'];
+				}
 
 				$phpconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
-				$phpconfig_edit_form = 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 \"" . getTemplate("phpconfig/overview_edit") . "\";");
+					'replacers' => $phpconfig_edit_data['phpconfig_replacers'],
+					'editid' => $id
+				]);
 			}
-
 		} else {
-			standard_error('nopermissionsorinvalidid');
+			Response::standardError('nopermissionsorinvalidid');
+		}
+	}
+} elseif ($page == 'fpmdaemons') {
+	if ($action == '') {
+		try {
+			$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) {
+			Response::dynamicError($e->getMessage());
+		}
+
+		UI::view('user/table.html.twig', [
+			'listing' => Listing::format($collection, $fpmconf_list_data, 'fpmconf_list'),
+			'actions_links' => (bool)$userinfo['change_serversettings'] ? [
+				[
+					'href' => $linker->getLink(['section' => 'phpsettings', 'page' => $page, 'action' => 'add']),
+					'label' => lng('admin.fpmsettings.addnew')
+				]
+			] : []
+		]);
+	}
+
+	if ($action == 'add') {
+		if ((int)$userinfo['change_serversettings'] == 1) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					FpmDaemons::getLocal($userinfo, $_POST)->add();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				$fpmconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php';
+
+				UI::view('user/form-replacers.html.twig', [
+					'formaction' => $linker->getLink(['section' => 'phpsettings', 'page' => 'fpmdaemons']),
+					'formdata' => $fpmconfig_add_data['fpmconfig_add'],
+					'replacers' => $fpmconfig_add_data['fpmconfig_replacers']
+				]);
+			}
+		} else {
+			Response::standardError('nopermissionsorinvalidid');
+		}
+	}
+
+	if ($action == 'delete') {
+		try {
+			$json_result = FpmDaemons::getLocal($userinfo, [
+				'id' => $id
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if ($id == 1) {
+			Response::standardError('cannotdeletedefaultphpconfig');
+		}
+
+		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) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				HTML::askYesNo('fpmsetting_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['description']);
+			}
+		} else {
+			Response::standardError('nopermissionsorinvalidid');
+		}
+	}
+
+	if ($action == 'edit') {
+		try {
+			$json_result = FpmDaemons::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['change_serversettings'] == 1) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					FpmDaemons::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				$fpmconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php';
+
+				UI::view('user/form-replacers.html.twig', [
+					'formaction' => $linker->getLink(['section' => 'phpsettings', 'page' => 'fpmdaemons', 'id' => $id]),
+					'formdata' => $fpmconfig_edit_data['fpmconfig_edit'],
+					'replacers' => $fpmconfig_edit_data['fpmconfig_replacers'],
+					'editid' => $id
+				]);
+			}
+		} else {
+			Response::standardError('nopermissionsorinvalidid');
 		}
 	}
 }

admin_plans.php

@@ -0,0 +1,278 @@
+<?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\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;
+
+$id = (int)Request::any('id');
+
+if ($page == '' || $page == 'overview') {
+	if ($action == '') {
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_plans");
+
+		try {
+			$plan_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.plans.php';
+			$collection = (new Collection(HostingPlans::class, $userinfo))
+				->withPagination($plan_list_data['plan_list']['columns'], $plan_list_data['plan_list']['default_sorting']);
+		} catch (Exception $e) {
+			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 (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					HostingPlans::getLocal($userinfo, [
+						'id' => $id
+					])->delete();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} else {
+				HTML::askYesNo('plan_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['name']);
+			}
+		} else {
+			Response::standardError('nopermissionsorinvalidid');
+		}
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				HostingPlans::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				Response::dynamicError($e->getMessage());
+			}
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
+		} 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 */
+			}
+
+			$phpconfigs = [];
+			$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) {
+					$phpconfigs[] = [
+						'label' => $row['description'] . " [" . $row['interpreter'] . "]",
+						'value' => $row['id']
+					];
+				} else {
+					$phpconfigs[] = [
+						'label' => $row['description'],
+						'value' => $row['id']
+					];
+				}
+			}
+
+			// dummy to avoid unknown variables
+			$hosting_plans = null;
+
+			$plans_add_data = include_once __DIR__ . '/lib/formfields/admin/plans/formfield.plans_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']);
+
+			UI::view('user/form.html.twig', [
+				'formaction' => $linker->getLink(['section' => 'plans']),
+				'formdata' => $plans_add_data['plans_add']
+			]);
+		}
+	} elseif ($action == 'edit' && $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['name'] != '') {
+			$result['value'] = json_decode($result['value'], true);
+			$result = PhpHelper::htmlentitiesArray($result);
+
+			foreach ($result['value'] as $index => $value) {
+				$result[$index] = $value;
+			}
+			$result['allowed_phpconfigs'] = json_encode($result['allowed_phpconfigs']);
+
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					HostingPlans::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
+			} 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 */
+				}
+
+				$phpconfigs = [];
+				$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) {
+						$phpconfigs[] = [
+							'label' => $row['description'] . " [" . $row['interpreter'] . "]",
+							'value' => $row['id']
+						];
+					} else {
+						$phpconfigs[] = [
+							'label' => $row['description'],
+							'value' => $row['id']
+						];
+					}
+				}
+
+				$result['imap'] = $result['email_imap'];
+				$result['pop3'] = $result['email_pop3'];
+
+				// dummy to avoid unknown variables
+				$result['loginname'] = null;
+				$result['documentroot'] = null;
+				$result['standardsubdomain'] = null;
+				$result['deactivated'] = null;
+				$result['def_language'] = null;
+				$result['firstname'] = null;
+				$result['gender'] = null;
+				$result['company'] = null;
+				$result['street'] = null;
+				$result['zipcode'] = null;
+				$result['city'] = null;
+				$result['phone'] = null;
+				$result['fax'] = null;
+				$result['email'] = null;
+				$result['customernumber'] = null;
+				$result['custom_notes'] = null;
+				$result['custom_notes_show'] = null;
+				$result['api_allowed'] = null;
+				$hosting_plans = null;
+				$admin_select = [];
+
+				$plans_edit_data = include_once __DIR__ . '/lib/formfields/admin/plans/formfield.plans_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']);
+
+				UI::view('user/form.html.twig', [
+					'formaction' => $linker->getLink(['section' => 'plans', 'id' => $id]),
+					'formdata' => $plans_edit_data['plans_edit'],
+					'editid' => $id
+				]);
+			}
+		}
+	} elseif ($action == 'jqGetPlanValues') {
+		$planid = (int)Request::any('planid', 0);
+		try {
+			$json_result = HostingPlans::getLocal($userinfo, [
+				'id' => $planid
+			])->get();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+		echo $result['value'];
+		exit();
+	}
+}

admin_settings.php

@@ -2,38 +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', '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;
 
-// get sql-root access data
+const AREA = 'admin';
-Database::needRoot(true);
+require __DIR__ . '/lib/init.php';
-Database::needSqlData();
-$sql_root = Database::getSqlData();
-Database::needRoot(false);
 
 if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
-	$settings_data = loadConfigArrayDir('./actions/admin/settings/');
+	$settings_data = PhpHelper::loadConfigArrayDir('./actions/admin/settings/');
-	$settings = loadSettings($settings_data);
+	Settings::loadSettingsInto($settings_data);
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
 
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
 		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
@@ -48,7 +62,6 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 				$settings_part = true;
 			}
 			$only_enabledisable = false;
-
 		} else {
 			$settings_all = false;
 			$settings_part = false;
@@ -56,192 +69,135 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		}
 
 		// check if the session timeout is too low #815
-		if (isset($_POST['session_sessiontimeout'])
+		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] < 60) {
-			&& $_POST['session_sessiontimeout'] < 60
+			Response::standardError(lng('error.session_timeout'), lng('error.session_timeout_desc'));
-		) {
-			standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
 		}
 
-		if (processFormEx(
+		try {
-			$settings_data,
+			if (Form::processForm($settings_data, $_POST, [
-			$_POST,
+				'filename' => $filename,
-			array('filename' => $filename, 'action' => $action, 'page' => $page),
+				'action' => $action,
-			$_part,
+				'page' => $page
-			$settings_all,
+			], $_part, $settings_all, $settings_part, $only_enabledisable)) {
-			$settings_part,
+				$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
-			$only_enabledisable
+				Cronjob::inserttask(TaskId::REBUILD_VHOST);
-			)
-		) {
-			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
-			inserttask('1');
 				// Using nameserver, insert a task which rebuilds the server config
-			inserttask('4');
+				Cronjob::inserttask(TaskId::REBUILD_DNS);
+				// cron.d file
+				Cronjob::inserttask(TaskId::REBUILD_CRON);
 
-			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
+				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 = 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 .= \"" . getTemplate("settings/settings_overview") . "\";");
 		} else {
-			eval("\$settings_page .= \"" . getTemplate("settings/settings") . "\";");
+			$em = Request::any('em', '');
+			UI::view('settings/detailpart.html.twig', ['fields' => $fields, 'em' => $em]);
 		}
-
-		eval("echo \"" . getTemplate("settings/settings_form_begin") . "\";");
-		eval("echo \$settings_page;");
-		eval("echo \"" . getTemplate("settings/settings_form_end") . "\";");
-
 	}
-
+} elseif ($page == 'phpinfo' && $userinfo['change_serversettings'] == '1') {
-} elseif($page == 'phpinfo'
-	&& $userinfo['change_serversettings'] == '1'
-) {
 	ob_start();
 	phpinfo();
-	$phpinfo = array('phpinfo' => array());
+	$phpinfo = [
-	if (preg_match_all(
+		'phpinfo' => []
-			'#(?:<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
+	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($match[3], $match[4]) : $match[3];
+				$phpinfo[$end][$match[2]] = isset($match[4]) ? [
+					$match[3],
+					$match[4]
+				] : $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 .= \"" . getTemplate("settings/phpinfo/phpinfo_3") . "\";");
-				} elseif (is_string($key)) {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_2") . "\";");
 	} else {
-					eval("\$phpinfoentries .= \"" . 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;
+	]);
-			}
+} elseif ($page == 'rebuildconfigs' && $userinfo['change_serversettings'] == '1') {
-			eval("\$phpinfohtml .= \"" . getTemplate("settings/phpinfo/phpinfo_table") . "\";");
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		}
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles");
-		$phpinfo = $phpinfohtml;
+		Cronjob::inserttask(TaskId::REBUILD_VHOST);
-	} else {
+		Cronjob::inserttask(TaskId::CREATE_QUOTA);
-		standard_error($lng['error']['no_phpinfo']);
-	}
-	eval("echo \"" . getTemplate("settings/phpinfo") . "\";");
-
-} elseif($page == 'rebuildconfigs'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
-		$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles");
-		inserttask('1');
-		inserttask('10');
 		// Using nameserver, insert a task which rebuilds the server config
-		inserttask('4');
+		Cronjob::inserttask(TaskId::REBUILD_DNS);
 		// cron.d file
-		inserttask('99');
+		Cronjob::inserttask(TaskId::REBUILD_CRON);
-
-		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 
+		Response::standardSuccess('rebuildingconfigs', '', [
+			'filename' => 'admin_index.php'
+		]);
 	} else {
-		ask_yesno('admin_configs_reallyrebuild', $filename, array('page' => $page));
+		HTML::askYesNo('admin_configs_reallyrebuild', $filename, [
+			'page' => $page
+		]);
 	}
-
+} elseif ($page == 'updatecounters' && $userinfo['change_serversettings'] == '1') {
-} elseif($page == 'updatecounters'
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-	&& $userinfo['change_serversettings'] == '1'
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "updated resource-counters");
-) {
+		$updatecounters = User::updateCounters(true);
-
+		UI::view('user/resource-counter.html.twig', [
-	if (isset($_POST['send'])
+			'counters' => $updatecounters
-		&& $_POST['send'] == 'send'
+		]);
-	) {
-
-		$log->logAction(ADM_ACTION, LOG_INFO, "updated resource-counters");
-		$updatecounters = updateCounters(true);
-		$customers = '';
-		foreach ($updatecounters['customers'] as $customerid => $customer) {
-			eval("\$customers.=\"" . getTemplate("settings/updatecounters_row_customer") . "\";");
-		}
-
-		$admins = '';
-		foreach ($updatecounters['admins'] as $adminid => $admin) {
-			eval("\$admins.=\"" . getTemplate("settings/updatecounters_row_admin") . "\";");
-		}
-
-		eval("echo \"" . getTemplate("settings/updatecounters") . "\";");
-
 	} else {
-		ask_yesno('admin_counters_reallyupdate', $filename, array('page' => $page));
+		HTML::askYesNo('admin_counters_reallyupdate', $filename, [
+			'page' => $page
+		]);
 	}
-
+} elseif ($page == 'wipecleartextmailpws' && $userinfo['change_serversettings'] == '1') {
-} elseif ($page == 'wipecleartextmailpws'
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-	&& $userinfo['change_serversettings'] == '1'
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
-) {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
-		$log->logAction(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'");
-		redirectTo($filename, array('s' => $s));
+		Response::redirectTo($filename);
-
 	} else {
-		ask_yesno('admin_cleartextmailpws_reallywipe', $filename, array('page' => $page));
+		HTML::askYesNo('admin_cleartextmailpws_reallywipe', $filename, [
+			'page' => $page
+		]);
 	}
-
+} elseif ($page == 'wipequotas' && $userinfo['change_serversettings'] == '1') {
-} elseif($page == 'wipequotas'
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-	&& $userinfo['change_serversettings'] == '1'
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
-) {
-
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-
-		$log->logAction(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'");
-		redirectTo($filename, array('s' => $s));
+		Response::redirectTo($filename);
-
 	} else {
-		ask_yesno('admin_quotas_reallywipe', $filename, array('page' => $page));
+		HTML::askYesNo('admin_quotas_reallywipe', $filename, [
+			'page' => $page
+		]);
 	}
-
+} elseif ($page == 'enforcequotas' && $userinfo['change_serversettings'] == '1') {
-} elseif ($page == 'enforcequotas'
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-	&& $userinfo['change_serversettings'] == '1'
-) {
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
 		// Fetch all accounts
 		$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
@@ -250,7 +206,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('diff' => $difference, 'customerid' => $customerid));
+				Database::pexecute($upd_stmt, [
+					'diff' => $difference,
+					'customerid' => $customerid
+				]);
 			}
 		}
 
@@ -258,35 +217,205 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		$upd_stmt = Database::prepare("
 			UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = :quota
 		");
-		Database::pexecute($upd_stmt, array('quota' => Settings::Get('system.mail_quota')));
+		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(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');
-		redirectTo($filename, array('s' => $s));
+		Response::redirectTo($filename);
-
 	} else {
-		ask_yesno('admin_quotas_reallyenforce', $filename, array('page' => $page));
+		HTML::askYesNo('admin_quotas_reallyenforce', $filename, [
+			'page' => $page
+		]);
 	}
-} elseif ($page == 'integritycheck'
+} elseif ($page == 'integritycheck' && $userinfo['change_serversettings'] == '1') {
-	&& $userinfo['change_serversettings'] == '1'
-) {
 	$integrity = new IntegrityCheck();
-	if (isset($_POST['send'])
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		&& $_POST['send'] == 'send'
-	) {
 		$integrity->fixAll();
-	} elseif(isset($_GET['action'])
+	} elseif (isset($_GET['action']) && $_GET['action'] == "fix") {
-		 && $_GET['action'] == "fix") {
+		HTML::askYesNo('admin_integritycheck_reallyfix', $filename, [
-		ask_yesno('admin_integritycheck_reallyfix', $filename, array('page' => $page));
+			'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.=\"" . getTemplate("settings/integritycheck_row") . "\";");
+			'checkdesc' => lng('integrity_check.' . $check)
+		];
 	}
-	eval("echo \"" . 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')) {
+		Response::standardError('jsonextensionnotfound');
+	}
+
+	if (isset($_GET['action']) && $_GET['action'] == "export") {
+		// export
+		try {
+			$json_result = Froxlor::getLocal($userinfo)->exportSettings();
+			$json_export = json_decode($json_result, true)['data'];
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
+		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();
+	} elseif (isset($_GET['action']) && $_GET['action'] == "import") {
+		// import
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			// get uploaded file
+			if (isset($_FILES["import_file"]["tmp_name"])) {
+				$imp_content = file_get_contents($_FILES["import_file"]["tmp_name"]);
+				try {
+					Froxlor::getLocal($userinfo, [
+						'json_str' => $imp_content
+					])->importSettings();
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
+				}
+				Response::standardSuccess('settingsimported', '', [
+					'filename' => 'admin_settings.php'
+				]);
+			}
+			Response::dynamicError("Upload failed");
+		}
+	} else {
+		$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
+		$testmail = new 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';
+			$testmail->Username = Settings::Get('system.mail_smtp_user');
+			$testmail->Password = Settings::Get('system.mail_smtp_passwd');
+			if (Settings::Get('system.mail_smtp_usetls')) {
+				$testmail->SMTPSecure = 'tls';
+			} else {
+				$testmail->SMTPAutoTLS = false;
+			}
+			$testmail->Port = Settings::Get('system.mail_smtp_port');
+		}
+
+		$_mailerror = 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') != '') {
+				$testmail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
+			}
+
+			try {
+				$testmail->Subject = "Froxlor Test-Mail";
+				$mail_body = "Yay, this worked :)";
+				$testmail->AltBody = $mail_body;
+				$testmail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+				$testmail->AddAddress($test_addr);
+				$testmail->Send();
+			} catch (\PHPMailer\PHPMailer\Exception $e) {
+				$note_type = 'danger';
+				$note_msg = $e->getMessage();
+				$_mailerror = true;
+			} catch (Exception $e) {
+				$note_type = 'danger';
+				$note_msg = $e->getMessage();
+				$_mailerror = true;
+			}
+
+			if (!$_mailerror) {
+				// success
+				$mail->ClearAddresses();
+				Response::standardSuccess('testmailsent', '', [
+					'filename' => 'admin_settings.php',
+					'page' => 'testmail'
+				]);
+			}
+		} else {
+			// invalid sender e-mail
+			$note_type = 'warning';
+			$note_msg = "Invalid sender e-mail address: " . Settings::Get('panel.adminmail');
+		}
+	}
+
+	$mailtest_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/settings/formfield.settings_mailtest.php';
+
+	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,267 +2,318 @@
 
 /**
  * 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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-if (isset($_POST['subjectid'])) {
+use Froxlor\Database\Database;
-	$subjectid = intval($_POST['subjectid']);
+use Froxlor\FroxlorLogger;
-	$mailbodyid = intval($_POST['mailbodyid']);
+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;
 
-} elseif(isset($_GET['subjectid'])) {
+$id = (int)Request::any('id');
-	$subjectid = intval($_GET['subjectid']);
+$subjectid = intval(Request::any('subjectid'));
-	$mailbodyid = intval($_GET['mailbodyid']);
+$mailbodyid = intval(Request::any('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) {
-	array_push($available_templates,
+	array_push($available_templates, 'trafficmaxpercent', 'diskmaxpercent');
-		'trafficmaxpercent',
+}
-		'diskmaxpercent'
+if (Settings::Get('panel.sendalternativemail') == 1) {
-	);
+	array_push($available_templates, 'pop_success_alternative');
 }
 
-if ((int)Settings::Get('ticket.enabled') == 1) {
+$file_templates = [
-	array_push($available_templates,
-		'new_ticket_by_customer',
-		'new_ticket_for_customer',
-		'new_ticket_by_staff',
-		'new_reply_ticket_by_customer',
-		'new_reply_ticket_by_staff'
-	);
-}
-
-$file_templates = array(
 	'index_html'
-);
+];
+
+$languages = Language::getLanguages();
 
 if ($action == '') {
 	// email templates
-	$log->logAction(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('adminid' => $userinfo['adminid']));
+	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.=\"" . getTemplate("templates/templates_template") . "\";");
+				'template' => lng('admin.templates.' . $action),
+				'language' => $language
+			];
 		}
 	}
 
-	$add = false;
+	$mail_actions_links = false;
-	while (list($language_file, $language_name) = each($languages)) {
+	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('adminid' => $userinfo['adminid'], 'lang' => $language_name));
+		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'"
+		WHERE `adminid` = :adminid AND `templategroup`='files'");
-	);
+	Database::pexecute($result_stmt, [
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
+		'adminid' => $userinfo['adminid']
-
+	]);
-	if (Database::num_rows() != count($file_templates)) {
-		$filetemplateadd = true;
-	}
 
+	$filetemplates = [];
 	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-		eval("\$filetemplates.=\"" . getTemplate("templates/templates_filetemplate") . "\";");
+		$filetemplates[] = [
+			'id' => $row['id'],
+			'template' => lng('admin.templates.' . $row['varname'])
+		];
 	}
-	eval("echo \"" . getTemplate("templates/templates") . "\";");
 
-} elseif($action == 'delete'
+	$file_actions_links = false;
-	&& $subjectid != 0
+	if (Database::num_rows() != count($file_templates)) {
-	&& $mailbodyid != 0
+		$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"
+		WHERE `adminid` = :adminid AND `id` = :id");
-	);
+	Database::pexecute($result_stmt, [
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $subjectid));
+		'adminid' => $userinfo['adminid'],
+		'id' => $subjectid
+	]);
 	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 	if ($result['varname'] != '') {
-		if (isset($_POST['send'])
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			&& $_POST['send'] == 'send'
-		) {
 			$del_stmt = Database::prepare("
 				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
 				WHERE `adminid` = :adminid
-				AND (`id` = :ida OR `id` = :idb)"
+				AND (`id` = :ida OR `id` = :idb)");
-			);
+			Database::pexecute($del_stmt, [
-			Database::pexecute($del_stmt, array(
 				'adminid' => $userinfo['adminid'],
 				'ida' => $subjectid,
 				'idb' => $mailbodyid
-			));
+			]);
-			$log->logAction(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'])) . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
+			Response::redirectTo($filename, [
-
+				'page' => $page
+			]);
 		} else {
-			ask_yesno('admin_template_reallydelete', $filename, array('subjectid' => $subjectid, 'mailbodyid' => $mailbodyid, 'page' => $page, 'action' => $action), $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]);
+			HTML::askYesNo('admin_template_reallydelete', $filename, [
+				'subjectid' => $subjectid,
+				'mailbodyid' => $mailbodyid,
+				'page' => $page,
+				'action' => $action
+			], $result['language'] . ' - ' . lng('admin.templates.' . str_replace('_subject', '', $result['varname'])));
 		}
 	}
-
+} elseif ($action == 'deletef' && $id != 0) {
-} elseif($action == 'deletef'
-	&& $id != 0
-) {
 	// file templates
 	$result_stmt = Database::prepare("
 		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :id"
+		WHERE `adminid` = :adminid AND `id` = :id");
-	);
+	Database::pexecute($result_stmt, [
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
+		'adminid' => $userinfo['adminid'],
+		'id' => $id
+	]);
 
 	if (Database::num_rows() > 0) {
-
 		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if (isset($_POST['send'])
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			&& $_POST['send'] == 'send'
-		) {
 			$del_stmt = Database::prepare("
 				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid AND `id` = :id"
+				WHERE `adminid` = :adminid AND `id` = :id");
-			);
+			Database::pexecute($del_stmt, [
-			Database::pexecute($del_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
+				'adminid' => $userinfo['adminid'],
-			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
+				'id' => $id
-			redirectTo($filename, array('page' => $page, 's' => $s));
+			]);
-
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . lng('admin.templates.' . $row['varname']) . "'");
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
 		} else {
-			ask_yesno('admin_template_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $lng['admin']['templates'][$row['varname']]);
+			HTML::askYesNo('admin_template_reallydelete', $filename, [
+				'id' => $id,
+				'page' => $page,
+				'action' => $action
+			], lng('admin.templates.' . $row['varname']));
 		}
-
 	} else {
-		standard_error('templatenotfound');
+		Response::standardError('templatenotfound');
 	}
-
 } elseif ($action == 'add') {
-
+	if (isset($_POST['prepare']) && $_POST['prepare'] == 'prepare') {
-	if (Settings::Get('panel.sendalternativemail') == 1) {
-		$available_templates[] = 'pop_success_alternative';
-	}
-
-	if (isset($_POST['prepare'])
-		&& $_POST['prepare'] == 'prepare'
-	) {
 		// email templates
-		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$language = htmlentities(Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = validate($_POST['template'], 'template');
+		if (!array_key_exists($language, $languages)) {
+			Response::standardError('templatelanguageinvalid');
+		}
+		$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 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 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 = 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 \"" . getTemplate("templates/templates_add_2") . "\";");
+			'replacers' => $template_add_data['template_replacers']
-
+		]);
-	} elseif(isset($_POST['send'])
+	} elseif (isset($_POST['send']) && $_POST['send'] == 'send' && !isset($_POST['filesend'])) {
-		&& $_POST['send'] == 'send'
-	) {
 		// email templates
-		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$language = htmlentities(Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = validate($_POST['template'], 'template');
+		if (!array_key_exists($language, $languages)) {
-		$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+			Response::standardError('templatelanguageinvalid');
-		$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		}
-		$templates = array();
+		$template = Validate::validate($_POST['template'], 'template');
+		$subject = Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+		$mailbody = Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		$templates = [];
 		$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, [
-		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language));
+			'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)) {
-			standard_error('templatenotfound');
+			Response::standardError('templatenotfound');
-
 		} else {
 			$ins_stmt = Database::prepare("
 				INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
@@ -270,37 +321,35 @@ if ($action == '') {
 					`language` = :lang,
 					`templategroup` = 'mails',
 					`varname` = :var,
-					`value` = :value"
+					`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(ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
 		}
-
+	} elseif (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
-	} elseif(isset($_POST['filesend'])
-		&& $_POST['filesend'] == 'filesend'
-	) {
 		// file templates
-		$template = validate($_POST['template'], 'template');
+		$template = Validate::validate($_POST['template'], 'template');
-		$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
+		$filecontent = Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 
 		$ins_stmt = Database::prepare("
 			INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
@@ -308,34 +357,35 @@ if ($action == '') {
 				`language` = '',
 				`templategroup` = 'files',
 				`varname` = :var,
-				`value` = :value"
+				`value` = :value");
-		);
 
-		$ins_data = array(
+		$ins_data = [
 			'adminid' => $userinfo['adminid'],
 			'var' => $template,
 			'value' => $filecontent
-		);
+		];
 		Database::pexecute($ins_stmt, $ins_data);
 
-		$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
+		$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
-		redirectTo($filename, array('page' => $page, 's' => $s));
+		Response::redirectTo($filename, [
-
+			'page' => $page
+		]);
 	} elseif (!isset($_GET['files'])) {
-
 		// email templates
 		$add = false;
-		$language_options = '';
+		$language_options = [];
-		$template_options = '';
+		$template_options = [];
 
-		while (list($language_file, $language_name) = each($languages)) {
+		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'"
+				AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
-			);
+			Database::pexecute($result_stmt, [
-			Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
+				'adminid' => $userinfo['adminid'],
+				'lang' => $language_name
+			]);
 
 			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$templates[] = str_replace('_subject', '', $row['varname']);
@@ -343,173 +393,192 @@ if ($action == '') {
 
 			if (count(array_diff($available_templates, $templates)) > 0) {
 				$add = true;
-				$language_options.= 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.= makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n";
+					$template_options[$template] = lng('admin.templates.' . $template);
 				}
 			}
 		}
 
 		if ($add) {
-			eval("echo \"" . 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 {
-			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'"
+			WHERE `adminid` = :adminid AND `templategroup`='files'");
-		);
+		Database::pexecute($result_stmt, [
-		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
+			'adminid' => $userinfo['adminid']
+		]);
 
 		if (Database::num_rows() == count($file_templates)) {
-			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.= 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 = 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 \"" . getTemplate("templates/filetemplates_add") . "\";");
+				'replacers' => $filetemplate_add_data['filetemplate_replacers']
+			]);
 		}
 	}
-
+} elseif ($action == 'edit' && $subjectid != 0 && $mailbodyid != 0) {
-} elseif($action == 'edit'
-	&& $subjectid != 0
-	&& $mailbodyid != 0
-) {
 	// email templates
 	$result_stmt = Database::prepare("
 		SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :subjectid"
+		WHERE `adminid` = :adminid AND `id` = :subjectid");
-	);
+	Database::pexecute($result_stmt, [
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'subjectid' => $subjectid));
+		'adminid' => $userinfo['adminid'],
+		'subjectid' => $subjectid
+	]);
 	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 	if ($result['varname'] != '') {
-
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		if (isset($_POST['send'])
+			$subject = Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-			&& $_POST['send'] == 'send'
+			$mailbody = Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
-		) {
-			$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-			$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
 
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
 					`value` = :value
-				WHERE `adminid` = :adminid AND `id` = :id"
+				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(ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
 
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
 		} else {
-
+			$result = PhpHelper::htmlentitiesArray($result);
-			$result = htmlentities_array($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"
+				WHERE `id` = :id");
-			);
+			Database::pexecute($result_stmt, [
-			Database::pexecute($result_stmt, array('id' => $mailbodyid));
+				'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 = htmlentities_array($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 = 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 \"" . getTemplate("templates/templates_edit") . "\";");
+				'replacers' => $template_edit_data['template_replacers']
+			]);
 		}
 	}
-
+} elseif ($action == 'editf' && $id != 0) {
-} elseif($action == 'editf'
-	&& $id != 0
-) {
 	// file templates
 	$result_stmt = Database::prepare("
 		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `id` = :id"
+		WHERE `adminid` = :adminid AND `id` = :id");
-	);
+	Database::pexecute($result_stmt, [
-	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
+		'adminid' => $userinfo['adminid'],
+		'id' => $id
+	]);
 
 	if (Database::num_rows() > 0) {
-
 		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		// filetemplates
-		if (isset($_POST['filesend'])
+		if (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
-			&& $_POST['filesend'] == 'filesend'
+			$filecontent = Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-		) {
-			$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
 					`value` = :value
-				WHERE `adminid` = :adminid AND `id` = :id"
+				WHERE `adminid` = :adminid AND `id` = :id");
-			);
+			Database::pexecute($upd_stmt, [
-			Database::pexecute($upd_stmt, array(
 				'value' => $filecontent,
 				'adminid' => $userinfo['adminid'],
 				'id' => $id
-			));
+			]);
-
-			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
 
+			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
+			Response::redirectTo($filename, [
+				'page' => $page
+			]);
 		} else {
-			$row = htmlentities_array($row);
+			$row = PhpHelper::htmlentitiesArray($row);
 
 			$filetemplate_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
-			$filetemplate_edit_form = 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 \"" . getTemplate("templates/filetemplates_edit") . "\";");
+				'replacers' => $filetemplate_edit_data['filetemplate_replacers'],
+				'editid' => $id
+			]);
 		}
-
 	} else {
-		standard_error('templatenotfound');
+		Response::standardError('templatenotfound');
 	}
 }

admin_tickets.php

@@ -1,909 +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    Panel
- *
- */
-
-define('AREA', 'admin');
-require './lib/init.php';
-
-if (isset($_POST['id'])) {
-	$id = intval($_POST['id']);
-
-} elseif(isset($_GET['id'])) {
-
-	$id = intval($_GET['id']);
-
-	// only check if this is not a category-id
-	if (!isset($_GET['page']) || (isset($_GET['page']) && $_GET['page'] != 'categories')) {
-		if (!$userinfo['customers_see_all']) {
-			/*
-			 * Check if the current user is allowed to see the current ticket.
-			 */
-			$stmt = Database::prepare("
-				SELECT `id` FROM `panel_tickets`
-				WHERE `id` = :id AND `adminid` = :adminid
-			");
-			$result = Database::pexecute_first($stmt, array('id' => $id, 'adminid' => $userinfo['adminid']));
-
-			if ($result == null) {
-				// no rights to see the requested ticket
-				standard_error(array('ticketnotaccessible'));
-			}
-		}
-	}
-}
-
-if ($page == 'tickets'
-   && $userinfo['customers'] != '0'
-) {
-	// Let's see how many customers we have
-	$countcustomers_stmt = Database::prepare("
-		SELECT COUNT(`customerid`) as `countcustomers`
-		FROM `" . TABLE_PANEL_CUSTOMERS . "` " .
-		($userinfo['customers_see_all'] ? '' : "WHERE `adminid` = :adminid")
-	);
-	$countcustomers = Database::pexecute_first($countcustomers_stmt, array('adminid' => $userinfo['adminid']));
-	$countcustomers = (int)$countcustomers['countcustomers'];
-
-	if ($action == '') {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_tickets");
-		$fields = array(
-			'status' => $lng['ticket']['status'],
-			'lastchange' => $lng['ticket']['lastchange'],
-			'subject' => $lng['ticket']['subject'],
-			'lastreplier' => $lng['ticket']['lastreplier']
-		);
-		$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields, null, null, 1, 'desc');
-		$result_stmt = Database::prepare("
-			SELECT `main`.`id`, `main`.`customerid`, (
-				SELECT COUNT(`sub`.`id`)
-				FROM `" . TABLE_PANEL_TICKETS . "` `sub`
-				WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`,
-			`main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
-			FROM `" . TABLE_PANEL_TICKETS . "` as `main`
-			WHERE `main`.`answerto` = '0'  AND `archived` = '0' " .
-			($userinfo['customers_see_all'] ? '' : " AND  `adminid` = :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);
-		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-		$searchcode = $paging->getHtmlSearchCode($lng);
-		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$ctickets = array();
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if (!isset($ctickets[$row['customerid']])
-				|| !is_array($ctickets[$row['customerid']])
-			) {
-				$ctickets[$row['customerid']] = array();
-			}
-			$ctickets[$row['customerid']][$row['id']] = $row;
-		}
-
-		if ($paging->sortfield == 'customerid'
-			&& $paging->sortorder == 'desc'
-		) {
-			krsort($ctickets);
-		} else {
-			ksort($ctickets);
-		}
-
-		$i = 0;
-		$count = 0;
-		$tickets_count = 0;
-		$tickets = '';
-		foreach ($ctickets as $cid => $ticketrows) {
-			$_cid = 0;
-			foreach ($ticketrows as $row) {
-				if ($paging->checkDisplay($i)) {
-
-					$row = htmlentities_array($row);
-					$row['lastchange'] = date("d.m.y H:i", $row['lastchange']);
-
-					if ($_cid != $row['customerid']) {
-						$cid = $row['customerid'];
-						$usr_stmt = Database::prepare('
-							SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-							FROM `' . TABLE_PANEL_CUSTOMERS . '`
-							WHERE `customerid` = :cid'
-						);
-						$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-
-						if (isset($usr['loginname'])) {
-							$customer = getCorrectFullUserDetails($usr);
-							$customerloginname =  $usr['loginname'];
-							$customerid = $usr['customerid'];
-						} else {
-							$customer = $lng['ticket']['nonexistingcustomer'];
-						}
-						eval("\$tickets.=\"" . getTemplate("tickets/tickets_customer") . "\";");
-					}
-
-					$tickets_count++;
-
-					if ($row['status'] >= 0
-						&& $row['status'] <= 2
-					) {
-						$reopen = 0;
-					} else {
-						$reopen = 1;
-					}
-
-					$row['status'] = ticket::getStatusText($lng, $row['status']);
-					$row['priority'] = ticket::getPriorityText($lng, $row['priority']);
-
-					if ($row['lastreplier'] == '1') {
-						$row['lastreplier'] = $lng['ticket']['staff'];
-						$cananswer = 0;
-					} else {
-						$row['lastreplier'] = $lng['ticket']['customer'];
-						$cananswer = 1;
-					}
-
-					$row['subject'] = html_entity_decode($row['subject']);
-					if (strlen($row['subject']) > 30) {
-						$ts = wordwrap($row['subject'], 30, "|");
-						$ts = explode("|", $ts);
-						$row['subject'] = $ts[0]. '...';
-					}
-
-					eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
-					$count++;
-					$_cid = $row['customerid'];
-				}
-				$i++;
-			}
-		}
-		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
-
-	} elseif($action == 'new') {
-
-		if ($userinfo['tickets_used'] < $userinfo['tickets']
-			|| $userinfo['tickets'] == '-1'
-		) {
-			if (isset($_POST['send'])
-				&& $_POST['send'] == 'send'
-			) {
-				$newticket = ticket::getInstanceOf($userinfo, -1);
-				$newticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
-				$newticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
-				$newticket->Set('category', validate($_POST['category'], 'category'), true, false);
-				$newticket->Set('customer', (int)$_POST['customer'], true, false);
-				$newticket->Set('message', validate(htmlentities(str_replace("\r\n", "\n", $_POST['message'])), 'message', '/^[^\0]*$/'), true, false);
-
-				if ($newticket->Get('subject') == null) {
-					standard_error(array('stringisempty', 'mysubject'));
-				} elseif($newticket->Get('message') == null) {
-					standard_error(array('stringisempty', 'mymessage'));
-				} else {
-					$now = time();
-					$newticket->Set('admin', $userinfo['adminid'], true, true);
-					$newticket->Set('dt', $now, true, true);
-					$newticket->Set('lastchange', $now, true, true);
-					$newticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
-					$newticket->Set('status', '0', true, true);
-					$newticket->Set('lastreplier', '1', true, true);
-					$newticket->Set('by', '1', true, true);
-					$newticket->Insert();
-					$newticket->sendMail((int)$newticket->Get('customer'), 'new_ticket_by_staff_subject', $lng['mails']['new_ticket_by_staff']['subject'], 'new_ticket_by_staff_mailbody', $lng['mails']['new_ticket_by_staff']['mailbody']);
-					$log->logAction(ADM_ACTION, LOG_NOTICE, "opened a new ticket for customer #" . $newticket->Get('customer') . " - '" . $newticket->Get('subject') . "'");
-					redirectTo($filename, Array('page' => $page, 's' => $s));
-				}
-			} else {
-				$categories = '';
-				$where = '';
-				if ($userinfo['tickets_see_all'] != '1') {
-					$where = 'WHERE `adminid` = :adminid';
-				}
-				$result_stmt = Database::prepare('
-					SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-					'.$where.' ORDER BY `logicalorder`, `name` ASC'
-				);
-				$result = Database::pexecute_first($result_stmt, array('adminid' => $userinfo['adminid']));
-
-				if (isset($result['name'])
-					&& $result['name'] != ''
-				) {
-					$result2_stmt = Database::prepare('
-						SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-						'.$where.' ORDER BY `logicalorder`, `name` ASC'
-					);
-					Database::pexecute($result2_stmt, array('adminid' => $userinfo['adminid']));
-
-					while ($row = $result2_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$categories.= makeoption($row['name'], $row['id']);
-					}
-
-				} else {
-					$categories = makeoption($lng['ticket']['no_cat'], '0');
-				}
-
-				$customers = '';
-				$result_customers_stmt = Database::prepare("
-					SELECT `customerid`, `loginname`, `name`, `firstname`, `company`
-					FROM `" . TABLE_PANEL_CUSTOMERS . "` " .
-					($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid")."
-					ORDER BY `name` ASC"
-				);
-				Database::pexecute($result_customers_stmt, array('adminid' => $userinfo['adminid']));
-
-				while ($row_customer = $result_customers_stmt->fetch(PDO::FETCH_ASSOC)) {
-					$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
-				}
-
-				$def_prio = Settings::Get('ticket.default_priority');
-				$priorities = makeoption($lng['ticket']['high'], '1', $def_prio);
-				$priorities.= makeoption($lng['ticket']['normal'], '2', $def_prio);
-				$priorities.= makeoption($lng['ticket']['low'], '3', $def_prio);
-
-				$ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_new.php';
-				$ticket_new_form = htmlform::genHTMLForm($ticket_new_data);
-
-				$title = $ticket_new_data['ticket_new']['title'];
-				$image = $ticket_new_data['ticket_new']['image'];
-
-				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
-			}
-
-		} else {
-			standard_error('nomoreticketsavailable');
-		}
-
-	} elseif($action == 'answer'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$replyticket = ticket::getInstanceOf($userinfo, -1);
-			$replyticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
-			$replyticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
-			$replyticket->Set('message', validate(htmlentities(str_replace("\r\n", "\n", $_POST['message'])), 'message', '/^[^\0]*$/'), true, false);
-
-			if ($replyticket->Get('message') == null) {
-				standard_error(array('stringisempty', 'mymessage'));
-			} else {
-				$now = time();
-				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-				$replyticket->Set('customer', $mainticket->Get('customer'), true, true);
-				$replyticket->Set('lastchange', $now, true, true);
-				$replyticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
-				$replyticket->Set('status', '1', true, true);
-				$replyticket->Set('answerto', (int)$id, true, false);
-				$replyticket->Set('by', '1', true, true);
-				$replyticket->Insert();
-
-				// Update priority if changed
-				if ($replyticket->Get('priority') != $mainticket->Get('priority')) {
-					$mainticket->Set('priority', $replyticket->Get('priority'), true);
-				}
-
-				$mainticket->Set('lastchange', $now);
-				$mainticket->Set('lastreplier', '1');
-				$mainticket->Set('status', '2');
-				$mainticket->Update();
-				$mainticket->sendMail((int)$mainticket->Get('customer'), 'new_reply_ticket_by_staff_subject', $lng['mails']['new_reply_ticket_by_staff']['subject'], 'new_reply_ticket_by_staff_mailbody', $lng['mails']['new_reply_ticket_by_staff']['mailbody']);
-				$log->logAction(ADM_ACTION, LOG_NOTICE, "answered ticket '" . $mainticket->Get('subject') . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			}
-
-		} else {
-
-			$ticket_replies = '';
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
-			$status = ticket::getStatusText($lng, $mainticket->Get('status'));
-
-			if ($mainticket->Get('status') >= 0
-				&& $mainticket->Get('status') <= 2
-			) {
-				$isclosed = 0;
-			} else {
-				$isclosed = 1;
-			}
-
-			if ($mainticket->Get('by') == '1') {
-				$by = $lng['ticket']['staff'];
-			} else {
-				$cid = $mainticket->Get('customer');
-				$usr_stmt = Database::prepare('
-					SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-					FROM `' . TABLE_PANEL_CUSTOMERS . '`
-					WHERE `customerid` = :cid'
-				);
-				$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-				$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
-				$by .= getCorrectFullUserDetails($usr).'</a>';
-			}
-
-			$subject = $mainticket->Get('subject');
-			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-
-			$result_stmt = Database::prepare('
-				SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = :cid'
-			);
-			$row = Database::pexecute_first($result_stmt, array('cid' => $mainticket->Get('category')));
-
-			$andere_stmt = Database::prepare('
-				SELECT * FROM `' . TABLE_PANEL_TICKETS . '`
-				WHERE `answerto` = :id ORDER BY `lastchange` ASC'
-			);
-			Database::pexecute($andere_stmt, array('id' => $id));
-			$numrows_andere = Database::num_rows();
-
-			while ($row2 = $andere_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$subticket = ticket::getInstanceOf($userinfo, (int)$row2['id']);
-				$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));
-
-				if ($subticket->Get('by') == '1') {
-					$by = $lng['ticket']['staff'];
-				} else {
-					$cid = $subticket->Get('customer');
-					$usr_stmt = Database::prepare('
-						SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = :cid'
-					);
-					$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-					$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
-					$by .= getCorrectFullUserDetails($usr).'</a>';
-				}
-
-				$subject = $subticket->Get('subject');
-				$message = $subticket->Get('message');
-
-				$row2 = htmlentities_array($row2);
-				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
-			}
-
-			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
-			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
-			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-			$subject = htmlentities($mainticket->Get('subject'));
-			$ticket_replies_count = $numrows_andere + 1;
-
-			// don't forget the main-ticket!
-			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_reply.php';
-			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
-
-			$title = $ticket_reply_data['ticket_reply']['title'];
-			$image = $ticket_reply_data['ticket_reply']['image'];
-
-			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
-		}
-
-	} elseif($action == 'close'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$now = time();
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$mainticket->Set('lastchange', $now, true, true);
-			$mainticket->Set('lastreplier', '1', true, true);
-			$mainticket->Set('status', '3', true, true);
-			$mainticket->Update();
-			$log->logAction(ADM_ACTION, LOG_NOTICE, "closed ticket '" . $mainticket->Get('subject') . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			ask_yesno('ticket_reallyclose', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
-		}
-
-	} elseif($action == 'reopen'
-		&& $id != 0
-	) {
-		$now = time();
-		$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-		$mainticket->Set('lastchange', $now, true, true);
-		$mainticket->Set('lastreplier', '1', true, true);
-		$mainticket->Set('status', '0', true, true);
-		$mainticket->Update();
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "reopened ticket '" . $mainticket->Get('subject') . "'");
-		redirectTo($filename, array('page' => $page, 's' => $s));
-
-	} elseif($action == 'archive'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$now = time();
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$mainticket->Set('lastchange', $now, true, true);
-			$mainticket->Set('lastreplier', '1', true, true);
-			$mainticket->Set('status', '3', true, true);
-			$mainticket->Update();
-			$mainticket->Archive();
-			$log->logAction(ADM_ACTION, LOG_NOTICE, "archived ticket '" . $mainticket->Get('subject') . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			ask_yesno('ticket_reallyarchive', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
-		}
-
-	} elseif($action == 'delete'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$log->logAction(ADM_ACTION, LOG_INFO, "deleted ticket '" . $mainticket->Get('subject') . "'");
-			$mainticket->Delete();
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			ask_yesno('ticket_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
-		}
-	}
-
-} elseif($page == 'categories'
-	&& $userinfo['customers'] != '0'
-) {
-	if ($action == '') {
-
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_tickets::categories");
-		$fields = array(
-			'name' => $lng['ticket']['category'],
-			'logicalorder' => $lng['ticket']['logicalorder']
-		);
-
-		$where = '1'; // WHERE 1 is like no 'where-clause'
-		if ($userinfo['tickets_see_all'] != '1') {
-			$where = " `main`.`adminid` = :adminid";
-		}
-		$paging = new paging($userinfo, TABLE_PANEL_TICKET_CATS, $fields);
-		$result_stmt = Database::prepare("
-			SELECT `main`.`id`, `main`.`name`, `main`.`logicalorder`, (
-				SELECT COUNT(`sub`.`id`) FROM `" . TABLE_PANEL_TICKETS . "` `sub`
-				WHERE `sub`.`category` = `main`.`id`
-				AND `sub`.`answerto` = '0'
-				AND `sub`.`adminid` = :adminid
-			) as `ticketcount`, (
-				SELECT COUNT(`sub2`.`id`) FROM `" . TABLE_PANEL_TICKETS . "` `sub2`
-				WHERE `sub2`.`category` = `main`.`id`
-				AND `sub2`.`answerto` = '0'
-				AND (`sub2`.`status` = '0' OR `sub2`.`status` = '1' OR `sub2`.`status` = '2')
-				AND `sub2`.`adminid` = :adminid
-			) as `ticketcountnotclosed`
-			FROM `" . TABLE_PANEL_TICKET_CATS . "` `main`
-			WHERE " . $where . $paging->getSqlWhere(true) . " " .
-			$paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
-		$numrows = Database::num_rows();
-		$paging->setEntries($numrows);
-		$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;
-		$ticketcategories = '';
-		$categories_count = $numrows;
-
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			if ($paging->checkDisplay($i)) {
-				$row = htmlentities_array($row);
-				$closedtickets_count = ($row['ticketcount'] - $row['ticketcountnotclosed']);
-				eval("\$ticketcategories.=\"" . getTemplate("tickets/tickets_categories") . "\";");
-				$count++;
-			}
-			$i++;
-		}
-		eval("echo \"" . getTemplate("tickets/categories") . "\";");
-
-	} elseif($action == 'addcategory') {
-
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-
-			$category = validate($_POST['category'], 'category');
-			$order = validate($_POST['logicalorder'], 'logicalorder');
-
-			if ($order < 1 || $order >= 1000) {
-				// use the latest available
-				$order = ticket::getHighestOrderNumber($userinfo['adminid']) + 1;
-			}
-
-			if ($category == '') {
-				standard_error(array('stringisempty', 'mycategory'));
-			} else {
-				ticket::addCategory($category, $userinfo['adminid'], $order);
-				$log->logAction(ADM_ACTION, LOG_INFO, "added ticket-category '" . $category . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			}
-		} else {
-			$order = ticket::getHighestOrderNumber($userinfo['adminid']) + 1;
-
-			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.category_new.php';
-			$category_new_form = htmlform::genHTMLForm($category_new_data);
-
-			$title = $category_new_data['category_new']['title'];
-			$image = $category_new_data['category_new']['image'];
-
-			eval("echo \"" . getTemplate("tickets/tickets_newcategory") . "\";");
-		}
-
-	} elseif($action == 'editcategory'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-
-			$category = validate($_POST['category'], 'category');
-			$order = validate($_POST['logicalorder'], 'logicalorder');
-
-			if ($order < 1 || $order >= 1000) {
-				$order = 1;
-			}
-
-			if ($category == '') {
-				standard_error(array('stringisempty', 'mycategory'));
-			} else {
-				ticket::editCategory($category, $id, $order);
-				$log->logAction(ADM_ACTION, LOG_INFO, "edited ticket-category '" . $category . "'");
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			}
-		} else {
-			$row_stmt = Database::prepare('
-				SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = :id'
-			);
-			$row = Database::pexecute_first($row_stmt, array('id' => $id));
-			$row = htmlentities_array($row);
-			$category_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.category_edit.php';
-			$category_edit_form = htmlform::genHTMLForm($category_edit_data);
-
-			$title = $category_edit_data['category_edit']['title'];
-			$image = $category_edit_data['category_edit']['image'];
-
-			eval("echo \"" . getTemplate("tickets/tickets_editcategory") . "\";");
-		}
-
-	} elseif($action == 'deletecategory'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			if (ticket::deleteCategory($id) == false) {
-				standard_error('categoryhastickets');
-			}
-
-			$log->logAction(ADM_ACTION, LOG_INFO, "deleted ticket-category #" . $id);
-			redirectTo($filename, array('page' => $page, 's' => $s));
-
-		} else {
-			$name = ticket::getCategoryName($id);
-			ask_yesno('ticket_reallydeletecat', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $name);
-		}
-	}
-
-} elseif($page == 'archive'
-	&& $userinfo['customers'] != '0'
-) {
-	if ($action == '') {
-
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_tickets::archive");
-
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$priority = array();
-			$categories = array();
-			$subject = validate($_POST['subject'], 'subject');
-			$priority[0] = isset($_POST['priority1']) ? $_POST['priority1'] : '';
-			$priority[1] = isset($_POST['priority2']) ? $_POST['priority2'] : '';
-			$priority[2] = isset($_POST['priority3']) ? $_POST['priority3'] : '';
-			$fromdate = validate($_POST['fromdate'], 'fromdate');
-			$todate = validate($_POST['todate'], 'todate');
-			$message = validate($_POST['message'], 'message');
-			$customer = validate($_POST['customer'], 'customer');
-
-			$cat_stmt = Database::query('SELECT COUNT(`id`) as `ccount` FROM `' . TABLE_PANEL_TICKET_CATS . '`');
-			$cat = $cat_stmt->fetch(PDO::FETCH_ASSOC);
-
-			for ($x = 0;$x < $cat['ccount'];$x++) {
-				$categories[$x] = isset($_POST['category' . $x]) ? $_POST['category' . $x] : '';
-			}
-
-			$archive_search = ticket::getArchiveSearchStatement($subject, $priority, $fromdate, $todate, $message, $customer, $userinfo['adminid'], $categories);
-
-			$query = $archive_search[0];
-			$archive_params = $archive_search[1];
-
-			$fields = array(
-				'lastchange' => $lng['ticket']['lastchange'],
-				'subject' => $lng['ticket']['subject'],
-				'lastreplier' => $lng['ticket']['lastreplier']
-			);
-			$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields);
-			$result_stmt = Database::prepare($query . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-			Database::pexecute($result_stmt, $archive_params);
-			$sortcode = $paging->getHtmlSortCode($lng);
-			$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
-			$searchcode = $paging->getHtmlSearchCode($lng);
-			$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-			$ctickets = array();
-
-			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-				if (!isset($ctickets[$row['customerid']])
-					|| !is_array($ctickets[$row['customerid']])
-				) {
-					$ctickets[$row['customerid']] = array();
-				}
-				$ctickets[$row['customerid']][$row['id']] = $row;
-			}
-
-			if ($paging->sortfield == 'customerid'
-				&& $paging->sortorder == 'desc'
-			) {
-				krsort($ctickets);
-			} else {
-				ksort($ctickets);
-			}
-
-			$i = 0;
-			$count = 0;
-			$tickets_count = 0;
-			$tickets = '';
-			foreach ($ctickets as $cid => $ticketrows) {
-				if ($paging->sortfield == 'lastchange'
-					&& $paging->sortorder == 'desc'
-				) {
-					krsort($ticketrows);
-				} else {
-					ksort($ticketrows);
-				}
-
-				$_cid = -1;
-				foreach ($ticketrows as $ticket) {
-					if ($paging->checkDisplay($i)) {
-						$ticket['lastchange'] = date("d.m.y H:i", $ticket['lastchange']);
-						if ($_cid != $ticket['customerid']) {
-							$cid = $ticket['customerid'];
-							$usr_stmt = Database::prepare('
-								SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-								FROM `' . TABLE_PANEL_CUSTOMERS . '`
-								WHERE `customerid` = :cid'
-							);
-							$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-
-							if (isset($usr['loginname'])) {
-								$customer = getCorrectFullUserDetails($usr);
-								$customerloginname =  $usr['loginname'];
-								$customerid = $usr['customerid'];
-							} else {
-								$customer = $lng['ticket']['nonexistingcustomer'];
-								$customerid = 0;
-								$customerloginname = '';
-							}
-							eval("\$tickets.=\"" . getTemplate("tickets/tickets_customer") . "\";");
-						}
-
-						$tickets_count++;
-						switch ($ticket['priority'])
-						{
-							case 1: $ticket['display'] = 'high';
-							break;
-							case 2: $ticket['display'] = 'normal';
-							break;
-							case 3: $ticket['display'] = 'low';
-							break;
-							default: $ticket['display'] = 'unknown';
-						}
-						$ticket['priority'] = ticket::getPriorityText($lng, $ticket['priority']);
-
-						if ($ticket['lastreplier'] == '1') {
-							$ticket['lastreplier'] = $lng['ticket']['staff'];
-						} else {
-							$ticket['lastreplier'] = $lng['ticket']['customer'];
-						}
-
-						if (strlen($ticket['subject']) > 20) {
-							$ticket['subject'] = substr($ticket['subject'], 0, 17) . '...';
-						}
-						$ticket = htmlentities_array($ticket);
-						eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";");
-						$count++;
-						$_cid = $ticket['customerid'];
-					}
-				}
-				$i++;
-			}
-			eval("echo \"" . getTemplate("tickets/archivesearch") . "\";");
-
-		} else {
-
-			$archived = array();
-			$archived = ticket::getLastArchived(6, $userinfo['adminid']);
-			$tickets = '';
-
-			if ($archived !== false) {
-
-				foreach ($archived as $id => $ticket) {
-
-					$ticket['lastchange'] = date("d.m.y H:i", $ticket['lastchange']);
-					$ticket['priority'] = ticket::getPriorityText($lng, $ticket['priority']);
-
-					if ($ticket['lastreplier'] == '1') {
-						$ticket['lastreplier'] = $lng['ticket']['staff'];
-					} else {
-						$ticket['lastreplier'] = $lng['ticket']['customer'];
-					}
-
-					if (strlen($ticket['subject']) > 20) {
-						$ticket['subject'] = substr($ticket['subject'], 0, 17) . '...';
-					}
-					eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";");
-				}
-			}
-
-			$priorities_options = makecheckbox('priority1', $lng['ticket']['high'], '1');
-			$priorities_options.= makecheckbox('priority2', $lng['ticket']['normal'], '2');
-			$priorities_options.= makecheckbox('priority3', $lng['ticket']['low'], '3');
-			$category_options = '';
-			$ccount = 0;
-			$result = Database::query('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');
-
-			while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-				$category_options.= makecheckbox('category' . $ccount, $row['name'], $row['id'], true);
-				$ccount++;
-			}
-
-			$customers = makeoption($lng['ticket']['nocustomer'], '-1', '-1');
-			$result_customers_stmt = Database::prepare("
-				SELECT `customerid`, `loginname`, `name`, `firstname`, `company`
-				FROM `" . TABLE_PANEL_CUSTOMERS . "` " .
-				($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid")."
-				ORDER BY `name` ASC"
-			);
-			Database::pexecute($result_customers_stmt, array('adminid' => $userinfo['adminid']));
-
-			while ($row_customer = $result_customers_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
-			}
-			eval("echo \"" . getTemplate("tickets/archive") . "\";");
-		}
-
-	} elseif($action == 'view'
-		&& $id != 0
-	) {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed archived-ticket #" . $id);
-		$ticket_replies = '';
-		$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-		$lastchange = date("d.m.Y H:i\h", $mainticket->Get('lastchange'));
-		$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
-		$status = ticket::getStatusText($lng, $mainticket->Get('status'));
-		$isclosed = 1;
-
-		if ($mainticket->Get('by') == '1') {
-			$by = $lng['ticket']['staff'];
-		} else {
-			$cid = $mainticket->Get('customer');
-			$usr_stmt = Database::prepare('
-				SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-				FROM `' . TABLE_PANEL_CUSTOMERS . '`
-				WHERE `customerid` = :cid'
-			);
-			$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-
-			if (isset($usr['loginname'])) {
-				$customer = getCorrectFullUserDetails($usr);
-				$customerloginname = ' ('.$usr['loginname'].')';
-				$customerid = $usr['customerid'];
-			} else {
-				$customer = $lng['ticket']['nonexistingcustomer'];
-				$customerid = 0;
-				$customerloginname = '';
-			}
-			if ($customerid != 0) {
-				$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customerid)).'" rel="external">';
-				$by .= $customer.$customerloginname.'</a>';
-			} else {
-				$by = $customer;
-			}
-		}
-
-		$subject = $mainticket->Get('subject');
-		$message = $mainticket->Get('message');
-		eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-
-		$result_stmt = Database::prepare('
-			SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = :cid'
-		);
-		$row = Database::pexecute_first($result_stmt, array('cid' => $mainticket->Get('category')));
-
-		$andere_stmt = Database::prepare('
-			SELECT * FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto` = :id'
-		);
-		Database::pexecute($andere_stmt, array('id' => $id));
-		$numrows_andere = Database::num_rows();
-
-		while ($row2 = $andere_stmt->fetch(PDO::FETCH_ASSOC)) {
-			$subticket = ticket::getInstanceOf($userinfo, (int)$row2['id']);
-			$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));
-
-			if ($subticket->Get('by') == '1') {
-				$by = $lng['ticket']['staff'];
-			} else {
-				$cid = $subticket->Get('customer');
-				$usr_stmt = Database::prepare('
-					SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-					FROM `' . TABLE_PANEL_CUSTOMERS . '`
-					WHERE `customerid` = :cid'
-				);
-				$usr = Database::pexecute_first($usr_stmt, array('cid' => $cid));
-
-				if (isset($usr['loginname'])) {
-					$customer = getCorrectFullUserDetails($usr);
-					$customerloginname = ' ('.$usr['loginname'].')';
-					$customerid = $usr['customerid'];
-				} else {
-					$customer = $lng['ticket']['nonexistingcustomer'];
-					$customerid = 0;
-					$customerloginname = '';
-				}
-				if ($customerid != 0) {
-					$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customerid)).'" rel="external">';
-					$by .= $customer.$customerloginname.'</a>';
-				} else {
-					$by = $customer;
-				}
-			}
-
-			$subject = $subticket->Get('subject');
-			$message = $subticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
-		}
-
-		$priorities = makeoption($lng['ticket']['high'], '1', htmlentities($mainticket->Get('priority')), true, true);
-		$priorities.= makeoption($lng['ticket']['normal'], '2', htmlentities($mainticket->Get('priority')), true, true);
-		$priorities.= makeoption($lng['ticket']['low'], '3', htmlentities($mainticket->Get('priority')), true, true);
-		$subject = $mainticket->Get('subject');
-		$ticket_replies_count = $numrows_andere + 1;
-
-		// don't forget the main-ticket!
-		eval("echo \"" . getTemplate("tickets/tickets_view") . "\";");
-
-	} elseif($action == 'delete'
-		&& $id != 0
-	) {
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$log->logAction(ADM_ACTION, LOG_INFO, "deleted archived ticket '" . $mainticket->Get('subject') . "'");
-			$mainticket->Delete();
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			ask_yesno('ticket_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
-		}
-	}
-} else {
-	standard_error('nocustomerforticket');
-}

admin_traffic.php

@@ -2,140 +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');
+const AREA = 'admin';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-if ($action == 'logout') {
+use Froxlor\Traffic\Traffic;
-	$logout_stmt = Database::prepare("
+use Froxlor\UI\Panel\UI;
-		DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+use Froxlor\UI\Request;
-		WHERE `userid` = :adminid
+use Froxlor\UI\Response;
-		AND `adminsession` = '1'"
-	);
-	Database::pexecute($logout_stmt, array('adminid' => $userinfo['adminid']));
-	redirectTo('index.php');
-}
 
-if (isset($_POST['id'])) {
+$range = Request::any('range', 'currentmonth');
-	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
-
-$months = array(
-	'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']]] = size_readable($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\", \"" . 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 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s'));
-		}
-		$customerview = 0;
-		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
-		eval("\$stats_tables .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table") . "\");");
-	}
-	eval("echo \"" . getTemplate("traffic/index") . "\";");
 }

admin_updates.php

@@ -4,118 +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');
+const AREA = 'admin';
-require './lib/init.php';
+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(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 (!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 (hasDbUpdates($dbversion) || hasUpdates($version)) {
+	if (Froxlor::hasDbUpdates() || Froxlor::hasUpdates()) {
 		$successful_update = false;
 		$message = '';
 
-		if (isset($_POST['send'])
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			&& $_POST['send'] == 'send'
+			if ((isset($_POST['update_preconfig']) && isset($_POST['update_changesagreed']) && intval($_POST['update_changesagreed']) != 0) || !isset($_POST['update_preconfig'])) {
-		) {
+				include_once Froxlor::getInstallDir() . 'install/updatesql.php';
-			if ((isset($_POST['update_preconfig'])
-				&& isset($_POST['update_changesagreed'])
-				&& intval($_POST['update_changesagreed']) != 0)
-				|| !isset($_POST['update_preconfig'])
-			) {
-				eval("echo \"" . getTemplate('update/update_start') . "\";");
 
-				include_once './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 \"" . getTemplate('update/update_end') . "\";");
+					'checks' => Update::getUpdateTasks()
-
+				]);
-				updateCounters();
+				exit;
-				inserttask('1');
-				@chmod('./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 './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 \"" . 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 \"" . getTemplate('update/noupdatesavail') . "\";");
 	}
 }

api.php

@@ -0,0 +1,44 @@
+<?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
+ */
+
+use Froxlor\Api\Api;
+use Froxlor\Api\Response;
+
+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

@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can also view it online at
+ * https://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  the authors
+ * @author     Froxlor team <team@froxlor.org>
+ * @license    https://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
+if (!defined('AREA')) {
+	header("Location: index.php");
+	exit();
+}
+
+use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\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");
+$id = (int)Request::any('id');
+
+// do the delete and then just show a success-message and the apikeys list again
+if ($action == 'delete' && $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("
+				SELECT c.customerid FROM `" . TABLE_PANEL_CUSTOMERS . "` c
+				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, [
+			'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, [
+			'id' => $id,
+			'aid' => $userinfo['adminid']
+		]);
+	}
+	if ($chk !== false) {
+		Database::pexecute($del_stmt, [
+			'id' => $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` = ''
+		");
+		// customer generates for himself, admins will see a customer-select-box later
+		if (AREA == 'admin') {
+			$cid = 0;
+		} elseif (AREA == 'customer') {
+			$cid = $userinfo['customerid'];
+		}
+		$key = hash('sha256', openssl_random_pseudo_bytes(64 * 64));
+		$secret = hash('sha512', openssl_random_pseudo_bytes(64 * 64 * 4));
+		Database::pexecute($ins_stmt, [
+			'key' => $key,
+			'secret' => $secret,
+			'aid' => $userinfo['adminid'],
+			'cid' => $cid
+		]);
+		Response::standardSuccess('apikeys.apikey_added', '', [
+			'filename' => $filename,
+			'page' => $page
+		]);
+	}
+	HTML::askYesNo('apikey_reallyadd', $filename, [
+		'id' => $id,
+		'page' => $page,
+		'action' => $action
+	], '', [
+		'section' => 'index',
+		'page' => $page
+	]);
+	exit;
+}
+
+$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed api::api_keys");
+
+// 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 = [];
+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 = [
+		'a.loginname' => lng('login.username')
+	];
+} elseif (AREA == 'customer') {
+	// customer-area
+	$keys_stmt_query .= "ak.customerid = :cid ";
+	$qry_params['cid'] = $userinfo['customerid'];
+	$fields = [
+		'c.loginname' => lng('login.username')
+	];
+} else {
+	// admin who can see all customers / reseller / admins
+	$keys_stmt_query .= "1 ";
+	$fields = [
+		'a.loginname' => lng('login.username')
+	];
+}
+
+//$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_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.apikeys.php';
+$collection = [
+	'data' => $all_keys,
+	'pagination' => []
+];
+
+$tpl = 'user/table.html.twig';
+
+UI::view($tpl, [
+	'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikeys_list'),
+	'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [
+		[
+			'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']),
+			'label' => lng('apikeys.key_add')
+		]
+	] : null,
+]);

bin/froxlor-cli

@@ -0,0 +1,64 @@
+#!/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\Cli\ValidateAcmeWebroot;
+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->add(new ValidateAcmeWebroot());
+$application->run();

build.xml

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="froxlor" default="build">
+
+	<!-- Use this when the tools are managed by Composer in ${basedir}/vendor/bin -->
+	<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="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,-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,-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,-check-failure"
+		description="Performs a lint check and runs the tests (without generating code coverage reports)" />
+
+	<target name="static-analysis"
+		depends="composer,lint,phploc-ci,pdepend,phpmd-ci,phpcs-ci,phpcompat-ci,phpcpd-ci"
+		description="Performs static analysis" />
+
+	<!-- Adjust the threadCount attribute's value to the number of CPUs -->
+	<target name="static-analysis-parallel"
+		description="Performs static analysis (executing the tools in parallel)">
+		<parallel threadCount="2">
+			<sequential>
+				<antcall target="pdepend" />
+				<antcall target="phpmd-ci" />
+			</sequential>
+			<antcall target="lint" />
+			<antcall target="phpcpd-ci" />
+			<antcall target="phpcs-ci" />
+			<antcall target="phpcompat-ci" />
+			<antcall target="phploc-ci" />
+		</parallel>
+	</target>
+
+	<target name="clean" unless="clean.done"
+		description="Cleanup build artifacts">
+		<delete dir="${basedir}/build/api" />
+		<delete dir="${basedir}/build/coverage" />
+		<delete dir="${basedir}/build/logs" />
+		<delete dir="${basedir}/build/pdepend" />
+		<property name="clean.done" value="true" />
+	</target>
+
+	<target name="prepare" unless="prepare.done" depends="clean"
+		description="Prepare for build">
+		<mkdir dir="${basedir}/build/api" />
+		<mkdir dir="${basedir}/build/coverage" />
+		<mkdir dir="${basedir}/build/logs" />
+		<mkdir dir="${basedir}/build/pdepend" />
+
+		<property name="prepare.done" value="true" />
+	</target>
+
+	<target name="composer"
+		description="Installing composer dependencies" depends="prepare">
+		<exec executable="composer" failonerror="true">
+			<arg value="install" />
+			<arg value="--prefer-dist" />
+			<arg value="--no-progress" />
+		</exec>
+	</target>
+
+	<target name="lint" unless="lint.done"
+		description="Perform syntax check of sourcecode files">
+		<apply executable="php" taskname="lint">
+			<arg value="-l" />
+
+			<fileset dir="${basedir}/lib/Froxlor">
+				<include name="**/*.php" />
+				<modified />
+			</fileset>
+
+			<fileset dir="${basedir}/tests">
+				<include name="**/*.php" />
+				<modified />
+			</fileset>
+		</apply>
+
+		<property name="lint.done" value="true" />
+	</target>
+
+	<target name="phploc" unless="phploc.done"
+		description="Measure project size using PHPLOC and print human readable output. Intended for usage on the command line.">
+		<exec executable="${phploc}" taskname="phploc">
+			<arg value="--count-tests" />
+			<arg path="${basedir}/lib/Froxlor" />
+			<arg path="${basedir}/tests" />
+		</exec>
+
+		<property name="phploc.done" value="true" />
+	</target>
+
+	<target name="phploc-ci" unless="phploc.done" depends="prepare"
+		description="Measure project size using PHPLOC and log result in CSV and XML format. Intended for usage within a continuous integration environment.">
+		<exec executable="${phploc}" taskname="phploc">
+			<arg value="--count-tests" />
+			<arg value="--log-csv" />
+			<arg path="${basedir}/build/logs/phploc.csv" />
+			<arg value="--log-xml" />
+			<arg path="${basedir}/build/logs/phploc.xml" />
+			<arg path="${basedir}/lib/Froxlor" />
+			<arg path="${basedir}/tests" />
+		</exec>
+
+		<property name="phploc.done" value="true" />
+	</target>
+
+	<target name="pdepend" unless="pdepend.done" depends="prepare"
+		description="Calculate software metrics using PHP_Depend and log result in XML format. Intended for usage within a continuous integration environment.">
+		<exec executable="${pdepend}" taskname="pdepend">
+			<arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
+			<arg
+				value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
+			<arg
+				value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
+			<arg path="${basedir}/lib/Froxlor" />
+		</exec>
+
+		<property name="pdepend.done" value="true" />
+	</target>
+
+	<target name="phpmd" unless="phpmd.done"
+		description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
+		<exec executable="${phpmd}" taskname="phpmd">
+			<arg path="${basedir}/lib/Froxlor" />
+			<arg value="text" />
+			<arg path="${basedir}/phpmd.xml" />
+		</exec>
+
+		<property name="phpmd.done" value="true" />
+	</target>
+
+	<target name="phpmd-ci" unless="phpmd.done" depends="prepare"
+		description="Perform project mess detection using PHPMD and log result in XML format. Intended for usage within a continuous integration environment.">
+		<exec executable="${phpmd}" taskname="phpmd">
+			<arg path="${basedir}/lib/Froxlor" />
+			<arg value="xml" />
+			<arg path="${basedir}/phpmd.xml" />
+			<arg value="--reportfile" />
+			<arg path="${basedir}/build/logs/pmd.xml" />
+		</exec>
+
+		<property name="phpmd.done" value="true" />
+	</target>
+
+	<target name="phpcs" unless="phpcs.done"
+		description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
+		<exec executable="${phpcs}" taskname="phpcs">
+			<arg value="--standard=${basedir}/phpcs.xml" />
+			<arg value="--extensions=php" />
+			<arg path="${basedir}/lib/Froxlor" />
+			<arg path="${basedir}/tests" />
+		</exec>
+
+		<property name="phpcs.done" value="true" />
+	</target>
+
+	<target name="phpcs-ci" unless="phpcs.done" depends="prepare"
+		description="Find coding standard violations using PHP_CodeSniffer and log result in XML format. Intended for usage within a continuous integration environment.">
+		<exec executable="${phpcs}" output="/dev/null" taskname="phpcs">
+			<arg value="--report=checkstyle" />
+			<arg
+				value="--report-file=${basedir}/build/logs/checkstyle-standard.xml" />
+			<arg value="--standard=${basedir}/phpcs.xml" />
+			<arg value="--extensions=php" />
+			<arg path="${basedir}/lib/Froxlor" />
+			<arg path="${basedir}/tests" />
+		</exec>
+
+		<property name="phpcs.done" value="true" />
+	</target>
+
+	<target name="phpcompat" unless="phpcompat.done"
+		depends="composer"
+		description="Find php violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
+		<exec executable="${phpcs}" taskname="phpcompat">
+			<arg
+				line="--standard=PHPCompatibility --runtime-set testVersion 5.6 ${basedir}/lib/Froxlor ${basedir}/tests" />
+		</exec>
+
+		<property name="phpcompat.done" value="true" />
+	</target>
+
+	<target name="phpcompat-ci" unless="phpcompat.done"
+		depends="composer"
+		description="Find php violations using PHP_CodeSniffer and log result in XML format. Intended for usage within a continuous integration environment.">
+		<exec executable="${phpcs}" output="/dev/null"
+			taskname="phpcompat">
+			<arg
+				line="--standard=PHPCompatibility --runtime-set testVersion 5.6 --report=checkstyle --report-file=${basedir}/build/logs/checkstyle-compat.xml ${basedir}/lib/Froxlor ${basedir}/tests" />
+		</exec>
+
+		<property name="phpcompat.done" value="true" />
+	</target>
+
+	<target name="phpcpd" unless="phpcpd.done"
+		description="Find duplicate code using PHPCPD and print human readable output. Intended for usage on the command line before committing.">
+		<exec executable="${phpcpd}" taskname="phpcpd">
+			<arg path="${basedir}/lib/Froxlor" />
+		</exec>
+
+		<property name="phpcpd.done" value="true" />
+	</target>
+
+	<target name="phpcpd-ci" unless="phpcpd.done" depends="prepare"
+		description="Find duplicate code using PHPCPD and log result in XML format. Intended for usage within a continuous integration environment.">
+		<exec executable="${phpcpd}" taskname="phpcpd">
+			<arg value="--log-pmd" />
+			<arg path="${basedir}/build/logs/pmd-cpd.xml" />
+			<arg path="${basedir}/lib/Froxlor" />
+		</exec>
+
+		<property name="phpcpd.done" value="true" />
+	</target>
+
+	<target name="phpunit-prepare" unless="phpunit-prepare.done" depends="composer"
+		description="prepare xdebug unit tests">
+		<exec executable="${phpunit}" resultproperty="result.phpunit-prepare"
+			taskname="phpunit">
+			<arg value="--configuration" />
+			<arg path="${basedir}/phpunit.xml" />
+			<arg value="--dump-xdebug-filter" />
+			<arg path="${basedir}/tests/xdebug-filter.php" />
+		</exec>
+
+		<property name="phpunit-prepare.done" value="true" />
+	</target>
+
+	<target name="phpunit" unless="phpunit.done" depends="phpunit-prepare"
+		description="Run unit tests with PHPUnit">
+		<exec executable="${phpunit}" failonerror="true" resultproperty="result.phpunit"
+			taskname="phpunit">
+			<arg value="--configuration" />
+			<arg path="${basedir}/phpunit.xml" />
+			<arg value="--testsuite" />
+			<arg value="froxlor" />
+			<arg value="--prepend" />
+			<arg path="${basedir}/tests/xdebug-filter.php" />
+		</exec>
+
+		<property name="phpunit.done" value="true" />
+	</target>
+
+	<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" resultproperty="result.phpunit"
+			taskname="phpunit">
+			<arg value="--configuration" />
+			<arg path="${basedir}/phpunit.xml" />
+			<arg value="--testsuite" />
+			<arg value="froxlor" />
+			<arg value="--no-coverage" />
+		</exec>
+
+		<property name="phpunit.done" value="true" />
+	</target>
+
+	<target name="-check-failure">
+		<fail message="PHPUnit did not finish successfully">
+			<condition>
+				<not>
+					<equals arg1="${result.phpunit}" arg2="0" />
+				</not>
+			</condition>
+		</fail>
+	</target>
+</project>

cache/.gitignore

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

composer.json

@@ -0,0 +1,88 @@
+{
+	"name": "froxlor/froxlor",
+	"description": "The server administration software for your needs. Developed by experienced server administrators, this panel simplifies the effort of managing your hosting platform.",
+	"keywords": [
+		"server",
+		"administration",
+		"php"
+	],
+	"homepage": "https://www.froxlor.org",
+	"license": "GPL-2.0-or-later",
+	"authors": [
+		{
+			"name": "Michael Kaufmann",
+			"email": "team@froxlor.org",
+			"role": "Lead Developer"
+		}
+	],
+	"support": {
+		"email": "team@froxlor.org",
+		"issues": "https://github.com/Froxlor/Froxlor/issues",
+		"forum": "https://forum.froxlor.org/",
+		"source": "https://github.com/Froxlor/Froxlor",
+		"docs": "https://docs.froxlor.org/",
+		"chat": "https://discord.froxlor.org/"
+	},
+	"funding": [
+		{
+			"type": "github",
+			"url": "https://github.com/sponsors/d00p"
+		}
+	],
+	"require": {
+		"php": "^7.4 || ^8.0",
+		"ext-session": "*",
+		"ext-ctype": "*",
+		"ext-pdo": "*",
+		"ext-pdo_mysql": "*",
+		"ext-simplexml": "*",
+		"ext-xml": "*",
+		"ext-filter": "*",
+		"ext-posix": "*",
+		"ext-mbstring": "*",
+		"ext-curl": "*",
+		"ext-json": "*",
+		"ext-openssl": "*",
+		"ext-fileinfo": "*",
+		"ext-gmp": "*",
+		"ext-gd": "*",
+		"phpmailer/phpmailer": "~6.0",
+		"monolog/monolog": "^1.24",
+		"robthree/twofactorauth": "^1.6",
+		"froxlor/idna-convert-legacy": "^2.1",
+		"voku/anti-xss": "^4.1",
+		"twig/twig": "^3.3",
+		"erusev/parsedown": "^1.7",
+		"symfony/console": "^5.4",
+		"pear/net_dns2": "^1.5"
+    },
+	"require-dev": {
+		"phpunit/phpunit": "^9",
+		"ext-pcntl": "*",
+		"phpcompatibility/php-compatibility": "*",
+		"squizlabs/php_codesniffer": "*",
+		"pdepend/pdepend": "^2.9",
+		"sebastian/phpcpd": "^6.0",
+		"phploc/phploc": "^7.0",
+		"phpmd/phpmd": "^2.10",
+		"phpunit/php-timer" : "^5",
+		"phpstan/phpstan": "^1.8"
+	},
+	"suggest": {
+		"ext-bcmath": "*",
+		"ext-zip": "*",
+		"ext-apcu": "*",
+		"ext-readline": "*"
+	},
+	"autoload": {
+		"psr-4": {
+			"Froxlor\\": [
+				"lib/Froxlor"
+			]
+		}
+	},
+	"scripts": {
+		"post-install-cmd": "if [ -f ./vendor/bin/phpcs ]; then \"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility ; fi",
+		"post-update-cmd" : "if [ -f ./vendor/bin/phpcs ]; then \"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility ; fi"
+	}
+}

customer_extras.php

@@ -2,639 +2,343 @@
 
 /**
  * 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\CustomerBackups as CustomerBackups;
+use Froxlor\Api\Commands\DirOptions as DirOptions;
+use Froxlor\Api\Commands\DirProtections as DirProtections;
+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')) {
-	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(USR_ACTION, LOG_NOTICE, "viewed customer_extras");
-	eval("echo \"" . 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')) {
-		redirectTo('customer_index.php');
+		Response::redirectTo('customer_index.php');
 	}
 
 	if ($action == '') {
-		$log->logAction(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 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'] = makeCorrectDir($row['path']);
-				$row = htmlentities_array($row);
-				eval("\$htpasswds.=\"" . 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 \"" . 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) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+		try {
-			WHERE `customerid`= :customerid
+			$json_result = DirProtections::getLocal($userinfo, [
-			AND `id`= :id");
+				'id' => $id
-		Database::pexecute($result_stmt, array(
+			])->get();
-			"customerid" => $userinfo['customerid'],
+		} catch (Exception $e) {
-			"id" => $id
+			Response::dynamicError($e->getMessage());
-		));
+		}
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['username']) && $result['username'] != '') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "`
+				try {
-					WHERE `customerid`= :customerid
+					DirProtections::getLocal($userinfo, $_POST)->delete();
-					AND `id`= :id");
+				} catch (Exception $e) {
-				Database::pexecute($stmt, array(
+					Response::dynamicError($e->getMessage());
-					"customerid" => $userinfo['customerid'],
+				}
-					"id" => $id
+				Response::redirectTo($filename, [
-				));
+					'page' => $page
-
+				]);
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
-				inserttask('1');
-				redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
 			} else {
 				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
 					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
-				ask_yesno('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') {
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$path = makeCorrectDir(validate($_POST['path'], 'path'));
+			try {
-			$userpath = $path;
+				DirProtections::getLocal($userinfo, $_POST)->add();
-			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+			} catch (Exception $e) {
-			$username = validate($_POST['username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
+				Response::dynamicError($e->getMessage());
-			$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
-			validate($_POST['directory_password'], 'password');
-
-			$username_path_check_stmt = Database::prepare("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "`
-				WHERE `username`= :username
-				AND `path`= :path
-				AND `customerid`= :customerid");
-			$params = array(
-				"username" => $username,
-				"path" => $path,
-				"customerid" => $userinfo['customerid']
-			);
-			Database::pexecute($username_path_check_stmt, $params);
-			$username_path_check = $username_path_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-			if (CRYPT_STD_DES == 1) {
-				$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
-				$password = crypt($_POST['directory_password'], $saltfordescrypt);
-			} else {
-				$password = crypt($_POST['directory_password']);
 			}
-
+			Response::redirectTo($filename, [
-			if (! $_POST['path']) {
+				'page' => $page
-				standard_error('invalidpath');
+			]);
-			}
-
-			if ($username == '') {
-				standard_error(array(
-					'stringisempty',
-					'myloginname'
-				));
-			} elseif ($username_path_check['username'] == $username && $username_path_check['path'] == $path) {
-				standard_error('userpathcombinationdupe');
-			} elseif ($_POST['directory_password'] == '') {
-				standard_error(array(
-					'stringisempty',
-					'mypassword'
-				));
-			} elseif ($path == '') {
-				standard_error('patherror');
-			} elseif ($_POST['directory_password'] == $username) {
-				standard_error('passwordshouldnotbeusername');
 		} else {
-				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` SET
+			$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-					`customerid` = :customerid,
-					`username` = :username,
-					`password` = :password,
-					`path` = :path,
-					`authname` = :authname");
-				$params = array(
-					"customerid" => $userinfo['customerid'],
-					"username" => $username,
-					"password" => $password,
-					"path" => $path,
-					"authname" => $authname
-				);
-				Database::pexecute($stmt, $params);
-				$log->logAction(USR_ACTION, LOG_INFO, "added htpasswd for '" . $username . " (" . $path . ")'");
-				inserttask('1');
-				redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
-			}
-		} else {
-			$pathSelect = 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 = 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 \"" . getTemplate("extras/htpasswds_add") . "\";");
+			]);
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+		try {
-			WHERE `customerid`= :customerid
+			$json_result = DirProtections::getLocal($userinfo, [
-			AND `id`= :id");
+				'id' => $id
-		Database::pexecute($result_stmt, array(
+			])->get();
-			"customerid" => $userinfo['customerid'],
+		} catch (Exception $e) {
-			"id" => $id
+			Response::dynamicError($e->getMessage());
-		));
+		}
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['username']) && $result['username'] != '') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				validate($_POST['directory_password'], 'password');
+				try {
-				$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
+					DirProtections::getLocal($userinfo, $_POST)->update();
-
+				} catch (Exception $e) {
-				if (CRYPT_STD_DES == 1) {
+					Response::dynamicError($e->getMessage());
-					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
-					$password = crypt($_POST['directory_password'], $saltfordescrypt);
-				} else {
-					$password = crypt($_POST['directory_password']);
-				}
-
-				if ($_POST['directory_password'] == $result['username']) {
-					standard_error('passwordshouldnotbeusername');
-				}
-
-				$params = array(
-					"customerid" => $userinfo['customerid'],
-					"id" => $id
-				);
-
-				$pwd_sql = '';
-				if ($_POST['directory_password'] != '') {
-					$pwd_sql = "`password`= :password ";
-					$params["password"] = $password;
-				}
-
-				$auth_sql = '';
-				if ($authname != $result['authname']) {
-					$auth_sql = "`authname`= :authname ";
-					$params["authname"] = $authname;
-				}
-
-				if ($pwd_sql != '' || $auth_sql != '') {
-					if ($pwd_sql != '' && $auth_sql != '') {
-						$pwd_sql .= ', ';
-					}
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
-						SET " . $pwd_sql . $auth_sql . "
-						WHERE `customerid`= :customerid
-						AND `id`= :id");
-					Database::pexecute($stmt, $params);
-					$log->logAction(USR_ACTION, LOG_INFO, "edited htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
-					inserttask('1');
-					redirectTo($filename, array(
-						'page' => $page,
-						's' => $s
-					));
 				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
 			} else {
 				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
 					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
-
+				$result = PhpHelper::htmlentitiesArray($result);
-				$result = htmlentities_array($result);
 
 				$htpasswd_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
-				$htpasswd_edit_form = 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 \"" . 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')) {
-		redirectTo('customer_index.php');
+		Response::redirectTo('customer_index.php');
 	}
 
 	if ($action == '') {
-		$log->logAction(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 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 = 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'] = 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 = htmlentities_array($row);
-				eval("\$htaccess.=\"" . 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 \"" . 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) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+		try {
-			WHERE `customerid` = :customerid
+			$json_result = DirOptions::getLocal($userinfo, [
-			AND `id` = :id");
+				'id' => $id
-		Database::pexecute($result_stmt, array(
+			])->get();
-			"customerid" => $userinfo['customerid'],
+		} catch (Exception $e) {
-			"id" => $id
+			Response::dynamicError($e->getMessage());
-		));
+		}
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['customerid']) && $result['customerid'] != '' && $result['customerid'] == $userinfo['customerid']) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// do we have to remove the symlink and folder in suexecpath?
+				try {
-				if ((int) Settings::Get('perl.suexecworkaround') == 1) {
+					DirOptions::getLocal($userinfo, $_POST)->delete();
-					$loginname = getCustomerDetail($result['customerid'], 'loginname');
+				} catch (Exception $e) {
-					$suexecpath = makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($result['path']) . '/');
+					Response::dynamicError($e->getMessage());
-					$perlsymlink = makeCorrectFile($result['path'] . '/cgi-bin');
-					// remove symlink
-					if (file_exists($perlsymlink)) {
-						safe_exec('rm -f ' . escapeshellarg($perlsymlink));
-						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround symlink '" . $perlsymlink . "'");
 				}
-					// remove folder in suexec-path
+				Response::redirectTo($filename, [
-					if (file_exists($suexecpath)) {
+					'page' => $page
-						safe_exec('rm -rf ' . escapeshellarg($suexecpath));
+				]);
-						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround path '" . $suexecpath . "'");
-					}
-				}
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTACCESS . "`
-					WHERE `customerid`= :customerid
-					AND `id`= :id");
-				Database::pexecute($stmt, array(
-					"customerid" => $userinfo['customerid'],
-					"id" => $id
-				));
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
-				inserttask('1');
-				redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
 			} else {
-				ask_yesno('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') {
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$path = makeCorrectDir(validate($_POST['path'], 'path'));
+			try {
-			$userpath = $path;
+				DirOptions::getLocal($userinfo, $_POST)->add();
-			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+			} catch (Exception $e) {
-			$path_dupe_check_stmt = Database::prepare("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "`
+				Response::dynamicError($e->getMessage());
-				WHERE `path`= :path
-				AND `customerid`= :customerid");
-			Database::pexecute($path_dupe_check_stmt, array(
-				"path" => $path,
-				"customerid" => $userinfo['customerid']
-			));
-			$path_dupe_check = $path_dupe_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-			if (! $_POST['path']) {
-				standard_error('invalidpath');
 			}
-
+			Response::redirectTo($filename, [
-			if (isset($_POST['options_cgi']) && (int) $_POST['options_cgi'] != 0) {
+				'page' => $page
-				$options_cgi = '1';
+			]);
 		} else {
-				$options_cgi = '0';
+			$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-			}
+			$cperlenabled = Customer::customerHasPerlEnabled($userinfo['customerid']);
-
-			$error404path = '';
-			if (isset($_POST['error404path'])) {
-				$error404path = correctErrorDocument($_POST['error404path']);
-			}
-
-			$error403path = '';
-			if (isset($_POST['error403path'])) {
-				$error403path = correctErrorDocument($_POST['error403path']);
-			}
-
-			$error500path = '';
-			if (isset($_POST['error500path'])) {
-				$error500path = correctErrorDocument($_POST['error500path']);
-			}
-
-			if ($path_dupe_check['path'] == $path) {
-				standard_error('errordocpathdupe', $userpath);
-			} elseif ($path == '') {
-				standard_error('patherror');
-			} else {
-				$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_HTACCESS . '` SET
-					`customerid` = :customerid,
-					`path` = :path,
-					`options_indexes` = :options_indexes,
-					`error404path` = :error404path,
-					`error403path` = :error403path,
-					`error500path` = :error500path,
-					`options_cgi` = :options_cgi');
-				$params = array(
-					"customerid" => $userinfo['customerid'],
-					"path" => $path,
-					"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
-					"error403path" => $error403path,
-					"error404path" => $error404path,
-					"error500path" => $error500path,
-					"options_cgi" => $options_cgi
-				);
-				Database::pexecute($stmt, $params);
-
-				$log->logAction(USR_ACTION, LOG_INFO, "added htaccess for '" . $path . "'");
-				inserttask('1');
-				redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
-			}
-		} else {
-			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 
 			$htaccess_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_add.php';
-			$htaccess_add_form = 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 \"" . getTemplate("extras/htaccess_add") . "\";");
+			]);
 		}
 	} elseif (($action == 'edit') && ($id != 0)) {
-		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+		try {
-			WHERE `customerid` = :customerid
+			$json_result = DirOptions::getLocal($userinfo, [
-			AND `id` = :id");
+				'id' => $id
-		Database::pexecute($result_stmt, array(
+			])->get();
-			"customerid" => $userinfo['customerid'],
+		} catch (Exception $e) {
-			"id" => $id
+			Response::dynamicError($e->getMessage());
-		));
+		}
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+		$result = json_decode($json_result, true)['data'];
 
 		if ((isset($result['customerid'])) && ($result['customerid'] != '') && ($result['customerid'] == $userinfo['customerid'])) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$option_indexes = intval($_POST['options_indexes']);
+				try {
-				$options_cgi = isset($_POST['options_cgi']) ? intval($_POST['options_cgi']) : 0;
+					DirOptions::getLocal($userinfo, $_POST)->update();
-
+				} catch (Exception $e) {
-				if ($option_indexes != '1') {
+					Response::dynamicError($e->getMessage());
-					$option_indexes = '0';
 				}
-
+				Response::redirectTo($filename, [
-				if ($options_cgi != '1') {
+					'page' => $page
-					$options_cgi = '0';
+				]);
-				}
-
-				$error404path = correctErrorDocument($_POST['error404path']);
-				$error403path = correctErrorDocument($_POST['error403path']);
-				$error500path = correctErrorDocument($_POST['error500path']);
-
-				if (($option_indexes != $result['options_indexes']) || ($error404path != $result['error404path']) || ($error403path != $result['error403path']) || ($error500path != $result['error500path']) || ($options_cgi != $result['options_cgi'])) {
-					inserttask('1');
-					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTACCESS . "`
-						SET `options_indexes` = :options_indexes,
-						`error404path` = :error404path,
-						`error403path` = :error403path,
-						`error500path` = :error500path,
-						`options_cgi` = :options_cgi
-						WHERE `customerid` = :customerid
-						AND `id` = :id");
-					$params = array(
-						"customerid" => $userinfo['customerid'],
-						"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
-						"error403path" => $error403path,
-						"error404path" => $error404path,
-						"error500path" => $error500path,
-						"options_cgi" => $options_cgi,
-						"id" => $id
-					);
-					Database::pexecute($stmt, $params);
-					$log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
-				}
-
-				redirectTo($filename, array(
-					'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 = customerHasPerlEnabled($userinfo['customerid']);
-				/*
-				 * $options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
-				 * $options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
-				 */
-				$result = htmlentities_array($result);
 
 				$htaccess_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_edit.php';
-				$htaccess_edit_form = 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 \"" . 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')) {
-		redirectTo('customer_index.php');
+		Response::redirectTo('customer_index.php');
 	}
 
-	if (Settings::Get('system.backupenabled') == 1)
+	if (Settings::Get('system.backupenabled') == 1) {
-	{
+		if ($action == 'abort') {
-		if ($action == 'abort' && isset($_POST['send']) && $_POST['send'] == 'send') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$log->logAction(USR_ACTION, LOG_NOTICE, "customer_extras::backup - aborted scheduled backupjob");
+				$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "customer_extras::backup - aborted scheduled backupjob");
-			$entry = isset($_POST['backup_job_entry']) ? (int)$_POST['backup_job_entry'] : 0;
+				try {
-			if ($entry > 0) {
+					CustomerBackups::getLocal($userinfo, $_POST)->delete();
-				$del_stmt = Database::prepare("DELETE FROM `".TABLE_PANEL_TASKS."` WHERE `id` = :tid");
+				} catch (Exception $e) {
-				Database::pexecute($del_stmt, array('tid' => $entry));
+					Response::dynamicError($e->getMessage());
-				standard_success('backupaborted');
 				}
-			redirectTo($filename, array('page' => $page, 'action' => '', 's' => $s));
+				Response::redirectTo($filename, [
+					'page' => $page,
+					'action' => ''
+				]);
+			} else {
+				HTML::askYesNo('extras_reallydelete_backup', $filename, [
+					'backup_job_entry' => $id,
+					'section' => 'extras',
+					'page' => $page,
+					'action' => $action
+				]);
 			}
-		if ($action == '') {
+		} elseif ($action == '') {
-			$log->logAction(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
-			$sel_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_TASKS."` WHERE `type` = '20'");
+			try {
-			Database::pexecute($sel_stmt);
+				$backup_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.backups.php';
-			$existing_backupJob = null;
+				$collection = (new Collection(CustomerBackups::class, $userinfo));
-			while ($entry = $sel_stmt->fetch())
+			} catch (Exception $e) {
-			{
+				Response::dynamicError($e->getMessage());
-				$data = unserialize($entry['data']);
-				if ($data['customerid'] == $userinfo['customerid']) {
-					$existing_backupJob = $entry;
-					break;
-				}
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-
+				try {
-				if (! $_POST['path']) {
+					CustomerBackups::getLocal($userinfo, $_POST)->add();
-					standard_error('invalidpath');
+				} catch (Exception $e) {
+					Response::dynamicError($e->getMessage());
 				}
-
+				Response::standardSuccess('backupscheduled');
-				$path = makeCorrectDir(validate($_POST['path'], 'path'));
-				$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-
-				$backup_dbs = isset($_POST['backup_dbs']) ? intval($_POST['backup_dbs']) : 0;
-				$backup_mail = isset($_POST['backup_mail']) ? intval($_POST['backup_mail']) : 0;
-				$backup_web = isset($_POST['backup_web']) ? intval($_POST['backup_web']) : 0;
-
-				if ($backup_dbs != '1') {
-					$backup_dbs = '0';
-				}
-
-				if ($backup_mail != '1') {
-					$backup_mail = '0';
-				}
-
-				if ($backup_web != '1') {
-					$backup_web = '0';
-				}
-
-				$task_data = array(
-					'customerid' => $userinfo['customerid'],
-					'uid' => $userinfo['guid'],
-					'gid' => $userinfo['guid'],
-					'loginname' => $userinfo['loginname'],
-					'destdir' => $path,
-					'backup_dbs' => $backup_dbs,
-					'backup_mail' => $backup_mail,
-					'backup_web' => $backup_web
-				);
-				// schedule backup job
-				inserttask('20', $task_data);
-
-				standard_success('backupscheduled');
 			} else {
-
+				$pathSelect = FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-				if (!empty($existing_backupJob)) {
-					$action = "abort";
-					$row = unserialize($entry['data']);
-					$row['path'] = 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 = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 				$backup_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.backup.php';
-				$backup_form = 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 = \"" . getTemplate("extras/backup_listexisting") . "\";");
+					'formdata' => $backup_data['backup'],
-				}
+					'tabledata' => Listing::format($collection, $backup_list_data, 'backup_list'),
-				eval("echo \"" . getTemplate("extras/backup") . "\";");
+				]);
 			}
 		}
-	}
+	} else {
-	else
+		Response::standardError('backupfunctionnotenabled');
-	{
-		standard_error('backupfunctionnotenabled');
 	}
 }

customer_ftp.php

@@ -2,486 +2,202 @@
 
 /**
  * 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');
+const AREA = 'customer';
-require './lib/init.php';
+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')) {
-	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(USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . getTemplate('ftp/ftp') . "\";");
-} elseif ($page == 'accounts') {
 	if ($action == '') {
-		$log->logAction(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 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'] = makeCorrectDir($row['documentroot']);
+		$actions_links = false;
-
+		if (CurrentUser::canAddResource('ftps')) {
-				$row = htmlentities_array($row);
+			$actions_links = [
-				eval("\$accounts.=\"" . 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 \"" . getTemplate('ftp/accounts') . "\";");
+			'entity_info' => lng('ftp.description')
+		]);
 	} elseif ($action == 'delete' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "`
+		try {
-			WHERE `customerid` = :customerid
+			$json_result = Ftps::getLocal($userinfo, [
-			AND `id` = :id"
+				'id' => $id
-		);
+			])->get();
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		} catch (Exception $e) {
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['username']) && $result['username'] != $userinfo['loginname']) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+				try {
-					SET `up_count` = `up_count` + :up_count,
+					Ftps::getLocal($userinfo, $_POST)->delete();
-					`up_bytes` = `up_bytes` + :up_bytes,
+				} catch (Exception $e) {
-					`down_count` = `down_count` + :down_count,
+					Response::dynamicError($e->getMessage());
-					`down_bytes` = `down_bytes` + :down_bytes
-					WHERE `username` = :username"
-				);
-				$params = array(
-					"up_count" => $result['up_count'],
-					"up_bytes" => $result['up_bytes'],
-					"down_count" => $result['down_count'],
-					"down_bytes" => $result['down_bytes'],
-					"username" => $userinfo['loginname']
-				);
-				Database::pexecute($stmt, $params);
-
-				$result_stmt = Database::prepare("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "`
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = :name");
-				Database::pexecute($stmt, array("name" => $result['username']));
-
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_USERS . "`
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-
-				$stmt = Database::prepare("
-					UPDATE `" . TABLE_FTP_GROUPS . "` SET
-					`members` = REPLACE(`members`, :username,'')
-					WHERE `customerid` = :customerid
-				");
-				Database::pexecute($stmt, array("username" => ",".$result['username'], "customerid" => $userinfo['customerid']));
-
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
-
-				$resetaccnumber = ($userinfo['ftps_used'] == '1') ? " , `ftp_lastaccountnumber`='0'" : '';
-
-				// refs #293
-				if (isset($_POST['delete_userfiles']) && (int)$_POST['delete_userfiles'] == 1) {
-					inserttask('8', $userinfo['loginname'], $result['homedir']);
 				}
-
+				Response::redirectTo($filename, [
-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+					'page' => $page
-					SET `ftps_used` = `ftps_used` - 1 $resetaccnumber
+				]);
-					WHERE `customerid` = :customerid"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
-				ask_yesno_withcheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username']);
+				HTML::askYesNoWithCheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $result['username']);
 			}
 		} else {
-			standard_error('ftp_cantdeletemainaccount');
+			Response::standardError('ftp_cantdeletemainaccount');
 		}
 	} elseif ($action == 'add') {
 		if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') {
-			if (isset($_POST['send'])
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				&& $_POST['send'] == 'send') {
-				$description = validate($_POST['ftp_description'], 'description');
-				// @FIXME use a good path-validating regex here (refs #1231)
-				$path = validate($_POST['path'], 'path');
-				$password = validate($_POST['ftp_password'], 'password');
-				$password = validatePassword($password);
-				$shell = "/bin/false";
-				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shell = isset($_POST['shell']) ? validate($_POST['shell'], 'shell') : '/bin/false';
-				}
-
-				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if ($sendinfomail != 1) {
-					$sendinfomail = 0;
-				}
-
-				if (Settings::Get('customer.ftpatdomain') == '1') {
-					$ftpusername = validate($_POST['ftp_username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
-					if ($ftpusername == '') {
-						standard_error(array('stringisempty', 'username'));
-					}
-					$ftpdomain = $idna_convert->encode(validate($_POST['ftp_domain'], 'domain'));
-					$ftpdomain_check_stmt = Database::prepare("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `domain` = :domain
-						AND `customerid` = :customerid"
-					);
-					Database::pexecute($ftpdomain_check_stmt, array("domain" => $ftpdomain, "customerid" => $userinfo['customerid']));
-					$ftpdomain_check = $ftpdomain_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-					if ($ftpdomain_check['domain'] != $ftpdomain) {
-						standard_error('maindomainnonexist', $domain);
-					}
-					$username = $ftpusername . "@" . $ftpdomain;
-				} else {
-					$username = $userinfo['loginname'] . Settings::Get('customer.ftpprefix') . (intval($userinfo['ftp_lastaccountnumber']) + 1);
-				}
-
-				$username_check_stmt = Database::prepare("SELECT * FROM `" . TABLE_FTP_USERS . "`
-					WHERE `username` = :username"
-				);
-				Database::pexecute($username_check_stmt, array("username" => $username));
-				$username_check = $username_check_stmt->fetch(PDO::FETCH_ASSOC);
-
-				if (!empty($username_check) && $username_check['username'] = $username) {
-					standard_error('usernamealreadyexists', $username);
-				} elseif ($password == '') {
-					standard_error(array('stringisempty', 'mypassword'));
-				} elseif ($path == '') {
-					standard_error('patherror');
-				} elseif ($username == $password) {
-					standard_error('passwordshouldnotbeusername');
-				} else {
-					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-
-					$cryptPassword = makeCryptPassword($password);
-
-					$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "`
-						(`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`, `shell`)
-						VALUES (:customerid, :username, :description, :password, :homedir, 'y', :guid, :guid, :shell)"
-					);
-					$params = array(
-						"customerid" => $userinfo['customerid'],
-						"username" => $username,
-						"description" => $description,
-						"password" => $cryptPassword,
-						"homedir" => $path,
-						"guid" => $userinfo['guid'],
-						"shell" => $shell
-					);
-					Database::pexecute($stmt, $params);
-
-					$result_stmt = Database::prepare("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "`
-						WHERE `name` = :name"
-					);
-					Database::pexecute($result_stmt, array("name" => $userinfo['loginname']));
-
-					while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "`
-							(`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`)
-							VALUES (:name, 'user', :bytes_in_used, '0', '0', '0', '0', '0')"
-						);
-						Database::pexecute($stmt, array("name" => $username, "bytes_in_used" => $row['bytes_in_used']));
-					}
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_GROUPS . "`
-						SET `members` = CONCAT_WS(',',`members`, :username)
-						WHERE `customerid`= :customerid
-						AND `gid`= :guid"
-					);
-					$params = array(
-						"username" => $username,
-						"customerid" => $userinfo['customerid'],
-						"guid" => $userinfo['guid']
-					);
-					Database::pexecute($stmt, $params);
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-						SET `ftps_used` = `ftps_used` + 1,
-						`ftp_lastaccountnumber` = `ftp_lastaccountnumber` + 1
-						WHERE `customerid` = :customerid"
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-					$log->logAction(USR_ACTION, LOG_INFO, "added ftp-account '" . $username . " (" . $path . ")'");
-					inserttask(5);
-
-					if ($sendinfomail == 1) {
-						$replace_arr = array(
-							'SALUTATION' => getCorrectUserSalutation($userinfo),
-							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
-							'USR_NAME' => $username,
-							'USR_PASS' => $password,
-							'USR_PATH' => makeCorrectDir(str_replace($userinfo['documentroot'], "/", $path))
-						);
-
-						$def_language = $userinfo['def_language'];
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid` = :adminid
-							AND `language` = :lang
-							AND `templategroup`='mails'
-							AND `varname`='new_ftpaccount_by_customer_subject'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['subject']), $replace_arr));
-
-						$def_language = $userinfo['def_language'];
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid` = :adminid
-							AND `language` = :lang
-							AND `templategroup`='mails'
-							AND `varname`='new_ftpaccount_by_customer_mailbody'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['mailbody']), $replace_arr));
-
-						$_mailerror = false;
 				try {
-							$mail->Subject = $mail_subject;
+					Ftps::getLocal($userinfo, $_POST)->add();
-							$mail->AltBody = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
-							$mail->Send();
-						} catch(phpmailerException $e) {
-							$mailerr_msg = $e->errorMessage();
-							$_mailerror = true;
 				} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
+					Response::dynamicError($e->getMessage());
-							$_mailerror = true;
-						}
-
-						if ($_mailerror) {
-							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $userinfo['email']);
-						}
-
-						$mail->ClearAddresses();
-					}
-
-					redirectTo($filename, array('page' => $page, 's' => $s));
 				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
 			} else {
-				$pathSelect = 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"
+						WHERE `customerid`= :customerid ORDER BY `domain` ASC");
-					);
+					Database::pexecute($result_domains_stmt, [
-					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
+						"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 .= makeoption($idna_convert->decode($dom), $dom);
-						}
 					}
 				}
 
 				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shells = makeoption("/bin/false", "/bin/false", "/bin/false");
+					$shells['/bin/false'] = "/bin/false";
 					$shells_avail = Settings::Get('system.available_shells');
 					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 .= makeoption($_shell, $_shell, "/bin/false");
+							$shells[$shell] = $shell;
 						}
 					}
 				}
 
-				//$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
-
 				$ftp_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/ftp/formfield.ftp_add.php';
-				$ftp_add_form = 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 \"" . getTemplate('ftp/accounts_add') . "\";");
+				]);
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir`, `uid`, `gid`, `shell` FROM `" . TABLE_FTP_USERS . "`
+		try {
-			WHERE `customerid` = :customerid
+			$json_result = Ftps::getLocal($userinfo, [
-			AND `id` = :id"
+				'id' => $id
-		);
+			])->get();
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		} catch (Exception $e) {
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['username']) && $result['username'] != '') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// @FIXME use a good path-validating regex here (refs #1231)
+				try {
-				$path = validate($_POST['path'], 'path');
+					Ftps::getLocal($userinfo, $_POST)->update();
-
+				} catch (Exception $e) {
-				$shell = "/bin/false";
+					Response::dynamicError($e->getMessage());
-				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shell = isset($_POST['shell']) ? validate($_POST['shell'], 'shell') : '/bin/false';
 				}
-
+				Response::redirectTo($filename, [
-				$_setnewpass = false;
+					'page' => $page
-				if (isset($_POST['ftp_password']) && $_POST['ftp_password'] != '') {
+				]);
-					$password = validate($_POST['ftp_password'], 'password');
-					$password = validatePassword($password);
-					$_setnewpass = true;
-				}
-
-				if ($_setnewpass) {
-					if ($password == '') {
-						standard_error(array('stringisempty', 'mypassword'));
-					} elseif ($result['username'] == $password) {
-						standard_error('passwordshouldnotbeusername');
-					}
-					$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
-					$cryptPassword = makeCryptPassword($password);
-
-					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-						SET `password` = :password
-						WHERE `customerid` = :customerid
-						AND `id` = :id"
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id, "password" => $cryptPassword));
-				}
-
-				if ($path != '') {
-					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-
-					if ($path != $result['homedir']) {
-						if (!file_exists($path)) {
-							// it's the task for "new ftp" but that will
-							// create all directories and correct their permissions
-							inserttask(5);
-						}
-
-						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account homdir for '" . $result['username'] . "'");
-
-						$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-							SET `homedir` = :homedir
-							WHERE `customerid` = :customerid
-							AND `id` = :id"
-						);
-						$params = array(
-							"homedir" => $path,
-							"customerid" => $userinfo['customerid'],
-							"id" => $id
-						);
-						Database::pexecute($stmt, $params);
-					}
-				}
-
-				$log->logAction(USR_ACTION, LOG_INFO, "edited ftp-account '" . $result['username'] . "'");
-				$description = validate($_POST['ftp_description'], 'description');
-				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-					SET `description` = :desc, `shell` = :shell
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("desc" => $description, "shell" => $shell, "customerid" => $userinfo['customerid'], "id" => $id));
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
 					$homedir = str_replace($userinfo['documentroot'], "/", $result['homedir']);
 				} else {
 					$homedir = $result['homedir'];
 				}
-				$homedir = makeCorrectDir($homedir);
+				$homedir = FileDir::makeCorrectDir($homedir);
 
-				$pathSelect = 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 .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
-					}
-				}
 
 				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shells = makeoption("/bin/false", "/bin/false", $result['shell']);
+					$shells['/bin/false'] = "/bin/false";
 					$shells_avail = Settings::Get('system.available_shells');
 					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 .= 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 = 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 \"" . getTemplate('ftp/accounts_edit') . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

customer_index.php

@@ -2,65 +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');
+const AREA = 'customer';
-require './lib/init.php';
+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(USR_ACTION, LOG_NOTICE, 'logged out');
+	$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'logged out');
 
-	$params = array("customerid" => $userinfo['customerid']);
+	unset($_SESSION['userinfo']);
-	if (Settings::Get('session.allow_multiple_login') == '1') {
+	CurrentUser::setData();
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+	session_destroy();
-			WHERE `userid` = :customerid
+
-			AND `adminsession` = '0'
+	Response::redirectTo('index.php');
-			AND `hash` = :hash"
+} elseif ($action == 'suback') {
-		);
+	if (is_array(CurrentUser::getField('switched_user'))) {
-		$params["hash"] = $s;
+		$result = CurrentUser::getData();
-	} else {
+		$result = $result['switched_user'];
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		CurrentUser::setData($result);
-			WHERE `userid` = :customerid
+		$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
-			AND `adminsession` = '0'"
+		$redirect = "admin_" . $target . ".php";
-		);
+		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);
-
-	redirectTo('index.php');
 }
 
 if ($page == 'overview') {
-	$log->logAction(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("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
+	Database::pexecute($domain_stmt, [
-
+		"customerid" => $userinfo['customerid'],
-	$domains = '';
+		"standardsubdomain" => $userinfo['standardsubdomain']
-	$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 = '';
@@ -70,7 +91,10 @@ if ($page == 'overview') {
 			WHERE `customerid` = :customerid
 			AND `id` = :standardsubdomain
 		");
-		$std_domain = Database::pexecute_first($std_domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
+		$std_domain = Database::pexecute_first($std_domain_stmt, [
+			"customerid" => $userinfo['customerid'],
+			"standardsubdomain" => $userinfo['standardsubdomain']
+		]);
 		$stdsubdomain = $std_domain['domain'];
 	}
 
@@ -80,242 +104,173 @@ 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('cid' => $userinfo['customerid']));
+	$usages = Database::pexecute_first($usages_stmt, [
+		'cid' => $userinfo['customerid']
+	]);
 
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, Settings::Get('panel.decimal_places'));
+	// get everything in bytes for the percentage calculation on the dashboard
-	$userinfo['diskspace_used'] = round($usages['webspace'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1;
-	$userinfo['mailspace_used'] = round($usages['mail'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : -1;
-	$userinfo['dbspace_used'] = round($usages['mysql'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['traffic_bytes_used'] = $userinfo['traffic_used'] * 1024;
 
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
+	if ($usages) {
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
+		$userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024;
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
+		$userinfo['mailspace_used']  = $usages['mail'] * 1024;
-
+		$userinfo['dbspace_used'] = $usages['mysql'] * 1024;
-	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+		$userinfo['total_bytes_used'] = ($usages['webspace'] + $usages['mail'] + $usages['mysql']) * 1024;
-
+	} else {
-	$services_enabled = "";
+		$userinfo['diskspace_bytes_used'] = 0;
-	$se = array();
+		$userinfo['total_bytes_used'] = 0;
-	if ($userinfo['imap'] == '1') $se[] = "IMAP";
+		$userinfo['mailspace_used']  = 0;
-	if ($userinfo['pop3'] == '1') $se[] = "POP3";
+		$userinfo['dbspace_used'] = 0;
-	if ($userinfo['phpenabled'] == '1') $se[] = "PHP";
-	if ($userinfo['perlenabled'] == '1') $se[] = "Perl/CGI";
-	$services_enabled = implode(", ", $se);
-
-	eval("echo \"" . getTemplate('index/index') . "\";");
-} elseif ($page == 'change_password') {
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$old_password = validate($_POST['old_password'], 'old password');
-		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_CUSTOMERS,'customerid')) {
-			standard_error('oldpasswordnotcorrect');
 	}
 
-		$new_password = validatePassword($_POST['new_password'], 'new password');
+	UI::twig()->addGlobal('userinfo', $userinfo);
-		$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
+	UI::view('user/index.html.twig', [
+		'domains' => $domainArray,
+		'stdsubdomain' => $stdsubdomain
+	]);
+} elseif ($page == 'change_password') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$old_password = Validate::validate($_POST['old_password'], 'old password');
+
+		if (!Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_CUSTOMERS, 'customerid')) {
+			Response::standardError('oldpasswordnotcorrect');
+		}
+
+		try {
+			$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 == '') {
-			standard_error(array('stringisempty', 'oldpassword'));
+			Response::standardError([
+				'stringisempty',
+				'changepassword.old_password'
+			]);
 		} elseif ($new_password == '') {
-			standard_error(array('stringisempty', 'newpassword'));
+			Response::standardError([
+				'stringisempty',
+				'changepassword.new_password'
+			]);
 		} elseif ($new_password_confirm == '') {
-			standard_error(array('stringisempty', 'newpasswordconfirm'));
+			Response::standardError([
+				'stringisempty',
+				'changepassword.new_password_confirm'
+			]);
 		} elseif ($new_password != $new_password_confirm) {
-			standard_error('newpasswordconfirmerror');
+			Response::standardError('newpasswordconfirmerror');
 		} else {
 			// Update user password
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+			try {
-				SET `password` = :newpassword
+				Customers::getLocal($userinfo, [
-				WHERE `customerid` = :customerid"
+					'id' => $userinfo['customerid'],
-			);
+					'new_customer_password' => $new_password
-			$params = array(
+				])->update();
-				"newpassword" => makeCryptPassword($new_password),
+			} catch (Exception $e) {
-				"customerid" => $userinfo['customerid']
+				Response::dynamicError($e->getMessage());
-			);
+			}
-			Database::pexecute($stmt, $params);
+			$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed password');
-			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');
 
 			// Update ftp password
 			if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') {
-				$cryptPassword = makeCryptPassword($new_password);
+				$cryptPassword = Crypt::makeCryptPassword($new_password);
 				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
 					SET `password` = :password
 					WHERE `customerid` = :customerid
-					AND `username` = :username"
+					AND `username` = :username");
-				);
+				$params = [
-				$params = array(
 					"password" => $cryptPassword,
 					"customerid" => $userinfo['customerid'],
 					"username" => $userinfo['loginname']
-				);
+				];
 				Database::pexecute($stmt, $params);
-				$log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password');
+				$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}
 
-			// Update webalizer password
+			// Update statistics password
-			if (isset($_POST['change_webalizer']) && $_POST['change_webalizer'] == 'true') {
+			if (isset($_POST['change_stats']) && $_POST['change_stats'] == 'true') {
-				if (CRYPT_STD_DES == 1) {
+				$new_stats_password = Crypt::makeCryptPassword($new_password, true);
-					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
-					$new_webalizer_password = crypt($new_password, $saltfordescrypt);
-				} else {
-					$new_webalizer_password = crypt($new_password);
-				}
 
 				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
 					SET `password` = :password
 					WHERE `customerid` = :customerid
-					AND `username` = :username"
+					AND `username` = :username");
-				);
+				$params = [
-				$params = array(
+					"password" => $new_stats_password,
-					"password" => $new_webalizer_password,
 					"customerid" => $userinfo['customerid'],
 					"username" => $userinfo['loginname']
-				);
+				];
 				Database::pexecute($stmt, $params);
+				Cronjob::inserttask(TaskId::REBUILD_VHOST);
 			}
 
-			redirectTo($filename, array('s' => $s));
+			Response::redirectTo($filename);
 		}
 	} else {
-		eval("echo \"" . 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 = validate($_POST['def_language'], 'default language');
+		$def_language = Validate::validate($_POST['def_language'], 'default language');
 		if (isset($languages[$def_language])) {
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+			try {
-				SET `def_language` = :lang
+				Customers::getLocal($userinfo, [
-				WHERE `customerid` = :customerid"
+					'id' => $userinfo['customerid'],
-			);
+					'def_language' => $def_language
-			Database::pexecute($stmt, array("lang" => $def_language, "customerid" => $userinfo['customerid']));
+				])->update();
-
+				CurrentUser::setField('language', $def_language);
-			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
+			} catch (Exception $e) {
-				SET `language` = :lang
+				Response::dynamicError($e->getMessage());
-				WHERE `hash` = :hash"
-			);
-			Database::pexecute($stmt, array("lang" => $def_language, "hash" => $s));
-
-			$log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
 			}
-
+		}
-		redirectTo($filename, array('s' => $s));
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
+		Response::redirectTo($filename);
 	} 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', [
-		while (list($language_file, $language_name) = each($languages)) {
+			'languages' => $languages,
-			$language_options .= makeoption($language_name, $language_file, $default_lang, true);
+			'default_lang' => $default_lang
-		}
+		]);
-
-		eval("echo \"" . getTemplate('index/change_language') . "\";");
 	}
 } elseif ($page == 'change_theme') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$theme = validate($_POST['theme'], 'theme');
+		$theme = Validate::validate($_POST['theme'], 'theme');
+		try {
+			Customers::getLocal($userinfo, [
+				'id' => $userinfo['customerid'],
+				'theme' => $theme
+			])->update();
+		} catch (Exception $e) {
+			Response::dynamicError($e->getMessage());
+		}
 
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+		$log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-			SET `theme` = :theme
+		Response::redirectTo($filename);
-			WHERE `customerid` = :customerid"
-		);
-		Database::pexecute($stmt, array("theme" => $theme, "customerid" => $userinfo['customerid']));
-
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
-			SET `theme` = :theme
-			WHERE `hash` = :hash"
-		);
-		Database::pexecute($stmt, array("theme" => $theme, "hash" => $s));
-
-		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-		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 = getThemes();
-		foreach ($themes_avail as $t => $d) {
-			$theme_options.= makeoption($d, $t, $default_theme, true);
-		}
 
-		eval("echo \"" . 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
+} elseif ($page == 'apikeys' && Settings::Get('api.enabled') == 1) {
-	if (isset($_GET['errorid']) && $_GET['errorid'] != '') {
+	require_once __DIR__ . '/api_keys.php';
-
+} elseif ($page == '2fa' && Settings::Get('2fa.enabled') == 1) {
-		$errid = $_GET['errorid'];
+	require_once __DIR__ . '/2fa.php';
-		// read error file
-		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
-		$err_file = 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_INSTALL_DIR))),
-				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", 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(phpmailerException $e) {
-					$mailerr_msg = $e->errorMessage();
-					$_mailerror = true;
-				} catch (Exception $e) {
-					$mailerr_msg = $e->getMessage();
-					$_mailerror = true;
-				}
-
-				if ($_mailerror) {
-					// error when reporting an error...LOLFUQ
-					standard_error('send_report_error', $mailerr_msg);
-				}
-
-				// finally remove error from fs
-				@unlink($err_file);
-				redirectTo($filename, array('s' => $s));
-			}
-			// show a nice summary of the error-report
-			// before actually sending anything
-			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
-
-		} else {
-			redirectTo($filename, array('s' => $s));
-		}
-	} else {
-		redirectTo($filename, array('s' => $s));
-	}
 }

customer_logger.php

@@ -2,121 +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');
+const AREA = 'customer';
-require './lib/init.php';
+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')) {
-	redirectTo('customer_index.php');
+	Response::redirectTo('customer_index.php');
 }
 
-if ($page == 'log'
+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 paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc');
-		$result_stmt = Database::prepare('
-			SELECT * FROM `' . TABLE_PANEL_LOG . '` WHERE `user` = :loginname ' . $paging->getSqlWhere(true) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit()
-		);
-		Database::pexecute($result_stmt, array("loginname" => $userinfo['loginname']));
-		$logs_count = Database::num_rows();
-		$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 = htmlentities_array($row);
-					$row['date'] = date("d.m.y H:i:s", $row['date']);
-
-					if ($_action != $action) {
-						switch ($action) {
-							case USR_ACTION:
-								$_action = $lng['admin']['customer'];
-								break;
-							case RES_ACTION:
-								$_action = $lng['logger']['reseller'];
-								break;
-							case ADM_ACTION:
-								$_action = $lng['logger']['admin'];
-								break;
-							case CRON_ACTION:
-								$_action = $lng['logger']['cron'];
-								break;
-							case LOGIN_ACTION:
-								$_action = $lng['logger']['login'];
-								break;
-							case LOG_ERROR:
-								$_action = $lng['logger']['intern'];
-								break;
-							default:
-								$_action = $lng['logger']['unknown'];
-								break;
-						}
-
-						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
-					}
-
-					$log_count++;
-					$row['type'] = getLogLevelDesc($row['type']);
-					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
-					$count++;
-					$_action = $action;
-				}
-				$i++;
-			}
-			$i++;
-		}
-
-		eval("echo \"" . getTemplate('logger/logger') . "\";");
-
 	}
 }

customer_mysql.php

@@ -2,27 +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');
+const AREA = 'customer';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
 
-// redirect if this customer page is hidden via settings
+use Froxlor\Api\Commands\Mysqls;
-if (Settings::IsInList('panel.customer_hide_options','mysql')) {
+use Froxlor\Api\Commands\MysqlServer;
-	redirectTo('customer_index.php');
+use Froxlor\Database\Database;
+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 or no resources given
+if (Settings::IsInList('panel.customer_hide_options', 'mysql') || $userinfo['mysqls'] == 0) {
+	Response::redirectTo('customer_index.php');
 }
 
 // get sql-root access data
@@ -31,78 +50,49 @@ 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(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 \"" . getTemplate('mysql/mysql') . "\";");
-} elseif ($page == 'mysqls') {
 	if ($action == '') {
-		$log->logAction(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 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."`");
+		try {
-		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+			$mysql_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.mysqls.php';
-		$count_mysqlservers = $dbserver['numservers'];
+			$collection = (new Collection(Mysqls::class, $userinfo))
-
+				->withPagination($mysql_list_data['mysql_list']['columns'], $mysql_list_data['mysql_list']['default_sorting']);
-		// Begin root-session
+		} catch (Exception $e) {
-		Database::needRoot(true);
+			Response::dynamicError($e->getMessage());
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				$row = htmlentities_array($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'] = size_readable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int)Settings::Get('panel.decimal_places') . 'f %s');
-				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
-				$count++;
 		}
-			$i++;
+
+		$actions_links = false;
+		if (CurrentUser::canAddResource('mysqls')) {
+			$actions_links = [
+				[
+					'href' => $linker->getLink(['section' => 'mysql', 'page' => 'mysqls', 'action' => 'add']),
+					'label' => lng('mysql.database_create')
+				]
+			];
 		}
-		Database::needRoot(false);
-		// End root-session
-
-		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
 
+		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) {
-		$result_stmt = Database::prepare('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '`
+		try {
-			WHERE `customerid`="' . (int)$userinfo['customerid'] . '"
+			$json_result = Mysqls::getLocal($userinfo, [
-			AND `id`="' . (int)$id . '"'
+				'id' => $id
-		);
+			])->get();
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		} catch (Exception $e) {
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['databasename']) && $result['databasename'] != '') {
-
+			Database::needRoot(true, $result['dbserver'], false);
-			Database::needRoot(true, $result['dbserver']);
 			Database::needSqlData();
 			$sql_root = Database::getSqlData();
 			Database::needRoot(false);
@@ -112,261 +102,96 @@ if ($page == 'overview') {
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// Begin root-session
+				try {
-				Database::needRoot(true, $result['dbserver']);
+					Mysqls::getLocal($userinfo, $_POST)->delete();
-				$dbm = new DbManager($log);
+				} catch (Exception $e) {
-				$dbm->getManager()->deleteDatabase($result['databasename']);
+					Response::dynamicError($e->getMessage());
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
+				}
-				Database::needRoot(false);
+				Response::redirectTo($filename, [
-				// End root-session
+					'page' => $page
-
+				]);
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_DATABASES . "`
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
-
-				$resetaccnumber = ($userinfo['mysqls_used'] == '1') ? " , `mysql_lastaccountnumber` = '0' " : '';
-
-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-					SET `mysqls_used` = `mysqls_used` - 1 " . $resetaccnumber . "
-					WHERE `customerid` = :customerid"
-				);
-				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 				$dbnamedesc = $result['databasename'];
 				if (isset($result['description']) && $result['description'] != '') {
 					$dbnamedesc .= ' (' . $result['description'] . ')';
 				}
-				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
+				HTML::askYesNo('mysql_reallydelete', $filename, [
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				], $dbnamedesc);
 			}
 		}
 	} elseif ($action == 'add') {
 		if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$password = validate($_POST['mysql_password'], 'password');
-				$password = validatePassword($password);
-
-				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if ($sendinfomail != 1) {
-					$sendinfomail = 0;
-				}
-
-				if ($password == '') {
-					standard_error(array('stringisempty', 'mypassword'));
-				} else {
-					$dbserver = 0;
-					$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'];
-					if ($count_mysqlservers > 1) {
-						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
-						Database::needRoot(true, $dbserver);
-						Database::needSqlData();
-						$sql_root = Database::getSqlData();
-						Database::needRoot(false);
-						if (!isset($sql_root) || !is_array($sql_root)) {
-							$dbserver = 0;
-						}
-					}
-
-					// validate description before actual adding the database, #1052
-					$databasedescription = validate(trim($_POST['description']), 'description');
-
-					// create database, user, set permissions, etc.pp.
-					$dbm = new DbManager($log);
-					$username = $dbm->createDatabase(
-						$userinfo['loginname'],
-						$password,
-						$userinfo['mysql_lastaccountnumber']
-					);
-
-					// we've checked against the password in dbm->createDatabase
-					if ($username == false) {
-						standard_error('passwordshouldnotbeusername');
-					}
-
-					// Statement modified for Database description -- PH 2004-11-29
-					$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_DATABASES . '`
-						(`customerid`, `databasename`, `description`, `dbserver`)
-						VALUES (:customerid, :databasename, :description, :dbserver)'
-					);
-					$params = array(
-						"customerid" => $userinfo['customerid'],
-						"databasename" => $username,
-						"description" => $databasedescription,
-						"dbserver" => $dbserver
-					);
-					Database::pexecute($stmt, $params);
-
-					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
-						SET `mysqls_used` = `mysqls_used` + 1, `mysql_lastaccountnumber` = `mysql_lastaccountnumber` + 1
-						WHERE `customerid` = :customerid'
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-					if ($sendinfomail == 1) {
-						$pma = $lng['admin']['notgiven'];
-						if (Settings::Get('panel.phpmyadmin_url') != '') {
-							$pma = Settings::Get('panel.phpmyadmin_url');
-						}
-
-						Database::needRoot(true, $dbserver);
-						Database::needSqlData();
-						$sql_root = Database::getSqlData();
-						Database::needRoot(false);
-
-						$replace_arr = array(
-							'SALUTATION' => getCorrectUserSalutation($userinfo),
-							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
-							'DB_NAME' => $username,
-							'DB_PASS' => $password,
-							'DB_DESC' => $databasedescription,
-							'DB_SRV' => $sql_root['host'],
-							'PMA_URI' => $pma
-						);
-
-						$def_language = $userinfo['def_language'];
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid` = :adminid
-							AND `language` = :lang
-							AND `templategroup`='mails'
-							AND `varname`='new_database_by_customer_subject'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['subject']), $replace_arr));
-
-						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-							WHERE `adminid`= :adminid
-							AND `language`= :lang
-							AND `templategroup` = 'mails'
-							AND `varname` = 'new_database_by_customer_mailbody'"
-						);
-						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
-						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['mailbody']), $replace_arr));
-
-						$_mailerror = false;
 				try {
-							$mail->Subject = $mail_subject;
+					Mysqls::getLocal($userinfo, $_POST)->add();
-							$mail->AltBody = $mail_body;
-							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
-							$mail->Send();
-						} catch(phpmailerException $e) {
-							$mailerr_msg = $e->errorMessage();
-							$_mailerror = true;
 				} catch (Exception $e) {
-							$mailerr_msg = $e->getMessage();
+					Response::dynamicError($e->getMessage());
-							$_mailerror = true;
-						}
-
-						if ($_mailerror) {
-							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-							standard_error('errorsendingmail', $userinfo['email']);
-						}
-
-						$mail->ClearAddresses();
-					}
-
-					redirectTo($filename, array('page' => $page, 's' => $s));
 				}
+				Response::redirectTo($filename, [
+					'page' => $page
+				]);
 			} 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 .= 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 = 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 \"" . getTemplate('mysql/mysqls_add') . "\";");
+				]);
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		$result_stmt = Database::prepare("SELECT `id`, `databasename`, `description`, `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`
+		try {
-			WHERE `customerid` = :customerid
+			$json_result = Mysqls::getLocal($userinfo, [
-			AND `id` = :id"
+				'id' => $id
-		);
+			])->get();
-		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		} catch (Exception $e) {
-		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+			Response::dynamicError($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
 		if (isset($result['databasename']) && $result['databasename'] != '') {
-			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
-				$result['dbserver'] = 0;
-			}
-
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				// Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29
+				try {
-				$password = validate($_POST['mysql_password'], 'password');
+					$json_result = Mysqls::getLocal($userinfo, $_POST)->update();
-				if ($password != '') {
+				} catch (Exception $e) {
-					// validate password
+					Response::dynamicError($e->getMessage());
-					$password = validatePassword($password);
-
-					if ($password == $result['databasename']) {
-						standard_error('passwordshouldnotbeusername');
 				}
-
+				Response::redirectTo($filename, [
-					// Begin root-session
+					'page' => $page
-					Database::needRoot(true);
+				]);
-					foreach (array_map('trim', explode(',', Settings::Get('system.mysql_access_host'))) as $mysql_access_host) {
-						$stmt = Database::prepare("SET PASSWORD FOR :dbname@:host = PASSWORD(:password)");
-						$params = array(
-							"dbname" => $result['databasename'],
-							"host" => $mysql_access_host,
-							"password" => $password
-						);
-						Database::pexecute($stmt, $params);
-					}
-
-					$stmt = Database::prepare("FLUSH PRIVILEGES");
-					Database::pexecute($stmt);
-					Database::needRoot(false);
-					// End root-session
-				}
-
-				// Update the Database description -- PH 2004-11-29
-				$log->logAction(USR_ACTION, LOG_INFO, "edited database '" . $result['databasename'] . "'");
-				$databasedescription = validate($_POST['description'], 'description');
-				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DATABASES . "`
-					SET `description` = :desc
-					WHERE `customerid` = :customerid
-					AND `id` = :id"
-				);
-				Database::pexecute($stmt, array("desc" => $databasedescription, "customerid" => $userinfo['customerid'], "id" => $id));
-				redirectTo($filename, array('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 = 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 \"" . getTemplate('mysql/mysqls_edit') . "\";");
+					'editid' => $id
+				]);
 			}
 		}
 	}

customer_tickets.php

@@ -1,392 +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    Panel
- *
- */
-
-define('AREA', 'customer');
-require './lib/init.php';
-
-// redirect if this customer page is hidden via settings
-if (Settings::IsInList('panel.customer_hide_options','domains')) {
-	redirectTo('customer_index.php');
-}
-
-if (isset($_POST['id'])) {
-
-	$id = intval($_POST['id']);
-
-	//Check if the current user is allowed to see the current ticket.
-	$stmt = Database::prepare("SELECT `id` FROM `panel_tickets` WHERE `id` = :id AND `customerid` = :customerid");
-	$result = Database::pexecute_first($stmt, array("id" => $id, "customerid" => $userinfo['customerid']));
-
-	if ($result == null) {
-		// no rights to see the requested ticket
-		standard_error(array('ticketnotaccessible'));
-	}
-} elseif (isset($_GET['id'])) {
-	$id = intval($_GET['id']);
-}
-
-if ($page == 'overview') {
-	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets");
-	eval("echo \"" . getTemplate("tickets/ticket") . "\";");
-} elseif ($page == 'tickets') {
-	if ($action == '') {
-		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets");
-		$fields = array(
-			'status' => $lng['ticket']['status'],
-			'lastchange' => $lng['ticket']['lastchange'],
-			'subject' => $lng['ticket']['subject'],
-			'lastreplier' => $lng['ticket']['lastreplier']
-		);
-		$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields);
-		$stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub`
-			WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
-			FROM `' . TABLE_PANEL_TICKETS . '` as `main`
-			WHERE `main`.`answerto` = "0"
-			AND `archived` = "0"
-			AND `customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
-		);
-		Database::pexecute($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;
-		$tickets = '';
-		$tickets_count = 0;
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			if ($paging->checkDisplay($i)) {
-				$tickets_count++;
-				$row = htmlentities_array($row);
-				$row['lastchange'] = date("d.m.y H:i", $row['lastchange']);
-
-				if ($row['status'] >= 0 && $row['status'] <= 2) {
-					$reopen = 0;
-				} else {
-					$reopen = 1;
-				}
-
-				$row['status'] = ticket::getStatusText($lng, $row['status']);
-				$row['priority'] = ticket::getPriorityText($lng, $row['priority']);
-
-				if ($row['lastreplier'] == '1') {
-					$row['lastreplier'] = $lng['ticket']['staff'];
-					$cananswer = 1;
-				} else {
-					$row['lastreplier'] = $lng['ticket']['customer'];
-					$cananswer = 0;
-				}
-
-				$row['subject'] = html_entity_decode($row['subject']);
-				if (strlen($row['subject']) > 30) {
-					$ts = wordwrap($row['subject'], 30, "|");
-					$ts = explode("|", $ts);
-					$row['subject'] = $ts[0]. '...';
-				}
-
-				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
-				$count++;
-			}
-
-			$i++;
-		}
-
-		$supportavailable = 0;
-		$time = date("Hi", time());
-		$day = date("w", time());
-		$start = substr(Settings::Get('ticket.worktime_begin'), 0, 2) . substr(Settings::Get('ticket.worktime_begin'), 3, 2);
-		$end = substr(Settings::Get('ticket.worktime_end'), 0, 2) . substr(Settings::Get('ticket.worktime_end'), 3, 2);
-
-		if ($time >= $start && $time <= $end) {
-			$supportavailable = 1;
-		}
-
-		if (Settings::Get('ticket.worktime_sat') == "0" && $day == "6") {
-			$supportavailable = 0;
-		}
-
-		if (Settings::Get('ticket.worktime_sun') == "0" && $day == "0") {
-			$supportavailable = 0;
-		}
-
-		if (Settings::Get('ticket.worktime_all') == "1") {
-			$supportavailable = 1;
-		}
-
-		$ticketsopen = 0;
-		$stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-			WHERE `customerid` = :customerid
-			AND `answerto` = "0"
-			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
-		);
-		$opentickets = Database::pexecute_first($stmt, array("customerid" => $userinfo['customerid']));
-
-		if (Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
-			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
-		} else {
-			$notmorethanxopentickets = '';
-		}
-
-		$ticketsopen = (int)$opentickets['count'];
-		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
-
-	} elseif ($action == 'new') {
-		if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				$newticket = ticket::getInstanceOf($userinfo, -1);
-				$newticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
-				$newticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
-				$newticket->Set('category', validate($_POST['category'], 'category'), true, false);
-				$newticket->Set('customer', (int)$userinfo['customerid'], true, false);
-				$newticket->Set('admin', (int)$userinfo['adminid'], true, false);
-				$newticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);
-
-				if ($newticket->Get('subject') == null) {
-					standard_error(array('stringisempty', 'mysubject'));
-				} elseif ($newticket->Get('message') == null) {
-					standard_error(array('stringisempty', 'mymessage'));
-				} else {
-					$now = time();
-					$newticket->Set('dt', $now, true, true);
-					$newticket->Set('lastchange', $now, true, true);
-					$newticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
-					$newticket->Set('status', '0', true, true);
-					$newticket->Set('lastreplier', '0', true, true);
-					$newticket->Set('by', '0', true, true);
-					$newticket->Insert();
-					$log->logAction(USR_ACTION, LOG_NOTICE, "opened support-ticket '" . $newticket->Get('subject') . "'");
-
-					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
-						SET `tickets_used`=`tickets_used` + 1
-						WHERE `customerid`= :customerid'
-					);
-					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-					// Customer mail
-					$newticket->sendMail((int)$userinfo['customerid'], 'new_ticket_for_customer_subject', $lng['mails']['new_ticket_for_customer']['subject'], 'new_ticket_for_customer_mailbody', $lng['mails']['new_ticket_for_customer']['mailbody']);
-
-					// Admin mail
-					$newticket->sendMail(-1, 'new_ticket_by_customer_subject', $lng['mails']['new_ticket_by_customer']['subject'], 'new_ticket_by_customer_mailbody', $lng['mails']['new_ticket_by_customer']['mailbody']);
-					redirectTo($filename, array('page' => $page, 's' => $s));
-				}
-			} else {
-				$categories = '';
-				$result_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-					WHERE `adminid` = :adminid
-					ORDER BY `logicalorder`, `name` ASC'
-				);
-				$result = Database::pexecute_first($result_stmt, array("adminid" => $userinfo['adminid']));
-
-				if (isset($result['name']) && $result['name'] != '') {
-					$result2_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-						WHERE `adminid` = :adminid
-						ORDER BY `logicalorder`, `name` ASC'
-					);
-					Database::pexecute($result2_stmt, array("adminid" => $userinfo['adminid']));
-
-					while ($row = $result2_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$categories.= makeoption($row['name'], $row['id']);
-					}
-				} else {
-					$categories = makeoption($lng['ticket']['no_cat'], '0');
-				}
-
-				$priorities = makeoption($lng['ticket']['high'], '1');
-				$priorities.= makeoption($lng['ticket']['normal'], '2');
-				$priorities.= makeoption($lng['ticket']['low'], '3');
-				$ticketsopen = 0;
-				$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-					WHERE `customerid` = :customerid
-					AND `answerto` = "0"
-					AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
-				);
-				$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
-
-				if (Settings::Get('ticket.concurrently_open') != -1 && Settings::Get('ticket.concurrently_open') != '') {
-					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
-				} else {
-					$notmorethanxopentickets = '';
-				}
-
-				$ticketsopen = (int)$opentickets['count'];
-
-				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_add.php';
-				$ticket_add_form = htmlform::genHTMLForm($ticket_add_data);
-
-				$title = $ticket_add_data['ticket_add']['title'];
-				$image = $ticket_add_data['ticket_add']['image'];
-
-				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
-			}
-		} else {
-			standard_error('nomoreticketsavailable');
-		}
-	} elseif ($action == 'answer' && $id != 0) {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$replyticket = ticket::getInstanceOf($userinfo, -1);
-			$replyticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
-			$replyticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
-			$replyticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);
-
-			if ($replyticket->Get('message') == null) {
-				standard_error(array('stringisempty', 'mymessage'));
-			} else {
-				$now = time();
-				$replyticket->Set('customer', (int)$userinfo['customerid'], true, true);
-				$replyticket->Set('lastchange', $now, true, true);
-				$replyticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
-				$replyticket->Set('status', '1', true, true);
-				$replyticket->Set('answerto', (int)$id, true, false);
-				$replyticket->Set('by', '0', true, true);
-				$replyticket->Insert();
-
-				// Update priority if changed
-				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-
-				if ($replyticket->Get('priority') != $mainticket->Get('priority')) {
-					$mainticket->Set('priority', $replyticket->Get('priority'), true);
-				}
-
-				$mainticket->Set('lastchange', $now);
-				$mainticket->Set('lastreplier', '0');
-				$mainticket->Set('status', '1');
-				$mainticket->Update();
-				$log->logAction(USR_ACTION, LOG_NOTICE, "answered support-ticket '" . $mainticket->Get('subject') . "'");
-				$mainticket->sendMail(-1, 'new_reply_ticket_by_customer_subject', $lng['mails']['new_reply_ticket_by_customer']['subject'], 'new_reply_ticket_by_customer_mailbody', $lng['mails']['new_reply_ticket_by_customer']['mailbody']);
-				redirectTo($filename, array('page' => $page, 's' => $s));
-			}
-		} else {
-			$ticket_replies = '';
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
-			$status = ticket::getStatusText($lng, $mainticket->Get('status'));
-
-			if ($mainticket->Get('status') >= 0 && $mainticket->Get('status') <= 2) {
-				$isclosed = 0;
-			} else {
-				$isclosed = 1;
-			}
-
-			if ($mainticket->Get('by') == '1') {
-				$by = $lng['ticket']['staff'];
-			} else {
-				$cid = $mainticket->Get('customer');
-				$usr_stmt = Database::prepare('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-					FROM `' . TABLE_PANEL_CUSTOMERS . '`
-					WHERE `customerid` = :customerid '
-				);
-				$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
-				$by = getCorrectFullUserDetails($usr);
-			}
-
-			$subject = $mainticket->Get('subject');
-			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-			$result_stmt = Database::prepare('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-				WHERE `id`= :id '
-			);
-			$row = Database::pexecute_first($result_stmt, array("id" => $mainticket->Get('category')));
-
-			$andere_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_TICKETS . '`
-				WHERE `answerto`= :answerto
-				ORDER BY `lastchange` ASC'
-			);
-			Database::pexecute($andere_stmt, array("answerto" => $id));
-			$numrows_andere = Database::num_rows();
-
-			while ($row2 = $andere_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$subticket = ticket::getInstanceOf($userinfo, (int)$row2['id']);
-				$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));
-
-				if ($subticket->Get('by') == '1') {
-					$by = $lng['ticket']['staff'];
-				} else {
-					$cid = $subticket->Get('customer');
-					$usr_stmt = Database::prepare('
-						SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = :customerid '
-					);
-					$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
-					$by = getCorrectFullUserDetails($usr);
-				}
-
-				$subject = $subticket->Get('subject');
-				$message = $subticket->Get('message');
-
-				$row2 = htmlentities_array($row2);
-				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
-			}
-
-			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
-			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
-			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-			$subject = htmlentities($mainticket->Get('subject'));
-			$ticket_replies_count = $numrows_andere + 1;
-
-			// don't forget the main-ticket!
-			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_reply.php';
-			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
-
-			$title = $ticket_reply_data['ticket_reply']['title'];
-			$image = $ticket_reply_data['ticket_reply']['image'];
-
-			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
-		}
-	} elseif ($action == 'close' && $id != 0) {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$now = time();
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			$mainticket->Set('lastchange', $now, true, true);
-			$mainticket->Set('lastreplier', '0', true, true);
-			$mainticket->Set('status', '3', true, true);
-			$mainticket->Update();
-			$log->logAction(USR_ACTION, LOG_NOTICE, "closed support-ticket '" . $mainticket->Get('subject') . "'");
-			redirectTo($filename, array('page' => $page, 's' => $s));
-		} else {
-			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-			ask_yesno('ticket_reallyclose', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
-		}
-	} elseif ($action == 'reopen' && $id != 0) {
-		$ticketsopen = 0;
-		$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-			WHERE `customerid` = :customerid
-			AND `answerto` = "0"
-			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
-		);
-		$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
-		$ticketsopen = (int)$opentickets['count'];
-
-		if ($ticketsopen > Settings::Get('ticket.concurrently_open') && Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
-			standard_error('notmorethanxopentickets', Settings::Get('ticket.concurrently_open'));
-		}
-
-		$now = time();
-		$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
-		$mainticket->Set('lastchange', $now, true, true);
-		$mainticket->Set('lastreplier', '0', true, true);
-		$mainticket->Set('status', '0', true, true);
-		$mainticket->Update();
-		$log->logAction(USR_ACTION, LOG_NOTICE, "reopened support-ticket '" . $mainticket->Get('subject') . "'");
-		redirectTo($filename, array('page' => $page, 's' => $s));
-	}
-}

customer_traffic.php

@@ -2,164 +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');
+const AREA = 'customer';
-$intrafficpage = 1;
+require __DIR__ . '/lib/init.php';
-require './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')) {
-	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.=\"" . getTemplate('traffic/traffic_month') . "\";");
+// pass metrics to the view
-		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
+UI::view('user/traffic.html.twig', $context);
-	}
-
-	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-
-	eval("echo \"" . 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.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
-	}
-
-	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
-
-	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
-}

dns_editor.php

@@ -1,306 +1,149 @@
 <?php
-if (! defined('AREA'))
-	die('You cannot access this file directly!');
 
 /**
  * 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 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
  */
 
+if (!defined('AREA')) {
+	header("Location: index.php");
+	exit();
+}
+
+use Froxlor\Api\Commands\DomainZones;
+use Froxlor\Dns\Dns;
+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;
+
 // 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 = getAllowedDomainEntry($domain_id, AREA, $userinfo, $idna_convert);
+$domain = Dns::getAllowedDomainEntry($domain_id, AREA, $userinfo);
 
-// select all entries
+$errors = "";
-$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 = array();
 $success_message = "";
 
 // action for adding a new entry
 if ($action == 'add_record' && !empty($_POST)) {
-
+	try {
-	// validation
+		DomainZones::getLocal($userinfo, [
-	if (empty($record)) {
+			'id' => $domain_id,
-		$record = "@";
-	}
-
-	$record = strtolower($record);
-
-	if ($record != '@' && $record != '*') {
-		// validate record
-		if (strpos($record, '--') !== false) {
-			$errors[] = $lng['error']['domain_nopunycode'];
-		} else {
-			$record = $idna_convert->encode($record);
-			if ($type != 'SRV' && $type != 'TXT') {
-				$check_dom = $record . '.example.com';
-				if (! validateDomain($check_dom)) {
-					$errors[] = sprintf($lng['error']['subdomainiswrong'], $idna_convert->decode($record));
-				}
-			}
-			if (strlen($record) > 63) {
-				$errors[] = $lng['error']['dns_record_toolong'];
-			}
-		}
-	}
-
-	// TODO regex validate content for invalid characters
-
-	if ($ttl <= 0) {
-		$ttl = 18000;
-	}
-
-	if (empty($content)) {
-		$errors[] = $lng['error']['dns_content_empty'];
-	}
-
-	// types
-	if ($type == 'A' && filter_var($content, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
-		$errors[] = $lng['error']['dns_arec_noipv4'];
-	} elseif ($type == 'AAAA' && filter_var($content, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
-		$errors[] = $lng['error']['dns_aaaarec_noipv6'];
-	} elseif ($type == 'MX') {
-		if ($prio === null || $prio < 0) {
-			$errors[] = $lng['error']['dns_mx_prioempty'];
-		}
-		// check for trailing dot
-		if (substr($content, - 1) == '.') {
-			// remove it for checks
-			$content = substr($content, 0, - 1);
-		}
-		if (! validateDomain($content)) {
-			$errors[] = $lng['error']['dns_mx_needdom'];
-		} else {
-			// check whether there is a CNAME-record for the same resource
-			foreach ($dom_entries as $existing_entries) {
-				$fqdn = $existing_entries['record'] . '.' . $domain;
-				if ($existing_entries['type'] == 'CNAME' && $fqdn == $content) {
-					$errors[] = $lng['error']['dns_mx_noalias'];
-					break;
-				}
-			}
-		}
-		// append trailing dot (again)
-		$content .= '.';
-	} elseif ($type == 'CNAME') {
-		// check for trailing dot
-		if (substr($content, - 1) == '.') {
-			// remove it for checks
-			$content = substr($content, 0, - 1);
-		}
-		if (! validateDomain($content)) {
-			$errors[] = $lng['error']['dns_cname_invaliddom'];
-		} else {
-			// check whether there are RR-records for the same resource
-			foreach ($dom_entries as $existing_entries) {
-				if (($existing_entries['type'] == 'A' || $existing_entries['type'] == 'AAAA' || $existing_entries['type'] == 'MX' || $existing_entries['type'] == 'NS') && $existing_entries['record'] == $record) {
-					$errors[] = $lng['error']['dns_cname_nomorerr'];
-					break;
-				}
-			}
-		}
-		// append trailing dot (again)
-		$content .= '.';
-	} elseif ($type == 'NS') {
-		// check for trailing dot
-		if (substr($content, - 1) == '.') {
-			// remove it for checks
-			$content = substr($content, 0, - 1);
-		}
-		if (! validateDomain($content)) {
-			$errors[] = $lng['error']['dns_ns_invaliddom'];
-		}
-		// append trailing dot (again)
-		$content .= '.';
-	} elseif ($type == 'TXT' && ! empty($content)) {
-		// check that TXT content is enclosed in " "
-		$content = encloseTXTContent($content);
-	} elseif ($type == 'SRV') {
-		if ($prio === null || $prio < 0) {
-			$errors[] = $lng['error']['dns_srv_prioempty'];
-		}
-		// check only last part of content, as it can look like:
-		// _service._proto.name. TTL class SRV priority weight port target.
-		$_split_content = explode(" ", $content);
-		// SRV content must be [weight] [port] [target]
-		if (count($_split_content) != 3) {
-			$errors[] = $lng['error']['dns_srv_invalidcontent'];
-		}
-		$target = trim($_split_content[count($_split_content) - 1]);
-		if ($target != '.') {
-			// check for trailing dot
-			if (substr($target, - 1) == '.') {
-				// remove it for checks
-				$target = substr($target, 0, - 1);
-			}
-		}
-		if ($target != '.' && ! validateDomain($target)) {
-			$errors[] = $lng['error']['dns_srv_needdom'];
-		} else {
-			// check whether there is a CNAME-record for the same resource
-			foreach ($dom_entries as $existing_entries) {
-				$fqdn = $existing_entries['record'] . '.' . $domain;
-				if ($existing_entries['type'] == 'CNAME' && $fqdn == $target) {
-					$errors[] = $lng['error']['dns_srv_noalias'];
-					break;
-				}
-			}
-		}
-		// append trailing dot (again)
-		if ($target != '.') {
-			$content .= '.';
-		}
-	}
-
-	$new_entry = array(
 			'record' => $record,
 			'type' => $type,
 			'prio' => $prio,
 			'content' => $content,
-		'ttl' => $ttl,
+			'ttl' => $ttl
-		'domain_id' => $domain_id
+		])->add();
-	);
+		$success_message = lng('success.dns_record_added');
-	ksort($new_entry);
+		$record = $prio = $content = "";
-
+	} catch (Exception $e) {
-	// check for duplicate
+		$errors = str_replace("\n", "<br>", $e->getMessage());
-	foreach ($dom_entries as $existing_entry) {
-		// compare serialized string of array
-		$check_entry = $existing_entry;
-		// new entry has no ID yet
-		unset($check_entry['id']);
-		// sort by key
-		ksort($check_entry);
-		// format integer fields to real integer (as they are read as string from the DB)
-		$check_entry['prio'] = (int) $check_entry['prio'];
-		$check_entry['ttl'] = (int) $check_entry['ttl'];
-		$check_entry['domain_id'] = (int) $check_entry['domain_id'];
-		// serialize both
-		$check_entry = serialize($check_entry);
-		$new = serialize($new_entry);
-		// compare
-		if ($check_entry === $new) {
-			$errors[] = $lng['error']['dns_duplicate_entry'];
-			unset($check_entry);
-			break;
-		}
-	}
-
-	if (empty($errors)) {
-		$ins_stmt = Database::prepare("
-			INSERT INTO `" . TABLE_DOMAIN_DNS . "` SET
-			`record` = :record,
-			`type` = :type,
-			`prio` = :prio,
-			`content` = :content,
-			`ttl` = :ttl,
-			`domain_id` = :domain_id
-		");
-
-		Database::pexecute($ins_stmt, $new_entry);
-
-		$new_entry_id = Database::lastInsertId();
-
-		// add temporary to the entries-array (no reread of DB necessary)
-		$new_entry['id'] = $new_entry_id;
-		$dom_entries[] = $new_entry;
-
-		// success message (inline)
-		$success_message = $lng['success']['dns_record_added'];
-
-		$record = "";
-		$type = 'A';
-		$prio = "";
-		$content = "";
-		$ttl = "";
-
-		// re-generate bind configs
-		inserttask('4');
-	} else {
-		// show $errors
-		$errors = implode("<br>", $errors);
 	}
 } elseif ($action == 'delete') {
-	// remove entry
 	$entry_id = isset($_GET['id']) ? (int)$_GET['id'] : 0;
-	if ($entry_id > 0) {
+	HTML::askYesNo('dnsentry_reallydelete', $filename, [
-		$del_stmt = Database::prepare("DELETE FROM `" . TABLE_DOMAIN_DNS . "` WHERE `id` = :id");
+		'id' => $entry_id,
-		Database::pexecute($del_stmt, array(
+		'domain_id' => $domain_id,
-			'id' => $entry_id
+		'page' => $page,
-		));
+		'action' => 'deletesure'
-
+	], '', [
-		// remove deleted entry from internal data array (no reread of DB necessary)
+		'section' => 'domains',
-		$_t = $dom_entries;
+		'page' => $page,
-		foreach ($_t as $idx => $entry) {
+		'domain_id' => $domain_id
-			if ($entry['id'] == $entry_id) {
+	]);
-				unset($dom_entries[$idx]);
+} elseif (isset($_POST['send']) && $_POST['send'] == 'send' && $action == 'deletesure' && !empty($_POST)) {
-				break;
+	$entry_id = isset($_POST['id']) ? (int)$_POST['id'] : 0;
-			}
+	$domain_id = isset($_POST['domain_id']) ? (int)$_POST['domain_id'] : 0;
-		}
+	// remove entry
-		unset($_t);
+	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) {
-		// re-generate bind configs
+			$errors = str_replace("\n", "<br>", $e->getMessage());
-		inserttask('4');
+		}
 	}
 }
 
-// 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'], ['domain_id='.$domain_id]);
-
+} 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.=\"" . getTemplate("dns_editor/entry_bit", true) . "\";");
-	}
 }
 
-// available types
+try {
-$type_select_values = array(
+	$json_result = DomainZones::getLocal($userinfo, [
-	'A',
+		'id' => $domain_id
-	'AAAA',
+	])->get();
-	'NS',
+} catch (Exception $e) {
-	'MX',
+	Response::dynamicError($e->getMessage());
-	'SRV',
-	'TXT',
-	'CNAME'
-);
-asort($type_select_values);
-foreach ($type_select_values as $_type) {
-	$type_select .= makeoption($_type, $_type, $type);
 }
+$result = json_decode($json_result, true)['data'];
+$zonefile = implode("\n", $result);
 
-eval("\$record_list=\"" . getTemplate("dns_editor/list", true) . "\";");
+$dns_add_data = include_once dirname(__FILE__) . '/lib/formfields/formfield.dns_add.php';
 
-$zone = createDomainZone($domain_id);
+UI::view('user/dns-editor.html.twig', [
-$zonefile = (string) $zone;
+	'listing' => Listing::format($collection, $dns_list_data, 'dns_list', ['domain_id' => $domain_id]),
-eval("echo \"" . getTemplate("dns_editor/index", true) . "\";");
+	'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

@@ -0,0 +1,67 @@
+<?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
+ */
+
+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)
+    {
+        $this->url = $url;
+        $this->key = $key;
+        $this->secret = $secret;
+    }
+
+    public function request($command, array $data = [])
+    {
+        $payload = [
+            'command' => $command,
+            'params' => $data
+        ];
+
+        $ch = curl_init($this->url);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_USERPWD, $this->key . ":" . $this->secret);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $result = curl_exec($ch);
+
+        $this->lastStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+        return json_decode($result ?? curl_error($ch), true);
+    }
+
+    public function getLastStatusCode(): ?string
+    {
+        return $this->lastStatusCode;
+    }
+}

doc/example/create_customer.php

@@ -0,0 +1,46 @@
+<?php
+
+// include FroxlorAPI helper class
+require __DIR__ . '/FroxlorAPI.php';
+
+// create object of FroxlorAPI with URL, apikey and apisecret
+$fapi = new FroxlorAPI('http://127.0.0.1/api.php', 'your-api-key', 'your-api-secret');
+
+// customer data
+$data = [
+	'new_loginname' => 'test',
+	'email' => 'test@froxlor.org',
+	'firstname' => 'Test',
+	'name' => 'Testman',
+	'customernumber' => 1337,
+	'new_customer_password' => 's0mEcRypt1cpassword' . uniqid()
+];
+// send request
+$response = $fapi->request('Customers.add', $data);
+
+// check for error
+if ($fapi->getLastStatusCode() != 200) {
+	echo "HTTP-STATUS: " . $fapi->getLastStatusCode() . PHP_EOL;
+    echo "Description: "  . $response['message'] . PHP_EOL;
+    exit();
+}
+
+// view response data
+var_dump($response);
+
+/*
+array(60) {
+  ["customerid"]=>
+  string(1) "1"
+  ["loginname"]=>
+  string(4) "test"
+  ["password"]=>
+  string(63) "$5$asdasdasd.asdasd"
+  ["adminid"]=>
+  string(1) "1"
+  ["name"]=>
+  string(7) "Testman"
+  ["firstname"]=>
+  string(4) "Test"
+  [...]
+*/

doc/example/list_functions.php

@@ -0,0 +1,20 @@
+<?php
+
+// include FroxlorAPI helper class
+require __DIR__ . '/FroxlorAPI.php';
+
+// create object of FroxlorAPI with URL, apikey and apisecret
+$fapi = new FroxlorAPI('http://localhost/api.php', 'your-api-key', 'your-api-secret');
+
+// send request
+$response = $fapi->request('Froxlor.listFunctions');
+
+// check for error
+if ($fapi->getLastStatusCode() != 200) {
+    echo "HTTP-STATUS: " . $fapi->getLastStatusCode() . PHP_EOL;
+    echo "Description: "  . $response['message'] . PHP_EOL;
+    exit();
+}
+
+// view response data
+var_dump($response);

error_report.php

@@ -0,0 +1,117 @@
+<?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;
+use Froxlor\Database\Database;
+
+// 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";
+		try {
+			$mail_body .= "Database: " . Database::getAttribute(PDO::ATTR_SERVER_VERSION);
+		} catch (\Exception $e) {
+			/* ignore */
+		}
+		$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,40 +2,136 @@
 
 /**
  * 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');
+const AREA = 'login';
-require './lib/init.php';
+require __DIR__ . '/lib/init.php';
+
+use Froxlor\CurrentUser;
+use Froxlor\Customer\Customer;
+use Froxlor\Database\Database;
+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 ($action == 'login') {
+if ($action == '2fa_entercode') {
+	// page for entering the 2FA code after successful login
+	if (!isset($_SESSION) || !isset($_SESSION['secret_2fa'])) {
+		// no session - redirect to index
+		Response::redirectTo('index.php');
+		exit();
+	}
+	// show template to enter code
+	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'])) {
+		// no session - redirect to index
+		Response::redirectTo('index.php');
+		exit();
+	}
+	$code = isset($_POST['2fa_code']) ? $_POST['2fa_code'] : null;
+	// verify entered code
+	$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
+	if ($result) {
+		// get user-data
+		$table = $_SESSION['uidtable_2fa'];
+		$field = $_SESSION['uidfield_2fa'];
+		$uid = $_SESSION['uid_2fa'];
+		$isadmin = $_SESSION['unfo_2fa'];
+		$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
+			$sel_stmt = Database::prepare("SELECT * FROM $table WHERE `" . $field . "` = :uid AND `data_2fa` = :code");
+			$sel_param['code'] = $code;
+		} else {
+			// Authenticator-verification has already happened at this point, so just get the user-data
+			$sel_stmt = Database::prepare("SELECT * FROM $table WHERE `" . $field . "` = :uid");
+		}
+		$userinfo = Database::pexecute_first($sel_stmt, $sel_param);
+		// whoops, no (valid) user? Start again
+		if (empty($userinfo)) {
+			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)) {
+			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, [
+				'uid' => $uid
+			]);
+		}
+		exit();
+	}
+	Response::redirectTo('index.php', [
+		'showmessage' => '2'
+	]);
+	exit();
+} elseif ($action == 'login') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$loginname = validate($_POST['loginname'], 'loginname');
+		$loginname = Validate::validate($_POST['loginname'], 'loginname');
-		$password = validate($_POST['password'], 'password');
+		$password = Validate::validate($_POST['password'], 'password');
 
 		$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `loginname`= :loginname"
+			WHERE `loginname`= :loginname");
-		);
+		Database::pexecute($stmt, [
-		Database::pexecute($stmt, array("loginname" => $loginname));
+			"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';
@@ -43,22 +139,27 @@ if ($action == 'login') {
 		} else {
 			$is_admin = true;
 			if ((int)Settings::Get('login.domain_login') == 1) {
-				$domainname = $idna_convert->encode(preg_replace(array('/\:(\d)+$/', '/^https?\:\/\//'), '', $loginname));
+				$domainname = $idna_convert->encode(preg_replace([
+					'/\:(\d)+$/',
+					'/^https?\:\/\//'
+				], '', $loginname));
 				$stmt = Database::prepare("SELECT `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
-					WHERE `domain` = :domain"
+					WHERE `domain` = :domain");
-				);
+				Database::pexecute($stmt, [
-				Database::pexecute($stmt, array("domain" => $domainname));
+					"domain" => $domainname
+				]);
 				$row2 = $stmt->fetch(PDO::FETCH_ASSOC);
 
 				if (isset($row2['customerid']) && $row2['customerid'] > 0) {
-					$loginname = 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"
+							WHERE `loginname`= :loginname");
-						);
+						Database::pexecute($stmt, [
-						Database::pexecute($stmt, array("loginname" => $loginname));
+							"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';
@@ -69,70 +170,83 @@ if ($action == 'login') {
 			}
 		}
 
-		if ((hasUpdates($version) || hasDbUpdates($dbversion)) && $is_admin == false) {
+		if ((Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) && $is_admin == false) {
-			redirectTo('index.php');
+			Response::redirectTo('index.php');
-			exit;
+			exit();
 		}
 
 		if ($is_admin) {
-			if (hasUpdates($version) || hasDbUpdates($dbversion)) {
+			if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
 				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
 					WHERE `loginname`= :loginname
-					AND `change_serversettings` = '1'"
+					AND `change_serversettings` = '1'");
-				);
+				Database::pexecute($stmt, [
-				Database::pexecute($stmt, array("loginname" => $loginname));
+					"loginname" => $loginname
+				]);
 				$row = $stmt->fetch(PDO::FETCH_ASSOC);
 				if (!isset($row['admin'])) {
 					// not an admin who can see updates
-					redirectTo('index.php');
+					Response::redirectTo('index.php');
-					exit;
+					exit();
 				}
 			} else {
 				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
-					WHERE `loginname`= :loginname"
+					WHERE `loginname`= :loginname");
-				);
+				Database::pexecute($stmt, [
-				Database::pexecute($stmt, array("loginname" => $loginname));
+					"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('loginname' => $_SERVER['REMOTE_ADDR']));
+				$rstlog = FroxlorLogger::getInstanceOf([
-				$rstlog->logAction(LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
+					'loginname' => $_SERVER['REMOTE_ADDR']
+				]);
+				$rstlog->logAction(FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
 
-				redirectTo('index.php', array('showmessage' => '2'));
+				Response::redirectTo('index.php', [
-				exit;
+					'showmessage' => '2'
+				]);
+				exit();
 			}
 		}
 
 		$userinfo_stmt = Database::prepare("SELECT * FROM $table
-			WHERE `loginname`= :loginname"
+			WHERE `loginname`= :loginname");
-		);
+		Database::pexecute($userinfo_stmt, [
-		Database::pexecute($userinfo_stmt, array("loginname" => $loginname));
+			"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'))) {
-			redirectTo('index.php', array('showmessage' => '3'));
+			Response::redirectTo('index.php', [
-			exit;
+				'showmessage' => '3'
-		} elseif (validatePasswordLogin($userinfo, $password, $table, $uid)) {
+			]);
+			exit();
+		} 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);
-		        redirectTo('index.php', array('showmessage' => '5'));
+				Response::redirectTo('index.php', [
-		        exit;
+					'showmessage' => '5'
+				]);
+				exit();
 			} else {
 				// login correct
 				// reset loginfail_counter, set lastlogin_succ
 				$stmt = Database::prepare("UPDATE $table
 					  SET `lastlogin_succ`= :lastlogin_succ, `loginfail_count`='0'
-		              WHERE `$uid`= :uid"
+					  WHERE `$uid`= :uid");
-		        );
+				Database::pexecute($stmt, [
-		        Database::pexecute($stmt, array("lastlogin_succ" => time(), "uid" => $userinfo[$uid]));
+					"lastlogin_succ" => time(),
+					"uid" => $userinfo[$uid]
+				]);
 				$userinfo['userid'] = $userinfo[$uid];
 				$userinfo['adminsession'] = $adminsession;
 			}
@@ -140,161 +254,135 @@ if ($action == 'login') {
 			// login incorrect
 			$stmt = Database::prepare("UPDATE $table
 				SET `lastlogin_fail`= :lastlogin_fail, `loginfail_count`=`loginfail_count`+1
-				WHERE `$uid`= :uid"
+				WHERE `$uid`= :uid");
-			);
+			Database::pexecute($stmt, [
-			Database::pexecute($stmt, array("lastlogin_fail" => time(), "uid" => $userinfo[$uid]));
+				"lastlogin_fail" => time(),
+				"uid" => $userinfo[$uid]
+			]);
 
 			// Log failed login
-			$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => $_SERVER['REMOTE_ADDR']));
+			$rstlog = FroxlorLogger::getInstanceOf([
-			$rstlog->logAction(LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");
+				'loginname' => $_SERVER['REMOTE_ADDR']
+			]);
+			$rstlog->logAction(FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");
 
 			unset($userinfo);
-			redirectTo('index.php', array('showmessage' => '2'));
+			Response::redirectTo('index.php', [
-			exit;
+				'showmessage' => '2'
+			]);
+			exit();
 		}
 
-		if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
+		// 2FA activated
-			$s = md5(uniqid(microtime(), 1));
+		if (Settings::Get('2fa.enabled') == '1' && $userinfo['type_2fa'] > 0) {
+			// redirect to code-enter-page
+			$_SESSION['secret_2fa'] = ($userinfo['type_2fa'] == 2 ? $userinfo['data_2fa'] : 'email');
+			$_SESSION['uid_2fa'] = $userinfo[$uid];
+			$_SESSION['uidfield_2fa'] = $uid;
+			$_SESSION['uidtable_2fa'] = $table;
+			$_SESSION['unfo_2fa'] = $is_admin;
+			// send mail if type_2fa = 1 (email)
+			if ($userinfo['type_2fa'] == 1) {
+				// generate code
+				$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, [
+					"d2fa" => $code,
+					"uid" => $userinfo[$uid]
+				]);
+				// build up & send email
+				$_mailerror = false;
+				$mailerr_msg = "";
+				$replace_arr = [
+					'CODE' => $code
+				];
+				$mail_body = html_entity_decode(PhpHelper::replaceVariables(lng('mails.2fa.mailbody'), $replace_arr));
 
-			if (isset($_POST['language'])) {
+				try {
-				$language = validate($_POST['language'], 'language');
+					$mail->Subject = lng('mails.2fa.subject');
-				if ($language == 'profile') {
+					$mail->AltBody = $mail_body;
-					$language = $userinfo['def_language'];
+					$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-				} elseif (!isset($languages[$language])) {
+					$mail->AddAddress($userinfo['email'], User::getCorrectUserSalutation($userinfo));
-					$language = Settings::Get('panel.standardlanguage');
+					$mail->Send();
+				} catch (\PHPMailer\PHPMailer\Exception $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
 				}
+
+				if ($_mailerror) {
+					$rstlog = FroxlorLogger::getInstanceOf([
+						'loginname' => '2fa code-sending'
+					]);
+					$rstlog->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+					Response::redirectTo('index.php', [
+						'showmessage' => '4',
+						'customermail' => $userinfo['email']
+					]);
+					exit();
+				}
+
+				$mail->ClearAddresses();
+			}
+			Response::redirectTo('index.php', [
+				'action' => '2fa_entercode'
+			]);
+			exit();
+		}
+
+		if (!finishLogin($userinfo)) {
+			Response::redirectTo('index.php', [
+				'showmessage' => '2'
+			]);
+		}
+		exit();
 	} else {
-				$language = Settings::Get('panel.standardlanguage');
-			}
-
-			if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
-				$theme = $userinfo['theme'];
-			} else {
-				$theme = Settings::Get('panel.default_theme');
-			}
-
-			if (Settings::Get('session.allow_multiple_login') != '1') {
-				$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
-			$theme_field = false;
-			$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 (hasUpdates($version) || hasDbUpdates($dbversion)) {
-					redirectTo('admin_updates.php', array('s' => $s));
-				} else {
-					if (isset($_POST['script']) && $_POST['script'] != "") {
-						if (preg_match("/customer\_/", $_POST['script']) === 1) {
-							redirectTo('admin_customers.php', array("page" => "customers"));
-						} else {
-							redirectTo($_POST['script'], $qryparams);
-						}
-					} else {
-						redirectTo('admin_index.php', $qryparams);
-					}
-				}
-			} else {
-				if (isset($_POST['script']) && $_POST['script'] != "") {
-					redirectTo($_POST['script'], $qryparams);
-				} else {
-					redirectTo('customer_index.php', $qryparams);
-				}
-			}
-		} else {
-			redirectTo('index.php', array('showmessage' => '2'));
-		}
-		exit;
-	} else {
-		$language_options = '';
-		$language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
-
-		while (list($language_file, $language_name) = each($languages)) {
-			$language_options .= 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 (hasUpdates($version) || hasDbUpdates($dbversion)) {
+		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)) {
 				$lastscript = "";
@@ -305,7 +393,14 @@ if ($action == 'login') {
 			$lastqrystr = htmlspecialchars($_REQUEST['qrystr'], ENT_QUOTES);
 		}
 
-		eval("echo \"" . getTemplate('login') . "\";");
+		UI::view('login/login.html.twig', [
+			'pagetitle' => 'Login',
+			'lastscript' => $lastscript,
+			'lastqrystr' => $lastqrystr,
+			'upd_in_progress' => $update_in_progress,
+			'message' => $message,
+			'successmsg' => $successmessage
+		]);
 	}
 }
 
@@ -314,20 +409,24 @@ if ($action == 'forgotpwd') {
 	$message = '';
 
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$loginname = validate($_POST['loginname'], 'loginname');
+		$loginname = Validate::validate($_POST['loginname'], 'loginname');
-		$email = 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"
+			AND `email`= :email");
-		);
+		Database::pexecute($result_stmt, [
-		Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
+			"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"
+				AND `email`= :email");
-			);
+			Database::pexecute($result_stmt, [
-			Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
+				"loginname" => $loginname,
+				"email" => $email
+			]);
 
 			if (Database::num_rows() > 0) {
 				$adminchecked = true;
@@ -336,49 +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']) {
-				redirectTo('index.php', array('showmessage' => '8'));
+					$message = lng('pwdreminder.notallowed');
-				exit;
+				} else {
-			}
-
 					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 . randomStr(16)), 0, 15);
+							$first = substr(md5($user['loginname'] . $timestamp . PhpHelper::randomStr(16)), 0, 15);
-					$third = substr(md5($user['email'] . $timestamp . 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"
+								AND `admin` = :admin");
-					);
+							$params = [
-					$params = array(
 								"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)"
+								VALUES (:userid, :admin, :creation, :activationcode)");
-					);
+							$params = [
-					$params = array(
 								"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
 								"admin" => $adminchecked ? 1 : 0,
 								"creation" => $timestamp,
 								"activationcode" => $activationcode
-					);
+							];
 							Database::pexecute($stmt, $params);
 
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+							$rstlog = FroxlorLogger::getInstanceOf([
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $user['loginname'] . "' requested a link for setting a new password.");
+								'loginname' => 'password_reset'
+							]);
+							$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';
@@ -392,45 +501,54 @@ 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 = 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' => 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 . '`
 								WHERE `adminid`= :adminid
 								AND `language`= :lang
 								AND `templategroup`=\'mails\'
-						AND `varname`=\'password_reset_subject\''
+								AND `varname`=\'password_reset_subject\'');
-					);
+							Database::pexecute($result_stmt, [
-					Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
+								"adminid" => $user['adminid'],
+								"lang" => $def_language
+							]);
 							$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-					$mail_subject = html_entity_decode(replace_variables((($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\''
+								AND `varname`=\'password_reset_mailbody\'');
-					);
+							Database::pexecute($result_stmt, [
-					Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
+								"adminid" => $user['adminid'],
+								"lang" => $def_language
+							]);
 							$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
-					$mail_body = html_entity_decode(replace_variables((($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 = "";
 							try {
 								$mail->Subject = $mail_subject;
 								$mail->AltBody = $mail_body;
 								$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-						$mail->AddAddress($user['email'], getCorrectUserSalutation($user));
+								$mail->AddAddress($user['email'], User::getCorrectUserSalutation($user));
 								$mail->Send();
-					} catch(phpmailerException $e) {
+							} catch (\PHPMailer\PHPMailer\Exception $e) {
 								$mailerr_msg = $e->errorMessage();
 								$_mailerror = true;
 							} catch (Exception $e) {
@@ -439,40 +557,44 @@ if ($action == 'forgotpwd') {
 							}
 
 							if ($_mailerror) {
-						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+								$rstlog = FroxlorLogger::getInstanceOf([
-						$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+									'loginname' => 'password_reset'
-						redirectTo('index.php', array('showmessage' => '4', 'customermail' => $user['email']));
+								]);
-						exit;
+								$rstlog->logAction(FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+								Response::redirectTo('index.php', [
+									'showmessage' => '4',
+									'customermail' => $user['email']
+								]);
+								exit();
 							}
 
 							$mail->ClearAddresses();
-					redirectTo('index.php', array('showmessage' => '1'));
+							Response::redirectTo('index.php', [
-					exit;
+								'showmessage' => '1'
+							]);
+							exit();
 						} else {
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+							$rstlog = FroxlorLogger::getInstanceOf([
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
+								'loginname' => 'password_reset'
-					$message = $lng['login']['combination_not_found'];
+							]);
+							$rstlog->logAction(FroxlorLogger::USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
+							$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 \"" . getTemplate('fpwd') . "\";");
 }
 
 if ($action == 'resetpwd') {
@@ -480,9 +602,10 @@ if ($action == 'resetpwd') {
 
 	// Remove old activation codes
 	$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
-		WHERE creation < :oldest"
+		WHERE creation < :oldest");
-	);
+	Database::pexecute($stmt, [
-	Database::pexecute($stmt, array("oldest" => time() - 86400));
+		"oldest" => time() - 86400
+	]);
 
 	if (isset($_GET['resetcode']) && strlen($_GET['resetcode']) == 50) {
 		// Check if activation code is valid
@@ -494,63 +617,121 @@ if ($action == 'resetpwd') {
 		if (substr(md5($third . $timestamp), 0, 10) == $check && $timestamp >= time() - 86400) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				$stmt = Database::prepare("SELECT `userid`, `admin` FROM `" . TABLE_PANEL_ACTIVATION . "`
-					WHERE `activationcode` = :activationcode"
+					WHERE `activationcode` = :activationcode");
-				);
+				$result = Database::pexecute_first($stmt, [
-				$result = Database::pexecute_first($stmt, array("activationcode" => $activationcode));
+					"activationcode" => $activationcode
+				]);
 
 				if ($result !== false) {
-					if ($result['admin'] == 1) {
+					try {
-						$new_password = validate($_POST['new_password'], 'new password');
+						$new_password = Crypt::validatePassword($_POST['new_password'], true);
-						$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
+						$new_password_confirm = Crypt::validatePassword($_POST['new_password_confirm'], true);
-					} else {
+					} catch (Exception $e) {
-						$new_password = validatePassword($_POST['new_password'], 'new password');
+						$message = $e->getMessage();
-						$new_password_confirm = 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 . "`
 								SET `password` = :newpassword
-								WHERE `adminid` = :userid"
+								WHERE `adminid` = :userid");
-							);
 						} else {
 							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
 								SET `password` = :newpassword
-								WHERE `customerid` = :userid"
+								WHERE `customerid` = :userid");
-							);
 						}
-						Database::pexecute($stmt, array("newpassword" => makeCryptPassword($new_password), "userid" => $result['userid']));
+						Database::pexecute($stmt, [
+							"newpassword" => Crypt::makeCryptPassword($new_password),
+							"userid" => $result['userid']
+						]);
 
-						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+						$rstlog = FroxlorLogger::getInstanceOf([
-						$rstlog->logAction(USR_ACTION, LOG_NOTICE, "changed password using password reset.");
+							'loginname' => '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"
+							AND `userid` = :userid");
-						);
+						Database::pexecute($stmt, [
-						Database::pexecute($stmt, array("activationcode" => $activationcode, "userid" => $result['userid']));
+							"activationcode" => $activationcode,
-						redirectTo('index.php', array("showmessage" => '6'));
+							"userid" => $result['userid']
+						]);
+						Response::redirectTo('index.php', [
+							"showmessage" => '6'
+						]);
 					}
 				} else {
-					redirectTo('index.php', array("showmessage" => '7'));
+					Response::redirectTo('index.php', [
+						"showmessage" => '7'
+					]);
 				}
 			}
 
-			eval("echo \"" . getTemplate('rpwd') . "\";");
+			UI::view('login/rpwd.html.twig', [
-
+				'pagetitle' => lng('pwdreminder.choosenew'),
+				'formaction' => 'index.php?action=resetpwd&resetcode=' . $activationcode,
+				'message' => $message,
+			]);
 		} else {
-			redirectTo('index.php', array("showmessage" => '7'));
+			Response::redirectTo('index.php', [
+				"showmessage" => '7'
+			]);
+		}
+	} else {
+		Response::redirectTo('index.php');
+	}
 }
 
+function finishLogin($userinfo)
+{
+	if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
+		CurrentUser::setData($userinfo);
+
+		$language = $userinfo['def_language'] ?? Settings::Get('panel.standardlanguage');
+		CurrentUser::setField('language', $language);
+
+		if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
+			$theme = $userinfo['theme'];
 		} else {
-		redirectTo('index.php');
+			$theme = Settings::Get('panel.default_theme');
+			CurrentUser::setField('theme', $theme);
+		}
+
+		$qryparams = [];
+		if (isset($_POST['qrystr']) && $_POST['qrystr'] != "") {
+			parse_str(urldecode($_POST['qrystr']), $qryparams);
+		}
+
+		if ($userinfo['adminsession'] == '1') {
+			if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
+				Response::redirectTo('admin_updates.php?page=overview');
+			} else {
+				if (isset($_POST['script']) && $_POST['script'] != "") {
+					if (preg_match("/customer\_/", $_POST['script']) === 1) {
+						Response::redirectTo('admin_customers.php', [
+							"page" => "customers"
+						]);
+					} else {
+						Response::redirectTo($_POST['script'], $qryparams);
+					}
+				} else {
+					Response::redirectTo('admin_index.php', $qryparams);
 				}
 			}
+		} else {
+			if (isset($_POST['script']) && $_POST['script'] != "") {
+				Response::redirectTo($_POST['script'], $qryparams);
+			} else {
+				Response::redirectTo('customer_index.php', $qryparams);
+			}
+		}
+	}
+	return false;
+}