set version to 0.10.29 for upcoming release

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

.github/CONTRIBUTING.md

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,64 @@
+# 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/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,38 @@
+# 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-mariadb.yml

@@ -0,0 +1,80 @@
+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.0']
+        mariadb-version: [10.5, 10.4]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - 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
+
+      - 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'@'%';"
+          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < install/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,57 @@
+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.0']
+        mysql-version: [8.0, 5.7]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - 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
+
+      - 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'@'%';"
+          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < install/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'@'%';"
+          mysql -h 127.0.0.1 --protocol=TCP -u root -pfr0xl0r.TravisCI froxlor010 < install/froxlor.sql
+
+      - name: Run testing
+        run: ant quick-build

.gitignore

@@ -1,10 +1,21 @@
-packages/*
-lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/
-temp/*
-templates/*
 install/update.log
+templates/*
+lib/userdata.inc.php
+lib/userdata.inc.php.bak
+logs/*
+!logs/index.html
 .buildpath
 .project
 .settings/
 *.diff
 *~
+.well-known
+.idea
+*.iml
+img/
+
+!templates/Froxlor/
+!templates/Sparkle/
+!templates/misc/
+templates/Sparkle/assets/css/custom.css
+vendor/

.travis.yml

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

2fa.php

@@ -0,0 +1,90 @@
+<?php
+if (! defined('AREA')) {
+	header("Location: index.php");
+	exit();
+}
+
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+
+if (Settings::Get('2fa.enabled') != '1') {
+	\Froxlor\UI\Response::dynamic_error("2FA not activated");
+}
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2018 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Froxlor team <team@froxlor.org> (2018-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Panel
+ * @since 0.10.0
+ *       
+ */
+
+// This file is being included in admin_index and customer_index
+// and therefore does not need to require lib/init.php
+if (AREA == 'admin') {
+	$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 \Froxlor\FroxlorTwoFactorAuth('Froxlor ' . Settings::Get('system.hostname'));
+
+// do the delete and then just show a success-message
+if ($action == 'delete') {
+	Database::pexecute($upd_stmt, array(
+		't2fa' => 0,
+		'd2fa' => "",
+		'id' => $uid
+	));
+	\Froxlor\UI\Response::standard_success($lng['2fa']['2fa_removed']);
+} elseif ($action == 'add') {
+	$type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0';
+
+	if ($type == 0 || $type == 1) {
+		$data = "";
+	}
+	if ($type == 2) {
+		// generate secret for TOTP
+		$data = $tfa->createSecret();
+	}
+	Database::pexecute($upd_stmt, array(
+		't2fa' => $type,
+		'd2fa' => $data,
+		'id' => $uid
+	));
+	\Froxlor\UI\Response::standard_success(sprintf($lng['2fa']['2fa_added'], $filename, $s));
+}
+
+$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed 2fa::overview");
+
+if ($userinfo['type_2fa'] == '0') {
+
+	// available types
+	$type_select_values = array(
+		0 => '-',
+		1 => 'E-Mail',
+		2 => 'Authenticator'
+	);
+	asort($type_select_values);
+	$type_select = "";
+	foreach ($type_select_values as $_val => $_type) {
+		$type_select .= \Froxlor\UI\HTML::makeoption($_type, $_val);
+	}
+} elseif ($userinfo['type_2fa'] == '1') {
+	// email 2fa enabled
+} elseif ($userinfo['type_2fa'] == '2') {
+	// authenticator 2fa enabled
+	$ga_qrcode = $tfa->getQRCodeImageAsDataUri($userinfo['loginname'], $userinfo['data_2fa']);
+}
+eval("echo \"" . \Froxlor\UI\Template::getTemplate("2fa/overview", true) . "\";");

README.md

@@ -0,0 +1,75 @@
+[![Froxlor-CI](https://github.com/Froxlor/Froxlor/actions/workflows/build-mariadb.yml/badge.svg?branch=master)](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=master)](https://github.com/Froxlor/Froxlor/actions/workflows/build-mysql.yml)
+[![Gitter](https://badges.gitter.im/Froxlor/community.svg)](https://gitter.im/Froxlor/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+# Froxlor
+
+The server administration software for your needs.
+Developed by experienced server administrators, this panel simplifies the effort of managing your hosting platform.
+
+## Installation
+
+### Fast install
+1. Ensure that your webserver serves /var/www
+2. Extract froxlor into /var/www
+3. Point your browser to http://[ip-of-webserver]/froxlor
+4. Follow the installer
+5. Login as administrator
+6. Adjust "System > Settings" according to your needs
+7. Choose your distribution under "System > Configuration"
+8. Follow the steps for your services
+9. Have fun!
+
+### Detailed installation
+https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-from-tarball
+
+## Help
+
+You may find help in the following places:
+
+### IRC
+
+froxlor may be found on libera.chat, channel #froxlor:
+irc://irc.libera.chat/froxlor
+
+### Forum
+
+The community is located on https://forum.froxlor.org/
+
+### Wiki
+
+More documentation may be found in the froxlor - wiki:
+https://github.com/Froxlor/Froxlor/wiki
+
+## License
+
+May be found in COPYING
+
+## Downloads
+
+### Tarball
+https://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](https://files.froxlor.org/releases/froxlor-latest.tar.gz.md5) [SHA1](https://files.froxlor.org/releases/froxlor-latest.tar.gz.sha1)
+
+### Debian repository
+
+[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-debian)
+
+```
+apt-get -y install apt-transport-https lsb-release ca-certificates
+wget -O - https://deb.froxlor.org/froxlor.gpg | apt-key add -
+echo "deb https://deb.froxlor.org/debian $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list
+```
+
+### Ubuntu repository
+
+[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-ubuntu)
+
+```
+apt-get -y install apt-transport-https lsb-release ca-certificates
+wget -O - https://deb.froxlor.org/froxlor.gpg | apt-key add -
+echo "deb https://deb.froxlor.org/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list
+```
+
+## Contributing
+
+[see here](.github/CONTRIBUTING.md)

SECURITY.md

@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+Our main and active version is currently 0.10.x. It will receive maintenance and security updates periodically. The older version 0.9.x will not receive any kind of updates. Please update to [0.10.x](https://github.com/Froxlor/Froxlor/wiki/Updating-Froxlor)
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.10.x  | :white_check_mark: |
+|  0.9.x  | :x:                |
+
+## Reporting a Vulnerability
+
+If you think you have found a vulnerability in froxlor, please send an email to [team@froxlor.org](mailto:team@froxlor.org) with as many information as possible. Also, please give us appropriate time to fix the issue and build update-packages before publishing anything into the wild.

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

@@ -16,40 +16,51 @@
  * @package    Language
  *
  */
-
 return array(
 	'groups' => array(
 		'panel' => array(
 			'title' => $lng['admin']['panelsettings'],
 			'fields' => array(
 				'panel_standardlanguage' => array(
-					'label' => array('title' => $lng['login']['language'], 'description' => $lng['serversettings']['language']['description']),
+					'label' => array(
+						'title' => $lng['login']['language'],
+						'description' => $lng['serversettings']['language']['description']
+					),
 					'settinggroup' => 'panel',
 					'varname' => 'standardlanguage',
 					'type' => 'option',
 					'default' => 'English',
 					'option_mode' => 'one',
-					'option_options_method' => 'getLanguages',
-					'save_method' => 'storeSettingField',
+					'option_options_method' => array(
+						'\\Froxlor\\User',
+						'getLanguages'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_default_theme' => array(
-					'label' => array('title' => $lng['panel']['theme'], 'description' => $lng['serversettings']['default_theme']),
+					'label' => array(
+						'title' => $lng['panel']['theme'],
+						'description' => $lng['serversettings']['default_theme']
+					),
 					'settinggroup' => 'panel',
 					'varname' => 'default_theme',
 					'type' => 'option',
-					'default' => 'Froxlor',
+					'default' => 'Sparkle',
 					'option_mode' => 'one',
-					'option_options_method' => 'getThemes',
-					'save_method' => 'storeSettingDefaultTheme',
+					'option_options_method' => array(
+						'\\Froxlor\\UI\\Template',
+						'getThemes'
 					),
+					'save_method' => 'storeSettingDefaultTheme'
+				),
 				'panel_allow_theme_change_customer' => array(
 					'label' => $lng['serversettings']['panel_allow_theme_change_customer'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_theme_change_customer',
 					'type' => 'bool',
 					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_allow_theme_change_admin' => array(
 					'label' => $lng['serversettings']['panel_allow_theme_change_admin'],
 					'settinggroup' => 'panel',
@@ -57,23 +68,15 @@ return array(
 					'type' => 'bool',
 					'default' => true,
 					'save_method' => 'storeSettingField'
-					),
+				),
 				'panel_natsorting' => array(
 					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
 					'varname' => 'natsorting',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'panel_no_robots' => array(
-					'label' => $lng['serversettings']['no_robots'],
-					'settinggroup' => 'panel',
-					'varname' => 'no_robots',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_paging' => array(
 					'label' => $lng['serversettings']['paging'],
 					'settinggroup' => 'panel',
@@ -81,8 +84,8 @@ return array(
 					'type' => 'int',
 					'int_min' => 0,
 					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_pathedit' => array(
 					'label' => $lng['serversettings']['pathedit'],
 					'settinggroup' => 'panel',
@@ -90,26 +93,12 @@ return array(
 					'type' => 'option',
 					'default' => 'Manual',
 					'option_mode' => 'one',
-					'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
-					'save_method' => 'storeSettingField',
-					),
-				'use_webfonts' => array(
-					'label' => $lng['serversettings']['enablewebfonts'],
-					'settinggroup' => 'panel',
-					'varname' => 'use_webfonts',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
-				'webfont' => array(
-					'label' => $lng['serversettings']['definewebfont']['title'],
-					'settinggroup' => 'panel',
-					'varname' => 'webfont',
-					'type' => 'string',
-					'default' => 'Numans',
-					'string_emptyallowed' => false,
-					'save_method' => 'storeSettingField',
+					'option_options' => array(
+						'Manual' => $lng['serversettings']['manual'],
+						'Dropdown' => $lng['serversettings']['dropdown']
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_adminmail' => array(
 					'label' => $lng['serversettings']['adminmail'],
 					'settinggroup' => 'panel',
@@ -118,16 +107,16 @@ return array(
 					'string_type' => 'mail',
 					'string_emptyallowed' => false,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_adminmail_defname' => array(
 					'label' => $lng['serversettings']['adminmail_defname'],
 					'settinggroup' => 'panel',
 					'varname' => 'adminmail_defname',
 					'type' => 'string',
 					'default' => 'Froxlor Administrator',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_adminmail_return' => array(
 					'label' => $lng['serversettings']['adminmail_return'],
 					'settinggroup' => 'panel',
@@ -136,8 +125,8 @@ return array(
 					'string_type' => 'mail',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_decimal_places' => array(
 					'label' => $lng['serversettings']['decimal_places'],
 					'settinggroup' => 'panel',
@@ -146,8 +135,8 @@ return array(
 					'int_min' => 0,
 					'int_max' => 15,
 					'default' => 4,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_phpmyadmin_url' => array(
 					'label' => $lng['serversettings']['phpmyadmin_url'],
 					'settinggroup' => 'panel',
@@ -156,8 +145,8 @@ return array(
 					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_webmail_url' => array(
 					'label' => $lng['serversettings']['webmail_url'],
 					'settinggroup' => 'panel',
@@ -166,8 +155,8 @@ return array(
 					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_webftp_url' => array(
 					'label' => $lng['serversettings']['webftp_url'],
 					'settinggroup' => 'panel',
@@ -176,51 +165,166 @@ return array(
 					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'admin_show_version_login' => array(
 					'label' => $lng['admin']['show_version_login'],
 					'settinggroup' => 'admin',
 					'varname' => 'show_version_login',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'admin_show_version_footer' => array(
 					'label' => $lng['admin']['show_version_footer'],
 					'settinggroup' => 'admin',
 					'varname' => 'show_version_footer',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
+				'admin_show_news_feed' => array(
+					'label' => $lng['admin']['show_news_feed'],
+					'settinggroup' => 'admin',
+					'varname' => 'show_news_feed',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'customer_show_news_feed' => array(
+					'label' => $lng['admin']['customer_show_news_feed'],
+					'settinggroup' => 'customer',
+					'varname' => 'show_news_feed',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'customer_news_feed_url' => array(
+					'label' => $lng['admin']['customer_news_feed_url'],
+					'settinggroup' => 'customer',
+					'varname' => 'news_feed_url',
+					'type' => 'string',
+					'string_type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
 				'panel_allow_domain_change_admin' => array(
 					'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_domain_change_admin',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_allow_domain_change_customer' => array(
 					'label' => $lng['serversettings']['panel_allow_domain_change_customer'],
 					'settinggroup' => 'panel',
 					'varname' => 'allow_domain_change_customer',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_phpconfigs_hidestdsubdomain' => array(
 					'label' => $lng['serversettings']['panel_phpconfigs_hidestdsubdomain'],
 					'settinggroup' => 'panel',
 					'varname' => 'phpconfigs_hidestdsubdomain',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
 				),
-			),
-		),
-	);
+				'panel_customer_hide_options' => array(
+					'label' => $lng['serversettings']['panel_customer_hide_options'],
+					'settinggroup' => 'panel',
+					'varname' => 'customer_hide_options',
+					'type' => 'option',
+					'default' => '',
+					'option_mode' => 'multiple',
+					'option_emptyallowed' => true,
+					'option_options' => array(
+						'email' => $lng['menue']['email']['email'],
+						'mysql' => $lng['menue']['mysql']['mysql'],
+						'domains' => $lng['menue']['domains']['domains'],
+						'ftp' => $lng['menue']['ftp']['ftp'],
+						'extras' => $lng['menue']['extras']['extras'],
+						'extras.directoryprotection' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['directoryprotection'],
+						'extras.pathoptions' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['pathoptions'],
+						'extras.logger' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['logger']['logger'],
+						'extras.backup' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['backup'],
+						'traffic' => $lng['menue']['traffic']['traffic'],
+						'traffic.http' => $lng['menue']['traffic']['traffic'] . " / HTTP",
+						'traffic.ftp' => $lng['menue']['traffic']['traffic'] . " / FTP",
+						'traffic.mail' => $lng['menue']['traffic']['traffic'] . " / Mail"
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'panel_imprint_url' => array(
+					'label' => $lng['serversettings']['imprint_url'],
+					'settinggroup' => 'panel',
+					'varname' => 'imprint_url',
+					'type' => 'string',
+					'string_type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'panel_terms_url' => array(
+					'label' => $lng['serversettings']['terms_url'],
+					'settinggroup' => 'panel',
+					'varname' => 'terms_url',
+					'type' => 'string',
+					'string_type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'panel_privacy_url' => array(
+					'label' => $lng['serversettings']['privacy_url'],
+					'settinggroup' => 'panel',
+					'varname' => 'privacy_url',
+					'type' => 'string',
+					'string_type' => 'url',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'panel_logo_overridetheme' => array(
+					'label' => $lng['serversettings']['logo_overridetheme'],
+					'settinggroup' => 'panel',
+					'varname' => 'logo_overridetheme',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'panel_logo_overridecustom' => array(
+					'label' => $lng['serversettings']['logo_overridecustom'],
+					'settinggroup' => 'panel',
+					'varname' => 'logo_overridecustom',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'panel_logo_image_header' => array(
+					'label' => $lng['serversettings']['logo_image_header'],
+					'settinggroup' => 'panel',
+					'varname' => 'logo_image_header',
+					'type' => 'image',
+					'image_name' => 'logo_header',
+					'default' => '',
+					'save_method' => 'storeSettingImage'
+				),
+				'panel_logo_image_login' => array(
+					'label' => $lng['serversettings']['logo_image_login'],
+					'settinggroup' => 'panel',
+					'varname' => 'logo_image_login',
+					'type' => 'image',
+					'image_name' => 'logo_login',
+					'default' => '',
+					'save_method' => 'storeSettingImage'
+				),
+			)
+		)
+	)
+);
 
 ?>

actions/admin/settings/110.accounts.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'accounts' => array(
@@ -28,91 +27,144 @@ return array(
 					'varname' => 'sessiontimeout',
 					'type' => 'int',
 					'default' => 600,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'session_allow_multiple_login' => array(
 					'label' => $lng['serversettings']['session_allow_multiple_login'],
 					'settinggroup' => 'session',
 					'varname' => 'allow_multiple_login',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'login_domain_login' => array(
 					'label' => $lng['serversettings']['login_domain_login'],
 					'settinggroup' => 'login',
 					'varname' => 'domain_login',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'login_maxloginattempts' => array(
 					'label' => $lng['serversettings']['maxloginattempts'],
 					'settinggroup' => 'login',
 					'varname' => 'maxloginattempts',
 					'type' => 'int',
 					'default' => 3,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'login_deactivatetime' => array(
 					'label' => $lng['serversettings']['deactivatetime'],
 					'settinggroup' => 'login',
 					'varname' => 'deactivatetime',
 					'type' => 'int',
 					'default' => 900,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
+				'2fa_enabled' => array(
+					'label' => $lng['2fa']['2fa_enabled'],
+					'settinggroup' => '2fa',
+					'varname' => 'enabled',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
 				'panel_password_min_length' => array(
 					'label' => $lng['serversettings']['panel_password_min_length'],
 					'settinggroup' => 'panel',
 					'varname' => 'password_min_length',
 					'type' => 'int',
 					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
+				'panel_password_alpha_lower' => array(
+					'label' => $lng['serversettings']['panel_password_alpha_lower'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_alpha_lower',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'panel_password_alpha_upper' => array(
+					'label' => $lng['serversettings']['panel_password_alpha_upper'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_alpha_upper',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'panel_password_numeric' => array(
+					'label' => $lng['serversettings']['panel_password_numeric'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_numeric',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'panel_password_special_char_required' => array(
+					'label' => $lng['serversettings']['panel_password_special_char_required'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_special_char_required',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'panel_password_special_char' => array(
+					'label' => $lng['serversettings']['panel_password_special_char'],
+					'settinggroup' => 'panel',
+					'varname' => 'password_special_char',
+					'type' => 'string',
+					'default' => '!?<>§$%+#=@',
+					'save_method' => 'storeSettingField'
+				),
 				'panel_password_regex' => array(
 					'label' => $lng['serversettings']['panel_password_regex'],
 					'settinggroup' => 'panel',
 					'varname' => 'password_regex',
 					'type' => 'string',
 					'default' => '',
-					/* 'plausibility_check_method' => 'checkValidRegEx', */
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'customer_accountprefix' => array(
 					'label' => $lng['serversettings']['accountprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'accountprefix',
 					'type' => 'string',
 					'default' => '',
-					'plausibility_check_method' => 'checkUsername',
-					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkUsername'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'customer_mysqlprefix' => array(
 					'label' => $lng['serversettings']['mysqlprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'mysqlprefix',
 					'type' => 'string',
 					'default' => '',
-					'plausibility_check_method' => 'checkUsername',
-					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkUsername'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'customer_ftpprefix' => array(
 					'label' => $lng['serversettings']['ftpprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'ftpprefix',
 					'type' => 'string',
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'customer_ftpatdomain' => array(
 					'label' => $lng['serversettings']['ftpdomain'],
 					'settinggroup' => 'customer',
 					'varname' => 'ftpatdomain',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_allow_preset' => array(
 					'label' => $lng['serversettings']['allow_password_reset'],
 					'settinggroup' => 'panel',
@@ -121,14 +173,14 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'dependency' => array(
-							'fieldname' => 'panel_allow_preset_admin',
-							'fielddata' => array(
-								'settinggroup' => 'panel',
-								'varname' => 'allow_preset_admin',
-							),
-							'onlyif' => 0
-						)
-					),
+						'fieldname' => 'panel_allow_preset_admin',
+						'fielddata' => array(
+							'settinggroup' => 'panel',
+							'varname' => 'allow_preset_admin'
+						),
+						'onlyif' => 0
+					)
+				),
 				'panel_allow_preset_admin' => array(
 					'label' => $lng['serversettings']['allow_password_reset_admin'],
 					'settinggroup' => 'panel',
@@ -137,17 +189,37 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'dependency' => array(
-							'fieldname' => 'panel_allow_preset',
-							'fielddata' => array(
-								'settinggroup' => 'panel',
-								'varname' => 'allow_preset',
-							),
-							'onlyif' => 1
-						)
-					),
+						'fieldname' => 'panel_allow_preset',
+						'fielddata' => array(
+							'settinggroup' => 'panel',
+							'varname' => 'allow_preset'
+						),
+						'onlyif' => 1
+					)
 				),
-			),
-		),
-	);
-
-?>
+				'system_backupenabled' => array(
+					'label' => $lng['serversettings']['backupenabled'],
+					'settinggroup' => 'system',
+					'varname' => 'backupenabled',
+					'type' => 'bool',
+					'default' => false,
+					'cronmodule' => 'froxlor/backup',
+					'save_method' => 'storeSettingField'
+				),
+				'system_createstdsubdom_default' => array(
+					'label' => $lng['serversettings']['createstdsubdom_default'],
+					'settinggroup' => 'system',
+					'varname' => 'createstdsubdom_default',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'0' => $lng['panel']['no'],
+						'1' => $lng['panel']['yes']
+					),
+					'save_method' => 'storeSettingField'
+				),
+			)
+		)
+	)
+);

actions/admin/settings/120.system.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'system' => array(
@@ -30,36 +29,58 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkPathConflicts'
-					),
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkPathConflicts'
+					)
+				),
 				'system_documentroot_use_default_value' => array(
 					'label' => $lng['serversettings']['documentroot_use_default_value'],
 					'settinggroup' => 'system',
 					'varname' => 'documentroot_use_default_value',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
 					'settinggroup' => 'system',
 					'varname' => 'ipaddress',
 					'type' => 'option',
 					'option_mode' => 'one',
-					'option_options_method' => 'getIpAddresses',
-					'default' => '',
-					'save_method' => 'storeSettingIpAddress',
+					'option_options_method' => array(
+						'\\Froxlor\\Domain\\IpAddr',
+						'getIpAddresses'
 					),
+					'default' => '',
+					'save_method' => 'storeSettingIpAddress'
+				),
 				'system_defaultip' => array(
 					'label' => $lng['serversettings']['defaultip'],
 					'settinggroup' => 'system',
 					'varname' => 'defaultip',
 					'type' => 'option',
-					'option_mode' => 'one',
-					'option_options_method' => 'getIpPortCombinations',
-					'default' => '',
-					'save_method' => 'storeSettingDefaultIp',
+					'option_mode' => 'multiple',
+					'option_options_method' => array(
+						'\\Froxlor\\Domain\\IpAddr',
+						'getIpPortCombinations'
 					),
+					'default' => '',
+					'save_method' => 'storeSettingDefaultIp'
+				),
+				'system_defaultsslip' => array(
+					'label' => $lng['serversettings']['defaultsslip'],
+					'settinggroup' => 'system',
+					'varname' => 'defaultsslip',
+					'type' => 'option',
+					'option_mode' => 'multiple',
+					'option_options_method' => array(
+						'\\Froxlor\\Domain\\IpAddr',
+						'getSslIpPortCombinations'
+					),
+					'default' => '',
+					'save_method' => 'storeSettingDefaultSslIp'
+				),
 				'system_hostname' => array(
 					'label' => $lng['serversettings']['hostname'],
 					'settinggroup' => 'system',
@@ -67,41 +88,55 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
-					'plausibility_check_method' => 'checkHostname',
-					),
-				'system_froxlordirectlyviahostname' => array(
-					'label' => $lng['serversettings']['froxlordirectlyviahostname'],
-					'settinggroup' => 'system',
-					'varname' => 'froxlordirectlyviahostname',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkHostname'
+					)
+				),
+				'api_enabled' => array(
+					'label' => $lng['serversettings']['enable_api'],
+					'settinggroup' => 'api',
+					'varname' => 'enabled',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_validatedomain' => array(
 					'label' => $lng['serversettings']['validate_domain'],
 					'settinggroup' => 'system',
 					'varname' => 'validate_domain',
 					'type' => 'bool',
 					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_stdsubdomain' => array(
 					'label' => $lng['serversettings']['stdsubdomainhost'],
 					'settinggroup' => 'system',
 					'varname' => 'stdsubdomain',
 					'type' => 'string',
 					'default' => '',
-					'save_method' => 'storeSettingHostname',
-					),
+					'save_method' => 'storeSettingHostname'
+				),
 				'system_mysql_access_host' => array(
 					'label' => $lng['serversettings']['mysql_access_host'],
 					'settinggroup' => 'system',
 					'varname' => 'mysql_access_host',
 					'type' => 'string',
 					'default' => '127.0.0.1,localhost',
-					'plausibility_check_method' => 'checkMysqlAccessHost',
-					'save_method' => 'storeSettingMysqlAccessHost',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkMysqlAccessHost'
 					),
+					'save_method' => 'storeSettingMysqlAccessHost'
+				),
+				'system_nssextrausers' => array(
+					'label' => $lng['serversettings']['nssextrausers'],
+					'settinggroup' => 'system',
+					'varname' => 'nssextrausers',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
 				'system_index_file_extension' => array(
 					'label' => $lng['serversettings']['index_file_extension'],
 					'settinggroup' => 'system',
@@ -109,28 +144,28 @@ return array(
 					'type' => 'string',
 					'string_regexp' => '/^[a-zA-Z0-9]{1,6}$/',
 					'default' => 'html',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_store_index_file_subs' => array(
 					'label' => $lng['serversettings']['system_store_index_file_subs'],
 					'settinggroup' => 'system',
 					'varname' => 'store_index_file_subs',
 					'type' => 'bool',
 					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_httpuser' => array(
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
 					'type' => 'hidden',
-					'default' => 'www-data',
-					),
+					'default' => 'www-data'
+				),
 				'system_httpgroup' => array(
 					'settinggroup' => 'system',
 					'varname' => 'httpgroup',
 					'type' => 'hidden',
-					'default' => 'www-data',
-					),
+					'default' => 'www-data'
+				),
 				'system_report_enable' => array(
 					'label' => $lng['serversettings']['report']['report'],
 					'settinggroup' => 'system',
@@ -138,39 +173,126 @@ return array(
 					'type' => 'bool',
 					'default' => true,
 					'cronmodule' => 'froxlor/reports',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_report_webmax' => array(
 					'label' => $lng['serversettings']['report']['webmax'],
 					'settinggroup' => 'system',
 					'varname' => 'report_webmax',
 					'type' => 'int',
-					'int_min' => 1,
+					'int_min' => 0,
 					'int_max' => 150,
 					'default' => 90,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_report_trafficmax' => array(
 					'label' => $lng['serversettings']['report']['trafficmax'],
 					'settinggroup' => 'system',
 					'varname' => 'report_trafficmax',
 					'type' => 'int',
-					'int_min' => 1,
+					'int_min' => 0,
 					'int_max' => 150,
 					'default' => 90,
-					'save_method' => 'storeSettingField',
-					),
-				'system_debug_cron' => array(
-					'label' => $lng['serversettings']['cron']['debug'],
+					'save_method' => 'storeSettingField'
+				),
+
+				'system_mail_use_smtp' => array(
+					'label' => $lng['serversettings']['mail_use_smtp'],
 					'settinggroup' => 'system',
-					'varname' => 'debug_cron',
+					'varname' => 'mail_use_smtp',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
 				),
-			),
-		),
-	);
-
-?>
+				'system_mail_smtp_host' => array(
+					'label' => $lng['serversettings']['mail_smtp_host'],
+					'settinggroup' => 'system',
+					'varname' => 'mail_smtp_host',
+					'type' => 'string',
+					'default' => 'localhost',
+					'save_method' => 'storeSettingField'
+				),
+				'system_mail_smtp_port' => array(
+					'label' => $lng['serversettings']['mail_smtp_port'],
+					'settinggroup' => 'system',
+					'varname' => 'mail_smtp_port',
+					'type' => 'int',
+					'int_min' => 1,
+					'int_max' => 65535,
+					'default' => 25,
+					'save_method' => 'storeSettingField'
+				),
+				'system_mail_smtp_usetls' => array(
+					'label' => $lng['serversettings']['mail_smtp_usetls'],
+					'settinggroup' => 'system',
+					'varname' => 'mail_smtp_usetls',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_mail_smtp_auth' => array(
+					'label' => $lng['serversettings']['mail_smtp_auth'],
+					'settinggroup' => 'system',
+					'varname' => 'mail_smtp_auth',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_mail_smtp_user' => array(
+					'label' => $lng['serversettings']['mail_smtp_user'],
+					'settinggroup' => 'system',
+					'varname' => 'mail_smtp_user',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_mail_smtp_passwd' => array(
+					'label' => $lng['serversettings']['mail_smtp_passwd'],
+					'settinggroup' => 'system',
+					'varname' => 'mail_smtp_passwd',
+					'type' => 'hiddenString',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_apply_specialsettings_default' => array(
+					'label' => $lng['serversettings']['apply_specialsettings_default'],
+					'settinggroup' => 'system',
+					'varname' => 'apply_specialsettings_default',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_apply_phpconfigs_default' => array(
+					'label' => $lng['serversettings']['apply_phpconfigs_default'],
+					'settinggroup' => 'system',
+					'varname' => 'apply_phpconfigs_default',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+                'system_domaindefaultalias' => array(
+                    'label' => $lng['admin']['domaindefaultalias'],
+                    'settinggroup' => 'system',
+                    'varname' => 'domaindefaultalias',
+                    'type' => 'option',
+                    'default' => '0',
+                    'option_mode' => 'one',
+                    'option_options' => array(
+                        '0' => $lng['domains']['serveraliasoption_wildcard'],
+                        '1' => $lng['domains']['serveraliasoption_www'],
+                        '2' => $lng['domains']['serveraliasoption_none']
+                    ),
+                    'save_method' => 'storeSettingField'
+                ),
+				'hide_incompatible_settings' => array(
+					'label' => $lng['serversettings']['hide_incompatible_settings'],
+					'settinggroup' => 'system',
+					'varname' => 'hide_incompatible_settings',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+			)
+		)
+	)
+);

actions/admin/settings/122.froxlorvhost.php

@@ -0,0 +1,271 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2016-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    \Froxlor\Settings
+ *
+ */
+return array(
+	'groups' => array(
+		'froxlorvhost' => array(
+			'title' => $lng['admin']['froxlorvhost'] . (call_user_func(array('\Froxlor\Settings\FroxlorVhostSettings', 'hasVhostContainerEnabled')) == false ? $lng['admin']['novhostcontainer'] : ''),
+			'fields' => array(
+				/**
+				 * Webserver-Vhost
+				 */
+				'system_froxlordirectlyviahostname' => array(
+					'label' => $lng['serversettings']['froxlordirectlyviahostname'],
+					'settinggroup' => 'system',
+					'varname' => 'froxlordirectlyviahostname',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_froxloraliases' => array(
+					'label' => $lng['serversettings']['froxloraliases'],
+					'settinggroup' => 'system',
+					'varname' => 'froxloraliases',
+					'type' => 'string',
+					'string_regexp' => '/^(([a-z0-9\-\._]+, ?)*[a-z0-9\-\._]+)?$/i',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				/**
+				 * SSL / Let's Encrypt
+				 */
+				'system_le_froxlor_enabled' => array(
+					'label' => $lng['serversettings']['le_froxlor_enabled'],
+					'settinggroup' => 'system',
+					'varname' => 'le_froxlor_enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingClearCertificates',
+					'visible' => \Froxlor\Settings::Get('system.leenabled') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				'system_le_froxlor_redirect' => array(
+					'label' => $lng['serversettings']['le_froxlor_redirect'],
+					'settinggroup' => 'system',
+					'varname' => 'le_froxlor_redirect',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				'system_hsts_maxage' => array(
+					'label' => $lng['admin']['domain_hsts_maxage'],
+					'settinggroup' => 'system',
+					'varname' => 'hsts_maxage',
+					'type' => 'int',
+					'int_min' => 0,
+					'int_max' => 94608000, // 3-years
+					'default' => 0,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				'system_hsts_incsub' => array(
+					'label' => $lng['admin']['domain_hsts_incsub'],
+					'settinggroup' => 'system',
+					'varname' => 'hsts_incsub',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				'system_hsts_preload' => array(
+					'label' => $lng['admin']['domain_hsts_preload'],
+					'settinggroup' => 'system',
+					'varname' => 'hsts_preload',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				'system_honorcipherorder' => array(
+					'label' => $lng['admin']['domain_honorcipherorder'],
+					'settinggroup' => 'system',
+					'varname' => 'honorcipherorder',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				'system_sessiontickets' => array(
+					'label' => $lng['admin']['domain_sessiontickets'],
+					'settinggroup' => 'system',
+					'varname' => 'sessiontickets',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					), true)
+				),
+				/**
+				 * FCGID
+				 */
+				'system_mod_fcgid_enabled_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_ownvhost',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2'
+					),
+					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				'system_mod_fcgid_httpuser' => array(
+					'label' => $lng['admin']['mod_fcgid_user'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_httpuser',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingWebserverFcgidFpmUser',
+					'websrv_avail' => array(
+						'apache2'
+					),
+					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				'system_mod_fcgid_httpgroup' => array(
+					'label' => $lng['admin']['mod_fcgid_group'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_httpgroup',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2'
+					),
+					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				'system_mod_fcgid_defaultini_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_defaultini_ownvhost',
+					'type' => 'option',
+					'default' => '2',
+					'option_mode' => 'one',
+					'option_options_method' => array(
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'
+					),
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2'
+					),
+					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				/**
+				 * php-fpm
+				 */
+				'system_phpfpm_enabled_ownvhost' => array(
+					'label' => $lng['phpfpm']['ownvhost'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'enabled_ownvhost',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				'system_phpfpm_httpuser' => array(
+					'label' => $lng['phpfpm']['vhost_httpuser'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'vhost_httpuser',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingWebserverFcgidFpmUser',
+					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				'system_phpfpm_httpgroup' => array(
+					'label' => $lng['phpfpm']['vhost_httpgroup'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'vhost_httpgroup',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				'system_phpfpm_defaultini_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'vhost_defaultini',
+					'type' => 'option',
+					'default' => '2',
+					'option_mode' => 'one',
+					'option_options_method' => array(
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'
+					),
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
+						'\Froxlor\Settings\FroxlorVhostSettings',
+						'hasVhostContainerEnabled'
+					))
+				),
+				/**
+				 * DNS
+				 */
+				'system_dns_createhostnameentry' => array(
+					'label' => $lng['serversettings']['dns_createhostnameentry'],
+					'settinggroup' => 'system',
+					'varname' => 'dns_createhostnameentry',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.bind_enable')
+				)
+			)
+		)
+	)
+);

actions/admin/settings/125.cronjob.php

@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2014 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ *
+ */
+return array(
+	'groups' => array(
+		'crond' => array(
+			'title' => $lng['admin']['cronsettings'],
+			'fields' => array(
+				'system_cronconfig' => array(
+					'label' => $lng['serversettings']['system_cronconfig'],
+					'settinggroup' => 'system',
+					'varname' => 'cronconfig',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/etc/cron.d/froxlor',
+					'save_method' => 'storeSettingField'
+				),
+				'system_croncmdline' => array(
+					'label' => $lng['serversettings']['system_croncmdline'],
+					'settinggroup' => 'system',
+					'varname' => 'croncmdline',
+					'type' => 'string',
+					'default' => '/usr/bin/nice -n 5 /usr/bin/php -q',
+					'save_method' => 'storeSettingField'
+				),
+				'system_crondreload' => array(
+					'label' => $lng['serversettings']['system_crondreload'],
+					'settinggroup' => 'system',
+					'varname' => 'crondreload',
+					'type' => 'string',
+					'default' => '/etc/init.d/cron reload',
+					'save_method' => 'storeSettingField'
+				),
+				'system_cron_allowautoupdate' => array(
+					'label' => $lng['serversettings']['system_cron_allowautoupdate'],
+					'settinggroup' => 'system',
+					'varname' => 'cron_allowautoupdate',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_debug_cron' => array(
+					'label' => $lng['serversettings']['cron']['debug'],
+					'settinggroup' => 'system',
+					'varname' => 'debug_cron',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
+	)
+);

actions/admin/settings/130.webserver.php

@@ -13,10 +13,9 @@
  * @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
+ * @package    \Froxlor\Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'webserver' => array(
@@ -29,10 +28,18 @@ return array(
 					'type' => 'option',
 					'default' => 'apache2',
 					'option_mode' => 'one',
-					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
+					'option_options' => array(
+						'apache2' => 'Apache 2',
+						'lighttpd' => 'ligHTTPd',
+						'nginx' => 'Nginx'
 					),
+					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkPhpInterfaceSetting'
+					),
+					'overview_option' => true
+				),
 				'system_apache_24' => array(
 					'label' => $lng['serversettings']['apache_24'],
 					'settinggroup' => 'system',
@@ -40,24 +47,62 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
+				'system_apache_itksupport' => array(
+					'label' => $lng['serversettings']['apache_itksupport'],
+					'settinggroup' => 'system',
+					'varname' => 'apacheitksupport',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 0 && \Froxlor\Settings::Get('phpfpm.enabled') == 0),
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
+				'system_http2_support' => array(
+					'label' => $lng['serversettings']['http2_support'],
+					'settinggroup' => 'system',
+					'varname' => 'http2_support',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2',
+						'nginx'
 					),
+					'visible' => \Froxlor\Settings::Get('system.use_ssl')
+				),
+				'system_dhparams_file' => array(
+					'label' => $lng['serversettings']['dhparams_file'],
+					'settinggroup' => 'system',
+					'varname' => 'dhparams_file',
+					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl')
+				),
 				'system_httpuser' => array(
 					'label' => $lng['admin']['webserver_user'],
 					'settinggroup' => 'system',
 					'varname' => 'httpuser',
 					'type' => 'string',
 					'default' => 'www-data',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingWebserverFcgidFpmUser'
+				),
 				'system_httpgroup' => array(
 					'label' => $lng['admin']['webserver_group'],
 					'settinggroup' => 'system',
 					'varname' => 'httpgroup',
 					'type' => 'string',
 					'default' => 'www-data',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_apacheconf_vhost' => array(
 					'label' => $lng['serversettings']['apacheconf_vhost'],
 					'settinggroup' => 'system',
@@ -65,8 +110,8 @@ return array(
 					'type' => 'string',
 					'string_type' => 'filedir',
 					'default' => '/etc/apache2/sites-enabled/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_apacheconf_diroptions' => array(
 					'label' => $lng['serversettings']['apacheconf_diroptions'],
 					'settinggroup' => 'system',
@@ -74,17 +119,17 @@ return array(
 					'type' => 'string',
 					'string_type' => 'filedir',
 					'default' => '/etc/apache2/sites-enabled/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_apacheconf_htpasswddir' => array(
 					'label' => $lng['serversettings']['apacheconf_htpasswddir'],
 					'settinggroup' => 'system',
 					'varname' => 'apacheconf_htpasswddir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/etc/apache2/htpasswd/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_logfiles_directory' => array(
 					'label' => $lng['serversettings']['logfiles_directory'],
 					'settinggroup' => 'system',
@@ -92,17 +137,93 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/var/customers/logs/',
+					'save_method' => 'storeSettingField'
+				),
+				'system_logfiles_script' => array(
+					'label' => $lng['serversettings']['logfiles_script'],
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_script',
+					'type' => 'string',
+					'string_type' => '',
+					'default' => '',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
+				'system_logfiles_piped' => array(
+					'label' => $lng['serversettings']['logfiles_piped'],
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_piped',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
+				'system_logfiles_format' => array(
+					'label' => $lng['serversettings']['logfiles_format'],
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_format',
+					'type' => 'string',
+					'default' => '',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2',
+						'nginx'
 					),
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
+				),
+				'system_logfiles_type' => array(
+					'label' => $lng['serversettings']['logfiles_type'],
+					'settinggroup' => 'system',
+					'varname' => 'logfiles_type',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'1' => 'combined',
+						'2' => 'vhost_combined'
+					),
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
+				'system_errorlog_level' => array(
+					'label' => $lng['serversettings']['errorlog_level'],
+					'settinggroup' => 'system',
+					'varname' => 'errorlog_level',
+					'type' => 'option',
+					'default' => (\Froxlor\Settings::Get('system.webserver') == 'nginx' ? 'error' : 'warn'),
+					'option_mode' => 'one',
+					'option_options' => array(
+						'emerg' => 'emerg',
+						'alert' => 'alert',
+						'crit' => 'crit',
+						'error' => 'error',
+						'warn' => 'warn',
+						'notice' => 'notice',
+						'info' => 'info',
+						'debug' => 'debug'
+					),
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array(
+						'apache2',
+						'nginx'
+					)
+				),
 				'system_customersslpath' => array(
 					'label' => $lng['serversettings']['customerssl_directory'],
 					'settinggroup' => 'system',
 					'varname' => 'customer_ssl_path',
 					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/etc/apache2/ssl/',
-					'save_method' => 'storeSettingField',
-					),
+					'string_type' => 'confdir',
+					'default' => '/etc/ssl/froxlor-custom/',
+					'save_method' => 'storeSettingField'
+				),
 				'system_phpappendopenbasedir' => array(
 					'label' => $lng['serversettings']['phpappendopenbasedir'],
 					'settinggroup' => 'system',
@@ -110,8 +231,8 @@ return array(
 					'type' => 'string',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_deactivateddocroot' => array(
 					'label' => $lng['serversettings']['deactivateddocroot'],
 					'settinggroup' => 'system',
@@ -120,24 +241,53 @@ return array(
 					'string_type' => 'dir',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_default_vhostconf' => array(
 					'label' => $lng['serversettings']['default_vhostconf'],
 					'settinggroup' => 'system',
 					'varname' => 'default_vhostconf',
 					'type' => 'text',
 					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_default_sslvhostconf' => array(
+					'label' => $lng['serversettings']['default_sslvhostconf'],
+					'settinggroup' => 'system',
+					'varname' => 'default_sslvhostconf',
+					'type' => 'text',
+					'default' => '',
 					'save_method' => 'storeSettingField',
-					),
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') == 1
+				),
+				'system_include_default_vhostconf' => array(
+					'label' => $lng['serversettings']['includedefault_sslvhostconf'],
+					'settinggroup' => 'system',
+					'varname' => 'include_default_vhostconf',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_apache_globaldiropt' => array(
+					'label' => $lng['serversettings']['apache_globaldiropt'],
+					'settinggroup' => 'system',
+					'varname' => 'apacheglobaldiropt',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 0 && \Froxlor\Settings::Get('phpfpm.enabled') == 0),
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
 				'system_apachereload_command' => array(
 					'label' => $lng['serversettings']['apachereload_command'],
 					'settinggroup' => 'system',
 					'varname' => 'apachereload_command',
 					'type' => 'string',
 					'default' => '/etc/init.d/apache2 reload',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_phpreload_command' => array(
 					'label' => $lng['serversettings']['phpreload_command'],
 					'settinggroup' => 'system',
@@ -145,8 +295,10 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
+					'websrv_avail' => array(
+						'nginx'
+					)
+				),
 				'system_nginx_php_backend' => array(
 					'label' => $lng['serversettings']['nginx_php_backend'],
 					'settinggroup' => 'system',
@@ -154,8 +306,10 @@ return array(
 					'type' => 'string',
 					'default' => '127.0.0.1:8888',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
+					'websrv_avail' => array(
+						'nginx'
+					)
+				),
 				'nginx_fastcgiparams' => array(
 					'label' => $lng['serversettings']['nginx_fastcgiparams'],
 					'settinggroup' => 'nginx',
@@ -164,16 +318,18 @@ return array(
 					'string_type' => 'file',
 					'default' => '/etc/nginx/fastcgi_params',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
+					'websrv_avail' => array(
+						'nginx'
+					)
+				),
 				'defaultwebsrverrhandler_enabled' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'enabled',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'defaultwebsrverrhandler_err401' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
 					'settinggroup' => 'defaultwebsrverrhandler',
@@ -181,8 +337,11 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'nginx')
-					),
+					'websrv_avail' => array(
+						'apache2',
+						'nginx'
+					)
+				),
 				'defaultwebsrverrhandler_err403' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
 					'settinggroup' => 'defaultwebsrverrhandler',
@@ -190,16 +349,19 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'nginx')
-					),
+					'websrv_avail' => array(
+						'apache2',
+						'nginx'
+					)
+				),
 				'defaultwebsrverrhandler_err404' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err404',
 					'type' => 'string',
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'defaultwebsrverrhandler_err500' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
 					'settinggroup' => 'defaultwebsrverrhandler',
@@ -207,17 +369,19 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'nginx')
-					),
+					'websrv_avail' => array(
+						'apache2',
+						'nginx'
+					)
+				),
 				'customredirect_enabled' => array(
 					'label' => $lng['serversettings']['customredirect_enabled'],
 					'settinggroup' => 'customredirect',
 					'varname' => 'enabled',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'lighttpd')
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'customredirect_default' => array(
 					'label' => $lng['serversettings']['customredirect_default'],
 					'settinggroup' => 'customredirect',
@@ -225,11 +389,10 @@ return array(
 					'type' => 'option',
 					'default' => '1',
 					'option_mode' => 'one',
-					'option_options_method' => 'getRedirectCodes',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2', 'lighttpd')
-					)
+					'option_options_method' => array('\\Froxlor\\Domain\\Domain', 'getRedirectCodes'),
+					'save_method' => 'storeSettingField'
 				)
 			)
 		)
-	);
+	)
+);

actions/admin/settings/131.ssl.php

@@ -13,65 +13,222 @@
  * @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
+ * @package    \Froxlor\Settings
  *
  */
-
 return array(
 	'groups' => array(
-			'ssl' => array(
-					'title' => $lng['admin']['sslsettings'],
-					'fields' => array(
-							'system_ssl_enabled' => array(
-									'label' => $lng['serversettings']['ssl']['use_ssl'],
-									'settinggroup' => 'system',
-									'varname' => 'use_ssl',
-									'type' => 'bool',
-									'default' => false,
-									'save_method' => 'storeSettingField',
-									'overview_option' => true
-							),
-							'system_ssl_cert_file' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_cert_file',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '/etc/apache2/apache2.pem',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_key_file' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_key_file'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_key_file',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '/etc/apache2/apache2.key',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_ca_file' => array(
-									'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_ca_file',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '',
-									'save_method' => 'storeSettingField',
-							),
-							'system_ssl_cert_chainfile' => array(
-									'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
-									'settinggroup' => 'system',
-									'varname' => 'ssl_cert_chainfile',
-									'type' => 'string',
-									'string_type' => 'file',
-									'string_emptyallowed' => true,
-									'default' => '',
-									'save_method' => 'storeSettingField',
-							)
-					)
+		'ssl' => array(
+			'title' => $lng['admin']['sslsettings'],
+			'fields' => array(
+				'system_ssl_enabled' => array(
+					'label' => $lng['serversettings']['ssl']['use_ssl'],
+					'settinggroup' => 'system',
+					'varname' => 'use_ssl',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'overview_option' => true
+				),
+				'system_ssl_protocols' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_protocols'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_protocols',
+					'type' => 'option',
+					'default' => 'TLSv1.2',
+					'option_mode' => 'multiple',
+					'option_options' => array(
+						'TLSv1' => 'TLSv1',
+						'TLSv1.1' => 'TLSv1.1',
+						'TLSv1.2' => 'TLSv1.2',
+						'TLSv1.3' => 'TLSv1.3'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_ssl_cipher_list' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_cipher_list'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_cipher_list',
+					'type' => 'string',
+					'string_emptyallowed' => false,
+					'default' => 'ECDH+AESGCM:ECDH+AES256:!aNULL:!MD5:!DSS:!DH:!AES128',
+					'save_method' => 'storeSettingField'
+				),
+				'system_tlsv13_cipher_list' => array(
+					'label' => $lng['serversettings']['ssl']['tlsv13_cipher_list'],
+					'settinggroup' => 'system',
+					'varname' => 'tlsv13_cipher_list',
+					'type' => 'string',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'visible' => \Froxlor\Settings::Get('system.webserver') == "apache2" && \Froxlor\Settings::Get('system.apache24') == 1,
+					'save_method' => 'storeSettingField'
+				),
+				'system_ssl_cert_file' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_cert_file',
+					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '/etc/apache2/apache2.pem',
+					'save_method' => 'storeSettingField'
+				),
+				'system_ssl_key_file' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_key_file'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_key_file',
+					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '/etc/apache2/apache2.key',
+					'save_method' => 'storeSettingField'
+				),
+				'system_ssl_cert_chainfile' => array(
+					'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_cert_chainfile',
+					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_ssl_ca_file' => array(
+					'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_ca_file',
+					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_apache24_ocsp_cache_path' => array(
+					'label' => $lng['serversettings']['ssl']['apache24_ocsp_cache_path'],
+					'settinggroup' => 'system',
+					'varname' => 'apache24_ocsp_cache_path',
+					'type' => 'string',
+					'string_type' => 'string',
+					'string_emptyallowed' => false,
+					'default' => 'shmcb:/var/run/apache2/ocsp-stapling.cache(131072)',
+					'visible' => \Froxlor\Settings::Get('system.webserver') == "apache2" && \Froxlor\Settings::Get('system.apache24') == 1,
+					'save_method' => 'storeSettingField'
+				),
+				'system_sessionticketsenabled' => array(
+					'label' => $lng['admin']['domain_sessionticketsenabled'],
+					'settinggroup' => 'system',
+					'varname' => 'sessionticketsenabled',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.use_ssl') && (\Froxlor\Settings::Get('system.webserver') == "nginx" || (\Froxlor\Settings::Get('system.webserver') == "apache2" && \Froxlor\Settings::Get('system.apache24') == 1))
+				),
+				'system_leenabled' => array(
+					'label' => $lng['serversettings']['leenabled'],
+					'settinggroup' => 'system',
+					'varname' => 'leenabled',
+					'type' => 'bool',
+					'default' => false,
+					'cronmodule' => 'froxlor/letsencrypt',
+					'save_method' => 'storeSettingField'
+				),
+				'system_letsencryptacmeconf' => array(
+					'label' => $lng['serversettings']['letsencryptacmeconf'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptacmeconf',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/etc/apache2/conf-enabled/acme.conf',
+					'save_method' => 'storeSettingField'
+				),
+			    /**
+			     * currently the only option anyway
+			     *
+				'system_leapiversion' => array(
+					'label' => $lng['serversettings']['leapiversion'],
+					'settinggroup' => 'system',
+					'varname' => 'leapiversion',
+					'type' => 'option',
+					'default' => '2',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'2' => 'ACME v2'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				*/
+				'system_letsencryptca' => array(
+					'label' => $lng['serversettings']['letsencryptca'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptca',
+					'type' => 'option',
+					'default' => 'letsencrypt',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'letsencrypt_test' => 'Let\'s Encrypt (Test / Staging)',
+						'letsencrypt' => 'Let\'s Encrypt (Live)',
+						'buypass_test' => 'Buypass (Test / Staging)',
+						'buypass' => 'Buypass (Live)',
+					    'zerossl' => 'ZeroSSL (Live)'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_letsencryptchallengepath' => array(
+					'label' => $lng['serversettings']['letsencryptchallengepath'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptchallengepath',
+					'type' => 'string',
+					'string_emptyallowed' => false,
+					'default' => \Froxlor\Froxlor::getInstallDir(),
+					'save_method' => 'storeSettingField'
+				),
+				'system_letsencryptkeysize' => array(
+					'label' => $lng['serversettings']['letsencryptkeysize'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptkeysize',
+					'type' => 'option',
+					'default' => '2048',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'2048' => '2048',
+						'3072' => '3072',
+						'4096' => '4096',
+						'8192' => '8192'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_leecc' => array(
+					'label' => $lng['serversettings']['letsencryptecc'],
+					'settinggroup' => 'system',
+					'varname' => 'leecc',
+					'type' => 'option',
+					'default' => '0',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'0' => '-',
+						'256' => 'ec-256',
+						'384' => 'ec-384'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_letsencryptreuseold' => array(
+					'label' => $lng['serversettings']['letsencryptreuseold'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptreuseold',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_disable_le_selfcheck' => array(
+					'label' => $lng['serversettings']['le_domain_dnscheck'],
+					'settinggroup' => 'system',
+					'varname' => 'le_domain_dnscheck',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				)
 			)
 		)
-	);
+	)
+);

actions/admin/settings/135.fcgid.php

@@ -14,12 +14,14 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'fcgid' => array(
 			'title' => $lng['admin']['fcgid_settings'],
-			'websrv_avail' => array('apache2', 'lighttpd'),
+			'websrv_avail' => array(
+				'apache2',
+				'lighttpd'
+			),
 			'fields' => array(
 				'system_mod_fcgid_enabled' => array(
 					'label' => $lng['serversettings']['mod_fcgid'],
@@ -28,19 +30,25 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkFcgidPhpFpm',
-					'overview_option' => true
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkFcgidPhpFpm'
 					),
+					'overview_option' => true
+				),
 				'system_mod_fcgid_configdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_configdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/var/www/php-fcgi-scripts/',
-					'plausibility_check_method' => 'checkPathConflicts',
-					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkPathConflicts'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mod_fcgid_tmpdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
 					'settinggroup' => 'system',
@@ -48,8 +56,8 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/var/customers/tmp/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mod_fcgid_peardir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
 					'settinggroup' => 'system',
@@ -59,34 +67,39 @@ return array(
 					'string_delimiter' => ':',
 					'string_emptyallowed' => true,
 					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mod_fcgid_wrapper' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['wrapper'],
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_wrapper',
 					'type' => 'option',
-					'option_options' => array(0 => 'ScriptAlias', 1=> 'FcgidWrapper'),
+					'option_options' => array(
+						0 => 'ScriptAlias',
+						1 => 'FcgidWrapper'
+					),
 					'default' => 1,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
 				'system_mod_fcgid_starter' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['starter'],
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_starter',
 					'type' => 'int',
 					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mod_fcgid_maxrequests' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['maxrequests'],
 					'settinggroup' => 'system',
 					'varname' => 'mod_fcgid_maxrequests',
 					'type' => 'int',
 					'default' => 250,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mod_fcgid_defaultini' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
 					'settinggroup' => 'system',
@@ -94,47 +107,11 @@ return array(
 					'type' => 'option',
 					'default' => '1',
 					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_enabled_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_ownvhost',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_httpuser' => array(
-					'label' => $lng['admin']['mod_fcgid_user'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpuser',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_httpgroup' => array(
-					'label' => $lng['admin']['mod_fcgid_group'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpgroup',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
-				'system_mod_fcgid_defaultini_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_defaultini_ownvhost',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
+					'option_options_method' => array(
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mod_fcgid_idle_timeout' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'],
 					'settinggroup' => 'system',
@@ -142,10 +119,10 @@ return array(
 					'type' => 'int',
 					'default' => 30,
 					'save_method' => 'storeSettingField'
-					),
 				)
 			)
 		)
-	);
+	)
+);
 
 ?>

actions/admin/settings/136.phpfpm.php

@@ -11,10 +11,9 @@
  * @copyright  (c) the authors
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
+ * @package    \Froxlor\Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'phpfpm' => array(
@@ -27,33 +26,12 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => 'checkFcgidPhpFpm',
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkFcgidPhpFpm'
+					),
 					'overview_option' => true
-					),
-				'system_phpfpm_enabled_ownvhost' => array(
-					'label' => $lng['phpfpm']['ownvhost'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'enabled_ownvhost',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_httpuser' => array(
-					'label' => $lng['phpfpm']['vhost_httpuser'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'vhost_httpuser',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField'
-					),
-				'system_phpfpm_httpgroup' => array(
-					'label' => $lng['phpfpm']['vhost_httpgroup'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'vhost_httpgroup',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField'
-					),
+				),
 				'system_phpfpm_defaultini' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
 					'settinggroup' => 'phpfpm',
@@ -61,37 +39,21 @@ return array(
 					'type' => 'option',
 					'default' => '1',
 					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					),
-				'system_phpfpm_defaultini_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'vhost_defaultini',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					),
-				'system_phpfpm_configdir' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'configdir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/etc/php-fpm.d/',
-					'save_method' => 'storeSettingField',
+					'option_options_method' => array(
+						'\\Froxlor\\Http\\PhpConfig',
+						'getPhpConfigs'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_phpfpm_aliasconfigdir' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'],
 					'settinggroup' => 'phpfpm',
 					'varname' => 'aliasconfigdir',
 					'type' => 'string',
-					'string_type' => 'dir',
+					'string_type' => 'confdir',
 					'default' => '/var/www/php-fpm/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_phpfpm_tmpdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
 					'settinggroup' => 'phpfpm',
@@ -99,86 +61,81 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/var/customers/tmp/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_phpfpm_peardir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
 					'settinggroup' => 'phpfpm',
 					'varname' => 'peardir',
 					'type' => 'string',
 					'string_type' => 'dir',
+					'string_delimiter' => ':',
+					'string_emptyallowed' => true,
 					'default' => '/usr/share/php/:/usr/share/php5/',
-					'save_method' => 'storeSettingField',
-					),
-				'system_phpfpm_reload' => array(
-					'label' => $lng['serversettings']['phpfpm_settings']['reload'],
-					'settinggroup' => 'phpfpm',
-					'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_envpath' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['envpath'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'envpath',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'string_delimiter' => ':',
+					'string_emptyallowed' => true,
+					'default' => '/usr/local/bin:/usr/bin:/bin',
+					'save_method' => 'storeSettingField'
+				),
+				'system_phpfpm_fastcgi_ipcdir' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'fastcgi_ipcdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/var/lib/apache2/fastcgi/',
+					'save_method' => 'storeSettingField'
+				),
+				'system_phpfpm_use_mod_proxy' => array(
+					'label' => $lng['phpfpm']['use_mod_proxy'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'use_mod_proxy',
+					'type' => 'bool',
+					'default' => true,
+					'visible' => \Froxlor\Settings::Get('system.apache24'),
+					'save_method' => 'storeSettingField'
+				),
+				'system_phpfpm_ini_flags' => array(
+					'label' => $lng['phpfpm']['ini_flags'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_flags',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_phpfpm_ini_values' => array(
+					'label' => $lng['phpfpm']['ini_values'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_values',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_phpfpm_ini_admin_flags' => array(
+					'label' => $lng['phpfpm']['ini_admin_flags'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_admin_flags',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_phpfpm_ini_admin_values' => array(
+					'label' => $lng['phpfpm']['ini_admin_values'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'ini_admin_values',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
+	)
+);

actions/admin/settings/137.perl.php

@@ -14,7 +14,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'perl' => array(
@@ -27,8 +26,10 @@ return array(
 					'type' => 'string',
 					'default' => '/usr/bin/perl',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('lighttpd')
-					),	
+					'websrv_avail' => array(
+						'lighttpd'
+					)
+				),
 				'system_perl_suexecworkaround' => array(
 					'label' => $lng['serversettings']['perl']['suexecworkaround'],
 					'settinggroup' => 'perl',
@@ -36,8 +37,10 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
 				'system_perl_suexeccgipath' => array(
 					'label' => $lng['serversettings']['perl']['suexeccgipath'],
 					'settinggroup' => 'perl',
@@ -46,8 +49,10 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/var/www/cgi-bin/',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
+					'websrv_avail' => array(
+						'apache2'
+					)
+				),
 				'perl_server' => array(
 					'label' => $lng['serversettings']['perl_server'],
 					'settinggroup' => 'serversettings',
@@ -55,11 +60,13 @@ return array(
 					'type' => 'string',
 					'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock',
 					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('nginx')
-					),
-				),
-			),
-		),
-	);
+					'websrv_avail' => array(
+						'nginx'
+					)
+				)
+			)
+		)
+	)
+);
 
 ?>

actions/admin/settings/140.statistics.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'statistics' => array(
@@ -29,17 +28,22 @@ return array(
 					'type' => 'option',
 					'default' => 2,
 					'option_mode' => 'one',
-					'option_options' => array(0 => $lng['admin']['webalizer']['normal'], 1 => $lng['admin']['webalizer']['quiet'], 2 => $lng['admin']['webalizer']['veryquiet']),
-					'save_method' => 'storeSettingField',
+					'option_options' => array(
+						0 => $lng['admin']['webalizer']['normal'],
+						1 => $lng['admin']['webalizer']['quiet'],
+						2 => $lng['admin']['webalizer']['veryquiet']
 					),
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 0
+				),
 				'system_awstats_enabled' => array(
 					'label' => $lng['serversettings']['awstats_enabled'],
 					'settinggroup' => 'system',
 					'varname' => 'awstats_enabled',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_awstats_path' => array(
 					'label' => $lng['serversettings']['awstats_path'],
 					'settinggroup' => 'system',
@@ -48,7 +52,8 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/usr/bin/',
 					'save_method' => 'storeSettingField',
-					),
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
+				),
 				'system_awstats_awstatspath' => array(
 					'label' => $lng['serversettings']['awstats_awstatspath'],
 					'settinggroup' => 'system',
@@ -57,7 +62,8 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/usr/bin/',
 					'save_method' => 'storeSettingField',
-					),
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
+				),
 				'system_awstats_conf' => array(
 					'label' => $lng['serversettings']['awstats_conf'],
 					'settinggroup' => 'system',
@@ -66,7 +72,8 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/etc/awstats/',
 					'save_method' => 'storeSettingField',
-					),
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
+				),
 				'system_awstats_icons' => array(
 					'label' => $lng['serversettings']['awstats_icons'],
 					'settinggroup' => 'system',
@@ -75,10 +82,20 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/usr/share/awstats/icon/',
 					'save_method' => 'storeSettingField',
-					)
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
+				),
+				'system_awstats_logformat' => array(
+					'label' => $lng['serversettings']['awstats']['logformat'],
+					'settinggroup' => 'system',
+					'varname' => 'awstats_logformat',
+					'type' => 'string',
+					'default' => '1',
+					'save_method' => 'storeSettingField',
+					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
 				)
 			)
 		)
-	);
+	)
+);
 
 ?>

actions/admin/settings/150.mail.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'mail' => array(
@@ -30,8 +29,8 @@ return array(
 					'default' => 2000,
 					'int_min' => 1,
 					'int_max' => 65535,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_vmail_gid' => array(
 					'label' => $lng['serversettings']['vmail_gid'],
 					'settinggroup' => 'system',
@@ -40,8 +39,8 @@ return array(
 					'default' => 2000,
 					'int_min' => 1,
 					'int_max' => 65535,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_vmail_homedir' => array(
 					'label' => $lng['serversettings']['vmail_homedir'],
 					'settinggroup' => 'system',
@@ -49,8 +48,8 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/var/customers/mail/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_vmail_maildirname' => array(
 					'label' => $lng['serversettings']['vmail_maildirname'],
 					'settinggroup' => 'system',
@@ -59,58 +58,97 @@ return array(
 					'string_type' => 'dir',
 					'default' => 'Maildir',
 					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'panel_sendalternativemail' => array(
 					'label' => $lng['serversettings']['sendalternativemail'],
 					'settinggroup' => 'panel',
 					'varname' => 'sendalternativemail',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mail_quota_enabled' => array(
 					'label' => $lng['serversettings']['mail_quota_enabled'],
 					'settinggroup' => 'system',
 					'varname' => 'mail_quota_enabled',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mail_quota' => array(
 					'label' => $lng['serversettings']['mail_quota'],
 					'settinggroup' => 'system',
 					'varname' => 'mail_quota',
 					'type' => 'int',
 					'default' => 100,
-					'save_method' => 'storeSettingField',
-					),
-				'system_autoresponder_enabled' => array(
-					'label' => $lng['serversettings']['autoresponder_active'],
-					'settinggroup' => 'autoresponder',
-					'varname' => 'autoresponder_active',
-					'type' => 'bool',
-					'default' => false,
-					'cronmodule' => 'froxlor/autoresponder',
-					'save_method' => 'storeSettingField',
-					),
-				'system_last_autoresponder_run' => array(
-					'settinggroup' => 'autoresponder',
-					'varname' => 'last_autoresponder_run',
-					'type' => 'hidden',
-					'default' => 0,
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_catchall_enabled' => array(
 					'label' => $lng['serversettings']['catchall_enabled'],
 					'settinggroup' => 'catchall',
 					'varname' => 'catchall_enabled',
 					'type' => 'bool',
 					'default' => true,
-					'save_method' => 'storeSettingResetCatchall',
-					),
+					'save_method' => 'storeSettingResetCatchall'
 				),
-			),
-		),
-	);
+				'system_mailtraffic_enabled' => array(
+					'label' => $lng['serversettings']['mailtraffic_enabled'],
+					'settinggroup' => 'system',
+					'varname' => 'mailtraffic_enabled',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_mdaserver' => array(
+					'label' => $lng['serversettings']['mdaserver'],
+					'settinggroup' => 'system',
+					'varname' => 'mdaserver',
+					'type' => 'option',
+					'option_mode' => 'one',
+					'default' => 'dovecot',
+					'option_options' => array(
+						'courier' => 'Courier',
+						'dovecot' => 'Dovecot'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_mdalog' => array(
+					'label' => $lng['serversettings']['mdalog'],
+					'settinggroup' => 'system',
+					'varname' => 'mdalog',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/var/log/mail.log',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_mtaserver' => array(
+					'label' => $lng['serversettings']['mtaserver'],
+					'settinggroup' => 'system',
+					'varname' => 'mtaserver',
+					'type' => 'option',
+					'option_mode' => 'one',
+					'default' => 'postfix',
+					'option_options' => array(
+						'exim4' => 'Exim4',
+						'postfix' => 'Postfix'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_mtalog' => array(
+					'label' => $lng['serversettings']['mtalog'],
+					'settinggroup' => 'system',
+					'varname' => 'mtalog',
+					'type' => 'string',
+					'string_type' => 'file',
+					'default' => '/var/log/mail.log',
+					'string_emptyallowed' => true,
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
+	)
+);
 
 ?>

actions/admin/settings/155.ftpserver.php

@@ -16,10 +16,9 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
-	'ftpserver' => array(
+		'ftpserver' => array(
 			'title' => $lng['admin']['ftpserversettings'],
 			'fields' => array(
 				'ftpserver' => array(
@@ -29,11 +28,14 @@ return array(
 					'type' => 'option',
 					'default' => 'proftpd',
 					'option_mode' => 'one',
-					'option_options' => array('proftpd' => 'Proftpd', 'pureftpd' => 'Pureftpd'),
-					'save_method' => 'storeSettingField',
-				),
-			),
-		),
+					'option_options' => array(
+						'proftpd' => 'Proftpd',
+						'pureftpd' => 'Pureftpd'
+					),
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
 	)
 );
 

actions/admin/settings/160.nameserver.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'nameserver' => array(
@@ -30,7 +29,28 @@ return array(
 					'default' => true,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
+				),
+				'system_dnsenabled' => array(
+					'label' => $lng['serversettings']['dnseditorenable'],
+					'settinggroup' => 'system',
+					'varname' => 'dnsenabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_dns_server' => array(
+					'label' => $lng['serversettings']['dns_server'],
+					'settinggroup' => 'system',
+					'varname' => 'dns_server',
+					'type' => 'option',
+					'default' => 'Bind',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'Bind' => 'Bind9',
+						'PowerDNS' => 'PowerDNS'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_bindconf_directory' => array(
 					'label' => $lng['serversettings']['bindconf_directory'],
 					'settinggroup' => 'system',
@@ -38,16 +58,16 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/etc/bind/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_bindreload_command' => array(
 					'label' => $lng['serversettings']['bindreload_command'],
 					'settinggroup' => 'system',
 					'varname' => 'bindreload_command',
 					'type' => 'string',
 					'default' => '/etc/init.d/bind9 reload',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_nameservers' => array(
 					'label' => $lng['serversettings']['nameservers'],
 					'settinggroup' => 'system',
@@ -56,8 +76,8 @@ return array(
 					'string_regexp' => '/^(([a-z0-9\-\._]+, ?)*[a-z0-9\-\._]+)?$/i',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
+					'save_method' => 'storeSettingFieldInsertBindTask'
+				),
 				'system_mxservers' => array(
 					'label' => $lng['serversettings']['mxservers'],
 					'settinggroup' => 'system',
@@ -66,17 +86,31 @@ return array(
 					'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(
 					'label' => $lng['serversettings']['axfrservers'],
 					'settinggroup' => 'system',
 					'varname' => 'axfrservers',
 					'type' => 'string',
-					'string_type' => 'validate_ip',
+					'string_type' => 'validate_ip_incl_private',
+					'string_delimiter' => ',',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
+				),
+				'system_powerdns_mode' => array(
+					'label' => $lng['serversettings']['powerdns_mode'],
+					'settinggroup' => 'system',
+					'varname' => 'powerdns_mode',
+					'type' => 'option',
+					'default' => 'Native',
+					'option_mode' => 'one',
+					'option_options' => array(
+						'Native' => 'Native',
+						'Master' => 'Master'
+					),
+					'save_method' => 'storeSettingField'
 				),
 				'system_dns_createmailentry' => array(
 					'label' => $lng['serversettings']['mail_also_with_mxservers'],
@@ -85,7 +119,23 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-					),
+				),
+				'system_dns_createcaaentry' => array(
+					'label' => $lng['serversettings']['caa_entry'],
+					'settinggroup' => 'system',
+					'varname' => 'dns_createcaaentry',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'caa_caa_entry' => array(
+					'label' => $lng['serversettings']['caa_entry_custom'],
+					'settinggroup' => 'caa',
+					'varname' => 'caa_entry',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
 				'system_defaultttl' => array(
 					'label' => $lng['serversettings']['defaultttl'],
 					'settinggroup' => 'system',
@@ -94,11 +144,19 @@ return array(
 					'default' => 604800, /* 1 week */
 					'int_min' => 3600, /* 1 hour */
 					'int_max' => 2147483647, /* integer max */
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
 				),
-			),
-		),
-	);
-
-?>
+				'system_soaemail' => array(
+					'label' => $lng['serversettings']['soaemail'],
+					'settinggroup' => 'system',
+					'varname' => 'soaemail',
+					'type' => 'string',
+					'string_type' => 'mail',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
+	)
+);

actions/admin/settings/170.logger.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'logging' => array(
@@ -30,7 +29,7 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-					),
+				),
 				'logger_severity' => array(
 					'label' => $lng['serversettings']['logger']['severity'],
 					'settinggroup' => 'logger',
@@ -38,9 +37,12 @@ return array(
 					'type' => 'option',
 					'default' => 1,
 					'option_mode' => 'one',
-					'option_options' => array(1 => $lng['admin']['logger']['normal'], 2 => $lng['admin']['logger']['paranoid']),
-					'save_method' => 'storeSettingField',
+					'option_options' => array(
+						1 => $lng['admin']['logger']['normal'],
+						2 => $lng['admin']['logger']['paranoid']
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'logger_logtypes' => array(
 					'label' => $lng['serversettings']['logger']['types'],
 					'settinggroup' => 'logger',
@@ -48,9 +50,13 @@ return array(
 					'type' => 'option',
 					'default' => 'syslog,mysql',
 					'option_mode' => 'multiple',
-					'option_options' => array('syslog' => 'syslog', 'file' => 'file', 'mysql' => 'mysql'),
-					'save_method' => 'storeSettingField',
+					'option_options' => array(
+						'syslog' => 'syslog',
+						'file' => 'file',
+						'mysql' => 'mysql'
 					),
+					'save_method' => 'storeSettingField'
+				),
 				'logger_logfile' => array(
 					'label' => $lng['serversettings']['logger']['logfile'],
 					'settinggroup' => 'logger',
@@ -59,19 +65,25 @@ return array(
 					'string_type' => 'file',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'logger_log_cron' => array(
 					'label' => $lng['serversettings']['logger']['logcron'],
 					'settinggroup' => 'logger',
 					'varname' => 'log_cron',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
+					'type' => 'option',
+					'default' => 0,
+					'option_mode' => 'one',
+					'option_options' => array(
+						0 => $lng['serversettings']['logger']['logcronoption']['never'],
+						1 => $lng['serversettings']['logger']['logcronoption']['once'],
+						2 => $lng['serversettings']['logger']['logcronoption']['always']
 					),
-				),
-			),
+					'save_method' => 'storeSettingField'
+				)
+			)
 		)
-	);
+	)
+);
 
 ?>

actions/admin/settings/180.dkim.php

@@ -13,12 +13,9 @@
  * @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
+ * @package    \Froxlor\Settings
  *
  */
-
-global $settings;
-
 return array(
 	'groups' => array(
 		'dkim' => array(
@@ -32,7 +29,7 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingFieldInsertBindTask',
 					'overview_option' => true
-					),
+				),
 				'dkim_prefix' => array(
 					'label' => $lng['dkim']['dkim_prefix'],
 					'settinggroup' => 'dkim',
@@ -40,8 +37,17 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/etc/postfix/dkim/',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
+				'dkim_privkeysuffix' => array(
+					'label' => $lng['dkim']['privkeysuffix'],
+					'settinggroup' => 'dkim',
+					'varname' => 'privkeysuffix',
+					'type' => 'string',
+					'string_regexp' => '/^[a-z0-9\._]+$/i',
+					'default' => '.priv',
+					'save_method' => 'storeSettingField'
+				),
 				'dkim_domains' => array(
 					'label' => $lng['dkim']['dkim_domains'],
 					'settinggroup' => 'dkim',
@@ -49,8 +55,8 @@ return array(
 					'type' => 'string',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => 'domains',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'dkim_dkimkeys' => array(
 					'label' => $lng['dkim']['dkim_dkimkeys'],
 					'settinggroup' => 'dkim',
@@ -58,8 +64,8 @@ return array(
 					'type' => 'string',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => 'dkim-keys.conf',
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'dkim_algorithm' => array(
 					'label' => $lng['dkim']['dkim_algorithm'],
 					'settinggroup' => 'dkim',
@@ -67,9 +73,13 @@ return array(
 					'type' => 'option',
 					'default' => 'all',
 					'option_mode' => 'multiple',
-					'option_options' => array('all' => 'All', 'sha1' => 'SHA1', 'sha256' => 'SHA256'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
+					'option_options' => array(
+						'all' => 'All',
+						'sha1' => 'SHA1',
+						'sha256' => 'SHA256'
 					),
+					'save_method' => 'storeSettingFieldInsertBindTask'
+				),
 				'dkim_servicetype' => array(
 					'label' => $lng['dkim']['dkim_servicetype'],
 					'settinggroup' => 'dkim',
@@ -77,22 +87,28 @@ return array(
 					'type' => 'option',
 					'default' => '0',
 					'option_mode' => 'one',
-					'option_options' => array('0' => 'All', '1' => 'E-Mail'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
+					'option_options' => array(
+						'0' => 'All',
+						'1' => 'E-Mail'
 					),
+					'save_method' => 'storeSettingFieldInsertBindTask'
+				),
 				'dkim_keylength' => array(
 					'label' => array(
 						'title' => $lng['dkim']['dkim_keylength']['title'],
-						'description' => sprintf($lng['dkim']['dkim_keylength']['description'],$settings['dkim']['dkim_prefix'])
+						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], \Froxlor\Settings::Get('dkim.dkim_prefix'))
 					),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_keylength',
 					'type' => 'option',
 					'default' => '1024',
 					'option_mode' => 'one',
-					'option_options' => array('1024' => '1024 Bit', '2048' => '2048 Bit'),
-					'save_method' => 'storeSettingFieldInsertBindTask',
+					'option_options' => array(
+						'1024' => '1024 Bit',
+						'2048' => '2048 Bit'
 					),
+					'save_method' => 'storeSettingFieldInsertBindTask'
+				),
 				'dkim_notes' => array(
 					'label' => $lng['dkim']['dkim_notes'],
 					'settinggroup' => 'dkim',
@@ -100,37 +116,19 @@ return array(
 					'type' => 'string',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => '',
-					'save_method' => 'storeSettingFieldInsertBindTask',
-					),
-				'dkim_add_adsp' => array(
-					'label' => $lng['dkim']['dkim_add_adsp'],
-					'settinggroup' => 'dkim',
-					'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',
-					),
+					'save_method' => 'storeSettingFieldInsertBindTask'
+				),
 				'dkimrestart_command' => array(
 					'label' => $lng['dkim']['dkimrestart_command'],
 					'settinggroup' => 'dkim',
 					'varname' => 'dkimrestart_command',
 					'type' => 'string',
 					'default' => '/etc/init.d/dkim-filter restart',
-					'save_method' => 'storeSettingField',
-					),
-				),
-			),
-		),
-	);
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
+	)
+);
 
 ?>

actions/admin/settings/185.spf.php

@@ -14,7 +14,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'spf' => array(
@@ -28,18 +27,18 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-					),
+				),
 				'spf_entry' => array(
 					'label' => $lng['spf']['spf_entry'],
 					'settinggroup' => 'spf',
 					'varname' => 'spf_entry',
 					'type' => 'string',
-					'default' => '@	IN	TXT	"v=spf1 a mx -all"',
+					'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/200.aps.php

@@ -1,102 +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(
-		'aps' => array(
-			'title' => $lng['admin']['aps'],
-			'fields' => array(
-				'aps_enable' => array(
-					'label' => $lng['aps']['activate_aps'],
-					'settinggroup' => 'aps',
-					'varname' => 'aps_active',
-					'type' => 'bool',
-					'default' => false,
-					'cronmodule' => 'froxlor/aps',
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-					),
-				'aps_items_per_page' => array(
-					'label' => $lng['aps']['packages_per_page'],
-					'settinggroup' => 'aps',
-					'varname' => 'items_per_page',
-					'type' => 'int',
-					'default' => 20,
-					'save_method' => 'storeSettingField',
-					),
-				'aps_upload_fields' => array(
-					'label' => $lng['aps']['upload_fields'],
-					'settinggroup' => 'aps',
-					'varname' => 'upload_fields',
-					'type' => 'int',
-					'default' => 5,
-					'save_method' => 'storeSettingField',
-					),
-				'aps_exceptions' => array(
-					'label' => $lng['aps']['exceptions'],
-					'type' => 'label',
-					),
-				'aps_php-extension' => array(
-					'label' => $lng['aps']['settings_php_extensions'],
-					'settinggroup' => 'aps',
-					'varname' => 'php-extension',
-					'type' => 'option',
-					'default' => '',
-					'option_mode' => 'multiple',
-					'option_options' => array('gd' => 'GD Library', 'pcre' => 'PCRE', 'ioncube' => 'ionCube', 'ioncube loader' => 'ionCube Loader', 'curl' => 'curl', 'mcrypt' => 'mcrypt', 'imap' => 'imap', 'json' => 'json', 'ldap' => 'LDAP', 'hash' => 'hash', 'mbstring' => 'mbstring', 'Zend Optimizer' => 'Zend Guard'),
-					'save_method' => 'storeSettingApsPhpExtensions',
-					),
-				'aps_php-function' => array(
-					'settinggroup' => 'aps',
-					'varname' => 'php-function',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				'aps_php-configuration' => array(
-					'label' => $lng['aps']['settings_php_configuration'],
-					'settinggroup' => 'aps',
-					'varname' => 'php-configuration',
-					'type' => 'option',
-					'default' => '',
-					'option_mode' => 'multiple',
-					'option_options' => array('short_open_tag' => 'short_open_tag', 'file_uploads' => 'file_uploads', 'magic_quotes_gpc' => 'magic_quotes_gpc', 'register_globals' => 'register_globals', 'allow_url_fopen' => 'allow_url_fopen', 'safe_mode' => 'safe_mode', 'post_max_size' => 'post_max_size', 'memory_limit' => 'memory_limit', 'max_execution_time' => 'max_execution_time'),
-					'save_method' => 'storeSettingField',
-					),
-				'aps_webserver-module' => array(
-					'label' => $lng['aps']['settings_webserver_modules'],
-					'settinggroup' => 'aps',
-					'varname' => 'webserver-module',
-					'type' => 'option',
-					'default' => '',
-					'option_mode' => 'multiple',
-					'option_options' => array('mod_perl' => 'mod_perl', 'mod_rewrite' => 'mod_rewrite', 'mod_access' => 'mod_access', 'fcgid-any' => 'FastCGI/mod_fcgid', 'htaccess' => '.htaccess'),
-					'save_method' => 'storeSettingApsWebserverModules',
-					),
-				'aps_webserver-htaccess' => array(
-					'settinggroup' => 'aps',
-					'varname' => 'webserver-htaccess',
-					'type' => 'hidden',
-					'default' => '',
-					),
-				),
-			),
-		),
-	);
-
-?>

actions/admin/settings/210.security.php

@@ -16,7 +16,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'security' => array(
@@ -28,16 +27,16 @@ return array(
 					'varname' => 'unix_names',
 					'type' => 'bool',
 					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
+					'save_method' => 'storeSettingField'
+				),
 				'system_mailpwcleartext' => array(
 					'label' => $lng['serversettings']['mailpwcleartext'],
 					'settinggroup' => 'system',
 					'varname' => 'mailpwcleartext',
 					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					),
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
 				'system_passwordcryptfunc' => array(
 					'label' => $lng['serversettings']['passwordcryptfunc'],
 					'settinggroup' => 'system',
@@ -45,10 +44,59 @@ return array(
 					'type' => 'option',
 					'default' => 0,
 					'option_mode' => 'one',
-					'option_options' => array(0 => $lng['serversettings']['systemdefault'], 1 => 'MD5', 2 => 'BLOWFISH', 3 => 'SHA-256', 4 => 'SHA-512'),
+					'option_options_method' => array(
+						'\\Froxlor\\System\\Crypt',
+						'getAvailablePasswordHashes'
+					),
+					'save_method' => 'storeSettingField'
+				),
+				'system_allow_error_report_admin' => array(
+					'label' => $lng['serversettings']['allow_error_report_admin'],
+					'settinggroup' => 'system',
+					'varname' => 'allow_error_report_admin',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_allow_error_report_customer' => array(
+					'label' => $lng['serversettings']['allow_error_report_customer'],
+					'settinggroup' => 'system',
+					'varname' => 'allow_error_report_customer',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_allow_customer_shell' => array(
+					'label' => $lng['serversettings']['allow_allow_customer_shell'],
+					'settinggroup' => 'system',
+					'varname' => 'allow_customer_shell',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+				),
+				'system_available_shells' => array(
+					'label' => $lng['serversettings']['available_shells'],
+					'settinggroup' => 'system',
+					'varname' => 'available_shells',
+					'type' => 'string',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField'
+				),
+				'system_froxlorusergroup' => array(
+					'label' => $lng['serversettings']['froxlorusergroup'],
+					'settinggroup' => 'system',
+					'varname' => 'froxlorusergroup',
+					'type' => 'string',
+					'default' => '',
 					'save_method' => 'storeSettingField',
-					)
-				)
+					'plausibility_check_method' => array(
+						'\\Froxlor\\Validate\\Check',
+						'checkLocalGroup'
+					),
+					'visible' => \Froxlor\Settings::Get('system.nssextrausers')
+				),
 			)
 		)
-	);
+	)
+);

actions/admin/settings/215.backup.php

@@ -1,118 +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(
-		'backup' => array(
-			'title' => $lng['backup'],
-			'fields' => array(
-				'backup_enabled' => array(
-					'label' => $lng['serversettings']['backup_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'cronmodule' => 'froxlor/backup',
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-				),
-				'backup_dir' => array(
-					'label' => $lng['serversettings']['backupdir']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_dir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/customers/backups/',
-					'string_regexp' => '#^/.*/$#',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_mysqldump_path' => array(
-					'label' => $lng['serversettings']['mysqldump_path']['description'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_mysqldump_path',
-					'type' => 'string',
-					'default' => '/usr/bin/mysqldump',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_count' => array(
-					'label' => $lng['serversettings']['backup_count'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_count',
-					'type' => 'bool',
-					'default' => 'true',
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),				
-				'backup_bigfile' => array(
-					'label' => $lng['serversettings']['backup_bigfile'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_bigfile',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'backup_ftp_enabled_' => array(
-					'label' => $lng['serversettings']['backup_ftp_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'backup_server' => array(
-					'label' => $lng['serversettings']['backup_ftp_server'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_server',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_user' => array(
-					'label' => $lng['serversettings']['backup_ftp_user'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_user',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_pass' => array(
-					'label' => $lng['serversettings']['backup_ftp_pass'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_pass',
-					'type' => 'hiddenstring',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-				),
-				'backup_passive_mode' => array(
-					'label' => $lng['serversettings']['backup_ftp_passive_mode'],
-					'settinggroup' => 'system',
-					'varname' => 'backup_ftp_passive',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField',
-					'overview_option' => false,
-				),
-				),
-			),
-		),
-	);
-
-?>

actions/admin/settings/220.quota.php

@@ -13,7 +13,6 @@
  * @package    Settings
  *
  */
-
 return array(
 	'groups' => array(
 		'diskquota' => array(
@@ -34,7 +33,7 @@ return array(
 					'varname' => 'diskquota_repquota_path',
 					'type' => 'string',
 					'default' => '/usr/sbin/repquota',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 				),
 				'diskquota_quotatool_path' => array(
 					'label' => $lng['serversettings']['diskquota_quotatool_path']['description'],
@@ -42,7 +41,7 @@ return array(
 					'varname' => 'diskquota_quotatool_path',
 					'type' => 'string',
 					'default' => '/usr/bin/quotatool',
-					'save_method' => 'storeSettingField',
+					'save_method' => 'storeSettingField'
 				),
 				'diskquota_customer_partition' => array(
 					'label' => $lng['serversettings']['diskquota_customer_partition']['description'],
@@ -50,11 +49,11 @@ return array(
 					'varname' => 'diskquota_customer_partition',
 					'type' => 'string',
 					'default' => '/dev/root',
-					'save_method' => 'storeSettingField',
-				),
-				),
-			),
-		),
-	);
+					'save_method' => 'storeSettingField'
+				)
+			)
+		)
+	)
+);
 
 ?>

admin_apcuinfo.php

@@ -0,0 +1,440 @@
+<?php
+
+/*
+ * +----------------------------------------------------------------------+
+ * | APC |
+ * +----------------------------------------------------------------------+
+ * | Copyright (c) 2006-2011 The PHP Group |
+ * +----------------------------------------------------------------------+
+ * | This source file is subject to version 3.01 of the PHP license, |
+ * | that is bundled with this package in the file LICENSE, and is |
+ * | available through the world-wide-web at the following url: |
+ * | http://www.php.net/license/3_01.txt |
+ * | If you did not receive a copy of the PHP license and are unable to |
+ * | obtain it through the world-wide-web, please send a note to |
+ * | license@php.net so we can mail you a copy immediately. |
+ * +----------------------------------------------------------------------+
+ * | Authors: Ralf Becker <beckerr@php.net> |
+ * | Rasmus Lerdorf <rasmus@php.net> |
+ * | Ilia Alshanetsky <ilia@prohost.org> |
+ * +----------------------------------------------------------------------+
+ *
+ * All other licensing and usage conditions are those of the PHP Group.
+ *
+ * Based on https://github.com/krakjoe/apcu/blob/master/apc.php
+ * Implemented into Froxlor: Janos Muzsi <muzsij@hypernics.hu>
+ *
+ */
+define('AREA', 'admin');
+require './lib/init.php';
+
+$horizontal_bar_size = 950; // 1280px window width
+
+if ($action == 'delete' && function_exists('apcu_clear_cache') && $userinfo['change_serversettings'] == '1') {
+	apcu_clear_cache();
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "cleared APCu cache");
+	header('Location: ' . $linker->getLink(array(
+		'section' => 'apcuinfo',
+		'page' => 'showinfo'
+	)));
+	exit();
+}
+
+if (! function_exists('apcu_cache_info') || ! function_exists('apcu_sma_info')) {
+	\Froxlor\UI\Response::standard_error($lng['error']['no_apcuinfo']);
+}
+
+if ($page == 'showinfo') {
+	$cache = apcu_cache_info();
+	$mem = apcu_sma_info();
+	$time = time();
+	$log->logAction(\Froxlor\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'];
+	}
+
+	if (! isset($cache['num_expunges'])) {
+		$cache['num_expunges'] = $lng['logger']['unknown'];
+	}
+
+	$runtimelines = '';
+	foreach (ini_get_all('apcu') as $name => $v) {
+		$value = $v['local_value'];
+		eval("\$runtimelines.=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/runtime_line") . "\";");
+	}
+
+	$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']));
+
+	// Fragmentation: (freeseg - 1) / total_seg
+	$nseg = $freeseg = $fragsize = $freetotal = 0;
+	for ($i = 0; $i < $mem['num_seg']; $i ++) {
+		$ptr = 0;
+		foreach ($mem['block_lists'][$i] as $block) {
+			if ($block['offset'] != $ptr) {
+				++ $nseg;
+			}
+			$ptr = $block['offset'] + $block['size'];
+			/* Only consider blocks <5M for the fragmentation % */
+			if ($block['size'] < (5 * 1024 * 1024))
+				$fragsize += $block['size'];
+			$freetotal += $block['size'];
+		}
+		$freeseg += count($mem['block_lists'][$i]);
+	}
+
+	if ($freeseg > 1) {
+		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize / $freetotal) * 100, bsize($fragsize), bsize($freetotal), $freeseg);
+	} else {
+		$frag = "0%";
+	}
+
+	foreach (ini_get_all('apcu') as $name => $v) {
+		$value = $v['local_value'];
+	}
+
+	$img_src1 = '';
+	$img_src2 = '';
+	$img_src3 = '';
+	if (graphics_avail()) {
+		$img_src = $linker->getLink(array(
+			'section' => 'apcuinfo',
+			'page' => 'img1',
+			'action' => mt_rand(0, 1000000)
+		));
+		eval("\$img_src1=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/img_line") . "\";");
+		$img_src = $linker->getLink(array(
+			'section' => 'apcuinfo',
+			'page' => 'img2',
+			'action' => mt_rand(0, 1000000)
+		));
+		eval("\$img_src2=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/img_line") . "\";");
+		$img_src = $linker->getLink(array(
+			'section' => 'apcuinfo',
+			'page' => 'img3',
+			'action' => mt_rand(0, 1000000)
+		));
+		eval("\$img_src3=\"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/img_line") . "\";");
+	}
+
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/showinfo") . "\";");
+} elseif ($page == 'img1') {
+
+	$mem = apcu_sma_info();
+
+	$size = 460;
+	$image = imagecreate($size + 5, $size + 5);
+
+	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+	$col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
+	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+	$col_black = imagecolorallocate($image, 0, 0, 0);
+
+	imagecolortransparent($image, $col_white);
+
+	$s = $mem['num_seg'] * $mem['seg_size'];
+	$a = $mem['avail_mem'];
+	$x = $y = $size / 2;
+	$fuzz = 0.000001;
+
+	// This block of code creates the pie chart. It is a lot more complex than you
+	// would expect because we try to visualize any memory fragmentation as well.
+	$angle_from = 0;
+	$string_placement = array();
+	for ($i = 0; $i < $mem['num_seg']; $i ++) {
+		$ptr = 0;
+		$free = $mem['block_lists'][$i];
+		uasort($free, 'block_sort');
+		foreach ($free as $block) {
+			if ($block['offset'] != $ptr) { // Used block
+				$angle_to = $angle_from + ($block['offset'] - $ptr) / $s;
+				if (($angle_to + $fuzz) > 1)
+					$angle_to = 1;
+				if (($angle_to * 360) - ($angle_from * 360) >= 1) {
+					fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
+					if (($angle_to - $angle_from) > 0.05) {
+						array_push($string_placement, array(
+							$angle_from,
+							$angle_to
+						));
+					}
+				}
+				$angle_from = $angle_to;
+			}
+			$angle_to = $angle_from + ($block['size']) / $s;
+			if (($angle_to + $fuzz) > 1)
+				$angle_to = 1;
+			if (($angle_to * 360) - ($angle_from * 360) >= 1) {
+				fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_green);
+				if (($angle_to - $angle_from) > 0.05) {
+					array_push($string_placement, array(
+						$angle_from,
+						$angle_to
+					));
+				}
+			}
+			$angle_from = $angle_to;
+			$ptr = $block['offset'] + $block['size'];
+		}
+		if ($ptr < $mem['seg_size']) { // memory at the end
+			$angle_to = $angle_from + ($mem['seg_size'] - $ptr) / $s;
+			if (($angle_to + $fuzz) > 1)
+				$angle_to = 1;
+			fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
+			if (($angle_to - $angle_from) > 0.05) {
+				array_push($string_placement, array(
+					$angle_from,
+					$angle_to
+				));
+			}
+		}
+	}
+	foreach ($string_placement as $angle) {
+		text_arc($image, $x, $y, $size, $angle[0] * 360, $angle[1] * 360, $col_black, bsize($s * ($angle[1] - $angle[0])));
+	}
+
+	header("Content-type: image/png");
+	imagepng($image);
+	exit();
+} elseif ($page == 'img2') {
+
+	$cache = apcu_cache_info();
+
+	$size = $horizontal_bar_size;
+	$image = imagecreate($size + 5, 140);
+
+	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+	$col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
+	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+	$col_black = imagecolorallocate($image, 0, 0, 0);
+
+	imagecolortransparent($image, $col_white);
+
+	$s = $cache['num_hits'] + $cache['num_misses'];
+	$a = $cache['num_hits'];
+
+	fill_box($image, 1, 10, $s ? ($a * ($size - 21) / $s) : $size, 50, $col_black, $col_green /* , sprintf("%.1f%%", $s ? $cache['num_hits'] * 100 / $s : 0) */
+	);
+	fill_box($image, 1, 80, $s ? max(4, ($s - $a) * ($size - 21) / $s) : $size, 50, $col_black, $col_red /* , sprintf("%.1f%%", $s ? $cache['num_misses'] * 100 / $s : 0) */
+	);
+
+	header("Content-type: image/png");
+	imagepng($image);
+	exit();
+} elseif ($page == 'img3') {
+
+	$mem = apcu_sma_info();
+
+	$size = $horizontal_bar_size;
+	$image = imagecreate($size, 70);
+
+	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+	$col_red = imagecolorallocate($image, 0xD0, 0x60, 0x30);
+	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+	$col_black = imagecolorallocate($image, 0, 0, 0);
+
+	imagecolortransparent($image, $col_white);
+
+	$s = $mem['num_seg'] * $mem['seg_size'];
+	$a = $mem['avail_mem'];
+	$x = 10;
+	$y = 0;
+
+	// This block of code creates the bar chart. It is a lot more complex than you
+	// would expect because we try to visualize any memory fragmentation as well.
+	for ($i = 0; $i < $mem['num_seg']; $i ++) {
+		$ptr = 0;
+		$free = $mem['block_lists'][$i];
+		uasort($free, 'block_sort');
+		foreach ($free as $block) {
+			if ($block['offset'] != $ptr) { // Used block
+				$h = ($size - 5) * ($block['offset'] - $ptr) / $s;
+				if ($h > 0) {
+					fill_box($image, $y, $x, $h, 50, $col_black, $col_red);
+				}
+				$y += $h;
+			}
+			$h = ($size - 5) * ($block['size']) / $s;
+			if ($h > 0) {
+				fill_box($image, $y, $x, $h, 50, $col_black, $col_green);
+			}
+			$y += $h;
+			$ptr = $block['offset'] + $block['size'];
+		}
+		if ($ptr < $mem['seg_size']) { // memory at the end
+			$h = ($size - 5) * ($mem['seg_size'] - $ptr) / $s;
+			if ($h > 0) {
+				fill_box($image, $y, $x, $h, 50, $col_black, $col_red, bsize($mem['seg_size'] - $ptr), $j ++);
+			}
+		}
+	}
+
+	header("Content-type: image/png");
+	imagepng($image);
+	exit();
+}
+
+function graphics_avail()
+{
+	return extension_loaded('gd');
+}
+
+// pretty printer for byte values
+//
+function bsize($s)
+{
+	foreach (array(
+		'',
+		'K',
+		'M',
+		'G'
+	) as $i => $k) {
+		if ($s < 1024)
+			break;
+		$s /= 1024;
+	}
+	return sprintf("%5.1f %sBytes", $s, $k);
+}
+
+function duration($ts)
+{
+	global $time;
+	$years = (int) ((($time - $ts) / (7 * 86400)) / 52.177457);
+	$rem = (int) (($time - $ts) - ($years * 52.177457 * 7 * 86400));
+	$weeks = (int) (($rem) / (7 * 86400));
+	$days = (int) (($rem) / 86400) - $weeks * 7;
+	$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)
+		$str .= "$years year, ";
+	if ($years > 1)
+		$str .= "$years years, ";
+	if ($weeks == 1)
+		$str .= "$weeks week, ";
+	if ($weeks > 1)
+		$str .= "$weeks weeks, ";
+	if ($days == 1)
+		$str .= "$days day,";
+	if ($days > 1)
+		$str .= "$days days,";
+	if ($hours == 1)
+		$str .= " $hours hour and";
+	if ($hours > 1)
+		$str .= " $hours hours and";
+	if ($mins == 1)
+		$str .= " 1 minute";
+	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_aps.php

@@ -1,34 +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
- *
- */
-
-// Required code
-
-define('AREA', 'admin');
-require ("./lib/init.php");
-$Id = 0;
-
-if(isset($_GET['id']))$Id = (int)$_GET['id'];
-
-if(isset($_POST['id']))$Id = (int)$_POST['id'];
-eval("echo \"" . getTemplate("aps/header") . "\";");
-$Aps = new ApsParser($userinfo, $settings, $db);
-$Aps->MainHandler($action);
-eval("echo \"" . getTemplate("aps/footer") . "\";");
-
-?>

admin_autoupdate.php

@@ -0,0 +1,235 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Frontend
+ *
+ * @since      0.9.35
+ *
+ */
+define('AREA', 'admin');
+require './lib/init.php';
+
+use Froxlor\Http\HttpClient;
+
+// define update-uri
+define('UPDATE_URI', "https://version.froxlor.org/Froxlor/api/" . $version);
+define('RELEASE_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip");
+define('CHECKSUM_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip.sha256");
+
+// check for archive-stuff
+if (! extension_loaded('zip')) {
+	\Froxlor\UI\Response::redirectTo($filename, array(
+		's' => $s,
+		'page' => 'error',
+		'errno' => 2
+	));
+}
+
+// 0.10.x requires 7.0 at least
+if (version_compare("7.0.0", PHP_VERSION, ">=")) {
+	\Froxlor\UI\Response::redirectTo($filename, array(
+		's' => $s,
+		'page' => 'error',
+		'errno' => 10
+	));
+}
+
+// display initial version check
+if ($page == 'overview') {
+
+	// log our actions
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "checking auto-update");
+
+	// check for new version
+	try {
+		$latestversion = HttpClient::urlGet(UPDATE_URI, true, 3);
+	} catch (\Exception $e) {
+		\Froxlor\UI\Response::dynamic_error("Version-check currently unavailable, please try again later");
+	}
+	$latestversion = explode('|', $latestversion);
+
+	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
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s,
+				'page' => 'error',
+				'errno' => 3
+			));
+		} elseif (\Froxlor\Froxlor::versionCompare2($version, $_version) == - 1) {
+			// there is a newer version - yay
+			$isnewerversion = 1;
+		} else {
+			// nothing new
+			$isnewerversion = 0;
+		}
+
+		// anzeige über version-status mit ggfls. formular
+		// zum update schritt #1 -> download
+		if ($isnewerversion == 1) {
+			$text = '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 \"" . \Froxlor\UI\Template::getTemplate("misc/question_yesno", true) . "\";");
+			exit();
+		} elseif ($isnewerversion == 0) {
+			// all good
+			\Froxlor\UI\Response::standard_success('noupdatesavail');
+		} else {
+			\Froxlor\UI\Response::standard_error('customized_version');
+		}
+	}
+} // download the new archive
+elseif ($page == 'getdownload') {
+
+	// retrieve the new version from the form
+	$newversion = isset($_POST['newversion']) ? $_POST['newversion'] : null;
+
+	// valid?
+	if ($newversion !== null) {
+
+		// define files to get
+		$toLoad = str_replace('{version}', $newversion, RELEASE_URI);
+		$toCheck = str_replace('{version}', $newversion, CHECKSUM_URI);
+
+		// check for local destination folder
+		if (! is_dir(\Froxlor\Froxlor::getInstallDir() . '/updates/')) {
+			mkdir(\Froxlor\Froxlor::getInstallDir() . '/updates/');
+		}
+
+		// name archive
+		$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . basename($toLoad);
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Downloading " . $toLoad . " to " . $localArchive);
+
+		// remove old archive
+		if (file_exists($localArchive)) {
+			@unlink($localArchive);
+		}
+
+		// get archive data
+		try {
+			HttpClient::fileGet($toLoad, $localArchive);
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s,
+				'page' => 'error',
+				'errno' => 4
+			));
+		}
+
+		// validate the integrity of the downloaded file
+		$_shouldsum = HttpClient::urlGet($toCheck);
+		if (! empty($_shouldsum)) {
+			$_t = explode(" ", $_shouldsum);
+			$shouldsum = $_t[0];
+		} else {
+			$shouldsum = null;
+		}
+		$filesum = hash_file('sha256', $localArchive);
+
+		if ($filesum != $shouldsum) {
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s,
+				'page' => 'error',
+				'errno' => 9
+			));
+		}
+
+		// to the next step
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s,
+			'page' => 'extract',
+			'archive' => basename($localArchive)
+		));
+	}
+	\Froxlor\UI\Response::redirectTo($filename, array(
+		's' => $s,
+		'page' => 'error',
+		'errno' => 6
+	));
+} // extract and install new version
+elseif ($page == 'extract') {
+
+	$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
+	$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . $toExtract;
+
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		// decompress from zip
+		$zip = new ZipArchive();
+		$res = $zip->open($localArchive);
+		if ($res === true) {
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Extracting " . $localArchive . " to " . \Froxlor\Froxlor::getInstallDir());
+			$zip->extractTo(\Froxlor\Froxlor::getInstallDir());
+			$zip->close();
+			// success - remove unused archive
+			@unlink($localArchive);
+			// wait a bit before we redirect to be sure
+			sleep(2);
+		} else {
+			// error
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s,
+				'page' => 'error',
+				'errno' => 8
+			));
+		}
+
+		// redirect to update-page?
+		\Froxlor\UI\Response::redirectTo('admin_updates.php', array(
+			's' => $s
+		));
+	}
+
+	if (! file_exists($localArchive)) {
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s,
+			'page' => 'error',
+			'errno' => 7
+		));
+	}
+
+	$text = 'Extract downloaded archive "' . $toExtract . '"?';
+	$hiddenparams = '';
+	$yesfile = $filename . '?s=' . $s . '&amp;page=extract&amp;archive=' . $toExtract;
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("misc/question_yesno", true) . "\";");
+} // display error
+elseif ($page == 'error') {
+
+	// retrieve error-number via url-parameter
+	$errno = isset($_GET['errno']) ? (int) $_GET['errno'] : 0;
+
+	// 2 = no Zlib
+	// 3 = custom version detected
+	// 4 = could not store archive to local hdd
+	// 5 = some weird value came from version.froxlor.org
+	// 6 = download without valid version
+	// 7 = local archive does not exist
+	// 8 = could not extract archive
+	// 9 = checksum mismatch
+	// 10 = <php-7.0
+	\Froxlor\UI\Response::standard_error('autoupdate_' . $errno);
+}

admin_configfiles.php

@@ -2,7 +2,6 @@
 
 /**
  * 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
@@ -10,176 +9,258 @@
  * 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
  *
+ * @since 0.9.34
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+use Froxlor\Settings;
 
-$need_db_sql_data = true;
-require ("./lib/init.php");
-require ("./lib/configfiles_index.inc.php");
-$distribution = '';
-$distributions_select = '';
-$service = '';
-$services_select = '';
-$daemon = '';
-$daemons_select = '';
+if ($userinfo['change_serversettings'] == '1') {
 
-if($userinfo['change_serversettings'] == '1')
-{
-	if(isset($_GET['distribution'])
-	   && $_GET['distribution'] != ''
-	   && isset($configfiles[$_GET['distribution']])
-	   && is_array($configfiles[$_GET['distribution']]))
-	{
-		$distribution = $_GET['distribution'];
+	if ($action == 'setconfigured') {
+		Settings::Set('panel.is_configured', '1', true);
+		\Froxlor\UI\Response::redirectTo('admin_configfiles.php', array(
+			's' => $s
+		));
+	}
 
-		if(isset($_GET['service'])
-		   && $_GET['service'] != ''
-		   && isset($configfiles[$distribution]['services'][$_GET['service']])
-		   && is_array($configfiles[$distribution]['services'][$_GET['service']]))
-		{
-			$service = $_GET['service'];
+	$customer_tmpdir = '/tmp/';
+	if (Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_tmpdir') != '') {
+		$customer_tmpdir = Settings::Get('system.mod_fcgid_tmpdir');
+	} elseif (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.tmpdir') != '') {
+		$customer_tmpdir = Settings::Get('phpfpm.tmpdir');
+	}
 
-			if(isset($_GET['daemon'])
-			   && $_GET['daemon'] != ''
-			   && isset($configfiles[$distribution]['services'][$service]['daemons'][$_GET['daemon']])
-			   && is_array($configfiles[$distribution]['services'][$service]['daemons'][$_GET['daemon']]))
-			{
-				$daemon = $_GET['daemon'];
+	// try to convert namserver hosts to ip's
+	$ns_ips = "";
+	if (Settings::Get('system.nameservers') != '') {
+		$nameservers = explode(',', Settings::Get('system.nameservers'));
+		foreach ($nameservers as $nameserver) {
+			$nameserver = trim($nameserver);
+			$nameserver_ips = \Froxlor\PhpHelper::gethostbynamel6($nameserver);
+			if (is_array($nameserver_ips) && count($nameserver_ips) > 0) {
+				$ns_ips .= implode(",", $nameserver_ips);
 			}
-			else
-			{
-				foreach($configfiles[$distribution]['services'][$service]['daemons'] as $daemon_name => $daemon_details)
-				{
-					$daemons_select.= makeoption($daemon_details['label'], $daemon_name);
+		}
+	}
+
+	$replace_arr = Array(
+		'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
+		'<SQL_UNPRIVILEGED_PASSWORD>' => 'FROXLOR_MYSQL_PASSWORD',
+		'<SQL_DB>' => $sql['db'],
+		'<SQL_HOST>' => $sql['host'],
+		'<SQL_SOCKET>' => isset($sql['socket']) ? $sql['socket'] : null,
+		'<SERVERNAME>' => Settings::Get('system.hostname'),
+		'<SERVERIP>' => Settings::Get('system.ipaddress'),
+		'<NAMESERVERS>' => Settings::Get('system.nameservers'),
+		'<NAMESERVERS_IP>' => $ns_ips,
+		'<AXFRSERVERS>' => Settings::Get('system.axfrservers'),
+		'<VIRTUAL_MAILBOX_BASE>' => Settings::Get('system.vmail_homedir'),
+		'<VIRTUAL_UID_MAPS>' => Settings::Get('system.vmail_uid'),
+		'<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'),
+		'<SSLPROTOCOLS>' => (Settings::Get('system.use_ssl') == '1') ? 'imaps pop3s' : '',
+		'<CUSTOMER_TMP>' => \Froxlor\FileDir::makeCorrectDir($customer_tmpdir),
+		'<BASE_PATH>' => \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir()),
+		'<BIND_CONFIG_PATH>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.bindconf_directory')),
+		'<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
+		'<CUSTOMER_LOGS>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')),
+		'<FPM_IPCDIR>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
+		'<WEBSERVER_GROUP>' => Settings::Get('system.httpgroup')
+	);
+
+	// get distro from URL param
+	$distribution = (isset($_GET['distribution']) && $_GET['distribution'] != 'choose') ? $_GET['distribution'] : "";
+	$service = (isset($_GET['service']) && $_GET['service'] != 'choose') ? $_GET['service'] : "";
+	$daemon = (isset($_GET['daemon']) && $_GET['daemon'] != 'choose') ? $_GET['daemon'] : "";
+	$distributions_select = "";
+	$services_select = "";
+	$daemons_select = "";
+
+	$configfiles = "";
+	$services = "";
+	$daemons = "";
+
+	$config_dir = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/');
+
+	if ($distribution != "") {
+
+		if (! file_exists($config_dir . '/' . $distribution . ".xml")) {
+			trigger_error("Unknown distribution, are you playing around with the URL?");
+			exit();
+		}
+
+		// create configparser object
+		$configfiles = new \Froxlor\Config\ConfigParser($config_dir . '/' . $distribution . ".xml");
+
+		// get distro-info
+		$dist_display = getCompleteDistroName($configfiles);
+
+		// get all the services from the distro
+		$services = $configfiles->getServices();
+
+		if ($service != "") {
+
+			if (! isset($services[$service])) {
+				trigger_error("Unknown service, are you playing around with the URL?");
+				exit();
+			}
+
+			$daemons = $services[$service]->getDaemons();
+
+			if ($daemon == "") {
+				foreach ($daemons as $di => $dd) {
+					$title = $dd->title;
+					if ($dd->default) {
+						$title = $title . " (" . strtolower($lng['panel']['default']) . ")";
+					}
+					$daemons_select .= \Froxlor\UI\HTML::makeoption($title, $di);
 				}
 			}
-		}
-		else
-		{
-			foreach($configfiles[$distribution]['services'] as $service_name => $service_details)
-			{
-				$services_select.= makeoption($service_details['label'], $service_name);
+		} else {
+			foreach ($services as $si => $sd) {
+				$services_select .= \Froxlor\UI\HTML::makeoption($sd->title, $si);
 			}
 		}
-	}
-	else
-	{
-		foreach($configfiles as $distribution_name => $distribution_details)
-		{
-			$distributions_select.= makeoption($distribution_details['label'], $distribution_name);
+	} else {
+
+		// show list of available distro's
+		$distros = glob($config_dir . '*.xml');
+		// tmp array
+		$distributions_select_data = array();
+		// read in all the distros
+		foreach ($distros as $_distribution) {
+			// get configparser object
+			$dist = new \Froxlor\Config\ConfigParser($_distribution);
+			// get distro-info
+			$dist_display = getCompleteDistroName($dist);
+			// store in tmp array
+			$distributions_select_data[$dist_display] = str_replace(".xml", "", strtolower(basename($_distribution)));
+		}
+
+		// sort by distribution name
+		ksort($distributions_select_data);
+
+		foreach ($distributions_select_data as $dist_display => $dist_index) {
+			// create select-box-option
+			$distributions_select .= \Froxlor\UI\HTML::makeoption($dist_display, $dist_index);
 		}
 	}
 
-	if($distribution != ''
-	   && $service != ''
-	   && $daemon != '')
-	{
-		$replace_arr = Array(
-			'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
-			'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
-			'<SQL_DB>' => $sql['db'],
-			'<SQL_HOST>' => $sql['host'],
-			'<SERVERNAME>' => $settings['system']['hostname'],
-			'<SERVERIP>' => $settings['system']['ipaddress'],
-			'<NAMESERVERS>' => $settings['system']['nameservers'],
-			'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
-			'<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'],
-			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
-			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
-			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/',
-			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__)),
-			'<BIND_CONFIG_PATH>' => makeCorrectDir($settings['system']['bindconf_directory']),
-			'<WEBSERVER_RELOAD_CMD>' => $settings['system']['apachereload_command'],
-			'<CUSTOMER_LOGS>' => makeCorrectDir($settings['system']['logfiles_directory'])
-		);
-		$files = '';
+	if ($distribution != "" && $service != "" && $daemon != "") {
+
+		if (! isset($daemons[$daemon])) {
+			trigger_error("Unknown daemon, are you playing around with the URL?");
+			exit();
+		}
+
+		$confarr = $daemons[$daemon]->getConfig();
+
 		$configpage = '';
-		foreach($configfiles[$distribution]['services'][$service]['daemons'][$daemon] as $action => $value)
-		{
-			if(substr($action, 0, 8) == 'commands')
-			{
+
+		$distro_editor = $configfiles->distributionEditor;
+
+		$commands_pre = "";
+		$commands_file = "";
+		$commands_post = "";
+
+		$lasttype = '';
+		$commands = '';
+		foreach ($confarr as $_action) {
+			if ($lasttype != '' && $lasttype != $_action['type']) {
+				$commands = trim($commands);
+				$numbrows = count(explode("\n", $commands));
+				eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
+				$lasttype = '';
 				$commands = '';
-
-				if(is_array($value))
-				{
-					$commands = implode("\n", $value);
-					$commands = str_replace("\n\n", "\n", $commands);
-
-					if($commands != '')
-					{
-						eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_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);
+							}
+						}
 					}
-				}
-			}
-			elseif(substr($action, 0, 5) == 'files')
-			{
-				$files = '';
-
-				if(is_array($value))
-				{
-					while(list($filename, $realname) = each($value))
-					{
-						$file_content = file_get_contents('./templates/misc/configfiles/' . $distribution . '/' . $daemon . '/' . $filename);
-						$file_content = strtr($file_content, $replace_arr);
-						$file_content = htmlspecialchars($file_content);
-						$numbrows = count(explode("\n", $file_content));
-						eval("\$files.=\"" . getTemplate("configfiles/configfiles_file") . "\";");
+					$realname = $_action['name'];
+					$commands = trim($commands_pre);
+					if ($commands != "") {
+						$numbrows = count(explode("\n", $commands));
+						eval("\$commands_pre=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
 					}
-
-					eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_files") . "\";");
-				}
+					$commands = trim($commands_post);
+					if ($commands != "") {
+						$numbrows = count(explode("\n", $commands));
+						eval("\$commands_post=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
+					}
+					eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_subfileblock") . "\";");
+					$commands = '';
+					$commands_pre = '';
+					$commands_post = '';
+					break;
 			}
 		}
-
-		if(isset($configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart'])
-		   && is_array($configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart']))
-		{
-			$restart = implode("\n", $configfiles[$distribution]['services'][$service]['daemons'][$daemon]['restart']);
+		$commands = trim($commands);
+		if ($commands != '') {
+			$numbrows = count(explode("\n", $commands));
+			eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
 		}
-		else
-		{
-			$restart = '';
-		}
-
-		eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
-	}
-	elseif($page == 'overview')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_configfiles");
-		$distributions = '';
-		foreach($configfiles as $distribution_name => $distribution_details)
-		{
-			$services = '';
-			foreach($distribution_details['services'] as $service_name => $service_details)
-			{
-				$daemons = '';
-				foreach($service_details['daemons'] as $daemon_name => $daemon_details)
-				{
-					eval("\$daemons.=\"" . getTemplate("configfiles/choose_daemon") . "\";");
-				}
-
-				eval("\$services.=\"" . getTemplate("configfiles/choose_service") . "\";");
-			}
-
-			eval("\$distributions.=\"" . getTemplate("configfiles/choose_distribution") . "\";");
-		}
-
-		eval("echo \"" . getTemplate("configfiles/choose") . "\";");
-	}
-	else
-	{
-		eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles") . "\";");
+	} else {
+		$basedir = \Froxlor\Froxlor::getInstallDir();
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("configfiles/wizard") . "\";");
 	}
+} else {
+	\Froxlor\UI\Response::redirectTo('admin_index.php', array(
+		's' => $s
+	));
 }
 
-?>
+// helper functions
+function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor)
+{
+	$files = "";
+	$file_content = trim($file_content);
+	if ($file_content != '') {
+		$file_content = strtr($file_content, $replace_arr);
+		$file_content = htmlspecialchars($file_content);
+		$numbrows = count(explode("\n", $file_content));
+		eval("\$files=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_file") . "\";");
+	}
+	return $files;
+}
+
+function getCompleteDistroName($cparser)
+{
+	// get distro-info
+	$dist_display = $cparser->distributionName;
+	if ($cparser->distributionCodename != '') {
+		$dist_display .= " " . $cparser->distributionCodename;
+	}
+	if ($cparser->distributionVersion != '') {
+		$dist_display .= " (" . $cparser->distributionVersion . ")";
+	}
+	if ($cparser->deprecated) {
+		$dist_display .= " [deprecated]";
+	}
+	return $dist_display;
+}

admin_cronjobs.php

@@ -14,96 +14,102 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
-require_once('./lib/init.php');
+require './lib/init.php';
+
+use Froxlor\Api\Commands\Cronjobs;
 
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
 if ($page == 'cronjobs' || $page == 'overview') {
 	if ($action == '') {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
 
 		$fields = array(
+			'c.module' => 'Module',
 			'c.lastrun' => $lng['cron']['lastrun'],
 			'c.interval' => $lng['cron']['interval'],
 			'c.isactive' => $lng['cron']['isactive']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_CRONRUNS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		try {
+			// get total count
+			$json_result = Cronjobs::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = Cronjobs::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
-		/*
-		 * @TODO Fix sorting
-		 */
 		$crons = '';
-		$result = $db->query("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `cronfile` ASC");
-		$paging->setEntries($db->num_rows($result));
 		$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 = $db->fetch_array($result)) {
-			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++;
+		foreach ($result['list'] as $row) {
+			if ($cmod != $row['module']) {
+				$_mod = explode("/", $row['module']);
+				$module = ucfirst($_mod[1]);
+				eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
+				$cmod = $row['module'];
 			}
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			$row['lastrun'] = date('d.m.Y H:i', $row['lastrun']);
+			$row['isactive'] = ((int) $row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no'];
+			$description = $lng['crondesc'][$row['desc_lng_key']];
 
-			$i++;
+			eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjob') . "\";");
+			$count ++;
 		}
 
-		eval("echo \"" . getTemplate('cronjobs/cronjobs') . "\";");
-
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs') . "\";");
 	} elseif ($action == 'new') {
 		/*
 		 * @TODO later
 		 */
 	} elseif ($action == 'edit' && $id != 0) {
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`='" . (int)$id . "'");
+		try {
+			$json_result = Cronjobs::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($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;
-				$interval_value = validate($_POST['interval_value'], 'interval_value', '/^([0-9]+)$/Di', 'stringisempty');
-				$interval_interval = validate($_POST['interval_interval'], 'interval_interval');
-
-				if ($isactive != 1) {
-					$isactive = 0;
+				try {
+					Cronjobs::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-
-				$interval = $interval_value . ' ' . strtoupper($interval_interval);
-
-				$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` 
-							SET `isactive` = '".(int)$isactive."',
-							`interval` = '".$interval."'
-							WHERE `id` = '" . (int)$id . "'");
-
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
-				//$isactive = makeyesno('isactive', '1', '0', $result['isactive']);
+
 				// interval
 				$interval_nfo = explode(' ', $result['interval']);
 				$interval_value = $interval_nfo[0];
 
 				$interval_interval = '';
-				$interval_interval .= makeoption($lng['cronmgmt']['seconds'], 'SECOND', $interval_nfo[1]);
-				$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]);
+				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
+				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
+				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
+				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
+				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
 				// end of interval
 
 				$change_cronfile = false;
@@ -111,17 +117,16 @@ if ($page == 'cronjobs' || $page == 'overview') {
 					$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);
+				$cronjobs_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php';
+				$cronjobs_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($cronjobs_edit_data);
 
 				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
 				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
 
-				eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjob_edit') . "\";");
 			}
 		}
-	}
-	elseif ($action == 'delete' && $id != 0) {
+	} elseif ($action == 'delete' && $id != 0) {
 		/*
 		 * @TODO later
 		 */

admin_index.php

@@ -16,188 +16,157 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+use Froxlor\Api\Commands\Froxlor as Froxlor;
+use Froxlor\Api\Commands\Admins as Admins;
 
-require ("./lib/init.php");
+if ($action == 'logout') {
 
-if($action == 'logout')
-{
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "logged out");
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "logged out");
 
-	if($settings['session']['allow_multiple_login'] == '1')
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1' AND `hash` = '" . $s . "'");
-	}
-	else
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
+	$params = array(
+		'adminid' => (int) $userinfo['adminid']
+	);
+
+	if (Settings::Get('session.allow_multiple_login') == '1') {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :adminid
+			AND `adminsession` = '1'
+			AND `hash` = :hash");
+		$params['hash'] = $s;
+	} else {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :adminid
+			AND `adminsession` = '1'");
 	}
+	Database::pexecute($stmt, $params);
 
-	redirectTo('index.php');
-	exit;
+	\Froxlor\UI\Response::redirectTo('index.php');
 }
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_index");
-	$overview = $db->query_first("SELECT COUNT(*) AS `number_customers`,
+if ($page == 'overview') {
+
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_index");
+	$params = [];
+	if ($userinfo['customers_see_all'] == '0') {
+		$params = [
+			'adminid' => $userinfo['adminid']
+		];
+	}
+	$overview_stmt = Database::prepare("SELECT COUNT(*) AS `number_customers`,
 				SUM(`diskspace_used`) AS `diskspace_used`,
 				SUM(`mysqls_used`) AS `mysqls_used`,
 				SUM(`emails_used`) AS `emails_used`,
 				SUM(`email_accounts_used`) AS `email_accounts_used`,
 				SUM(`email_forwarders_used`) AS `email_forwarders_used`,
 				SUM(`email_quota_used`) AS `email_quota_used`,
-				SUM(`email_autoresponder_used`) AS `email_autoresponder_used`,
 				SUM(`ftps_used`) AS `ftps_used`,
-				SUM(`tickets_used`) AS `tickets_used`,
 				SUM(`subdomains_used`) AS `subdomains_used`,
-				SUM(`traffic_used`) AS `traffic_used`,
-				SUM(`aps_packages_used`) AS `aps_packages_used`
-				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' "));
-	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$overview['diskspace_used'] = round($overview['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
-	$number_domains = $db->query_first("SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' "));
+				SUM(`traffic_used`) AS `traffic_used`
+				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid "));
+	$overview = Database::pexecute_first($overview_stmt, $params);
+
+	$dec_places = Settings::Get('panel.decimal_places');
+	$overview['traffic_bytes_used'] = $overview['traffic_used'] * 1024;
+	$overview['traffic_used'] = \Froxlor\PhpHelper::sizeReadable($overview['traffic_used'] * 1024, null, 'bi');
+	$overview['diskspace_bytes_used'] = $overview['diskspace_used'] * 1024;
+	$overview['diskspace_used'] = \Froxlor\PhpHelper::sizeReadable($overview['diskspace_used'] * 1024, null, 'bi');
+
+	$number_domains_stmt = Database::prepare("
+		SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "`
+		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid"));
+	$number_domains = Database::pexecute_first($number_domains_stmt, $params);
+
 	$overview['number_domains'] = $number_domains['number_domains'];
+
 	$phpversion = phpversion();
-	$phpmemorylimit = @ini_get("memory_limit");
-
-	if($phpmemorylimit == "")
-	{
-		$phpmemorylimit = $lng['admin']['memorylimitdisabled'];
-	}
-
-	$mysqlserverversion = mysql_get_server_info();
-	$mysqlclientversion = mysql_get_client_info();
+	$mysqlserverversion = Database::getAttribute(PDO::ATTR_SERVER_VERSION);
 	$webserverinterface = strtoupper(@php_sapi_name());
 
-	if((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
-	|| (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;
-
-					if (version_compare2($version, $_version) == -1) {
-						$isnewerversion = 1;
-					} else {
-						$isnewerversion = 0;
-					}
-				}
-				else
-				{
-					redirectTo($update_check_uri.'/pretty', NULL);
-				}
-			}
-			else
-			{
-				redirectTo($update_check_uri.'/pretty', NULL);
-			}
+	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes') || (isset($lookfornewversion) && $lookfornewversion == 'yes')) {
+		try {
+			$json_result = Froxlor::getLocal($userinfo)->checkUpdate();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
 		}
-		else
-		{
-			redirectTo($update_check_uri.'/pretty', NULL);
-		}
-	}
-	else
-	{
+		$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 {
 		$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
 		$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
+		$lookfornewversion_message = '';
 		$lookfornewversion_addinfo = '';
 		$isnewerversion = 0;
 	}
 
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages');
+	$dec_places = Settings::Get('panel.decimal_places');
+	// get everything in bytes for the percentage calculation on the dashboard
+	$userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1;
+	$userinfo['diskspace_bytes_used'] = $userinfo['diskspace_used'] * 1024;
+	$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : - 1;
+	$userinfo['traffic_bytes_used'] = $userinfo['traffic_used'] * 1024;
 
-	$cron_last_runs = getCronjobsLastRun();
-	$outstanding_tasks = getOutstandingTasks();
+	$userinfo['diskspace'] = ($userinfo['diskspace'] > -1) ? \Froxlor\PhpHelper::sizeReadable($userinfo['diskspace'] * 1024, null, 'bi') : - 1;
+	$userinfo['diskspace_used'] = \Froxlor\PhpHelper::sizeReadable($userinfo['diskspace_used'] * 1024, null, 'bi');
+	$userinfo['traffic'] = ($userinfo['traffic'] > -1) ? \Froxlor\PhpHelper::sizeReadable($userinfo['traffic'] * 1024, null, 'bi') : - 1;
+	$userinfo['traffic_used'] = \Froxlor\PhpHelper::sizeReadable($userinfo['traffic_used'] * 1024, null, 'bi');
+	$userinfo = \Froxlor\PhpHelper::strReplaceArray('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace diskspace_bytes traffic traffic_bytes mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
 
-	$opentickets = 0;
-	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                   WHERE `answerto` = "0" AND (`status` = "0" OR `status` = "1")
-                                   AND `lastreplier`="0" AND `adminid` = "' . $userinfo['adminid'] . '"');
-	$awaitingtickets = $opentickets['count'];
-	$awaitingtickets_text = '';
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
 
-	if($opentickets > 0)
-	{
-		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="admin_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
+	$cron_last_runs = \Froxlor\System\Cronjob::getCronjobsLastRun();
+	$outstanding_tasks = \Froxlor\System\Cronjob::getOutstandingTasks();
+
+	$system_hostname = gethostname();
+	$meminfo = explode("\n", @file_get_contents("/proc/meminfo"));
+	$memory = "";
+	for ($i = 0; $i < sizeof($meminfo); ++ $i) {
+		if (substr($meminfo[$i], 0, 3) === "Mem") {
+			$memory .= $meminfo[$i] . PHP_EOL;
+		}
 	}
 
-	if(function_exists('sys_getloadavg'))
-	{
+	if (function_exists('sys_getloadavg')) {
 		$loadArray = sys_getloadavg();
 		$load = number_format($loadArray[0], 2, '.', '') . " / " . number_format($loadArray[1], 2, '.', '') . " / " . number_format($loadArray[2], 2, '.', '');
-	}
-	else
-	{
+	} else {
 		$load = @file_get_contents('/proc/loadavg');
 
-		if(!$load)
-		{
+		if (! $load) {
 			$load = $lng['admin']['noloadavailable'];
 		}
 	}
 
-	if(function_exists('posix_uname'))
-	{
+	if (function_exists('posix_uname')) {
 		$showkernel = 1;
 		$kernel_nfo = posix_uname();
 		$kernel = $kernel_nfo['release'] . ' (' . $kernel_nfo['machine'] . ')';
-	}
-	else
-	{
+	} 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"));
 
-	if(is_array($uptime_array)
-	&& isset($uptime_array[0])
-	&& is_numeric($uptime_array[0]))
-	{
+	if (is_array($uptime_array) && isset($uptime_array[0]) && is_numeric($uptime_array[0])) {
 		// Some calculatioon to get a nicly formatted display
-
 		$seconds = round($uptime_array[0], 0);
 		$minutes = $seconds / 60;
 		$hours = $minutes / 60;
@@ -208,123 +177,230 @@ if($page == 'overview')
 		$uptime = "{$days}d, {$hours}h, {$minutes}m, {$seconds}s";
 
 		// Just cleanup
-
 		unset($uptime_array, $seconds, $minutes, $hours, $days);
-	}
-	else
-	{
+	} else {
 		// Nothing of the above worked, show an error :/
-
 		$uptime = '';
 	}
 
-	eval("echo \"" . getTemplate("index/index") . "\";");
-}
-elseif($page == 'change_password')
-{
-	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
-	{
-		$old_password = validate($_POST['old_password'], 'old password');
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/index") . "\";");
+} elseif ($page == 'change_password') {
 
-		if(md5($old_password) != $userinfo['password'])
-		{
-			standard_error('oldpasswordnotcorrect');
-			exit;
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
+
+		if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) {
+			\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
 		}
 
-		$new_password = validate($_POST['new_password'], 'new password');
-		$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
+		try {
+			$new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], 'new password');
+			$new_password_confirm = \Froxlor\System\Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
 
-		if($old_password == '')
-		{
-			standard_error(array('stringisempty', 'oldpassword'));
-		}
-		elseif($new_password == '')
-		{
-			standard_error(array('stringisempty', 'newpassword'));
-		}
-		elseif($new_password_confirm == '')
-		{
-			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		}
-		elseif($new_password != $new_password_confirm)
-		{
-			standard_error('newpasswordconfirmerror');
-		}
-		else
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($new_password) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `password`='" . md5($old_password) . "'");
-			$log->logAction(ADM_ACTION, LOG_NOTICE, 'changed password');
-			redirectTo($filename, Array('s' => $s));
+		if ($old_password == '') {
+			\Froxlor\UI\Response::standard_error(array(
+				'stringisempty',
+				'oldpassword'
+			));
+		} elseif ($new_password == '') {
+			\Froxlor\UI\Response::standard_error(array(
+				'stringisempty',
+				'newpassword'
+			));
+		} elseif ($new_password_confirm == '') {
+			\Froxlor\UI\Response::standard_error(array(
+				'stringisempty',
+				'newpasswordconfirm'
+			));
+		} elseif ($new_password != $new_password_confirm) {
+			\Froxlor\UI\Response::standard_error('newpasswordconfirmerror');
+		} else {
+			try {
+				Admins::getLocal($userinfo, array(
+					'id' => $userinfo['adminid'],
+					'admin_password' => $new_password
+				))->update();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'changed password');
+			\Froxlor\UI\Response::redirectTo($filename, Array(
+				's' => $s
+			));
 		}
+	} else {
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_password") . "\";");
 	}
-	else
-	{
-		eval("echo \"" . getTemplate("index/change_password") . "\";");
-	}
-}
-elseif($page == 'change_language')
-{
-	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
-	{
-		$def_language = validate($_POST['def_language'], 'default language');
+} elseif ($page == 'change_language') {
 
-		if(isset($languages[$def_language]))
-		{
-			$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
-			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$def_language = \Froxlor\Validate\Validate::validate($_POST['def_language'], 'default language');
+
+		if (isset($languages[$def_language])) {
+			try {
+				Admins::getLocal($userinfo, array(
+					'id' => $userinfo['adminid'],
+					'def_language' => $def_language
+				))->update();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+
+			// also update current session
+			$lng_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_SESSIONS . "`
+				SET `language`= :lng
+				WHERE `hash`= :hash");
+			Database::pexecute($lng_stmt, array(
+				'lng' => $def_language,
+				'hash' => $s
+			));
 		}
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	} else {
 
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
 		$language_options = '';
 
-		$default_lang = $settings['panel']['standardlanguage'];
-		if($userinfo['def_language'] != '') {
+		$default_lang = Settings::Get('panel.standardlanguage');
+		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
-		while(list($language_file, $language_name) = each($languages))
-		{
-			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
+		foreach ($languages as $language_file => $language_name) {
+			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $default_lang, true);
 		}
 
-		eval("echo \"" . getTemplate("index/change_language") . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_language") . "\";");
 	}
-}
-elseif($page == 'change_theme')
-{
-	if(isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-		$theme = validate($_POST['theme'], 'theme');
+} elseif ($page == 'change_theme') {
 
-		$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
-		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$theme = \Froxlor\Validate\Validate::validate($_POST['theme'], 'theme');
+		try {
+			Admins::getLocal($userinfo, array(
+				'id' => $userinfo['adminid'],
+				'theme' => $theme
+			))->update();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+
+		// also update current session
+		$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(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	} else {
 
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
 		$theme_options = '';
 
-		$default_theme = $settings['panel']['default_theme'];
-		if($userinfo['theme'] != '') {
+		$default_theme = Settings::Get('panel.default_theme');
+		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
-		$themes_avail = getThemes();
-		foreach($themes_avail as $t)
-		{
-			$theme_options.= makeoption($t, $t, $default_theme, true);
+		$themes_avail = \Froxlor\UI\Template::getThemes();
+		foreach ($themes_avail as $t => $d) {
+			$theme_options .= \Froxlor\UI\HTML::makeoption($d, $t, $default_theme, true);
 		}
 
-		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::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 = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . "/logs/");
+		$err_file = \Froxlor\FileDir::makeCorrectFile($err_dir . "/" . $errid . "_sql-error.log");
+
+		if (file_exists($err_file)) {
+
+			$error_content = file_get_contents($err_file);
+			$error = explode("|", $error_content);
+
+			$_error = array(
+				'code' => str_replace("\n", "", substr($error[1], 5)),
+				'message' => str_replace("\n", "", substr($error[2], 4)),
+				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(\Froxlor\Froxlor::getInstallDir()))),
+				'line' => str_replace("\n", "", substr($error[4], 5)),
+				'trace' => str_replace(\Froxlor\Froxlor::getInstallDir(), "", substr($error[5], 6))
+			);
+
+			// build mail-content
+			$mail_body = "Dear froxlor-team,\n\n";
+			$mail_body .= "the following error has been reported by a user:\n\n";
+			$mail_body .= "-------------------------------------------------------------\n";
+			$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
+			$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
+			$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
+			$mail_body .= "-------------------------------------------------------------\n\n";
+			$mail_body .= "Froxlor-version: " . $version . "\n";
+			$mail_body .= "DB-version: " . $dbversion . "\n\n";
+			$mail_body .= "End of report";
+			$mail_html = nl2br($mail_body);
+
+			// send actual report to dev-team
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				// send mail and say thanks
+				$_mailerror = false;
+				try {
+					$mail->Subject = '[Froxlor] Error report by user';
+					$mail->AltBody = $mail_body;
+					$mail->MsgHTML($mail_html);
+					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
+					$mail->Send();
+				} catch (\PHPMailer\PHPMailer\Exception $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
+				}
+
+				if ($_mailerror) {
+					// error when reporting an error...LOLFUQ
+					\Froxlor\UI\Response::standard_error('send_report_error', $mailerr_msg);
+				}
+
+				// finally remove error from fs
+				@unlink($err_file);
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					's' => $s
+				));
+			}
+			// show a nice summary of the error-report
+			// before actually sending anything
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/send_error_report") . "\";");
+		} else {
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s
+			));
+		}
+	} else {
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	}
+} elseif ($page == 'apikeys' && Settings::Get('api.enabled') == 1) {
+	require_once __DIR__ . '/api_keys.php';
+} elseif ($page == '2fa' && Settings::Get('2fa.enabled') == 1) {
+	require_once __DIR__ . '/2fa.php';
 }

admin_ipsandports.php

@@ -16,428 +16,158 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+use Froxlor\Settings;
+use Froxlor\Api\Commands\IpsAndPorts;
 
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'ipsandports'
-   || $page == 'overview')
-{
-	if($action == '')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
+if ($page == 'ipsandports' || $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 ($action == '') {
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
 		$fields = array(
 			'ip' => $lng['admin']['ipsandports']['ip'],
 			'port' => $lng['admin']['ipsandports']['port']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_IPSANDPORTS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
+		try {
+			// get total count
+			$json_result = IpsAndPorts::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = IpsAndPorts::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
 		$ipsandports = '';
-		$result = $db->query("SELECT `id`, `ip`, `port`, `listen_statement`, `namevirtualhost_statement`, `vhostcontainer`, `vhostcontainer_servername_statement`, `specialsettings`, `ssl` FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
 		$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 = $db->fetch_array($result))
-		{
-			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++;
+		foreach ($result['list'] as $row) {
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				$row['ip'] = '[' . $row['ip'] . ']';
 			}
-
-			$i++;
+			eval("\$ipsandports.=\"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_ipandport") . "\";");
+			$count ++;
 		}
-
-		eval("echo \"" . getTemplate("ipsandports/ipsandports") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
-
-		if(isset($result['id'])
-		   && $result['id'] == $id)
-		{
-			$result_checkdomain = $db->query_first("SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports`='" . (int)$id . "'");
-
-			if($result_checkdomain['id'] == '')
-			{
-				if($result['id'] != $settings['system']['defaultip'])
-				{
-					$result_sameipotherport = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($result['ip']) . "' AND `id`!='" . (int)$id . "'");
-
-					if(($result['ip'] != $settings['system']['ipaddress'])
-					   || ($result['ip'] == $settings['system']['ipaddress'] && $result_sameipotherport['id'] != ''))
-					{
-						$result = $db->query_first("SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
-
-						if($result['ip'] != '')
-						{
-							if(isset($_POST['send'])
-							   && $_POST['send'] == 'send')
-							{
-								$db->query("DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
-
-								// also, remove connections to domains (multi-stack)
-								$db->query("DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports`='".(int)$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');
-			}
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports") . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = IpsAndPorts::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
 		}
-	}
-	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['system']['use_ssl'] == 1)
-			{
-				$ssl = intval($_POST['ssl']);
-				$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');
+		$result = json_decode($json_result, true)['data'];
+
+		if (isset($result['id']) && $result['id'] == $id) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+
+				try {
+					IpsAndPorts::getLocal($userinfo, array(
+						'id' => $id
+					))->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} 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 = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");
-
-			if($result_checkfordouble['id'] != '')
-			{
-				standard_error('myipnotdouble');
-			}
-			else
-			{
-				$db->query("INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET 
-						`ip` = '" . $db->escape($ip) . "', 
-						`port` = '" . (int)$port . "', 
-						`listen_statement` = '" . (int)$listen_statement . "', 
-						`namevirtualhost_statement` = '" . (int)$namevirtualhost_statement . "', 
-						`vhostcontainer` = '" . (int)$vhostcontainer . "', 
-						`vhostcontainer_servername_statement` = '" . (int)$vhostcontainer_servername_statement . "', 
-						`specialsettings` = '" . $db->escape($specialsettings) . "', 
-						`ssl` = '" . (int)$ssl . "', 
-						`ssl_cert_file` = '" . $db->escape($ssl_cert_file) . "', 
-						`ssl_key_file` = '" . $db->escape($ssl_key_file) . "', 
-						`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
-						`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "', 
-						`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
-						`docroot` = '" . $db->escape($docroot) . "';
-					");
-
-				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));
+				\Froxlor\UI\HTML::askYesNo('admin_ip_reallydelete', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['ip'] . ':' . $result['port']);
 			}
 		}
-		else
-		{
-			/*
-			$enable_ssl = makeyesno('ssl', '1', '0', '0');
-			$listen_statement = makeyesno('listen_statement', '1', '0', '1');
-			$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', '1');
-			$vhostcontainer = makeyesno('vhostcontainer', '1', '0', '1');
-			$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', '1');
-			*/
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				IpsAndPorts::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			\Froxlor\UI\Response::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);
+			$ipsandports_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
+			$ipsandports_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($ipsandports_add_data);
 
 			$title = $ipsandports_add_data['ipsandports_add']['title'];
 			$image = $ipsandports_add_data['ipsandports_add']['image'];
 
-			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
+	} elseif ($action == 'edit' && $id != 0) {
+		try {
+			$json_result = IpsAndPorts::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
-		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'));
-				$result_checkfordouble = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");
-				$result_sameipotherport = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($result['ip']) . "' AND `id`!='" . (int)$id . "'");
-				$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 ($result['ip'] != '') {
 
-				if((int)$settings['system']['use_ssl'] == 1
-					/* 
-					 * check here if ssl is even checked, cause if not, we don't need
-					 * to validate and set all the $ssl_*_file vars
-					 */
-					&& 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 (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					IpsAndPorts::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
 
-				if($listen_statement != '1')
-				{
-					$listen_statement = '0';
-				}
+				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
-				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['system']['ipaddress']
-				   && $result_sameipotherport['id'] == '')
-				{
-					standard_error('cantchangesystemip');
-				}
-				elseif($result_checkfordouble['id'] != ''
-				       && $result_checkfordouble['id'] != $id)
-				{
-					standard_error('myipnotdouble');
-				}
-				else
-				{
-
-					$db->query("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
-					SET 
-						`ip` = '" . $db->escape($ip) . "', 
-						`port` = '" . (int)$port . "', 
-						`listen_statement` = '" . (int)$listen_statement . "', 
-						`namevirtualhost_statement` = '" . (int)$namevirtualhost_statement . "', 
-						`vhostcontainer` = '" . (int)$vhostcontainer . "', 
-						`vhostcontainer_servername_statement` = '" . (int)$vhostcontainer_servername_statement . "', 
-						`specialsettings` = '" . $db->escape($specialsettings) . "', 
-						`ssl` = '" . (int)$ssl . "', 
-						`ssl_cert_file` = '" . $db->escape($ssl_cert_file) . "', 
-						`ssl_key_file` = '" . $db->escape($ssl_key_file) . "', 
-						`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
-						`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "', 
-						`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
-						`docroot` = '" . $db->escape($docroot) . "' 
-					WHERE `id`='" . (int)$id . "'
-					");
-
-					$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
-					inserttask('1');
-
-					// Using nameserver, insert a task which rebuilds the server config
-					inserttask('4');
-
-					redirectTo($filename, Array('page' => $page, 's' => $s));
-				}
-			}
-			else
-			{
-				$result = htmlentities_array($result);
-				/*
-				$enable_ssl = makeyesno('ssl', '1', '0', $result['ssl']);
-				$listen_statement = makeyesno('listen_statement', '1', '0', $result['listen_statement']);
-				$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', $result['namevirtualhost_statement']);
-				$vhostcontainer = makeyesno('vhostcontainer', '1', '0', $result['vhostcontainer']);
-				$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', $result['vhostcontainer_servername_statement']);
-				*/
-
-				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
-				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
+				$ipsandports_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
+				$ipsandports_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($ipsandports_edit_data);
 
 				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
 				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
 
-				eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_edit") . "\";");
 			}
 		}
+	} 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

@@ -16,17 +16,12 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-require('./lib/init.php');
+use Froxlor\Api\Commands\SysLog;
 
-if ($page == 'log'
-   && $userinfo['change_serversettings'] == '1'
-) {
+if ($page == 'log' && $userinfo['change_serversettings'] == '1') {
 	if ($action == '') {
 		$fields = array(
 			'date' => $lng['logger']['date'],
@@ -34,120 +29,104 @@ if ($page == 'log'
 			'user' => $lng['logger']['user'],
 			'text' => $lng['logger']['action']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_LOG, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$paging->sortfield = 'date';
-		$paging->sortorder = 'desc';
-		$result = $db->query('SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy() . ' ' . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		try {
+			// get total count
+			$json_result = SysLog::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = SysLog::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 		$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 = $db->fetch_array($result)) {
-			if (!isset($clog[$row['action']])
-			   || !is_array($clog[$row['action']])
-			) {
+		foreach ($result['list'] as $row) {
+			if (! isset($clog[$row['action']]) || ! is_array($clog[$row['action']])) {
 				$clog[$row['action']] = array();
 			}
-
 			$clog[$row['action']][$row['logid']] = $row;
 		}
 
-		if ($paging->sortfield == 'date'
-		   && $paging->sortorder == 'desc'
-		) {
+		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 ($paging->checkDisplay($i)) {
+				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+				$row['date'] = date("d.m.y H:i:s", $row['date']);
 
-					if ($_action != $action) {
-						switch ($action) {
-							case USR_ACTION:
-								$_action = $lng['admin']['customer'];
-								break;
-							case RES_ACTION:
-								$_action = 'Reseller';
-								break;
-							case ADM_ACTION:
-								$_action = 'Administrator';
-								break;
-							case CRON_ACTION:
-								$_action = 'Cronjob';
-								break;
-							case LOG_ERROR:
-								$_action = 'Internal';
-								break;
-							default:
-								$_action = 'Unknown';
-								break;
-						}
-
-						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
-					}
-
-					$log_count++;
-					$type = $row['type'];
-					$_type = 'unknown';
-
-					switch ($type) {
-						case LOG_INFO:
-							$_type = 'Information';
+				if ($_action != $action) {
+					switch ($action) {
+						case \Froxlor\FroxlorLogger::USR_ACTION:
+							$_action = $lng['admin']['customer'];
 							break;
-						case LOG_NOTICE:
-							$_type = 'Notice';
+						case \Froxlor\FroxlorLogger::RES_ACTION:
+							$_action = $lng['logger']['reseller'];
 							break;
-						case LOG_WARNING:
-							$_type = 'Warning';
+						case \Froxlor\FroxlorLogger::ADM_ACTION:
+							$_action = $lng['logger']['admin'];
 							break;
-						case LOG_ERR:
-							$_type = 'Error';
+						case \Froxlor\FroxlorLogger::CRON_ACTION:
+							$_action = $lng['logger']['cron'];
 							break;
-						case LOG_CRIT:
-							$_type = 'Critical';
+						case \Froxlor\FroxlorLogger::LOGIN_ACTION:
+							$_action = $lng['logger']['login'];
+							break;
+						case \Froxlor\FroxlorLogger::LOG_ERROR:
+							$_action = $lng['logger']['intern'];
 							break;
 						default:
-							$_type = 'Unknown';
+							$_action = $lng['logger']['unknown'];
 							break;
 					}
 
-					$row['type'] = $_type;
-					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
-					$count++;
-					$_action = $action;
+					$row['action'] = $_action;
+					eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_action') . "\";");
 				}
+
+				$log_count ++;
+				$row['type'] = \Froxlor\FroxlorLogger::getInstanceOf()->getLogLevelDesc($row['type']);
+				eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_log') . "\";");
+				$count ++;
+				$_action = $action;
 			}
-			$i++;
 		}
 
-		eval("echo \"" . getTemplate('logger/logger') . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('logger/logger') . "\";");
 	} elseif ($action == 'truncate') {
-		if (isset($_POST['send'])
-		   && $_POST['send'] == 'send'
-		) {
-			$yesterday = time() - (60 * 10);
 
-			/* (60*60*24); */
-
-			$db->query("DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < '" . $yesterday . "'");
-			$log->logAction(ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
-			redirectTo($filename, Array('page' => $page, 's' => $s));
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				SysLog::getLocal($userinfo, array(
+					'min_to_keep' => 10
+				))->delete();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
 		} else {
-			ask_yesno('logger_reallytruncate', $filename, array('page' => $page, 'action' => $action), TABLE_PANEL_LOG);
+			\Froxlor\UI\HTML::askYesNo('logger_reallytruncate', $filename, array(
+				'page' => $page,
+				'action' => $action
+			), TABLE_PANEL_LOG);
 		}
 	}
 }

admin_message.php

@@ -16,13 +16,10 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-require('./lib/init.php');
+use Froxlor\Database\Database;
 
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
@@ -32,69 +29,83 @@ if (isset($_POST['id'])) {
 
 if ($page == 'message') {
 	if ($action == '') {
-		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
 
-		if (isset($_POST['send'])
-		   && $_POST['send'] == 'send'
-		) {
-			if ($_POST['receipient'] == 0
-			   && $userinfo['customers_see_all'] == '1'
-			) {
-				$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
-				$result = $db->query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
-			} elseif ($_POST['receipient'] == 1) {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			if ($_POST['recipient'] == 0 && $userinfo['customers_see_all'] == '1') {
+				$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
+				$result = Database::query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
+			} elseif ($_POST['recipient'] == 1) {
 				if ($userinfo['customers_see_all'] == '1') {
-					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
-					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
+					$log->logAction(\Froxlor\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');
-					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "` WHERE `adminid`='" . $userinfo['adminid'] . "'");
+					$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
+					$result = Database::prepare('
+						SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`
+						WHERE `adminid` = :adminid");
+					Database::pexecute($result, array(
+						'adminid' => $userinfo['adminid']
+					));
 				}
 			} else {
-				standard_error('noreceipientsgiven');
+				\Froxlor\UI\Response::standard_error('norecipientsgiven');
 			}
 
 			$subject = $_POST['subject'];
 			$message = wordwrap($_POST['message'], 70);
 
-			if (!empty($message)) {
+			if (! empty($message)) {
 				$mailcounter = 0;
 				$mail->Body = $message;
 				$mail->Subject = $subject;
 
-				while ($row = $db->fetch_array($result)) {
-					$mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']);
+				while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+
+					$row['firstname'] = isset($row['firstname']) ? $row['firstname'] : '';
+					$row['company'] = isset($row['company']) ? $row['company'] : '';
+					$mail->AddAddress($row['email'], \Froxlor\User::getCorrectUserSalutation(array(
+						'firstname' => $row['firstname'],
+						'name' => $row['name'],
+						'company' => $row['company']
+					)));
 					$mail->From = $userinfo['email'];
 					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];
 
-					if (!$mail->Send()) {
+					if (! $mail->Send()) {
 						if ($mail->ErrorInfo != '') {
 							$mailerr_msg = $mail->ErrorInfo;
 						} else {
 							$mailerr_msg = $row['email'];
 						}
 
-						$log->logAction(ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
-						standard_error('errorsendingmail', $row['email']);
+						$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
+						\Froxlor\UI\Response::standard_error('errorsendingmail', $row['email']);
 					}
 
-					$mailcounter++;
+					$mailcounter ++;
 					$mail->ClearAddresses();
 				}
 
-				redirectTo($filename, Array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s,
+					'action' => 'showsuccess',
+					'sentitems' => $mailcounter
+				));
 			} else {
-				standard_error('nomessagetosend');
+				\Froxlor\UI\Response::standard_error('nomessagetosend');
 			}
 		}
 	}
 
 	if ($action == 'showsuccess') {
+
 		$success = 1;
-		$sentitems = isset($_GET['sentitems']) ? (int)$_GET['sentitems'] : 0;
+		$sentitems = isset($_GET['sentitems']) ? (int) $_GET['sentitems'] : 0;
 
 		if ($sentitems == 0) {
-			$successmessage = $lng['message']['noreceipients'];
+			$successmessage = $lng['message']['norecipients'];
 		} else {
 			$successmessage = str_replace('%s', $sentitems, $lng['message']['success']);
 		}
@@ -103,14 +114,14 @@ if ($page == 'message') {
 		$sentitems = 0;
 		$successmessage = '';
 	}
-	$action = '';
 
-	$receipients = '';
+	$action = '';
+	$recipients = '';
 
 	if ($userinfo['customers_see_all'] == '1') {
-		$receipients.= makeoption($lng['panel']['reseller'], 0);
+		$recipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['reseller'], 0);
 	}
 
-	$receipients .= makeoption($lng['panel']['customer'], 1);
-	eval("echo \"" . getTemplate('message/message') . "\";");
+	$recipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['customer'], 1);
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('message/message') . "\";");
 }

admin_opcacheinfo.php

@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Janos Muzsi <muzsij@hypernics.hu> (2016)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Panel
+ *
+ * Based on https://github.com/amnuts/opcache-gui
+ *
+ */
+define('AREA', 'admin');
+require './lib/init.php';
+
+if ($action == 'reset' && function_exists('opcache_reset') && $userinfo['change_serversettings'] == '1') {
+	opcache_reset();
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "reset OPcache");
+	header('Location: ' . $linker->getLink(array(
+		'section' => 'opcacheinfo',
+		'page' => 'showinfo'
+	)));
+	exit();
+}
+
+if (! function_exists('opcache_get_configuration')) {
+	\Froxlor\UI\Response::standard_error($lng['error']['no_opcacheinfo']);
+}
+
+if ($page == 'showinfo') {
+
+	$opcache_info = opcache_get_configuration();
+	$opcache_status = opcache_get_status(false);
+	$time = time();
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed OPcache info");
+
+	$runtimelines = '';
+	if (isset($opcache_info['directives']) && is_array($opcache_info['directives'])) {
+		foreach ($opcache_info['directives'] as $name => $value) {
+			$linkname = str_replace('_', '-', $name);
+			if ($name == 'opcache.optimization_level' && is_integer($value)) {
+				$value = '0x' . dechex($value);
+			}
+			if ($name == 'opcache.memory_consumption' && is_integer($value) && $value % (1024 * 1024) == 0) {
+				$value = $value / (1024 * 1024);
+			}
+			if ($value === null || $value === '') {
+				$value = $lng['opcacheinfo']['novalue'];
+			}
+			if ($value === true) {
+				$value = $lng['opcacheinfo']['true'];
+			}
+			if ($value === false) {
+				$value = $lng['opcacheinfo']['false'];
+			}
+			if (is_integer($value)) {
+				$value = number_format($value, 0, '.', ' ');
+			}
+			$name = str_replace('_', ' ', $name);
+			eval("\$runtimelines.=\"" . \Froxlor\UI\Template::getTemplate("settings/opcacheinfo/runtime_line") . "\";");
+		}
+	}
+
+	$cachehits = @$opcache_status['opcache_statistics']['hits'] ?: 0;
+	$cachemiss = @$opcache_status['opcache_statistics']['misses'] ?: 0;
+	$blacklistmiss = @$opcache_status['opcache_statistics']['blacklist_misses'] ?: 0;
+	$cachetotal = $cachehits + $cachemiss + $blacklistmiss;
+
+	$general = array(
+		'version' => (isset($opcache_info['version']['opcache_product_name']) ? $opcache_info['version']['opcache_product_name'] . ' ' : '') . $opcache_info['version']['version'],
+		'phpversion' => phpversion(),
+		'start_time' => @$opcache_status['opcache_statistics']['start_time'] ? date('Y-m-d H:i:s', $opcache_status['opcache_statistics']['start_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'],
+		'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;
+	$usedmemstr = bsize($usedmem);
+	$freemem = @$opcache_status['memory_usage']['free_memory'] ?: 0;
+	$freememstr = bsize($freemem);
+	$totalmem = $usedmem + $freemem;
+	$wastedmem = @$opcache_status['memory_usage']['wasted_memory'] ?: 0;
+	$wastedmemstr = bsize($wastedmem);
+	if ($totalmem) {
+		$memory = array(
+			'total' => bsize($totalmem),
+			'used' => $usedmemstr . ($totalmem > 0 ? sprintf(" (%.1f %%)", $usedmem / ($totalmem) * 100) : ''),
+			'free' => $freememstr . ($totalmem > 0 ? sprintf(" (%.1f %%)", $freemem / ($totalmem) * 100) : ''),
+			'wasted' => $wastedmemstr . ($totalmem > 0 ? sprintf(" (%.1f %%)", $wastedmem / ($totalmem) * 100) : '')
+		);
+	}
+
+	if (isset($opcache_status['interned_strings_usage'])) {
+		$usedstring = @$opcache_status['interned_strings_usage']['used_memory'] ?: 0;
+		$usedstringstr = bsize($usedstring);
+		$freestring = @$opcache_status['interned_strings_usage']['free_memory'] ?: 0;
+		$freestringstr = bsize($freestring);
+		$totalstring = $usedstring + $freestring;
+		$stringbuffer = array(
+			'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, '.', ' ')
+		);
+	}
+
+	$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.=\"" . \Froxlor\UI\Template::getTemplate("settings/opcacheinfo/blacklist_line") . "\";");
+		}
+	}
+
+	eval("echo \"" . \Froxlor\UI\Template::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

@@ -16,14 +16,12 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
+use Froxlor\Database\Database;
+use Froxlor\Api\Commands\PhpSettings as PhpSettings;
+use Froxlor\Api\Commands\FpmDaemons as FpmDaemons;
 
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
@@ -35,173 +33,310 @@ if ($page == 'overview') {
 
 	if ($action == '') {
 
+		try {
+			$json_result = PhpSettings::getLocal($userinfo, array(
+				'with_subdomains' => true
+			))->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
 		$tablecontent = '';
 		$count = 0;
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
-
-		while ($row = $db->fetch_array($result)) {
-
-			$domainresult = false;
-
-			$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
-					WHERE `phpsettingid` = '".(int)$row['id']."'
-					AND `parentdomainid` = '0'";
-
-			if ((int)$userinfo['domains_see_all'] == 0) {
-				$query .= " AND `adminid` = '".(int)$userinfo['userid']."'";
-			}
-
-			if ((int)$settings['panel']['phpconfigs_hidestdsubdomain'] == 1) {
-				$query2 = "SELECT DISTINCT `standardsubdomain`
-						FROM `".TABLE_PANEL_CUSTOMERS."`
-						WHERE `standardsubdomain` > 0 ORDER BY `standardsubdomain` ASC;";
-				$ssdids_res = $db->query($query2);
-				$ssdids = array();
-				while ($ssd = $db->fetch_array($ssdids_res)) {
-					$ssdids[] = $ssd['standardsubdomain'];
+		if (isset($result['count']) && $result['count'] > 0) {
+			foreach ($result['list'] as $row) {
+				if (isset($row['is_default']) && $row['is_default'] == true) {
+					$row['description'] = "<b>" . $row['description'] . "</b>";
 				}
-				if (count($ssdids) > 0) {
-					$query .= " AND `id` NOT IN (".implode(', ', $ssdids).")";
+				$domains = "";
+				$subdomains_count = count($row['subdomains']);
+				foreach ($row['domains'] as $configdomain) {
+					$domains .= $idna_convert->decode($configdomain) . "<br>";
 				}
-			}
-
-			$domainresult = $db->query($query);
-
-			$domains = '';
-			if ($db->num_rows($domainresult) > 0) {
-				while ($row2 = $db->fetch_array($domainresult)) {
-					$domains.= $row2['domain'] . '<br/>';
+				$count ++;
+				if ($subdomains_count == 0 && empty($domains)) {
+					$domains = $lng['admin']['phpsettings']['notused'];
 				}
-			} else {
-				$domains = $lng['admin']['phpsettings']['notused'];
+				eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_overview") . "\";");
 			}
-
-			$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") . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview") . "\";");
 	}
 
-	if($action == 'add')
-	{
-		if((int)$userinfo['change_serversettings'] == 1)
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$description = validate($_POST['description'], 'description');
-				$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-				$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
-				$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', ''));
+	if ($action == 'add') {
 
-				if(strlen($description) == 0
-				   || strlen($description) > 50)
-				{
-					standard_error('descriptioninvalid');
+		if ((int) $userinfo['change_serversettings'] == 1) {
+
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					PhpSettings::getLocal($userinfo, $_POST)->add();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+
+				if (file_exists(\Froxlor\Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php')) {
+					require_once \Froxlor\Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php';
+					$result = [
+						'phpsettings' => DEFAULT_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);
 				}
 
-				$db->query("INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET `description` = '" . $db->escape($description) . "', `binary` = '" . $db->escape($binary) . "', `file_extensions` = '" . $db->escape($file_extensions) . "', `mod_fcgid_starter` = '" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests` = '" . $db->escape($mod_fcgid_maxrequests) . "', `phpsettings` = '" . $db->escape($phpsettings) . "'");
-				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
-			{
-				$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
+				$fpmconfigs = '';
+				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
+				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
+					$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], 1, true, true);
+				}
 
-				$phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
-				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
+				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', 'dynamic', true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'dynamic', true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', 'dynamic', true, true);
+
+				$phpconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
+				$phpconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_add_data);
 
 				$title = $phpconfig_add_data['phpconfig_add']['title'];
 				$image = $phpconfig_add_data['phpconfig_add']['image'];
 
-				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_add") . "\";");
 			}
-		}
-		else
-		{
-			standard_error('nopermissionsorinvalidid');
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
 		}
 	}
 
-	if($action == 'delete')
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);
+	if ($action == 'delete') {
 
-		if($result['id'] != 0
-		   && $result['id'] == $id
-		   && (int)$userinfo['change_serversettings'] == 1
-		   && $id != 1)
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `phpsettingid` = 1 WHERE `phpsettingid` = " . (int)$id);
-				$db->query("DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$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']);
-			}
+		try {
+			$json_result = PhpSettings::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
 		}
-		else
+		$result = json_decode($json_result, true)['data'];
+
+		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
 		{
-			standard_error('nopermissionsorinvalidid');
+
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					PhpSettings::getLocal($userinfo, array(
+						'id' => $id
+					))->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				\Froxlor\UI\HTML::askYesNo('phpsetting_reallydelete', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['description']);
+			}
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
 		}
 	}
 
-	if($action == 'edit')
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$id);
+	if ($action == 'edit') {
 
-		if($result['id'] != 0
-		   && $result['id'] == $id
-		   && (int)$userinfo['change_serversettings'] == 1)
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$description = validate($_POST['description'], 'description');
-				$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
-				$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
-				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
-				$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', ''));
+		try {
+			$json_result = PhpSettings::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
-				if(strlen($description) == 0
-				   || strlen($description) > 50)
-				{
-					standard_error('descriptioninvalid');
+		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1) {
+
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					PhpSettings::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+
+				$fpmconfigs = '';
+				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
+				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
+					$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], $result['fpmsettingid'], true, true);
 				}
 
-				$db->query("UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET `description` = '" . $db->escape($description) . "', `binary` = '" . $db->escape($binary) . "', `file_extensions` = '" . $db->escape($file_extensions) . "', `mod_fcgid_starter` = '" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests` = '" . $db->escape($mod_fcgid_maxrequests) . "', `phpsettings` = '" . $db->escape($phpsettings) . "' WHERE `id` = " . (int)$id);
-				inserttask('1');
-				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been changed by '" . $userinfo['loginname'] . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				$phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
-				$phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data);
+				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', $result['pm'], true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', $result['pm'], true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', $result['pm'], true, true);
+
+				$phpconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
+				$phpconfig_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_edit_data);
 
 				$title = $phpconfig_edit_data['phpconfig_edit']['title'];
 				$image = $phpconfig_edit_data['phpconfig_edit']['image'];
 
-				eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_edit") . "\";");
+			}
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+		}
+	}
+} elseif ($page == 'fpmdaemons') {
+
+	if ($action == '') {
+
+		try {
+			$json_result = FpmDaemons::getLocal($userinfo)->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		$tablecontent = '';
+		$count = 0;
+		if (isset($result['count']) && $result['count'] > 0) {
+			foreach ($result['list'] as $row) {
+				$configs = "";
+				foreach ($row['configs'] as $configused) {
+					$configs .= $configused . "<br>";
+				}
+				$count ++;
+				eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons_overview") . "\";");
 			}
 		}
-		else
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons") . "\";");
+	}
+
+	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) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+
+				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', 'dynamic', true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'dynamic', true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', 'dynamic', true, true);
+
+				$fpmconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php';
+				$fpmconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_add_data);
+
+				$title = $fpmconfig_add_data['fpmconfig_add']['title'];
+				$image = $fpmconfig_add_data['fpmconfig_add']['image'];
+
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmconfig_add") . "\";");
+			}
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+		}
+	}
+
+	if ($action == 'delete') {
+
+		try {
+			$json_result = FpmDaemons::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if ($id == 1) {
+			\Froxlor\UI\Response::standard_error('cannotdeletedefaultphpconfig');
+		}
+
+		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
 		{
-			standard_error('nopermissionsorinvalidid');
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					FpmDaemons::getLocal($userinfo, $_POST)->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				\Froxlor\UI\HTML::askYesNo('fpmsetting_reallydelete', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['description']);
+			}
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+		}
+	}
+
+	if ($action == 'edit') {
+
+		try {
+			$json_result = FpmDaemons::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($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) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+
+				$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', $result['pm'], true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', $result['pm'], true, true);
+				$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', $result['pm'], true, true);
+
+				$fpmconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php';
+				$fpmconfig_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_edit_data);
+
+				$title = $fpmconfig_edit_data['fpmconfig_edit']['title'];
+				$image = $fpmconfig_edit_data['fpmconfig_edit']['image'];
+
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmconfig_edit") . "\";");
+			}
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
 		}
 	}
 }
-
-?>

admin_plans.php

@@ -0,0 +1,322 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Panel
+ *
+ */
+define('AREA', 'admin');
+require './lib/init.php';
+
+use Froxlor\Api\Commands\HostingPlans;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+
+if (isset($_POST['id'])) {
+	$id = intval($_POST['id']);
+} elseif (isset($_GET['id'])) {
+	$id = intval($_GET['id']);
+}
+
+if ($page == '' || $page == 'overview') {
+
+	if ($action == '') {
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_plans");
+		$fields = array(
+			'p.name' => $lng['admin']['plans']['name'],
+			'p.description' => $lng['admin']['plans']['description'],
+			'adminname' => $lng['admin']['admin'],
+			'p.ts' => $lng['admin']['plans']['last_update']
+		);
+		try {
+			// get total count
+			$json_result = HostingPlans::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = HostingPlans::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		$plans = '';
+		$sortcode = $paging->getHtmlSortCode($lng);
+		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
+		$searchcode = $paging->getHtmlSearchCode($lng);
+		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$count = 0;
+
+		foreach ($result['list'] as $row) {
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			$row['ts_format'] = date("d.m.Y H:i", $row['ts']);
+			eval("\$plans.=\"" . \Froxlor\UI\Template::getTemplate("plans/plans_plan") . "\";");
+			$count ++;
+		}
+
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans") . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
+
+		try {
+			$json_result = HostingPlans::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($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, array(
+						'id' => $id
+					))->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				\Froxlor\UI\HTML::askYesNo('plan_reallydelete', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['name']);
+			}
+		} else {
+			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+		}
+	} elseif ($action == 'add') {
+
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				HostingPlans::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+
+			$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+
+			$phpconfigs = array();
+			$configs = Database::query("
+					SELECT c.*, fc.description as interpreter
+					FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
+					LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
+				");
+			while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
+				if ((int) Settings::Get('phpfpm.enabled') == 1) {
+					$phpconfigs[] = array(
+						'label' => $row['description'] . " [" . $row['interpreter'] . "]<br />",
+						'value' => $row['id']
+					);
+				} else {
+					$phpconfigs[] = array(
+						'label' => $row['description'] . "<br />",
+						'value' => $row['id']
+					);
+				}
+			}
+
+			// dummy to avoid unknown variables
+			$language_options = null;
+			$gender_options = null;
+			$hosting_plans = null;
+
+			$plans_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/plans/formfield.plans_add.php';
+			$cust_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/customer/formfield.customer_add.php';
+			// unset unneeded stuff
+			unset($cust_add_data['customer_add']['sections']['section_a']);
+			unset($cust_add_data['customer_add']['sections']['section_b']);
+			unset($cust_add_data['customer_add']['sections']['section_cpre']);
+			// merge
+			$plans_add_data['plans_add']['sections'] = array_merge($plans_add_data['plans_add']['sections'], $cust_add_data['customer_add']['sections']);
+			$plans_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($plans_add_data);
+
+			$title = $plans_add_data['plans_add']['title'];
+			$image = $plans_add_data['plans_add']['image'];
+
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans_add") . "\";");
+		}
+	} elseif ($action == 'edit' && $id != 0) {
+		try {
+			$json_result = HostingPlans::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if ($result['name'] != '') {
+
+			$result['value'] = json_decode($result['value'], true);
+			$result = \Froxlor\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) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+
+				$diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true);
+				if ($result['diskspace'] == '-1') {
+					$result['diskspace'] = '';
+				}
+
+				$traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true);
+				if ($result['traffic'] == '-1') {
+					$result['traffic'] = '';
+				}
+
+				$subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true);
+				if ($result['subdomains'] == '-1') {
+					$result['subdomains'] = '';
+				}
+
+				$emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true);
+				if ($result['emails'] == '-1') {
+					$result['emails'] = '';
+				}
+
+				$email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true);
+				if ($result['email_accounts'] == '-1') {
+					$result['email_accounts'] = '';
+				}
+
+				$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true);
+				if ($result['email_forwarders'] == '-1') {
+					$result['email_forwarders'] = '';
+				}
+
+				$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
+				if ($result['email_quota'] == '-1') {
+					$result['email_quota'] = '';
+				}
+
+				$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
+				if ($result['ftps'] == '-1') {
+					$result['ftps'] = '';
+				}
+
+				$mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true);
+				if ($result['mysqls'] == '-1') {
+					$result['mysqls'] = '';
+				}
+
+				$phpconfigs = array();
+				$configs = Database::query("
+					SELECT c.*, fc.description as interpreter
+					FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
+					LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
+				");
+				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
+					if ((int) Settings::Get('phpfpm.enabled') == 1) {
+						$phpconfigs[] = array(
+							'label' => $row['description'] . " [" . $row['interpreter'] . "]<br />",
+							'value' => $row['id']
+						);
+					} else {
+						$phpconfigs[] = array(
+							'label' => $row['description'] . "<br />",
+							'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;
+				$language_options = null;
+				$result['firstname'] = null;
+				$gender_options = 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_cnt = null;
+				$admin_select = null;
+
+				$plans_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/plans/formfield.plans_edit.php';
+				$cust_edit_data = include_once dirname(__FILE__) . '/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']);
+				// merge
+				$plans_edit_data['plans_edit']['sections'] = array_merge($plans_edit_data['plans_edit']['sections'], $cust_edit_data['customer_edit']['sections']);
+				$plans_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($plans_edit_data);
+
+				$title = $plans_edit_data['plans_edit']['title'];
+				$image = $plans_edit_data['plans_edit']['image'];
+
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans_edit") . "\";");
+			}
+		}
+	} elseif ($action == 'jqGetPlanValues') {
+		$planid = isset($_POST['planid']) ? (int) $_POST['planid'] : 0;
+		try {
+			$json_result = HostingPlans::getLocal($userinfo, array(
+				'id' => $planid
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+		echo $result['value'];
+		exit();
+	}
+}

admin_settings.php

@@ -16,123 +16,105 @@
  * @package    Panel
  *
  */
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+use Froxlor\Api\Commands\Froxlor;
 
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+// get sql-root access data
+Database::needRoot(true);
+Database::needSqlData();
+$sql_root = Database::getSqlData();
+Database::needRoot(false);
 
-$need_db_sql_data = true;
-$need_root_db_sql_data = true;
-require ("./lib/init.php");
+if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
+	$settings_data = \Froxlor\PhpHelper::loadConfigArrayDir('./actions/admin/settings/');
+	Settings::loadSettingsInto($settings_data);
 
-if(($page == 'settings' || $page == 'overview')
-   && $userinfo['change_serversettings'] == '1')
-{
-	$settings_data = loadConfigArrayDir('./actions/admin/settings/');
-	$settings = loadSettings($settings_data, $db);
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
-
-		if($_part == '')
-		{
+		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
 		}
 
-		if($_part != '')
-		{
-			if($_part == 'all')
-			{
+		if ($_part != '') {
+			if ($_part == 'all') {
 				$settings_all = true;
 				$settings_part = false;
-			}
-			else
-			{
+			} else {
 				$settings_all = false;
 				$settings_part = true;
 			}
-
 			$only_enabledisable = false;
-		}
-		else
-		{
+		} else {
 			$settings_all = false;
 			$settings_part = false;
 			$only_enabledisable = true;
 		}
 
 		// check if the session timeout is too low #815
-		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] <= 60) {
-			standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
+		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] < 60) {
+			\Froxlor\UI\Response::standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
 		}
 
-		if(processFormEx(
-			$settings_data,
-			$_POST,
-			array('filename' => $filename, 'action' => $action, 'page' => $page),
-			$_part,
-			$settings_all,
-			$settings_part,
-			$only_enabledisable
-			)
-		) {
-			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
-			inserttask('1');
+		if (\Froxlor\UI\Form::processFormEx($settings_data, $_POST, array(
+			'filename' => $filename,
+			'action' => $action,
+			'page' => $page
+		), $_part, $settings_all, $settings_part, $only_enabledisable)) {
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
+			\Froxlor\System\Cronjob::inserttask('1');
 			// Using nameserver, insert a task which rebuilds the server config
-			inserttask('4');
+			\Froxlor\System\Cronjob::inserttask('4');
+			// cron.d file
+			\Froxlor\System\Cronjob::inserttask('99');
 
-			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
+			\Froxlor\UI\Response::standard_success('settingssaved', '', array(
+				'filename' => $filename,
+				'action' => $action,
+				'page' => $page
+			));
 		}
-	}
-	else
-	{
-		$_part = isset($_GET['part']) ? $_GET['part'] : '';
+	} else {
 
-		if($_part == '')
-		{
+		$_part = isset($_GET['part']) ? $_GET['part'] : '';
+		if ($_part == '') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
 		}
 
-		$fields = buildFormEx($settings_data, $_part);
+		$fields = \Froxlor\UI\Form::buildFormEx($settings_data, $_part);
 
 		$settings_page = '';
-		if($_part == '')
-		{
-			eval("\$settings_page .= \"" . getTemplate("settings/settings_overview") . "\";");
-		}
-		else
-		{
-			eval("\$settings_page .= \"" . getTemplate("settings/settings") . "\";");
+		if ($_part == '') {
+			eval("\$settings_page .= \"" . \Froxlor\UI\Template::getTemplate("settings/settings_overview") . "\";");
+		} else {
+			eval("\$settings_page .= \"" . \Froxlor\UI\Template::getTemplate("settings/settings") . "\";");
 		}
 
-		eval("echo \"" . getTemplate("settings/settings_form_begin") . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/settings_form_begin") . "\";");
 		eval("echo \$settings_page;");
-		eval("echo \"" . getTemplate("settings/settings_form_end") . "\";");
-
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/settings_form_end") . "\";");
 	}
-}
-elseif($page == 'phpinfo'
-	&& $userinfo['change_serversettings'] == '1'
-) {
-		ob_start();
-		phpinfo();
-		$phpinfo = array('phpinfo' => array());
-		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
-			)
-		) {
+} elseif ($page == 'phpinfo' && $userinfo['change_serversettings'] == '1') {
+	ob_start();
+	phpinfo();
+	$phpinfo = array(
+		'phpinfo' => array()
+	);
+	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();
 			} 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]) ? array(
+					$match[3],
+					$match[4]
+				) : $match[3];
 			} else {
 				$phpinfo[$end][] = $match[2];
 			}
@@ -142,132 +124,261 @@ elseif($page == 'phpinfo'
 			$phpinfoentries = "";
 			foreach ($section as $key => $val) {
 				if (is_array($val)) {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_3") . "\";");
+					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_3") . "\";");
 				} elseif (is_string($key)) {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_2") . "\";");
+					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_2") . "\";");
 				} else {
-					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_1") . "\";");
+					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_1") . "\";");
 				}
 			}
 			// first header -> show actual php version
 			if (strtolower($name) == "phpinfo") {
-				$name = "PHP ".PHP_VERSION;
+				$name = "PHP " . PHP_VERSION;
 			}
-			eval("\$phpinfohtml .= \"" . getTemplate("settings/phpinfo/phpinfo_table") . "\";");
+			eval("\$phpinfohtml .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_table") . "\";");
 		}
 		$phpinfo = $phpinfohtml;
+	} else {
+		\Froxlor\UI\Response::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');
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo") . "\";");
+} elseif ($page == 'rebuildconfigs' && $userinfo['change_serversettings'] == '1') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 
-		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles");
+		\Froxlor\System\Cronjob::inserttask('1');
+		\Froxlor\System\Cronjob::inserttask('10');
+		// Using nameserver, insert a task which rebuilds the server config
+		\Froxlor\System\Cronjob::inserttask('4');
+		// cron.d file
+		\Froxlor\System\Cronjob::inserttask('99');
+
+		\Froxlor\UI\Response::standard_success('rebuildingconfigs', '', array(
+			'filename' => 'admin_index.php'
+		));
+	} else {
+		\Froxlor\UI\HTML::askYesNo('admin_configs_reallyrebuild', $filename, array(
+			'page' => $page
+		));
 	}
-	else
-	{
-		ask_yesno('admin_configs_reallyrebuild', $filename, array('page' => $page));
-	}
-}
-elseif($page == 'updatecounters'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
-		$log->logAction(ADM_ACTION, LOG_INFO, "updated resource-counters");
-		$updatecounters = updateCounters(true);
+} elseif ($page == 'updatecounters' && $userinfo['change_serversettings'] == '1') {
+
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "updated resource-counters");
+		$updatecounters = \Froxlor\User::updateCounters(true);
 		$customers = '';
-		foreach($updatecounters['customers'] as $customerid => $customer)
-		{
-			eval("\$customers.=\"" . getTemplate("settings/updatecounters_row_customer") . "\";");
+		foreach ($updatecounters['customers'] as $customerid => $customer) {
+			eval("\$customers.=\"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters_row_customer") . "\";");
 		}
 
 		$admins = '';
-		foreach($updatecounters['admins'] as $adminid => $admin)
-		{
-			eval("\$admins.=\"" . getTemplate("settings/updatecounters_row_admin") . "\";");
+		foreach ($updatecounters['admins'] as $adminid => $admin) {
+			eval("\$admins.=\"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters_row_admin") . "\";");
 		}
 
-		eval("echo \"" . getTemplate("settings/updatecounters") . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters") . "\";");
+	} else {
+		\Froxlor\UI\HTML::askYesNo('admin_counters_reallyupdate', $filename, array(
+			'page' => $page
+		));
 	}
-	else
-	{
-		ask_yesno('admin_counters_reallyupdate', $filename, array('page' => $page));
+} elseif ($page == 'wipecleartextmailpws' && $userinfo['change_serversettings'] == '1') {
+
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
+		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password` = '';");
+		Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '0' WHERE `settinggroup` = 'system' AND `varname` = 'mailpwcleartext'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	} else {
+		\Froxlor\UI\HTML::askYesNo('admin_cleartextmailpws_reallywipe', $filename, array(
+			'page' => $page
+		));
 	}
-}
-elseif($page == 'wipecleartextmailpws'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
-		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
-		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password`='' ");
-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='0' WHERE `settinggroup`='system' AND `varname`='mailpwcleartext'");
-		redirectTo('admin_settings.php', array('s' => $s));
-	}
-	else
-	{
-		ask_yesno('admin_cleartextmailpws_reallywipe', $filename, array('page' => $page));
-	}
-}
-elseif($page == 'wipequotas'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
-		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
+} elseif ($page == 'wipequotas' && $userinfo['change_serversettings'] == '1') {
+
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
 
 		// Set the quota to 0 which means unlimited
-
-		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota`='0' ");
-		$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota_used` = 0");
-		redirectTo('admin_settings.php', array('s' => $s));
+		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = '0';");
+		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota_used` = '0'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	} else {
+		\Froxlor\UI\HTML::askYesNo('admin_quotas_reallywipe', $filename, array(
+			'page' => $page
+		));
 	}
-	else
-	{
-		ask_yesno('admin_quotas_reallywipe', $filename, array('page' => $page));
-	}
-}
-elseif($page == 'enforcequotas'
-       && $userinfo['change_serversettings'] == '1')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+} elseif ($page == 'enforcequotas' && $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 . "`");
 
-		$result = $db->query("SELECT `quota`, `customerid` FROM " . TABLE_MAIL_USERS);
+		if (Database::num_rows() > 0) {
 
-		while($array = $db->fetch_array($result))
-		{
-			$difference = $settings['system']['mail_quota'] - $array['quota'];
-			$db->query("UPDATE " . TABLE_PANEL_CUSTOMERS . " SET `email_quota_used` = `email_quota_used` + " . (int)$difference . " WHERE `customerid` = '" . $array['customerid'] . "'");
+			$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
+				`email_quota_used` = `email_quota_used` + :diff
+				WHERE `customerid` = :customerid
+			");
+
+			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
+				));
+			}
 		}
 
 		// Set the new quota
-
-		$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota`='" . $settings['system']['mail_quota'] . "'");
+		$upd_stmt = Database::prepare("
+			UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = :quota
+		");
+		Database::pexecute($upd_stmt, array(
+			'quota' => Settings::Get('system.mail_quota')
+		));
 
 		// Update the Customer, if the used quota is bigger than the allowed quota
+		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota` = `email_quota_used` WHERE `email_quota` < `email_quota_used`");
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . Settings::Get('system.mail_quota') . ' MB');
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	} else {
+		\Froxlor\UI\HTML::askYesNo('admin_quotas_reallyenforce', $filename, array(
+			'page' => $page
+		));
+	}
+} elseif ($page == 'integritycheck' && $userinfo['change_serversettings'] == '1') {
+	$integrity = new \Froxlor\Database\IntegrityCheck();
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$integrity->fixAll();
+	} elseif (isset($_GET['action']) && $_GET['action'] == "fix") {
+		\Froxlor\UI\HTML::askYesNo('admin_integritycheck_reallyfix', $filename, array(
+			'page' => $page
+		));
+	}
 
-		$db->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['system']['mail_quota'] . ' MB');
-		redirectTo('admin_settings.php', array('s' => $s));
+	$integritycheck = '';
+	foreach ($integrity->available as $id => $check) {
+		$displayid = $id + 1;
+		$result = $integrity->$check();
+		$checkdesc = $lng['integrity_check'][$check];
+		eval("\$integritycheck.=\"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck_row") . "\";");
 	}
-	else
-	{
-		ask_yesno('admin_quotas_reallyenforce', $filename, array('page' => $page));
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck") . "\";");
+} elseif ($page == 'importexport' && $userinfo['change_serversettings'] == '1') {
+	// check for json-stuff
+	if (! extension_loaded('json')) {
+		\Froxlor\UI\Response::standard_error('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) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		header('Content-disposition: attachment; filename=Froxlor_settings-' . $version . '-' . $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, array(
+						'json_str' => $imp_content
+					))->importSettings();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::standard_success('settingsimported', '', array(
+					'filename' => 'admin_settings.php'
+				));
+			}
+			\Froxlor\UI\Response::dynamic_error("Upload failed");
+		}
+	} else {
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/importexport/index") . "\";");
+	}
+} elseif ($page == 'testmail') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$test_addr = isset($_POST['test_addr']) ? $_POST['test_addr'] : null;
+
+		/**
+		 * Initialize the mailingsystem
+		 */
+		$testmail = new \PHPMailer\PHPMailer\PHPMailer(true);
+		$testmail->CharSet = "UTF-8";
+
+		if (Settings::Get('system.mail_use_smtp')) {
+			$testmail->isSMTP();
+			$testmail->Host = Settings::Get('system.mail_smtp_host');
+			$testmail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
+			$testmail->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\PHPMailer\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) {
+				$mailerr_msg = $e->errorMessage();
+				$_mailerror = true;
+			} catch (Exception $e) {
+				$mailerr_msg = $e->getMessage();
+				$_mailerror = true;
+			}
+
+			if (! $_mailerror) {
+				// success
+				$mail->ClearAddresses();
+				\Froxlor\UI\Response::standard_success('testmailsent', '', array(
+					'filename' => 'admin_settings.php',
+					'page' => 'testmail'
+				));
+			}
+		} else {
+			// invalid sender e-mail
+			$mailerr_msg = "Invalid sender e-mail address: " . Settings::Get('panel.adminmail');
+			$_mailerror = true;
+		}
+	}
+
+	$mail_smtp_user = Settings::Get('system.mail_smtp_user');
+	$mail_smtp_host = Settings::Get('system.mail_smtp_host');
+	$mail_smtp_port = Settings::Get('system.mail_smtp_port');
+
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/testmail") . "\";");
 }

admin_templates.php

@@ -16,32 +16,23 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
-require ("./lib/init.php");
-
-if(isset($_POST['subjectid']))
-{
+if (isset($_POST['subjectid'])) {
 	$subjectid = intval($_POST['subjectid']);
 	$mailbodyid = intval($_POST['mailbodyid']);
-}
-elseif(isset($_GET['subjectid']))
-{
+} elseif (isset($_GET['subjectid'])) {
 	$subjectid = intval($_GET['subjectid']);
 	$mailbodyid = intval($_GET['mailbodyid']);
 }
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
@@ -54,367 +45,459 @@ $available_templates = array(
 );
 
 // only show templates of features that are enabled #1191
-if ((int)$settings['system']['report_enable'] == 1) {
-	array_push($available_templates,
-		'trafficmaxpercent',
-		'diskmaxpercent'
-	);
-}
-if ((int)$settings['ticket']['enabled'] == 1) {
-	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'
-	);
+if ((int) Settings::Get('system.report_enable') == 1) {
+	array_push($available_templates, 'trafficmaxpercent', 'diskmaxpercent');
 }
 
 $file_templates = array(
 	'index_html'
 );
 
-if($action == '')
-{
-	//email templates
+if ($action == '') {
+	// email templates
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
 
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
-
-	if($settings['panel']['sendalternativemail'] == 1)
-	{
+	if (Settings::Get('panel.sendalternativemail') == 1) {
 		$available_templates[] = 'pop_success_alternative';
 	}
 
 	$templates_array = array();
-	$result = $db->query("SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='mails' ORDER BY `language`, `varname`");
+	$result_stmt = Database::prepare("
+		SELECT `id`, `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `templategroup`='mails'
+		ORDER BY `language`, `varname`");
+	Database::pexecute($result_stmt, array(
+		'adminid' => $userinfo['adminid']
+	));
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$parts = array();
 		preg_match('/^([a-z]([a-z_]+[a-z])*)_(mailbody|subject)$/', $row['varname'], $parts);
 		$templates_array[$row['language']][$parts[1]][$parts[3]] = $row['id'];
 	}
 
 	$templates = '';
-	foreach($templates_array as $language => $template_defs)
-	{
-		foreach($template_defs as $action => $email)
-		{
+	foreach ($templates_array as $language => $template_defs) {
+		foreach ($template_defs as $action => $email) {
 			$subjectid = $email['subject'];
 			$mailbodyid = $email['mailbody'];
 			$template = $lng['admin']['templates'][$action];
-			eval("\$templates.=\"" . getTemplate("templates/templates_template") . "\";");
+			eval("\$templates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_template") . "\";");
 		}
 	}
 
 	$add = false;
+	foreach ($languages as $language_file => $language_name) {
 
-	while(list($language_file, $language_name) = each($languages))
-	{
 		$templates_done = array();
-		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language_name) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+		$result_stmt = Database::prepare("
+			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+			WHERE `adminid` = :adminid AND `language`= :lang
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
+		Database::pexecute($result_stmt, array(
+			'adminid' => $userinfo['adminid'],
+			'lang' => $language_name
+		));
 
-		while(($row = $db->fetch_array($result)) != false)
-		{
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			$templates_done[] = str_replace('_subject', '', $row['varname']);
 		}
 
-		if(count(array_diff($available_templates, $templates_done)) > 0)
-		{
+		if (count(array_diff($available_templates, $templates_done)) > 0) {
 			$add = true;
 		}
 	}
 
-	//filetemplates
-
+	// filetemplates
 	$filetemplates = '';
 	$filetemplateadd = false;
-	$result = $db->query("SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='files'");
+	$result_stmt = Database::prepare("
+		SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `templategroup`='files'");
+	Database::pexecute($result_stmt, array(
+		'adminid' => $userinfo['adminid']
+	));
 
-	if($db->num_rows($result) != count($file_templates))$filetemplateadd = true;
-
-	while($row = $db->fetch_array($result))
-	{
-		eval("\$filetemplates.=\"" . getTemplate("templates/templates_filetemplate") . "\";");
+	if (Database::num_rows() != count($file_templates)) {
+		$filetemplateadd = true;
 	}
 
-	eval("echo \"" . getTemplate("templates/templates") . "\";");
-}
-elseif($action == 'delete'
-       && $subjectid != 0
-       && $mailbodyid != 0)
-{
-	//email templates
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		eval("\$filetemplates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_filetemplate") . "\";");
+	}
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates") . "\";");
+} elseif ($action == 'delete' && $subjectid != 0 && $mailbodyid != 0) {
+	// email templates
+	$result_stmt = Database::prepare("
+		SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :id");
+	Database::pexecute($result_stmt, array(
+		'adminid' => $userinfo['adminid'],
+		'id' => $subjectid
+	));
+	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-	$result = $db->query_first("SELECT `language`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
-
-	if($result['varname'] != '')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$db->query("DELETE FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND (`id`='" . (int)$subjectid . "' OR `id`='" . (int)$mailbodyid . "')");
-			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		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'])]);
+	if ($result['varname'] != '') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			$del_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `adminid` = :adminid
+				AND (`id` = :ida OR `id` = :idb)");
+			Database::pexecute($del_stmt, array(
+				'adminid' => $userinfo['adminid'],
+				'ida' => $subjectid,
+				'idb' => $mailbodyid
+			));
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'");
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+			\Froxlor\UI\HTML::askYesNo('admin_template_reallydelete', $filename, array(
+				'subjectid' => $subjectid,
+				'mailbodyid' => $mailbodyid,
+				'page' => $page,
+				'action' => $action
+			), $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]);
 		}
 	}
-}
-elseif($action == 'deletef'
-       && $id != 0)
-{
-	//file templates
+} elseif ($action == 'deletef' && $id != 0) {
+	// file templates
+	$result_stmt = Database::prepare("
+		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :id");
+	Database::pexecute($result_stmt, array(
+		'adminid' => $userinfo['adminid'],
+		'id' => $id
+	));
 
-	$result = $db->query("SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
+	if (Database::num_rows() > 0) {
 
-	if($db->num_rows($result) > 0)
-	{
-		$row = $db->fetch_array($result);
+		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$db->query("DELETE FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`=" . (int)$userinfo['adminid'] . " AND `id`=" . (int)$id . "");
-			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
-			ask_yesno('admin_template_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $lng['admin']['templates'][$row['varname']]);
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			$del_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `adminid` = :adminid AND `id` = :id");
+			Database::pexecute($del_stmt, array(
+				'adminid' => $userinfo['adminid'],
+				'id' => $id
+			));
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+			\Froxlor\UI\HTML::askYesNo('admin_template_reallydelete', $filename, array(
+				'id' => $id,
+				'page' => $page,
+				'action' => $action
+			), $lng['admin']['templates'][$row['varname']]);
 		}
+	} else {
+		\Froxlor\UI\Response::standard_error('templatenotfound');
 	}
-	else
-	{
-		standard_error('templatenotfound');
-		exit;
-	}
-}
-elseif($action == 'add')
-{
-	if($settings['panel']['sendalternativemail'] == 1)
-	{
+} elseif ($action == 'add') {
+
+	if (Settings::Get('panel.sendalternativemail') == 1) {
 		$available_templates[] = 'pop_success_alternative';
 	}
 
-	if(isset($_POST['prepare'])
-	   && $_POST['prepare'] == 'prepare')
-	{
-		//email templates
+	if (isset($_POST['prepare']) && $_POST['prepare'] == 'prepare') {
+		// email templates
+		$language = htmlentities(\Froxlor\Validate\Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
 
-		$language = validate($_POST['language'], 'language');
-		$templates = array();
-		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
-
-		while(($row = $db->fetch_array($result)) != false)
-		{
-			$templates[] = str_replace('_subject', '', $row['varname']);
+		$lng_bak = $lng;
+		foreach ($langs['English'] as $key => $value) {
+			include_once \Froxlor\FileDir::makeSecurePath($value['file']);
+		}
+		if ($language != 'English') {
+			foreach ($langs[$language] as $key => $value) {
+				include \Froxlor\FileDir::makeSecurePath($value['file']);
+			}
 		}
 
-		$templates = array_diff($available_templates, $templates);
-		$template_options = '';
-		foreach($templates as $template)
-		{
-			$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true);
-		}
+		$subject = $lng['mails'][$template]['subject'];
+		$body = str_replace('\n', "\n", $lng['mails'][$template]['mailbody']);
 
-		$template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php';
-		$template_add_form = htmlform::genHTMLForm($template_add_data);
+		$lng = $lng_bak;
+
+		$template_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_add.php';
+		$template_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($template_add_data);
 
 		$title = $template_add_data['template_add']['title'];
 		$image = $template_add_data['template_add']['image'];
 
-		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
-	}
-	elseif(isset($_POST['send'])
-	       && $_POST['send'] == 'send')
-	{
-		//email templates
-
-		$language = validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect');
-		$template = validate($_POST['template'], 'template');
-		$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-		$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_add_2") . "\";");
+	} elseif (isset($_POST['send']) && $_POST['send'] == 'send') {
+		// email templates
+		$language = htmlentities(\Froxlor\Validate\Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
+		$subject = \Froxlor\Validate\Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+		$mailbody = \Froxlor\Validate\Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
 		$templates = array();
-		$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+		$result_stmt = Database::prepare("
+			SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+			WHERE `adminid` = :adminid AND `language` = :lang
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
+		Database::pexecute($result_stmt, array(
+			'adminid' => $userinfo['adminid'],
+			'lang' => $language
+		));
 
-		while(($row = $db->fetch_array($result)) != false)
-		{
+		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) {
+			\Froxlor\UI\Response::standard_error('templatenotfound');
+		} else {
+			$ins_stmt = Database::prepare("
+				INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
+					`adminid` = :adminid,
+					`language` = :lang,
+					`templategroup` = 'mails',
+					`varname` = :var,
+					`value` = :value");
 
-		if(array_search($template, $templates) === false)
-		{
-			standard_error('templatenotfound');
+			// mail-subject
+			$ins_data = array(
+				'adminid' => $userinfo['adminid'],
+				'lang' => $language,
+				'var' => $template . '_subject',
+				'value' => $subject
+			);
+			Database::pexecute($ins_stmt, $ins_data);
+
+			// mail-body
+			$ins_data = array(
+				'adminid' => $userinfo['adminid'],
+				'lang' => $language,
+				'var' => $template . '_mailbody',
+				'value' => $mailbody
+			);
+			Database::pexecute($ins_stmt, $ins_data);
+
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
 		}
-		else
-		{
-			$result = $db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
-									VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($language) . "', 'mails', '" . $db->escape($template) . "_subject','" . $db->escape($subject) . "')");
-			$result = $db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
-									VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($language) . "', 'mails', '" . $db->escape($template) . "_mailbody','" . $db->escape($mailbody) . "')");
-			$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $language . ' - ' . $template . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-	}
-	elseif(isset($_POST['filesend'])
-	       && $_POST['filesend'] == 'filesend')
-	{
-		//file templates
+	} elseif (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
+		// file templates
+		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
+		$filecontent = \Froxlor\Validate\Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 
-		$template = validate($_POST['template'], 'template');
-		$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-		$db->query("INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` (`adminid`, `language`, `templategroup`, `varname`, `value`)
-					VALUES ('" . (int)$userinfo['adminid'] . "', '', 'files', '" . $db->escape($template) . "','" . $db->escape($filecontent) . "')");
-		$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
-		redirectTo($filename, Array('page' => $page, 's' => $s));
-	}
-	elseif(!isset($_GET['files']))
-	{
-		//email templates
+		$ins_stmt = Database::prepare("
+			INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
+				`adminid` = :adminid,
+				`language` = '',
+				`templategroup` = 'files',
+				`varname` = :var,
+				`value` = :value");
 
+		$ins_data = array(
+			'adminid' => $userinfo['adminid'],
+			'var' => $template,
+			'value' => $filecontent
+		);
+		Database::pexecute($ins_stmt, $ins_data);
+
+		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			'page' => $page,
+			's' => $s
+		));
+	} elseif (! isset($_GET['files'])) {
+
+		// email templates
 		$add = false;
 		$language_options = '';
+		$template_options = '';
 
-		while(list($language_file, $language_name) = each($languages))
-		{
+		foreach ($languages as $language_file => $language_name) {
 			$templates = array();
-			$result = $db->query('SELECT `varname` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($language_name) . '\' AND `templategroup`=\'mails\' AND `varname` LIKE \'%_subject\'');
+			$result_stmt = Database::prepare("
+				SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `adminid` = :adminid AND `language` = :lang
+				AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'");
+			Database::pexecute($result_stmt, array(
+				'adminid' => $userinfo['adminid'],
+				'lang' => $language_name
+			));
 
-			while(($row = $db->fetch_array($result)) != false)
-			{
+			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$templates[] = str_replace('_subject', '', $row['varname']);
 			}
 
-			if(count(array_diff($available_templates, $templates)) > 0)
-			{
+			if (count(array_diff($available_templates, $templates)) > 0) {
 				$add = true;
-				$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true);
+				$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $userinfo['language'], true, true);
+
+				$templates = array_diff($available_templates, $templates);
+
+				foreach ($templates as $template) {
+					$template_options .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n";
+				}
 			}
 		}
 
-		if($add)
-		{
-			eval("echo \"" . getTemplate("templates/templates_add_1") . "\";");
+		if ($add) {
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_add_1") . "\";");
+		} else {
+			\Froxlor\UI\Response::standard_error('alltemplatesdefined');
 		}
-		else
-		{
-			standard_error('alltemplatesdefined');
-			exit;
-		}
-	}
-	else
-	{
-		//filetemplates
+	} else {
+		// filetemplates
+		$result_stmt = Database::prepare("
+			SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
+			WHERE `adminid` = :adminid AND `templategroup`='files'");
+		Database::pexecute($result_stmt, array(
+			'adminid' => $userinfo['adminid']
+		));
 
-		$result = $db->query("SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `templategroup`='files'");
+		if (Database::num_rows() == count($file_templates)) {
+			\Froxlor\UI\Response::standard_error('alltemplatesdefined');
+		} else {
 
-		if($db->num_rows($result) == count($file_templates))
-		{
-			standard_error('alltemplatesdefined');
-			exit;
-		}
-		else
-		{
 			$templatesdefined = array();
 			$free_templates = '';
 
-			while($row = $db->fetch_array($result))$templatesdefined[] = $row['varname'];
-			foreach(array_diff($file_templates, $templatesdefined) as $template)
-			{
-				$free_templates.= makeoption($lng['admin']['templates'][$template], $template, '', true);
+			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$templatesdefined[] = $row['varname'];
 			}
 
-			$filetemplate_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_add.php';
-			$filetemplate_add_form = htmlform::genHTMLForm($filetemplate_add_data);
+			foreach (array_diff($file_templates, $templatesdefined) as $template) {
+				$free_templates .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, '', true);
+			}
+
+			$filetemplate_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_add.php';
+			$filetemplate_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($filetemplate_add_data);
 
 			$title = $filetemplate_add_data['filetemplate_add']['title'];
 			$image = $filetemplate_add_data['filetemplate_add']['image'];
 
-			eval("echo \"" . getTemplate("templates/filetemplates_add") . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/filetemplates_add") . "\";");
 		}
 	}
-}
-elseif($action == 'edit'
-       && $subjectid != 0
-       && $mailbodyid != 0)
-{
-	//email templates
+} 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");
+	Database::pexecute($result_stmt, array(
+		'adminid' => $userinfo['adminid'],
+		'subjectid' => $subjectid
+	));
+	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-	$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
+	if ($result['varname'] != '') {
 
-	if($result['varname'] != '')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-			$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
-			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($subject) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$subjectid . "'");
-			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($mailbody) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$mailbodyid . "'");
-			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
-			$result = htmlentities_array($result);
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			$subject = \Froxlor\Validate\Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+			$mailbody = \Froxlor\Validate\Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+
+			$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
+					`value` = :value
+				WHERE `adminid` = :adminid AND `id` = :id");
+			// subject
+			Database::pexecute($upd_stmt, array(
+				'value' => $subject,
+				'adminid' => $userinfo['adminid'],
+				'id' => $subjectid
+			));
+			// same query but mailbody
+			Database::pexecute($upd_stmt, array(
+				'value' => $mailbody,
+				'adminid' => $userinfo['adminid'],
+				'id' => $mailbodyid
+			));
+
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+
+			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 			$template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])];
 			$subject = $result['value'];
-			$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `id`='$mailbodyid'");
-			$result = htmlentities_array($result);
+			$result_stmt = Database::prepare("
+				SELECT `language`, `varname`, `value`
+				FROM `" . TABLE_PANEL_TEMPLATES . "`
+				WHERE `id` = :id");
+			Database::pexecute($result_stmt, array(
+				'id' => $mailbodyid
+			));
+			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+			$template_name = str_replace('_mailbody', '', $result['varname']);
+
+			// don't escape the already escaped language-string so save up before htmlentities()
+			$language = $result['language'];
+			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 			$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);
+			$template_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_edit.php';
+			$template_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($template_edit_data);
 
 			$title = $template_edit_data['template_edit']['title'];
 			$image = $template_edit_data['template_edit']['image'];
 
-			eval("echo \"" . getTemplate("templates/templates_edit") . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_edit") . "\";");
 		}
 	}
-}
-elseif($action == 'editf'
-       && $id != 0)
-{
-	//file templates
+} elseif ($action == 'editf' && $id != 0) {
+	// file templates
+	$result_stmt = Database::prepare("
+		SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "`
+		WHERE `adminid` = :adminid AND `id` = :id");
+	Database::pexecute($result_stmt, array(
+		'adminid' => $userinfo['adminid'],
+		'id' => $id
+	));
 
-	$result = $db->query("SELECT * FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
+	if (Database::num_rows() > 0) {
 
-	if($db->num_rows($result) > 0)
-	{
-		$row = $db->fetch_array($result);
+		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		//filetemplates
+		// filetemplates
+		if (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
+			$filecontent = \Froxlor\Validate\Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
+			$upd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
+					`value` = :value
+				WHERE `adminid` = :adminid AND `id` = :id");
+			Database::pexecute($upd_stmt, array(
+				'value' => $filecontent,
+				'adminid' => $userinfo['adminid'],
+				'id' => $id
+			));
 
-		if(isset($_POST['filesend'])
-		   && $_POST['filesend'] == 'filesend')
-		{
-			$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
-			$db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `value`='" . $db->escape($filecontent) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "' AND `id`='" . (int)$id . "'");
-			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
-			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
-			$row = htmlentities_array($row);
+			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+			$row = \Froxlor\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);
+			$filetemplate_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
+			$filetemplate_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($filetemplate_edit_data);
 
 			$title = $filetemplate_edit_data['filetemplate_edit']['title'];
 			$image = $filetemplate_edit_data['filetemplate_edit']['image'];
 
-			eval("echo \"" . getTemplate("templates/filetemplates_edit") . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/filetemplates_edit") . "\";");
 		}
-	}
-	else
-	{
-		standard_error('templatenotfound');
-		exit;
+	} else {
+		\Froxlor\UI\Response::standard_error('templatenotfound');
 	}
 }

admin_tickets.php

@@ -1,905 +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');
-
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-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.
-			 */
-			$sql = "SELECT `id` FROM `panel_tickets` WHERE `id` = '".$id."' AND `adminid` = '".$userinfo['admindid']."'";
-
-			$result = $db->query_first($sql);
-			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 = $db->query_first("SELECT COUNT(`customerid`) as `countcustomers` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") . "");
-	$countcustomers = (int)$countcustomers['countcustomers'];
-
-	if($action == '')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_tickets");
-		$fields = array(
-			'status' => $lng['ticket']['status'],
-			'priority' => $lng['ticket']['priority'],
-			'lastchange' => $lng['ticket']['lastchange'],
-			'ticket_answers' => $lng['ticket']['ticket_answers'],
-			'subject' => $lng['ticket']['subject'],
-			'lastreplier' => $lng['ticket']['lastreplier']
-		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$paging->sortfield = 'lastchange';
-		$paging->sortorder = 'desc';
-		$result = $db->query('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` = "' . (int)$userinfo['adminid'] . '"') . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
-		$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 = $db->fetch_array($result))
-		{
-			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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
-                                     WHERE `customerid` = "' . (int)$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']) > 20)
-					{
-						$row['subject'] = substr($row['subject'], 0, 17) . '...';
-					}
-
-					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, $db, $settings, -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` = "' . $userinfo['adminid'] . '"';
-				}
-				$result = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` '.$where.' ORDER BY `logicalorder`, `name` ASC');
-
-				if(isset($result['name'])
-				   && $result['name'] != '')
-				{
-					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` '.$where.' ORDER BY `logicalorder`, `name` ASC');
-
-					while($row = $db->fetch_array($result2))
-					{
-						$categories.= makeoption($row['name'], $row['id']);
-					}
-				}
-				else
-				{
-					$categories = makeoption($lng['ticket']['no_cat'], '0');
-				}
-
-				$customers = '';
-				$result_customers = $db->query("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY `name` ASC");
-
-				while($row_customer = $db->fetch_array($result_customers))
-				{
-					$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
-				}
-
-				$priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']);
-				$priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']);
-				$priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']);
-
-				$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, $db, $settings, -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, $db, $settings, (int)$id);
-				$replyticket->Set('customerid', $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, $db, $settings, (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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = "' . (int)$cid . '"'
-				);
-				$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
-				$by .= getCorrectFullUserDetails($usr).'</a>';
-				//$by = $lng['ticket']['customer'];
-			}
-
-			$subject = $mainticket->Get('subject');
-			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-			$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-                                WHERE `id`="' . (int)$mainticket->Get('category') . '"');
-			$row = $db->fetch_array($result);
-			$andere = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto`="' . (int)$id . '" ORDER BY `lastchange` ASC');
-
-			while($row2 = $db->fetch_array($andere))
-			{
-				$subticket = ticket::getInstanceOf($userinfo, $db, $settings, (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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = "' . (int)$cid . '"'
-					);
-					$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
-					$by .= getCorrectFullUserDetails($usr).'</a>';
-					//$by = $lng['ticket']['customer'];
-				}
-
-				$subject = $subticket->Get('subject');
-				$message = $subticket->Get('message');
-				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 = $mainticket->Get('subject');
-			$ticket_replies_count = $db->num_rows($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, $db, $settings, (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, $db, $settings, (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, $db, $settings, (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, $db, $settings, (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, $db, $settings, (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, $db, $settings, (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, $db, $settings, (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` = '" . (int)$userinfo['adminid'] . "'";
-		}
-		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKET_CATS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("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` = '" . $userinfo['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` = '" . $userinfo['adminid'] . "'
-                              ) as `ticketcountnotclosed`
-                              FROM `" . TABLE_PANEL_TICKET_CATS . "` `main` WHERE " . $where . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
-		$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 = $db->num_rows($result);
-
-		while($row = $db->fetch_array($result))
-		{
-			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($db, $userinfo['adminid']) + 1;
-			}
-
-			if($category == '')
-			{
-				standard_error(array('stringisempty', 'mycategory'));
-			}
-			else
-			{
-				ticket::addCategory($db, $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($db, $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($db, $category, $id, $order);
-				$log->logAction(ADM_ACTION, LOG_INFO, "edited ticket-category '" . $category . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-		}
-		else
-		{
-			$row = $db->query_first('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = "' . (int)$id . '"');
-
-			$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($db, $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($db, $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 = $db->query_first('SELECT COUNT(`id`) as `ccount` FROM `' . TABLE_PANEL_TICKET_CATS . '`');
-			for ($x = 0;$x < $cat['ccount'];$x++)
-			{
-				$categories[$x] = isset($_POST['category' . $x]) ? $_POST['category' . $x] : '';
-			}
-			$query = ticket::getArchiveSearchStatement($db, $subject, $priority, $fromdate, $todate, $message, $customer, $userinfo['adminid'], $categories);
-			$fields = array(
-				'lastchange' => $lng['ticket']['lastchange'],
-				'ticket_answers' => $lng['ticket']['ticket_answers'],
-				'subject' => $lng['ticket']['subject'],
-				'lastreplier' => $lng['ticket']['lastreplier'],
-				'priority' => $lng['ticket']['priority']
-			);
-			$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-			$result = $db->query($query . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-			$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 = $db->fetch_array($result))
-			{
-				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 = 0;
-				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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '`
-                                       WHERE `customerid` = "' . (int)$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++;
-						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($db, 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 = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC');
-
-			while($row = $db->fetch_array($result))
-			{
-				$category_options.= makecheckbox('category' . $ccount, $row['name'], $row['id'], true);
-				$ccount++;
-			}
-
-			$customers = makeoption($lng['ticket']['nocustomer'], '-1', '-1');
-			$result_customers = $db->query("SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY `name` ASC");
-
-			while($row_customer = $db->fetch_array($result_customers))
-			{
-				$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, $db, $settings, (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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = "' . (int)$cid . '"'
-			);
-			$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
-			$by .= getCorrectFullUserDetails($usr).'</a>';
-			//$by = $lng['ticket']['customer'];
-		}
-
-		$subject = $mainticket->Get('subject');
-		$message = $mainticket->Get('message');
-		eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-		$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-                              WHERE `id`="' . (int)$mainticket->Get('category') . '"');
-		$row = $db->fetch_array($result);
-		$andere = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto`="' . (int)$id . '"');
-
-		while($row2 = $db->fetch_array($andere))
-		{
-			$subticket = ticket::getInstanceOf($userinfo, $db, $settings, (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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = "' . (int)$cid . '"'
-				);
-				$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
-				$by .= getCorrectFullUserDetails($usr).'</a>';
-				//$by = $lng['ticket']['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 = $db->num_rows($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, $db, $settings, (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, $db, $settings, (int)$id);
-			ask_yesno('ticket_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
-		}
-	}
-} else {
-	standard_error('nocustomerforticket');
-}

admin_traffic.php

@@ -15,28 +15,15 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
-require ("./lib/init.php");
-
-if($action == 'logout')
-{
-	$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
-	redirectTo('index.php');
-	exit;
-}
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
@@ -53,47 +40,47 @@ $months = array(
 	'9' => 'sep',
 	'10' => 'oct',
 	'11' => 'nov',
-	'12' => 'dec',
+	'12' => 'dec'
 );
 
-if($page == 'overview' || $page == 'customers') 
-{
-	if($action == 'su' && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$id . "' " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' "));
+if ($page == 'overview' || $page == 'customers') {
 
-		if($result['loginname'] != '')
-		{
-			$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid`='" . (int)$userinfo['userid'] . "'");
-			$s = md5(uniqid(microtime(), 1));
-			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$id . "', '" . $db->escape($result['ipaddress']) . "', '" . $db->escape($result['useragent']) . "', '" . time() . "', '" . $db->escape($result['language']) . "', '0')");
-			redirectTo('customer_traffic.php', Array(
-				's' => $s
-			));
-		}
-		else
-		{
-			redirectTo('index.php', Array(
-				'action' => 'login'
-			));
-		}
-	}
 	$customerview = 1;
 	$stats_tables = '';
-	$minyear = $db->query_first("SELECT `year` FROM `". TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
-	if (!isset($minyear['year']) || $minyear['year'] == 0)
-	{
+	$minyear_stmt = Database::query("SELECT `year` FROM `" . TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
+	$minyear = $minyear_stmt->fetch(PDO::FETCH_ASSOC);
+
+	if (! isset($minyear['year']) || $minyear['year'] == 0) {
 		$maxyears = 0;
-	}
-	else
-	{
+	} else {
 		$maxyears = date("Y") - $minyear['year'];
 	}
-	for($years = 0; $years<=$maxyears; $years++) {
-		$overview['year'] = date("Y")-$years;
+
+	$params = [];
+	if ($userinfo['customers_see_all'] == '0') {
+		$params = [
+			'id' => $userinfo['adminid']
+		];
+	}
+	$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"
+	);
+
+	$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"
+	);
+
+	for ($years = 0; $years <= $maxyears; $years ++) {
+
+		$overview['year'] = date("Y") - $years;
 		$overview['type'] = $lng['traffic']['customer'];
 		$domain_list = '';
-		$customer_name_list = $db->query("SELECT `customerid`,`company`,`name`,`firstname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `deactivated`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY name");
 		$totals = array(
 			'jan' => 0,
 			'feb' => 0,
@@ -106,9 +93,13 @@ if($page == 'overview' || $page == 'customers')
 			'sep' => 0,
 			'oct' => 0,
 			'nov' => 0,
-			'dec' => 0,
+			'dec' => 0
 		);
-		while($customer_name = $db->fetch_array($customer_name_list)) {
+
+		Database::pexecute($customer_name_list_stmt, $params);
+
+		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'],
@@ -123,26 +114,30 @@ if($page == 'overview' || $page == 'customers')
 				'sep' => '-',
 				'oct' => '-',
 				'nov' => '-',
-				'dec' => '-',
+				'dec' => '-'
 			);
 
-			$traffic_list = $db->query("SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE year = " . (date("Y")-$years) . " AND `customerid` = '" . $customer_name['customerid'] . "' GROUP BY month ORDER BY month");
-			while($traffic_month = $db->fetch_array($traffic_list)) {
-				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-				$totals[$months[(int)$traffic_month['month']]] += $traffic_month['traffic'];
+			Database::pexecute($traffic_list_stmt, array(
+				'year' => (date("Y") - $years),
+				'id' => $customer_name['customerid']
+			));
+
+			while ($traffic_month = $traffic_list_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$virtual_host[$months[(int) $traffic_month['month']]] = \Froxlor\PhpHelper::sizeReadable($traffic_month['traffic'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+				$totals[$months[(int) $traffic_month['month']]] += $traffic_month['traffic'];
 			}
-			eval("\$domain_list .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
+			eval("\$domain_list .= sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table_row") . "\");");
 		}
 		// sum up totals
 		$virtual_host = array(
-			'name' => $lng['traffic']['months']['total'],
+			'name' => $lng['traffic']['months']['total']
 		);
-		foreach($totals as $month => $bytes) {
-			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s'));
+		foreach ($totals as $month => $bytes) {
+			$virtual_host[$month] = ($bytes == 0 ? '-' : \Froxlor\PhpHelper::sizeReadable($bytes, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'));
 		}
 		$customerview = 0;
-		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
-		eval("\$stats_tables .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table") . "\");");
+		eval("\$total_list = sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table_row") . "\");");
+		eval("\$stats_tables .= sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table") . "\");");
 	}
-	eval("echo \"" . getTemplate("traffic/index") . "\";");
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("traffic/index") . "\";");
 }

admin_updates.php

@@ -14,98 +14,99 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'admin');
-require('./lib/init.php');
+require './lib/init.php';
+
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 if ($page == 'overview') {
-	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
+	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
 
 	/**
 	 * this is a dirty hack but syscp 1.4.2.1 does not
-	 * has any version/dbversion in the database (don't know why)
+	 * 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 (!isset($settings['panel']['version'])
-			|| $settings['panel']['version'] == ''
-		) {
-			$settings['panel']['version'] = '1.4.2.1';
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')");
+	if (! \Froxlor\Froxlor::isFroxlor()) {
+		if (Settings::Get('panel.version') == null || Settings::Get('panel.version') == '') {
+			Settings::Set('panel.version', '1.4.2.1');
 		}
-		if (!isset($settings['system']['dbversion'])
-			|| $settings['system']['dbversion'] == ''
-		) {
+		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 = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
+			$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['system']['dbversion'] = (int)$result['value'];
+				Settings::Set('system.dbversion', (int) $result['value'], false);
 			} else {
-				$settings['system']['dbversion'] = 0;
+				Settings::Set('system.dbversion', 0, false);
 			}
 		}
 	}
 
-	if (hasUpdates($version)) {
+	if (\Froxlor\Froxlor::hasDbUpdates() || \Froxlor\Froxlor::hasUpdates()) {
 		$successful_update = false;
 		$message = '';
 
-		if (isset($_POST['send'])
-			&& $_POST['send'] == 'send'
-		) {
-			if ((isset($_POST['update_preconfig'])
-				&& isset($_POST['update_changesagreed'])
-				&& intval($_POST['update_changesagreed']) != 0)
-				|| !isset($_POST['update_preconfig'])
-			) {
-				eval("echo \"" . getTemplate('update/update_start') . "\";");
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			if ((isset($_POST['update_preconfig']) && isset($_POST['update_changesagreed']) && intval($_POST['update_changesagreed']) != 0) || ! isset($_POST['update_preconfig'])) {
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/update_start') . "\";");
 
-				include_once './install/updatesql.php';
+				include_once \Froxlor\Froxlor::getInstallDir() . 'install/updatesql.php';
 
 				$redirect_url = 'admin_index.php?s=' . $s;
-				eval("echo \"" . getTemplate('update/update_end') . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/update_end') . "\";");
 
-				updateCounters();
-				inserttask('1');
-				@chmod('./lib/userdata.inc.php', 0440);
+				\Froxlor\User::updateCounters();
+				\Froxlor\System\Cronjob::inserttask('1');
+				@chmod(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php', 0440);
 
 				$successful_update = true;
 			} else {
-				$message = '<br /><strong style="color: red">You have to agree that you have read the update notifications.</strong>';
+				$message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>';
 			}
 		}
 
-		if (!$successful_update) {
-			$current_version = $settings['panel']['version'];
+		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_db_version = $dbversion;
 
 			$ui_text = $lng['update']['update_information']['part_a'];
-			$ui_text = str_replace('%curversion', $current_version, $ui_text);
-			$ui_text = str_replace('%newversion', $new_version, $ui_text);
+			if ($version != $current_version) {
+				$ui_text = str_replace('%curversion', $current_version, $ui_text);
+				$ui_text = str_replace('%newversion', $new_version, $ui_text);
+			} else {
+				// show db version
+				$ui_text = str_replace('%curversion', $current_db_version, $ui_text);
+				$ui_text = str_replace('%newversion', $new_db_version, $ui_text);
+			}
 			$update_information = $ui_text;
 
-			include_once './install/updates/preconfig.php';
-			$preconfig = getPreConfig($current_version);
+			include_once \Froxlor\Froxlor::getInstallDir() . '/install/updates/preconfig.php';
+			$preconfig = getPreConfig($current_version, $current_db_version);
 			if ($preconfig != '') {
 				$update_information .= '<br />' . $preconfig . $message;
 			}
 
 			$update_information .= $lng['update']['update_information']['part_b'];
 
-			eval("echo \"" . getTemplate('update/index') . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/index') . "\";");
 		}
 	} else {
-		/*
-		 * @TODO version-webcheck check here
-		 */
 		$success_message = $lng['update']['noupdatesavail'];
 		$redirect_url = 'admin_index.php?s=' . $s;
-		eval("echo \"" . getTemplate('update/noupdatesavail') . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/noupdatesavail') . "\";");
 	}
 }

api.php

@@ -0,0 +1,88 @@
+<?php
+use voku\helper\AntiXSS;
+
+require __DIR__ . '/vendor/autoload.php';
+
+require \Froxlor\Froxlor::getInstallDir() . '/lib/tables.inc.php';
+
+// check whether API interface is enabled after all
+if (\Froxlor\Settings::Get('api.enabled') != 1) {
+	// not enabled
+	header("Status: 404 Not found", 404);
+	header($_SERVER["SERVER_PROTOCOL"] . " 404 Not found", 404);
+	exit();
+}
+
+// we're talking json here
+header("Content-Type:application/json");
+
+// get our request
+$request = @file_get_contents('php://input');
+
+// check if present
+if (empty($request)) {
+	json_response(400, "Invalid request");
+}
+
+// decode json request
+$decoded_request = json_decode($request, true);
+
+// is it valid?
+if (is_null($decoded_request)) {
+	json_response(400, "Invalid JSON");
+}
+
+/**
+ * check for xss attempts and clean request
+ */
+$antiXss = new AntiXSS();
+$request = $antiXss->xss_clean($request);
+
+// validate content
+try {
+	$decoded_request = stripcslashes_deep($decoded_request);
+	$request = \Froxlor\Api\FroxlorRPC::validateRequest($decoded_request);
+	// now actually do it
+	$cls = "\\Froxlor\\Api\\Commands\\" . $request['command']['class'];
+	$method = $request['command']['method'];
+	$apiObj = new $cls($decoded_request['header'], $request['params']);
+	// call the method with the params if any
+	echo $apiObj->$method();
+} catch (Exception $e) {
+	json_response($e->getCode(), $e->getMessage());
+}
+
+exit();
+
+/**
+ * output json result
+ *
+ * @param int $status
+ * @param string $status_message
+ * @param mixed $data
+ *
+ * @return void
+ */
+function json_response($status, $status_message = '', $data = null)
+{
+	if (isset($_SERVER["SERVER_PROTOCOL"]) && ! empty($_SERVER["SERVER_PROTOCOL"])) {
+		$resheader = $_SERVER["SERVER_PROTOCOL"] . " " . $status;
+		if (! empty($status_message)) {
+			$resheader .= ' ' . str_replace("\n", " ", $status_message);
+		}
+		header($resheader);
+	}
+	$response = array();
+	$response['status'] = $status;
+	$response['status_message'] = $status_message;
+	$response['data'] = $data;
+
+	$json_response = json_encode($response, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+	echo $json_response;
+	exit();
+}
+
+function stripcslashes_deep($value)
+{
+	return is_array($value) ? array_map('stripcslashes_deep', $value) : stripcslashes($value);
+}

api_keys.php

@@ -0,0 +1,235 @@
+<?php
+if (! defined('AREA')) {
+	header("Location: index.php");
+	exit();
+}
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2018 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Froxlor team <team@froxlor.org> (2018-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Panel
+ * @since 0.10.0
+ *       
+ */
+
+use Froxlor\Database\Database;
+
+// This file is being included in admin_index and customer_index
+// and therefore does not need to require lib/init.php
+
+$del_stmt = Database::prepare("DELETE FROM `" . TABLE_API_KEYS . "` WHERE id = :id");
+$success_message = "";
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+$area = AREA;
+
+// do the delete and then just show a success-message and the apikeys list again
+if ($action == 'delete') {
+	if ($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, array(
+				'id' => $id,
+				'cid' => $userinfo['customerid']
+			));
+		} elseif (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
+			$chk_stmt = Database::prepare("
+				SELECT a.adminid FROM `" . TABLE_PANEL_ADMINS . "` a
+				LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.adminid = a.adminid
+				WHERE ak.`id` = :id AND a.`adminid` = :aid
+			");
+			$chk = Database::pexecute_first($chk_stmt, array(
+				'id' => $id,
+				'aid' => $userinfo['adminid']
+			));
+		}
+		if ($chk !== false) {
+			Database::pexecute($del_stmt, array(
+				'id' => $id
+			));
+			$success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
+		}
+	}
+} elseif ($action == 'add') {
+	$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, array(
+		'key' => $key,
+		'secret' => $secret,
+		'aid' => $userinfo['adminid'],
+		'cid' => $cid
+	));
+	$success_message = $lng['apikeys']['apikey_added'];
+} elseif ($action == 'jqEditApiKey') {
+	$keyid = isset($_POST['id']) ? (int) $_POST['id'] : 0;
+	$allowed_from = isset($_POST['allowed_from']) ? $_POST['allowed_from'] : "";
+	$valid_until = isset($_POST['valid_until']) ? (int) $_POST['valid_until'] : - 1;
+
+	// validate allowed_from
+	if (! empty($allowed_from)) {
+		$ip_list = array_map('trim', explode(",", $allowed_from));
+		$_check_list = $ip_list;
+		foreach ($_check_list as $idx => $ip) {
+			if (\Froxlor\Validate\Validate::validate_ip2($ip, true, 'invalidip', true, true) == false) {
+				unset($ip_list[$idx]);
+			}
+		}
+		$ip_list = array_map('inet_ntop', array_map('inet_pton', $ip_list));
+		$allowed_from = implode(",", array_unique($ip_list));
+	}
+
+	if ($valid_until <= 0 || ! is_numeric($valid_until)) {
+		$valid_until = - 1;
+	}
+
+	$upd_stmt = Database::prepare("
+		UPDATE `" . TABLE_API_KEYS . "` SET
+		`valid_until` = :vu, `allowed_from` = :af
+		WHERE `id` = :keyid AND `adminid` = :aid AND `customerid` = :cid
+	");
+	if (AREA == 'admin') {
+		$cid = 0;
+	} elseif (AREA == 'customer') {
+		$cid = $userinfo['customerid'];
+	}
+	Database::pexecute($upd_stmt, array(
+		'keyid' => $keyid,
+		'af' => $allowed_from,
+		'vu' => $valid_until,
+		'aid' => $userinfo['adminid'],
+		'cid' => $cid
+	));
+	echo json_encode(true);
+	exit();
+}
+
+$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed api::api_keys");
+
+// select all my (accessible) certificates
+$keys_stmt_query = "SELECT ak.*, c.loginname, a.loginname as adminname
+	FROM `" . TABLE_API_KEYS . "` ak
+	LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` c ON `c`.`customerid` = `ak`.`customerid`
+	LEFT JOIN `" . TABLE_PANEL_ADMINS . "` a ON `a`.`adminid` = `ak`.`adminid`
+	WHERE ";
+
+$qry_params = array();
+if (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
+	// admin with only customer-specific permissions
+	$keys_stmt_query .= "ak.adminid = :adminid ";
+	$qry_params['adminid'] = $userinfo['adminid'];
+	$fields = array(
+		'a.loginname' => $lng['login']['username']
+	);
+} elseif (AREA == 'customer') {
+	// customer-area
+	$keys_stmt_query .= "ak.customerid = :cid ";
+	$qry_params['cid'] = $userinfo['customerid'];
+	$fields = array(
+		'c.loginname' => $lng['login']['username']
+	);
+} else {
+	// admin who can see all customers / reseller / admins
+	$keys_stmt_query .= "1 ";
+	$fields = array(
+		'a.loginname' => $lng['login']['username']
+	);
+}
+
+$paging = new \Froxlor\UI\Paging($userinfo, TABLE_API_KEYS, $fields);
+$keys_stmt_query .= $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit();
+
+$keys_stmt = Database::prepare($keys_stmt_query);
+Database::pexecute($keys_stmt, $qry_params);
+$all_keys = $keys_stmt->fetchAll(PDO::FETCH_ASSOC);
+$apikeys = "";
+
+if (count($all_keys) == 0) {
+	$count = 0;
+	$message = $lng['apikeys']['no_api_keys'];
+	$sortcode = "";
+	$searchcode = "";
+	$pagingcode = "";
+	eval("\$apikeys.=\"" . \Froxlor\UI\Template::getTemplate("api_keys/keys_error", true) . "\";");
+} else {
+	$count = count($all_keys);
+	$paging->setEntries($count);
+	$sortcode = $paging->getHtmlSortCode($lng);
+	$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
+	$searchcode = $paging->getHtmlSearchCode($lng);
+	$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+
+	foreach ($all_keys as $idx => $key) {
+		if ($paging->checkDisplay($idx)) {
+
+			// my own key
+			$isMyKey = false;
+			if ($key['adminid'] == $userinfo['adminid'] && ((AREA == 'admin' && $key['customerid'] == 0) || (AREA == 'customer' && $key['customerid'] == $userinfo['customerid']))) {
+				// this is mine
+				$isMyKey = true;
+			}
+
+			$adminCustomerLink = "";
+			if (AREA == 'admin') {
+				if ($isMyKey) {
+					$adminCustomerLink = $key['adminname'];
+				} else {
+					$adminCustomerLink = '<a href="' . $linker->getLink(array(
+						'section' => (empty($key['customerid']) ? 'admins' : 'customers'),
+						'page' => (empty($key['customerid']) ? 'admins' : 'customers'),
+						'action' => 'su',
+						'id' => (empty($key['customerid']) ? $key['adminid'] : $key['customerid'])
+					)) . '" rel="external">' . (empty($key['customerid']) ? $key['adminname'] : $key['loginname']) . '</a>';
+				}
+			} else {
+				// customer do not need links
+				$adminCustomerLink = $key['loginname'];
+			}
+
+			// escape stuff
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($key);
+
+			// shorten keys
+			$row['_apikey'] = substr($row['apikey'], 0, 20) . '...';
+			$row['_secret'] = substr($row['secret'], 0, 20) . '...';
+
+			// check whether the api key is not valid anymore
+			$isValid = true;
+			if ($row['valid_until'] >= 0) {
+				if ($row['valid_until'] < time()) {
+					$isValid = false;
+				}
+				// format
+				$row['valid_until'] = date('Y-m-d', $row['valid_until']);
+			} else {
+				// infinity
+				$row['valid_until'] = "";
+			}
+			eval("\$apikeys.=\"" . \Froxlor\UI\Template::getTemplate("api_keys/keys_key", true) . "\";");
+		} else {
+			continue;
+		}
+	}
+}
+eval("echo \"" . \Froxlor\UI\Template::getTemplate("api_keys/keys_list", true) . "\";");

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

@@ -1 +0,0 @@
-*

composer.json

@@ -0,0 +1,82 @@
+{
+	"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"
+		},
+		{
+			"name": "Robert Förster",
+			"email": "team@froxlor.org",
+			"role": "Package Maintainer"
+		}
+	],
+	"support": {
+		"email": "team@froxlor.org",
+		"issues": "https://github.com/Froxlor/Froxlor/issues",
+		"forum": "https://forum.froxlor.org/",
+		"wiki": "https://github.com/Froxlor/Froxlor/wiki",
+		"irc": "irc://irc.libera.chat/froxlor",
+		"source": "https://github.com/Froxlor/Froxlor",
+		"docs": "https://github.com/Froxlor/Froxlor/wiki"
+	},
+	"require": {
+		"php": ">=7.1",
+		"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": "*",
+		"phpmailer/phpmailer": "~6.0",
+		"monolog/monolog": "^1.24",
+		"robthree/twofactorauth": "^1.6",
+		"froxlor/idna-convert-legacy": "^2.1",
+		"voku/anti-xss": "^4.1"
+    },
+	"require-dev": {
+		"phpunit/phpunit": "^9",
+		"php": ">=7.3",
+		"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"
+	},
+	"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"
+	}
+}

css/jquery.jqplot.min.css

@@ -1 +0,0 @@
-.jqplot-target{position:relative;color:#666;font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;font-size:1em}.jqplot-axis{font-size:.75em}.jqplot-xaxis{margin-top:10px}.jqplot-x2axis{margin-bottom:10px}.jqplot-yaxis{margin-right:10px}.jqplot-y2axis,.jqplot-y3axis,.jqplot-y4axis,.jqplot-y5axis,.jqplot-y6axis,.jqplot-y7axis,.jqplot-y8axis,.jqplot-y9axis,.jqplot-yMidAxis{margin-left:10px;margin-right:10px}.jqplot-axis-tick,.jqplot-xaxis-tick,.jqplot-yaxis-tick,.jqplot-x2axis-tick,.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick,.jqplot-yMidAxis-tick{position:absolute;white-space:pre}.jqplot-xaxis-tick{top:0;left:15px;vertical-align:top}.jqplot-x2axis-tick{bottom:0;left:15px;vertical-align:bottom}.jqplot-yaxis-tick{right:0;top:15px;text-align:right}.jqplot-yaxis-tick.jqplot-breakTick{right:-20px;margin-right:0;padding:1px 5px 1px 5px;z-index:2;font-size:1.5em}.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick{left:0;top:15px;text-align:left}.jqplot-yMidAxis-tick{text-align:center;white-space:nowrap}.jqplot-xaxis-label{margin-top:10px;font-size:11pt;position:absolute}.jqplot-x2axis-label{margin-bottom:10px;font-size:11pt;position:absolute}.jqplot-yaxis-label{margin-right:10px;font-size:11pt;position:absolute}.jqplot-yMidAxis-label{font-size:11pt;position:absolute}.jqplot-y2axis-label,.jqplot-y3axis-label,.jqplot-y4axis-label,.jqplot-y5axis-label,.jqplot-y6axis-label,.jqplot-y7axis-label,.jqplot-y8axis-label,.jqplot-y9axis-label{font-size:11pt;margin-left:10px;position:absolute}.jqplot-meterGauge-tick{font-size:.75em;color:#999}.jqplot-meterGauge-label{font-size:1em;color:#999}table.jqplot-table-legend{margin-top:12px;margin-bottom:12px;margin-left:12px;margin-right:12px}table.jqplot-table-legend,table.jqplot-cursor-legend{background-color:rgba(255,255,255,0.6);border:1px solid #ccc;position:absolute;font-size:.75em}td.jqplot-table-legend{vertical-align:middle}td.jqplot-seriesToggle:hover,td.jqplot-seriesToggle:active{cursor:pointer}.jqplot-table-legend .jqplot-series-hidden{text-decoration:line-through}div.jqplot-table-legend-swatch-outline{border:1px solid #ccc;padding:1px}div.jqplot-table-legend-swatch{width:0;height:0;border-top-width:5px;border-bottom-width:5px;border-left-width:6px;border-right-width:6px;border-top-style:solid;border-bottom-style:solid;border-left-style:solid;border-right-style:solid}.jqplot-title{top:0;left:0;padding-bottom:.5em;font-size:1.2em}table.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em}.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px}.jqplot-highlighter-tooltip,.jqplot-canvasOverlay-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px}.jqplot-point-label{font-size:.75em;z-index:2}td.jqplot-cursor-legend-swatch{vertical-align:middle;text-align:center}div.jqplot-cursor-legend-swatch{width:1.2em;height:.7em}.jqplot-error{text-align:center}.jqplot-error-message{position:relative;top:46%;display:inline-block}div.jqplot-bubble-label{font-size:.8em;padding-left:2px;padding-right:2px;color:rgb(20%,20%,20%)}div.jqplot-bubble-label.jqplot-bubble-label-highlight{background:rgba(90%,90%,90%,0.7)}div.jqplot-noData-container{text-align:center;background-color:rgba(96%,96%,96%,0.3)}

customer_aps.php

@@ -1,34 +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');
-
-$Id = 0;
-if (isset($_GET['id'])) {
-    $Id = (int)$_GET['id'];
-}
-if (isset($_POST['id'])) {
-    $Id = (int)$_POST['id'];
-}
-
-eval("echo \"" . getTemplate('aps/header') . "\";");
-$Aps = new ApsParser($userinfo, $settings, $db);
-$Aps->MainHandler($action);
-eval("echo \"" . getTemplate('aps/footer') . "\";");

customer_autoresponder.php

@@ -1,252 +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');
-
-if ($action == 'add') {
-	// Create new autoresponder
-	if (isset($_POST['send'])
-	   && $_POST['send'] == 'send'
-	) {
-		$account = trim($_POST['account']);
-		$subject = trim($_POST['subject']);
-		$message = trim($_POST['message']);
-
-		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
-		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
-
-		/*
-		 * @TODO validate date (DD-MM-YYYY)
-		 */
-		$ts_from = -1;
-		$ts_until = -1;
-
-		if ($date_from_off > -1) {
-			$date_from = $_POST['date_from'];
-			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
-		}
-		if ($date_until_off > -1) {
-			$date_until = $_POST['date_until'];
-			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
-		}
-
-		if (empty($account)
-		   || empty($subject)
-		   || empty($message)
-		) {
-			standard_error('missingfields');
-		}
-
-		// Does account exist?
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-		if ($db->num_rows($result) == 0) {
-			standard_error('accountnotexisting');
-		}
-
-		// Does autoresponder exist?
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-		if ($db->num_rows($result) == 1) {
-			standard_error('autoresponderalreadyexists');
-		}
-
-		$db->query("INSERT INTO `" . TABLE_MAIL_AUTORESPONDER . "`
-			SET `email` = '" . $db->escape($account) . "',
-			`message` = '" . $db->escape($message) . "',
-			`enabled` = '" . (int)$_POST['active'] . "',
-			`date_from` = '" . (int)$ts_from . "',
-			`date_until` = '" . (int)$ts_until . "',
-			`subject` = '" . $db->escape($subject) . "',
-			`customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
-			");
-		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` + 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	// Get accounts
-	$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`) ORDER BY email ASC");
-	if ($db->num_rows($result) == 0) {
-		standard_error('noemailaccount');
-	}
-
-	$accounts = '';
-	while ($row = $db->fetch_array($result)) {
-		$accounts .= '<option value="' . $row['email'] . '">' . $row['email'] . '</option>';
-	}
-
-	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
-	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
-
-	//$isactive = makeyesno('active', '1', '0', '1');
-
-	$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_add.php';
-	$autoresponder_add_form = htmlform::genHTMLForm($autoresponder_add_data);
-
-	$title = $autoresponder_add_data['autoresponder_add']['title'];
-	$image = $autoresponder_add_data['autoresponder_add']['image'];
-
-	eval("echo \"" . getTemplate('autoresponder/autoresponder_add') . "\";");
-} elseif ($action == 'edit') {
-	// Edit autoresponder
-	if (isset($_POST['send'])
-	   && $_POST['send'] == 'send'
-	) {
-		$account = trim($_POST['account']);
-		$subject = trim($_POST['subject']);
-		$message = trim($_POST['message']);
-
-		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
-		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
-
-		/*
-		 * @TODO validate date (DD-MM-YYYY)
-		 */
-		$ts_from = -1;
-		$ts_until = -1;
-
-		if ($date_from_off > -1) {
-			$date_from = $_POST['date_from'];
-			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
-		}
-		if ($date_until_off > -1) {
-			$date_until = $_POST['date_until'];
-			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
-		}
-
-		if (empty($account)
-		   || empty($subject)
-		   || empty($message)
-		) {
-			standard_error('missingfields');
-		}
-
-		// Does account exist?
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-		if ($db->num_rows($result) == 0)
-		{
-			standard_error('accountnotexisting');
-		}
-
-		// Does autoresponder exist?
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-		if ($db->num_rows($result) == 0) {
-			standard_error('invalidautoresponder');
-		}
-
-		$ResponderActive = (isset($_POST['active']) && $_POST['active'] == '1') ? 1 : 0;
-
-		$db->query("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "`
-			SET `message` = '" . $db->escape($message) . "',
-			`enabled` = '" . (int)$ResponderActive . "',
-			`date_from` = '" . (int)$ts_from . "',
-			`date_until` = '" . (int)$ts_until . "',
-			`subject` = '" . $db->escape($subject) . "'
-			WHERE `email` = '" . $db->escape($account) . "'
-			AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
-			");
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	$email = trim(htmlspecialchars($_GET['email']));
-
-	// Get account data
-	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($email) . "' LIMIT 0,1");
-	if ($db->num_rows($result) == 0) {
-		standard_error('invalidautoresponder');
-	}
-
-	$row = $db->fetch_array($result);
-	$subject = htmlspecialchars($row['subject']);
-	$message = htmlspecialchars($row['message']);
-
-	$date_from = (int)$row['date_from'];
-	$date_until = (int)$row['date_until'];
-
-	if ($date_from == -1) {
-		$deactivated = '-1';
-		$date_from = '';
-	} else {
-		$deactivated = '0';
-		$date_from = date('d-m-Y', $date_from);
-	}
-	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
-
-	if ($date_until == -1) {
-		$deactivated = '-1';
-		$date_until = '';
-	} else {
-		$deactivated = '0';
-		$date_until = date('d-m-Y', $date_until);
-	}
-	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
-
-	//$isactive = makeyesno('active', '1', '0', $row['enabled']);
-
-	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php';
-	$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
-
-	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
-	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
-
-	eval("echo \"" . getTemplate('autoresponder/autoresponder_edit') . "\";");
-} elseif ($action == 'delete') {
-	// Delete autoresponder
-	if (isset($_POST['send'])
-	   && $_POST['send'] == 'send'
-	) {
-		$account = trim($_POST['account']);
-
-		// Does autoresponder exist?
-		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-		if ($db->num_rows($result) == 0) {
-			standard_error('invalidautoresponder');
-		}
-
-		$db->query("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-			WHERE `email` = '" . $db->escape($account) . "'
-			AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "'
-			");
-		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` - 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'");
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	$email = trim(htmlspecialchars($_GET['email']));
-	ask_yesno('autoresponderdelete', $filename, array('action' => $action, 'account' => $email));
-} else {
-	// List existing autoresponders
-	$autoresponder = '';
-	$count = 0;
-	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC");
-
-	while ($row = $db->fetch_array($result)) {
-		if ($row['date_from'] == -1 && $row['date_until'] == -1) {
-			$activated_date = $lng['panel']['not_activated'];
-		} elseif($row['date_from'] == -1 && $row['date_until'] != -1) {
-			$activated_date = $lng['autoresponder']['date_until'].': '.date('d-m-Y', $row['date_until']);
-		} elseif($row['date_from'] != -1 && $row['date_until'] == -1) {
-			$activated_date = $lng['autoresponder']['date_from'].': '.date('d-m-Y', $row['date_from']);
-		} else {
-			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
-		}
-		eval("\$autoresponder.=\"" . getTemplate('autoresponder/autoresponder_autoresponder') . "\";");
-		$count++;
-	}
-
-	eval("echo \"" . getTemplate('autoresponder/autoresponder') . "\";");
-}

customer_extras.php

@@ -16,258 +16,174 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
+use Froxlor\Settings;
+use Froxlor\Api\Commands\DirOptions as DirOptions;
+use Froxlor\Api\Commands\DirProtections as DirProtections;
+use Froxlor\Api\Commands\CustomerBackups as CustomerBackups;
 
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
-	$id = intval($_POST['id']);
+// redirect if this customer page is hidden via settings
+if (Settings::IsInList('panel.customer_hide_options', 'extras')) {
+	\Froxlor\UI\Response::redirectTo('customer_index.php');
 }
-elseif(isset($_GET['id']))
-{
+
+if (isset($_POST['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 == 'backup')
-{
-    $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras_backup");
+if ($page == 'overview') {
+	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras");
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/extras") . "\";");
+} elseif ($page == 'htpasswds') {
 
-    $result = $db->query("SELECT `backup_enabled` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-    $row = $db->fetch_array($result);
+	// redirect if this customer sub-page is hidden via settings
+	if (Settings::IsInList('panel.customer_hide_options', 'extras.directoryprotection')) {
+		\Froxlor\UI\Response::redirectTo('customer_index.php');
+	}
 
-    $backup_enabled = makeyesno('backup_enabled', '1', '0', $row['backup_enabled']);
-
-    if(isset($_POST['send']) && $_POST['send'] == 'send'){
-	$backup_enabled = ($_POST['backup_enabled'] == '1' ? '1' : '0');
-	
-        $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `backup_enabled`='" . $backup_enabled . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-	redirectTo($filename, Array('page' => $page, 's' => $s));
-    }
-
-    $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'];
-    
-    eval("echo \"" . getTemplate("extras/backup") . "\";");
-}
-elseif($page == 'htpasswds')
-{
-	if($action == '')
-	{
-		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
+	if ($action == '') {
+		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
 		$fields = array(
 			'username' => $lng['login']['username'],
 			'path' => $lng['panel']['path']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_HTPASSWDS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		try {
+			// get total count
+			$json_result = DirProtections::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = DirProtections::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
 		$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 = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				if(strpos($row['path'], $userinfo['documentroot']) === 0)
-				{
-					$row['path'] = substr($row['path'], strlen($userinfo['documentroot']));
+		foreach ($result['list'] as $row) {
+			if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+				$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+			}
+			$row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']);
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			eval("\$htpasswds.=\"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_htpasswd") . "\";");
+			$count ++;
+		}
+
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds") . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = DirProtections::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if (isset($result['username']) && $result['username'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					DirProtections::getLocal($userinfo, $_POST)->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
+					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
-				$row = htmlentities_array($row);
-				eval("\$htpasswds.=\"" . getTemplate("extras/htpasswds_htpasswd") . "\";");
-				$count++;
-			}
-
-			$i++;
-		}
-
-		eval("echo \"" . getTemplate("extras/htpasswds") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-
-		if(isset($result['username'])
-		   && $result['username'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$db->query("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='$id'");
-				$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'] = substr($result['path'], strlen($userinfo['documentroot']));
-				}
-
-				ask_yesno('extras_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username'] . ' (' . $result['path'] . ')');
+				\Froxlor\UI\HTML::askYesNo('extras_reallydelete', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['username'] . ' (' . $result['path'] . ')');
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$path = makeCorrectDir(validate($_POST['path'], 'path'));
-			$userpath = $path;
-			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-			$username = validate($_POST['username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
-			$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
-			validate($_POST['directory_password'], 'password');
-			$username_path_check = $db->query_first("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `username`='" . $db->escape($username) . "' AND `path`='" . $db->escape($path) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				DirProtections::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+			$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 
-			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']);
-			}
-
-			if(!$_POST['path'])
-			{
-				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');
-			}
-			else
-			{
-				$db->query("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` (`customerid`, `username`, `password`, `path`, `authname`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', '" . $db->escape($password) . "', '" . $db->escape($path) . "', '" . $db->escape($authname) . "')");
-				$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'], $settings['panel']['pathedit']);
-
-			$htpasswd_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_add.php';
-			$htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data);
+			$htpasswd_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_add.php';
+			$htpasswd_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($htpasswd_add_data);
 
 			$title = $htpasswd_add_data['htpasswd_add']['title'];
 			$image = $htpasswd_add_data['htpasswd_add']['image'];
 
-			eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_add") . "\";");
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+	} elseif ($action == 'edit' && $id != 0) {
+		try {
+			$json_result = DirProtections::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$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');
-				$authname = validate($_POST['directory_authname'], 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/');
-
-				if(CRYPT_STD_DES == 1)
-				{
-					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
-					$password = crypt($_POST['directory_password'], $saltfordescrypt);
+		if (isset($result['username']) && $result['username'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					DirProtections::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-				else
-				{
-					$password = crypt($_POST['directory_password']);
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
+					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
-				$pwd_sql = '';
-				if($_POST['directory_password'] != '')
-				{
-					$pwd_sql = "`password`='" . $db->escape($password) . "' ";
-				}
+				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
-				$auth_sql = '';
-				if($authname != $result['authname'])
-				{
-					$auth_sql = "`authname`='" . $db->escape($authname) . "' ";
-				}
-
-				if($pwd_sql != '' || $auth_sql != '')
-				{
-					if($pwd_sql !='' && $auth_sql != '') {
-						$pwd_sql.= ', ';
-					}
-
-					$db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET ".$pwd_sql.$auth_sql." WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-					$log->logAction(USR_ACTION, LOG_INFO, "edited 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'] = substr($result['path'], strlen($userinfo['documentroot']));
-				}
-
-				$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);
+				$htpasswd_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
+				$htpasswd_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($htpasswd_edit_data);
 
 				$title = $htpasswd_edit_data['htpasswd_edit']['title'];
 				$image = $htpasswd_edit_data['htpasswd_edit']['image'];
 
-				eval("echo \"" . getTemplate("extras/htpasswds_edit") . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_edit") . "\";");
 			}
 		}
 	}
-}
-elseif($page == 'htaccess')
-{
-	if($action == '')
-	{
-		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
+} elseif ($page == 'htaccess') {
+
+	// redirect if this customer sub-page is hidden via settings
+	if (Settings::IsInList('panel.customer_hide_options', 'extras.pathoptions')) {
+		\Froxlor\UI\Response::redirectTo('customer_index.php');
+	}
+
+	if ($action == '') {
+		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
 		$fields = array(
 			'path' => $lng['panel']['path'],
 			'options_indexes' => $lng['extras']['view_directory'],
@@ -276,218 +192,210 @@ elseif($page == 'htaccess')
 			'error500path' => $lng['extras']['error500path'],
 			'options_cgi' => $lng['extras']['execute_perl']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_HTACCESS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		try {
+			// get total count
+			$json_result = DirOptions::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = DirOptions::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
 		$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 = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				if(strpos($row['path'], $userinfo['documentroot']) === 0)
-				{
-					$row['path'] = substr($row['path'], strlen($userinfo['documentroot']));
-					// don't show nothing wehn it's the docroot, show slash
-					if ($row['path'] == '') { $row['path'] = '/'; }
+		foreach ($result['list'] as $row) {
+			if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+				$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+			}
+			$row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']);
+			$row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']);
+			$row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']);
+			$row['options_cgi'] = str_replace('1', $lng['panel']['yes'], $row['options_cgi']);
+			$row['options_cgi'] = str_replace('0', $lng['panel']['no'], $row['options_cgi']);
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			eval("\$htaccess.=\"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_htaccess") . "\";");
+			$count ++;
+		}
+
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess") . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
+		try {
+			$json_result = DirOptions::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if (isset($result['customerid']) && $result['customerid'] != '' && $result['customerid'] == $userinfo['customerid']) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					DirOptions::getLocal($userinfo, $_POST)->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($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++;
-		}
-
-		eval("echo \"" . getTemplate("extras/htaccess") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
-		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-
-		if(isset($result['customerid'])
-		   && $result['customerid'] != ''
-		   && $result['customerid'] == $userinfo['customerid'])
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
-				$db->query("DELETE FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$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('id' => $id, 'page' => $page, 'action' => $action), str_replace($userinfo['documentroot'], '', $result['path']));
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				\Froxlor\UI\HTML::askYesNo('extras_reallydelete_pathoptions', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), str_replace($userinfo['documentroot'], '/', $result['path']));
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			$path = makeCorrectDir(validate($_POST['path'], 'path'));
-			$userpath = $path;
-			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-			$path_dupe_check = $db->query_first("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `path`='" . $db->escape($path) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
+	} elseif ($action == 'add') {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				DirOptions::getLocal($userinfo, $_POST)->add();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				's' => $s
+			));
+		} else {
+			$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+			$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
 
-			if(!$_POST['path'])
-			{
-				standard_error('invalidpath');
-			}
-
-			if(isset($_POST['options_cgi'])
-				&& (int)$_POST['options_cgi'] != 0
-			) {
-				$options_cgi = '1';
-			}
-			else
-			{
-				$options_cgi = '0';
-			} 
-
-			$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
-			{
-				$db->query('INSERT INTO `' . TABLE_PANEL_HTACCESS . '` SET
-							`customerid` = "'.(int)$userinfo['customerid'].'",
-							`path` = "'.$db->escape($path).'",
-							`options_indexes` = "'.$db->escape($_POST['options_indexes'] == '1' ? '1' : '0').'",
-							`error404path` = "'.$db->escape($error404path).'",
-							`error403path` = "'.$db->escape($error403path).'",
-							`error500path` = "'.$db->escape($error500path).'",
-							`options_cgi` = "'.$db->escape($options_cgi).'"');
-
-				$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'], $settings['panel']['pathedit']);
-			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-			/*
-			$options_indexes = makeyesno('options_indexes', '1', '0', '0');
-			$options_cgi = makeyesno('options_cgi', '1', '0', '0');
-			*/
-
-			$htaccess_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_add.php';
-			$htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data);
+			$htaccess_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_add.php';
+			$htaccess_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($htaccess_add_data);
 
 			$title = $htaccess_add_data['htaccess_add']['title'];
 			$image = $htaccess_add_data['htaccess_add']['image'];
 
-			eval("echo \"" . getTemplate("extras/htaccess_add") . "\";");
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_add") . "\";");
 		}
-	}
-	elseif(($action == 'edit')
-	       && ($id != 0))
-	{
-		$result = $db->query_first('SELECT * FROM `' . TABLE_PANEL_HTACCESS . '` WHERE `customerid` = "' . (int)$userinfo['customerid'] . '"  AND `id`         = "' . (int)$id . '"');
+	} elseif (($action == 'edit') && ($id != 0)) {
+		try {
+			$json_result = DirOptions::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$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']);
-				$options_cgi = isset($_POST['options_cgi']) ? intval($_POST['options_cgi']) : 0;
-
-				if($option_indexes != '1')
-				{
-					$option_indexes = '0';
+		if ((isset($result['customerid'])) && ($result['customerid'] != '') && ($result['customerid'] == $userinfo['customerid'])) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					DirOptions::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-
-				if($options_cgi != '1')
-				{
-					$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');
-					$db->query('UPDATE `' . TABLE_PANEL_HTACCESS . '` SET `options_indexes` = "' . $db->escape($option_indexes) . '", `error404path`    = "' . $db->escape($error404path) . '",  `error403path`    = "' . $db->escape($error403path) . '",  `error500path`    = "' . $db->escape($error500path) . '", `options_cgi` = "' . $db->escape($options_cgi) . '" WHERE `customerid` = "' . (int)$userinfo['customerid'] . '"  AND `id` = "' . (int)$id . '"');
-					$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'] = substr($result['path'], strlen($userinfo['documentroot']));
-					// don't show nothing wehn it's the docroot, show slash
-					if ($result['path'] == '') { $result['path'] = '/'; }
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			} else {
+				if (strpos($result['path'], $userinfo['documentroot']) === 0) {
+					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
 				$result['error404path'] = $result['error404path'];
 				$result['error403path'] = $result['error403path'];
 				$result['error500path'] = $result['error500path'];
-				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
+				$cperlenabled = \Froxlor\Customer\Customer::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);
+				 * $options_indexes = \Froxlor\UI\HTML::makeyesno('options_indexes', '1', '0', $result['options_indexes']);
+				 * $options_cgi = \Froxlor\UI\HTML::makeyesno('options_cgi', '1', '0', $result['options_cgi']);
+				 */
+				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
 
-				$htaccess_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_edit.php';
-				$htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data);
+				$htaccess_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_edit.php';
+				$htaccess_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($htaccess_edit_data);
 
 				$title = $htaccess_edit_data['htaccess_edit']['title'];
 				$image = $htaccess_edit_data['htaccess_edit']['image'];
 
-				eval("echo \"" . getTemplate("extras/htaccess_edit") . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_edit") . "\";");
 			}
 		}
 	}
-}
+} elseif ($page == 'backup') {
 
-?>
+	// redirect if this customer sub-page is hidden via settings
+	if (Settings::IsInList('panel.customer_hide_options', 'extras.backup')) {
+		\Froxlor\UI\Response::redirectTo('customer_index.php');
+	}
+
+	if (Settings::Get('system.backupenabled') == 1) {
+		if ($action == 'abort' && isset($_POST['send']) && $_POST['send'] == 'send') {
+			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "customer_extras::backup - aborted scheduled backupjob");
+			try {
+				CustomerBackups::getLocal($userinfo, $_POST)->delete();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			\Froxlor\UI\Response::standard_success('backupaborted');
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				'page' => $page,
+				'action' => '',
+				's' => $s
+			));
+		}
+		if ($action == '') {
+			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::backup");
+
+			// check whether there is a backup-job for this customer
+			try {
+				$json_result = CustomerBackups::getLocal($userinfo)->listing();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			$result = json_decode($json_result, true)['data'];
+			$existing_backupJob = null;
+			if ($result['count'] > 0) {
+				$existing_backupJob = array_shift($result['list']);
+			}
+
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					CustomerBackups::getLocal($userinfo, $_POST)->add();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				}
+				\Froxlor\UI\Response::standard_success('backupscheduled');
+			} else {
+
+				if (! empty($existing_backupJob)) {
+					$action = "abort";
+					$row = $existing_backupJob['data'];
+
+					$row['path'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['destdir']));
+					$row['backup_web'] = ($row['backup_web'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
+					$row['backup_mail'] = ($row['backup_mail'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
+					$row['backup_dbs'] = ($row['backup_dbs'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
+				}
+				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+				$backup_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.backup.php';
+				$backup_form = \Froxlor\UI\HtmlForm::genHTMLForm($backup_data);
+				$title = $backup_data['backup']['title'];
+				$image = $backup_data['backup']['image'];
+
+				if (! empty($existing_backupJob)) {
+					// overwrite backup_form after we took everything from it we needed
+					eval("\$backup_form = \"" . \Froxlor\UI\Template::getTemplate("extras/backup_listexisting") . "\";");
+				}
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/backup") . "\";");
+			}
+		}
+	} else {
+		\Froxlor\UI\Response::standard_error('backupfunctionnotenabled');
+	}
+}

customer_ftp.php

@@ -16,300 +16,225 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-require('./lib/init.php');
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+use Froxlor\Api\Commands\Ftps as Ftps;
+
+// redirect if this customer page is hidden via settings
+if (Settings::IsInList('panel.customer_hide_options', 'ftp')) {
+	\Froxlor\UI\Response::redirectTo('customer_index.php');
+}
 
 $id = 0;
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
 if ($page == 'overview') {
-	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . getTemplate('ftp/ftp') . "\";");
+	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/ftp') . "\";");
 } elseif ($page == 'accounts') {
 	if ($action == '') {
-		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
+		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
 		$fields = array(
 			'username' => $lng['login']['username'],
-			'homedir' => $lng['panel']['path']
+			'homedir' => $lng['panel']['path'],
+			'description' => $lng['panel']['ftpdesc']
 		);
-		$paging = new paging($userinfo, $db, TABLE_FTP_USERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . $userinfo['customerid'] . "'  AND `username` NOT LIKE '%_backup'" . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		try {
+			// get total count
+			$json_result = Ftps::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = Ftps::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+		$ftps_count = $paging->getEntries();
 		$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 = $db->fetch_array($result)) {
-			if ($paging->checkDisplay($i)) {
-				if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
-					$row['documentroot'] = substr($row['homedir'], strlen($userinfo['documentroot']));
-				} else {
-					$row['documentroot'] = $row['homedir'];
-				}
-
-				$row['documentroot'] = makeCorrectDir($row['documentroot']);
-				
-				$row = htmlentities_array($row);
-				eval("\$accounts.=\"" . getTemplate('ftp/accounts_account') . "\";");
-				$count++;
+		foreach ($result['list'] as $row) {
+			if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
+				$row['documentroot'] = str_replace($userinfo['documentroot'], "/", $row['homedir']);
+			} else {
+				$row['documentroot'] = $row['homedir'];
 			}
-
-			$i++;
+			$row['documentroot'] = \Froxlor\FileDir::makeCorrectDir($row['documentroot']);
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_account') . "\";");
+			$count ++;
 		}
 
-		$ftps_count = $db->num_rows($result);
-		eval("echo \"" . getTemplate('ftp/accounts') . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts') . "\";");
 	} elseif ($action == 'delete' && $id != 0) {
-		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+		try {
+			$json_result = Ftps::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
 
-		if (isset($result['username'])
-		   && $result['username'] != $userinfo['loginname']
-		) {
-			if (isset($_POST['send'])
-			   && $_POST['send'] == 'send'
-			) {
-				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `up_count`=`up_count`+'" . (int)$result['up_count'] . "', `up_bytes`=`up_bytes`+'" . (int)$result['up_bytes'] . "', `down_count`=`down_count`+'" . (int)$result['down_count'] . "', `down_bytes`=`down_bytes`+'" . (int)$result['down_bytes'] . "' WHERE `username`='" . $db->escape($userinfo['loginname']) . "'");
-				$result = $db->query_first("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($result['username']) . "'");
-				$db->query("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
-				$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=REPLACE(`members`,'," . $db->escape($result['username']) . "','') WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-
-				$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']);
+		if (isset($result['username']) && $result['username'] != $userinfo['loginname']) {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					Ftps::getLocal($userinfo, $_POST)->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-
-				$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`-1 $resetaccnumber WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				\Froxlor\UI\Response::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']);
+				\Froxlor\UI\HTML::askYesNoWithCheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array(
+					'id' => $id,
+					'page' => $page,
+					'action' => $action
+				), $result['username']);
 			}
 		} else {
-			standard_error('ftp_cantdeletemainaccount');
+			\Froxlor\UI\Response::standard_error('ftp_cantdeletemainaccount');
 		}
 	} elseif ($action == 'add') {
-		if ($userinfo['ftps_used'] < $userinfo['ftps']
-		   || $userinfo['ftps'] == '-1'
-		) {
-			if (isset($_POST['send'])
-			   && $_POST['send'] == 'send'
-			) {
-				// @FIXME use a good path-validating regex here (refs #1231)
-				$path = validate($_POST['path'], 'path');
-				$password = validate($_POST['ftp_password'], 'password');
-				$password = validatePassword($password);
-
-				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if ($sendinfomail != 1) {
-					$sendinfomail = 0;
-				}
-
-				if ($settings['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 = $db->query_first("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($ftpdomain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
-					if ($ftpdomain_check['domain'] != $ftpdomain) {
-						standard_error('maindomainnonexist', $domain);
-					}
-					$username = $ftpusername . "@" . $ftpdomain;
-				} else {
-					$username = $userinfo['loginname'] . $settings['customer']['ftpprefix'] . (intval($userinfo['ftp_lastaccountnumber']) + 1);
-				}
-				
-				$username_check = $db->query_first('SELECT * FROM `' . TABLE_FTP_USERS .'` WHERE `username` = \'' . $db->escape($username) . '\'');
-				
-				if (!empty($username_check) && $username_check['username'] = $username) {
-					standard_error('usernamealreadyexists', $username);
-				} elseif ($password == '') {
-					standard_error(array('stringisempty', 'mypassword'));
-				} elseif ($path == '') {
-					standard_error('patherror');
-				} else {
-					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-
-					$cryptPassword = makeCryptPassword($password);
-					$db->query("INSERT INTO `" . TABLE_FTP_USERS . "` (`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', '" . $db->escape($cryptPassword) . "', '" . $db->escape($path) . "', 'y', '" . (int)$userinfo['guid'] . "', '" . (int)$userinfo['guid'] . "')");
-					$result = $db->query("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $userinfo['loginname'] . "'");
-					while ($row = $db->fetch_array($result)) {
-						$db->query("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 ('" . $db->escape($username) . "', 'user', '" . $db->escape($row['bytes_in_used']) . "', '0', '0', '0', '0', '0')");
-					}
-					$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=CONCAT_WS(',',`members`,'" . $db->escape($username) . "') WHERE `customerid`='" . $userinfo['customerid'] . "' AND `gid`='" . (int)$userinfo['guid'] . "'");
-					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`+1, `ftp_lastaccountnumber`=`ftp_lastaccountnumber`+1 WHERE `customerid`='" . (int)$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(substr($path, strlen($userinfo['documentroot'])))
-						);
-						
-						$def_language = $userinfo['def_language'];
-						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_ftpaccount_by_customer_subject\'');
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_subject']), $replace_arr));
-						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_ftpaccount_by_customer_mailbody\'');
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['ftp_add']['infomail_body']['main']), $replace_arr));
-						
-						$_mailerror = false;
-						try {
-							$mail->Subject = $mail_subject;
-							$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();
-							$_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));
+		if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					Ftps::getLocal($userinfo, $_POST)->add();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], '/');
+				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
 
-				if ($settings['customer']['ftpatdomain'] == '1') {
+				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$domainlist = array();
 					$domains = '';
 
-					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+					$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 = $db->fetch_array($result_domains)) {
-						$domainlist[] =  $row_domain['domain'];
+					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
+						$domainlist[] = $row_domain['domain'];
 					}
 
 					sort($domainlist);
 
 					if (isset($domainlist[0]) && $domainlist[0] != '') {
 						foreach ($domainlist as $dom) {
-							$domains .= makeoption($idna_convert->decode($dom), $dom);
+							$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($dom), $dom);
 						}
 					}
 				}
 
-				//$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
+				if (Settings::Get('system.allow_customer_shell') == '1') {
+					$shells = \Froxlor\UI\HTML::makeoption("/bin/false", "/bin/false", "/bin/false");
+					$shells_avail = Settings::Get('system.available_shells');
+					if (! empty($shells_avail)) {
+						$shells_avail = explode(",", $shells_avail);
+						$shells_avail = array_map("trim", $shells_avail);
+						foreach ($shells_avail as $_shell) {
+							$shells .= \Froxlor\UI\HTML::makeoption($_shell, $_shell, "/bin/false");
+						}
+					}
+				}
 
-				$ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php';
-				$ftp_add_form = htmlform::genHTMLForm($ftp_add_data);
+				// $sendinfomail = \Froxlor\UI\HTML::makeyesno('sendinfomail', '1', '0', '0');
+
+				$ftp_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/ftp/formfield.ftp_add.php';
+				$ftp_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($ftp_add_data);
 
 				$title = $ftp_add_data['ftp_add']['title'];
 				$image = $ftp_add_data['ftp_add']['image'];
 
-				eval("echo \"" . getTemplate('ftp/accounts_add') . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_add') . "\";");
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `uid`, `gid` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+		try {
+			$json_result = Ftps::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($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)
-				$path = validate($_POST['path'], 'path');
-				
-				$_setnewpass = false;
-				if (isset($_POST['ftp_password']) && $_POST['ftp_password'] != '') {
-					$password = validate($_POST['ftp_password'], 'password');
-					$password = validatePassword($password);
-					$_setnewpass = true;
+		if (isset($result['username']) && $result['username'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					Ftps::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-
-				if ($_setnewpass) {
-					if ($password == '') {
-						standard_error(array('stringisempty', 'mypassword'));
-						exit;
-					}
-					$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
-					$cryptPassword = makeCryptPassword($password);
-					$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-						
-					// also update customers backup user password if password of main ftp user is changed
-					if(!preg_match('/' . $settings['customer']['ftpprefix'] . '/', $result['username'])){
-					    $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $result['username'] . "_backup'");
-					}
-				}
-				
-				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'] . "'");
-						$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `homedir`= '" . $db->escape($path) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");						
-					}
-				}
-
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
 				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
-					$homedir = substr($result['homedir'], strlen($userinfo['documentroot']));
+					$homedir = str_replace($userinfo['documentroot'], "/", $result['homedir']);
 				} else {
 					$homedir = $result['homedir'];
 				}
-				$homedir = makeCorrectDir($homedir);
+				$homedir = \Froxlor\FileDir::makeCorrectDir($homedir);
 
-				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $homedir);
+				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
 
-				if ($settings['customer']['ftpatdomain'] == '1') {
+				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$domains = '';
 
-					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+					$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 = $db->fetch_array($result_domains)) {
-						$domains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
+					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
+						$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}
 
-				$ftp_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_edit.php';
-				$ftp_edit_form = htmlform::genHTMLForm($ftp_edit_data);
+				if (Settings::Get('system.allow_customer_shell') == '1') {
+					$shells = \Froxlor\UI\HTML::makeoption("/bin/false", "/bin/false", $result['shell']);
+					$shells_avail = Settings::Get('system.available_shells');
+					if (! empty($shells_avail)) {
+						$shells_avail = explode(",", $shells_avail);
+						$shells_avail = array_map("trim", $shells_avail);
+						foreach ($shells_avail as $_shell) {
+							$shells .= \Froxlor\UI\HTML::makeoption($_shell, $_shell, $result['shell']);
+						}
+					}
+				}
+
+				$ftp_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/ftp/formfield.ftp_edit.php';
+				$ftp_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($ftp_edit_data);
 
 				$title = $ftp_edit_data['ftp_edit']['title'];
 				$image = $ftp_edit_data['ftp_edit']['image'];
 
-				eval("echo \"" . getTemplate('ftp/accounts_edit') . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_edit') . "\";");
 			}
 		}
 	}

customer_index.php

@@ -16,156 +16,367 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-require('./lib/init.php');
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+use Froxlor\Api\Commands\Customers as Customers;
 
 if ($action == 'logout') {
-	$log->logAction(USR_ACTION, LOG_NOTICE, 'logged out');
+	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'logged out');
 
-        $query = "DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'";
-	if ($settings['session']['allow_multiple_login'] == '1') {
-		$query .= " AND `hash` = '" . $s . "'";
+	$params = array(
+		"customerid" => $userinfo['customerid']
+	);
+	if (Settings::Get('session.allow_multiple_login') == '1') {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :customerid
+			AND `adminsession` = '0'
+			AND `hash` = :hash");
+		$params["hash"] = $s;
+	} else {
+		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+			WHERE `userid` = :customerid
+			AND `adminsession` = '0'");
 	}
-	$db->query($query);
-	redirectTo('index.php');
-	exit;
+	Database::pexecute($stmt, $params);
+
+	\Froxlor\UI\Response::redirectTo('index.php');
 }
 
 if ($page == 'overview') {
-	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_index");
+	$log->logAction(\Froxlor\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']
+	));
+
 	$domains = '';
-	$result = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `id` <> '" . (int)$userinfo['standardsubdomain'] . "' ");
 	$domainArray = array();
 
-	while ($row = $db->fetch_array($result)) {
+	while ($row = $domain_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$domainArray[] = $idna_convert->decode($row['domain']);
 	}
 
 	natsort($domainArray);
 	$domains = implode(',<br />', $domainArray);
+
+	// standard-subdomain
+	$stdsubdomain = '';
+	if ($userinfo['standardsubdomain'] != '0') {
+		$std_domain_stmt = Database::prepare("
+			SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :standardsubdomain
+		");
+		$std_domain = Database::pexecute_first($std_domain_stmt, array(
+			"customerid" => $userinfo['customerid'],
+			"standardsubdomain" => $userinfo['standardsubdomain']
+		));
+		$stdsubdomain = $std_domain['domain'];
+	}
+
 	$userinfo['email'] = $idna_convert->decode($userinfo['email']);
 	$yesterday = time() - (60 * 60 * 24);
 	$month = date('M Y', $yesterday);
 
-	/*		$traffic=$db->query_first("SELECT SUM(http) AS http_sum, SUM(ftp_up) AS ftp_up_sum, SUM(ftp_down) AS ftp_down_sum, SUM(mail) AS mail_sum FROM ".TABLE_PANEL_TRAFFIC." WHERE year='".date('Y')."' AND month='".date('m')."' AND day<='".date('d')."' AND customerid='".$userinfo['customerid']."'");
-		$userinfo['traffic_used']=$traffic['http_sum']+$traffic['ftp_up_sum']+$traffic['ftp_down_sum']+$traffic['mail_sum'];*/
+	// 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']
+	));
 
-	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
-	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages');
-	$opentickets = 0;
-	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                   WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                   AND `answerto` = "0"
-                                   AND (`status` = "0" OR `status` = "2")
-                                   AND `lastreplier`="1"');
-	$awaitingtickets = $opentickets['count'];
-	$awaitingtickets_text = '';
+	// get everything in bytes for the percentage calculation on the dashboard
+	$userinfo['diskspace_bytes'] = ($userinfo['diskspace'] > -1) ? $userinfo['diskspace'] * 1024 : -1;
+	$userinfo['traffic_bytes'] = ($userinfo['traffic'] > -1) ? $userinfo['traffic'] * 1024 : - 1;
+	$userinfo['traffic_bytes_used'] = $userinfo['traffic_used'] * 1024;
 
-	if ($opentickets > 0) {
-		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="customer_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
+	if ($usages) {
+		$userinfo['diskspace_used'] = \Froxlor\PhpHelper::sizeReadable($usages['webspace'] * 1024, null, 'bi');
+		$userinfo['mailspace_used'] = \Froxlor\PhpHelper::sizeReadable($usages['mail'] * 1024, null, 'bi');
+		$userinfo['dbspace_used'] = \Froxlor\PhpHelper::sizeReadable($usages['mysql'] * 1024, null, 'bi');
+		$userinfo['total_used'] = \Froxlor\PhpHelper::sizeReadable(($usages['webspace'] + $usages['mail'] + $usages['mysql']) * 1024, null, 'bi');
+		$userinfo['diskspace_bytes_used'] = $usages['webspace'] * 1024;
+		$userinfo['total_bytes_used'] = ($usages['webspace'] + $usages['mail'] + $usages['mysql']) * 1024;
+	} else {
+		$userinfo['diskspace_used'] = 0;
+		$userinfo['mailspace_used'] = 0;
+		$userinfo['dbspace_used'] = 0;
+		$userinfo['total_used'] = 0;
+		$userinfo['diskspace_bytes_used'] = 0;
+		$userinfo['total_bytes_used'] = 0;
 	}
+	$userinfo['diskspace'] = ($userinfo['diskspace'] > -1) ? \Froxlor\PhpHelper::sizeReadable($userinfo['diskspace'] * 1024, null, 'bi') : - 1;
+	$userinfo['traffic'] = ($userinfo['traffic'] > -1) ? \Froxlor\PhpHelper::sizeReadable($userinfo['traffic'] * 1024, null, 'bi') : - 1;
+	$userinfo['traffic_used'] = \Froxlor\PhpHelper::sizeReadable($userinfo['traffic_used'] * 1024, null, 'bi');
+	$userinfo = \Froxlor\PhpHelper::strReplaceArray('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace diskspace_bytes traffic traffic_bytes mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
 
-	eval("echo \"" . getTemplate('index/index') . "\";");
+	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
+
+	$services_enabled = "";
+	$se = array();
+	if ($userinfo['imap'] == '1')
+		$se[] = "IMAP";
+	if ($userinfo['pop3'] == '1')
+		$se[] = "POP3";
+	if ($userinfo['phpenabled'] == '1')
+		$se[] = "PHP";
+	if ($userinfo['perlenabled'] == '1')
+		$se[] = "Perl/CGI";
+	if ($userinfo['api_allowed'] == '1')
+		$se[] = '<a href="customer_index.php?s=' . $s . '&page=apikeys">API</a>';
+	$services_enabled = implode(", ", $se);
+
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/index') . "\";");
 } elseif ($page == 'change_password') {
+
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$old_password = validate($_POST['old_password'], 'old password');
-		if (md5($old_password) != $userinfo['password']) {
-			standard_error('oldpasswordnotcorrect');
-			exit;
+		$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
+
+		if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_CUSTOMERS, 'customerid')) {
+			\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
 		}
 
-		$new_password = validatePassword($_POST['new_password'], 'new password');
-		$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
+		try {
+			$new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], 'new password');
+			$new_password_confirm = \Froxlor\System\Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
 
 		if ($old_password == '') {
-			standard_error(array('stringisempty', 'oldpassword'));
-		} elseif($new_password == '') {
-			standard_error(array('stringisempty', 'newpassword'));
-		} elseif($new_password_confirm == '') {
-			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		} elseif($new_password != $new_password_confirm) {
-			standard_error('newpasswordconfirmerror');
+			\Froxlor\UI\Response::standard_error(array(
+				'stringisempty',
+				'oldpassword'
+			));
+		} elseif ($new_password == '') {
+			\Froxlor\UI\Response::standard_error(array(
+				'stringisempty',
+				'newpassword'
+			));
+		} elseif ($new_password_confirm == '') {
+			\Froxlor\UI\Response::standard_error(array(
+				'stringisempty',
+				'newpasswordconfirm'
+			));
+		} elseif ($new_password != $new_password_confirm) {
+			\Froxlor\UI\Response::standard_error('newpasswordconfirmerror');
 		} else {
-			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($new_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `password`='" . md5($old_password) . "'");
-			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');
+			// Update user password
+			try {
+				Customers::getLocal($userinfo, array(
+					'id' => $userinfo['customerid'],
+					'new_customer_password' => $new_password
+				))->update();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
+			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed password');
 
-			if (isset($_POST['change_main_ftp'])
-			   && $_POST['change_main_ftp'] == 'true'
-			) {
-				$cryptPassword = makeCryptPassword($new_password);
-				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
-				$log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password');
+			// Update ftp password
+			if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') {
+				$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($new_password);
+				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+					SET `password` = :password
+					WHERE `customerid` = :customerid
+					AND `username` = :username");
+				$params = array(
+					"password" => $cryptPassword,
+					"customerid" => $userinfo['customerid'],
+					"username" => $userinfo['loginname']
+				);
+				Database::pexecute($stmt, $params);
+				$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}
 
-			if (isset($_POST['change_webalizer'])
-			   && $_POST['change_webalizer'] == 'true'
-			) {
-				if (CRYPT_STD_DES == 1) {
-					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
-					$new_webalizer_password = crypt($new_password, $saltfordescrypt);
-				} else {
-					$new_webalizer_password = crypt($new_password);
-				}
+			// Update statistics password
+			if (isset($_POST['change_stats']) && $_POST['change_stats'] == 'true') {
+				$new_stats_password = \Froxlor\System\Crypt::makeCryptPassword($new_password, true);
 
-				$db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET `password`='" . $db->escape($new_webalizer_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
+					SET `password` = :password
+					WHERE `customerid` = :customerid
+					AND `username` = :username");
+				$params = array(
+					"password" => $new_stats_password,
+					"customerid" => $userinfo['customerid'],
+					"username" => $userinfo['loginname']
+				);
+				Database::pexecute($stmt, $params);
 			}
 
-			redirectTo($filename, Array('s' => $s));
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s
+			));
 		}
 	} else {
-		eval("echo \"" . getTemplate('index/change_password') . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_password') . "\";");
 	}
 } elseif ($page == 'change_language') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$def_language = validate($_POST['def_language'], 'default language');
+		$def_language = \Froxlor\Validate\Validate::validate($_POST['def_language'], 'default language');
 		if (isset($languages[$def_language])) {
-			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
-			$log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
-		}
+			try {
+				Customers::getLocal($userinfo, array(
+					'id' => $userinfo['customerid'],
+					'def_language' => $def_language
+				))->update();
+			} catch (Exception $e) {
+				\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			}
 
-		redirectTo($filename, Array('s' => $s));
+			// also update current session
+			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
+				SET `language` = :lang
+				WHERE `hash` = :hash");
+			Database::pexecute($stmt, array(
+				"lang" => $def_language,
+				"hash" => $s
+			));
+		}
+		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
 	} else {
-		$default_lang = $settings['panel']['standardlanguage'];
+		$default_lang = Settings::Get('panel.standardlanguage');
 		if ($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
 		$language_options = '';
-		while (list($language_file, $language_name) = each($languages)) {
-			$language_options .= makeoption($language_name, $language_file, $default_lang, true);
+		foreach ($languages as $language_file => $language_name) {
+			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $default_lang, true);
 		}
 
-		eval("echo \"" . getTemplate('index/change_language') . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_language') . "\";");
 	}
 } elseif ($page == 'change_theme') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$theme = validate($_POST['theme'], 'theme');
+		$theme = \Froxlor\Validate\Validate::validate($_POST['theme'], 'theme');
+		try {
+			Customers::getLocal($userinfo, array(
+				'id' => $userinfo['customerid'],
+				'theme' => $theme
+			))->update();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
 
-		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
-		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
-		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
-		redirectTo($filename, Array('s' => $s));
+		// also update current session
+		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "`
+			SET `theme` = :theme
+			WHERE `hash` = :hash");
+		Database::pexecute($stmt, array(
+			"theme" => $theme,
+			"hash" => $s
+		));
+
+		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
 	} else {
-		$default_theme = $settings['panel']['default_theme'];
+		$default_theme = Settings::Get('panel.default_theme');
 		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
 		$theme_options = '';
-		$themes_avail = getThemes();
-		foreach ($themes_avail as $t) {
-			$theme_options .= makeoption($t, $t, $default_theme, true);
+		$themes_avail = \Froxlor\UI\Template::getThemes();
+		foreach ($themes_avail as $t => $d) {
+			$theme_options .= \Froxlor\UI\HTML::makeoption($d, $t, $default_theme, true);
 		}
 
-		eval("echo \"" . getTemplate('index/change_theme') . "\";");
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_theme') . "\";");
 	}
+} elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_customer') == '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 = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . "/logs/");
+		$err_file = \Froxlor\FileDir::makeCorrectFile($err_dir . "/" . $errid . "_sql-error.log");
+
+		if (file_exists($err_file)) {
+
+			$error_content = file_get_contents($err_file);
+			$error = explode("|", $error_content);
+
+			$_error = array(
+				'code' => str_replace("\n", "", substr($error[1], 5)),
+				'message' => str_replace("\n", "", substr($error[2], 4)),
+				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(\Froxlor\Froxlor::getInstallDir()))),
+				'line' => str_replace("\n", "", substr($error[4], 5)),
+				'trace' => str_replace(\Froxlor\Froxlor::getInstallDir(), "", substr($error[5], 6))
+			);
+
+			// build mail-content
+			$mail_body = "Dear froxlor-team,\n\n";
+			$mail_body .= "the following error has been reported by a user:\n\n";
+			$mail_body .= "-------------------------------------------------------------\n";
+			$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
+			$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
+			$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
+			$mail_body .= "-------------------------------------------------------------\n\n";
+			$mail_body .= "Froxlor-version: " . $version . "\n";
+			$mail_body .= "DB-version: " . $dbversion . "\n\n";
+			$mail_body .= "End of report";
+			$mail_html = str_replace("\n", "<br />", $mail_body);
+
+			// send actual report to dev-team
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				// send mail and say thanks
+				$_mailerror = false;
+				try {
+					$mail->Subject = '[Froxlor] Error report by user';
+					$mail->AltBody = $mail_body;
+					$mail->MsgHTML($mail_html);
+					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
+					$mail->Send();
+				} catch (\PHPMailer\PHPMailer\Exception $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
+				}
+
+				if ($_mailerror) {
+					// error when reporting an error...LOLFUQ
+					\Froxlor\UI\Response::standard_error('send_report_error', $mailerr_msg);
+				}
+
+				// finally remove error from fs
+				@unlink($err_file);
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					's' => $s
+				));
+			}
+			// show a nice summary of the error-report
+			// before actually sending anything
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/send_error_report") . "\";");
+		} else {
+			\Froxlor\UI\Response::redirectTo($filename, array(
+				's' => $s
+			));
+		}
+	} else {
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			's' => $s
+		));
+	}
+} elseif ($page == 'apikeys' && Settings::Get('api.enabled') == 1) {
+	require_once __DIR__ . '/api_keys.php';
+} elseif ($page == '2fa' && Settings::Get('2fa.enabled') == 1) {
+	require_once __DIR__ . '/2fa.php';
 }

customer_logger.php

@@ -0,0 +1,120 @@
+<?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';
+
+use Froxlor\Api\Commands\SysLog;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+
+// redirect if this customer page is hidden via settings
+if (Settings::IsInList('panel.customer_hide_options', 'extras.logger')) {
+	\Froxlor\UI\Response::redirectTo('customer_index.php');
+}
+
+if ($page == 'log') {
+	if ($action == '') {
+		$fields = array(
+			'date' => $lng['logger']['date'],
+			'type' => $lng['logger']['type'],
+			'user' => $lng['logger']['user'],
+			'text' => $lng['logger']['action']
+		);
+		try {
+			// get total count
+			$json_result = SysLog::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = SysLog::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+		$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();
+
+		foreach ($result['list'] as $row) {
+
+			if (! isset($clog[$row['action']]) || ! is_array($clog[$row['action']])) {
+				$clog[$row['action']] = array();
+			}
+			$clog[$row['action']][$row['logid']] = $row;
+		}
+
+		if ($paging->sortfield == 'date' && $paging->sortorder == 'desc') {
+			krsort($clog);
+		} else {
+			ksort($clog);
+		}
+
+		$count = 0;
+		$log_count = 0;
+		$log = '';
+		foreach ($clog as $action => $logrows) {
+			$_action = 0;
+			foreach ($logrows as $row) {
+				// if ($paging->checkDisplay($i)) {
+				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+				$row['date'] = date("d.m.y H:i:s", $row['date']);
+
+				if ($_action != $action) {
+					switch ($action) {
+						case \Froxlor\FroxlorLogger::USR_ACTION:
+							$_action = $lng['admin']['customer'];
+							break;
+						case \Froxlor\FroxlorLogger::RES_ACTION:
+							$_action = $lng['logger']['reseller'];
+							break;
+						case \Froxlor\FroxlorLogger::ADM_ACTION:
+							$_action = $lng['logger']['admin'];
+							break;
+						case \Froxlor\FroxlorLogger::CRON_ACTION:
+							$_action = $lng['logger']['cron'];
+							break;
+						case \Froxlor\FroxlorLogger::LOGIN_ACTION:
+							$_action = $lng['logger']['login'];
+							break;
+						case \Froxlor\FroxlorLogger::LOG_ERROR:
+							$_action = $lng['logger']['intern'];
+							break;
+						default:
+							$_action = $lng['logger']['unknown'];
+							break;
+					}
+
+					$row['action'] = $_action;
+					eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_action') . "\";");
+				}
+
+				$log_count ++;
+				$row['type'] = \Froxlor\FroxlorLogger::getInstanceOf()->getLogLevelDesc($row['type']);
+				eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_log') . "\";");
+				$count ++;
+				$_action = $action;
+			}
+		}
+
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('logger/logger') . "\";");
+	}
+}

customer_mysql.php

@@ -16,276 +16,207 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'customer');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-$need_db_sql_data = true;
-$need_root_db_sql_data = true;
-require('./lib/init.php');
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+use Froxlor\Api\Commands\Mysqls as Mysqls;
+
+// redirect if this customer page is hidden via settings
+if (Settings::IsInList('panel.customer_hide_options', 'mysql')) {
+	\Froxlor\UI\Response::redirectTo('customer_index.php');
+}
+
+// get sql-root access data
+Database::needRoot(true);
+Database::needSqlData();
+$sql_root = Database::getSqlData();
+Database::needRoot(false);
 
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-} elseif(isset($_GET['id'])) {
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
 if ($page == 'overview') {
-	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
+	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
+	Database::needSqlData();
+	$sql = Database::getSqlData();
 	$lng['mysql']['description'] = str_replace('<SQL_HOST>', $sql['host'], $lng['mysql']['description']);
-	eval("echo \"" . getTemplate('mysql/mysql') . "\";");
-} elseif($page == 'mysqls') {
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysql') . "\";");
+} elseif ($page == 'mysqls') {
 	if ($action == '') {
-		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
+		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
 		$fields = array(
 			'databasename' => $lng['mysql']['databasename'],
 			'description' => $lng['mysql']['databasedescription']
 		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_DATABASES, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
+		try {
+			// get total count
+			$json_result = Mysqls::getLocal($userinfo)->listingCount();
+			$result = json_decode($json_result, true)['data'];
+			// initialize pagination and filtering
+			$paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result);
+			// get list
+			$json_result = Mysqls::getLocal($userinfo, $paging->getApiCommandParams())->listing();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		$mysqls_count = $paging->getEntries();
 		$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;
 		$mysqls = '';
 
+		$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `" . TABLE_PANEL_DATABASES . "`");
+		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+		$count_mysqlservers = $dbserver['numservers'];
+
 		// Begin root-session
-		$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-		while ($row = $db->fetch_array($result)) {
-			if ($paging->checkDisplay($i)) {
-				$row = htmlentities_array($row);
-				$mbdata = $db_root->query_first("SELECT SUM( data_length + index_length) / 1024 / 1024 'MB' FROM information_schema.TABLES WHERE table_schema = '" . $db_root->escape($row['databasename']) . "' GROUP BY table_schema ;");
-				$row['size'] = number_format($mbdata['MB'], 3, '.', '');
-				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
-				$count++;
+		Database::needRoot(true);
+		foreach ($result['list'] as $row) {
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			$mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES
+					WHERE table_schema = :table_schema
+					GROUP BY table_schema");
+			$mbdata = Database::pexecute_first($mbdata_stmt, array(
+				"table_schema" => $row['databasename']
+			));
+			if (!$mbdata) {
+				$mbdata = array('MB' => 0);
 			}
-			$i++;
+			$row['size'] = \Froxlor\PhpHelper::sizeReadable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+			eval("\$mysqls.=\"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_database') . "\";");
+			$count ++;
 		}
-		$db_root->close();
+		Database::needRoot(false);
 		// End root-session
 
-		$mysqls_count = $db->num_rows($result);
-		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
-	} elseif($action == 'delete' && $id != 0) {
-		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls') . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
 
-		if (isset($result['databasename'])
-		   && $result['databasename'] != ''
-		) {
-			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
+		try {
+			$json_result = Mysqls::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		}
+		$result = json_decode($json_result, true)['data'];
+
+		if (isset($result['databasename']) && $result['databasename'] != '') {
+
+			Database::needRoot(true, $result['dbserver']);
+			Database::needSqlData();
+			$sql_root = Database::getSqlData();
+			Database::needRoot(false);
+
+			if (! isset($sql_root[$result['dbserver']]) || ! is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
-			if (isset($_POST['send'])
-			   && $_POST['send'] == 'send'
-			) {
-				// Begin root-session
-				$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
-				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
-				if (mysql_get_server_info() < '5.0.2') { 
-					// Revoke privileges (only required for MySQL 4.1.2 - 5.0.1)
-					$db_root->query('REVOKE ALL PRIVILEGES, GRANT OPTION FROM \'' . $db_root->escape($result['databasename']) .'\'',false,true);
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					Mysqls::getLocal($userinfo, $_POST)->delete();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-
-				$host_res = $db_root->query("SELECT `Host` FROM `mysql`.`user` WHERE `User`='" . $db_root->escape($result['databasename']) . "'");
-				while ($host = $db_root->fetch_array($host_res)) {
-					// as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+)
-					$db_root->query('DROP USER \'' . $db_root->escape($result['databasename']). '\'@\'' . $db_root->escape($host['Host']) . '\'', false, true);
-				}
-
-				$db_root->query('DROP DATABASE IF EXISTS `' . $db_root->escape($result['databasename']) . '`');
-				$db_root->query('FLUSH PRIVILEGES');
-				$db_root->close();
-				// End root-session
-
-				$db->query('DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
-
-				$resetaccnumber = ($userinfo['mysqls_used'] == '1') ? " , `mysql_lastaccountnumber`='0' " : '';
-
-				$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`-1 ' . $resetaccnumber . 'WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
 				$dbnamedesc = $result['databasename'];
 				if (isset($result['description']) && $result['description'] != '') {
-					$dbnamedesc .= ' ('.$result['description'].')';
+					$dbnamedesc .= ' (' . $result['description'] . ')';
 				}
-				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
+				\Froxlor\UI\HTML::askYesNo('mysql_reallydelete', $filename, array(
+					'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;
-					if (count($sql_root) > 1) {
-						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
-						if (!isset($sql_root[$dbserver]) || !is_array($sql_root[$dbserver])) {
-							$dbserver = 0;
-						}
-					}
-					
-					// validate description before actual adding the database, #1052
-					$databasedescription = validate(trim($_POST['description']), 'description');
-
-					// Begin root-session
-					$db_root = new db($sql_root[$dbserver]['host'], $sql_root[$dbserver]['user'], $sql_root[$dbserver]['password'], '');
-
-					if (strtoupper($settings['customer']['mysqlprefix']) == 'RANDOM') {
-						$result = $db_root->query('SELECT `User` FROM mysql.user');
-						while ($row = $db_root->fetch_array($result)) {
-							$allsqlusers[] = $row[User];
-						}
-						$username = $userinfo['loginname'] . '-' . substr(md5(uniqid(microtime(), 1)), 20, 3);
-						while (in_array($username , $allsqlusers)) {
-							$username = $userinfo['loginname'] . '-' . substr(md5(uniqid(microtime(), 1)), 20, 3);
-						}
-					} else {
-						$username = $userinfo['loginname'] . $settings['customer']['mysqlprefix'] . (intval($userinfo['mysql_lastaccountnumber']) + 1);
-					}
-
-					$db_root->query('CREATE DATABASE `' . $db_root->escape($username) . '`');
-					$log->logAction(USR_ACTION, LOG_INFO, "created database '" . $username . "'");
-					foreach (array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host) {
-						$db_root->query('GRANT ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($username)) . '`.* TO `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` IDENTIFIED BY \'password\'');
-						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
-						$log->logAction(USR_ACTION, LOG_NOTICE, "grant all privileges for '" . $username . "'@'" . $mysql_access_host . "'");
-					}
-
-					$db_root->query('FLUSH PRIVILEGES');
-					$db_root->close();
-					// End root-session
-
-					// Statement modified for Database description -- PH 2004-11-29
-					$result = $db->query('INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databasename`, `description`, `dbserver`) VALUES ("' . (int)$userinfo['customerid'] . '", "' . $db->escape($username) . '", "' . $db->escape($databasedescription) . '", "' . $db->escape($dbserver) . '")');
-					$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
-
-					if ($sendinfomail == 1) {
-						$pma = $lng['admin']['notgiven'];
-						if ($settings['panel']['phpmyadmin_url'] != '') {
-							$pma = $settings['panel']['phpmyadmin_url'];
-						}
-
-						$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[$dbserver]['host'],
-							'PMA_URI' => $pma 
-						);
-						
-						$def_language = $userinfo['def_language'];
-						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_database_by_customer_subject\'');
-						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_subject']), $replace_arr));
-						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'new_database_by_customer_mailbody\'');
-						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['customer']['mysql_add']['infomail_body']['main']), $replace_arr));
-
-						$_mailerror = false;
-						try {
-							$mail->Subject = $mail_subject;
-							$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();
-							$_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));
+		if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					Mysqls::getLocal($userinfo, $_POST)->add();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
+
+				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`");
 				$mysql_servers = '';
-
-				foreach ($sql_root as $mysql_server => $mysql_server_details) {
-					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
+				$count_mysqlservers = 0;
+				while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) {
+					Database::needRoot(true, $dbserver['dbserver']);
+					Database::needSqlData();
+					$sql_root = Database::getSqlData();
+					$mysql_servers .= \Froxlor\UI\HTML::makeoption($sql_root['caption'], $dbserver['dbserver']);
+					$count_mysqlservers ++;
 				}
+				Database::needRoot(false);
 
-				//$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
-
-				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
-				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
+				$mysql_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/mysql/formfield.mysql_add.php';
+				$mysql_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($mysql_add_data);
 
 				$title = $mysql_add_data['mysql_add']['title'];
 				$image = $mysql_add_data['mysql_add']['image'];
 
-				eval("echo \"" . getTemplate('mysql/mysqls_add') . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_add') . "\";");
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"');
+		try {
+			$json_result = Mysqls::getLocal($userinfo, array(
+				'id' => $id
+			))->get();
+		} catch (Exception $e) {
+			\Froxlor\UI\Response::dynamic_error($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
-				$password = validate($_POST['mysql_password'], 'password');
-				if ($password != '') {
-					// validate password
-					$password = validatePassword($password);
-
-					// Begin root-session
-					$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
-					foreach (array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host) {
-						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
-					}
-
-					$db_root->query('FLUSH PRIVILEGES');
-					$db_root->close();
-					// End root-session
+		if (isset($result['databasename']) && $result['databasename'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				try {
+					$json_result = Mysqls::getLocal($userinfo, $_POST)->update();
+				} catch (Exception $e) {
+					\Froxlor\UI\Response::dynamic_error($e->getMessage());
 				}
-
-				// Update the Database description -- PH 2004-11-29
-				$log->logAction(USR_ACTION, LOG_INFO, "edited database '" . $result['databasename'] . "'");
-				$databasedescription = validate($_POST['description'], 'description');
-				$result = $db->query('UPDATE `' . TABLE_PANEL_DATABASES . '` SET `description`="' . $db->escape($databasedescription) . '" WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
-				redirectTo($filename, Array('page' => $page, 's' => $s));
+				\Froxlor\UI\Response::redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			} else {
-				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
-				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
+
+				$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'];
+
+				Database::needRoot(true, $result['dbserver']);
+				Database::needSqlData();
+				$sql_root = Database::getSqlData();
+				Database::needRoot(false);
+
+				$mysql_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/mysql/formfield.mysql_edit.php';
+				$mysql_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($mysql_edit_data);
 
 				$title = $mysql_edit_data['mysql_edit']['title'];
 				$image = $mysql_edit_data['mysql_edit']['image'];
 
-				eval("echo \"" . getTemplate('mysql/mysqls_edit') . "\";");
+				eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_edit') . "\";");
 			}
 		}
 	}

customer_tickets.php

@@ -1,446 +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');
-
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
-	$id = intval($_POST['id']);
-	
-	/*
-	 * Check if the current user is allowed to see the current ticket.
-	 */
-	$sql = "SELECT `id` FROM `panel_tickets` WHERE `id` = '".$id."' AND `customerid` = '".$userinfo['customerid']."'";
-	
-	$result = $db->query_first($sql);
-	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'],
-			'priority' => $lng['ticket']['priority'],
-			'lastchange' => $lng['ticket']['lastchange'],
-			'ticket_answers' => $lng['ticket']['ticket_answers'],
-			'subject' => $lng['ticket']['subject'],
-			'lastreplier' => $lng['ticket']['lastreplier']
-		);
-		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$paging->sortfield = 'lastchange';
-		$paging->sortorder = 'desc';
-		$result = $db->query('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`="' . (int)$userinfo['customerid'] . '" ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
-		$paging->setEntries($db->num_rows($result));
-		$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 = $db->fetch_array($result))
-		{
-			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']) > 20)
-				{
-					$row['subject'] = substr($row['subject'], 0, 17) . '...';
-				}
-
-				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
-				$count++;
-			}
-
-			$i++;
-		}
-
-		$supportavailable = 0;
-		$time = date("Hi", time());
-		$day = date("w", time());
-		$start = substr($settings['ticket']['worktime_begin'], 0, 2) . substr($settings['ticket']['worktime_begin'], 3, 2);
-		$end = substr($settings['ticket']['worktime_end'], 0, 2) . substr($settings['ticket']['worktime_end'], 3, 2);
-
-		if($time >= $start
-		   && $time <= $end)
-		{
-			$supportavailable = 1;
-		}
-
-		if($settings['ticket']['worktime_sat'] == "0"
-		   && $day == "6")
-		{
-			$supportavailable = 0;
-		}
-
-		if($settings['ticket']['worktime_sun'] == "0"
-		   && $day == "0")
-		{
-			$supportavailable = 0;
-		}
-
-		if($settings['ticket']['worktime_all'] == "1")
-		{
-			$supportavailable = 1;
-		}
-
-		$ticketsopen = 0;
-		$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                         WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                         AND `answerto` = "0"
-                                         AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
-
-		if($settings['ticket']['concurrently_open'] != - 1
-		   && $settings['ticket']['concurrently_open'] != '')
-		{
-			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => $settings['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, $db, $settings, -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') . "'");
-					$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
-                          SET `tickets_used`=`tickets_used`+1 WHERE `customerid`="' . (int)$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 = $db->query_first('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `adminid` = "' . $userinfo['adminid'] . '" ORDER BY `logicalorder`, `name` ASC');
-
-				if(isset($result['name'])
-				   && $result['name'] != '')
-				{
-					$result2 = $db->query('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `adminid` = "' . $userinfo['adminid'] . '" ORDER BY `logicalorder`, `name` ASC');
-
-					while($row = $db->fetch_array($result2))
-					{
-						$categories.= makeoption($row['name'], $row['id']);
-					}
-				}
-				else
-				{
-					$categories = makeoption($lng['ticket']['no_cat'], '0');
-				}
-
-				$priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']);
-				$priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']);
-				$priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']);
-				$ticketsopen = 0;
-				$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                           WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                           AND `answerto` = "0"
-                                           AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
-
-				if($settings['ticket']['concurrently_open'] != - 1
-				   && $settings['ticket']['concurrently_open'] != '')
-				{
-					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => $settings['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, $db, $settings, -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('customerid', (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, $db, $settings, (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, $db, $settings, (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 = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
-						FROM `' . TABLE_PANEL_CUSTOMERS . '`
-						WHERE `customerid` = "' . (int)$cid . '"'
-				);
-				$by = getCorrectFullUserDetails($usr);
-				//$by = $lng['ticket']['customer'];
-			}
-
-			$subject = $mainticket->Get('subject');
-			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
-			$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
-                                WHERE `id`="' . (int)$mainticket->Get('category') . '"');
-			$row = $db->fetch_array($result);
-			$andere = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKETS . '` WHERE `answerto`="' . (int)$id . '" ORDER BY `lastchange` ASC');
-
-			while($row2 = $db->fetch_array($andere))
-			{
-				$subticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$row2['id']);
-				$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));
-
-				if($subticket->Get('by') == '1')
-				{
-					$by = $lng['ticket']['staff'];
-				}
-				else
-				{
-					$by = getCorrectFullUserDetails($usr);
-					//$by = $lng['ticket']['customer'];
-				}
-
-				$subject = $subticket->Get('subject');
-				$message = $subticket->Get('message');
-				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 = $mainticket->Get('subject');
-			$ticket_replies_count = $db->num_rows($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, $db, $settings, (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, $db, $settings, (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 = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
-                                       WHERE `customerid` = "' . $userinfo['customerid'] . '"
-                                       AND `answerto` = "0"
-                                       AND (`status` = "0" OR `status` = "1" OR `status` = "2")');
-		$ticketsopen = (int)$opentickets['count'];
-
-		if($ticketsopen > $settings['ticket']['concurrently_open']
-		   && $settings['ticket']['concurrently_open'] != - 1
-		   && $settings['ticket']['concurrently_open'] != '')
-		{
-			standard_error('notmorethanxopentickets', $settings['ticket']['concurrently_open']);
-		}
-
-		$now = time();
-		$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (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

@@ -16,35 +16,30 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'customer');
-
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
 $intrafficpage = 1;
-require('./lib/init.php');
+require './lib/init.php';
+
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+
+// redirect if this customer page is hidden via settings
+if (Settings::IsInList('panel.customer_hide_options', 'traffic')) {
+	\Froxlor\UI\Response::redirectTo('customer_index.php');
+}
+
 $traffic = '';
 $month = null;
 $year = null;
 
-if (isset($_POST['month'])
-	&& isset($_POST['year'])
-) {
+if (isset($_POST['month']) && isset($_POST['year'])) {
 	$month = intval($_POST['month']);
 	$year = intval($_POST['year']);
-} elseif (isset($_GET['month'])
-	&& isset($_GET['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'
-) {
+} // BAM! $_GET???
+elseif (isset($_GET['page']) && $_GET['page'] == 'current') {
 	if (date('d') != '01') {
 		$month = date('m');
 		$year = date('Y');
@@ -59,22 +54,27 @@ elseif (isset($_GET['page'])
 	}
 }
 
-if (!is_null($month)
-	&& !is_null($year)) {
+if (! is_null($month) && ! is_null($year)) {
 	$traf['byte'] = 0;
-	$result = $db->query("SELECT
-                                SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail',
-                                `day`, `month`, `year`
-                             FROM `" . TABLE_PANEL_TRAFFIC . "`
-	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
-	                     AND `month` = '" . $month . "' AND `year` = '" . $year . "'
-	                     GROUP BY `day` ORDER BY `day` ASC");
+	$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`
+		FROM `" . TABLE_PANEL_TRAFFIC . "`
+		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 = $db->fetch_array($result)) {
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$http = $row['http'];
 		$ftp = $row['ftp_up'] + $row['ftp_down'];
 		$mail = $row['mail'];
@@ -85,47 +85,45 @@ if (!is_null($month)
 		$traf['day'] = $row['day'] . '.';
 
 		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($row['ftp_down'], 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
-			$traf['ftp'] = bcdiv($ftp, 1024, $settings['panel']['decimal_places']);
-			$traf['http'] = bcdiv($http, 1024, $settings['panel']['decimal_places']);
-			$traf['mail'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']);
-			$traf['byte'] = bcdiv($traf['byte'], 1024, $settings['panel']['decimal_places']);
+			$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['ftp'] = bcdiv($ftp, 1024, Settings::Get('panel.decimal_places'));
 		} else {
-			$traf['ftptext'] = round($row['ftp_up'] / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($row['ftp_down'] / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
-			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
-			$traf['http'] = round($http, $settings['panel']['decimal_places']);
-			$traf['ftp'] = round($ftp, $settings['panel']['decimal_places']);
-			$traf['mail'] = round($mail, $settings['panel']['decimal_places']);
-			$traf['byte'] = round($traf['byte'] / 1024, $settings['panel']['decimal_places']);
+			$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['ftp'] = round($ftp / 1024, Settings::Get('panel.decimal_places'));
 		}
 
-		eval("\$traffic.=\"" . getTemplate('traffic/traffic_month') . "\";");
+		getReadableTraffic($traf,'httptext', $http, 1024, "MiB (HTTP)");
+		getReadableTraffic($traf,'http', $http, 1024);
+		getReadableTraffic($traf,'mailtext', $mail, 1024, "MiB (Mail)");
+		getReadableTraffic($traf,'mail', $mail, 1024);
+		getReadableTraffic($traf,'byte', $traf['byte'], (1024 * 1024));
+
+		eval("\$traffic.=\"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_month') . "\";");
 		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
 	}
 
-	if (extension_loaded('bcmath')) {
-		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024, $settings['panel']['decimal_places']);
-	} else {
-		$traffic_complete['http'] = round($traffic_complete['http'] / 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024, $settings['panel']['decimal_places']);
-	}
+	$traffic_complete['http'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+	$traffic_complete['ftp'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+	$traffic_complete['mail'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
 
-	eval("echo \"" . getTemplate('traffic/traffic_details') . "\";");
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_details') . "\";");
 } else {
-	$result = $db->query("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` = '" . $userinfo['customerid'] . "'
-	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
+	$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`, `month`
+		ORDER 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 = $db->fetch_array($result)) {
+	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$http = $row['http'];
 		$ftp_up = $row['ftp_up'];
 		$ftp_down = $row['ftp_down'];
@@ -139,35 +137,34 @@ if (!is_null($month)
 		$traf['byte'] = $http + $ftp_up + $ftp_down + $mail;
 
 		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($ftp_up, 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($ftp_down, 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
-			$traf['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, $settings['panel']['decimal_places']);
-			$traf['http'] = bcdiv($http, 1024, $settings['panel']['decimal_places']);
-			$traf['mail'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']);
-			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, $settings['panel']['decimal_places']);
+			$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['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, Settings::Get('panel.decimal_places'));
 		} else {
-			$traf['ftptext'] = round($ftp_up / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($ftp_down / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
-			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
-			$traf['ftp'] = round(($ftp_up + $ftp_down) / 1024, $settings['panel']['decimal_places']);
-			$traf['http'] = round($http / 1024, $settings['panel']['decimal_places']);
-			$traf['mail'] = round($mail / 1024, $settings['panel']['decimal_places']);
-			$traf['byte'] = round($traf['byte'] / (1024 * 1024), $settings['panel']['decimal_places']);
+			$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['ftp'] = round(($ftp_up + $ftp_down) / 1024, Settings::Get('panel.decimal_places'));
 		}
 
-		eval("\$traffic.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
+		getReadableTraffic($traf,'httptext', $http, 1024, "MiB (HTTP)");
+		getReadableTraffic($traf,'http', $http, 1024);
+		getReadableTraffic($traf,'mailtext', $mail, 1024, "MiB (Mail)");
+		getReadableTraffic($traf,'mail', $mail, 1024);
+		getReadableTraffic($traf,'byte', $traf['byte'], (1024 * 1024));
+
+		eval("\$traffic.=\"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_traffic') . "\";");
 	}
 
-	if (extension_loaded('bcmath')) {
-		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024 * 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024 * 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024 * 1024, $settings['panel']['decimal_places']);
-	} else {
-		$traffic_complete['http'] = round($traffic_complete['http'] / (1024 * 1024), $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / (1024 * 1024), $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = round($traffic_complete['mail'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	}
+	$traffic_complete['http'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+	$traffic_complete['ftp'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+	$traffic_complete['mail'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
 
-	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('traffic/traffic') . "\";");
+}
+
+function getReadableTraffic(&$traf, $index, $value, $divisor, $desc = "")
+{
+	if (extension_loaded('bcmath')) {
+		$traf[$index] = bcdiv($value, $divisor,Settings::Get('panel.decimal_places')).(!empty($desc) ? " ".$desc : "");
+	} else {
+		$traf[$index] = round($value / $divisor, Settings::Get('panel.decimal_places')).(!empty($desc) ? " ".$desc : "");
+	}
 }

dns_editor.php

@@ -0,0 +1,132 @@
+<?php
+if (! defined('AREA')) {
+	header("Location: index.php");
+	exit();
+}
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Froxlor team <team@froxlor.org> (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Panel
+ *         
+ */
+
+use Froxlor\Api\Commands\DomainZones as DomainZones;
+
+// This file is being included in admin_domains and customer_domains
+// and therefore does not need to require lib/init.php
+
+$domain_id = isset($_GET['domain_id']) ? (int) $_GET['domain_id'] : null;
+
+$record = isset($_POST['record']['record']) ? trim($_POST['record']['record']) : null;
+$type = isset($_POST['record']['type']) ? $_POST['record']['type'] : 'A';
+$prio = isset($_POST['record']['prio']) ? (int) $_POST['record']['prio'] : null;
+$content = isset($_POST['record']['content']) ? trim($_POST['record']['content']) : null;
+$ttl = isset($_POST['record']['ttl']) ? (int) $_POST['record']['ttl'] : 18000;
+
+// get domain-name
+$domain = \Froxlor\Dns\Dns::getAllowedDomainEntry($domain_id, AREA, $userinfo);
+
+$errors = "";
+$success_message = "";
+
+// action for adding a new entry
+if ($action == 'add_record' && ! empty($_POST)) {
+	try {
+		DomainZones::getLocal($userinfo, array(
+			'id' => $domain_id,
+			'record' => $record,
+			'type' => $type,
+			'prio' => $prio,
+			'content' => $content,
+			'ttl' => $ttl
+		))->add();
+		$success_message = $lng['success']['dns_record_added'];
+		$record = $prio = $content = "";
+	} catch (Exception $e) {
+		$errors = str_replace("\n", "<br>", $e->getMessage());
+	}
+} elseif ($action == 'delete') {
+	// remove entry
+	$entry_id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+	if ($entry_id > 0) {
+		try {
+			DomainZones::getLocal($userinfo, array(
+				'entry_id' => $entry_id,
+				'id' => $domain_id
+			))->delete();
+			// success message (inline)
+			$success_message = $lng['success']['dns_record_deleted'];
+		} catch (Exception $e) {
+			$errors = str_replace("\n", "<br>", $e->getMessage());
+		}
+	}
+}
+
+// select all entries
+try {
+	// get list
+	$json_result = DomainZones::getLocal($userinfo, [
+		'id' => $domain_id
+	])->listing();
+} catch (Exception $e) {
+	\Froxlor\UI\Response::dynamic_error($e->getMessage());
+}
+$result = json_decode($json_result, true)['data'];
+$dom_entries = $result['list'];
+
+// show editor
+$record_list = "";
+$existing_entries = "";
+$type_select = "";
+$entriescount = 0;
+
+if (! empty($dom_entries)) {
+	$entriescount = count($dom_entries);
+	foreach ($dom_entries as $entry) {
+		$entry['content'] = wordwrap($entry['content'], 100, '<br>', true);
+		eval("\$existing_entries.=\"" . \Froxlor\UI\Template::getTemplate("dns_editor/entry_bit", true) . "\";");
+	}
+}
+
+// available types
+$type_select_values = array(
+	'A',
+	'AAAA',
+	'CAA',
+	'CNAME',
+	'DNAME',
+	'LOC',
+	'MX',
+	'NS',
+	'RP',
+	'SRV',
+	'SSHFP',
+	'TXT'
+);
+asort($type_select_values);
+foreach ($type_select_values as $_type) {
+	$type_select .= \Froxlor\UI\HTML::makeoption($_type, $_type, $type);
+}
+
+eval("\$record_list=\"" . \Froxlor\UI\Template::getTemplate("dns_editor/list", true) . "\";");
+
+try {
+	$json_result = DomainZones::getLocal($userinfo, array(
+		'id' => $domain_id
+	))->get();
+} catch (Exception $e) {
+	\Froxlor\UI\Response::dynamic_error($e->getMessage());
+}
+$result = json_decode($json_result, true)['data'];
+$zonefile = implode("\n", $result);
+
+eval("echo \"" . \Froxlor\UI\Template::getTemplate("dns_editor/index", true) . "\";");

doc/example/FroxlorAPI.php

@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2018 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2018-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    API-example
+ * @since      0.10.0
+ *
+ */
+class FroxlorAPI
+{
+
+	/**
+	 * URL to api.php of your froxlor installation
+	 *
+	 * @var string
+	 */
+	private $host = "";
+
+	/**
+	 * your api-key
+	 *
+	 * @var string
+	 */
+	private $api_key = "";
+
+	/**
+	 * your api-secret
+	 *
+	 * @var string
+	 */
+	private $api_secret = "";
+
+	/**
+	 * last cURL error message
+	 *
+	 * @var string
+	 */
+	private $last_error = "";
+
+	/**
+	 * last response header received
+	 *
+	 * @var array
+	 */
+	private $last_header = array();
+
+	/**
+	 * last response data received
+	 *
+	 * @var array
+	 */
+	private $last_body = array();
+
+	/**
+	 * create FroxlorAPI object
+	 *
+	 * @param string $host
+	 *        	URL to api.php of your froxlor installation
+	 * @param string $api_key
+	 *        	your api-key
+	 * @param string $api_secret
+	 *        	your api-secret
+	 *
+	 * @return FroxlorAPI
+	 */
+	public function __construct(string $host, string $api_key, string $api_secret)
+	{
+		$this->host = $host;
+		$this->api_key = $api_key;
+		$this->api_secret = $api_secret;
+	}
+
+	/**
+	 * send request to froxlor api
+	 *
+	 * @param string $command
+	 * @param array $params
+	 *
+	 * @return FroxlorAPI
+	 */
+	public function request(string $command, array $params = array()): FroxlorAPI
+	{
+	// build request array
+	$request = [
+		'header' => [
+			'apikey' => $this->api_key,
+			'secret' => $this->api_secret
+		],
+		'body' => [
+			'command' => $command
+		]
+	];
+
+	// add parameter to request-body if any
+	if (! empty($params)) {
+		$request['body']['params'] = $params;
+	}
+
+	// reset last data
+	$this->last_header = array();
+	$this->last_body = array();
+
+	// send actual request
+	$response = $this->requestCurl(json_encode($request));
+
+	// decode response
+	$resp = json_decode($response[1], true);
+	// set body to data-part of response
+	$this->last_body = $resp['data'];
+	// set header of response
+	$this->last_header = [
+		'status' => $resp['status'],
+		'status_message' => $resp['status_message']
+	];
+
+	// check for error in api response
+	if (isset($this->last_header['status']) && $this->last_header['status'] >= 400) {
+		// set last-error message
+		$this->last_error .= "[" . $this->last_header['status'] . "] " . $this->last_header['status_message'];
+	}
+
+	return $this;
+}
+
+	/**
+	 * returns last response header
+	 *
+	 * @return array status|status_message
+	 */
+	public function getLastHeader(): array
+	{
+		return $this->last_header;
+	}
+
+	/**
+	 * returns last response data
+	 *
+	 * @return array
+	 */
+	public function getLastResponse(): array
+	{
+		if (!empty($this->getLastError())) {
+			// nothing is returned when the last call
+			// was not successful
+			return [];
+		}
+		return $this->last_body;
+	}
+
+	/**
+	 * return last known error message
+	 *
+	 * @return string
+	 */
+	public function getLastError(): string
+	{
+		return $this->last_error;
+	}
+
+	/**
+	 * send cURL request to api
+	 *
+	 * @param string $data
+	 *        	json array
+	 *        	
+	 * @return array header|body
+	 */
+	private function requestCurl(string $data): array
+	{
+		// reset last error message
+		$this->last_error = "";
+
+		$ch = curl_init($this->host);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+			'Content-type: application/json'
+		));
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($ch, CURLOPT_VERBOSE, true);
+		curl_setopt($ch, CURLOPT_HEADER, 1);
+		$verbose = fopen('php://temp', 'w+');
+		curl_setopt($ch, CURLOPT_STDERR, $verbose);
+
+		if (! $data = curl_exec($ch)) {
+			$this->last_error = 'Curl execution error: ' . curl_error($ch) . "\n";
+			rewind($verbose);
+			$verboseLog = stream_get_contents($verbose);
+			$this->last_error .= "Verbose information: " . htmlspecialchars($verboseLog) . "\n";
+		}
+
+		$header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+		$header = substr($data, 0, $header_size);
+		$body = substr($data, $header_size);
+
+		curl_close($ch);
+		return array(
+			$header,
+			$body
+		);
+	}
+}

doc/example/create_customer.php

@@ -0,0 +1,48 @@
+<?php
+
+// include FroxlorAPI helper class
+require __DIR__ . '/FroxlorAPI.php';
+
+// create object of FroxlorAPI with URL, apikey and apisecret
+$fapi = new FroxlorAPI('https://froxlor.your-host.tld/api.php', 'your-api-key', 'your-api-secret');
+
+// customer data
+$data = [
+	'new_loginname' => 'test',
+	'email' => 'test@froxlor.org',
+	'firstname' => 'Test',
+	'name' => 'Testman',
+	'customernumber' => 1337,
+	'new_customer_password' => 's0mEcRypt1cpassword' . uniqid()
+];
+// send request
+$fapi->request('Customers.add', $data);
+
+// check for error
+if (! empty($fapi->getLastError())) {
+	echo "Error: " . $fapi->getLastError();
+	exit();
+}
+
+// get response of request
+$request = $fapi->getLastResponse();
+
+// view response data
+var_dump($request);
+
+/*
+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,22 @@
+<?php
+
+// include FroxlorAPI helper class
+require __DIR__ . '/FroxlorAPI.php';
+
+// create object of FroxlorAPI with URL, apikey and apisecret
+$fapi = new FroxlorAPI('https://froxlor.your-host.tld/api.php', 'your-api-key', 'your-api-secret');
+
+// send request
+$fapi->request('Froxlor.listFunctions');
+
+// check for error
+if (! empty($fapi->getLastError())) {
+	echo "Error: " . $fapi->getLastError();
+	exit();
+}
+
+// get response of request
+$request = $fapi->getLastResponse();
+
+// view response data
+var_dump($request);

index.php

@@ -16,46 +16,139 @@
  * @package    Panel
  *
  */
-
 define('AREA', 'login');
+require './lib/init.php';
 
-/**
- * Include our init.php, which manages Sessions, Language etc.
- */
-require ('./lib/init.php');
+use Froxlor\Database\Database;
+use Froxlor\Settings;
+use Froxlor\FroxlorLogger;
 
 if ($action == '') {
 	$action = 'login';
 }
 
-if ($action == 'login') {
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-		$loginname = validate($_POST['loginname'], 'loginname');
-		$password = validate($_POST['password'], 'password');
+if (session_status() == PHP_SESSION_NONE) {
+	ini_set("session.name", "s");
+	ini_set("url_rewriter.tags", "");
+	ini_set("session.use_cookies", false);
+	ini_set("session.cookie_httponly", true);
+	ini_set("session.cookie_secure", $is_ssl);
+	session_id('login');
+	session_start();
+}
 
-		$row = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
+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
+		\Froxlor\UI\Response::redirectTo('index.php');
+		exit();
+	}
+	// show template to enter code
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('2fa/entercode', true) . "\";");
+} elseif ($action == '2fa_verify') {
+	// verify code from 2fa code-enter form
+	if (! isset($_SESSION) || ! isset($_SESSION['secret_2fa'])) {
+		// no session - redirect to index
+		\Froxlor\UI\Response::redirectTo('index.php');
+		exit();
+	}
+	$code = isset($_POST['2fa_code']) ? $_POST['2fa_code'] : null;
+	// verify entered code
+	$tfa = new \Froxlor\FroxlorTwoFactorAuth('Froxlor');
+	$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 = array(
+			'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)) {
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				'showmessage' => '2'
+			));
+		}
+		// set fields in $userinfo required for finishLogin()
+		$userinfo['adminsession'] = $isadmin;
+		$userinfo['userid'] = $uid;
 
-		if ($row['customer'] == $loginname) {
+		// if not successful somehow - start again
+		if (! finishLogin($userinfo)) {
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				'showmessage' => '2'
+			));
+		}
+
+		// when using email-2fa, remove the one-time-code
+		if ($userinfo['type_2fa'] == '1') {
+			$del_stmt = Database::prepare("UPDATE $table SET `data_2fa` = '' WHERE `" . $field . "` = :uid");
+			$userinfo = Database::pexecute_first($del_stmt, array(
+				'uid' => $uid
+			));
+		}
+		exit();
+	}
+	\Froxlor\UI\Response::redirectTo('index.php', array(
+		'showmessage' => '2'
+	));
+	exit();
+} elseif ($action == 'login') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$loginname = \Froxlor\Validate\Validate::validate($_POST['loginname'], 'loginname');
+		$password = \Froxlor\Validate\Validate::validate($_POST['password'], 'password');
+
+		$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+			WHERE `loginname`= :loginname");
+		Database::pexecute($stmt, array(
+			"loginname" => $loginname
+		));
+		$row = $stmt->fetch(PDO::FETCH_ASSOC);
+
+		if ($row && $row['customer'] == $loginname) {
 			$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 			$uid = 'customerid';
 			$adminsession = '0';
 			$is_admin = false;
 		} else {
 			$is_admin = true;
-			if ((int)$settings['login']['domain_login'] == 1) {
-				/**
-				 * check if the customer tries to login with a domain, #374
-				 */
-				$domainname = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/', '/^https?\:\/\//'), '', $loginname));
-				$row2 = $db->query_first("SELECT `customerid` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain` = '".$db->escape($domainname)."'");
+			if ((int) Settings::Get('login.domain_login') == 1) {
+				$domainname = $idna_convert->encode(preg_replace(array(
+					'/\:(\d)+$/',
+					'/^https?\:\/\//'
+				), '', $loginname));
+				$stmt = Database::prepare("SELECT `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
+					WHERE `domain` = :domain");
+				Database::pexecute($stmt, array(
+					"domain" => $domainname
+				));
+				$row2 = $stmt->fetch(PDO::FETCH_ASSOC);
 
 				if (isset($row2['customerid']) && $row2['customerid'] > 0) {
-					$loginname = getCustomerDetail($row2['customerid'], 'loginname');
+					$loginname = \Froxlor\Customer\Customer::getCustomerDetail($row2['customerid'], 'loginname');
 					if ($loginname !== false) {
-						$row3 = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
-						if ($row3['customer'] == $loginname) {
+						$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+							WHERE `loginname`= :loginname");
+						Database::pexecute($stmt, array(
+							"loginname" => $loginname
+						));
+						$row3 = $stmt->fetch(PDO::FETCH_ASSOC);
+						if ($row3 && $row3['customer'] == $loginname) {
 							$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 							$uid = 'customerid';
 							$adminsession = '0';
@@ -66,118 +159,185 @@ if ($action == 'login') {
 			}
 		}
 
-		if (hasUpdates($version) && $is_admin == false) {
-			redirectTo('index.php');
-			exit;
+		if ((\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) && $is_admin == false) {
+			\Froxlor\UI\Response::redirectTo('index.php');
+			exit();
 		}
 
 		if ($is_admin) {
-			if (hasUpdates($version)) {
-				$row = $db->query_first("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname`='" . $db->escape($loginname) . "' AND `change_serversettings` = '1'");
-				/*
-				 * not an admin who can see updates
-				 */
-				if (!isset($row['admin'])) {
-					redirectTo('index.php');
-					exit;
+			if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
+					WHERE `loginname`= :loginname
+					AND `change_serversettings` = '1'");
+				Database::pexecute($stmt, array(
+					"loginname" => $loginname
+				));
+				$row = $stmt->fetch(PDO::FETCH_ASSOC);
+				if (! isset($row['admin'])) {
+					// not an admin who can see updates
+					\Froxlor\UI\Response::redirectTo('index.php');
+					exit();
 				}
 			} else {
-				$row = $db->query_first("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
+				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
+					WHERE `loginname`= :loginname");
+				Database::pexecute($stmt, array(
+					"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 {
-				redirectTo('index.php', Array('showmessage' => '2'), true);
-				exit;
+				// Log failed login
+				$rstlog = FroxlorLogger::getInstanceOf(array(
+					'loginname' => $_SERVER['REMOTE_ADDR']
+				));
+				$rstlog->logAction(\Froxlor\FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
+
+				\Froxlor\UI\Response::redirectTo('index.php', array(
+					'showmessage' => '2'
+				));
+				exit();
 			}
 		}
 
-		$userinfo = $db->query_first("SELECT * FROM $table WHERE `loginname`='" . $db->escape($loginname) . "'");
+		$userinfo_stmt = Database::prepare("SELECT * FROM $table
+			WHERE `loginname`= :loginname");
+		Database::pexecute($userinfo_stmt, array(
+			"loginname" => $loginname
+		));
+		$userinfo = $userinfo_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if ($userinfo['loginfail_count'] >= $settings['login']['maxloginattempts']
-			&& $userinfo['lastlogin_fail'] > (time() - $settings['login']['deactivatetime'])
-		) {
-			redirectTo('index.php', Array('showmessage' => '3'), true);
-			exit;
-		} elseif($userinfo['password'] == md5($password)) {
-			// login correct
-			// reset loginfail_counter, set lastlogin_succ
-			$db->query("UPDATE $table SET `lastlogin_succ`='" . time() . "', `loginfail_count`='0' WHERE `$uid`='" . (int)$userinfo[$uid] . "'");
-			$userinfo['userid'] = $userinfo[$uid];
-			$userinfo['adminsession'] = $adminsession;
+		if ($userinfo['loginfail_count'] >= Settings::Get('login.maxloginattempts') && $userinfo['lastlogin_fail'] > (time() - Settings::Get('login.deactivatetime'))) {
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				'showmessage' => '3'
+			));
+			exit();
+		} elseif (\Froxlor\System\Crypt::validatePasswordLogin($userinfo, $password, $table, $uid)) {
+			// only show "you're banned" if the login was successful
+			// because we don't want to publish that the user does exist
+			if ($userinfo['deactivated']) {
+				unset($userinfo);
+				\Froxlor\UI\Response::redirectTo('index.php', array(
+					'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");
+				Database::pexecute($stmt, array(
+					"lastlogin_succ" => time(),
+					"uid" => $userinfo[$uid]
+				));
+				$userinfo['userid'] = $userinfo[$uid];
+				$userinfo['adminsession'] = $adminsession;
+			}
 		} else {
 			// login incorrect
-			$db->query("UPDATE $table SET `lastlogin_fail`='" . time() . "', `loginfail_count`=`loginfail_count`+1 WHERE `$uid`='" . (int)$userinfo[$uid] . "'");
+			$stmt = Database::prepare("UPDATE $table
+				SET `lastlogin_fail`= :lastlogin_fail, `loginfail_count`=`loginfail_count`+1
+				WHERE `$uid`= :uid");
+			Database::pexecute($stmt, array(
+				"lastlogin_fail" => time(),
+				"uid" => $userinfo[$uid]
+			));
+
+			// Log failed login
+			$rstlog = FroxlorLogger::getInstanceOf(array(
+				'loginname' => $_SERVER['REMOTE_ADDR']
+			));
+			$rstlog->logAction(\Froxlor\FroxlorLogger::LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");
+
 			unset($userinfo);
-			redirectTo('index.php', Array('showmessage' => '2'), true);
-			exit;
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				'showmessage' => '2'
+			));
+			exit();
 		}
 
-		if (isset($userinfo['userid'])
-			&& $userinfo['userid'] != ''
-		) {
-			$s = md5(uniqid(microtime(), 1));
+		// 2FA activated
+		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 \Froxlor\FroxlorTwoFactorAuth('Froxlor');
+				$code = $tfa->getCode($tfa->createSecret());
+				// set code for user
+				$stmt = Database::prepare("UPDATE $table SET `data_2fa` = :d2fa WHERE `$uid` = :uid");
+				Database::pexecute($stmt, array(
+					"d2fa" => $code,
+					"uid" => $userinfo[$uid]
+				));
+				// build up & send email
+				$_mailerror = false;
+				$mailerr_msg = "";
+				$replace_arr = array(
+					'CODE' => $code
+				);
+				$mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables($lng['mails']['2fa']['mailbody'], $replace_arr));
 
-			if (isset($_POST['language'])) {
-				$language = validate($_POST['language'], 'language');
-				if ($language == 'profile') {
-					$language = $userinfo['def_language'];
-				} elseif(!isset($languages[$language])) {
-					$language = $settings['panel']['standardlanguage'];
+				try {
+					$mail->Subject = $lng['mails']['2fa']['subject'];
+					$mail->AltBody = $mail_body;
+					$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+					$mail->AddAddress($userinfo['email'], \Froxlor\User::getCorrectUserSalutation($userinfo));
+					$mail->Send();
+				} catch (\PHPMailer\PHPMailer\Exception $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
 				}
-			} else {
-				$language = $settings['panel']['standardlanguage'];
-			}
 
-			if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
-				$theme = $userinfo['theme'];
-			} else {
-				$theme = $settings['panel']['default_theme'];
-			}
-
-			if ($settings['session']['allow_multiple_login'] != '1') {
-				$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['userid'] . "' AND `adminsession` = '" . $db->escape($userinfo['adminsession']) . "'");
-			}
-
-			// check for field 'theme' in session-table, refs #607
-			$fields = mysql_list_fields($db->getDbName(), TABLE_PANEL_SESSIONS);
-			$columns = mysql_num_fields($fields);
-			$field_array = array();
-			for ($i = 0; $i < $columns; $i++) {
-				$field_array[] = mysql_field_name($fields, $i);
-			}
-
-			if (!in_array('theme', $field_array)) {
-				$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "')");
-    			} else {
-    				$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "', '" . $db->escape($theme) . "')");
-    			}
-
-			if ($userinfo['adminsession'] == '1') {
-				if (hasUpdates($version)) {
-					redirectTo('admin_updates.php', Array('s' => $s), true);
-				} else {
-					redirectTo('admin_index.php', Array('s' => $s), true);
+				if ($_mailerror) {
+					$rstlog = FroxlorLogger::getInstanceOf(array(
+						'loginname' => '2fa code-sending'
+					));
+					$rstlog->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+					\Froxlor\UI\Response::redirectTo('index.php', array(
+						'showmessage' => '4',
+						'customermail' => $userinfo['email']
+					));
+					exit();
 				}
-			} else {
-				redirectTo('customer_index.php', Array('s' => $s), true);
+
+				$mail->ClearAddresses();
 			}
-		} else {
-			redirectTo('index.php', Array('showmessage' => '2'), true);
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				'action' => '2fa_entercode'
+			));
+			exit();
 		}
-		exit;
+
+		if (! finishLogin($userinfo)) {
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				'showmessage' => '2'
+			));
+		}
+		exit();
 	} else {
 		$language_options = '';
-		$language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
+		$language_options .= \Froxlor\UI\HTML::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);
+		foreach ($languages as $language_file => $language_name) {
+			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, 'profile', true);
 		}
 
-		$smessage = isset($_GET['showmessage']) ? (int)$_GET['showmessage'] : 0;
+		$smessage = isset($_GET['showmessage']) ? (int) $_GET['showmessage'] : 0;
 		$message = '';
 		$successmessage = '';
 
@@ -189,7 +349,7 @@ if ($action == 'login') {
 				$message = $lng['error']['login'];
 				break;
 			case 3:
-				$message = sprintf($lng['error']['login_blocked'],$settings['login']['deactivatetime']);
+				$message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime'));
 				break;
 			case 4:
 				$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
@@ -198,14 +358,37 @@ if ($action == 'login') {
 			case 5:
 				$message = $lng['error']['user_banned'];
 				break;
+			case 6:
+				$successmessage = $lng['pwdreminder']['changed'];
+				break;
+			case 7:
+				$message = $lng['pwdreminder']['wrongcode'];
+				break;
+			case 8:
+				$message = $lng['pwdreminder']['notallowed'];
+				break;
 		}
 
 		$update_in_progress = '';
-		if (hasUpdates($version)) {
+		if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
 			$update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
 		}
 
-		eval("echo \"" . getTemplate('login') . "\";");
+		// Pass the last used page if needed
+		$lastscript = "";
+		if (isset($_REQUEST['script']) && $_REQUEST['script'] != "") {
+			$lastscript = $_REQUEST['script'];
+
+			if (! file_exists(__DIR__ . "/" . $lastscript)) {
+				$lastscript = "";
+			}
+		}
+		$lastqrystr = "";
+		if (isset($_REQUEST['qrystr']) && $_REQUEST['qrystr'] != "") {
+			$lastqrystr = htmlspecialchars($_REQUEST['qrystr'], ENT_QUOTES);
+		}
+
+		eval("echo \"" . \Froxlor\UI\Template::getTemplate('login') . "\";");
 	}
 }
 
@@ -213,84 +396,139 @@ if ($action == 'forgotpwd') {
 	$adminchecked = false;
 	$message = '';
 
-	if (isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
-		$loginname = validate($_POST['loginname'], 'loginname');
-		$email = validateEmail($_POST['loginemail'], 'email');
-		$sql = "SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-				WHERE `loginname`='" . $db->escape($loginname) . "'
-				AND `email`='" . $db->escape($email) . "'";
-		$result = $db->query($sql);
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		$loginname = \Froxlor\Validate\Validate::validate($_POST['loginname'], 'loginname');
+		$email = \Froxlor\Validate\Validate::validateEmail($_POST['loginemail'], 'email');
+		$result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `customernumber`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+			WHERE `loginname`= :loginname
+			AND `email`= :email");
+		Database::pexecute($result_stmt, array(
+			"loginname" => $loginname,
+			"email" => $email
+		));
 
-		if ($db->num_rows() == 0) {
-			$sql = "SELECT `adminid`, `name`, `email`, `loginname`, `def_language` FROM `" . TABLE_PANEL_ADMINS . "`
-				WHERE `loginname`='" . $db->escape($loginname) . "'
-				AND `email`='" . $db->escape($email) . "'";
-			$result = $db->query($sql);
+		if (Database::num_rows() == 0) {
+			$result_stmt = Database::prepare("SELECT `adminid`, `name`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_ADMINS . "`
+				WHERE `loginname`= :loginname
+				AND `email`= :email");
+			Database::pexecute($result_stmt, array(
+				"loginname" => $loginname,
+				"email" => $email
+			));
 
-			if ($db->num_rows() > 0) {
+			if (Database::num_rows() > 0) {
 				$adminchecked = true;
 			} else {
-				$result = null;
+				$result_stmt = null;
 			}
 		}
 
-		if ($result !== null) {
-			$user = $db->fetch_array($result);
+		if ($result_stmt !== null) {
+			$user = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 			/* Check whether user is banned */
 			if ($user['deactivated']) {
-				$message = $lng['pwdreminder']['notallowed'];
-				redirectTo('index.php', Array('showmessage' => '5'), true);
+				\Froxlor\UI\Response::redirectTo('index.php', array(
+					'showmessage' => '8'
+				));
+				exit();
 			}
 
-			if (($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
-				|| $adminchecked == false
-			) {
+			if (($adminchecked && Settings::Get('panel.allow_preset_admin') == '1') || $adminchecked == false) {
 				if ($user !== false) {
-					if ($settings['panel']['password_min_length'] <= 6) {
-						$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
-					} else {
-						// make it two times larger than password_min_length
-						$rnd = '';
-						$minlength = $settings['panel']['password_min_length'];
-						while (strlen($rnd) < ($minlength * 2)) {
-							$rnd .= md5(uniqid(microtime(), 1));
-						}
-						$password = substr($rnd, (int)($minlength / 2), $minlength);
+					// build a activation code
+					$timestamp = time();
+					$first = substr(md5($user['loginname'] . $timestamp . \Froxlor\PhpHelper::randomStr(16)), 0, 15);
+					$third = substr(md5($user['email'] . $timestamp . \Froxlor\PhpHelper::randomStr(16)), - 15);
+					$activationcode = $first . $timestamp . $third . substr(md5($third . $timestamp), 0, 10);
+
+					// Drop all existing activation codes for this user
+					$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
+						WHERE `userid` = :userid
+						AND `admin` = :admin");
+					$params = array(
+						"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
+						"admin" => $adminchecked ? 1 : 0
+					);
+					Database::pexecute($stmt, $params);
+
+					// Add new activation code to database
+					$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_ACTIVATION . "`
+						(userid, admin, creation, activationcode)
+						VALUES (:userid, :admin, :creation, :activationcode)");
+					$params = array(
+						"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->logAction(\Froxlor\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';
+					// this can be a fixed value to avoid potential exploiting by modifying headers
+					$host = Settings::Get('system.hostname'); // $_SERVER['HTTP_HOST'];
+					$port = $_SERVER['SERVER_PORT'] != 80 ? ':' . $_SERVER['SERVER_PORT'] : '';
+					// don't add :443 when https is used, as it is default (and just looks weird!)
+					if ($protocol == 'https' && $_SERVER['SERVER_PORT'] == '443') {
+						$port = '';
 					}
-
-					$passwordTable = $adminchecked ? TABLE_PANEL_ADMINS : TABLE_PANEL_CUSTOMERS;
-					$db->query("UPDATE `" . $passwordTable . "` SET `password`='" . md5($password) . "'
-							WHERE `loginname`='" . $user['loginname'] . "'
-							AND `email`='" . $user['email'] . "'");
-
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
+					// there can be only one script to handle this so we can use a fixed value here
+					$script = "/index.php"; // $_SERVER['SCRIPT_NAME'];
+					if (Settings::Get('system.froxlordirectlyviahostname') == 0) {
+						$script = \Froxlor\FileDir::makeCorrectFile("/" . basename(__DIR__) . "/" . $script);
+					}
+					$activationlink = $protocol . '://' . $host . $port . $script . '?action=resetpwd&resetcode=' . $activationcode;
 
 					$replace_arr = array(
-						'SALUTATION' => getCorrectUserSalutation($user),
-						'USERNAME' => $user['loginname'],
-						'PASSWORD' => $password
+						'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($user),
+						'NAME' => $user['name'],
+						'FIRSTNAME' => $user['firstname'] ?? "",
+						'COMPANY' => $user['company'] ?? "",
+						'CUSTOMER_NO' => $user['customernumber'] ?? 0,
+						'USERNAME' => $loginname,
+						'LINK' => $activationlink
 					);
 
-					$body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password));
+					$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\'');
+					Database::pexecute($result_stmt, array(
+						"adminid" => $user['adminid'],
+						"lang" => $def_language
+					));
+					$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['subject']), $replace_arr));
 
-					$def_language = ($user['def_language'] != '') ? $user['def_language'] : $settings['panel']['standardlanguage'];
-					$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$user['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'password_reset_subject\'');
-					$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['pwdreminder']['subject']), $replace_arr));
-					$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$user['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'password_reset_mailbody\'');
-					$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr));
+					$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
+						WHERE `adminid`= :adminid
+						AND `language`= :lang
+						AND `templategroup`=\'mails\'
+						AND `varname`=\'password_reset_mailbody\'');
+					Database::pexecute($result_stmt, array(
+						"adminid" => $user['adminid'],
+						"lang" => $def_language
+					));
+					$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['mailbody']), $replace_arr));
 
 					$_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'], $user['firstname'] . ' ' . $user['name']);
+						$mail->AddAddress($user['email'], \Froxlor\User::getCorrectUserSalutation($user));
 						$mail->Send();
-					} catch(phpmailerException $e) {
+					} catch (\PHPMailer\PHPMailer\Exception $e) {
 						$mailerr_msg = $e->errorMessage();
 						$_mailerror = true;
 					} catch (Exception $e) {
@@ -299,18 +537,27 @@ if ($action == 'forgotpwd') {
 					}
 
 					if ($_mailerror) {
-						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
-						$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-						redirectTo('index.php', Array('showmessage' => '4', 'customermail' => $user['email']), true);
-						exit;
+						$rstlog = FroxlorLogger::getInstanceOf(array(
+							'loginname' => 'password_reset'
+						));
+						$rstlog->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+						\Froxlor\UI\Response::redirectTo('index.php', array(
+							'showmessage' => '4',
+							'customermail' => $user['email']
+						));
+						exit();
 					}
 
 					$mail->ClearAddresses();
-					redirectTo('index.php', Array('showmessage' => '1'), true);
-					exit;
+					\Froxlor\UI\Response::redirectTo('index.php', array(
+						'showmessage' => '1'
+					));
+					exit();
 				} else {
-					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
-					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
+					$rstlog = FroxlorLogger::getInstanceOf(array(
+						'loginname' => 'password_reset'
+					));
+					$rstlog->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
 					$message = $lng['login']['combination_not_found'];
 				}
 
@@ -322,15 +569,203 @@ if ($action == 'forgotpwd') {
 	}
 
 	if ($adminchecked) {
-		if ($settings['panel']['allow_preset_admin'] != '1') {
+		if (Settings::Get('panel.allow_preset_admin') != '1') {
 			$message = $lng['pwdreminder']['notallowed'];
-			unset ($adminchecked);
+			unset($adminchecked);
 		}
 	} else {
-		if ($settings['panel']['allow_preset'] != '1') {
+		if (Settings::Get('panel.allow_preset') != '1') {
 			$message = $lng['pwdreminder']['notallowed'];
 		}
 	}
 
-	eval("echo \"" . getTemplate('fpwd') . "\";");
+	eval("echo \"" . \Froxlor\UI\Template::getTemplate('fpwd') . "\";");
+}
+
+if ($action == 'resetpwd') {
+	$message = '';
+
+	// Remove old activation codes
+	$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
+		WHERE creation < :oldest");
+	Database::pexecute($stmt, array(
+		"oldest" => time() - 86400
+	));
+
+	if (isset($_GET['resetcode']) && strlen($_GET['resetcode']) == 50) {
+		// Check if activation code is valid
+		$activationcode = $_GET['resetcode'];
+		$timestamp = substr($activationcode, 15, 10);
+		$third = substr($activationcode, 25, 15);
+		$check = substr($activationcode, 40, 10);
+
+		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");
+				$result = Database::pexecute_first($stmt, array(
+					"activationcode" => $activationcode
+				));
+
+				if ($result !== false) {
+					try {
+						$new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], true);
+						$new_password_confirm = \Froxlor\System\Crypt::validatePassword($_POST['new_password_confirm'], true);
+					} catch (Exception $e) {
+						$message = $e->getMessage();
+					}
+
+					if (empty($message) && (empty($new_password) || $new_password != $new_password_confirm)) {
+						$message = $lng['error']['newpasswordconfirmerror'];
+					}
+
+					if (empty($message)) {
+						// Update user password
+						if ($result['admin'] == 1) {
+							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_ADMINS . "`
+								SET `password` = :newpassword
+								WHERE `adminid` = :userid");
+						} else {
+							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+								SET `password` = :newpassword
+								WHERE `customerid` = :userid");
+						}
+						Database::pexecute($stmt, array(
+							"newpassword" => \Froxlor\System\Crypt::makeCryptPassword($new_password),
+							"userid" => $result['userid']
+						));
+
+						$rstlog = FroxlorLogger::getInstanceOf(array(
+							'loginname' => 'password_reset'
+						));
+						$rstlog->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed password using password reset.");
+
+						// Remove activation code from DB
+						$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
+							WHERE `activationcode` = :activationcode
+							AND `userid` = :userid");
+						Database::pexecute($stmt, array(
+							"activationcode" => $activationcode,
+							"userid" => $result['userid']
+						));
+						\Froxlor\UI\Response::redirectTo('index.php', array(
+							"showmessage" => '6'
+						));
+					}
+				} else {
+					\Froxlor\UI\Response::redirectTo('index.php', array(
+						"showmessage" => '7'
+					));
+				}
+			}
+
+			eval("echo \"" . \Froxlor\UI\Template::getTemplate('rpwd') . "\";");
+		} else {
+			\Froxlor\UI\Response::redirectTo('index.php', array(
+				"showmessage" => '7'
+			));
+		}
+	} else {
+		\Froxlor\UI\Response::redirectTo('index.php');
+	}
+}
+
+function finishLogin($userinfo)
+{
+	global $version, $dbversion, $remote_addr, $http_user_agent, $languages;
+
+	if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
+		$s = \Froxlor\Froxlor::genSessionId();
+
+		if (isset($_POST['language'])) {
+			$language = \Froxlor\Validate\Validate::validate($_POST['language'], 'language');
+			if ($language == 'profile') {
+				$language = $userinfo['def_language'];
+			} elseif (! isset($languages[$language])) {
+				$language = Settings::Get('panel.standardlanguage');
+			}
+		} else {
+			$language = Settings::Get('panel.standardlanguage');
+		}
+
+		if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
+			$theme = $userinfo['theme'];
+		} else {
+			$theme = Settings::Get('panel.default_theme');
+		}
+
+		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
+		$stmt = Database::query("SHOW COLUMNS FROM panel_sessions LIKE 'theme'");
+		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($row['Field'] == "theme") {
+				$has_theme = true;
+			}
+		}
+
+		$params = array(
+			"hash" => $s,
+			"userid" => $userinfo['userid'],
+			"ipaddress" => $remote_addr,
+			"useragent" => $http_user_agent,
+			"lastactivity" => time(),
+			"language" => $language,
+			"adminsession" => $userinfo['adminsession']
+		);
+
+		if ($has_theme) {
+			$params["theme"] = $theme;
+			$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
+					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`)
+					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession, :theme)");
+		} else {
+			$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
+					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`)
+					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession)");
+		}
+		Database::pexecute($stmt, $params);
+
+		$qryparams = array();
+		if (isset($_POST['qrystr']) && $_POST['qrystr'] != "") {
+			parse_str(urldecode($_POST['qrystr']), $qryparams);
+		}
+		$qryparams['s'] = $s;
+
+		if ($userinfo['adminsession'] == '1') {
+			if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+				\Froxlor\UI\Response::redirectTo('admin_updates.php', array(
+					's' => $s
+				));
+			} else {
+				if (isset($_POST['script']) && $_POST['script'] != "") {
+					if (preg_match("/customer\_/", $_POST['script']) === 1) {
+						\Froxlor\UI\Response::redirectTo('admin_customers.php', array(
+							"page" => "customers"
+						));
+					} else {
+						\Froxlor\UI\Response::redirectTo($_POST['script'], $qryparams);
+					}
+				} else {
+					\Froxlor\UI\Response::redirectTo('admin_index.php', $qryparams);
+				}
+			}
+		} else {
+			if (isset($_POST['script']) && $_POST['script'] != "") {
+				\Froxlor\UI\Response::redirectTo($_POST['script'], $qryparams);
+			} else {
+				\Froxlor\UI\Response::redirectTo('customer_index.php', $qryparams);
+			}
+		}
+	}
+	return false;
 }

install/install.php

@@ -15,8 +15,16 @@
  * @package    Install
  *
  */
-
-require 'lib/class.FroxlorInstall.php';
+if (! file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
+	// get hint-template
+	$vendor_hint = file_get_contents(dirname(__DIR__) . '/templates/Sparkle/misc/vendormissinghint.tpl');
+	// replace values
+	$vendor_hint = str_replace("<FROXLOR_INSTALL_DIR>", dirname(__DIR__), $vendor_hint);
+	$vendor_hint = str_replace("<CURRENT_YEAR>", date('Y', time()), $vendor_hint);
+	die($vendor_hint);
+}
+require dirname(__DIR__) . '/vendor/autoload.php';
+require __DIR__ . '/lib/class.FroxlorInstall.php';
 
 $frxinstall = new FroxlorInstall();
 $frxinstall->run();

install/lib/updateFunctions.php

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ *
+ */
+
+/**
+ * Function showUpdateStep
+ *
+ * outputs and logs the current
+ * update progress
+ *
+ * @param
+ *        	string task/status
+ * @param
+ *        	bool needs_status (if false, a linebreak will be added)
+ *        	
+ * @return string formatted output and log-entry
+ */
+function showUpdateStep($task = null, $needs_status = true)
+{
+	set_time_limit(30);
+	if (! $needs_status)
+		echo "<b>";
+
+	// output
+	echo $task;
+
+	if (! $needs_status) {
+		echo "</b><br />";
+	}
+
+	\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, $task);
+}
+
+/**
+ * Function lastStepStatus
+ *
+ * outputs [OK] (success), [??] (warning) or [!!] (failure)
+ * of the last update-step
+ *
+ * @param
+ *        	int status (0 = success, 1 = warning, 2 = failure)
+ *        	
+ * @return string formatted output and log-entry
+ */
+function lastStepStatus($status = -1, $message = '')
+{
+	switch ($status) {
+
+		case 0:
+			$status_sign = ($message != '') ? '[' . $message . ']' : '[OK]';
+			$status_color = 'ok';
+			break;
+		case 1:
+			$status_sign = ($message != '') ? '[' . $message . ']' : '[??]';
+			$status_color = 'warn';
+			break;
+		case 2:
+			$status_sign = ($message != '') ? '[' . $message . ']' : '[!!]';
+			$status_color = 'err';
+			break;
+		default:
+			$status_sign = '[unknown]';
+			$status_color = 'unknown';
+			break;
+	}
+
+	// output
+	echo "<span class=\"update-step update-step-" . $status_color . "\">" . $status_sign . "</span><br />";
+
+	if ($status == - 1 || $status == 2) {
+		\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');
+	} elseif ($status == 0 || $status == 1) {
+		\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, 'Success');
+	}
+}

install/lng/english.lng.php

@@ -16,28 +16,36 @@
  * @package    Language
  *
  */
-
 $lng['requirements']['title'] = 'Checking system requirements...';
 $lng['requirements']['installed'] = 'installed';
 $lng['requirements']['not_true'] = 'no';
 $lng['requirements']['notfound'] = 'not found';
 $lng['requirements']['notinstalled'] = 'not installed';
 $lng['requirements']['activated'] = 'enabled';
-$lng['requirements']['phpversion'] = 'PHP version >= 5.2';
-$lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime...';
-$lng['requirements']['phpmagic_quotes_runtime_description'] = 'PHP setting "magic_quotes_runtime" must be set to "Off". We have disabled it temporary for now please fix the coresponding php.ini.';
-$lng['requirements']['phpmysql'] = 'MySQL-extension...';
+$lng['requirements']['phpversion'] = 'PHP version >= 7.0';
+$lng['requirements']['newerphpprefered'] = 'Good, but php-7.1 is preferred.';
+$lng['requirements']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...';
+$lng['requirements']['phpsession'] = 'PHP session-extension...';
+$lng['requirements']['phpctype'] = 'PHP ctype-extension...';
+$lng['requirements']['phpsimplexml'] = 'PHP SimpleXML-extension...';
 $lng['requirements']['phpxml'] = 'PHP XML-extension...';
 $lng['requirements']['phpfilter'] = 'PHP filter-extension...';
 $lng['requirements']['phpposix'] = 'PHP posix-extension...';
 $lng['requirements']['phpbcmath'] = 'PHP bcmath-extension...';
+$lng['requirements']['phpcurl'] = 'PHP curl-extension...';
+$lng['requirements']['phpmbstring'] = 'PHP mbstring-extension...';
+$lng['requirements']['phpzip'] = 'PHP zip-extension...';
+$lng['requirements']['phpjson'] = 'PHP json-extension...';
 $lng['requirements']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!';
+$lng['requirements']['zipdescription'] = 'The auto-update feature requires the zip extension.';
 $lng['requirements']['openbasedir'] = 'open_basedir...';
-$lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the coresponding php.ini';
+$lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the corresponding php.ini';
+$lng['requirements']['mysqldump'] = 'MySQL dump tool';
+$lng['requirements']['mysqldumpmissing'] = 'Automatic backup of possible existing database is not possible. Please install mysql-client tools';
 $lng['requirements']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Try to fix them and retry.';
 $lng['requirements']['froxlor_succ_checks'] = 'All requirements are satisfied';
 
-$lng['install']['title'] = 'Froxlor install - chose language';
+$lng['install']['lngtitle'] = 'Froxlor install - choose language';
 $lng['install']['language'] = 'Installation language';
 $lng['install']['lngbtn_go'] = 'Change language';
 $lng['install']['title'] = 'Froxlor install - setup';
@@ -45,28 +53,37 @@ $lng['install']['welcometext'] = 'Thank you for choosing Froxlor. Please fill ou
 $lng['install']['database'] = 'Database connection';
 $lng['install']['mysql_host'] = 'MySQL-Hostname';
 $lng['install']['mysql_database'] = 'Database name';
+$lng['install']['mysql_forcecreate'] = 'Backup and overwrite database if exists?';
 $lng['install']['mysql_unpriv_user'] = 'Username for the unprivileged MySQL-account';
 $lng['install']['mysql_unpriv_pass'] = 'Password for the unprivileged MySQL-account';
 $lng['install']['mysql_root_user'] = 'Username for the MySQL-root-account';
 $lng['install']['mysql_root_pass'] = 'Password for the MySQL-root-account';
+$lng['install']['mysql_ssl_ca_file'] = 'MySQL server certificate file path';
+$lng['install']['mysql_ssl_verify_server_certificate'] = 'Verify MySQL TLS certificate';
 $lng['install']['admin_account'] = 'Administrator Account';
 $lng['install']['admin_user'] = 'Administrator Username';
 $lng['install']['admin_pass1'] = 'Administrator Password';
 $lng['install']['admin_pass2'] = 'Administrator-Password (confirm)';
+$lng['install']['activate_newsfeed'] = 'Enable the official newsfeed<br><small>(https://inside.froxlor.org/news/)</small>';
 $lng['install']['serversettings'] = 'Server settings';
+$lng['install']['distribution'] = 'Distribution';
 $lng['install']['servername'] = 'Server name (FQDN, no ip-address)';
 $lng['install']['serverip'] = 'Server IP';
 $lng['install']['webserver'] = 'Webserver';
-$lng['install']['apache2'] = 'Apache 2';
+$lng['install']['apache2'] = 'Apache 2.2';
+$lng['install']['apache24'] = 'Apache 2.4';
 $lng['install']['lighttpd'] = 'LigHTTPd';
 $lng['install']['nginx'] = 'NGINX';
 $lng['install']['httpuser'] = 'HTTP username';
 $lng['install']['httpgroup'] = 'HTTP groupname';
 
 $lng['install']['testing_mysql'] = 'Checking MySQL-root access...';
+$lng['install']['testing_mysql_fail'] = 'There seems to be a problem with the database-connection. Cannot continue. Please go back and check your credentials.';
 $lng['install']['backup_old_db'] = 'Creating backup of old database...';
 $lng['install']['backup_binary_missing'] = 'Could not find mysqldump';
 $lng['install']['backup_failed'] = 'Could not backup database';
+$lng['install']['check_db_exists'] = 'Checking database...';
+$lng['install']['db_exists'] = 'Unable to create database. A database with the same name exists and should not be overwritten';
 $lng['install']['prepare_db'] = 'Preparing database...';
 $lng['install']['create_mysqluser_and_db'] = 'Creating database and username...';
 $lng['install']['testing_new_db'] = 'Testing if database and user have been created correctly...';
@@ -75,10 +92,11 @@ $lng['install']['changing_data'] = 'Adjusting settings...';
 $lng['install']['creating_entries'] = 'Inserting new values...';
 $lng['install']['adding_admin_user'] = 'Creating admin-account...';
 $lng['install']['creating_configfile'] = 'Creating configfile...';
-$lng['install']['creating_configfile_temp'] = 'File was saved in /tmp/userdata.inc.php, please move to lib/.';
-$lng['install']['creating_configfile_failed'] = 'Could not create lib/userdata.inc.php, please create it manually with the following content:';
+$lng['install']['creating_configfile_temp'] = 'File was saved in %s, please move to ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php';
+$lng['install']['creating_configfile_failed'] = 'Could not create ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php, please create it manually with the following content:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor was installed successfully.';
 
 $lng['click_here_to_refresh'] = 'Click here to check again';
+$lng['click_here_to_goback'] = 'Click here to go back';
 $lng['click_here_to_continue'] = 'Click here to continue';
 $lng['click_here_to_login'] = 'Click here to login.';

install/lng/french.lng.php

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

install/lng/german.lng.php

@@ -16,25 +16,33 @@
  * @package    Language
  *
  */
-
 $lng['requirements']['title'] = 'Prüfe Systemvoraussetzungen...';
 $lng['requirements']['installed'] = 'installiert';
 $lng['requirements']['not_true'] = 'nein';
 $lng['requirements']['notfound'] = 'nicht gefunden';
 $lng['requirements']['notinstalled'] = 'nicht installiert';
 $lng['requirements']['activated'] = 'ist aktiviert.';
-$lng['requirements']['phpversion'] = 'PHP Version >= 5.2';
-$lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime';
-$lng['requirements']['phpmagic_quotes_runtime_description'] = 'Die PHP Einstellung "magic_quotes_runtime" muss deaktiviert sein ("Off"). Die Einstellung wurde temporär deaktiviert, bitte ändern Sie diese in der entsprechenden php.ini.';
-$lng['requirements']['phpmysql'] = 'PHP MySQL-Erweiterung...';
+$lng['requirements']['phpversion'] = 'PHP Version >= 7.0';
+$lng['requirements']['newerphpprefered'] = 'Passt, aber php-7.1 wird bevorzugt.';
+$lng['requirements']['phppdo'] = 'PHP PDO Erweiterung und PDO-MySQL Treiber...';
+$lng['requirements']['phpsession'] = 'PHP session-Erweiterung...';
+$lng['requirements']['phpctype'] = 'PHP ctype-Erweiterung...';
+$lng['requirements']['phpsimplexml'] = 'PHP SimpleXML-Erweiterung...';
 $lng['requirements']['phpxml'] = 'PHP XML-Erweiterung...';
 $lng['requirements']['phpfilter'] = 'PHP filter-Erweiterung...';
 $lng['requirements']['phpposix'] = 'PHP posix-Erweiterung...';
 $lng['requirements']['phpbcmath'] = 'PHP bcmath-Erweiterung...';
+$lng['requirements']['phpcurl'] = 'PHP curl-Erweiterung...';
+$lng['requirements']['phpmbstring'] = 'PHP mbstring-Erweiterung...';
+$lng['requirements']['phpzip'] = 'PHP zip-Erweiterung...';
+$lng['requirements']['phpjson'] = 'PHP json-Erweiterung...';
 $lng['requirements']['bcmathdescription'] = 'Traffic-Berechnungs bezogene Funktionen stehen nicht vollständig zur Verfügung!';
+$lng['requirements']['zipdescription'] = 'Die Auto-Update Funktion benötigt die zip Erweiterung.';
 $lng['requirements']['openbasedir'] = 'open_basedir genutzt wird...';
 $lng['requirements']['openbasedirenabled'] = 'Froxlor wird mit aktiviertem open_basedir nicht vollständig funktionieren. Bitte deaktivieren Sie open_basedir für Froxlor in der entsprechenden php.ini';
-$lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Versuchen Sie die angezeigten Problem zu beheben und versuchen Sie es erneut.';
+$lng['requirements']['mysqldump'] = 'MySQL dump Tool';
+$lng['requirements']['mysqldumpmissing'] = 'Ein automatisches Backup einer möglicherweise schon existierenden Datenbank nicht möglich. Bitte mysql-client installieren';
+$lng['requirements']['diedbecauseofrequirements'] = 'Kann Froxlor ohne diese Voraussetzungen nicht installieren! Beheben Sie die angezeigten Probleme und versuchen Sie es erneut.';
 $lng['requirements']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüllt';
 
 $lng['install']['lngtitle'] = 'Froxlor Installation - Sprache auswählen';
@@ -45,28 +53,37 @@ $lng['install']['welcometext'] = 'Vielen Dank dass Sie sich für Froxlor entschi
 $lng['install']['database'] = 'Datenbankverbindung';
 $lng['install']['mysql_host'] = 'MySQL-Hostname';
 $lng['install']['mysql_database'] = 'Datenbank Name';
+$lng['install']['mysql_forcecreate'] = 'Datenbank sichern und überschreiben wenn vorhanden?';
 $lng['install']['mysql_unpriv_user'] = 'Benutzername für den unprivilegierten MySQL-Account';
 $lng['install']['mysql_unpriv_pass'] = 'Passwort für den unprivilegierten MySQL-Account';
 $lng['install']['mysql_root_user'] = 'Benutzername für den MySQL-Root-Account';
 $lng['install']['mysql_root_pass'] = 'Passwort für den MySQL-Root-Account';
+$lng['install']['mysql_ssl_ca_file'] = 'MySQL-Server Zertifikatspfad';
+$lng['install']['mysql_ssl_verify_server_certificate'] = 'Validieren des MySQL-Server Zertifikats';
 $lng['install']['admin_account'] = 'Admin-Zugang';
 $lng['install']['admin_user'] = 'Administrator-Benutzername';
 $lng['install']['admin_pass1'] = 'Administrator-Passwort';
 $lng['install']['admin_pass2'] = 'Administrator-Passwort (Bestätigung)';
+$lng['install']['activate_newsfeed'] = 'Aktiviere das offizielle Newsfeed<br><small>(https://inside.froxlor.org/news/)</small>';
 $lng['install']['serversettings'] = 'Servereinstellungen';
+$lng['install']['distribution'] = 'Distribution';
 $lng['install']['servername'] = 'Servername (FQDN, keine IP-Adresse)';
 $lng['install']['serverip'] = 'Server-IP';
 $lng['install']['webserver'] = 'Webserver';
 $lng['install']['apache2'] = 'Apache 2';
+$lng['install']['apache24'] = 'Apache 2.4';
 $lng['install']['lighttpd'] = 'LigHTTPd';
 $lng['install']['nginx'] = 'NGINX';
 $lng['install']['httpuser'] = 'HTTP Username';
 $lng['install']['httpgroup'] = 'HTTP Gruppenname';
 
 $lng['install']['testing_mysql'] = 'Teste MySQL-Root Zugang...';
+$lng['install']['testing_mysql_fail'] = 'Bei der Verwendung der Datenbank gibt es scheinbar Probleme. Installation kann nicht fortgesetzt werden. Bitte Zugangsdaten prüfen und erneut versuchen.';
 $lng['install']['backup_old_db'] = 'Sicherung vorheriger Datenbank...';
 $lng['install']['backup_binary_missing'] = 'Konnte mysqldump nicht finden';
 $lng['install']['backup_failed'] = 'Sicherung fehlgeschlagen';
+$lng['install']['check_db_exists'] = 'Databenbank wird geprüft...';
+$lng['install']['db_exists'] = 'Datenbank kann nicht erstellt werden. Eine Datenbank mit dem selben Namen existiert bereits und soll nicht überschrieben werden.';
 $lng['install']['prepare_db'] = 'Datenbank wird vorbereitet...';
 $lng['install']['create_mysqluser_and_db'] = 'Erstelle Datenbank und Benutzer...';
 $lng['install']['testing_new_db'] = 'Teste, ob Datenbank und Benutzer korrekt angelegt wurden...';
@@ -75,10 +92,11 @@ $lng['install']['changing_data'] = 'Einstellungen anpassen...';
 $lng['install']['creating_entries'] = 'Trage neue Werte ein...';
 $lng['install']['adding_admin_user'] = 'Erstelle Admin-Benutzer...';
 $lng['install']['creating_configfile'] = 'Erstelle Konfigurationsdatei...';
-$lng['install']['creating_configfile_temp'] = 'Datei wurde in /tmp/userdata.inc.php gespeichert, bitte nach lib/ verschieben.';
-$lng['install']['creating_configfile_failed'] = 'Konnte lib/userdata.inc.php nicht erstellen, bitte manuell mit folgendem Inhalt anlegen:';
+$lng['install']['creating_configfile_temp'] = 'Datei wurde in %s gespeichert, bitte nach ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php verschieben.';
+$lng['install']['creating_configfile_failed'] = 'Konnte ' . dirname(dirname(__DIR__)) . '/lib/userdata.inc.php nicht erstellen, bitte manuell mit folgendem Inhalt anlegen:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor wurde erfolgreich installiert.';
 
 $lng['click_here_to_refresh'] = 'Hier klicken, um erneut zu prüfen';
+$lng['click_here_to_goback'] = 'Einen Schritt zurück';
 $lng['click_here_to_continue'] = 'Installation fortführen';
 $lng['click_here_to_login'] = 'Hier geht es weiter zum Login-Fenster.';

install/scripts/config-services.php

@@ -0,0 +1,31 @@
+#!/usr/bin/php
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2018 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Froxlor team <team@froxlor.org> (2018-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
+ *         
+ */
+
+// Check if we're in the CLI
+if (@php_sapi_name() !== 'cli') {
+	die('This script will only work in the shell.');
+}
+
+require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+
+// give control to command line handler
+try {
+	\Froxlor\Cli\ConfigServicesCmd::processParameters($argc, $argv);
+} catch (Exception $e) {
+	\Froxlor\Cli\ConfigServicesCmd::printerr($e->getMessage());
+}

install/scripts/htpasswd-htaccess-remover.php

@@ -1,106 +0,0 @@
-<?php
-
-/**
- * This file is part of the SysCP project.
- * Copyright (c) 2003-2007 the SysCP 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.syscp.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Michael Duergner <michael@duergner.com>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
- * @package    System
- *
- */
-
-if(@php_sapi_name() != 'cli'
-   && @php_sapi_name() != 'cgi'
-   && @php_sapi_name() != 'cgi-fcgi')
-{
-	die('This script will only work in the shell.');
-}
-
-$pathtophpfiles = '/var/www/syscp';
-$filename = 'htpasswd-htaccess-remover.php';
-
-/**
- * Includes the Usersettings eg. MySQL-Username/Passwort etc.
- */
-
-require ("$pathtophpfiles/lib/userdata.inc.php");
-
-/**
- * Includes the MySQL-Tabledefinitions etc.
- */
-
-require ("$pathtophpfiles/lib/tables.inc.php");
-
-/**
- * Includes the MySQL-Connection-Class
- */
-
-require ("$pathtophpfiles/lib/class_mysqldb.php");
-$debugMsg[] = 'Database Class has been loaded';
-$db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']);
-$db_root = new db($sql['host'], $sql['root_user'], $sql['root_password'], '');
-
-if($db->link_id == 0
-   || $db_root->link_id == 0)
-{
-	/**
-	 * Do not proceed further if no database connection could be established (either normal or root)
-	 */
-
-	die('Cant connect to mysqlserver. Please check userdata.inc.php! Exiting...');
-}
-
-unset($sql['password']);
-unset($db->password);
-$result = $db->query("SELECT `settingid`, `settinggroup`, `varname`, `value` FROM `" . TABLE_PANEL_SETTINGS . "`");
-
-while($row = $db->fetch_array($result))
-{
-	$settings["$row[settinggroup]"]["$row[varname]"] = $row['value'];
-}
-
-unset($row);
-unset($result);
-
-if(!isset($settings['panel']['version'])
-   || $settings['panel']['version'] != $version)
-{
-	/**
-	 * Do not proceed further if the Database version is not the same as the script version
-	 */
-
-	die('Version of File doesnt match Version of Database. Exiting...');
-}
-
-/**
- * Includes the Functions
- */
-
-require ("$pathtophpfiles/lib/functions.php");
-$result = $db->query('SELECT * FROM `' . TABLE_PANEL_HTACCESS . '` ');
-
-while($row = $db->fetch_array($result))
-{
-	if(file_exists($row['path'] . '.htaccess'))
-	{
-		unlink($row['path'] . '.htaccess');
-	}
-}
-
-$result = $db->query('SELECT * FROM `' . TABLE_PANEL_HTPASSWDS . '` ');
-
-while($row = $db->fetch_array($result))
-{
-	if(file_exists($row['path'] . '.htpasswd'))
-	{
-		unlink($row['path'] . '.htpasswd');
-	}
-}
-
-?>

install/scripts/language-check.php

@@ -1,184 +0,0 @@
-<?php
-
-/**
- * This file is part of the SysCP project.
- * Copyright (c) 2003-2007 the SysCP 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.syscp.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Martin Burchert <eremit@syscp.org>
- * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
- * @package    System
- *
- */
-
-// some configs
-
-$baseLanguage = 'english.lng.php';
-
-// Check if we're in the CLI
-
-if(@php_sapi_name() != 'cli')
-{
-	die('This script will only work in the shell.');
-}
-
-// Check argument count
-
-if(sizeof($argv) != 2)
-{
-	print_help($argv);
-	exit;
-}
-
-// Load the contents of the given path
-
-$path = $argv[1];
-$files = array();
-
-if($dh = opendir($path))
-{
-	while(false !== ($file = readdir($dh)))
-	{
-		if($file != "."
-		   && $file != ".."
-		   && !is_dir($file)
-		   && preg_match('/(.+)\.lng\.php/i', $file))
-		{
-			$files[$file] = str_replace('//', '/', $path . '/' . $file);
-		}
-	}
-
-	closedir($dh);
-}
-else
-{
-	print "ERROR: The path you requested cannot be read! \n ";
-	print "\n";
-	print_help();
-	exit;
-}
-
-// check if there is the default language defined
-
-if(!isset($files[$baseLanguage]))
-{
-	print "ERROR: The baselanguage cannot be found! \n";
-	print "\n";
-	print_help();
-	exit;
-}
-
-// import the baselanguage
-
-$base = import($files[$baseLanguage]);
-
-// and unset it in the files, because we don't need to compare base to base
-
-unset($files[$baseLanguage]);
-
-// compare each language with the baselanguage
-
-foreach($files as $key => $file)
-{
-	$comp = import($file);
-	print "\n\nComparing " . $baseLanguage . " to " . $key . "\n";
-	$result = compare($base, $comp);
-
-	if(is_array($result)
-	   && sizeof($result) > 0)
-	{
-		print "  found missing strings: \n";
-		foreach($result as $value)
-		{
-			print "    " . $value . "\n";
-		}
-	}
-	else
-	{
-		print "   no missing strings found! \n ";
-	}
-
-	print "\nReverse Checking " . $key . " to " . $baseLanguage . "\n";
-	$result = compare($comp, $base);
-
-	if(is_array($result)
-	   && sizeof($result) > 0)
-	{
-		print "  found strings not in basefile: \n";
-		foreach($result as $key => $value)
-		{
-			print "    " . $value . "\n";
-		}
-	}
-	else
-	{
-		print "   There are no strings which are not in the basefile! \n ";
-	}
-}
-
-//-----------------------------------------------------------------------------------------
-// FUNCTIONS
-//-----------------------------------------------------------------------------------------
-
-/**
- * prints the help screen
- *
- * @param  array  $argv
- */
-
-function print_help($argv)
-{
-	print "Usage: php " . $argv[0] . " /PATH/TO/LNG \n";
-	print " \n ";
-}
-
-function import($file)
-{
-	$input = file($file);
-	$return = array();
-	foreach($input as $key => $value)
-	{
-		if(!preg_match('/^\$/', $value))
-		{
-			unset($input[$key]);
-		}
-		else
-		{
-			// generate the key
-
-			$key = preg_replace('/^\$lng\[\'(.*)=(.*)$/U', '\\1', $value);
-			$key = str_replace('[\'', '/', $key);
-			$key = trim(str_replace('\']', '', $key));
-
-			//generate the value
-
-			$value = trim($value);
-
-			// set the result
-
-			$return[$key] = $value;
-		}
-	}
-
-	return $return;
-}
-
-function compare($array1, $array2)
-{
-	$result = array();
-	foreach($array1 as $key => $value)
-	{
-		if(!isset($array2[$key]))
-		{
-			$result[$key] = $value;
-		}
-	}
-
-	return $result;
-}
-
-?>

install/scripts/switch-server-ip.php

@@ -0,0 +1,31 @@
+#!/usr/bin/php
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Froxlor team <team@froxlor.org> (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
+ *         
+ */
+
+// Check if we're in the CLI
+if (@php_sapi_name() !== 'cli') {
+	die('This script will only work in the shell.');
+}
+
+require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+
+// give control to command line handler
+try {
+	\Froxlor\Cli\SwitchServerIpCmd::processParameters($argc, $argv);
+} catch (Exception $e) {
+	\Froxlor\Cli\SwitchServerIpCmd::printerr($e->getMessage());
+}

install/templates/assets/css/install.css

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