set version to 0.9.40.1 for bugfix release

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

.github/CONTRIBUTING.md

@@ -2,12 +2,15 @@
 
 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.
+already working on it or if we don't want to invest the effort in favour of
+working on Froxlor 2.0.
+Of course, bug fixes 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).
+Currently, we are working on a complete re-write, which, at this point in
+time, is not yet public to keep delays due to discussions about internal
+details to a minimum.
 
 
 
@@ -32,7 +35,7 @@ Thanks!
 
 ### Webserver changes
 If you make changes to the functionality of webserver configuration, please
-make sure your implementation covers all supported webservers.
+make sure your implementation covers both apache **and** nginx.
 
 
 
@@ -48,10 +51,8 @@ strings in
 
 
 
-### New settings and database-layout changnes
-If you add new settings or layout changes, please make sure you add these to
+### New settings
+If you add new settings, please make sure you add the default values 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
-
+* handle the update (see `install/updates/froxlor/0.9/update_0.9.inc.php`)

.github/FUNDING.yml

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

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

@@ -1,9 +1,7 @@
 install/update.log
 templates/*
 lib/userdata.inc.php
-lib/userdata.inc.php.bak
 logs/*
-!logs/index.html
 .buildpath
 .project
 .settings/
@@ -17,4 +15,3 @@ logs/*
 !templates/Sparkle/
 !templates/misc/
 templates/Froxlor/assets/img/logo_custom.png
-vendor/

.travis.yml

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

2fa.php

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

@@ -1,6 +1,3 @@
-[![Build Status](https://travis-ci.com/Froxlor/Froxlor.svg?branch=master)](https://travis-ci.com/Froxlor/Froxlor)
-[![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.
@@ -53,21 +50,14 @@ https://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](https://files.fro
 
 [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
-```
+/etc/apt/sources.list.d/froxlor.list
+> deb http://debian.froxlor.org {wheezy|jessie|stretch} main
 
-### Ubuntu repository
+### Gentoo repository
 
-[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-ubuntu)
+[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-gentoo)
 
-```
-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
-```
+https://files.froxlor.org/gentoo/repositories.xml
 
 ## Contributing
 

SECURITY.md

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

@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ *
+ */
+
+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,51 +16,40 @@
  * @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' => array(
-						'\\Froxlor\\User',
-						'getLanguages'
+					'option_options_method' => 'getLanguages',
+					'save_method' => 'storeSettingField',
 					),
-					'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' => 'Sparkle',
+					'default' => 'Froxlor',
 					'option_mode' => 'one',
-					'option_options_method' => array(
-						'\\Froxlor\\UI\\Template',
-						'getThemes'
+					'option_options_method' => 'getThemes',
+					'save_method' => 'storeSettingDefaultTheme',
 					),
-					'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',
@@ -68,23 +57,23 @@ 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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'panel_no_robots' => array(
 					'label' => $lng['serversettings']['no_robots'],
 					'settinggroup' => 'panel',
 					'varname' => 'no_robots',
 					'type' => 'bool',
 					'default' => true,
-					'save_method' => 'storeSettingField'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'panel_paging' => array(
 					'label' => $lng['serversettings']['paging'],
 					'settinggroup' => 'panel',
@@ -92,8 +81,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',
@@ -101,12 +90,9 @@ return array(
 					'type' => 'option',
 					'default' => 'Manual',
 					'option_mode' => 'one',
-					'option_options' => array(
-						'Manual' => $lng['serversettings']['manual'],
-						'Dropdown' => $lng['serversettings']['dropdown']
+					'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
+					'save_method' => 'storeSettingField',
 					),
-					'save_method' => 'storeSettingField'
-				),
 				'panel_adminmail' => array(
 					'label' => $lng['serversettings']['adminmail'],
 					'settinggroup' => 'panel',
@@ -115,16 +101,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',
@@ -133,8 +119,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',
@@ -143,8 +129,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',
@@ -153,8 +139,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',
@@ -163,8 +149,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',
@@ -173,40 +159,40 @@ 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'
-				),
+					'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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'customer_news_feed_url' => array(
 					'label' => $lng['admin']['customer_news_feed_url'],
 					'settinggroup' => 'customer',
@@ -215,32 +201,32 @@ return array(
 					'string_type' => 'url',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				),
+					'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',
@@ -250,25 +236,25 @@ return array(
 					'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"
+						'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'
-				)
-			)
-		)
-	)
-);
+					'save_method' => 'storeSettingField',
+					),
+				),
+			),
+		),
+	);
 
 ?>

actions/admin/settings/110.accounts.php

@@ -16,6 +16,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'accounts' => array(
@@ -27,144 +28,131 @@ 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'
-				),
-				'2fa_enabled' => array(
-					'label' => $lng['2fa']['2fa_enabled'],
-					'settinggroup' => '2fa',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => true,
-					'save_method' => 'storeSettingField'
-				),
+					'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'
-				),
+					'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'
-				),
+					'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'
-				),
+					'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'
-				),
+					'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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'panel_password_regex' => array(
 					'label' => $lng['serversettings']['panel_password_regex'],
 					'settinggroup' => 'panel',
 					'varname' => 'password_regex',
 					'type' => 'string',
 					'default' => '',
-					'save_method' => 'storeSettingField'
-				),
+					/* 'plausibility_check_method' => 'checkValidRegEx', */
+					'save_method' => 'storeSettingField',
+					),
 				'customer_accountprefix' => array(
 					'label' => $lng['serversettings']['accountprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'accountprefix',
 					'type' => 'string',
 					'default' => '',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkUsername'
+					'plausibility_check_method' => 'checkUsername',
+					'save_method' => 'storeSettingField',
 					),
-					'save_method' => 'storeSettingField'
-				),
 				'customer_mysqlprefix' => array(
 					'label' => $lng['serversettings']['mysqlprefix'],
 					'settinggroup' => 'customer',
 					'varname' => 'mysqlprefix',
 					'type' => 'string',
 					'default' => '',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkUsername'
+					'plausibility_check_method' => 'checkUsername',
+					'save_method' => 'storeSettingField',
 					),
-					'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',
@@ -173,14 +161,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',
@@ -189,12 +177,12 @@ 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(
@@ -205,9 +193,9 @@ return array(
 					'default' => false,
 					'cronmodule' => 'froxlor/backup',
 					'save_method' => 'storeSettingField'
-				)
-			)
-		)
+				),
+			),
+		),
 	)
 );
 

actions/admin/settings/120.system.php

@@ -16,6 +16,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'system' => array(
@@ -29,58 +30,36 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkPathConflicts'
-					)
-				),
+					'plausibility_check_method' => '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' => array(
-						'\\Froxlor\\Domain\\IpAddr',
-						'getIpAddresses'
-					),
+					'option_options_method' => 'getIpAddresses',
 					'default' => '',
-					'save_method' => 'storeSettingIpAddress'
-				),
+					'save_method' => 'storeSettingIpAddress',
+					),
 				'system_defaultip' => array(
 					'label' => $lng['serversettings']['defaultip'],
 					'settinggroup' => 'system',
 					'varname' => 'defaultip',
 					'type' => 'option',
 					'option_mode' => 'multiple',
-					'option_options_method' => array(
-						'\\Froxlor\\Domain\\IpAddr',
-						'getIpPortCombinations'
-					),
+					'option_options_method' => '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'
+					'save_method' => 'storeSettingDefaultIp',
 					),
-					'default' => '',
-					'save_method' => 'storeSettingDefaultSslIp'
-				),
 				'system_hostname' => array(
 					'label' => $lng['serversettings']['hostname'],
 					'settinggroup' => 'system',
@@ -88,47 +67,33 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
-					'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'
-				),
+					'plausibility_check_method' => 'checkHostname',
+					),
 				'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' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkMysqlAccessHost'
+					'plausibility_check_method' => 'checkMysqlAccessHost',
+					'save_method' => 'storeSettingMysqlAccessHost',
 					),
-					'save_method' => 'storeSettingMysqlAccessHost'
-				),
 				'system_nssextrausers' => array(
 					'label' => $lng['serversettings']['nssextrausers'],
 					'settinggroup' => 'system',
@@ -136,7 +101,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField'
-				),
+					),
 				'system_index_file_extension' => array(
 					'label' => $lng['serversettings']['index_file_extension'],
 					'settinggroup' => 'system',
@@ -144,28 +109,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',
@@ -173,8 +138,8 @@ 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',
@@ -183,8 +148,8 @@ return array(
 					'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',
@@ -193,8 +158,8 @@ return array(
 					'int_min' => 0,
 					'int_max' => 150,
 					'default' => 90,
-					'save_method' => 'storeSettingField'
-				),
+					'save_method' => 'storeSettingField',
+					),
 
 				'system_mail_use_smtp' => array(
 					'label' => $lng['serversettings']['mail_use_smtp'],
@@ -202,16 +167,16 @@ return array(
 					'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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'system_mail_smtp_port' => array(
 					'label' => $lng['serversettings']['mail_smtp_port'],
 					'settinggroup' => 'system',
@@ -220,57 +185,41 @@ return array(
 					'int_min' => 1,
 					'int_max' => 65535,
 					'default' => 25,
-					'save_method' => 'storeSettingField'
-				),
+					'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'
-				),
+					'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'
-				),
+					'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'
-				),
+					'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'
+					'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'
-				),
-			)
-		)
-	)
-);
+			),
+		),
+	);

actions/admin/settings/122.froxlorvhost.php

@@ -11,13 +11,13 @@
  * @copyright  (c) the authors
  * @author     Froxlor team <team@froxlor.org> (2016-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    \Froxlor\Settings
+ * @package    Settings
  *
  */
 return array(
 	'groups' => array(
 		'froxlorvhost' => array(
-			'title' => $lng['admin']['froxlorvhost'] . (call_user_func(array('\Froxlor\Settings\FroxlorVhostSettings', 'hasVhostContainerEnabled')) == false ? $lng['admin']['novhostcontainer'] : ''),
+			'title' => $lng['admin']['froxlorvhost'],
 			'fields' => array(
 				/**
 				 * Webserver-Vhost
@@ -30,16 +30,6 @@ return array(
 					'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
 				 */
@@ -50,10 +40,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingClearCertificates',
-					'visible' => \Froxlor\Settings::Get('system.leenabled') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					), true)
+					'visible' => Settings::Get('system.leenabled')
 				),
 				'system_le_froxlor_redirect' => array(
 					'label' => $lng['serversettings']['le_froxlor_redirect'],
@@ -62,10 +49,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					), true)
+					'visible' => Settings::Get('system.use_ssl')
 				),
 				'system_hsts_maxage' => array(
 					'label' => $lng['admin']['domain_hsts_maxage'],
@@ -76,10 +60,7 @@ return array(
 					'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)
+					'visible' => Settings::Get('system.use_ssl')
 				),
 				'system_hsts_incsub' => array(
 					'label' => $lng['admin']['domain_hsts_incsub'],
@@ -88,10 +69,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.use_ssl') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					), true)
+					'visible' => Settings::Get('system.use_ssl')
 				),
 				'system_hsts_preload' => array(
 					'label' => $lng['admin']['domain_hsts_preload'],
@@ -100,34 +78,7 @@ return array(
 					'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)
+					'visible' => Settings::Get('system.use_ssl')
 				),
 				/**
 				 * FCGID
@@ -142,10 +93,7 @@ return array(
 					'websrv_avail' => array(
 						'apache2'
 					),
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('system.mod_fcgid')
 				),
 				'system_mod_fcgid_httpuser' => array(
 					'label' => $lng['admin']['mod_fcgid_user'],
@@ -157,10 +105,7 @@ return array(
 					'websrv_avail' => array(
 						'apache2'
 					),
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('system.mod_fcgid')
 				),
 				'system_mod_fcgid_httpgroup' => array(
 					'label' => $lng['admin']['mod_fcgid_group'],
@@ -172,10 +117,7 @@ return array(
 					'websrv_avail' => array(
 						'apache2'
 					),
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('system.mod_fcgid')
 				),
 				'system_mod_fcgid_defaultini_ownvhost' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
@@ -184,18 +126,12 @@ return array(
 					'type' => 'option',
 					'default' => '2',
 					'option_mode' => 'one',
-					'option_options_method' => array(
-						'\\Froxlor\\Http\\PhpConfig',
-						'getPhpConfigs'
-					),
+					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array(
 						'apache2'
 					),
-					'visible' => \Froxlor\Settings::Get('system.mod_fcgid') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('system.mod_fcgid')
 				),
 				/**
 				 * php-fpm
@@ -207,10 +143,7 @@ return array(
 					'type' => 'bool',
 					'default' => true,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('phpfpm.enabled')
 				),
 				'system_phpfpm_httpuser' => array(
 					'label' => $lng['phpfpm']['vhost_httpuser'],
@@ -219,10 +152,7 @@ return array(
 					'type' => 'string',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingWebserverFcgidFpmUser',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('phpfpm.enabled')
 				),
 				'system_phpfpm_httpgroup' => array(
 					'label' => $lng['phpfpm']['vhost_httpgroup'],
@@ -231,10 +161,7 @@ return array(
 					'type' => 'string',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('phpfpm.enabled')
 				),
 				'system_phpfpm_defaultini_ownvhost' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
@@ -243,15 +170,9 @@ return array(
 					'type' => 'option',
 					'default' => '2',
 					'option_mode' => 'one',
-					'option_options_method' => array(
-						'\\Froxlor\\Http\\PhpConfig',
-						'getPhpConfigs'
-					),
+					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('phpfpm.enabled') && call_user_func(array(
-						'\Froxlor\Settings\FroxlorVhostSettings',
-						'hasVhostContainerEnabled'
-					))
+					'visible' => Settings::Get('phpfpm.enabled')
 				),
 				/**
 				 * DNS
@@ -263,7 +184,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => \Froxlor\Settings::Get('system.bind_enable')
+					'visible' => Settings::Get('system.bind_enable')
 				)
 			)
 		)

actions/admin/settings/125.cronjob.php

@@ -14,6 +14,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'crond' => array(
@@ -26,40 +27,40 @@ return array(
 					'type' => 'string',
 					'string_type' => 'file',
 					'default' => '/etc/cron.d/froxlor',
-					'save_method' => 'storeSettingField'
-				),
+					'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'
-				),
+					'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'
-				),
+					'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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'system_debug_cron' => array(
 					'label' => $lng['serversettings']['cron']['debug'],
 					'settinggroup' => 'system',
 					'varname' => 'debug_cron',
 					'type' => 'bool',
 					'default' => false,
-					'save_method' => 'storeSettingField'
-				)
+					'save_method' => 'storeSettingField',
+					)
 			)
 		)
 	)

actions/admin/settings/130.webserver.php

@@ -13,7 +13,7 @@
  * @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    \Froxlor\Settings
+ * @package    Settings
  *
  */
 return array(
@@ -34,10 +34,7 @@ return array(
 						'nginx' => 'Nginx'
 					),
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkPhpInterfaceSetting'
-					),
+					'plausibility_check_method' => 'checkPhpInterfaceSetting',
 					'overview_option' => true
 				),
 				'system_apache_24' => array(
@@ -58,7 +55,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 0 && \Froxlor\Settings::Get('phpfpm.enabled') == 0),
+					'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
 					'websrv_avail' => array(
 						'apache2'
 					)
@@ -74,18 +71,7 @@ return 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')
+					'visible' => Settings::Get('system.use_ssl')
 				),
 				'system_httpuser' => array(
 					'label' => $lng['admin']['webserver_user'],
@@ -173,8 +159,7 @@ return array(
 					'websrv_avail' => array(
 						'apache2',
 						'nginx'
-					),
-					'visible' => \Froxlor\Settings::Get('system.awstats_enabled') == 1
+					)
 				),
 				'system_logfiles_type' => array(
 					'label' => $lng['serversettings']['logfiles_type'],
@@ -192,29 +177,6 @@ return 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',
@@ -251,23 +213,6 @@ return array(
 					'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',
@@ -275,7 +220,7 @@ return array(
 					'type' => 'text',
 					'default' => '',
 					'save_method' => 'storeSettingField',
-					'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 0 && \Froxlor\Settings::Get('phpfpm.enabled') == 0),
+					'visible' => (Settings::Get('system.mod_fcgid') == 0 && Settings::Get('phpfpm.enabled') == 0),
 					'websrv_avail' => array(
 						'apache2'
 					)
@@ -389,7 +334,7 @@ return array(
 					'type' => 'option',
 					'default' => '1',
 					'option_mode' => 'one',
-					'option_options_method' => array('\\Froxlor\\Domain\\Domain', 'getRedirectCodes'),
+					'option_options_method' => 'getRedirectCodes',
 					'save_method' => 'storeSettingField'
 				)
 			)

actions/admin/settings/131.ssl.php

@@ -13,7 +13,7 @@
  * @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    \Froxlor\Settings
+ * @package    Settings
  *
  */
 return array(
@@ -35,7 +35,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'ssl_protocols',
 					'type' => 'option',
-					'default' => 'TLSv1.2',
+					'default' => 'TLSv1,TLSv1.2',
 					'option_mode' => 'multiple',
 					'option_options' => array(
 						'TLSv1' => 'TLSv1',
@@ -54,16 +54,6 @@ return array(
 					'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',
@@ -112,18 +102,9 @@ return array(
 					'string_type' => 'string',
 					'string_emptyallowed' => false,
 					'default' => 'shmcb:/var/run/apache2/ocsp-stapling.cache(131072)',
-					'visible' => \Froxlor\Settings::Get('system.webserver') == "apache2" && \Froxlor\Settings::Get('system.apache24') == 1,
+					'visible' => Settings::Get('system.webserver') == "apache2" && Settings::Get('system.apache24') == 1,
 					'save_method' => 'storeSettingField'
 				),
-				'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',
@@ -147,9 +128,10 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'leapiversion',
 					'type' => 'option',
-					'default' => '2',
+					'default' => '1',
 					'option_mode' => 'one',
 					'option_options' => array(
+						'1' => 'ACME v1',
 						'2' => 'ACME v2'
 					),
 					'save_method' => 'storeSettingField'
@@ -159,50 +141,48 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptca',
 					'type' => 'option',
-					'default' => 'production',
+					'default' => 'testing',
 					'option_mode' => 'one',
 					'option_options' => array(
-						'testing' => 'https://acme-staging-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org (Test)',
-						'production' => 'https://acme-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org (Live)'
+						'testing' => 'https://acme-staging' . (Settings::Get('system.leapiversion') == '2' ? '-v02' : '') . '.api.letsencrypt.org (Test)',
+						'production' => 'https://acme-v0' . Settings::Get('system.leapiversion') . '.api.letsencrypt.org (Live)'
 					),
 					'save_method' => 'storeSettingField'
 				),
+				'system_letsencryptcountrycode' => array(
+					'label' => $lng['serversettings']['letsencryptcountrycode'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptcountrycode',
+					'type' => 'string',
+					'string_emptyallowed' => false,
+					'default' => 'DE',
+					'save_method' => 'storeSettingField'
+				),
+				'system_letsencryptstate' => array(
+					'label' => $lng['serversettings']['letsencryptstate'],
+					'settinggroup' => 'system',
+					'varname' => 'letsencryptstate',
+					'type' => 'string',
+					'string_emptyallowed' => false,
+					'default' => 'Hessen',
+					'save_method' => 'storeSettingField'
+				),
 				'system_letsencryptchallengepath' => array(
 					'label' => $lng['serversettings']['letsencryptchallengepath'],
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptchallengepath',
 					'type' => 'string',
 					'string_emptyallowed' => false,
-					'default' => \Froxlor\Froxlor::getInstallDir(),
+					'default' => FROXLOR_INSTALL_DIR,
 					'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'
-					),
+					'type' => 'int',
+					'int_min' => 2048,
+					'default' => 4096,
 					'save_method' => 'storeSettingField'
 				),
 				'system_letsencryptreuseold' => array(
@@ -210,15 +190,15 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptreuseold',
 					'type' => 'bool',
-					'default' => true,
+					'default' => false,
 					'save_method' => 'storeSettingField'
 				),
 				'system_disable_le_selfcheck' => array(
-					'label' => $lng['serversettings']['le_domain_dnscheck'],
+					'label' => $lng['serversettings']['disable_le_selfcheck'],
 					'settinggroup' => 'system',
-					'varname' => 'le_domain_dnscheck',
+					'varname' => 'disable_le_selfcheck',
 					'type' => 'bool',
-					'default' => true,
+					'default' => false,
 					'save_method' => 'storeSettingField'
 				)
 			)

actions/admin/settings/135.fcgid.php

@@ -14,14 +14,12 @@
  * @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'],
@@ -30,12 +28,9 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkFcgidPhpFpm'
-					),
+					'plausibility_check_method' => 'checkFcgidPhpFpm',
 					'overview_option' => true
-				),
+					),
 				'system_mod_fcgid_configdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
 					'settinggroup' => 'system',
@@ -43,12 +38,9 @@ return array(
 					'type' => 'string',
 					'string_type' => 'confdir',
 					'default' => '/var/www/php-fcgi-scripts/',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkPathConflicts'
+					'plausibility_check_method' => 'checkPathConflicts',
+					'save_method' => 'storeSettingField',
 					),
-					'save_method' => 'storeSettingField'
-				),
 				'system_mod_fcgid_tmpdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
 					'settinggroup' => 'system',
@@ -56,8 +48,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',
@@ -67,39 +59,34 @@ 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',
@@ -107,11 +94,9 @@ return array(
 					'type' => 'option',
 					'default' => '1',
 					'option_mode' => 'one',
-					'option_options_method' => array(
-						'\\Froxlor\\Http\\PhpConfig',
-						'getPhpConfigs'),
-					'save_method' => 'storeSettingField'
-				),
+					'option_options_method' => 'getPhpConfigs',
+					'save_method' => 'storeSettingField',
+					),
 				'system_mod_fcgid_idle_timeout' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'],
 					'settinggroup' => 'system',
@@ -119,10 +104,10 @@ return array(
 					'type' => 'int',
 					'default' => 30,
 					'save_method' => 'storeSettingField'
+					)
 				)
 			)
 		)
-	)
-);
+	);
 
 ?>

actions/admin/settings/136.phpfpm.php

@@ -1,141 +1,136 @@
-<?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    \Froxlor\Settings
- *
- */
-return array(
-	'groups' => array(
-		'phpfpm' => array(
-			'title' => $lng['admin']['phpfpm_settings'],
-			'fields' => array(
-				'system_phpfpm_enabled' => array(
-					'label' => $lng['serversettings']['phpfpm'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'plausibility_check_method' => array(
-						'\\Froxlor\\Validate\\Check',
-						'checkFcgidPhpFpm'
-					),
-					'overview_option' => true
-				),
-				'system_phpfpm_defaultini' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'defaultini',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'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' => 'confdir',
-					'default' => '/var/www/php-fpm/',
-					'save_method' => 'storeSettingField'
-				),
-				'system_phpfpm_tmpdir' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
-					'settinggroup' => 'phpfpm',
-					'varname' => 'tmpdir',
-					'type' => 'string',
-					'string_type' => 'dir',
-					'default' => '/var/customers/tmp/',
-					'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_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'
-				)
-			)
-		)
-	)
-);
+<?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    Settings
+ *
+ */
+
+return array(
+	'groups' => array(
+		'phpfpm' => array(
+			'title' => $lng['admin']['phpfpm_settings'],
+			'fields' => array(
+				'system_phpfpm_enabled' => array(
+					'label' => $lng['serversettings']['phpfpm'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkFcgidPhpFpm',
+					'overview_option' => true
+					),
+				'system_phpfpm_defaultini' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'defaultini',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options_method' => 'getPhpConfigs',
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_aliasconfigdir' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'aliasconfigdir',
+					'type' => 'string',
+					'string_type' => 'confdir',
+					'default' => '/var/www/php-fpm/',
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_tmpdir' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'tmpdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/var/customers/tmp/',
+					'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_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' => false,
+					'visible' => 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,6 +14,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'perl' => array(
@@ -26,10 +27,8 @@ 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',
@@ -37,10 +36,8 @@ 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',
@@ -49,10 +46,8 @@ 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',
@@ -60,13 +55,11 @@ 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,6 +16,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'statistics' => array(
@@ -28,22 +29,17 @@ 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']
-					),
+					'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',
@@ -52,8 +48,7 @@ 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',
@@ -62,8 +57,7 @@ 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',
@@ -72,8 +66,7 @@ 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',
@@ -82,20 +75,10 @@ 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,6 +16,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'mail' => array(
@@ -29,8 +30,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',
@@ -39,8 +40,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',
@@ -48,8 +49,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',
@@ -58,48 +59,48 @@ 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'
-				),
+					'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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'system_mdaserver' => array(
 					'label' => $lng['serversettings']['mdaserver'],
 					'settinggroup' => 'system',
@@ -107,12 +108,9 @@ return array(
 					'type' => 'option',
 					'option_mode' => 'one',
 					'default' => 'dovecot',
-					'option_options' => array(
-						'courier' => 'Courier',
-						'dovecot' => 'Dovecot'
+					'option_options' => array('courier' => 'Courier', 'dovecot' => 'Dovecot'),
+					'save_method' => 'storeSettingField',
 					),
-					'save_method' => 'storeSettingField'
-				),
 				'system_mdalog' => array(
 					'label' => $lng['serversettings']['mdalog'],
 					'settinggroup' => 'system',
@@ -121,8 +119,8 @@ return array(
 					'string_type' => 'file',
 					'default' => '/var/log/mail.log',
 					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'system_mtaserver' => array(
 					'label' => $lng['serversettings']['mtaserver'],
 					'settinggroup' => 'system',
@@ -130,12 +128,9 @@ return array(
 					'type' => 'option',
 					'option_mode' => 'one',
 					'default' => 'postfix',
-					'option_options' => array(
-						'exim4' => 'Exim4',
-						'postfix' => 'Postfix'
+					'option_options' => array('exim4' => 'Exim4', 'postfix' => 'Postfix'),
+					'save_method' => 'storeSettingField',
 					),
-					'save_method' => 'storeSettingField'
-				),
 				'system_mtalog' => array(
 					'label' => $lng['serversettings']['mtalog'],
 					'settinggroup' => 'system',
@@ -144,11 +139,11 @@ return array(
 					'string_type' => 'file',
 					'default' => '/var/log/mail.log',
 					'string_emptyallowed' => true,
-					'save_method' => 'storeSettingField'
-				)
-			)
-		)
-	)
-);
+					'save_method' => 'storeSettingField',
+					),
+				),
+			),
+		),
+	);
 
 ?>

actions/admin/settings/155.ftpserver.php

@@ -16,9 +16,10 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
-		'ftpserver' => array(
+	'ftpserver' => array(
 			'title' => $lng['admin']['ftpserversettings'],
 			'fields' => array(
 				'ftpserver' => array(
@@ -28,14 +29,11 @@ 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,6 +16,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'nameserver' => array(
@@ -29,7 +30,7 @@ return array(
 					'default' => true,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-				),
+					),
 				'system_dnsenabled' => array(
 					'label' => $lng['serversettings']['dnseditorenable'],
 					'settinggroup' => 'system',
@@ -37,18 +38,15 @@ return array(
 					'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',
+					'default' => 'bind',
 					'option_mode' => 'one',
-					'option_options' => array(
-						'Bind' => 'Bind9',
-						'PowerDNS' => 'PowerDNS'
-					),
+					'option_options' => array('bind' => 'Bind9', 'pdns' => 'PowerDNS'),
 					'save_method' => 'storeSettingField'
 				),
 				'system_bindconf_directory' => array(
@@ -58,16 +56,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',
@@ -76,8 +74,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',
@@ -86,8 +84,8 @@ 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',
@@ -97,7 +95,7 @@ return array(
 					'string_delimiter' => ',',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
 				),
 				'system_dns_createmailentry' => array(
 					'label' => $lng['serversettings']['mail_also_with_mxservers'],
@@ -106,23 +104,7 @@ 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',
@@ -131,9 +113,9 @@ return array(
 					'default' => 604800, /* 1 week */
 					'int_min' => 3600, /* 1 hour */
 					'int_max' => 2147483647, /* integer max */
-					'save_method' => 'storeSettingField'
-				)
-			)
-		)
-	)
-);
+					'save_method' => 'storeSettingField',
+					),
+				),
+			),
+		),
+	);

actions/admin/settings/170.logger.php

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

actions/admin/settings/180.dkim.php

@@ -13,9 +13,10 @@
  * @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    \Froxlor\Settings
+ * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'dkim' => array(
@@ -29,7 +30,7 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingFieldInsertBindTask',
 					'overview_option' => true
-				),
+					),
 				'dkim_prefix' => array(
 					'label' => $lng['dkim']['dkim_prefix'],
 					'settinggroup' => 'dkim',
@@ -37,8 +38,8 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/etc/postfix/dkim/',
-					'save_method' => 'storeSettingField'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'dkim_domains' => array(
 					'label' => $lng['dkim']['dkim_domains'],
 					'settinggroup' => 'dkim',
@@ -46,8 +47,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',
@@ -55,8 +56,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',
@@ -64,13 +65,9 @@ return array(
 					'type' => 'option',
 					'default' => 'all',
 					'option_mode' => 'multiple',
-					'option_options' => array(
-						'all' => 'All',
-						'sha1' => 'SHA1',
-						'sha256' => 'SHA256'
+					'option_options' => array('all' => 'All', 'sha1' => 'SHA1', 'sha256' => 'SHA256'),
+					'save_method' => 'storeSettingFieldInsertBindTask',
 					),
-					'save_method' => 'storeSettingFieldInsertBindTask'
-				),
 				'dkim_servicetype' => array(
 					'label' => $lng['dkim']['dkim_servicetype'],
 					'settinggroup' => 'dkim',
@@ -78,28 +75,22 @@ return array(
 					'type' => 'option',
 					'default' => '0',
 					'option_mode' => 'one',
-					'option_options' => array(
-						'0' => 'All',
-						'1' => 'E-Mail'
+					'option_options' => array('0' => 'All', '1' => 'E-Mail'),
+					'save_method' => 'storeSettingFieldInsertBindTask',
 					),
-					'save_method' => 'storeSettingFieldInsertBindTask'
-				),
 				'dkim_keylength' => array(
 					'label' => array(
 						'title' => $lng['dkim']['dkim_keylength']['title'],
-						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], \Froxlor\Settings::Get('dkim.dkim_prefix'))
+						'description' => sprintf($lng['dkim']['dkim_keylength']['description'], 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'
+					'option_options' => array('1024' => '1024 Bit', '2048' => '2048 Bit'),
+					'save_method' => 'storeSettingFieldInsertBindTask',
 					),
-					'save_method' => 'storeSettingFieldInsertBindTask'
-				),
 				'dkim_notes' => array(
 					'label' => $lng['dkim']['dkim_notes'],
 					'settinggroup' => 'dkim',
@@ -107,19 +98,37 @@ return array(
 					'type' => 'string',
 					'string_regexp' => '/^[a-z0-9\._]+$/i',
 					'default' => '',
-					'save_method' => 'storeSettingFieldInsertBindTask'
-				),
+					'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',
+					),
 				'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,6 +14,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'spf' => array(
@@ -27,7 +28,7 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
-				),
+					),
 				'spf_entry' => array(
 					'label' => $lng['spf']['spf_entry'],
 					'settinggroup' => 'spf',
@@ -35,10 +36,10 @@ return array(
 					'type' => 'string',
 					'default' => '"v=spf1 a mx -all"',
 					'save_method' => 'storeSettingField'
+					)
 				)
 			)
 		)
-	)
-);
+	);
 
 ?>

actions/admin/settings/190.ticket.php

@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ *
+ */
+
+return array(
+	'groups' => array(
+		'ticket' => array(
+			'title' => $lng['admin']['ticketsettings'],
+			'fields' => array(
+				'ticket_enabled' => array(
+					'label' => $lng['serversettings']['ticket']['enable'],
+					'settinggroup' => 'ticket',
+					'varname' => 'enabled',
+					'type' => 'bool',
+					'default' => false,
+					'cronmodule' => 'froxlor/ticket',
+					'save_method' => 'storeSettingField',
+					'overview_option' => true
+					),
+				'ticket_noreply_email' => array(
+					'label' => $lng['serversettings']['ticket']['noreply_email'],
+					'settinggroup' => 'ticket',
+					'varname' => 'noreply_email',
+					'type' => 'string',
+					'string_type' => 'mail',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_noreply_name' => array(
+					'label' => $lng['serversettings']['ticket']['noreply_name'],
+					'settinggroup' => 'ticket',
+					'varname' => 'noreply_name',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_reset_cycle' => array(
+					'label' => $lng['serversettings']['ticket']['reset_cycle'],
+					'settinggroup' => 'ticket',
+					'varname' => 'reset_cycle',
+					'type' => 'option',
+					'default' => 1,
+					'option_mode' => 'one',
+					'option_options' => array(0 => html_entity_decode($lng['admin']['tickets']['daily']), 1 => html_entity_decode($lng['admin']['tickets']['weekly']), 2 => html_entity_decode($lng['admin']['tickets']['monthly']), 3 => html_entity_decode($lng['admin']['tickets']['yearly'])),
+					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'setCycleOfCronjob',
+					),
+				'ticket_concurrently_open' => array(
+					'label' => $lng['serversettings']['ticket']['concurrentlyopen'],
+					'settinggroup' => 'ticket',
+					'varname' => 'concurrently_open',
+					'type' => 'int',
+					'default' => 5,
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_archiving_days' => array(
+					'label' => $lng['serversettings']['ticket']['archiving_days'],
+					'settinggroup' => 'ticket',
+					'varname' => 'archiving_days',
+					'type' => 'int',
+					'int_min' => 1,
+					'int_max' => 99,
+					'default' => 5,
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_worktime_all' => array(
+					'label' => $lng['serversettings']['ticket']['worktime_all'],
+					'settinggroup' => 'ticket',
+					'varname' => 'worktime_all',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_worktime_begin' => array(
+					'label' => $lng['serversettings']['ticket']['worktime_begin'],
+					'settinggroup' => 'ticket',
+					'varname' => 'worktime_begin',
+					'type' => 'string',
+					'string_regexp' => '/^[012][0-9]:[0-6][0-9]$/',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_worktime_end' => array(
+					'label' => $lng['serversettings']['ticket']['worktime_end'],
+					'settinggroup' => 'ticket',
+					'varname' => 'worktime_end',
+					'type' => 'string',
+					'string_regexp' => '/^[012][0-9]:[0-6][0-9]$/',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_worktime_sat' => array(
+					'label' => $lng['serversettings']['ticket']['worktime_sat'],
+					'settinggroup' => 'ticket',
+					'varname' => 'worktime_sat',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'ticket_worktime_sun' => array(
+					'label' => $lng['serversettings']['ticket']['worktime_sun'],
+					'settinggroup' => 'ticket',
+					'varname' => 'worktime_sun',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'system_last_archive_run' => array(
+					'settinggroup' => 'system',
+					'varname' => 'last_archive_run',
+					'type' => 'hidden',
+					'default' => '',
+					),
+				'ticket_default_priority' => array(
+					'label' => $lng['serversettings']['ticket']['default_priority'],
+					'settinggroup' => 'ticket',
+					'varname' => 'default_priority',
+					'type' => 'option',
+					'default' => 2,
+					'option_mode' => 'one',
+					'option_options' => array(1 => $lng['ticket']['high'], 2 => $lng['ticket']['normal'], 3 => $lng['ticket']['low']),
+					'save_method' => 'storeSettingField', 
+					),
+				),
+			),
+		)
+	);
+
+?>

actions/admin/settings/210.security.php

@@ -16,6 +16,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'security' => array(
@@ -27,16 +28,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' => false,
-					'save_method' => 'storeSettingField'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'system_passwordcryptfunc' => array(
 					'label' => $lng['serversettings']['passwordcryptfunc'],
 					'settinggroup' => 'system',
@@ -44,36 +45,33 @@ return array(
 					'type' => 'option',
 					'default' => 0,
 					'option_mode' => 'one',
-					'option_options_method' => array(
-						'\\Froxlor\\System\\Crypt',
-						'getAvailablePasswordHashes'
+					'option_options_method' => 'getAvailablePasswordHashes',
+					'save_method' => 'storeSettingField',
 					),
-					'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'
-				),
+					'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'
-				),
+					'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'
-				),
+					'save_method' => 'storeSettingField',
+					),
 				'system_available_shells' => array(
 					'label' => $lng['serversettings']['available_shells'],
 					'settinggroup' => 'system',
@@ -81,9 +79,9 @@ return array(
 					'type' => 'string',
 					'string_emptyallowed' => true,
 					'default' => '',
-					'save_method' => 'storeSettingField'
+					'save_method' => 'storeSettingField',
+					)
 				)
 			)
 		)
-	)
-);
+	);

actions/admin/settings/220.quota.php

@@ -13,6 +13,7 @@
  * @package    Settings
  *
  */
+
 return array(
 	'groups' => array(
 		'diskquota' => array(
@@ -33,7 +34,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'],
@@ -41,7 +42,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'],
@@ -49,11 +50,11 @@ return array(
 					'varname' => 'diskquota_customer_partition',
 					'type' => 'string',
 					'default' => '/dev/root',
-					'save_method' => 'storeSettingField'
-				)
-			)
-		)
-	)
-);
+					'save_method' => 'storeSettingField',
+				),
+				),
+			),
+		),
+	);
 
 ?>

admin_apcuinfo.php

@@ -1,440 +1,415 @@
 <?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>
- *
+  +----------------------------------------------------------------------+
+  | 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 ($action == 'delete' &&
+        function_exists('apcu_clear_cache') &&
+        $userinfo['change_serversettings'] == '1'
+) {
+    apcu_clear_cache();
+    $log->logAction(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 (!function_exists('apcu_cache_info') ||
+        !function_exists('apcu_sma_info')
+) {
+    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");
+if ($page == 'showinfo'
+) {
+    $cache = apcu_cache_info();
+    $mem = apcu_sma_info();
+    $time = time();
+    $log->logAction(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']);
+    $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'];
-	}
+    // 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'];
-	}
+    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") . "\";");
-	}
+    $runtimelines = '';
+    foreach (ini_get_all('apcu') as $name => $v) {
+        $value = $v['local_value'];
+        eval("\$runtimelines.=\"" . 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']));
+    $freemem = bsize($mem_avail) . sprintf(" (%.1f%%)", $mem_avail * 100 / $mem_size);
+    $usedmem = bsize($mem_used) . sprintf(" (%.1f%%)", $mem_used * 100 / $mem_size);
+    $hits = $cache['num_hits'] . @sprintf(" (%.1f%%)", $cache['num_hits'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
+    $misses = $cache['num_misses'] . @sprintf(" (%.1f%%)", $cache['num_misses'] * 100 / ($cache['num_hits'] + $cache['num_misses']));
 
-	// Fragementation: (freeseg - 1) / total_seg
-	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for ($i = 0; $i < $mem['num_seg']; $i ++) {
-		$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]);
-	}
+    // Fragementation: (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%";
-	}
+    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'];
-	}
+    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") . "\";");
-	}
+    $img_src1 = '';
+    $img_src2 = '';
+    $img_src3 = '';
+    if (graphics_avail()) {
+        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img1', 'action' => mt_rand(0, 1000000)));
+        eval("\$img_src1=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
+        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img2', 'action' => mt_rand(0, 1000000)));
+        eval("\$img_src2=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
+        $img_src = $linker->getLink(array('section' => 'apcuinfo', 'page' => 'img3', 'action' => mt_rand(0, 1000000)));
+        eval("\$img_src3=\"" . getTemplate("settings/apcuinfo/img_line") . "\";");
+    }
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/apcuinfo/showinfo") . "\";");
-} elseif ($page == 'img1') {
+    eval("echo \"" . getTemplate("settings/apcuinfo/showinfo") . "\";");
+    
+} elseif ($page == 'img1'
+) {
 
-	$mem = apcu_sma_info();
+    $mem = apcu_sma_info();
 
-	$size = 460;
-	$image = imagecreate($size + 5, $size + 5);
+    $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);
+    $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);
+    imagecolortransparent($image, $col_white);
 
-	$s = $mem['num_seg'] * $mem['seg_size'];
-	$a = $mem['avail_mem'];
-	$x = $y = $size / 2;
-	$fuzz = 0.000001;
+    $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])));
-	}
+    // 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') {
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
+} elseif ($page == 'img2'
+) {
 
-	$cache = apcu_cache_info();
+    $cache = apcu_cache_info();
 
-	$size = $horizontal_bar_size;
-	$image = imagecreate($size + 5, 140);
+    $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);
+    $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);
+    imagecolortransparent($image, $col_white);
 
-	$s = $cache['num_hits'] + $cache['num_misses'];
-	$a = $cache['num_hits'];
+    $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) */
-	);
+    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') {
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
+} elseif ($page == 'img3'
+) {
 
-	$mem = apcu_sma_info();
+    $mem = apcu_sma_info();
 
-	$size = $horizontal_bar_size;
-	$image = imagecreate($size, 70);
+    $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);
+    $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);
+    imagecolortransparent($image, $col_white);
 
-	$s = $mem['num_seg'] * $mem['seg_size'];
-	$a = $mem['avail_mem'];
-	$x = 10;
-	$y = 0;
+    $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 ++);
-			}
-		}
-	}
+    // 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();
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
 }
 
-function graphics_avail()
-{
-	return extension_loaded('gd');
+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 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 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 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);
+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);
-		}
-	}
+
+    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);
+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);
-	}
+    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;
+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) {
+    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);
-		}
-	}
+            if ($placeindex < 16) {
+                $px = 5;
+                $py = $placeindex * 12 + 6;
+                imagefilledrectangle($im, $px + 90, $py + 3, $px + 90 - 4, $py - 3, $color2);
+                imageline($im, $x, $y + $h / 2, $px + 90, $py, $color2);
+                imagestring($im, 2, $px, $py - 6, $text, $color1);
+            } else {
+                if ($placeindex < 31) {
+                    $px = $x + 40 * 2;
+                    $py = ($placeindex - 15) * 12 + 6;
+                } else {
+                    $px = $x + 40 * 2 + 100 * intval(($placeindex - 15) / 15);
+                    $py = ($placeindex % 15) * 12 + 6;
+                }
+                imagefilledrectangle($im, $px, $py + 3, $px - 4, $py - 3, $color2);
+                imageline($im, $x + $w, $y + $h / 2, $px, $py, $color2);
+                imagestring($im, 2, $px + 2, $py - 6, $text, $color1);
+            }
+        } else {
+            imagestring($im, 4, $x + 5, $y1 - 16, $text, $color1);
+        }
+    }
 }

admin_autoupdate.php

@@ -20,127 +20,113 @@
 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('UPDATE_URI', "https://version.froxlor.org/Froxlor/legacy/" . $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(
+	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");
-
+	$log->logAction(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 = HttpClient::urlGet(UPDATE_URI);
+	
 	$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(
+			redirectTo($filename, array(
 				's' => $s,
 				'page' => 'error',
 				'errno' => 3
 			));
-		} elseif (\Froxlor\Froxlor::versionCompare2($version, $_version) == - 1) {
+		} elseif (version_compare2($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) . "\";");
+			eval("echo \"" . getTemplate("misc/question_yesno", true) . "\";");
 			exit();
 		} elseif ($isnewerversion == 0) {
 			// all good
-			\Froxlor\UI\Response::standard_success('noupdatesavail');
+			standard_success('noupdatesavail');
 		} else {
-			\Froxlor\UI\Response::standard_error('customized_version');
+			standard_error('customized_version');
 		}
 	}
-} // download the new archive
+}// 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/');
+		if (! is_dir(FROXLOR_INSTALL_DIR . '/updates/')) {
+			mkdir(FROXLOR_INSTALL_DIR . '/updates/');
 		}
-
+		
 		// name archive
-		$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . basename($toLoad);
-
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "Downloading " . $toLoad . " to " . $localArchive);
-
+		$localArchive = FROXLOR_INSTALL_DIR . '/updates/' . basename($toLoad);
+		
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "Downloading " . $toLoad . " to " . $localArchive);
+		
 		// remove old archive
 		if (file_exists($localArchive)) {
 			@unlink($localArchive);
 		}
-
+		
 		// get archive data
 		try {
 			HttpClient::fileGet($toLoad, $localArchive);
 		} catch (Exception $e) {
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			redirectTo($filename, array(
 				's' => $s,
 				'page' => 'error',
 				'errno' => 4
 			));
 		}
-
+		
 		// validate the integrity of the downloaded file
 		$_shouldsum = HttpClient::urlGet($toCheck);
 		if (! empty($_shouldsum)) {
@@ -150,78 +136,77 @@ elseif ($page == 'getdownload') {
 			$shouldsum = null;
 		}
 		$filesum = hash_file('sha256', $localArchive);
-
+		
 		if ($filesum != $shouldsum) {
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			redirectTo($filename, array(
 				's' => $s,
 				'page' => 'error',
 				'errno' => 9
 			));
 		}
-
+		
 		// to the next step
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		redirectTo($filename, array(
 			's' => $s,
 			'page' => 'extract',
 			'archive' => basename($localArchive)
 		));
 	}
-	\Froxlor\UI\Response::redirectTo($filename, array(
+	redirectTo($filename, array(
 		's' => $s,
 		'page' => 'error',
 		'errno' => 6
 	));
-} // extract and install new version
+}// extract and install new version
 elseif ($page == 'extract') {
-
+	
 	$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
-	$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . $toExtract;
-
+	$localArchive = FROXLOR_INSTALL_DIR . '/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());
+			$log->logAction(ADM_ACTION, LOG_NOTICE, "Extracting " . $localArchive . " to " . FROXLOR_INSTALL_DIR);
+			$zip->extractTo(FROXLOR_INSTALL_DIR);
 			$zip->close();
 			// success - remove unused archive
 			@unlink($localArchive);
-			// wait a bit before we redirect to be sure
-			sleep(2);
 		} else {
 			// error
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			redirectTo($filename, array(
 				's' => $s,
 				'page' => 'error',
 				'errno' => 8
 			));
 		}
-
+		
 		// redirect to update-page?
-		\Froxlor\UI\Response::redirectTo('admin_updates.php', array(
+		redirectTo('admin_updates.php', array(
 			's' => $s
 		));
 	}
-
+	
 	if (! file_exists($localArchive)) {
-		\Froxlor\UI\Response::redirectTo($filename, array(
+		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
+	eval("echo \"" . 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
@@ -230,6 +215,5 @@ elseif ($page == 'error') {
 	// 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);
+	standard_error('autoupdate_' . $errno);
 }

admin_configfiles.php

@@ -18,21 +18,15 @@
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Settings;
-
 if ($userinfo['change_serversettings'] == '1') {
 
-	if ($action == 'setconfigured') {
-		Settings::Set('panel.is_configured', '1', true);
-		\Froxlor\UI\Response::redirectTo('admin_configfiles.php', array(
-			's' => $s
-		));
-	}
-
 	$customer_tmpdir = '/tmp/';
-	if (Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_tmpdir') != '') {
+	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') != '') {
+	}
+	elseif (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.tmpdir') != '')
+	{
 		$customer_tmpdir = Settings::Get('phpfpm.tmpdir');
 	}
 
@@ -42,7 +36,7 @@ if ($userinfo['change_serversettings'] == '1') {
 		$nameservers = explode(',', Settings::Get('system.nameservers'));
 		foreach ($nameservers as $nameserver) {
 			$nameserver = trim($nameserver);
-			$nameserver_ips = \Froxlor\PhpHelper::gethostbynamel6($nameserver);
+			$nameserver_ips = gethostbynamel($nameserver);
 			if (is_array($nameserver_ips) && count($nameserver_ips) > 0) {
 				$ns_ips .= implode(",", $nameserver_ips);
 			}
@@ -64,12 +58,12 @@ if ($userinfo['change_serversettings'] == '1') {
 		'<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')),
+		'<CUSTOMER_TMP>' => makeCorrectDir($customer_tmpdir),
+		'<BASE_PATH>' => makeCorrectDir(FROXLOR_INSTALL_DIR),
+		'<BIND_CONFIG_PATH>' => makeCorrectDir(Settings::Get('system.bindconf_directory')),
 		'<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
-		'<CUSTOMER_LOGS>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')),
-		'<FPM_IPCDIR>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
+		'<CUSTOMER_LOGS>' => makeCorrectDir(Settings::Get('system.logfiles_directory')),
+		'<FPM_IPCDIR>' => makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
 		'<WEBSERVER_GROUP>' => Settings::Get('system.httpgroup')
 	);
 
@@ -85,17 +79,17 @@ if ($userinfo['change_serversettings'] == '1') {
 	$services = "";
 	$daemons = "";
 
-	$config_dir = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/');
+	$config_dir = makeCorrectDir(FROXLOR_INSTALL_DIR . '/lib/configfiles/');
 
 	if ($distribution != "") {
 
-		if (! file_exists($config_dir . '/' . $distribution . ".xml")) {
+		if (!file_exists($config_dir . '/' . $distribution . ".xml")) {
 			trigger_error("Unknown distribution, are you playing around with the URL?");
-			exit();
+			exit;
 		}
 
 		// create configparser object
-		$configfiles = new \Froxlor\Config\ConfigParser($config_dir . '/' . $distribution . ".xml");
+		$configfiles = new ConfigParser($config_dir . '/' . $distribution . ".xml");
 
 		// get distro-info
 		$dist_display = getCompleteDistroName($configfiles);
@@ -105,9 +99,9 @@ if ($userinfo['change_serversettings'] == '1') {
 
 		if ($service != "") {
 
-			if (! isset($services[$service])) {
+			if (!isset($services[$service])) {
 				trigger_error("Unknown service, are you playing around with the URL?");
-				exit();
+				exit;
 			}
 
 			$daemons = $services[$service]->getDaemons();
@@ -118,12 +112,12 @@ if ($userinfo['change_serversettings'] == '1') {
 					if ($dd->default) {
 						$title = $title . " (" . strtolower($lng['panel']['default']) . ")";
 					}
-					$daemons_select .= \Froxlor\UI\HTML::makeoption($title, $di);
+					$daemons_select .= makeoption($title, $di);
 				}
 			}
 		} else {
 			foreach ($services as $si => $sd) {
-				$services_select .= \Froxlor\UI\HTML::makeoption($sd->title, $si);
+				$services_select .= makeoption($sd->title, $si);
 			}
 		}
 	} else {
@@ -135,7 +129,7 @@ if ($userinfo['change_serversettings'] == '1') {
 		// read in all the distros
 		foreach ($distros as $_distribution) {
 			// get configparser object
-			$dist = new \Froxlor\Config\ConfigParser($_distribution);
+			$dist = new ConfigParser($_distribution);
 			// get distro-info
 			$dist_display = getCompleteDistroName($dist);
 			// store in tmp array
@@ -147,15 +141,15 @@ if ($userinfo['change_serversettings'] == '1') {
 
 		foreach ($distributions_select_data as $dist_display => $dist_index) {
 			// create select-box-option
-			$distributions_select .= \Froxlor\UI\HTML::makeoption($dist_display, $dist_index);
+			$distributions_select .= makeoption($dist_display, $dist_index);
 		}
 	}
 
 	if ($distribution != "" && $service != "" && $daemon != "") {
 
-		if (! isset($daemons[$daemon])) {
+		if (!isset($daemons[$daemon])) {
 			trigger_error("Unknown daemon, are you playing around with the URL?");
-			exit();
+			exit;
 		}
 
 		$confarr = $daemons[$daemon]->getConfig();
@@ -170,49 +164,49 @@ if ($userinfo['change_serversettings'] == '1') {
 
 		$lasttype = '';
 		$commands = '';
-		foreach ($confarr as $_action) {
-			if ($lasttype != '' && $lasttype != $_action['type']) {
+		foreach ($confarr as $idx => $action) {
+			if ($lasttype != '' && $lasttype != $action['type']) {
 				$commands = trim($commands);
 				$numbrows = count(explode("\n", $commands));
-				eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
+				eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
 				$lasttype = '';
 				$commands = '';
 			}
-			switch ($_action['type']) {
+			switch ($action['type']) {
 				case "install":
-					$commands .= strtr($_action['content'], $replace_arr) . "\n";
+					$commands .= strtr($action['content'], $replace_arr) . "\n";
 					$lasttype = "install";
 					break;
 				case "command":
-					$commands .= strtr($_action['content'], $replace_arr) . "\n";
+					$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('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);
+								$commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name'], $distro_editor);
 							}
 						}
 					}
-					$realname = $_action['name'];
+					$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("\$commands_pre=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
 					}
 					$commands = trim($commands_post);
 					if ($commands != "") {
 						$numbrows = count(explode("\n", $commands));
-						eval("\$commands_post=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
+						eval("\$commands_post=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
 					}
-					eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_subfileblock") . "\";");
+					eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_subfileblock") . "\";");
 					$commands = '';
 					$commands_pre = '';
 					$commands_post = '';
@@ -222,17 +216,15 @@ if ($userinfo['change_serversettings'] == '1') {
 		$commands = trim($commands);
 		if ($commands != '') {
 			$numbrows = count(explode("\n", $commands));
-			eval("\$configpage.=\"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles_commands") . "\";");
+			eval("\$configpage.=\"" . getTemplate("configfiles/configfiles_commands") . "\";");
 		}
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("configfiles/configfiles") . "\";");
+		eval("echo \"" . getTemplate("configfiles/configfiles") . "\";");
 	} else {
-		$basedir = \Froxlor\Froxlor::getInstallDir();
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("configfiles/wizard") . "\";");
+		eval("echo \"" . getTemplate("configfiles/wizard") . "\";");
 	}
 } else {
-	\Froxlor\UI\Response::redirectTo('admin_index.php', array(
-		's' => $s
-	));
+	die('not allowed to see this page');
+	// redirect or similar here
 }
 
 // helper functions
@@ -244,7 +236,7 @@ function getFileContentContainer($file_content, &$replace_arr, $realname, $distr
 		$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") . "\";");
+		eval("\$files=\"" . getTemplate("configfiles/configfiles_file") . "\";");
 	}
 	return $files;
 }

admin_cronjobs.php

@@ -14,90 +14,95 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 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(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
+		$log->logAction(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']
 		);
-		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'];
+		$paging = new paging($userinfo, TABLE_PANEL_CRONRUNS, $fields);
 
 		$crons = '';
+		$result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `module` ASC, `cronfile` ASC");
+		Database::pexecute($result_stmt);
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 
+		$i = 0;
 		$count = 0;
 		$cmod = '';
 
-		foreach ($result['list'] as $row) {
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			if ($cmod != $row['module']) {
 				$_mod = explode("/", $row['module']);
 				$module = ucfirst($_mod[1]);
-				eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
+				eval("\$crons.=\"" . 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']];
+			if ($paging->checkDisplay($i)) {
+				$row = htmlentities_array($row);
 
-			eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjob') . "\";");
-			$count ++;
+				$row['lastrun'] = date('d.m.Y H:i', $row['lastrun']);
+				$row['isactive'] = ((int)$row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no'];
+
+				$description = $lng['crondesc'][$row['desc_lng_key']];
+
+				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjob') . "\";");
+				$count++;
+			}
+
+			$i++;
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs') . "\";");
+		eval("echo \"" . getTemplate('cronjobs/cronjobs') . "\";");
+
 	} elseif ($action == 'new') {
 		/*
 		 * @TODO later
 		 */
 	} elseif ($action == 'edit' && $id != 0) {
-		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'];
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`= :id");
+		Database::pexecute($result_stmt, array('id' => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 		if ($result['cronfile'] != '') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					Cronjobs::getLocal($userinfo, $_POST)->update();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				$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;
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
+
+				$interval = $interval_value . ' ' . strtoupper($interval_interval);
+
+				$upd = Database::prepare("
+					UPDATE `" . TABLE_PANEL_CRONRUNS . "`
+					SET `isactive` = :isactive, `interval` = :int
+					WHERE `id` = :id"
+				);
+				Database::pexecute($upd, array('isactive' => $isactive, 'int' => $interval, 'id' => $id));
+
+				// insert task to re-generate the cron.d-file
+				inserttask('99');
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 
 				// interval
@@ -105,11 +110,11 @@ if ($page == 'cronjobs' || $page == 'overview') {
 				$interval_value = $interval_nfo[0];
 
 				$interval_interval = '';
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
-				$interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
 				// end of interval
 
 				$change_cronfile = false;
@@ -117,16 +122,17 @@ 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 = \Froxlor\UI\HtmlForm::genHTMLForm($cronjobs_edit_data);
+				$cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php';
+				$cronjobs_edit_form = htmlform::genHTMLForm($cronjobs_edit_data);
 
 				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
 				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjob_edit') . "\";");
+				eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";");
 			}
 		}
-	} elseif ($action == 'delete' && $id != 0) {
+	}
+	elseif ($action == 'delete' && $id != 0) {
 		/*
 		 * @TODO later
 		 */

admin_index.php

@@ -16,47 +16,42 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-use Froxlor\Api\Commands\Froxlor as Froxlor;
-use Froxlor\Api\Commands\Admins as Admins;
+if ($action == 'logout')  {
 
-if ($action == 'logout') {
+	$log->logAction(ADM_ACTION, LOG_NOTICE, "logged out");
 
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "logged out");
-
-	$params = array(
-		'adminid' => (int) $userinfo['adminid']
-	);
+	$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");
+			AND `hash` = :hash"
+		);
 		$params['hash'] = $s;
 	} else {
 		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
 			WHERE `userid` = :adminid
-			AND `adminsession` = '1'");
+			AND `adminsession` = '1'"
+		);
 	}
 	Database::pexecute($stmt, $params);
 
-	\Froxlor\UI\Response::redirectTo('index.php');
+	redirectTo('index.php');
 }
 
 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(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_index");
+	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_index");
 	$overview_stmt = Database::prepare("SELECT COUNT(*) AS `number_customers`,
 				SUM(`diskspace_used`) AS `diskspace_used`,
 				SUM(`mysqls_used`) AS `mysqls_used`,
@@ -65,12 +60,11 @@ if ($page == 'overview') {
 				SUM(`email_forwarders_used`) AS `email_forwarders_used`,
 				SUM(`email_quota_used`) AS `email_quota_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`
 				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid "));
-	$overview = Database::pexecute_first($overview_stmt, array(
-		'adminid' => $userinfo['adminid']
-	));
+	$overview = Database::pexecute_first($overview_stmt, array('adminid' => $userinfo['adminid']));
 
 	$dec_places = Settings::Get('panel.decimal_places');
 	$overview['traffic_used'] = round($overview['traffic_used'] / (1024 * 1024), $dec_places);
@@ -78,10 +72,9 @@ if ($page == 'overview') {
 
 	$number_domains_stmt = Database::prepare("
 		SELECT COUNT(*) AS `number_domains` FROM `" . TABLE_PANEL_DOMAINS . "`
-		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid"));
-	$number_domains = Database::pexecute_first($number_domains_stmt, array(
-		'adminid' => $userinfo['adminid']
-	));
+		WHERE `parentdomainid`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid")
+	);
+	$number_domains = Database::pexecute_first($number_domains_stmt, array('adminid' => $userinfo['adminid']));
 
 	$overview['number_domains'] = $number_domains['number_domains'];
 
@@ -89,23 +82,49 @@ if ($page == 'overview') {
 	$mysqlserverversion = Database::getAttribute(PDO::ATTR_SERVER_VERSION);
 	$webserverinterface = strtoupper(@php_sapi_name());
 
-	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes') || (isset($lookfornewversion) && $lookfornewversion == 'yes')) {
-		try {
-			$json_result = Froxlor::getLocal($userinfo)->checkUpdate();
-		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
-		}
-		$result = json_decode($json_result, true)['data'];
+	if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
+		|| (isset($lookfornewversion) && $lookfornewversion == 'yes')
+	) {
+		if (function_exists('curl_version')) {
+			$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;
+			$latestversion = HttpClient::urlGet($update_check_uri);
+			$latestversion = explode('|', $latestversion);
 
-		$lookfornewversion_lable = $result['version'];
-		$lookfornewversion_link = $result['link'];
-		$lookfornewversion_message = $result['message'];
-		$lookfornewversion_addinfo = $result['additional_info'];
-		$isnewerversion = $result['isnewerversion'];
+			if (is_array($latestversion)
+				&& count($latestversion) >= 1
+			) {
+				$_version = $latestversion[0];
+				$_message = isset($latestversion[1]) ? $latestversion[1] : '';
+				$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
+
+				// add the branding so debian guys are not gettings confused
+				// about their version-number
+				$lookfornewversion_lable = $_version.$branding;
+				$lookfornewversion_link = $_link;
+				$lookfornewversion_addinfo = $_message;
+
+				// not numeric -> error-message
+				if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
+					// check for customized version to not output
+					// "There is a newer version of froxlor" besides the error-message
+					$isnewerversion = 2;
+				} elseif (version_compare2($version, $_version) == -1) {
+					$isnewerversion = 1;
+				} else {
+					$isnewerversion = 0;
+				}
+			} else {
+				redirectTo($update_check_uri.'/pretty', NULL, false);
+			}
+		} else {
+			$lookfornewversion_lable = "Version-check not available due to missing php-curl extension";
+			$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
+			$lookfornewversion_addinfo = '';
+			$isnewerversion = 0;
+		}
 	} 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;
 	}
@@ -115,19 +134,19 @@ if ($page == 'overview') {
 	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $dec_places);
 	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $dec_places);
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $dec_places);
-	$userinfo = \Froxlor\PhpHelper::strReplaceArray('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
 	$userinfo['custom_notes'] = ($userinfo['custom_notes'] != '') ? nl2br($userinfo['custom_notes']) : '';
 
-	$cron_last_runs = \Froxlor\System\Cronjob::getCronjobsLastRun();
-	$outstanding_tasks = \Froxlor\System\Cronjob::getOutstandingTasks();
+	$cron_last_runs = getCronjobsLastRun();
+	$outstanding_tasks = getOutstandingTasks();
 
 	$system_hostname = gethostname();
-	$meminfo = explode("\n", @file_get_contents("/proc/meminfo"));
+	$meminfo= explode("\n", @file_get_contents("/proc/meminfo"));
 	$memory = "";
-	for ($i = 0; $i < sizeof($meminfo); ++ $i) {
+	for ($i = 0; $i < sizeof($meminfo); ++$i) {
 		if (substr($meminfo[$i], 0, 3) === "Mem") {
-			$memory .= $meminfo[$i] . PHP_EOL;
+			$memory.= $meminfo[$i] . PHP_EOL;
 		}
 	}
 
@@ -137,7 +156,7 @@ if ($page == 'overview') {
 	} else {
 		$load = @file_get_contents('/proc/loadavg');
 
-		if (! $load) {
+		if (!$load) {
 			$load = $lng['admin']['noloadavailable'];
 		}
 	}
@@ -155,7 +174,10 @@ if ($page == 'overview') {
 	// 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;
@@ -173,82 +195,79 @@ if ($page == 'overview') {
 		$uptime = '';
 	}
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/index") . "\";");
-} elseif ($page == 'change_password') {
+	eval("echo \"" . getTemplate("index/index") . "\";");
 
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
+} elseif($page == 'change_password') {
 
-		if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) {
-			\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$old_password = validate($_POST['old_password'], 'old password');
+
+		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_ADMINS,'adminid')) {
+			standard_error('oldpasswordnotcorrect');
 		}
 
-		$new_password = \Froxlor\Validate\Validate::validate($_POST['new_password'], 'new password');
-		$new_password_confirm = \Froxlor\Validate\Validate::validate($_POST['new_password_confirm'], 'new password confirm');
+		$new_password = validate($_POST['new_password'], 'new password');
+		$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
 
 		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');
+			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 {
-			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
+			$chgpwd_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				SET `password`= :newpasswd
+				WHERE `adminid`= :adminid"
+			);
+			Database::pexecute($chgpwd_stmt, array(
+				'newpasswd' => makeCryptPassword($new_password),
+				'adminid' => (int)$userinfo['adminid']
 			));
+			$log->logAction(ADM_ACTION, LOG_NOTICE, 'changed password');
+			redirectTo($filename, Array('s' => $s));
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_password") . "\";");
+		eval("echo \"" . getTemplate("index/change_password") . "\";");
 	}
-} elseif ($page == 'change_language') {
 
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$def_language = \Froxlor\Validate\Validate::validate($_POST['def_language'], 'default language');
+} elseif($page == 'change_language') {
+
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$def_language = 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());
-			}
+			$lng_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				SET `def_language`= :deflng
+				WHERE `adminid`= :adminid"
+			);
+			Database::pexecute($lng_stmt, array(
+				'deflng' => $def_language,
+				'adminid' => (int)$userinfo['adminid']
+			));
 
-			// also update current session
 			$lng_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_SESSIONS . "`
 				SET `language`= :lng
-				WHERE `hash`= :hash");
+				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
-		));
+
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her default language to '" . $def_language . "'");
+		redirectTo($filename, array('s' => $s));
+
 	} else {
 
 		$language_options = '';
@@ -259,38 +278,42 @@ if ($page == 'overview') {
 		}
 
 		foreach ($languages as $language_file => $language_name) {
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $default_lang, true);
+			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_language") . "\";");
+		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
+
 } elseif ($page == 'change_theme') {
 
-	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());
-		}
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$theme = validate($_POST['theme'], 'theme');
+
+		$theme_stmt = Database::prepare("
+				UPDATE `" . TABLE_PANEL_ADMINS . "`
+				SET `theme`= :theme
+				WHERE `adminid`= :adminid"
+		);
+		Database::pexecute($theme_stmt, array(
+			'theme' => $theme,
+			'adminid' => (int)$userinfo['adminid']
+		));
 
-		// also update current session
 		$theme_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_SESSIONS . "`
 				SET `theme`= :theme
-				WHERE `hash`= :hash");
+				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
-		));
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
+		redirectTo($filename, array('s' => $s));
+
 	} else {
 
 		$theme_options = '';
@@ -300,22 +323,27 @@ if ($page == 'overview') {
 			$default_theme = $userinfo['theme'];
 		}
 
-		$themes_avail = \Froxlor\UI\Template::getThemes();
+		$themes_avail = getThemes();
 		foreach ($themes_avail as $t => $d) {
-			$theme_options .= \Froxlor\UI\HTML::makeoption($d, $t, $default_theme, true);
+			$theme_options.= makeoption($d, $t, $default_theme, true);
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("index/change_theme") . "\";");
+		eval("echo \"" . getTemplate("index/change_theme") . "\";");
 	}
-} elseif ($page == 'send_error_report' && Settings::Get('system.allow_error_report_admin') == '1') {
+
+} 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'] != '') {
+	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");
+		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
+		$err_file = makeCorrectFile($err_dir."/".$errid."_sql-error.log");
 
 		if (file_exists($err_file)) {
 
@@ -325,26 +353,28 @@ if ($page == 'overview') {
 			$_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()))),
+				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(FROXLOR_INSTALL_DIR))),
 				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(\Froxlor\Froxlor::getInstallDir(), "", substr($error[5], 6))
+				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", substr($error[5], 6))
 			);
 
 			// build mail-content
 			$mail_body = "Dear froxlor-team,\n\n";
 			$mail_body .= "the following error has been reported by a user:\n\n";
 			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
-			$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
-			$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
+			$mail_body .= $_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 .= "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') {
+			if (isset($_POST['send'])
+					&& $_POST['send'] == 'send'
+			) {
 				// send mail and say thanks
 				$_mailerror = false;
 				try {
@@ -353,7 +383,7 @@ if ($page == 'overview') {
 					$mail->MsgHTML($mail_html);
 					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
 					$mail->Send();
-				} catch (\PHPMailer\PHPMailer\Exception $e) {
+				} catch(phpmailerException $e) {
 					$mailerr_msg = $e->errorMessage();
 					$_mailerror = true;
 				} catch (Exception $e) {
@@ -363,30 +393,21 @@ if ($page == 'overview') {
 
 				if ($_mailerror) {
 					// error when reporting an error...LOLFUQ
-					\Froxlor\UI\Response::standard_error('send_report_error', $mailerr_msg);
+					standard_error('send_report_error', $mailerr_msg);
 				}
 
 				// finally remove error from fs
 				@unlink($err_file);
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					's' => $s
-				));
+				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") . "\";");
+			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
+
 		} else {
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s
-			));
+			redirectTo($filename, array('s' => $s));
 		}
 	} else {
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
+		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,19 +16,19 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Settings;
-use Froxlor\Api\Commands\IpsAndPorts;
-
 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 ($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');
@@ -37,137 +37,402 @@ if ($page == 'ipsandports' || $page == 'overview') {
 
 	if ($action == '') {
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports");
 		$fields = array(
 			'ip' => $lng['admin']['ipsandports']['ip'],
 			'port' => $lng['admin']['ipsandports']['port']
 		);
-		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'];
-
+		$paging = new paging($userinfo, TABLE_PANEL_IPSANDPORTS, $fields);
 		$ipsandports = '';
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		Database::pexecute($result_stmt);
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$i = 0;
 		$count = 0;
 
-		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'] . ']';
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			if ($paging->checkDisplay($i)) {
+				$row = htmlentities_array($row);
+				if (filter_var($row['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					$row['ip'] = '[' . $row['ip'] . ']';
+				}
+				eval("\$ipsandports.=\"" . getTemplate("ipsandports/ipsandports_ipandport") . "\";");
+				$count++;
 			}
-			eval("\$ipsandports.=\"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_ipandport") . "\";");
-			$count ++;
+			$i++;
 		}
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports") . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
-		try {
-			$json_result = IpsAndPorts::getLocal($userinfo, array(
-				'id' => $id
-			))->get();
-		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+
+		eval("echo \"" . getTemplate("ipsandports/ipsandports") . "\";");
+
+	} elseif($action == 'delete'
+		&& $id != 0
+	) {
+		$result_stmt = Database::prepare("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array('id' => $id));
+
+		if (isset($result['id'])
+			&& $result['id'] == $id
+		) {
+			$result_checkdomain_stmt = Database::prepare("
+				SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id"
+			);
+			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array('id' => $id));
+
+			if ($result_checkdomain['id'] == '') {
+				if (!in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
+
+					$result_sameipotherport_stmt = Database::prepare("
+						SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+						WHERE `ip` = :ip AND `id` <> :id"
+					);
+					$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('id' => $id, 'ip' => $result['ip']));
+
+					if (($result['ip'] != Settings::Get('system.ipaddress'))
+						|| ($result['ip'] == Settings::Get('system.ipaddress')
+						&& $result_sameipotherport['id'] != '')
+					) {
+						$result_stmt = Database::prepare("
+							SELECT `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+							WHERE `id` = :id"
+						);
+						$result = Database::pexecute_first($result_stmt, array('id' => $id));
+
+						if ($result['ip'] != '') {
+
+							if (isset($_POST['send'])
+								&& $_POST['send'] == 'send'
+							) {
+								$del_stmt = Database::prepare("
+									DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+									WHERE `id` = :id"
+								);
+								Database::pexecute($del_stmt, array('id' => $id));
+
+								// also, remove connections to domains (multi-stack)
+								$del_stmt = Database::prepare("
+									DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports` = :id"
+								);
+								Database::pexecute($del_stmt, array('id' => $id));
+
+								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
+								inserttask('1');
+								// Using nameserver, insert a task which rebuilds the server config
+								inserttask('4');
+
+								redirectTo($filename, array('page' => $page, 's' => $s));
+
+							} else {
+								ask_yesno('admin_ip_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['ip'] . ':' . $result['port']);
+							}
+						}
+					} else {
+						standard_error('cantdeletesystemip');
+					}
+				} else {
+					standard_error('cantdeletedefaultip');
+				}
+			} else {
+				standard_error('ipstillhasdomains');
+			}
 		}
-		$result = json_decode($json_result, true)['data'];
 
-		if (isset($result['id']) && $result['id'] == $id) {
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	} elseif($action == 'add') {
 
-				try {
-					IpsAndPorts::getLocal($userinfo, array(
-						'id' => $id
-					))->delete();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
+
+			$ip = validate_ip($_POST['ip']);
+			$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
+			$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
+			$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
+			$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
+			$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
+			$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
+			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
+			$docroot = validate($_POST['docroot'], 'docroot');
+
+			if ((int)Settings::Get('system.use_ssl') == 1) {
+				$ssl = isset($_POST['ssl']) ? intval($_POST['ssl']) : 0;
+				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
+				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
+				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
+				$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
+			} else {
+				$ssl = 0;
+				$ssl_cert_file = '';
+				$ssl_key_file = '';
+				$ssl_ca_file = '';
+				$ssl_cert_chainfile = '';
+			}
+
+			if ($listen_statement != '1') {
+				$listen_statement = '0';
+			}
+
+			if ($namevirtualhost_statement != '1') {
+				$namevirtualhost_statement = '0';
+			}
+
+			if ($vhostcontainer != '1') {
+				$vhostcontainer = '0';
+			}
+
+			if ($vhostcontainer_servername_statement != '1') {
+				$vhostcontainer_servername_statement = '0';
+			}
+
+			if ($ssl != '1') {
+				$ssl = '0';
+			}
+
+			if ($ssl_cert_file != '') {
+				$ssl_cert_file = makeCorrectFile($ssl_cert_file);
+			}
+
+			if ($ssl_key_file != '') {
+				$ssl_key_file = makeCorrectFile($ssl_key_file);
+			}
+
+			if ($ssl_ca_file != '') {
+				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
+			}
+
+			if ($ssl_cert_chainfile != '') {
+				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
+			}
+
+			if (strlen(trim($docroot)) > 0) {
+				$docroot = makeCorrectDir($docroot);
+			} else {
+				$docroot = '';
+			}
+
+			$result_checkfordouble_stmt = Database::prepare("
+				SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+				WHERE `ip` = :ip AND `port` = :port"
+			);
+			$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
+
+			if ($result_checkfordouble['id'] != '') {
+				standard_error('myipnotdouble');
+			} else {
+				$ins_stmt = Database::prepare("
+					INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
+					SET
+						`ip` = :ip, `port` = :port, `listen_statement` = :ls,
+						`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
+						`vhostcontainer_servername_statement` = :vhcss,
+						`specialsettings` = :ss, `ssl` = :ssl,
+						`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
+						`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
+						`default_vhostconf_domain` = :dvhd, `docroot` = :docroot;
+				");
+				$ins_data = array(
+					'ip' => $ip,
+					'port' => $port,
+					'ls' => $listen_statement,
+					'nvhs' => $namevirtualhost_statement,
+					'vhc' => $vhostcontainer,
+					'vhcss' => $vhostcontainer_servername_statement,
+					'ss' => $specialsettings,
+					'ssl' => $ssl,
+					'ssl_cert' => $ssl_cert_file,
+					'ssl_key' => $ssl_key_file,
+					'ssl_ca' => $ssl_ca_file,
+					'ssl_chain' => $ssl_cert_chainfile,
+					'dvhd' => $default_vhostconf_domain,
+					'docroot' => $docroot
+				);
+				Database::pexecute($ins_stmt, $ins_data);
+
+				if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					$ip = '[' . $ip . ']';
 				}
 
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
-			} else {
-				\Froxlor\UI\HTML::askYesNo('admin_ip_reallydelete', $filename, array(
-					'id' => $id,
-					'page' => $page,
-					'action' => $action
-				), $result['ip'] . ':' . $result['port']);
+				$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));
 			}
-		}
-	} 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 = \Froxlor\UI\HtmlForm::genHTMLForm($ipsandports_add_data);
+			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
+			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
 
 			$title = $ipsandports_add_data['ipsandports_add']['title'];
 			$image = $ipsandports_add_data['ipsandports_add']['image'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_add") . "\";");
+			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
-	} 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'];
+
+	} elseif($action == 'edit'
+		&& $id != 0
+	) {
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :id"
+		);
+		$result = Database::pexecute_first($result_stmt, array('id' => $id));
 
 		if ($result['ip'] != '') {
 
-			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					IpsAndPorts::getLocal($userinfo, $_POST)->update();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
+
+				$ip = validate_ip($_POST['ip']);
+				$port = validate($_POST['port'], 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array('stringisempty', 'myport'));
+				$listen_statement = isset($_POST['listen_statement']) ? 1 : 0;
+				$namevirtualhost_statement = isset($_POST['namevirtualhost_statement']) ? 1 : 0;
+				$vhostcontainer = isset($_POST['vhostcontainer']) ? 1 : 0;
+				$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
+				$vhostcontainer_servername_statement = isset($_POST['vhostcontainer_servername_statement']) ? 1 : 0;
+				$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
+				$docroot =  validate($_POST['docroot'], 'docroot');
+
+				$result_checkfordouble_stmt = Database::prepare("
+					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+					WHERE `ip` = :ip AND `port` = :port"
+				);
+				$result_checkfordouble = Database::pexecute_first($result_checkfordouble_stmt, array('ip' => $ip, 'port' => $port));
+
+				$result_sameipotherport_stmt = Database::prepare("
+					SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
+					WHERE `ip` = :ip AND `id` <> :id"
+				);
+				$result_sameipotherport = Database::pexecute_first($result_sameipotherport_stmt, array('ip' => $ip, 'id' => $id));
+
+				if ((int)Settings::Get('system.use_ssl') == 1
+					&& isset($_POST['ssl'])
+					&& $_POST['ssl'] != 0
+				) {
+					$ssl = 1;
+					$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
+					$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
+					$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
+					$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
+				} else {
+					$ssl = 0;
+					$ssl_cert_file = '';
+					$ssl_key_file = '';
+					$ssl_ca_file = '';
+					$ssl_cert_chainfile = '';
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
+
+				if ($listen_statement != '1') {
+					$listen_statement = '0';
+				}
+
+				if ($namevirtualhost_statement != '1') {
+					$namevirtualhost_statement = '0';
+				}
+
+				if ($vhostcontainer != '1') {
+					$vhostcontainer = '0';
+				}
+
+				if ($vhostcontainer_servername_statement != '1') {
+					$vhostcontainer_servername_statement = '0';
+				}
+
+				if ($ssl != '1') {
+					$ssl = '0';
+				}
+
+				if ($ssl_cert_file != '') {
+					$ssl_cert_file = makeCorrectFile($ssl_cert_file);
+				}
+
+				if ($ssl_key_file != '') {
+					$ssl_key_file = makeCorrectFile($ssl_key_file);
+				}
+
+				if ($ssl_ca_file != '') {
+					$ssl_ca_file = makeCorrectFile($ssl_ca_file);
+				}
+
+				if ($ssl_cert_chainfile != '') {
+					$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
+				}
+
+				if (strlen(trim($docroot)) > 0) {
+					$docroot = makeCorrectDir($docroot);
+				} else {
+					$docroot = '';
+				}
+
+				if ($result['ip'] != $ip
+					&& $result['ip'] == Settings::Get('system.ipaddress')
+					&& $result_sameipotherport['id'] == ''
+				) {
+					standard_error('cantchangesystemip');
+
+				} elseif($result_checkfordouble['id'] != ''
+					&& $result_checkfordouble['id'] != $id
+				) {
+					standard_error('myipnotdouble');
+
+				} else {
+
+					$upd_stmt = Database::prepare("
+						UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
+						SET
+							`ip` = :ip, `port` = :port, `listen_statement` = :ls,
+							`namevirtualhost_statement` = :nvhs, `vhostcontainer` = :vhc,
+							`vhostcontainer_servername_statement` = :vhcss,
+							`specialsettings` = :ss, `ssl` = :ssl,
+							`ssl_cert_file` = :ssl_cert, `ssl_key_file` = :ssl_key,
+							`ssl_ca_file` = :ssl_ca, `ssl_cert_chainfile` = :ssl_chain,
+							`default_vhostconf_domain` = :dvhd, `docroot` = :docroot
+						WHERE `id` = :id;
+					");
+					$upd_data = array(
+						'ip' => $ip,
+						'port' => $port,
+						'ls' => $listen_statement,
+						'nvhs' => $namevirtualhost_statement,
+						'vhc' => $vhostcontainer,
+						'vhcss' => $vhostcontainer_servername_statement,
+						'ss' => $specialsettings,
+						'ssl' => $ssl,
+						'ssl_cert' => $ssl_cert_file,
+						'ssl_key' => $ssl_key_file,
+						'ssl_ca' => $ssl_ca_file,
+						'ssl_chain' => $ssl_cert_chainfile,
+						'dvhd' => $default_vhostconf_domain,
+						'docroot' => $docroot,
+						'id' => $id
+					);
+					Database::pexecute($upd_stmt, $upd_data);
+
+					$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 = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = htmlentities_array($result);
 
-				$ipsandports_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
-				$ipsandports_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($ipsandports_edit_data);
+				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
+				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
 
 				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
 				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("ipsandports/ipsandports_edit") . "\";");
+				eval("echo \"" . 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,12 +16,13 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 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'],
@@ -29,37 +30,37 @@ if ($page == 'log' && $userinfo['change_serversettings'] == '1') {
 			'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'];
+		$paging = new paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc', 30);
+		$query = 'SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy();
+		$result_stmt = Database::query($query . ' ' . $paging->getSqlLimit());
+		$result_cnt_stmt = Database::query($query);
+		$logs_count = $result_cnt_stmt->rowCount();
+		$paging->setEntries($logs_count);
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 		$clog = array();
 
-		foreach ($result['list'] as $row) {
-			if (! isset($clog[$row['action']]) || ! is_array($clog[$row['action']])) {
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			if (!isset($clog[$row['action']])
+				|| !is_array($clog[$row['action']])
+			) {
 				$clog[$row['action']] = array();
 			}
 			$clog[$row['action']][$row['logid']] = $row;
 		}
 
-		if ($paging->sortfield == 'date' && $paging->sortorder == 'desc') {
+		if ($paging->sortfield == 'date'
+			&& $paging->sortorder == 'desc'
+		) {
 			krsort($clog);
 		} else {
 			ksort($clog);
 		}
 
+		$i = 0;
 		$count = 0;
 		$log_count = 0;
 		$log = '';
@@ -67,66 +68,65 @@ if ($page == 'log' && $userinfo['change_serversettings'] == '1') {
 			$_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']);
+					$row = htmlentities_array($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;
+					if ($_action != $action) {
+						switch ($action) {
+							case USR_ACTION:
+								$_action = $lng['admin']['customer'];
+								break;
+							case RES_ACTION:
+								$_action = $lng['logger']['reseller'];
+								break;
+							case ADM_ACTION:
+								$_action = $lng['logger']['admin'];
+								break;
+							case CRON_ACTION:
+								$_action = $lng['logger']['cron'];
+								break;
+							case LOGIN_ACTION:
+								$_action = $lng['logger']['login'];
+								break;
+							case LOG_ERROR:
+								$_action = $lng['logger']['intern'];
+								break;
+							default:
+								$_action = $lng['logger']['unknown'];
+								break;
+						}
+
+						$row['action'] = $_action;
+						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
 					}
 
-					$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;
+					$log_count++;
+					$row['type'] = getLogLevelDesc($row['type']);
+					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
+					$count++;
+					$_action = $action;
+				// }
+				$i++;
 			}
+			$i++;
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('logger/logger') . "\";");
+		eval("echo \"" . getTemplate('logger/logger') . "\";");
+
 	} elseif ($action == 'truncate') {
 
-		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
-			));
+		if (isset($_POST['send'])
+		   && $_POST['send'] == 'send'
+		) {
+			$truncatedate = time() - (60 * 10);
+			$trunc_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < :trunc"
+			);
+			Database::pexecute($trunc_stmt, array('trunc' => $truncatedate));
+			$log->logAction(ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
+			redirectTo($filename, array('page' => $page, 's' => $s));
 		} else {
-			\Froxlor\UI\HTML::askYesNo('logger_reallytruncate', $filename, array(
-				'page' => $page,
-				'action' => $action
-			), TABLE_PANEL_LOG);
+			ask_yesno('logger_reallytruncate', $filename, array('page' => $page, 'action' => $action), TABLE_PANEL_LOG);
 		}
 	}
 }

admin_message.php

@@ -16,11 +16,10 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
 } elseif (isset($_GET['id'])) {
@@ -29,33 +28,36 @@ if (isset($_POST['id'])) {
 
 if ($page == 'message') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
+		$log->logAction(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(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
+		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 = Database::query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
 			} elseif ($_POST['receipient'] == 1) {
 				if ($userinfo['customers_see_all'] == '1') {
-					$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
+					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
 					$result = Database::query('SELECT `firstname`, `name`, `company`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
 				} else {
-					$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
+					$log->logAction(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']
-					));
+						WHERE `adminid` = :adminid"
+					);
+					Database::pexecute($result, array('adminid' => $userinfo['adminid']));
 				}
 			} else {
-				\Froxlor\UI\Response::standard_error('noreceipientsgiven');
+				standard_error('noreceipientsgiven');
 			}
 
 			$subject = $_POST['subject'];
 			$message = wordwrap($_POST['message'], 70);
 
-			if (! empty($message)) {
+			if (!empty($message)) {
 				$mailcounter = 0;
 				$mail->Body = $message;
 				$mail->Subject = $subject;
@@ -64,37 +66,28 @@ if ($page == 'message') {
 
 					$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->AddAddress($row['email'], 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(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
-						\Froxlor\UI\Response::standard_error('errorsendingmail', $row['email']);
+						$log->logAction(ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
+						standard_error('errorsendingmail', $row['email']);
 					}
 
-					$mailcounter ++;
+					$mailcounter++;
 					$mail->ClearAddresses();
 				}
 
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s,
-					'action' => 'showsuccess',
-					'sentitems' => $mailcounter
-				));
+				redirectTo($filename, array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
 			} else {
-				\Froxlor\UI\Response::standard_error('nomessagetosend');
+				standard_error('nomessagetosend');
 			}
 		}
 	}
@@ -102,13 +95,14 @@ if ($page == 'message') {
 	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'];
 		} else {
 			$successmessage = str_replace('%s', $sentitems, $lng['message']['success']);
 		}
+
 	} else {
 		$success = 0;
 		$sentitems = 0;
@@ -119,9 +113,9 @@ if ($page == 'message') {
 	$receipients = '';
 
 	if ($userinfo['customers_see_all'] == '1') {
-		$receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['reseller'], 0);
+		$receipients.= makeoption($lng['panel']['reseller'], 0);
 	}
 
-	$receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['customer'], 1);
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('message/message') . "\";");
+	$receipients .= makeoption($lng['panel']['customer'], 1);
+	eval("echo \"" . getTemplate('message/message') . "\";");
 }

admin_opcacheinfo.php

@@ -17,140 +17,142 @@
  * 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, "reseted OPcache");
-	header('Location: ' . $linker->getLink(array(
-		'section' => 'opcacheinfo',
-		'page' => 'showinfo'
-	)));
-	exit();
+
+if ($action == 'reset' &&
+        function_exists('opcache_reset') &&
+        $userinfo['change_serversettings'] == '1'
+) {
+    opcache_reset();
+    $log->logAction(ADM_ACTION, LOG_INFO, "reseted 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 (!function_exists('opcache_get_configuration')
+) {
+    standard_error($lng['error']['no_opcacheinfo']);
 }
 
-if ($page == 'showinfo') {
+if ($page == 'showinfo'
+) {
+    
+    $opcache_info = opcache_get_configuration();
+    $opcache_status = opcache_get_status(false);
+    $time = time();
+    $log->logAction(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.=\"" . 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,'.',' '),
+        );
+    }
 
-	$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") . "\";");
+    $usedkey=@$opcache_status['opcache_statistics']['num_cached_keys'] ?: 0;
+    $usedkeystr=number_format($usedkey,0,'.',' ');
+    $totalkey=@$opcache_status['opcache_statistics']['max_cached_keys'] ?: 0;
+    $wastedkey=$usedkey - (@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0);
+    if (isset($opcache_status['opcache_statistics'])) {
+        $keystat=array(
+            'total' => number_format($totalkey,0,'.',' '),
+            'used' => $usedkeystr . ($totalkey>0 ? sprintf(" (%.1f %%)", $usedkey/($totalkey)*100) : ''),
+            'wasted' => number_format($wastedkey,0,'.',' ') . ($totalkey>0 ? sprintf(" (%.1f %%)", $wastedkey/($totalkey)*100) : ''),
+        );
+    }
+    
+    $blacklistlines = '';
+    if (isset($opcache_info['blacklist']) && is_array($opcache_info['blacklist'])) {
+        foreach ($opcache_info['blacklist'] as $value) {
+            eval("\$blacklistlines.=\"" . getTemplate("settings/opcacheinfo/blacklist_line") . "\";");
+        }
+    }
+    
+    eval("echo \"" . getTemplate("settings/opcacheinfo/showinfo") . "\";");
+    
 }
 
-function bsize($s)
-{
-	foreach (array(
-		'',
-		'K',
-		'M',
-		'G'
-	) as $i => $k) {
-		if ($s < 1024)
-			break;
-		$s /= 1024;
-	}
-	return sprintf("%5.1f %sBytes", $s, $k);
+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

@@ -19,10 +19,6 @@
 define('AREA', 'admin');
 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']);
 } elseif (isset($_GET['id'])) {
@@ -30,149 +26,407 @@ if (isset($_POST['id'])) {
 }
 
 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;
-		if (isset($result['count']) && $result['count'] > 0) {
-			foreach ($result['list'] as $row) {
-				if (isset($row['is_default']) && $row['is_default'] == true) {
-					$row['description'] = "<b>" . $row['description'] . "</b>";
-				}
-				$domains = "";
-				$subdomains_count = count($row['subdomains']);
-				foreach ($row['domains'] as $configdomain) {
-					$domains .= $idna_convert->decode($configdomain) . "<br>";
-				}
-				$count ++;
-				if ($subdomains_count == 0 && empty($domains)) {
-					$domains = $lng['admin']['phpsettings']['notused'];
-				}
-				eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_overview") . "\";");
+		$result = Database::query("
+			SELECT c.*, fd.description as fpmdesc
+			FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
+			LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fd ON fd.id = c.fpmsettingid
+			ORDER BY c.description ASC
+		");
+		
+		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+			
+			$domainresult = false;
+			$query_params = array(
+				'id' => $row['id']
+			);
+			
+			$query = "SELECT * FROM `" . TABLE_PANEL_DOMAINS . "`
+					WHERE `phpsettingid` = :id
+					AND `parentdomainid` = '0'";
+			
+			if ((int) $userinfo['domains_see_all'] == 0) {
+				$query .= " AND `adminid` = :adminid";
+				$query_params['adminid'] = $userinfo['adminid'];
 			}
-		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview") . "\";");
-	}
-
-	if ($action == 'add') {
-
-		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());
+			
+			if ((int) Settings::Get('panel.phpconfigs_hidestdsubdomain') == 1) {
+				$ssdids_res = Database::query("
+					SELECT DISTINCT `standardsubdomain` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+					WHERE `standardsubdomain` > 0 ORDER BY `standardsubdomain` ASC;");
+				$ssdids = array();
+				while ($ssd = $ssdids_res->fetch(PDO::FETCH_ASSOC)) {
+					$ssdids[] = $ssd['standardsubdomain'];
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				if (count($ssdids) > 0) {
+					$query .= " AND `id` NOT IN (" . implode(', ', $ssdids) . ")";
+				}
+			}
+			
+			$domainresult_stmt = Database::prepare($query);
+			Database::pexecute($domainresult_stmt, $query_params);
+			
+			$domains = '';
+			if (Database::num_rows() > 0) {
+				while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) {
+					$domains .= $row2['domain'] . '<br/>';
+				}
+			}
+			
+			// check whether we use that config as froxor-vhost config
+			if (Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $row['id'] || Settings::Get('phpfpm.vhost_defaultini') == $row['id']) {
+				$domains .= Settings::Get('system.hostname');
+			}
+			
+			if ($domains == '') {
+				$domains = $lng['admin']['phpsettings']['notused'];
+			}
+			
+			// check whether this is our default config
+			if ((Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_defaultini') == $row['id']) || (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.defaultini') == $row['id'])) {
+				$row['description'] = '<b>' . $row['description'] . '</b>';
+			}
+			
+			$count ++;
+			eval("\$tablecontent.=\"" . getTemplate("phpconfig/overview_overview") . "\";");
+		}
+		
+		$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting overview has been viewed by '" . $userinfo['loginname'] . "'");
+		eval("echo \"" . getTemplate("phpconfig/overview") . "\";");
+	}
+	
+	if ($action == 'add') {
+		
+		if ((int) $userinfo['change_serversettings'] == 1) {
+			
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$description = validate($_POST['description'], 'description');
+				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
+				
+				if (Settings::Get('system.mod_fcgid') == 1) {
+					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
+					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
+					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array(
+						'-1',
+						''
+					));
+					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array(
+						'-1',
+						''
+					));
+					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
+					// disable fpm stuff
+					$fpm_config_id = 1;
+					$fpm_enableslowlog = 0;
+					$fpm_reqtermtimeout = 0;
+					$fpm_reqslowtimeout = 0;
+					$fpm_pass_authorizationheader = 0;
+					$override_fpmconfig = 0;
+					$stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` WHERE `id` = :id");
+					$def_fpmconfig = Database::pexecute_first($stmt, array(
+						'id' => $fpm_config_id
+					));
+					$pm = $def_fpmconfig['pm'];
+					$max_children = $def_fpmconfig['max_children'];
+					$start_servers = $def_fpmconfig['start_servers'];
+					$min_spare_servers = $def_fpmconfig['min_spare_servers'];
+					$max_spare_servers = $def_fpmconfig['max_spare_servers'];
+					$max_requests = $def_fpmconfig['max_requests'];
+					$idle_timeout = $def_fpmconfig['idle_timeout'];
+					$limit_extensions = $def_fpmconfig['limit_extensions'];
+
+				} elseif (Settings::Get('phpfpm.enabled') == 1) {
+					$fpm_config_id = intval($_POST['fpmconfig']);
+					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int) $_POST['phpfpm_enable_slowlog'] : 0;
+					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					$fpm_pass_authorizationheader = isset($_POST['phpfpm_pass_authorizationheader']) ? (int) $_POST['phpfpm_pass_authorizationheader'] : 0;
+					$override_fpmconfig = isset($_POST['override_fpmconfig']) ? (int) $_POST['override_fpmconfig'] : 0;
+					$pm = $_POST['pm'];
+					$max_children = isset($_POST['max_children']) ? (int) $_POST['max_children'] : 0;
+					$start_servers = isset($_POST['start_servers']) ? (int) $_POST['start_servers'] : 0;
+					$min_spare_servers = isset($_POST['min_spare_servers']) ? (int) $_POST['min_spare_servers'] : 0;
+					$max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : 0;
+					$max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : 0;
+					$idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : 0;
+					$limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions', '/^(\.[a-z]([a-z0-9]+)\ ?)+$/');
+					// disable fcgid stuff
+					$binary = '/usr/bin/php-cgi';
+					$file_extensions = 'php';
+					$mod_fcgid_starter = 0;
+					$mod_fcgid_maxrequests = 0;
+					$mod_fcgid_umask = "022";
+				}
+				
+				if (strlen($description) == 0 || strlen($description) > 50) {
+					standard_error('descriptioninvalid');
+				}
+				
+				$ins_stmt = Database::prepare("
+					INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` SET
+						`description` = :desc,
+						`binary` = :binary,
+						`file_extensions` = :fext,
+						`mod_fcgid_starter` = :starter,
+						`mod_fcgid_maxrequests` = :mreq,
+						`mod_fcgid_umask` = :umask,
+						`fpm_slowlog` = :fpmslow,
+						`fpm_reqterm` = :fpmreqterm,
+						`fpm_reqslow` = :fpmreqslow,
+						`phpsettings` = :phpsettings,
+						`fpmsettingid` = :fpmsettingid,
+						`pass_authorizationheader` = :fpmpassauth,
+						`override_fpmconfig` = :ofc,
+						`pm` = :pm,
+						`max_children` = :max_children,
+						`start_servers` = :start_servers,
+						`min_spare_servers` = :min_spare_servers,
+						`max_spare_servers` = :max_spare_servers,
+						`max_requests` = :max_requests,
+						`idle_timeout` = :idle_timeout,
+						`limit_extensions` = :limit_extensions");
+				$ins_data = array(
+					'desc' => $description,
+					'binary' => $binary,
+					'fext' => $file_extensions,
+					'starter' => $mod_fcgid_starter,
+					'mreq' => $mod_fcgid_maxrequests,
+					'umask' => $mod_fcgid_umask,
+					'fpmslow' => $fpm_enableslowlog,
+					'fpmreqterm' => $fpm_reqtermtimeout,
+					'fpmreqslow' => $fpm_reqslowtimeout,
+					'phpsettings' => $phpsettings,
+					'fpmsettingid' => $fpm_config_id,
+					'fpmpassauth' => $fpm_pass_authorizationheader,
+					'ofc' => $override_fpmconfig,
+					'pm' => $pm,
+					'max_children' => $max_children,
+					'start_servers' => $start_servers,
+					'min_spare_servers' => $min_spare_servers,
+					'max_spare_servers' => $max_spare_servers,
+					'max_requests' => $max_requests,
+					'idle_timeout' => $idle_timeout,
+					'limit_extensions' => $limit_extensions
+				);
+				Database::pexecute($ins_stmt, $ins_data);
+				
+				inserttask('1');
+				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with description '" . $description . "' has been created by '" . $userinfo['loginname'] . "'");
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
 			} else {
-
-				if (file_exists(\Froxlor\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);
-				}
-
+				
+				$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
+				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+				
 				$fpmconfigs = '';
 				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
 				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-					$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], 1, true, true);
+					$fpmconfigs .= makeoption($row['description'], $row['id'], 1, true, true);
 				}
-
-				$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);
-
+				
+				$pm_select = makeoption('static', 'static', 'static', true, true);
+				$pm_select.= makeoption('dynamic', 'dynamic', 'static', true, true);
+				$pm_select.= makeoption('ondemand', 'ondemand', 'static', true, true);
+				
 				$phpconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
-				$phpconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_add_data);
-
+				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
+				
 				$title = $phpconfig_add_data['phpconfig_add']['title'];
 				$image = $phpconfig_add_data['phpconfig_add']['image'];
-
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_add") . "\";");
+				
+				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			standard_error('nopermissionsorinvalidid');
 		}
 	}
-
+	
 	if ($action == 'delete') {
-
-		try {
-			$json_result = PhpSettings::getLocal($userinfo, array(
-				'id' => $id
-			))->get();
-		} catch (Exception $e) {
-			\Froxlor\UI\Response::dynamic_error($e->getMessage());
+		
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $id
+		));
+		
+		if ((Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_defaultini_ownvhost') == $id) || (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.vhost_defaultini') == $id)) {
+			standard_error('cannotdeletehostnamephpconfig');
 		}
-		$result = json_decode($json_result, true)['data'];
-
+		
+		if ((Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_defaultini') == $id) || (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.defaultini') == $id)) {
+			standard_error('cannotdeletedefaultphpconfig');
+		}
+		
 		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
 		{
-
+			
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					PhpSettings::getLocal($userinfo, array(
-						'id' => $id
-					))->delete();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
-				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				// set php-config to default for all domains using the
+				// config that is to be deleted
+				$upd_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_DOMAINS . "` SET
+					`phpsettingid` = '1' WHERE `phpsettingid` = :id");
+				Database::pexecute($upd_stmt, array(
+					'id' => $id
+				));
+				
+				$del_stmt = Database::prepare("
+					DELETE FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id");
+				Database::pexecute($del_stmt, array(
+					'id' => $id
+				));
+				
+				inserttask('1');
+				$log->logAction(ADM_ACTION, LOG_INFO, "php.ini setting with id #" . (int) $id . " has been deleted by '" . $userinfo['loginname'] . "'");
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('phpsetting_reallydelete', $filename, array(
+				ask_yesno('phpsetting_reallydelete', $filename, array(
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
 				), $result['description']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			standard_error('nopermissionsorinvalidid');
 		}
 	}
-
+	
 	if ($action == 'edit') {
-
-		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'];
-
+		
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $id
+		));
+		
 		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1) {
-
+			
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					PhpSettings::getLocal($userinfo, $_POST)->update();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				$description = validate($_POST['description'], 'description');
+				$phpsettings = validate(str_replace("\r\n", "\n", $_POST['phpsettings']), 'phpsettings', '/^[^\0]*$/');
+				
+				if (Settings::Get('system.mod_fcgid') == 1) {
+					$binary = makeCorrectFile(validate($_POST['binary'], 'binary'));
+					$file_extensions = validate($_POST['file_extensions'], 'file_extensions', '/^[a-zA-Z0-9\s]*$/');
+					$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array(
+						'-1',
+						''
+					));
+					$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array(
+						'-1',
+						''
+					));
+					$mod_fcgid_umask = validate($_POST['mod_fcgid_umask'], 'mod_fcgid_umask', '/^[0-9]*$/');
+					// disable fpm stuff
+					$fpm_config_id = 1;
+					$fpm_enableslowlog = 0;
+					$fpm_reqtermtimeout = 0;
+					$fpm_reqslowtimeout = 0;
+					$fpm_pass_authorizationheader = 0;
+					$override_fpmconfig = 0;
+					$stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` WHERE `id` = :id");
+					$def_fpmconfig = Database::pexecute_first($stmt, array(
+						'id' => $fpm_config_id
+					));
+					$pm = $def_fpmconfig['pm'];
+					$max_children = $def_fpmconfig['max_children'];
+					$start_servers = $def_fpmconfig['start_servers'];
+					$min_spare_servers = $def_fpmconfig['min_spare_servers'];
+					$max_spare_servers = $def_fpmconfig['max_spare_servers'];
+					$max_requests = $def_fpmconfig['max_requests'];
+					$idle_timeout = $def_fpmconfig['idle_timeout'];
+					$limit_extensions = $def_fpmconfig['limit_extensions'];
+
+				} elseif (Settings::Get('phpfpm.enabled') == 1) {
+					$fpm_config_id = intval($_POST['fpmconfig']);
+					$fpm_enableslowlog = isset($_POST['phpfpm_enable_slowlog']) ? (int) $_POST['phpfpm_enable_slowlog'] : 0;
+					$fpm_reqtermtimeout = validate($_POST['phpfpm_reqtermtimeout'], 'phpfpm_reqtermtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					$fpm_reqslowtimeout = validate($_POST['phpfpm_reqslowtimeout'], 'phpfpm_reqslowtimeout', '/^([0-9]+)(|s|m|h|d)$/');
+					$fpm_pass_authorizationheader = isset($_POST['phpfpm_pass_authorizationheader']) ? (int) $_POST['phpfpm_pass_authorizationheader'] : 0;
+					$override_fpmconfig = isset($_POST['override_fpmconfig']) ? (int) $_POST['override_fpmconfig'] : $result['override_fpmconfig'];
+					$pm = $_POST['pm'];
+					$max_children = isset($_POST['max_children']) ? (int) $_POST['max_children'] : $result['max_children'];
+					$start_servers = isset($_POST['start_servers']) ? (int) $_POST['start_servers'] : $result['start_servers'];
+					$min_spare_servers = isset($_POST['min_spare_servers']) ? (int) $_POST['min_spare_servers'] : $result['min_spare_servers'];
+					$max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : $result['max_spare_servers'];
+					$max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : $result['max_requests'];
+					$idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : $result['idle_timeout'];
+					$limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions', '/^(\.[a-z]([a-z0-9]+)\ ?)+$/');
+					// disable fcgid stuff
+					$binary = '/usr/bin/php-cgi';
+					$file_extensions = 'php';
+					$mod_fcgid_starter = 0;
+					$mod_fcgid_maxrequests = 0;
+					$mod_fcgid_umask = "022";
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				
+				if (strlen($description) == 0 || strlen($description) > 50) {
+					standard_error('descriptioninvalid');
+				}
+				
+				$upd_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET
+						`description` = :desc,
+						`binary` = :binary,
+						`file_extensions` = :fext,
+						`mod_fcgid_starter` = :starter,
+						`mod_fcgid_maxrequests` = :mreq,
+						`mod_fcgid_umask` = :umask,
+						`fpm_slowlog` = :fpmslow,
+						`fpm_reqterm` = :fpmreqterm,
+						`fpm_reqslow` = :fpmreqslow,
+						`phpsettings` = :phpsettings,
+						`fpmsettingid` = :fpmsettingid,
+						`pass_authorizationheader` = :fpmpassauth,
+						`override_fpmconfig` = :ofc,
+						`pm` = :pm,
+						`max_children` = :max_children,
+						`start_servers` = :start_servers,
+						`min_spare_servers` = :min_spare_servers,
+						`max_spare_servers` = :max_spare_servers,
+						`max_requests` = :max_requests,
+						`idle_timeout` = :idle_timeout,
+						`limit_extensions` = :limit_extensions
+					WHERE `id` = :id");
+				$upd_data = array(
+					'desc' => $description,
+					'binary' => $binary,
+					'fext' => $file_extensions,
+					'starter' => $mod_fcgid_starter,
+					'mreq' => $mod_fcgid_maxrequests,
+					'umask' => $mod_fcgid_umask,
+					'fpmslow' => $fpm_enableslowlog,
+					'fpmreqterm' => $fpm_reqtermtimeout,
+					'fpmreqslow' => $fpm_reqslowtimeout,
+					'phpsettings' => $phpsettings,
+					'fpmsettingid' => $fpm_config_id,
+					'fpmpassauth' => $fpm_pass_authorizationheader,
+					'ofc' => $override_fpmconfig,
+					'pm' => $pm,
+					'max_children' => $max_children,
+					'start_servers' => $start_servers,
+					'min_spare_servers' => $min_spare_servers,
+					'max_spare_servers' => $max_spare_servers,
+					'max_requests' => $max_requests,
+					'idle_timeout' => $idle_timeout,
+					'limit_extensions' => $limit_extensions,
+					'id' => $id
+				);
+				Database::pexecute($upd_stmt, $upd_data);
+				
+				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
 				));
@@ -181,162 +435,266 @@ if ($page == 'overview') {
 				$fpmconfigs = '';
 				$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
 				while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
-					$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], $result['fpmsettingid'], true, true);
+					$fpmconfigs .= makeoption($row['description'], $row['id'], $result['fpmsettingid'], true, true);
 				}
-
-				$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);
+				
+				$pm_select = makeoption('static', 'static', $result['pm'], true, true);
+				$pm_select.= makeoption('dynamic', 'dynamic', $result['pm'], true, true);
+				$pm_select.= 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);
+				$phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data);
 
 				$title = $phpconfig_edit_data['phpconfig_edit']['title'];
 				$image = $phpconfig_edit_data['phpconfig_edit']['image'];
-
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_edit") . "\";");
+				
+				eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";");
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			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>";
+		$result = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
+		
+		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+
+			$query_params = array(
+				'id' => $row['id']
+			);
+			
+			$query = "SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `fpmsettingid` = :id";
+			
+			$configresult_stmt = Database::prepare($query);
+			Database::pexecute($configresult_stmt, $query_params);
+			
+			$configs = '';
+			if (Database::num_rows() > 0) {
+				while ($row2 = $configresult_stmt->fetch(PDO::FETCH_ASSOC)) {
+					$configs .= $row2['description'] . '<br/>';
 				}
-				$count ++;
-				eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons_overview") . "\";");
 			}
+			
+			if ($configs == '') {
+				$configs = $lng['admin']['phpsettings']['notused'];
+			}
+			
+			$count ++;
+			eval("\$tablecontent.=\"" . getTemplate("phpconfig/fpmdaemons_overview") . "\";");
 		}
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons") . "\";");
+		
+		$log->logAction(ADM_ACTION, LOG_INFO, "fpm daemons setting overview has been viewed by '" . $userinfo['loginname'] . "'");
+		eval("echo \"" . 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());
+				$description = validate($_POST['description'], 'description');
+				$reload_cmd = validate($_POST['reload_cmd'], 'reload_cmd');
+				$config_dir = validate($_POST['config_dir'], 'config_dir');
+				$pm = $_POST['pm'];
+				$max_children = isset($_POST['max_children']) ? (int) $_POST['max_children'] : 0;
+				$start_servers = isset($_POST['start_servers']) ? (int) $_POST['start_servers'] : 0;
+				$min_spare_servers = isset($_POST['min_spare_servers']) ? (int) $_POST['min_spare_servers'] : 0;
+				$max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : 0;
+				$max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : 0;
+				$idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : 0;
+				$limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions', '/^(\.[a-z]([a-z0-9]+)\ ?)+$/');
+				
+				if (strlen($description) == 0 || strlen($description) > 50) {
+					standard_error('descriptioninvalid');
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				
+				$ins_stmt = Database::prepare("
+					INSERT INTO `" . TABLE_PANEL_FPMDAEMONS . "` SET
+					`description` = :desc,
+					`reload_cmd` = :reload_cmd,
+					`config_dir` = :config_dir,
+					`pm` = :pm,
+					`max_children` = :max_children,
+					`start_servers` = :start_servers,
+					`min_spare_servers` = :min_spare_servers,
+					`max_spare_servers` = :max_spare_servers,
+					`max_requests` = :max_requests,
+					`idle_timeout` = :idle_timeout,
+					`limit_extensions` = :limit_extensions
+				");
+				$ins_data = array(
+					'desc' => $description,
+					'reload_cmd' => $reload_cmd,
+					'config_dir' => makeCorrectDir($config_dir),
+					'pm' => $pm,
+					'max_children' => $max_children,
+					'start_servers' => $start_servers,
+					'min_spare_servers' => $min_spare_servers,
+					'max_spare_servers' => $max_spare_servers,
+					'max_requests' => $max_requests,
+					'idle_timeout' => $idle_timeout,
+					'limit_extensions' => $limit_extensions
+				);
+				Database::pexecute($ins_stmt, $ins_data);
+				
+				inserttask('1');
+				$log->logAction(ADM_ACTION, LOG_INFO, "fpm-daemon setting with description '" . $description . "' has been created by '" . $userinfo['loginname'] . "'");
+				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);
+				
+				$pm_select = makeoption('static', 'static', 'static', true, true);
+				$pm_select.= makeoption('dynamic', 'dynamic', 'static', true, true);
+				$pm_select.= makeoption('ondemand', 'ondemand', 'static', true, true);
 
 				$fpmconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php';
-				$fpmconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_add_data);
-
+				$fpmconfig_add_form = 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") . "\";");
+				
+				eval("echo \"" . getTemplate("phpconfig/fpmconfig_add") . "\";");
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			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'];
+		
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $id
+		));
 
 		if ($id == 1) {
-			\Froxlor\UI\Response::standard_error('cannotdeletedefaultphpconfig');
+			standard_error('cannotdeletedefaultphpconfig');
 		}
 
 		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1 && $id != 1) // cannot delete the default php.config
 		{
+			
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					FpmDaemons::getLocal($userinfo, $_POST)->delete();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
-				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				// set default fpm daemon config for all php-config that use this config that is to be deleted
+				$upd_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET
+					`fpmsettingid` = '1' WHERE `fpmsettingid` = :id");
+				Database::pexecute($upd_stmt, array(
+					'id' => $id
+				));
+				
+				$del_stmt = Database::prepare("
+					DELETE FROM `" . TABLE_PANEL_FPMDAEMONS . "` WHERE `id` = :id");
+				Database::pexecute($del_stmt, array(
+					'id' => $id
+				));
+				
+				inserttask('1');
+				$log->logAction(ADM_ACTION, LOG_INFO, "fpm-daemon setting with id #" . (int) $id . " has been deleted by '" . $userinfo['loginname'] . "'");
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('fpmsetting_reallydelete', $filename, array(
+				ask_yesno('fpmsetting_reallydelete', $filename, array(
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
 				), $result['description']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			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'];
-
+		
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $id
+		));
+		
 		if ($result['id'] != 0 && $result['id'] == $id && (int) $userinfo['change_serversettings'] == 1) {
-
+			
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					FpmDaemons::getLocal($userinfo, $_POST)->update();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				$description = validate($_POST['description'], 'description');
+				$reload_cmd = validate($_POST['reload_cmd'], 'reload_cmd');
+				$config_dir = validate($_POST['config_dir'], 'config_dir');
+				$pm = $_POST['pm'];
+				$max_children = isset($_POST['max_children']) ? (int) $_POST['max_children'] : $result['max_children'];
+				$start_servers = isset($_POST['start_servers']) ? (int) $_POST['start_servers'] : $result['start_servers'];
+				$min_spare_servers = isset($_POST['min_spare_servers']) ? (int) $_POST['min_spare_servers'] : $result['min_spare_servers'];
+				$max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : $result['max_spare_servers'];
+				$max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : $result['max_requests'];
+				$idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : $result['idle_timeout'];
+				$limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions', '/^(\.[a-z]([a-z0-9]+)\ ?)+$/');
+				
+				if (strlen($description) == 0 || strlen($description) > 50) {
+					standard_error('descriptioninvalid');
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				
+				$upd_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_FPMDAEMONS . "` SET
+					`description` = :desc,
+					`reload_cmd` = :reload_cmd,
+					`config_dir` = :config_dir,
+					`pm` = :pm,
+					`max_children` = :max_children,
+					`start_servers` = :start_servers,
+					`min_spare_servers` = :min_spare_servers,
+					`max_spare_servers` = :max_spare_servers,
+					`max_requests` = :max_requests,
+					`idle_timeout` = :idle_timeout,
+					`limit_extensions` = :limit_extensions
+					WHERE `id` = :id
+				");
+				$upd_data = array(
+					'desc' => $description,
+					'reload_cmd' => $reload_cmd,
+					'config_dir' => makeCorrectDir($config_dir),
+					'pm' => $pm,
+					'max_children' => $max_children,
+					'start_servers' => $start_servers,
+					'min_spare_servers' => $min_spare_servers,
+					'max_spare_servers' => $max_spare_servers,
+					'max_requests' => $max_requests,
+					'idle_timeout' => $idle_timeout,
+					'limit_extensions' => $limit_extensions,
+					'id' => $id
+				);
+				Database::pexecute($upd_stmt, $upd_data);
+				
+				inserttask('1');
+				$log->logAction(ADM_ACTION, LOG_INFO, "fpm-daemon setting with description '" . $description . "' has been changed by '" . $userinfo['loginname'] . "'");
+				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);
+				
+				$pm_select = makeoption('static', 'static', $result['pm'], true, true);
+				$pm_select.= makeoption('dynamic', 'dynamic', $result['pm'], true, true);
+				$pm_select.= 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);
-
+				$fpmconfig_edit_form = 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") . "\";");
+				
+				eval("echo \"" . getTemplate("phpconfig/fpmconfig_edit") . "\";");
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			standard_error('nopermissionsorinvalidid');
 		}
 	}
 }

admin_plans.php

@@ -17,10 +17,6 @@
 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'])) {
@@ -28,104 +24,206 @@ if (isset($_POST['id'])) {
 }
 
 if ($page == '' || $page == 'overview') {
-
+	
 	if ($action == '') {
-
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_plans");
+		
+		$log->logAction(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'];
-
+		$paging = new paging($userinfo, TABLE_PANEL_PLANS, $fields);
 		$plans = '';
+		$result_stmt = Database::prepare("
+			SELECT p.*, a.loginname as adminname
+			FROM `" . TABLE_PANEL_PLANS . "` p, `" . TABLE_PANEL_ADMINS . "` a
+			WHERE " . ($userinfo['customers_see_all'] ? '' : " `p`.`adminid` = :adminid AND ") . "
+			`p`.`adminid` = `a`.`adminid` " . $paging->getSqlWhere(false) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		Database::pexecute($result_stmt, array(
+			'adminid' => $userinfo['adminid']
+		));
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$i = 0;
 		$count = 0;
-
-		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 ++;
+		
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			
+			if ($paging->checkDisplay($i)) {
+				$row = htmlentities_array($row);
+				$row['ts_format'] = date("d.m.Y H:i", $row['ts']);
+				eval("\$plans.=\"" . getTemplate("plans/plans_plan") . "\";");
+				$count ++;
+			}
+			$i ++;
 		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("plans/plans") . "\";");
+		
+		eval("echo \"" . 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'];
-
+		
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PLANS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $id
+		));
+		
 		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(
+				
+				$del_stmt = Database::prepare("
+					DELETE FROM `" . TABLE_PANEL_PLANS . "` WHERE `id` = :id");
+				Database::pexecute($del_stmt, array(
+					'id' => $id
+				));
+				
+				$log->logAction(ADM_ACTION, LOG_INFO, "Plan '" . $result['name'] . "' has been deleted by '" . $userinfo['loginname'] . "'");
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('plan_reallydelete', $filename, array(
+				ask_yesno('plan_reallydelete', $filename, array(
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
 				), $result['name']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
+			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());
+			$name = validate($_POST['name'], 'name');
+			$description = validate(str_replace("\r\n", "\n", $_POST['description']), 'description', '/^[^\0]*$/');
+			
+			$value_arr = array();
+			
+			$value_arr['diskspace'] = intval_ressource($_POST['diskspace']);
+			if (isset($_POST['diskspace_ul'])) {
+				$value_arr['diskspace'] = - 1;
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
+			
+			$value_arr['traffic'] = doubleval_ressource($_POST['traffic']);
+			if (isset($_POST['traffic_ul'])) {
+				$value_arr['traffic'] = - 1;
+			}
+			
+			$value_arr['subdomains'] = intval_ressource($_POST['subdomains']);
+			if (isset($_POST['subdomains_ul'])) {
+				$value_arr['subdomains'] = - 1;
+			}
+			
+			$value_arr['emails'] = intval_ressource($_POST['emails']);
+			if (isset($_POST['emails_ul'])) {
+				$value_arr['emails'] = - 1;
+			}
+			
+			$value_arr['email_accounts'] = intval_ressource($_POST['email_accounts']);
+			if (isset($_POST['email_accounts_ul'])) {
+				$value_arr['email_accounts'] = - 1;
+			}
+			
+			$value_arr['email_forwarders'] = intval_ressource($_POST['email_forwarders']);
+			if (isset($_POST['email_forwarders_ul'])) {
+				$value_arr['email_forwarders'] = - 1;
+			}
+			
+			if (Settings::Get('system.mail_quota_enabled') == '1') {
+				$value_arr['email_quota'] = validate($_POST['email_quota'], 'email_quota', '/^\d+$/', 'vmailquotawrong', array(
+					'0',
+					''
+				));
+				if (isset($_POST['email_quota_ul'])) {
+					$value_arr['email_quota'] = - 1;
+				}
+			} else {
+				$value_arr['email_quota'] = - 1;
+			}
+			
+			$value_arr['email_imap'] = 0;
+			if (isset($_POST['email_imap'])) {
+				$value_arr['email_imap'] = intval_ressource($_POST['email_imap']);
+			}
+			
+			$value_arr['email_pop3'] = 0;
+			if (isset($_POST['email_pop3'])) {
+				$value_arr['email_pop3'] = intval_ressource($_POST['email_pop3']);
+			}
+			
+			$value_arr['ftps'] = intval_ressource($_POST['ftps']);
+			if (isset($_POST['ftps_ul'])) {
+				$value_arr['ftps'] = - 1;
+			}
+			
+			$value_arr['tickets'] = (Settings::Get('ticket.enabled') == 1 ? intval_ressource($_POST['tickets']) : 0);
+			if (isset($_POST['tickets_ul']) && Settings::Get('ticket.enabled') == '1') {
+				$value_arr['tickets'] = - 1;
+			}
+			
+			$value_arr['mysqls'] = intval_ressource($_POST['mysqls']);
+			if (isset($_POST['mysqls_ul'])) {
+				$value_arr['mysqls'] = - 1;
+			}
+			
+			$value_arr['phpenabled'] = 0;
+			if (isset($_POST['phpenabled'])) {
+				$value_arr['phpenabled'] = intval($_POST['phpenabled']);
+			}
+			
+			$value_arr['allowed_phpconfigs'] = array();
+			if (isset($_POST['allowed_phpconfigs']) && is_array($_POST['allowed_phpconfigs'])) {
+				foreach ($_POST['allowed_phpconfigs'] as $allowed_phpconfig) {
+					$allowed_phpconfig = intval($allowed_phpconfig);
+					$value_arr['allowed_phpconfigs'][] = $allowed_phpconfig;
+				}
+			}
+			
+			$value_arr['perlenabled'] = 0;
+			if (isset($_POST['perlenabled'])) {
+				$value_arr['perlenabled'] = intval($_POST['perlenabled']);
+			}
+			
+			$value_arr['dnsenabled'] = 0;
+			if (isset($_POST['dnsenabled'])) {
+				$value_arr['dnsenabled'] = intval($_POST['dnsenabled']);
+			}
+			
+			$ins_stmt = Database::prepare("
+				INSERT INTO `" . TABLE_PANEL_PLANS . "`
+				SET `adminid` = :adminid, `name` = :name, `description` = :desc, `value` = :valuearr, `ts` = UNIX_TIMESTAMP();
+			");
+			$ins_data = array(
+				'adminid' => $userinfo['adminid'],
+				'name' => $name,
+				'desc' => $description,
+				'valuearr' => json_encode($value_arr)
+			);
+			Database::pexecute($ins_stmt, $ins_data);
+			
+			$log->logAction(ADM_ACTION, LOG_WARNING, "added plan '" . $name . "'");
+			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);
-
+			
+			$diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$traffic_ul = makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$subdomains_ul = makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$emails_ul = makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
+			
 			$phpconfigs = array();
 			$configs = Database::query("
 					SELECT c.*, fc.description as interpreter
@@ -145,7 +243,7 @@ if ($page == '' || $page == 'overview') {
 					);
 				}
 			}
-
+			
 			// dummy to avoid unknown variables
 			$language_options = null;
 			$gender_options = null;
@@ -159,91 +257,197 @@ if ($page == '' || $page == 'overview') {
 			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);
-
+			$plans_add_form = 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") . "\";");
+			
+			eval("echo \"" . 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'];
-
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PLANS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $id
+		));
+		
 		if ($result['name'] != '') {
-
+			
 			$result['value'] = json_decode($result['value'], true);
-			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
-
+			$result = htmlentities_array($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());
+				
+				$name = validate($_POST['name'], 'name');
+				$description = validate(str_replace("\r\n", "\n", $_POST['description']), 'description', '/^[^\0]*$/');
+				
+				$value_arr = array();
+				
+				$value_arr['diskspace'] = intval_ressource($_POST['diskspace']);
+				if (isset($_POST['diskspace_ul'])) {
+					$value_arr['diskspace'] = - 1;
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				
+				$value_arr['traffic'] = doubleval_ressource($_POST['traffic']);
+				if (isset($_POST['traffic_ul'])) {
+					$value_arr['traffic'] = - 1;
+				}
+				
+				$value_arr['subdomains'] = intval_ressource($_POST['subdomains']);
+				if (isset($_POST['subdomains_ul'])) {
+					$value_arr['subdomains'] = - 1;
+				}
+				
+				$value_arr['emails'] = intval_ressource($_POST['emails']);
+				if (isset($_POST['emails_ul'])) {
+					$value_arr['emails'] = - 1;
+				}
+				
+				$value_arr['email_accounts'] = intval_ressource($_POST['email_accounts']);
+				if (isset($_POST['email_accounts_ul'])) {
+					$value_arr['email_accounts'] = - 1;
+				}
+				
+				$value_arr['email_forwarders'] = intval_ressource($_POST['email_forwarders']);
+				if (isset($_POST['email_forwarders_ul'])) {
+					$value_arr['email_forwarders'] = - 1;
+				}
+				
+				if (Settings::Get('system.mail_quota_enabled') == '1') {
+					$value_arr['email_quota'] = validate($_POST['email_quota'], 'email_quota', '/^\d+$/', 'vmailquotawrong', array(
+						'0',
+						''
+					));
+					if (isset($_POST['email_quota_ul'])) {
+						$value_arr['email_quota'] = - 1;
+					}
+				} else {
+					$value_arr['email_quota'] = - 1;
+				}
+				
+				$value_arr['email_imap'] = 0;
+				if (isset($_POST['email_imap'])) {
+					$value_arr['email_imap'] = intval_ressource($_POST['email_imap']);
+				}
+				
+				$value_arr['email_pop3'] = 0;
+				if (isset($_POST['email_pop3'])) {
+					$value_arr['email_pop3'] = intval_ressource($_POST['email_pop3']);
+				}
+				
+				$value_arr['ftps'] = intval_ressource($_POST['ftps']);
+				if (isset($_POST['ftps_ul'])) {
+					$value_arr['ftps'] = - 1;
+				}
+				
+				$value_arr['tickets'] = (Settings::Get('ticket.enabled') == 1 ? intval_ressource($_POST['tickets']) : 0);
+				if (isset($_POST['tickets_ul']) && Settings::Get('ticket.enabled') == '1') {
+					$value_arr['tickets'] = - 1;
+				}
+				
+				$value_arr['mysqls'] = intval_ressource($_POST['mysqls']);
+				if (isset($_POST['mysqls_ul'])) {
+					$value_arr['mysqls'] = - 1;
+				}
+				
+				$value_arr['phpenabled'] = 0;
+				if (isset($_POST['phpenabled'])) {
+					$value_arr['phpenabled'] = intval($_POST['phpenabled']);
+				}
+				
+				$value_arr['allowed_phpconfigs'] = array();
+				if (isset($_POST['allowed_phpconfigs']) && is_array($_POST['allowed_phpconfigs'])) {
+					foreach ($_POST['allowed_phpconfigs'] as $allowed_phpconfig) {
+						$allowed_phpconfig = intval($allowed_phpconfig);
+						$value_arr['allowed_phpconfigs'][] = $allowed_phpconfig;
+					}
+				}
+				
+				$value_arr['perlenabled'] = 0;
+				if (isset($_POST['perlenabled'])) {
+					$value_arr['perlenabled'] = intval($_POST['perlenabled']);
+				}
+				
+				$value_arr['dnsenabled'] = 0;
+				if (isset($_POST['dnsenabled'])) {
+					$value_arr['dnsenabled'] = intval($_POST['dnsenabled']);
+				}
+				
+				$ins_stmt = Database::prepare("
+					UPDATE `" . TABLE_PANEL_PLANS . "`
+					SET `name` = :name, `description` = :desc, `value` = :valuearr, `ts` = UNIX_TIMESTAMP()
+					WHERE `id` = :id
+				");
+				$ins_data = array(
+					'name' => $name,
+					'desc' => $description,
+					'valuearr' => json_encode($value_arr),
+					'id' => $id
+				);
+				Database::pexecute($ins_stmt, $ins_data);
+				
+				$log->logAction(ADM_ACTION, LOG_WARNING, "updated plan '" . $name . "'");
+				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);
+				$diskspace_ul = 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);
+				$traffic_ul = 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);
+				$subdomains_ul = 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);
+				
+				$emails_ul = 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);
+				
+				$email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true);
 				if ($result['email_accounts'] == '-1') {
 					$result['email_accounts'] = '';
 				}
-
-				$email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true);
+				
+				$email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true);
 				if ($result['email_forwarders'] == '-1') {
 					$result['email_forwarders'] = '';
 				}
-
-				$email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
+				
+				$email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true);
 				if ($result['email_quota'] == '-1') {
 					$result['email_quota'] = '';
 				}
-
-				$ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
+				
+				$ftps_ul = 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);
+				
+				$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, $result['tickets'], true, true);
+				if ($result['tickets'] == '-1') {
+					$result['tickets'] = '';
+				}
+				
+				$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true);
 				if ($result['mysqls'] == '-1') {
 					$result['mysqls'] = '';
 				}
-
+				
 				$phpconfigs = array();
 				$configs = Database::query("
 					SELECT c.*, fc.description as interpreter
@@ -285,7 +489,6 @@ if ($page == '' || $page == 'overview') {
 				$result['customernumber'] = null;
 				$result['custom_notes'] = null;
 				$result['custom_notes_show'] = null;
-				$result['api_allowed'] = null;
 				$hosting_plans = null;
 				$admin_select_cnt = null;
 				$admin_select = null;
@@ -298,25 +501,22 @@ if ($page == '' || $page == 'overview') {
 				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);
-
+				$plans_edit_form = 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") . "\";");
+				
+				eval("echo \"" . 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'];
+		$planid = isset($_POST['planid']) ? (int)$_POST['planid'] : 0;
+		$result_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_PLANS . "` WHERE `id` = :id");
+		$result = Database::pexecute_first($result_stmt, array(
+			'id' => $planid
+		));
 		echo $result['value'];
-		exit();
+		exit;
 	}
 }

admin_settings.php

@@ -16,9 +16,6 @@
  * @package    Panel
  *
  */
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-use Froxlor\Api\Commands\Froxlor;
 
 define('AREA', 'admin');
 require './lib/init.php';
@@ -30,10 +27,12 @@ $sql_root = Database::getSqlData();
 Database::needRoot(false);
 
 if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
-	$settings_data = \Froxlor\PhpHelper::loadConfigArrayDir('./actions/admin/settings/');
-	Settings::loadSettingsInto($settings_data);
+	$settings_data = loadConfigArrayDir('./actions/admin/settings/');
+	$settings = loadSettings($settings_data);
 
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
 		if ($_part == '') {
@@ -49,6 +48,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 				$settings_part = true;
 			}
 			$only_enabledisable = false;
+
 		} else {
 			$settings_all = false;
 			$settings_part = false;
@@ -56,28 +56,30 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		}
 
 		// check if the session timeout is too low #815
-		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] < 60) {
-			\Froxlor\UI\Response::standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
+		if (isset($_POST['session_sessiontimeout'])
+			&& $_POST['session_sessiontimeout'] < 60
+		) {
+			standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
 		}
 
-		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');
+		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');
 			// Using nameserver, insert a task which rebuilds the server config
-			\Froxlor\System\Cronjob::inserttask('4');
-			// cron.d file
-			\Froxlor\System\Cronjob::inserttask('99');
+			inserttask('4');
 
-			\Froxlor\UI\Response::standard_success('settingssaved', '', array(
-				'filename' => $filename,
-				'action' => $action,
-				'page' => $page
-			));
+			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
+
 	} else {
 
 		$_part = isset($_GET['part']) ? $_GET['part'] : '';
@@ -85,36 +87,39 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 			$_part = isset($_POST['part']) ? $_POST['part'] : '';
 		}
 
-		$fields = \Froxlor\UI\Form::buildFormEx($settings_data, $_part);
+		$fields = buildFormEx($settings_data, $_part);
 
 		$settings_page = '';
 		if ($_part == '') {
-			eval("\$settings_page .= \"" . \Froxlor\UI\Template::getTemplate("settings/settings_overview") . "\";");
+			eval("\$settings_page .= \"" . getTemplate("settings/settings_overview") . "\";");
 		} else {
-			eval("\$settings_page .= \"" . \Froxlor\UI\Template::getTemplate("settings/settings") . "\";");
+			eval("\$settings_page .= \"" . getTemplate("settings/settings") . "\";");
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/settings_form_begin") . "\";");
+		eval("echo \"" . getTemplate("settings/settings_form_begin") . "\";");
 		eval("echo \$settings_page;");
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/settings_form_end") . "\";");
+		eval("echo \"" . getTemplate("settings/settings_form_end") . "\";");
+
 	}
-} elseif ($page == 'phpinfo' && $userinfo['change_serversettings'] == '1') {
+
+} elseif($page == 'phpinfo'
+	&& $userinfo['change_serversettings'] == '1'
+) {
 	ob_start();
 	phpinfo();
-	$phpinfo = array(
-		'phpinfo' => array()
-	);
-	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)) {
+	$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];
 			}
@@ -124,99 +129,114 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 			$phpinfoentries = "";
 			foreach ($section as $key => $val) {
 				if (is_array($val)) {
-					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_3") . "\";");
+					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_3") . "\";");
 				} elseif (is_string($key)) {
-					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_2") . "\";");
+					eval("\$phpinfoentries .= \"" . getTemplate("settings/phpinfo/phpinfo_2") . "\";");
 				} else {
-					eval("\$phpinfoentries .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_1") . "\";");
+					eval("\$phpinfoentries .= \"" . 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 .= \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo/phpinfo_table") . "\";");
+			eval("\$phpinfohtml .= \"" . getTemplate("settings/phpinfo/phpinfo_table") . "\";");
 		}
 		$phpinfo = $phpinfohtml;
 	} else {
-		\Froxlor\UI\Response::standard_error($lng['error']['no_phpinfo']);
+		standard_error($lng['error']['no_phpinfo']);
 	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo") . "\";");
-} elseif ($page == 'rebuildconfigs' && $userinfo['change_serversettings'] == '1') {
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+	eval("echo \"" . getTemplate("settings/phpinfo") . "\";");
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "rebuild configfiles");
-		\Froxlor\System\Cronjob::inserttask('1');
-		\Froxlor\System\Cronjob::inserttask('10');
+} 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
-		\Froxlor\System\Cronjob::inserttask('4');
+		inserttask('4');
 		// cron.d file
-		\Froxlor\System\Cronjob::inserttask('99');
+		inserttask('99');
+
+		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 
-		\Froxlor\UI\Response::standard_success('rebuildingconfigs', '', array(
-			'filename' => 'admin_index.php'
-		));
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_configs_reallyrebuild', $filename, array(
-			'page' => $page
-		));
+		ask_yesno('admin_configs_reallyrebuild', $filename, array('page' => $page));
 	}
-} elseif ($page == 'updatecounters' && $userinfo['change_serversettings'] == '1') {
 
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+} elseif($page == 'updatecounters'
+	&& $userinfo['change_serversettings'] == '1'
+) {
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "updated resource-counters");
-		$updatecounters = \Froxlor\User::updateCounters(true);
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
+		$log->logAction(ADM_ACTION, LOG_INFO, "updated resource-counters");
+		$updatecounters = updateCounters(true);
 		$customers = '';
 		foreach ($updatecounters['customers'] as $customerid => $customer) {
-			eval("\$customers.=\"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters_row_customer") . "\";");
+			eval("\$customers.=\"" . getTemplate("settings/updatecounters_row_customer") . "\";");
 		}
 
 		$admins = '';
 		foreach ($updatecounters['admins'] as $adminid => $admin) {
-			eval("\$admins.=\"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters_row_admin") . "\";");
+			eval("\$admins.=\"" . getTemplate("settings/updatecounters_row_admin") . "\";");
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/updatecounters") . "\";");
+		eval("echo \"" . getTemplate("settings/updatecounters") . "\";");
+
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_counters_reallyupdate', $filename, array(
-			'page' => $page
-		));
+		ask_yesno('admin_counters_reallyupdate', $filename, array('page' => $page));
 	}
-} elseif ($page == 'wipecleartextmailpws' && $userinfo['change_serversettings'] == '1') {
 
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+} elseif ($page == 'wipecleartextmailpws'
+	&& $userinfo['change_serversettings'] == '1'
+) {
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
+		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all cleartext mail passwords");
 		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `password` = '';");
 		Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '0' WHERE `settinggroup` = 'system' AND `varname` = 'mailpwcleartext'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
+		redirectTo($filename, array('s' => $s));
+
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_cleartextmailpws_reallywipe', $filename, array(
-			'page' => $page
-		));
+		ask_yesno('admin_cleartextmailpws_reallywipe', $filename, array('page' => $page));
 	}
-} elseif ($page == 'wipequotas' && $userinfo['change_serversettings'] == '1') {
 
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
+} elseif($page == 'wipequotas'
+	&& $userinfo['change_serversettings'] == '1'
+) {
 
-		$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+
+		$log->logAction(ADM_ACTION, LOG_WARNING, "wiped all mailquotas");
 
 		// Set the quota to 0 which means unlimited
 		Database::query("UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = '0';");
 		Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_quota_used` = '0'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
+		redirectTo($filename, array('s' => $s));
+
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_quotas_reallywipe', $filename, array(
-			'page' => $page
-		));
+		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 . "`");
 
@@ -230,10 +250,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 
 			while ($array = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$difference = Settings::Get('system.mail_quota') - $array['quota'];
-				Database::pexecute($upd_stmt, array(
-					'diff' => $difference,
-					'customerid' => $customerid
-				));
+				Database::pexecute($upd_stmt, array('diff' => $difference, 'customerid' => $customerid));
 			}
 		}
 
@@ -241,29 +258,27 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		$upd_stmt = Database::prepare("
 			UPDATE `" . TABLE_MAIL_USERS . "` SET `quota` = :quota
 		");
-		Database::pexecute($upd_stmt, array(
-			'quota' => Settings::Get('system.mail_quota')
-		));
+		Database::pexecute($upd_stmt, 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
-		));
+		$log->logAction(ADM_ACTION, LOG_WARNING, 'enforcing mailquota to all customers: ' . Settings::Get('system.mail_quota') . ' MB');
+		redirectTo($filename, array('s' => $s));
+
 	} else {
-		\Froxlor\UI\HTML::askYesNo('admin_quotas_reallyenforce', $filename, array(
-			'page' => $page
-		));
+		ask_yesno('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') {
+} elseif ($page == 'integritycheck'
+	&& $userinfo['change_serversettings'] == '1'
+) {
+	$integrity = new IntegrityCheck();
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 		$integrity->fixAll();
-	} elseif (isset($_GET['action']) && $_GET['action'] == "fix") {
-		\Froxlor\UI\HTML::askYesNo('admin_integritycheck_reallyfix', $filename, array(
-			'page' => $page
-		));
+	} elseif(isset($_GET['action'])
+		 && $_GET['action'] == "fix") {
+		ask_yesno('admin_integritycheck_reallyfix', $filename, array('page' => $page));
 	}
 
 	$integritycheck = '';
@@ -271,27 +286,28 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 		$displayid = $id + 1;
 		$result = $integrity->$check();
 		$checkdesc = $lng['integrity_check'][$check];
-		eval("\$integritycheck.=\"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck_row") . "\";");
+		eval("\$integritycheck.=\"" . getTemplate("settings/integritycheck_row") . "\";");
 	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck") . "\";");
-} elseif ($page == 'importexport' && $userinfo['change_serversettings'] == '1') {
+	eval("echo \"" . getTemplate("settings/integritycheck") . "\";");
+}
+elseif ($page == 'importexport' && $userinfo['change_serversettings'] == '1')
+{
 	// check for json-stuff
 	if (! extension_loaded('json')) {
-		\Froxlor\UI\Response::standard_error('jsonextensionnotfound');
+		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());
+			$json_export = SImExporter::export();
+		} catch(Exception $e) {
+			dynamic_error($e->getMessage());
 		}
-		header('Content-disposition: attachment; filename=Froxlor_settings-' . $version . '-' . $dbversion . '_' . date('d.m.Y') . '.json');
+		header('Content-disposition: attachment; filename=Froxlor_settings-'.$version.'-'.$dbversion.'_'.date('d.m.Y').'.json');
 		header('Content-type: application/json');
 		echo $json_export;
-		exit();
+		exit;
 	} elseif (isset($_GET['action']) && $_GET['action'] == "import") {
 		// import
 		if (isset($_POST['send']) && $_POST['send'] == 'send') {
@@ -299,86 +315,88 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
 			if (isset($_FILES["import_file"]["tmp_name"])) {
 				$imp_content = file_get_contents($_FILES["import_file"]["tmp_name"]);
 				try {
-					Froxlor::getLocal($userinfo, array(
-						'json_str' => $imp_content
-					))->importSettings();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+					SImExporter::import($imp_content);
+				} catch(Exception $e) {
+					dynamic_error($e->getMessage());
 				}
-				\Froxlor\UI\Response::standard_success('settingsimported', '', array(
-					'filename' => 'admin_settings.php'
-				));
+				inserttask('1');
+				inserttask('10');
+				// Using nameserver, insert a task which rebuilds the server config
+				inserttask('4');
+				// cron.d file
+				inserttask('99');
+				standard_success('settingsimported', '', array('filename' => 'admin_settings.php'));
 			}
-			\Froxlor\UI\Response::dynamic_error("Upload failed");
+			dynamic_error("Upload failed");
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/importexport/index") . "\";");
+		eval("echo \"" . 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") . "\";");
+}
+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(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::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(phpmailerException $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
+				}
+
+				if (!$_mailerror) {
+					// success
+					$mail->ClearAddresses();
+					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 \"" . getTemplate("settings/testmail") . "\";");
 }

admin_templates.php

@@ -16,23 +16,23 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-
 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'])) {
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
@@ -45,8 +45,21 @@ $available_templates = array(
 );
 
 // only show templates of features that are enabled #1191
-if ((int) Settings::Get('system.report_enable') == 1) {
-	array_push($available_templates, 'trafficmaxpercent', 'diskmaxpercent');
+if ((int)Settings::Get('system.report_enable') == 1) {
+	array_push($available_templates,
+		'trafficmaxpercent',
+		'diskmaxpercent'
+	);
+}
+
+if ((int)Settings::Get('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'
+	);
 }
 
 $file_templates = array(
@@ -54,8 +67,8 @@ $file_templates = array(
 );
 
 if ($action == '') {
-	// email templates
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
+	//email templates
+	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
 
 	if (Settings::Get('panel.sendalternativemail') == 1) {
 		$available_templates[] = 'pop_success_alternative';
@@ -65,10 +78,9 @@ if ($action == '') {
 	$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']
-	));
+		ORDER BY `language`, `varname`"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
 
 	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 		$parts = array();
@@ -82,7 +94,7 @@ if ($action == '') {
 			$subjectid = $email['subject'];
 			$mailbodyid = $email['mailbody'];
 			$template = $lng['admin']['templates'][$action];
-			eval("\$templates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_template") . "\";");
+			eval("\$templates.=\"" . getTemplate("templates/templates_template") . "\";");
 		}
 	}
 
@@ -93,11 +105,9 @@ if ($action == '') {
 		$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
-		));
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
+		);
+		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
 
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			$templates_done[] = str_replace('_subject', '', $row['varname']);
@@ -108,115 +118,111 @@ if ($action == '') {
 		}
 	}
 
-	// filetemplates
+	//filetemplates
 	$filetemplates = '';
 	$filetemplateadd = false;
 	$result_stmt = Database::prepare("
 		SELECT `id`, `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`
-		WHERE `adminid` = :adminid AND `templategroup`='files'");
-	Database::pexecute($result_stmt, array(
-		'adminid' => $userinfo['adminid']
-	));
+		WHERE `adminid` = :adminid AND `templategroup`='files'"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
 
 	if (Database::num_rows() != count($file_templates)) {
 		$filetemplateadd = true;
 	}
 
 	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-		eval("\$filetemplates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_filetemplate") . "\";");
+		eval("\$filetemplates.=\"" . getTemplate("templates/templates_filetemplate") . "\";");
 	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates") . "\";");
-} elseif ($action == 'delete' && $subjectid != 0 && $mailbodyid != 0) {
-	// email templates
+	eval("echo \"" . 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
-	));
+		WHERE `adminid` = :adminid AND `id` = :id"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $subjectid));
 	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 	if ($result['varname'] != '') {
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		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)");
+				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
-			));
+			$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 {
-			\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'])]);
+			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'])]);
 		}
 	}
-} 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
-	));
+		WHERE `adminid` = :adminid AND `id` = :id"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
 
 	if (Database::num_rows() > 0) {
 
 		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+		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
-			));
+				WHERE `adminid` = :adminid AND `id` = :id"
+			);
+			Database::pexecute($del_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
+			$log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'");
+			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']]);
+			ask_yesno('admin_template_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $lng['admin']['templates'][$row['varname']]);
 		}
+
 	} else {
-		\Froxlor\UI\Response::standard_error('templatenotfound');
+		standard_error('templatenotfound');
 	}
-} elseif ($action == 'add') {
+
+} elseif($action == 'add') {
 
 	if (Settings::Get('panel.sendalternativemail') == 1) {
 		$available_templates[] = 'pop_success_alternative';
 	}
 
-	if (isset($_POST['prepare']) && $_POST['prepare'] == 'prepare') {
-		// email templates
-		$language = htmlentities(\Froxlor\Validate\Validate::validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
-		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
+	if (isset($_POST['prepare'])
+		&& $_POST['prepare'] == 'prepare'
+	) {
+		//email templates
+		$language = htmlentities(validate($_POST['language'], 'language', '/^[^\r\n\0"\']+$/', 'nolanguageselect'));
+		$template = validate($_POST['template'], 'template');
 
 		$lng_bak = $lng;
 		foreach ($langs['English'] as $key => $value) {
-			include_once \Froxlor\FileDir::makeSecurePath($value['file']);
+			include_once makeSecurePath($value['file']);
 		}
 		if ($language != 'English') {
 			foreach ($langs[$language] as $key => $value) {
-				include \Froxlor\FileDir::makeSecurePath($value['file']);
+				include makeSecurePath($value['file']);
 			}
 		}
 
@@ -225,36 +231,38 @@ if ($action == '') {
 
 		$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);
+		$template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php';
+		$template_add_form = htmlform::genHTMLForm($template_add_data);
 
 		$title = $template_add_data['template_add']['title'];
 		$image = $template_add_data['template_add']['image'];
 
-		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');
+		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
+
+	} elseif(isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		//email templates
+		$language = htmlentities(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');
 		$templates = array();
 		$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
-		));
+			AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
+		);
+		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language));
 
-		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+		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');
+			standard_error('templatenotfound');
+
 		} else {
 			$ins_stmt = Database::prepare("
 				INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
@@ -262,13 +270,14 @@ if ($action == '') {
 					`language` = :lang,
 					`templategroup` = 'mails',
 					`varname` = :var,
-					`value` = :value");
+					`value` = :value"
+			);
 
 			// mail-subject
 			$ins_data = array(
 				'adminid' => $userinfo['adminid'],
 				'lang' => $language,
-				'var' => $template . '_subject',
+				'var' =>  $template.'_subject',
 				'value' => $subject
 			);
 			Database::pexecute($ins_stmt, $ins_data);
@@ -277,21 +286,21 @@ if ($action == '') {
 			$ins_data = array(
 				'adminid' => $userinfo['adminid'],
 				'lang' => $language,
-				'var' => $template . '_mailbody',
+				'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
-			));
+			$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
-		$template = \Froxlor\Validate\Validate::validate($_POST['template'], 'template');
-		$filecontent = \Froxlor\Validate\Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
+
+	} elseif(isset($_POST['filesend'])
+		&& $_POST['filesend'] == 'filesend'
+	) {
+		//file templates
+		$template = validate($_POST['template'], 'template');
+		$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 
 		$ins_stmt = Database::prepare("
 			INSERT INTO `" . TABLE_PANEL_TEMPLATES . "` SET
@@ -299,7 +308,8 @@ if ($action == '') {
 				`language` = '',
 				`templategroup` = 'files',
 				`varname` = :var,
-				`value` = :value");
+				`value` = :value"
+		);
 
 		$ins_data = array(
 			'adminid' => $userinfo['adminid'],
@@ -308,14 +318,12 @@ if ($action == '') {
 		);
 		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'])) {
+		$log->logAction(ADM_ACTION, LOG_INFO, "added template '" . $template . "'");
+		redirectTo($filename, array('page' => $page, 's' => $s));
 
-		// email templates
+	} elseif(!isset($_GET['files'])) {
+
+		//email templates
 		$add = false;
 		$language_options = '';
 		$template_options = '';
@@ -325,11 +333,9 @@ if ($action == '') {
 			$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
-			));
+				AND `templategroup` = 'mails' AND `varname` LIKE '%_subject'"
+			);
+			Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'lang' => $language_name));
 
 			while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 				$templates[] = str_replace('_subject', '', $row['varname']);
@@ -337,32 +343,33 @@ if ($action == '') {
 
 			if (count(array_diff($available_templates, $templates)) > 0) {
 				$add = true;
-				$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $userinfo['language'], true, true);
+				$language_options.= 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";
+					$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n";
 				}
 			}
 		}
 
 		if ($add) {
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_add_1") . "\";");
+			eval("echo \"" . getTemplate("templates/templates_add_1") . "\";");
 		} else {
-			\Froxlor\UI\Response::standard_error('alltemplatesdefined');
+			standard_error('alltemplatesdefined');
 		}
+
 	} else {
-		// filetemplates
+		//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']
-		));
+			WHERE `adminid` = :adminid AND `templategroup`='files'"
+		);
+		Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid']));
 
 		if (Database::num_rows() == count($file_templates)) {
-			\Froxlor\UI\Response::standard_error('alltemplatesdefined');
+			standard_error('alltemplatesdefined');
+
 		} else {
 
 			$templatesdefined = array();
@@ -373,39 +380,44 @@ if ($action == '') {
 			}
 
 			foreach (array_diff($file_templates, $templatesdefined) as $template) {
-				$free_templates .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, '', true);
+				$free_templates.= 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);
+			$filetemplate_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_add.php';
+			$filetemplate_add_form = htmlform::genHTMLForm($filetemplate_add_data);
 
 			$title = $filetemplate_add_data['filetemplate_add']['title'];
 			$image = $filetemplate_add_data['filetemplate_add']['image'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/filetemplates_add") . "\";");
+			eval("echo \"" . 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
-	));
+		WHERE `adminid` = :adminid AND `id` = :subjectid"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'subjectid' => $subjectid));
 	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 	if ($result['varname'] != '') {
 
-		if (isset($_POST['send']) && $_POST['send'] == 'send') {
-			$subject = \Froxlor\Validate\Validate::validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
-			$mailbody = \Froxlor\Validate\Validate::validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
+			$subject = validate($_POST['subject'], 'subject', '/^[^\r\n\0]+$/', 'nosubjectcreate');
+			$mailbody = validate($_POST['mailbody'], 'mailbody', '/^[^\0]+$/', 'nomailbodycreate');
 
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
 					`value` = :value
-				WHERE `adminid` = :adminid AND `id` = :id");
+				WHERE `adminid` = :adminid AND `id` = :id"
+			);
 			// subject
 			Database::pexecute($upd_stmt, array(
 				'value' => $subject,
@@ -419,85 +431,85 @@ if ($action == '') {
 				'id' => $mailbodyid
 			));
 
-			$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				'page' => $page,
-				's' => $s
-			));
+			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $result['varname'] . "'");
+			redirectTo($filename, array('page' => $page, 's' => $s));
+
 		} else {
 
-			$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+			$result = htmlentities_array($result);
 			$template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])];
 			$subject = $result['value'];
 			$result_stmt = Database::prepare("
 				SELECT `language`, `varname`, `value`
 				FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `id` = :id");
-			Database::pexecute($result_stmt, array(
-				'id' => $mailbodyid
-			));
+				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);
+			$result = htmlentities_array($result);
 			$mailbody = $result['value'];
 
-			$template_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_edit.php';
-			$template_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($template_edit_data);
+			$template_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_edit.php';
+			$template_edit_form = htmlform::genHTMLForm($template_edit_data);
 
 			$title = $template_edit_data['template_edit']['title'];
 			$image = $template_edit_data['template_edit']['image'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/templates_edit") . "\";");
+			eval("echo \"" . 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
-	));
+		WHERE `adminid` = :adminid AND `id` = :id"
+	);
+	Database::pexecute($result_stmt, array('adminid' => $userinfo['adminid'], 'id' => $id));
 
-	if (Database::num_rows() > 0) {
+	if(Database::num_rows() > 0) {
 
 		$row = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
-		// filetemplates
-		if (isset($_POST['filesend']) && $_POST['filesend'] == 'filesend') {
-			$filecontent = \Froxlor\Validate\Validate::validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
+		//filetemplates
+		if (isset($_POST['filesend'])
+			&& $_POST['filesend'] == 'filesend'
+		) {
+			$filecontent = validate($_POST['filecontent'], 'filecontent', '/^[^\0]+$/', 'filecontentnotset');
 			$upd_stmt = Database::prepare("
 				UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET
 					`value` = :value
-				WHERE `adminid` = :adminid AND `id` = :id");
+				WHERE `adminid` = :adminid AND `id` = :id"
+			);
 			Database::pexecute($upd_stmt, array(
 				'value' => $filecontent,
 				'adminid' => $userinfo['adminid'],
 				'id' => $id
 			));
 
-			$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);
+			$log->logAction(ADM_ACTION, LOG_INFO, "edited template '" . $row['varname'] . "'");
+			redirectTo($filename, array('page' => $page, 's' => $s));
 
-			$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);
+		} else {
+			$row = htmlentities_array($row);
+
+			$filetemplate_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
+			$filetemplate_edit_form = htmlform::genHTMLForm($filetemplate_edit_data);
 
 			$title = $filetemplate_edit_data['filetemplate_edit']['title'];
 			$image = $filetemplate_edit_data['filetemplate_edit']['image'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("templates/filetemplates_edit") . "\";");
+			eval("echo \"" . getTemplate("templates/filetemplates_edit") . "\";");
 		}
+
 	} else {
-		\Froxlor\UI\Response::standard_error('templatenotfound');
+		standard_error('templatenotfound');
 	}
 }

admin_tickets.php

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

admin_traffic.php

@@ -15,15 +15,23 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-use Froxlor\Settings;
+if ($action == 'logout') {
+	$logout_stmt = Database::prepare("
+		DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+		WHERE `userid` = :adminid
+		AND `adminsession` = '1'"
+	);
+	Database::pexecute($logout_stmt, array('adminid' => $userinfo['adminid']));
+	redirectTo('index.php');
+}
 
 if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-} elseif (isset($_GET['id'])) {
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
@@ -40,52 +48,52 @@ $months = array(
 	'9' => 'sep',
 	'10' => 'oct',
 	'11' => 'nov',
-	'12' => 'dec'
+	'12' => 'dec',
 );
 
 if ($page == 'overview' || $page == 'customers') {
 
 	$customerview = 1;
 	$stats_tables = '';
-	$minyear_stmt = Database::query("SELECT `year` FROM `" . TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
+	$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) {
+	if (!isset($minyear['year']) || $minyear['year'] == 0) {
 		$maxyears = 0;
 	} else {
 		$maxyears = date("Y") - $minyear['year'];
 	}
 
-	for ($years = 0; $years <= $maxyears; $years ++) {
+	for ($years = 0; $years<=$maxyears; $years++) {
 
-		$overview['year'] = date("Y") - $years;
+		$overview['year'] = date("Y")-$years;
 		$overview['type'] = $lng['traffic']['customer'];
 		$domain_list = '';
 		$totals = array(
-			'jan' => 0,
-			'feb' => 0,
-			'mar' => 0,
-			'apr' => 0,
-			'may' => 0,
-			'jun' => 0,
-			'jul' => 0,
-			'aug' => 0,
-			'sep' => 0,
-			'oct' => 0,
-			'nov' => 0,
-			'dec' => 0
+				'jan' => 0,
+				'feb' => 0,
+				'mar' => 0,
+				'apr' => 0,
+				'may' => 0,
+				'jun' => 0,
+				'jul' => 0,
+				'aug' => 0,
+				'sep' => 0,
+				'oct' => 0,
+				'nov' => 0,
+				'dec' => 0,
 		);
 
 		$customer_name_list_stmt = Database::prepare("
 			SELECT `customerid`,`company`,`name`,`firstname`
 			FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `deactivated`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :id") . "
-			ORDER BY name");
-		Database::pexecute($customer_name_list_stmt, array(
-			'id' => $userinfo['adminid']
-		));
+			WHERE `deactivated`='0'" .
+			($userinfo['customers_see_all'] ? '' : " AND `adminid` = :id") . "
+			ORDER BY name"
+		);
+		Database::pexecute($customer_name_list_stmt, array('id' => $userinfo['adminid']));
 
-		while ($customer_name = $customer_name_list_stmt->fetch(PDO::FETCH_ASSOC)) {
+		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']),
@@ -101,35 +109,33 @@ if ($page == 'overview' || $page == 'customers') {
 				'sep' => '-',
 				'oct' => '-',
 				'nov' => '-',
-				'dec' => '-'
+				'dec' => '-',
 			);
 
 			$traffic_list_stmt = Database::prepare("
 				SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic
 				FROM `" . TABLE_PANEL_TRAFFIC . "`
 				WHERE year = :year AND `customerid` = :id
-				GROUP BY month ORDER BY month");
-			Database::pexecute($traffic_list_stmt, array(
-				'year' => (date("Y") - $years),
-				'id' => $customer_name['customerid']
-			));
+				GROUP BY month ORDER BY month"
+			);
+			Database::pexecute($traffic_list_stmt, array('year' => (date("Y")-$years), 'id' => $customer_name['customerid']));
 
 			while ($traffic_month = $traffic_list_stmt->fetch(PDO::FETCH_ASSOC)) {
-				$virtual_host[$months[(int) $traffic_month['month']]] = \Froxlor\PhpHelper::sizeReadable($traffic_month['traffic'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-				$totals[$months[(int) $traffic_month['month']]] += $traffic_month['traffic'];
+				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+				$totals[$months[(int)$traffic_month['month']]] += $traffic_month['traffic'];
 			}
-			eval("\$domain_list .= sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table_row") . "\");");
+			eval("\$domain_list .= sprintf(\"%s\", \"" . 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 ? '-' : \Froxlor\PhpHelper::sizeReadable($bytes, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'));
+			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s'));
 		}
 		$customerview = 0;
-		eval("\$total_list = sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table_row") . "\");");
-		eval("\$stats_tables .= sprintf(\"%s\", \"" . \Froxlor\UI\Template::getTemplate("traffic/index_table") . "\");");
+		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
+		eval("\$stats_tables .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table") . "\");");
 	}
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("traffic/index") . "\";");
+	eval("echo \"" . getTemplate("traffic/index") . "\";");
 }

admin_updates.php

@@ -14,25 +14,27 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'admin');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
+	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
 
 	/**
 	 * this is a dirty hack but syscp 1.4.2.1 does not
 	 * have any version/dbversion in the database (don't know why)
 	 * so we have to set them both to run a correct upgrade
 	 */
-	if (! \Froxlor\Froxlor::isFroxlor()) {
-		if (Settings::Get('panel.version') == null || Settings::Get('panel.version') == '') {
+	if (!isFroxlor()) {
+		if (Settings::Get('panel.version') == null
+			|| Settings::Get('panel.version') == ''
+		) {
 			Settings::Set('panel.version', '1.4.2.1');
 		}
-		if (Settings::Get('system.dbversion') == null || Settings::Get('system.dbversion') == '') {
+		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
@@ -40,33 +42,40 @@ if ($page == 'overview') {
 			 * -> bug #54
 			 */
 			$result_stmt = Database::query("
-				SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
+				SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'"
+			);
 			$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 			if (isset($result['value'])) {
-				Settings::Set('system.dbversion', (int) $result['value'], false);
+				Settings::Set('system.dbversion', (int)$result['value'], false);
 			} else {
 				Settings::Set('system.dbversion', 0, false);
 			}
 		}
 	}
 
-	if (\Froxlor\Froxlor::hasDbUpdates() || \Froxlor\Froxlor::hasUpdates()) {
+	if (hasDbUpdates($dbversion) || hasUpdates($version)) {
 		$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 \"" . \Froxlor\UI\Template::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 \"" . getTemplate('update/update_start') . "\";");
 
-				include_once \Froxlor\Froxlor::getInstallDir() . 'install/updatesql.php';
+				include_once './install/updatesql.php';
 
 				$redirect_url = 'admin_index.php?s=' . $s;
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/update_end') . "\";");
+				eval("echo \"" . getTemplate('update/update_end') . "\";");
 
-				\Froxlor\User::updateCounters();
-				\Froxlor\System\Cronjob::inserttask('1');
-				@chmod(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php', 0440);
+				updateCounters();
+				inserttask('1');
+				@chmod('./lib/userdata.inc.php', 0440);
 
 				$successful_update = true;
 			} else {
@@ -74,27 +83,27 @@ if ($page == 'overview') {
 			}
 		}
 
-		if (! $successful_update) {
+		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";
+			    $current_db_version = "0";
 			}
 			$new_version = $version;
 			$new_db_version = $dbversion;
 
 			$ui_text = $lng['update']['update_information']['part_a'];
 			if ($version != $current_version) {
-				$ui_text = str_replace('%curversion', $current_version, $ui_text);
-				$ui_text = str_replace('%newversion', $new_version, $ui_text);
+			     $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);
+			    // 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 \Froxlor\Froxlor::getInstallDir() . '/install/updates/preconfig.php';
+			include_once './install/updates/preconfig.php';
 			$preconfig = getPreConfig($current_version, $current_db_version);
 			if ($preconfig != '') {
 				$update_information .= '<br />' . $preconfig . $message;
@@ -102,11 +111,11 @@ if ($page == 'overview') {
 
 			$update_information .= $lng['update']['update_information']['part_b'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/index') . "\";");
+			eval("echo \"" . getTemplate('update/index') . "\";");
 		}
 	} else {
 		$success_message = $lng['update']['noupdatesavail'];
 		$redirect_url = 'admin_index.php?s=' . $s;
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/noupdatesavail') . "\";");
+		eval("echo \"" . getTemplate('update/noupdatesavail') . "\";");
 	}
 }

api.php

@@ -1,80 +0,0 @@
-<?php
-require __DIR__ . '/vendor/autoload.php';
-
-require \Froxlor\Froxlor::getInstallDir() . '/lib/tables.inc.php';
-
-// check whether API interface is enabled after all
-if (\Froxlor\Settings::Get('api.enabled') != 1) {
-	// not enabled
-	header("Status: 404 Not found", 404);
-	header($_SERVER["SERVER_PROTOCOL"] . " 404 Not found", 404);
-	exit();
-}
-
-// we're talking json here
-header("Content-Type:application/json");
-
-// get our request
-$request = @file_get_contents('php://input');
-
-// check if present
-if (empty($request)) {
-	json_response(400, "Invalid request");
-}
-
-// decode json request
-$decoded_request = json_decode($request, true);
-
-// is it valid?
-if (is_null($decoded_request)) {
-	json_response(400, "Invalid JSON");
-}
-
-// 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

@@ -1,235 +0,0 @@
-<?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 (accessable) 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

@@ -1,293 +0,0 @@
-<?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="phpdox" value="${basedir}/vendor/bin/phpdox" />
-	<property name="phploc" value="${basedir}/vendor/bin/phploc" />
-	<property name="phpmd" value="${basedir}/vendor/bin/phpmd" />
-	<property name="phpunit" value="${basedir}/vendor/bin/phpunit" />
-
-	<target name="full-build"
-		depends="prepare,composer,static-analysis,phpunit,phpdox,-check-failure"
-		description="Performs static analysis, runs the tests, and generates project documentation" />
-
-	<target name="full-build-parallel"
-		depends="prepare,composer,static-analysis-parallel,phpunit,phpdox,-check-failure"
-		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"
-		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" />
-		<delete dir="${basedir}/build/phpdox" />
-		<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" />
-		<mkdir dir="${basedir}/build/phpdox" />
-
-		<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"
-			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="phpdox" unless="phpdox.done"
-		depends="phploc-ci,phpcs-ci,phpcompat-ci,phpmd-ci"
-		description="Generate project documentation using phpDox">
-		<exec executable="${phpdox}" dir="${basedir}/build"
-			taskname="phpdox">
-			<arg value="--file" />
-			<arg path="${basedir}/phpdox.xml" />
-		</exec>
-
-		<property name="phpdox.done" value="true" />
-	</target>
-
-	<target name="-check-failure">
-		<fail message="PHPUnit did not finish successfully">
-			<condition>
-				<not>
-					<equals arg1="${result.phpunit}" arg2="0" />
-				</not>
-			</condition>
-		</fail>
-	</target>
-</project>

composer.json

@@ -1,80 +0,0 @@
-{
-	"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://chat.freenode.net/froxlor",
-		"source": "https://github.com/Froxlor/Froxlor",
-		"docs": "https://github.com/Froxlor/Froxlor/wiki"
-	},
-	"require": {
-		"php": ">=7.0",
-		"ext-session": "*",
-		"ext-ctype": "*",
-		"ext-pdo": "*",
-		"ext-pdo_mysql": "*",
-		"ext-simplexml": "*",
-		"ext-xml": "*",
-		"ext-filter": "*",
-		"ext-posix": "*",
-		"ext-mbstring": "*",
-		"ext-curl": "*",
-		"ext-json": "*",
-		"ext-openssl": "*",
-		"phpmailer/phpmailer": "~6.0",
-		"monolog/monolog": "^1.24",
-		"robthree/twofactorauth": "^1.6",
-		"froxlor/idna-convert-legacy": "^2.1"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "8.4.1",
-		"php": ">=7.3",
-		"ext-pcntl": "*",
-		"phpcompatibility/php-compatibility": "*",
-		"squizlabs/php_codesniffer": "*",
-		"pdepend/pdepend": "^2.5",
-		"sebastian/phpcpd": "^4.1",
-		"theseer/phpdox": "^0.12.0",
-		"phploc/phploc": "^5.0",
-		"phpmd/phpmd": "^2.6"
-	},
-	"suggest": {
-		"ext-bcmath": "*",
-		"ext-zip": "*",
-		"ext-apcu": "*",
-		"ext-readline": "*"
-	},
-	"autoload": {
-		"psr-4": {
-			"Froxlor\\": [
-				"lib/Froxlor"
-			]
-		}
-	},
-	"scripts": {
-		"post-install-cmd": "if [ -f ./vendor/bin/phpcs ]; then \"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility ; fi",
-		"post-update-cmd" : "if [ -f ./vendor/bin/phpcs ]; then \"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility ; fi"
-	}
-}

customer_extras.php

@@ -19,14 +19,9 @@
 define('AREA', 'customer');
 require './lib/init.php';
 
-use Froxlor\Settings;
-use Froxlor\Api\Commands\DirOptions as DirOptions;
-use Froxlor\Api\Commands\DirProtections as DirProtections;
-use Froxlor\Api\Commands\CustomerBackups as CustomerBackups;
-
 // redirect if this customer page is hidden via settings
-if (Settings::IsInList('panel.customer_hide_options', 'extras')) {
-	\Froxlor\UI\Response::redirectTo('customer_index.php');
+if (Settings::IsInList('panel.customer_hide_options','extras')) {
+	redirectTo('customer_index.php');
 }
 
 if (isset($_POST['id'])) {
@@ -36,70 +31,74 @@ if (isset($_POST['id'])) {
 }
 
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras");
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/extras") . "\";");
+	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras");
+	eval("echo \"" . getTemplate("extras/extras") . "\";");
 } elseif ($page == 'htpasswds') {
 
 	// redirect if this customer sub-page is hidden via settings
-	if (Settings::IsInList('panel.customer_hide_options', 'extras.directoryprotection')) {
-		\Froxlor\UI\Response::redirectTo('customer_index.php');
+	if (Settings::IsInList('panel.customer_hide_options','extras.directoryprotection')) {
+		redirectTo('customer_index.php');
 	}
 
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
+		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds");
 		$fields = array(
 			'username' => $lng['login']['username'],
 			'path' => $lng['panel']['path']
 		);
-		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'];
-
+		$paging = new paging($userinfo, TABLE_PANEL_HTPASSWDS, $fields);
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		Database::pexecute($result_stmt, array(
+			"customerid" => $userinfo['customerid']
+		));
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$i = 0;
 		$count = 0;
 		$htpasswds = '';
 
-		foreach ($result['list'] as $row) {
-			if (strpos($row['path'], $userinfo['documentroot']) === 0) {
-				$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+				}
+				$row['path'] = makeCorrectDir($row['path']);
+				$row = htmlentities_array($row);
+				eval("\$htpasswds.=\"" . getTemplate("extras/htpasswds_htpasswd") . "\";");
+				$count ++;
 			}
-			$row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']);
-			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-			eval("\$htpasswds.=\"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_htpasswd") . "\";");
-			$count ++;
+
+			$i ++;
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds") . "\";");
+		eval("echo \"" . 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'];
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			WHERE `customerid`= :customerid
+			AND `id`= :id");
+		Database::pexecute($result_stmt, array(
+			"customerid" => $userinfo['customerid'],
+			"id" => $id
+		));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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(
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "`
+					WHERE `customerid`= :customerid
+					AND `id`= :id");
+				Database::pexecute($stmt, array(
+					"customerid" => $userinfo['customerid'],
+					"id" => $id
+				));
+
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
+				inserttask('1');
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
@@ -108,7 +107,7 @@ if ($page == 'overview') {
 					$result['path'] = str_replace($userinfo['documentroot'], "/", $result['path']);
 				}
 
-				\Froxlor\UI\HTML::askYesNo('extras_reallydelete', $filename, array(
+				ask_yesno('extras_reallydelete', $filename, array(
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
@@ -117,73 +116,171 @@ if ($page == 'overview') {
 		}
 	} 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());
+			$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_stmt = Database::prepare("SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "`
+				WHERE `username`= :username
+				AND `path`= :path
+				AND `customerid`= :customerid");
+			$params = array(
+				"username" => $username,
+				"path" => $path,
+				"customerid" => $userinfo['customerid']
+			);
+			Database::pexecute($username_path_check_stmt, $params);
+			$username_path_check = $username_path_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+			if (CRYPT_STD_DES == 1) {
+				$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
+				$password = crypt($_POST['directory_password'], $saltfordescrypt);
+			} else {
+				$password = crypt($_POST['directory_password']);
+			}
+
+			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');
+			} elseif ($_POST['directory_password'] == $username) {
+				standard_error('passwordshouldnotbeusername');
+			} else {
+				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` SET
+					`customerid` = :customerid,
+					`username` = :username,
+					`password` = :password,
+					`path` = :path,
+					`authname` = :authname");
+				$params = array(
+					"customerid" => $userinfo['customerid'],
+					"username" => $username,
+					"password" => $password,
+					"path" => $path,
+					"authname" => $authname
+				);
+				Database::pexecute($stmt, $params);
+				$log->logAction(USR_ACTION, LOG_INFO, "added htpasswd for '" . $username . " (" . $path . ")'");
+				inserttask('1');
+				redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
 			}
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				'page' => $page,
-				's' => $s
-			));
 		} else {
-			$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
 
 			$htpasswd_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_add.php';
-			$htpasswd_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($htpasswd_add_data);
+			$htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data);
 
 			$title = $htpasswd_add_data['htpasswd_add']['title'];
 			$image = $htpasswd_add_data['htpasswd_add']['image'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_add") . "\";");
+			eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";");
 		}
 	} 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'];
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "`
+			WHERE `customerid`= :customerid
+			AND `id`= :id");
+		Database::pexecute($result_stmt, array(
+			"customerid" => $userinfo['customerid'],
+			"id" => $id
+		));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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());
+				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);
+				} else {
+					$password = crypt($_POST['directory_password']);
+				}
+
+				if ($_POST['directory_password'] == $result['username']) {
+					standard_error('passwordshouldnotbeusername');
+				}
+
+				$params = array(
+					"customerid" => $userinfo['customerid'],
+					"id" => $id
+				);
+
+				$pwd_sql = '';
+				if ($_POST['directory_password'] != '') {
+					$pwd_sql = "`password`= :password ";
+					$params["password"] = $password;
+				}
+
+				$auth_sql = '';
+				if ($authname != $result['authname']) {
+					$auth_sql = "`authname`= :authname ";
+					$params["authname"] = $authname;
+				}
+
+				if ($pwd_sql != '' || $auth_sql != '') {
+					if ($pwd_sql != '' && $auth_sql != '') {
+						$pwd_sql .= ', ';
+					}
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
+						SET " . $pwd_sql . $auth_sql . "
+						WHERE `customerid`= :customerid
+						AND `id`= :id");
+					Database::pexecute($stmt, $params);
+					$log->logAction(USR_ACTION, LOG_INFO, "edited htpasswd for '" . $result['username'] . " (" . $result['path'] . ")'");
+					inserttask('1');
+					redirectTo($filename, array(
+						'page' => $page,
+						's' => $s
+					));
 				}
-				\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 = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = htmlentities_array($result);
 
 				$htpasswd_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
-				$htpasswd_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($htpasswd_edit_data);
+				$htpasswd_edit_form = htmlform::genHTMLForm($htpasswd_edit_data);
 
 				$title = $htpasswd_edit_data['htpasswd_edit']['title'];
 				$image = $htpasswd_edit_data['htpasswd_edit']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_edit") . "\";");
+				eval("echo \"" . getTemplate("extras/htpasswds_edit") . "\";");
 			}
 		}
 	}
 } 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 (Settings::IsInList('panel.customer_hide_options','extras.pathoptions')) {
+		redirectTo('customer_index.php');
 	}
 
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
+		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess");
 		$fields = array(
 			'path' => $lng['panel']['path'],
 			'options_indexes' => $lng['extras']['view_directory'],
@@ -192,66 +289,85 @@ if ($page == 'overview') {
 			'error500path' => $lng['extras']['error500path'],
 			'options_cgi' => $lng['extras']['execute_perl']
 		);
-		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'];
-
+		$paging = new paging($userinfo, TABLE_PANEL_HTACCESS, $fields);
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		Database::pexecute($result_stmt, array(
+			"customerid" => $userinfo['customerid']
+		));
+		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$i = 0;
 		$count = 0;
 		$htaccess = '';
 
-		$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
+		$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 
-		foreach ($result['list'] as $row) {
-			if (strpos($row['path'], $userinfo['documentroot']) === 0) {
-				$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['path'], $userinfo['documentroot']) === 0) {
+					$row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']);
+				}
+				$row['path'] = makeCorrectDir($row['path']);
+				$row['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 ++;
 			}
-			$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 ++;
+
+			$i ++;
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess") . "\";");
+		eval("echo \"" . 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'];
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id");
+		Database::pexecute($result_stmt, array(
+			"customerid" => $userinfo['customerid'],
+			"id" => $id
+		));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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());
+				// do we have to remove the symlink and folder in suexecpath?
+				if ((int) Settings::Get('perl.suexecworkaround') == 1) {
+					$loginname = getCustomerDetail($result['customerid'], 'loginname');
+					$suexecpath = makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($result['path']) . '/');
+					$perlsymlink = makeCorrectFile($result['path'] . '/cgi-bin');
+					// remove symlink
+					if (file_exists($perlsymlink)) {
+						safe_exec('rm -f ' . escapeshellarg($perlsymlink));
+						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround symlink '" . $perlsymlink . "'");
+					}
+					// remove folder in suexec-path
+					if (file_exists($suexecpath)) {
+						safe_exec('rm -rf ' . escapeshellarg($suexecpath));
+						$log->logAction(USR_ACTION, LOG_DEBUG, "deleted suexecworkaround path '" . $suexecpath . "'");
+					}
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_HTACCESS . "`
+					WHERE `customerid`= :customerid
+					AND `id`= :id");
+				Database::pexecute($stmt, array(
+					"customerid" => $userinfo['customerid'],
+					"id" => $id
+				));
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
+				inserttask('1');
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
 			} else {
-				\Froxlor\UI\HTML::askYesNo('extras_reallydelete_pathoptions', $filename, array(
+				ask_yesno('extras_reallydelete_pathoptions', $filename, array(
 					'id' => $id,
 					'page' => $page,
 					'action' => $action
@@ -260,45 +376,137 @@ if ($page == 'overview') {
 		}
 	} 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
+			$path = makeCorrectDir(validate($_POST['path'], 'path'));
+			$userpath = $path;
+			$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+			$path_dupe_check_stmt = Database::prepare("SELECT `id`, `path` FROM `" . TABLE_PANEL_HTACCESS . "`
+				WHERE `path`= :path
+				AND `customerid`= :customerid");
+			Database::pexecute($path_dupe_check_stmt, array(
+				"path" => $path,
+				"customerid" => $userinfo['customerid']
 			));
+			$path_dupe_check = $path_dupe_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+			if (! $_POST['path']) {
+				standard_error('invalidpath');
+			}
+
+			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 {
+				$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_HTACCESS . '` SET
+					`customerid` = :customerid,
+					`path` = :path,
+					`options_indexes` = :options_indexes,
+					`error404path` = :error404path,
+					`error403path` = :error403path,
+					`error500path` = :error500path,
+					`options_cgi` = :options_cgi');
+				$params = array(
+					"customerid" => $userinfo['customerid'],
+					"path" => $path,
+					"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
+					"error403path" => $error403path,
+					"error404path" => $error404path,
+					"error500path" => $error500path,
+					"options_cgi" => $options_cgi
+				);
+				Database::pexecute($stmt, $params);
+
+				$log->logAction(USR_ACTION, LOG_INFO, "added htaccess for '" . $path . "'");
+				inserttask('1');
+				redirectTo($filename, array(
+					'page' => $page,
+					's' => $s
+				));
+			}
 		} else {
-			$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
-			$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
+			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 
 			$htaccess_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_add.php';
-			$htaccess_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($htaccess_add_data);
+			$htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data);
 
 			$title = $htaccess_add_data['htaccess_add']['title'];
 			$image = $htaccess_add_data['htaccess_add']['image'];
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_add") . "\";");
+			eval("echo \"" . getTemplate("extras/htaccess_add") . "\";");
 		}
 	} 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'];
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id");
+		Database::pexecute($result_stmt, array(
+			"customerid" => $userinfo['customerid'],
+			"id" => $id
+		));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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());
+				$option_indexes = intval($_POST['options_indexes']);
+				$options_cgi = isset($_POST['options_cgi']) ? intval($_POST['options_cgi']) : 0;
+
+				if ($option_indexes != '1') {
+					$option_indexes = '0';
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
+
+				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');
+					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTACCESS . "`
+						SET `options_indexes` = :options_indexes,
+						`error404path` = :error404path,
+						`error403path` = :error403path,
+						`error500path` = :error500path,
+						`options_cgi` = :options_cgi
+						WHERE `customerid` = :customerid
+						AND `id` = :id");
+					$params = array(
+						"customerid" => $userinfo['customerid'],
+						"options_indexes" => $_POST['options_indexes'] == '1' ? '1' : '0',
+						"error403path" => $error403path,
+						"error404path" => $error404path,
+						"error500path" => $error500path,
+						"options_cgi" => $options_cgi,
+						"id" => $id
+					);
+					Database::pexecute($stmt, $params);
+					$log->logAction(USR_ACTION, LOG_INFO, "edited htaccess for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'");
+				}
+
+				redirectTo($filename, array(
 					'page' => $page,
 					's' => $s
 				));
@@ -310,92 +518,128 @@ if ($page == 'overview') {
 				$result['error404path'] = $result['error404path'];
 				$result['error403path'] = $result['error403path'];
 				$result['error500path'] = $result['error500path'];
-				$cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']);
+				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 				/*
-				 * $options_indexes = \Froxlor\UI\HTML::makeyesno('options_indexes', '1', '0', $result['options_indexes']);
-				 * $options_cgi = \Froxlor\UI\HTML::makeyesno('options_cgi', '1', '0', $result['options_cgi']);
+				 * $options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
+				 * $options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
 				 */
-				$result = \Froxlor\PhpHelper::htmlentitiesArray($result);
+				$result = htmlentities_array($result);
 
 				$htaccess_edit_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.htaccess_edit.php';
-				$htaccess_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($htaccess_edit_data);
+				$htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data);
 
 				$title = $htaccess_edit_data['htaccess_edit']['title'];
 				$image = $htaccess_edit_data['htaccess_edit']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_edit") . "\";");
+				eval("echo \"" . 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::IsInList('panel.customer_hide_options','extras.backup')) {
+		redirectTo('customer_index.php');
 	}
 
-	if (Settings::Get('system.backupenabled') == 1) {
+	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());
+			$log->logAction(USR_ACTION, LOG_NOTICE, "customer_extras::backup - aborted scheduled backupjob");
+			$entry = isset($_POST['backup_job_entry']) ? (int)$_POST['backup_job_entry'] : 0;
+			if ($entry > 0) {
+				$del_stmt = Database::prepare("DELETE FROM `".TABLE_PANEL_TASKS."` WHERE `id` = :tid");
+				Database::pexecute($del_stmt, array('tid' => $entry));
+				standard_success('backupaborted');
 			}
-			\Froxlor\UI\Response::standard_success('backupaborted');
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				'page' => $page,
-				'action' => '',
-				's' => $s
-			));
+			redirectTo($filename, array('page' => $page, 'action' => '', 's' => $s));
 		}
 		if ($action == '') {
-			$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::backup");
+			$log->logAction(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'];
+			$sel_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_TASKS."` WHERE `type` = '20'");
+			Database::pexecute($sel_stmt);
 			$existing_backupJob = null;
-			if ($result['count'] > 0) {
-				$existing_backupJob = array_shift($result['list']);
+			while ($entry = $sel_stmt->fetch())
+			{
+				$data = json_decode($entry['data'], true);
+				if ($data['customerid'] == $userinfo['customerid']) {
+					$existing_backupJob = $entry;
+					break;
+				}
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					CustomerBackups::getLocal($userinfo, $_POST)->add();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+
+				if (! $_POST['path']) {
+					standard_error('invalidpath');
 				}
-				\Froxlor\UI\Response::standard_success('backupscheduled');
+
+				$path = makeCorrectDir(validate($_POST['path'], 'path'));
+				$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+
+				// path cannot be the customers docroot
+				if ($path == makeCorrectDir($userinfo['documentroot'])) {
+					standard_error('backupfoldercannotbedocroot');
+				}
+
+				$backup_dbs = isset($_POST['backup_dbs']) ? intval($_POST['backup_dbs']) : 0;
+				$backup_mail = isset($_POST['backup_mail']) ? intval($_POST['backup_mail']) : 0;
+				$backup_web = isset($_POST['backup_web']) ? intval($_POST['backup_web']) : 0;
+
+				if ($backup_dbs != '1') {
+					$backup_dbs = '0';
+				}
+
+				if ($backup_mail != '1') {
+					$backup_mail = '0';
+				}
+
+				if ($backup_web != '1') {
+					$backup_web = '0';
+				}
+
+				$task_data = array(
+					'customerid' => $userinfo['customerid'],
+					'uid' => $userinfo['guid'],
+					'gid' => $userinfo['guid'],
+					'loginname' => $userinfo['loginname'],
+					'destdir' => $path,
+					'backup_dbs' => $backup_dbs,
+					'backup_mail' => $backup_mail,
+					'backup_web' => $backup_web
+				);
+				// schedule backup job
+				inserttask('20', $task_data);
+
+				standard_success('backupscheduled');
 			} else {
 
-				if (! empty($existing_backupJob)) {
+				if (!empty($existing_backupJob)) {
 					$action = "abort";
-					$row = $existing_backupJob['data'];
-
-					$row['path'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['destdir']));
+					$row = json_decode($entry['data'], true);
+					$row['path'] = makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['destdir']));
 					$row['backup_web'] = ($row['backup_web'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
 					$row['backup_mail'] = ($row['backup_mail'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
 					$row['backup_dbs'] = ($row['backup_dbs'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no'];
 				}
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']);
+				$pathSelect = 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);
+				$backup_form = htmlform::genHTMLForm($backup_data);
 				$title = $backup_data['backup']['title'];
 				$image = $backup_data['backup']['image'];
 
-				if (! empty($existing_backupJob)) {
+				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("\$backup_form = \"" . getTemplate("extras/backup_listexisting") . "\";");
 				}
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/backup") . "\";");
+				eval("echo \"" . getTemplate("extras/backup") . "\";");
 			}
 		}
-	} else {
-		\Froxlor\UI\Response::standard_error('backupfunctionnotenabled');
+	}
+	else
+	{
+		standard_error('backupfunctionnotenabled');
 	}
 }

customer_ftp.php

@@ -16,16 +16,13 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'customer');
 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');
+if (Settings::IsInList('panel.customer_hide_options','ftp')) {
+	redirectTo('customer_index.php');
 }
 
 $id = 0;
@@ -36,205 +33,462 @@ if (isset($_POST['id'])) {
 }
 
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/ftp') . "\";");
+	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
+	eval("echo \"" . getTemplate('ftp/ftp') . "\";");
 } elseif ($page == 'accounts') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
+		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
 		$fields = array(
 			'username' => $lng['login']['username'],
 			'homedir' => $lng['panel']['path'],
 			'description' => $lng['panel']['ftpdesc']
 		);
-		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();
+		$paging = new paging($userinfo, TABLE_FTP_USERS, $fields);
+
+		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir`, `shell` FROM `" . TABLE_FTP_USERS . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$ftps_count = Database::num_rows();
+		$paging->setEntries($ftps_count);
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$i = 0;
 		$count = 0;
 		$accounts = '';
 
-		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'];
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
+					$row['documentroot'] = str_replace($userinfo['documentroot'], "/", $row['homedir']);
+				} else {
+					$row['documentroot'] = $row['homedir'];
+				}
+
+				$row['documentroot'] = makeCorrectDir($row['documentroot']);
+
+				$row = htmlentities_array($row);
+				eval("\$accounts.=\"" . getTemplate('ftp/accounts_account') . "\";");
+				$count++;
 			}
-			$row['documentroot'] = \Froxlor\FileDir::makeCorrectDir($row['documentroot']);
-			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-			eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_account') . "\";");
-			$count ++;
+
+			$i++;
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts') . "\";");
+		eval("echo \"" . getTemplate('ftp/accounts') . "\";");
 	} elseif ($action == 'delete' && $id != 0) {
-		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'];
+		$result_stmt = Database::prepare("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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());
+				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+					SET `up_count` = `up_count` + :up_count,
+					`up_bytes` = `up_bytes` + :up_bytes,
+					`down_count` = `down_count` + :down_count,
+					`down_bytes` = `down_bytes` + :down_bytes
+					WHERE `username` = :username"
+				);
+				$params = array(
+					"up_count" => $result['up_count'],
+					"up_bytes" => $result['up_bytes'],
+					"down_count" => $result['down_count'],
+					"down_bytes" => $result['down_bytes'],
+					"username" => $userinfo['loginname']
+				);
+				Database::pexecute($stmt, $params);
+
+				$result_stmt = Database::prepare("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "`
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+				$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = :name");
+				Database::pexecute($stmt, array("name" => $result['username']));
+
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_USERS . "`
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+
+				$stmt = Database::prepare("
+					UPDATE `" . TABLE_FTP_GROUPS . "` SET
+					`members` = REPLACE(`members`, :username,'')
+					WHERE `customerid` = :customerid
+				");
+				Database::pexecute($stmt, array("username" => ",".$result['username'], "customerid" => $userinfo['customerid']));
+
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
+
+				$resetaccnumber = ($userinfo['ftps_used'] == '1') ? " , `ftp_lastaccountnumber`='0'" : '';
+
+				// refs #293
+				if (isset($_POST['delete_userfiles']) && (int)$_POST['delete_userfiles'] == 1) {
+					inserttask('8', $userinfo['loginname'], $result['homedir']);
+				} else {
+					if (Settings::Get('system.nssextrausers') == 1)
+					{
+						// this is used so that the libnss-extrausers cron is fired
+						inserttask(5);
+					}
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
+
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+					SET `ftps_used` = `ftps_used` - 1 $resetaccnumber
+					WHERE `customerid` = :customerid"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
-				\Froxlor\UI\HTML::askYesNoWithCheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array(
-					'id' => $id,
-					'page' => $page,
-					'action' => $action
-				), $result['username']);
+				ask_yesno_withcheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username']);
 			}
 		} else {
-			\Froxlor\UI\Response::standard_error('ftp_cantdeletemainaccount');
+			standard_error('ftp_cantdeletemainaccount');
 		}
 	} elseif ($action == 'add') {
 		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());
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send') {
+				$description = validate($_POST['ftp_description'], 'description');
+				// @FIXME use a good path-validating regex here (refs #1231)
+				$path = validate($_POST['path'], 'path');
+				$password = validate($_POST['ftp_password'], 'password');
+				$password = validatePassword($password);
+				$shell = "/bin/false";
+				if (Settings::Get('system.allow_customer_shell') == '1') {
+					$shell = isset($_POST['shell']) ? validate($_POST['shell'], 'shell') : '/bin/false';
+				}
+
+				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
+				if ($sendinfomail != 1) {
+					$sendinfomail = 0;
+				}
+
+				if (Settings::Get('customer.ftpatdomain') == '1') {
+					$ftpusername = validate($_POST['ftp_username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
+					if ($ftpusername == '') {
+						standard_error(array('stringisempty', 'username'));
+					}
+					$ftpdomain = $idna_convert->encode(validate($_POST['ftp_domain'], 'domain'));
+					$ftpdomain_check_stmt = Database::prepare("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "`
+						WHERE `domain` = :domain
+						AND `customerid` = :customerid"
+					);
+					Database::pexecute($ftpdomain_check_stmt, array("domain" => $ftpdomain, "customerid" => $userinfo['customerid']));
+					$ftpdomain_check = $ftpdomain_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+					if ($ftpdomain_check['domain'] != $ftpdomain) {
+						standard_error('maindomainnonexist', $domain);
+					}
+					$username = $ftpusername . "@" . $ftpdomain;
+				} else {
+					$username = $userinfo['loginname'] . Settings::Get('customer.ftpprefix') . (intval($userinfo['ftp_lastaccountnumber']) + 1);
+				}
+
+				$username_check_stmt = Database::prepare("SELECT * FROM `" . TABLE_FTP_USERS . "`
+					WHERE `username` = :username"
+				);
+				Database::pexecute($username_check_stmt, array("username" => $username));
+				$username_check = $username_check_stmt->fetch(PDO::FETCH_ASSOC);
+
+				if (!empty($username_check) && $username_check['username'] = $username) {
+					standard_error('usernamealreadyexists', $username);
+				} elseif ($password == '') {
+					standard_error(array('stringisempty', 'mypassword'));
+				} elseif ($path == '') {
+					standard_error('patherror');
+				} elseif ($username == $password) {
+					standard_error('passwordshouldnotbeusername');
+				} else {
+					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+
+					$cryptPassword = makeCryptPassword($password);
+
+					$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "`
+						(`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`, `shell`)
+						VALUES (:customerid, :username, :description, :password, :homedir, 'y', :guid, :guid, :shell)"
+					);
+					$params = array(
+						"customerid" => $userinfo['customerid'],
+						"username" => $username,
+						"description" => $description,
+						"password" => $cryptPassword,
+						"homedir" => $path,
+						"guid" => $userinfo['guid'],
+						"shell" => $shell
+					);
+					Database::pexecute($stmt, $params);
+
+					$result_stmt = Database::prepare("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "`
+						WHERE `name` = :name"
+					);
+					Database::pexecute($result_stmt, array("name" => $userinfo['loginname']));
+
+					while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+						$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "`
+							(`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`)
+							VALUES (:name, 'user', :bytes_in_used, '0', '0', '0', '0', '0')"
+						);
+						Database::pexecute($stmt, array("name" => $username, "bytes_in_used" => $row['bytes_in_used']));
+					}
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_GROUPS . "`
+						SET `members` = CONCAT_WS(',',`members`, :username)
+						WHERE `customerid`= :customerid
+						AND `gid`= :guid"
+					);
+					$params = array(
+						"username" => $username,
+						"customerid" => $userinfo['customerid'],
+						"guid" => $userinfo['guid']
+					);
+					Database::pexecute($stmt, $params);
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+						SET `ftps_used` = `ftps_used` + 1,
+						`ftp_lastaccountnumber` = `ftp_lastaccountnumber` + 1
+						WHERE `customerid` = :customerid"
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+					$log->logAction(USR_ACTION, LOG_INFO, "added ftp-account '" . $username . " (" . $path . ")'");
+					inserttask(5);
+
+					if ($sendinfomail == 1) {
+						$replace_arr = array(
+							'SALUTATION' => getCorrectUserSalutation($userinfo),
+							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
+							'USR_NAME' => $username,
+							'USR_PASS' => $password,
+							'USR_PATH' => makeCorrectDir(str_replace($userinfo['documentroot'], "/", $path))
+						);
+
+						$def_language = $userinfo['def_language'];
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid` = :adminid
+							AND `language` = :lang
+							AND `templategroup`='mails'
+							AND `varname`='new_ftpaccount_by_customer_subject'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['subject']), $replace_arr));
+
+						$def_language = $userinfo['def_language'];
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid` = :adminid
+							AND `language` = :lang
+							AND `templategroup`='mails'
+							AND `varname`='new_ftpaccount_by_customer_mailbody'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_ftpaccount_by_customer']['mailbody']), $replace_arr));
+
+						$_mailerror = false;
+						try {
+							$mail->Subject = $mail_subject;
+							$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));
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
 			} else {
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
+				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], '/');
 
 				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$domainlist = array();
 					$domains = '';
 
 					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `customerid`= :customerid");
-					Database::pexecute($result_domains_stmt, array(
-						"customerid" => $userinfo['customerid']
-					));
+						WHERE `customerid`= :customerid"
+					);
+					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
 
 					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$domainlist[] = $row_domain['domain'];
+						$domainlist[] =  $row_domain['domain'];
 					}
 
 					sort($domainlist);
 
 					if (isset($domainlist[0]) && $domainlist[0] != '') {
 						foreach ($domainlist as $dom) {
-							$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($dom), $dom);
+							$domains .= makeoption($idna_convert->decode($dom), $dom);
 						}
 					}
 				}
 
 				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shells = \Froxlor\UI\HTML::makeoption("/bin/false", "/bin/false", "/bin/false");
+					$shells = makeoption("/bin/false", "/bin/false", "/bin/false");
 					$shells_avail = Settings::Get('system.available_shells');
-					if (! empty($shells_avail)) {
+					if (!empty($shells_avail)) {
 						$shells_avail = explode(",", $shells_avail);
 						$shells_avail = array_map("trim", $shells_avail);
 						foreach ($shells_avail as $_shell) {
-							$shells .= \Froxlor\UI\HTML::makeoption($_shell, $_shell, "/bin/false");
+							$shells .= makeoption($_shell, $_shell, "/bin/false");
 						}
 					}
 				}
 
-				// $sendinfomail = \Froxlor\UI\HTML::makeyesno('sendinfomail', '1', '0', '0');
+				//$sendinfomail = 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);
+				$ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php';
+				$ftp_add_form = htmlform::genHTMLForm($ftp_add_data);
 
 				$title = $ftp_add_data['ftp_add']['title'];
 				$image = $ftp_add_data['ftp_add']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_add') . "\";");
+				eval("echo \"" . getTemplate('ftp/accounts_add') . "\";");
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		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'];
+		$result_stmt = Database::prepare("SELECT `id`, `username`, `description`, `homedir`, `uid`, `gid`, `shell` FROM `" . TABLE_FTP_USERS . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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());
+				// @FIXME use a good path-validating regex here (refs #1231)
+				$path = validate($_POST['path'], 'path');
+
+				$shell = "/bin/false";
+				if (Settings::Get('system.allow_customer_shell') == '1') {
+					$shell = isset($_POST['shell']) ? validate($_POST['shell'], 'shell') : '/bin/false';
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
+
+				$_setnewpass = false;
+				if (isset($_POST['ftp_password']) && $_POST['ftp_password'] != '') {
+					$password = validate($_POST['ftp_password'], 'password');
+					$password = validatePassword($password);
+					$_setnewpass = true;
+				}
+
+				if ($_setnewpass) {
+					if ($password == '') {
+						standard_error(array('stringisempty', 'mypassword'));
+					} elseif ($result['username'] == $password) {
+						standard_error('passwordshouldnotbeusername');
+					}
+					$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
+					$cryptPassword = makeCryptPassword($password);
+
+					$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+						SET `password` = :password
+						WHERE `customerid` = :customerid
+						AND `id` = :id"
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id, "password" => $cryptPassword));
+				}
+
+				if ($path != '') {
+					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+
+					if ($path != $result['homedir']) {
+						if (!file_exists($path)) {
+							// it's the task for "new ftp" but that will
+							// create all directories and correct their permissions
+							inserttask(5);
+						}
+
+						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account homdir for '" . $result['username'] . "'");
+
+						$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+							SET `homedir` = :homedir
+							WHERE `customerid` = :customerid
+							AND `id` = :id"
+						);
+						$params = array(
+							"homedir" => $path,
+							"customerid" => $userinfo['customerid'],
+							"id" => $id
+						);
+						Database::pexecute($stmt, $params);
+					}
+				}
+
+				$log->logAction(USR_ACTION, LOG_INFO, "edited ftp-account '" . $result['username'] . "'");
+				inserttask(5);
+				$description = validate($_POST['ftp_description'], 'description');
+				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
+					SET `description` = :desc, `shell` = :shell
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("desc" => $description, "shell" => $shell, "customerid" => $userinfo['customerid'], "id" => $id));
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
 					$homedir = str_replace($userinfo['documentroot'], "/", $result['homedir']);
 				} else {
 					$homedir = $result['homedir'];
 				}
-				$homedir = \Froxlor\FileDir::makeCorrectDir($homedir);
+				$homedir = makeCorrectDir($homedir);
 
-				$pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
+				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $homedir);
 
 				if (Settings::Get('customer.ftpatdomain') == '1') {
 					$domains = '';
 
 					$result_domains_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
-						WHERE `customerid` = :customerid");
-					Database::pexecute($result_domains_stmt, array(
-						"customerid" => $userinfo['customerid']
-					));
+						WHERE `customerid` = :customerid"
+					);
+					Database::pexecute($result_domains_stmt, array("customerid" => $userinfo['customerid']));
 
 					while ($row_domain = $result_domains_stmt->fetch(PDO::FETCH_ASSOC)) {
-						$domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
+						$domains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}
 
 				if (Settings::Get('system.allow_customer_shell') == '1') {
-					$shells = \Froxlor\UI\HTML::makeoption("/bin/false", "/bin/false", $result['shell']);
+					$shells = makeoption("/bin/false", "/bin/false", $result['shell']);
 					$shells_avail = Settings::Get('system.available_shells');
-					if (! empty($shells_avail)) {
+					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']);
+							$shells .= 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);
+				$ftp_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_edit.php';
+				$ftp_edit_form = htmlform::genHTMLForm($ftp_edit_data);
 
 				$title = $ftp_edit_data['ftp_edit']['title'];
 				$image = $ftp_edit_data['ftp_edit']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_edit') . "\";");
+				eval("echo \"" . getTemplate('ftp/accounts_edit') . "\";");
 			}
 		}
 	}

customer_index.php

@@ -16,47 +16,41 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'customer');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-use Froxlor\Api\Commands\Customers as Customers;
-
 if ($action == 'logout') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, 'logged out');
+	$log->logAction(USR_ACTION, LOG_NOTICE, 'logged out');
 
-	$params = array(
-		"customerid" => $userinfo['customerid']
-	);
+	$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");
+			AND `hash` = :hash"
+		);
 		$params["hash"] = $s;
 	} else {
 		$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
 			WHERE `userid` = :customerid
-			AND `adminsession` = '0'");
+			AND `adminsession` = '0'"
+		);
 	}
 	Database::pexecute($stmt, $params);
 
-	\Froxlor\UI\Response::redirectTo('index.php');
+	redirectTo('index.php');
 }
 
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_index");
+	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_index");
 
 	$domain_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
 		WHERE `customerid` = :customerid
 		AND `parentdomainid` = '0'
 		AND `id` <> :standardsubdomain
 	");
-	Database::pexecute($domain_stmt, array(
-		"customerid" => $userinfo['customerid'],
-		"standardsubdomain" => $userinfo['standardsubdomain']
-	));
+	Database::pexecute($domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
 
 	$domains = '';
 	$domainArray = array();
@@ -76,10 +70,7 @@ if ($page == 'overview') {
 			WHERE `customerid` = :customerid
 			AND `id` = :standardsubdomain
 		");
-		$std_domain = Database::pexecute_first($std_domain_stmt, array(
-			"customerid" => $userinfo['customerid'],
-			"standardsubdomain" => $userinfo['standardsubdomain']
-		));
+		$std_domain = Database::pexecute_first($std_domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain']));
 		$stdsubdomain = $std_domain['domain'];
 	}
 
@@ -88,149 +79,124 @@ if ($page == 'overview') {
 	$month = date('M Y', $yesterday);
 
 	// get disk-space usages for web, mysql and mail
-	$usages_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DISKSPACE . "` WHERE `customerid` = :cid ORDER BY `stamp` DESC LIMIT 1");
-	$usages = Database::pexecute_first($usages_stmt, array(
-		'cid' => $userinfo['customerid']
-	));
+	$usages_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']));
 
-	if ($usages)
-	{
-		$userinfo['diskspace_used'] = round($usages['webspace'] / 1024, Settings::Get('panel.decimal_places'));
-		$userinfo['mailspace_used'] = round($usages['mail'] / 1024, Settings::Get('panel.decimal_places'));
-		$userinfo['dbspace_used'] = round($usages['mysql'] / 1024, Settings::Get('panel.decimal_places'));
-		$userinfo['total_used'] = round(($usages['webspace'] + $usages['mail'] + $usages['mysql']) / 1024, Settings::Get('panel.decimal_places'));
-	} else {
-		$userinfo['diskspace_used'] = 0;
-		$userinfo['mailspace_used'] = 0;
-		$userinfo['dbspace_used'] = 0;
-		$userinfo['total_used'] = 0;
-	}
 	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['diskspace_used'] = round($usages['webspace'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['mailspace_used'] = round($usages['mail'] / 1024, Settings::Get('panel.decimal_places'));
+	$userinfo['dbspace_used'] = round($usages['mysql'] / 1024, Settings::Get('panel.decimal_places'));
+
 	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
-	$userinfo = \Froxlor\PhpHelper::strReplaceArray('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains');
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
 	$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>';
+	if ($userinfo['imap'] == '1') $se[] = "IMAP";
+	if ($userinfo['pop3'] == '1') $se[] = "POP3";
+	if ($userinfo['phpenabled'] == '1') $se[] = "PHP";
+	if ($userinfo['perlenabled'] == '1') $se[] = "Perl/CGI";
 	$services_enabled = implode(", ", $se);
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/index') . "\";");
+	eval("echo \"" . getTemplate('index/index') . "\";");
 } elseif ($page == 'change_password') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
-		if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_CUSTOMERS, 'customerid')) {
-			\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
+		$old_password = validate($_POST['old_password'], 'old password');
+		if (!validatePasswordLogin($userinfo,$old_password,TABLE_PANEL_CUSTOMERS,'customerid')) {
+			standard_error('oldpasswordnotcorrect');
 		}
 
-		$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');
+		$new_password = validatePassword($_POST['new_password'], 'new password');
+		$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
 
 		if ($old_password == '') {
-			\Froxlor\UI\Response::standard_error(array(
-				'stringisempty',
-				'oldpassword'
-			));
+			standard_error(array('stringisempty', 'oldpassword'));
 		} elseif ($new_password == '') {
-			\Froxlor\UI\Response::standard_error(array(
-				'stringisempty',
-				'newpassword'
-			));
+			standard_error(array('stringisempty', 'newpassword'));
 		} elseif ($new_password_confirm == '') {
-			\Froxlor\UI\Response::standard_error(array(
-				'stringisempty',
-				'newpasswordconfirm'
-			));
+			standard_error(array('stringisempty', 'newpasswordconfirm'));
 		} elseif ($new_password != $new_password_confirm) {
-			\Froxlor\UI\Response::standard_error('newpasswordconfirmerror');
+			standard_error('newpasswordconfirmerror');
 		} else {
 			// 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');
+			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+				SET `password` = :newpassword
+				WHERE `customerid` = :customerid"
+			);
+			$params = array(
+				"newpassword" => makeCryptPassword($new_password),
+				"customerid" => $userinfo['customerid']
+			);
+			Database::pexecute($stmt, $params);
+			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');
 
 			// Update ftp password
 			if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') {
-				$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($new_password);
+				$cryptPassword = makeCryptPassword($new_password);
 				$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
 					SET `password` = :password
 					WHERE `customerid` = :customerid
-					AND `username` = :username");
+					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');
+				$log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}
 
-			// Update statistics password
-			if (isset($_POST['change_stats']) && $_POST['change_stats'] == 'true') {
-				$new_stats_password = \Froxlor\System\Crypt::makeCryptPassword($new_password, true);
+			// Update webalizer 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);
+				}
 
 				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "`
 					SET `password` = :password
 					WHERE `customerid` = :customerid
-					AND `username` = :username");
+					AND `username` = :username"
+				);
 				$params = array(
-					"password" => $new_stats_password,
+					"password" => $new_webalizer_password,
 					"customerid" => $userinfo['customerid'],
 					"username" => $userinfo['loginname']
 				);
 				Database::pexecute($stmt, $params);
 			}
 
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s
-			));
+			redirectTo($filename, array('s' => $s));
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_password') . "\";");
+		eval("echo \"" . getTemplate('index/change_password') . "\";");
 	}
 } elseif ($page == 'change_language') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$def_language = \Froxlor\Validate\Validate::validate($_POST['def_language'], 'default language');
+		$def_language = validate($_POST['def_language'], 'default language');
 		if (isset($languages[$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());
-			}
+			$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+				SET `def_language` = :lang
+				WHERE `customerid` = :customerid"
+			);
+			Database::pexecute($stmt, array("lang" => $def_language, "customerid" => $userinfo['customerid']));
 
-			// 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
-			));
+				WHERE `hash` = :hash"
+			);
+			Database::pexecute($stmt, array("lang" => $def_language, "hash" => $s));
+
+			$log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
 		}
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
+
+		redirectTo($filename, array('s' => $s));
 	} else {
 		$default_lang = Settings::Get('panel.standardlanguage');
 		if ($userinfo['def_language'] != '') {
@@ -239,36 +205,29 @@ if ($page == 'overview') {
 
 		$language_options = '';
 		foreach ($languages as $language_file => $language_name) {
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $default_lang, true);
+			$language_options .= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_language') . "\";");
+		eval("echo \"" . getTemplate('index/change_language') . "\";");
 	}
 } elseif ($page == 'change_theme') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$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());
-		}
+		$theme = validate($_POST['theme'], 'theme');
+
+		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+			SET `theme` = :theme
+			WHERE `customerid` = :customerid"
+		);
+		Database::pexecute($stmt, array("theme" => $theme, "customerid" => $userinfo['customerid']));
 
-		// 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
-		));
+			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
-		));
+		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
+		redirectTo($filename, array('s' => $s));
 	} else {
 		$default_theme = Settings::Get('panel.default_theme');
 		if ($userinfo['theme'] != '') {
@@ -276,13 +235,14 @@ if ($page == 'overview') {
 		}
 
 		$theme_options = '';
-		$themes_avail = \Froxlor\UI\Template::getThemes();
+		$themes_avail = getThemes();
 		foreach ($themes_avail as $t => $d) {
-			$theme_options .= \Froxlor\UI\HTML::makeoption($d, $t, $default_theme, true);
+			$theme_options.= makeoption($d, $t, $default_theme, true);
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_theme') . "\";");
+		eval("echo \"" . 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
@@ -290,8 +250,8 @@ if ($page == 'overview') {
 
 		$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");
+		$err_dir = makeCorrectDir(FROXLOR_INSTALL_DIR."/logs/");
+		$err_file = makeCorrectFile($err_dir."/".$errid."_sql-error.log");
 
 		if (file_exists($err_file)) {
 
@@ -301,26 +261,28 @@ if ($page == 'overview') {
 			$_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()))),
+				'file' => str_replace("\n", "", substr($error[3], 5 + strlen(FROXLOR_INSTALL_DIR))),
 				'line' => str_replace("\n", "", substr($error[4], 5)),
-				'trace' => str_replace(\Froxlor\Froxlor::getInstallDir(), "", substr($error[5], 6))
+				'trace' => str_replace(FROXLOR_INSTALL_DIR, "", substr($error[5], 6))
 			);
 
 			// build mail-content
 			$mail_body = "Dear froxlor-team,\n\n";
 			$mail_body .= "the following error has been reported by a user:\n\n";
 			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'] . ' ' . $_error['message'] . "\n\n";
-			$mail_body .= "File: " . $_error['file'] . ':' . $_error['line'] . "\n\n";
-			$mail_body .= "Trace:\n" . trim($_error['trace']) . "\n\n";
+			$mail_body .= $_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 .= "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') {
+			if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+			) {
 				// send mail and say thanks
 				$_mailerror = false;
 				try {
@@ -329,7 +291,7 @@ if ($page == 'overview') {
 					$mail->MsgHTML($mail_html);
 					$mail->AddAddress('error-reports@froxlor.org', 'Froxlor Developer Team');
 					$mail->Send();
-				} catch (\PHPMailer\PHPMailer\Exception $e) {
+				} catch(phpmailerException $e) {
 					$mailerr_msg = $e->errorMessage();
 					$_mailerror = true;
 				} catch (Exception $e) {
@@ -339,30 +301,21 @@ if ($page == 'overview') {
 
 				if ($_mailerror) {
 					// error when reporting an error...LOLFUQ
-					\Froxlor\UI\Response::standard_error('send_report_error', $mailerr_msg);
+					standard_error('send_report_error', $mailerr_msg);
 				}
 
 				// finally remove error from fs
 				@unlink($err_file);
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					's' => $s
-				));
+				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") . "\";");
+			eval("echo \"" . getTemplate("index/send_error_report") . "\";");
+
 		} else {
-			\Froxlor\UI\Response::redirectTo($filename, array(
-				's' => $s
-			));
+			redirectTo($filename, array('s' => $s));
 		}
 	} else {
-		\Froxlor\UI\Response::redirectTo($filename, array(
-			's' => $s
-		));
+		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

@@ -19,13 +19,9 @@
 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');
+	redirectTo('customer_index.php');
 }
 
 if ($page == 'log') {
@@ -36,38 +32,40 @@ if ($page == 'log') {
 			'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'];
+		$paging = new paging($userinfo, TABLE_PANEL_LOG, $fields, null, null, 0, 'desc', 30);
+		$query = 'SELECT * FROM `' . TABLE_PANEL_LOG . '` WHERE `user` = :loginname ' . $paging->getSqlWhere(true) . ' ' . $paging->getSqlOrderBy();
+		$result_stmt = Database::prepare($query . ' ' . $paging->getSqlLimit());
+		Database::pexecute($result_stmt, array(
+			"loginname" => $userinfo['loginname']
+		));
+		$result_cnt_stmt = Database::prepare($query);
+		Database::pexecute($result_cnt_stmt, array(
+			"loginname" => $userinfo['loginname']
+		));
+		$res_cnt = $result_cnt_stmt->fetch(PDO::FETCH_ASSOC);
+		$logs_count = $result_cnt_stmt->rowCount();
+		$paging->setEntries($logs_count);
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 		$clog = array();
-
-		foreach ($result['list'] as $row) {
-
+		
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			
 			if (! isset($clog[$row['action']]) || ! is_array($clog[$row['action']])) {
 				$clog[$row['action']] = array();
 			}
 			$clog[$row['action']][$row['logid']] = $row;
 		}
-
+		
 		if ($paging->sortfield == 'date' && $paging->sortorder == 'desc') {
 			krsort($clog);
 		} else {
 			ksort($clog);
 		}
-
+		
+		$i = 0;
 		$count = 0;
 		$log_count = 0;
 		$log = '';
@@ -75,46 +73,49 @@ if ($page == 'log') {
 			$_action = 0;
 			foreach ($logrows as $row) {
 				// if ($paging->checkDisplay($i)) {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+				$row = htmlentities_array($row);
 				$row['date'] = date("d.m.y H:i:s", $row['date']);
-
+				
 				if ($_action != $action) {
 					switch ($action) {
-						case \Froxlor\FroxlorLogger::USR_ACTION:
+						case USR_ACTION:
 							$_action = $lng['admin']['customer'];
 							break;
-						case \Froxlor\FroxlorLogger::RES_ACTION:
+						case RES_ACTION:
 							$_action = $lng['logger']['reseller'];
 							break;
-						case \Froxlor\FroxlorLogger::ADM_ACTION:
+						case ADM_ACTION:
 							$_action = $lng['logger']['admin'];
 							break;
-						case \Froxlor\FroxlorLogger::CRON_ACTION:
+						case CRON_ACTION:
 							$_action = $lng['logger']['cron'];
 							break;
-						case \Froxlor\FroxlorLogger::LOGIN_ACTION:
+						case LOGIN_ACTION:
 							$_action = $lng['logger']['login'];
 							break;
-						case \Froxlor\FroxlorLogger::LOG_ERROR:
+						case 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') . "\";");
+					eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
 				}
-
+				
 				$log_count ++;
-				$row['type'] = \Froxlor\FroxlorLogger::getInstanceOf()->getLogLevelDesc($row['type']);
-				eval("\$log.=\"" . \Froxlor\UI\Template::getTemplate('logger/logger_log') . "\";");
+				$row['type'] = getLogLevelDesc($row['type']);
+				eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
 				$count ++;
 				$_action = $action;
+				// }
+				$i ++;
 			}
+			$i ++;
 		}
-
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('logger/logger') . "\";");
+		
+		eval("echo \"" . getTemplate('logger/logger') . "\";");
 	}
 }

customer_mysql.php

@@ -16,16 +16,13 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'customer');
 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');
+if (Settings::IsInList('panel.customer_hide_options','mysql')) {
+	redirectTo('customer_index.php');
 }
 
 // get sql-root access data
@@ -41,74 +38,67 @@ if (isset($_POST['id'])) {
 }
 
 if ($page == 'overview') {
-	$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
+	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
 	Database::needSqlData();
 	$sql = Database::getSqlData();
 	$lng['mysql']['description'] = str_replace('<SQL_HOST>', $sql['host'], $lng['mysql']['description']);
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysql') . "\";");
+	eval("echo \"" . getTemplate('mysql/mysql') . "\";");
 } elseif ($page == 'mysqls') {
 	if ($action == '') {
-		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
+		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
 		$fields = array(
 			'databasename' => $lng['mysql']['databasename'],
 			'description' => $lng['mysql']['databasedescription']
 		);
-		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'];
+		$paging = new paging($userinfo, TABLE_PANEL_DATABASES, $fields);
+		$result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DATABASES . "`
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$mysqls_count = Database::num_rows();
+		$paging->setEntries($mysqls_count);
 
-		$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 . "`");
+		$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
 		$dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
 		$count_mysqlservers = $dbserver['numservers'];
 
 		// Begin root-session
 		Database::needRoot(true);
-		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
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				$row = htmlentities_array($row);
+				$mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES
 					WHERE table_schema = :table_schema
-					GROUP BY table_schema");
-			$mbdata = Database::pexecute_first($mbdata_stmt, array(
-				"table_schema" => $row['databasename']
-			));
-			if (!$mbdata) {
-				$mbdata = array('MB' => 0);
+					GROUP BY table_schema"
+				);
+				Database::pexecute($mbdata_stmt, array("table_schema" => $row['databasename']));
+				$mbdata = $mbdata_stmt->fetch(PDO::FETCH_ASSOC);
+				$row['size'] = size_readable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int)Settings::Get('panel.decimal_places') . 'f %s');
+				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
+				$count++;
 			}
-			$row['size'] = \Froxlor\PhpHelper::sizeReadable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-			eval("\$mysqls.=\"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_database') . "\";");
-			$count ++;
+			$i++;
 		}
 		Database::needRoot(false);
 		// End root-session
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls') . "\";");
-	} elseif ($action == 'delete' && $id != 0) {
+		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
 
-		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'];
+	} elseif ($action == 'delete' && $id != 0) {
+		$result_stmt = Database::prepare('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '`
+			WHERE `customerid`="' . (int)$userinfo['customerid'] . '"
+			AND `id`="' . (int)$id . '"'
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		if (isset($result['databasename']) && $result['databasename'] != '') {
 
@@ -117,91 +107,251 @@ if ($page == 'overview') {
 			$sql_root = Database::getSqlData();
 			Database::needRoot(false);
 
-			if (! isset($sql_root[$result['dbserver']]) || ! is_array($sql_root[$result['dbserver']])) {
+			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
-				try {
-					Mysqls::getLocal($userinfo, $_POST)->delete();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
-				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
+				// Begin root-session
+				Database::needRoot(true, $result['dbserver']);
+				$dbm = new DbManager($log);
+				$dbm->getManager()->deleteDatabase($result['databasename']);
+				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
+				Database::needRoot(false);
+				// End root-session
+
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_DATABASES . "`
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+
+				$resetaccnumber = ($userinfo['mysqls_used'] == '1') ? " , `mysql_lastaccountnumber` = '0' " : '';
+
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
+					SET `mysqls_used` = `mysqls_used` - 1 " . $resetaccnumber . "
+					WHERE `customerid` = :customerid"
+				);
+				Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 				$dbnamedesc = $result['databasename'];
 				if (isset($result['description']) && $result['description'] != '') {
-					$dbnamedesc .= ' (' . $result['description'] . ')';
+					$dbnamedesc .= ' ('.$result['description'].')';
 				}
-				\Froxlor\UI\HTML::askYesNo('mysql_reallydelete', $filename, array(
-					'id' => $id,
-					'page' => $page,
-					'action' => $action
-				), $dbnamedesc);
+				ask_yesno('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') {
-				try {
-					Mysqls::getLocal($userinfo, $_POST)->add();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				$password = validate($_POST['mysql_password'], 'password');
+				$password = validatePassword($password);
+
+				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
+				if ($sendinfomail != 1) {
+					$sendinfomail = 0;
+				}
+
+				if ($password == '') {
+					standard_error(array('stringisempty', 'mypassword'));
+				} else {
+					$dbserver = 0;
+					$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `".TABLE_PANEL_DATABASES."`");
+					$_dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC);
+					$count_mysqlservers = $_dbserver['numservers'];
+					if ($count_mysqlservers > 1) {
+						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
+						Database::needRoot(true, $dbserver);
+						Database::needSqlData();
+						$sql_root = Database::getSqlData();
+						Database::needRoot(false);
+						if (!isset($sql_root) || !is_array($sql_root)) {
+							$dbserver = 0;
+						}
+					}
+
+					// validate description before actual adding the database, #1052
+					$databasedescription = validate(trim($_POST['description']), 'description');
+
+					// create database, user, set permissions, etc.pp.
+					$dbm = new DbManager($log);
+					$username = $dbm->createDatabase(
+						$userinfo['loginname'],
+						$password,
+						$userinfo['mysql_lastaccountnumber']
+					);
+
+					// we've checked against the password in dbm->createDatabase
+					if ($username == false) {
+						standard_error('passwordshouldnotbeusername');
+					}
+
+					// Statement modified for Database description -- PH 2004-11-29
+					$stmt = Database::prepare('INSERT INTO `' . TABLE_PANEL_DATABASES . '`
+						(`customerid`, `databasename`, `description`, `dbserver`)
+						VALUES (:customerid, :databasename, :description, :dbserver)'
+					);
+					$params = array(
+						"customerid" => $userinfo['customerid'],
+						"databasename" => $username,
+						"description" => $databasedescription,
+						"dbserver" => $dbserver
+					);
+					Database::pexecute($stmt, $params);
+
+					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
+						SET `mysqls_used` = `mysqls_used` + 1, `mysql_lastaccountnumber` = `mysql_lastaccountnumber` + 1
+						WHERE `customerid` = :customerid'
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+					if ($sendinfomail == 1) {
+						$pma = $lng['admin']['notgiven'];
+						if (Settings::Get('panel.phpmyadmin_url') != '') {
+							$pma = Settings::Get('panel.phpmyadmin_url');
+						}
+
+						Database::needRoot(true, $dbserver);
+						Database::needSqlData();
+						$sql_root = Database::getSqlData();
+						Database::needRoot(false);
+
+						$replace_arr = array(
+							'SALUTATION' => getCorrectUserSalutation($userinfo),
+							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
+							'DB_NAME' => $username,
+							'DB_PASS' => $password,
+							'DB_DESC' => $databasedescription,
+							'DB_SRV' => $sql_root['host'],
+							'PMA_URI' => $pma
+						);
+
+						$def_language = $userinfo['def_language'];
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid` = :adminid
+							AND `language` = :lang
+							AND `templategroup`='mails'
+							AND `varname`='new_database_by_customer_subject'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['subject']), $replace_arr));
+
+						$result_stmt = Database::prepare("SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+							WHERE `adminid`= :adminid
+							AND `language`= :lang
+							AND `templategroup` = 'mails'
+							AND `varname` = 'new_database_by_customer_mailbody'"
+						);
+						Database::pexecute($result_stmt, array("adminid" => $userinfo['adminid'], "lang" => $def_language));
+						$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['new_database_by_customer']['mailbody']), $replace_arr));
+
+						$_mailerror = false;
+						try {
+							$mail->Subject = $mail_subject;
+							$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));
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
 			} else {
 
-				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`");
+				$dbservers_stmt = Database::query("SELECT DISTINCT `dbserver` FROM `".TABLE_PANEL_DATABASES."`");
 				$mysql_servers = '';
 				$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 ++;
+					$mysql_servers .= makeoption($sql_root['caption'], $dbserver['dbserver']);
+					$count_mysqlservers++;
 				}
 				Database::needRoot(false);
 
-				$mysql_add_data = include_once dirname(__FILE__) . '/lib/formfields/customer/mysql/formfield.mysql_add.php';
-				$mysql_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($mysql_add_data);
+				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
+				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
 
 				$title = $mysql_add_data['mysql_add']['title'];
 				$image = $mysql_add_data['mysql_add']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_add') . "\";");
+				eval("echo \"" . getTemplate('mysql/mysqls_add') . "\";");
 			}
 		}
 	} elseif ($action == 'edit' && $id != 0) {
-		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'];
+		$result_stmt = Database::prepare("SELECT `id`, `databasename`, `description`, `dbserver` FROM `" . TABLE_PANEL_DATABASES . "`
+			WHERE `customerid` = :customerid
+			AND `id` = :id"
+		);
+		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid'], "id" => $id));
+		$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
 
 		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') {
-				try {
-					$json_result = Mysqls::getLocal($userinfo, $_POST)->update();
-				} catch (Exception $e) {
-					\Froxlor\UI\Response::dynamic_error($e->getMessage());
+				// 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);
+
+					if ($password == $result['databasename']) {
+						standard_error('passwordshouldnotbeusername');
+					}
+
+					// Begin root-session
+					Database::needRoot(true);
+					foreach (array_map('trim', explode(',', Settings::Get('system.mysql_access_host'))) as $mysql_access_host) {
+						$stmt = Database::prepare("SET PASSWORD FOR :dbname@:host = PASSWORD(:password)");
+						$params = array(
+							"dbname" => $result['databasename'],
+							"host" => $mysql_access_host,
+							"password" => $password
+						);
+						Database::pexecute($stmt, $params);
+					}
+
+					$stmt = Database::prepare("FLUSH PRIVILEGES");
+					Database::pexecute($stmt);
+					Database::needRoot(false);
+					// End root-session
 				}
-				\Froxlor\UI\Response::redirectTo($filename, array(
-					'page' => $page,
-					's' => $s
-				));
+
+				// Update the Database description -- PH 2004-11-29
+				$log->logAction(USR_ACTION, LOG_INFO, "edited database '" . $result['databasename'] . "'");
+				$databasedescription = validate($_POST['description'], 'description');
+				$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DATABASES . "`
+					SET `description` = :desc
+					WHERE `customerid` = :customerid
+					AND `id` = :id"
+				);
+				Database::pexecute($stmt, array("desc" => $databasedescription, "customerid" => $userinfo['customerid'], "id" => $id));
+				redirectTo($filename, array('page' => $page, 's' => $s));
 			} else {
 
-				$dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `" . TABLE_PANEL_DATABASES . "`");
+				$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'];
 
@@ -210,13 +360,13 @@ if ($page == 'overview') {
 				$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);
+				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
+				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
 
 				$title = $mysql_edit_data['mysql_edit']['title'];
 				$image = $mysql_edit_data['mysql_edit']['image'];
 
-				eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_edit') . "\";");
+				eval("echo \"" . getTemplate('mysql/mysqls_edit') . "\";");
 			}
 		}
 	}

customer_tickets.php

@@ -0,0 +1,411 @@
+<?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 (isset($_POST['id'])) {
+
+	$id = intval($_POST['id']);
+
+	//Check if the current user is allowed to see the current ticket.
+	$stmt = Database::prepare("SELECT `id` FROM `panel_tickets` WHERE `id` = :id AND `customerid` = :customerid");
+	$result = Database::pexecute_first($stmt, array("id" => $id, "customerid" => $userinfo['customerid']));
+
+	if ($result == null) {
+		// no rights to see the requested ticket
+		standard_error(array('ticketnotaccessible'));
+	}
+} elseif (isset($_GET['id'])) {
+	$id = intval($_GET['id']);
+}
+
+if ($page == 'overview') {
+	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets");
+	eval("echo \"" . getTemplate("tickets/ticket") . "\";");
+} elseif ($page == 'tickets') {
+	if ($action == '') {
+		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets::tickets");
+		$fields = array(
+			'status' => $lng['ticket']['status'],
+			'lastchange' => $lng['ticket']['lastchange'],
+			'subject' => $lng['ticket']['subject'],
+			'lastreplier' => $lng['ticket']['lastreplier']
+		);
+		$paging = new paging($userinfo, TABLE_PANEL_TICKETS, $fields);
+		$stmt = Database::prepare('SELECT `main`.`id`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub`
+			WHERE `sub`.`answerto` = `main`.`id`) AS `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority`
+			FROM `' . TABLE_PANEL_TICKETS . '` as `main`
+			WHERE `main`.`answerto` = "0"
+			AND `archived` = "0"
+			AND `customerid`= :customerid ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+		);
+		Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+		$paging->setEntries(Database::num_rows());
+		$sortcode = $paging->getHtmlSortCode($lng);
+		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
+		$searchcode = $paging->getHtmlSearchCode($lng);
+		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
+		$i = 0;
+		$count = 0;
+		$tickets = '';
+		$tickets_count = 0;
+
+		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($paging->checkDisplay($i)) {
+				$tickets_count++;
+				$row = htmlentities_array($row);
+				$row['lastchange'] = date("d.m.y H:i", $row['lastchange']);
+
+				if ($row['status'] >= 0 && $row['status'] <= 2) {
+					$reopen = 0;
+				} else {
+					$reopen = 1;
+				}
+
+				$row['status'] = ticket::getStatusText($lng, $row['status']);
+				$row['priority'] = ticket::getPriorityText($lng, $row['priority']);
+
+				if ($row['lastreplier'] == '1') {
+					$row['lastreplier'] = $lng['ticket']['staff'];
+					$cananswer = 1;
+				} else {
+					$row['lastreplier'] = $lng['ticket']['customer'];
+					$cananswer = 0;
+				}
+
+				$row['subject'] = html_entity_decode($row['subject']);
+				if (strlen($row['subject']) > 30) {
+					$ts = wordwrap($row['subject'], 30, "|");
+					$ts = explode("|", $ts);
+					$row['subject'] = $ts[0]. '...';
+				}
+
+				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
+				$count++;
+			}
+
+			$i++;
+		}
+
+		$supportavailable = 0;
+		$time = date("Hi", time());
+		$day = date("w", time());
+		$start = substr(Settings::Get('ticket.worktime_begin'), 0, 2) . substr(Settings::Get('ticket.worktime_begin'), 3, 2);
+		$end = substr(Settings::Get('ticket.worktime_end'), 0, 2) . substr(Settings::Get('ticket.worktime_end'), 3, 2);
+
+		if ($time >= $start && $time <= $end) {
+			$supportavailable = 1;
+		}
+
+		if (Settings::Get('ticket.worktime_sat') == "0" && $day == "6") {
+			$supportavailable = 0;
+		}
+
+		if (Settings::Get('ticket.worktime_sun') == "0" && $day == "0") {
+			$supportavailable = 0;
+		}
+
+		if (Settings::Get('ticket.worktime_all') == "1") {
+			$supportavailable = 1;
+		}
+
+		$ticketsopen = 0;
+		$stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+			WHERE `customerid` = :customerid
+			AND `answerto` = "0"
+			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
+		);
+		$opentickets = Database::pexecute_first($stmt, array("customerid" => $userinfo['customerid']));
+
+		if (Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
+			$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
+		} else {
+			$notmorethanxopentickets = '';
+		}
+
+		$ticketsopen = (int)$opentickets['count'];
+		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
+
+	} elseif ($action == 'new') {
+		if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
+				$newticket = ticket::getInstanceOf($userinfo, -1);
+				$newticket->Set('subject', validate($_POST['subject'], 'subject'), true, false);
+				$newticket->Set('priority', validate($_POST['priority'], 'priority'), true, false);
+				$newticket->Set('category', validate($_POST['category'], 'category'), true, false);
+				$newticket->Set('customer', (int)$userinfo['customerid'], true, false);
+				$newticket->Set('admin', (int)$userinfo['adminid'], true, false);
+				$newticket->Set('message', validate(str_replace("\r\n", "\n", $_POST['message']), 'message', '/^[^\0]*$/'), true, false);
+
+				if ($newticket->Get('subject') == null) {
+					standard_error(array('stringisempty', 'mysubject'));
+				} elseif ($newticket->Get('message') == null) {
+					standard_error(array('stringisempty', 'mymessage'));
+				} else {
+					$now = time();
+					$newticket->Set('dt', $now, true, true);
+					$newticket->Set('lastchange', $now, true, true);
+					$newticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
+					$newticket->Set('status', '0', true, true);
+					$newticket->Set('lastreplier', '0', true, true);
+					$newticket->Set('by', '0', true, true);
+					$newticket->Insert();
+					$log->logAction(USR_ACTION, LOG_NOTICE, "opened support-ticket '" . $newticket->Get('subject') . "'");
+
+					$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '`
+						SET `tickets_used`=`tickets_used` + 1
+						WHERE `customerid`= :customerid'
+					);
+					Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
+
+					// Customer mail
+					$newticket->sendMail((int)$userinfo['customerid'], 'new_ticket_for_customer_subject', $lng['mails']['new_ticket_for_customer']['subject'], 'new_ticket_for_customer_mailbody', $lng['mails']['new_ticket_for_customer']['mailbody']);
+
+					// Admin mail
+					$newticket->sendMail(-1, 'new_ticket_by_customer_subject', $lng['mails']['new_ticket_by_customer']['subject'], 'new_ticket_by_customer_mailbody', $lng['mails']['new_ticket_by_customer']['mailbody']);
+					redirectTo($filename, array('page' => $page, 's' => $s));
+				}
+			} else {
+				$categories = '';
+				$result_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+					WHERE `adminid` = :adminid
+					ORDER BY `logicalorder`, `name` ASC'
+				);
+				$result = Database::pexecute_first($result_stmt, array("adminid" => $userinfo['adminid']));
+
+				if (isset($result['name']) && $result['name'] != '') {
+					$result2_stmt = Database::prepare('SELECT `id`, `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+						WHERE `adminid` = :adminid
+						ORDER BY `logicalorder`, `name` ASC'
+					);
+					Database::pexecute($result2_stmt, array("adminid" => $userinfo['adminid']));
+
+					while ($row = $result2_stmt->fetch(PDO::FETCH_ASSOC)) {
+						$categories.= makeoption($row['name'], $row['id']);
+					}
+				} else {
+					$categories = makeoption($lng['ticket']['no_cat'], '0');
+				}
+
+				$priorities = makeoption($lng['ticket']['high'], '1');
+				$priorities.= makeoption($lng['ticket']['normal'], '2');
+				$priorities.= makeoption($lng['ticket']['low'], '3');
+				$ticketsopen = 0;
+				$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+					WHERE `customerid` = :customerid
+					AND `answerto` = "0"
+					AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
+				);
+				$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
+
+				if (Settings::Get('ticket.concurrently_open') != -1 && Settings::Get('ticket.concurrently_open') != '') {
+					$notmorethanxopentickets = strtr($lng['ticket']['notmorethanxopentickets'], array('%s' => Settings::Get('ticket.concurrently_open')));
+				} else {
+					$notmorethanxopentickets = '';
+				}
+
+				$ticketsopen = (int)$opentickets['count'];
+
+				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_add.php';
+				$ticket_add_form = htmlform::genHTMLForm($ticket_add_data);
+
+				$title = $ticket_add_data['ticket_add']['title'];
+				$image = $ticket_add_data['ticket_add']['image'];
+
+				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
+			}
+		} else {
+			standard_error('nomoreticketsavailable');
+		}
+	} elseif ($action == 'answer' && $id != 0) {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			try {
+				$replyticket = ticket::getInstanceOf($userinfo, -1);
+			} catch(Exception $e) {
+				standard_error($e->getMessage());
+			}
+			$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 {
+				try {
+					$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+				} catch(Exception $e) {
+					standard_error($e->getMessage());
+				}
+				$now = time();
+				$replyticket->Set('customer', (int)$userinfo['customerid'], true, true);
+				$replyticket->Set('lastchange', $now, true, true);
+				$replyticket->Set('ip', $_SERVER['REMOTE_ADDR'], true, true);
+				$replyticket->Set('status', '1', true, true);
+				$replyticket->Set('answerto', (int)$id, true, false);
+				$replyticket->Set('by', '0', true, true);
+				$replyticket->Insert();
+
+				// Update priority if changed
+				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 = '';
+			try {
+				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+			} catch(Exception $e) {
+				standard_error($e->getMessage());
+			}
+			$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
+			$status = ticket::getStatusText($lng, $mainticket->Get('status'));
+
+			if ($mainticket->Get('status') >= 0 && $mainticket->Get('status') <= 2) {
+				$isclosed = 0;
+			} else {
+				$isclosed = 1;
+			}
+
+			if ($mainticket->Get('by') == '1') {
+				$by = $lng['ticket']['staff'];
+			} else {
+				$cid = $mainticket->Get('customer');
+				$usr_stmt = Database::prepare('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+					FROM `' . TABLE_PANEL_CUSTOMERS . '`
+					WHERE `customerid` = :customerid '
+				);
+				$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
+				$by = getCorrectFullUserDetails($usr);
+			}
+
+			$subject = $mainticket->Get('subject');
+			$message = $mainticket->Get('message');
+			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
+			$result_stmt = Database::prepare('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
+				WHERE `id`= :id '
+			);
+			$row = Database::pexecute_first($result_stmt, array("id" => $mainticket->Get('category')));
+
+			$andere_stmt = Database::prepare('SELECT * FROM `' . TABLE_PANEL_TICKETS . '`
+				WHERE `answerto`= :answerto
+				ORDER BY `lastchange` ASC'
+			);
+			Database::pexecute($andere_stmt, array("answerto" => $id));
+			$numrows_andere = Database::num_rows();
+
+			while ($row2 = $andere_stmt->fetch(PDO::FETCH_ASSOC)) {
+				$subticket = ticket::getInstanceOf($userinfo, (int)$row2['id']);
+				$lastchange = date("d.m.Y H:i\h", $subticket->Get('lastchange'));
+
+				if ($subticket->Get('by') == '1') {
+					$by = $lng['ticket']['staff'];
+				} else {
+					$cid = $subticket->Get('customer');
+					$usr_stmt = Database::prepare('
+						SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = :customerid '
+					);
+					$usr = Database::pexecute_first($usr_stmt, array("customerid" => $cid));
+					$by = getCorrectFullUserDetails($usr);
+				}
+
+				$subject = $subticket->Get('subject');
+				$message = $subticket->Get('message');
+
+				$row2 = htmlentities_array($row2);
+				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
+			}
+
+			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
+			$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
+			$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
+			$subject = htmlentities($mainticket->Get('subject'));
+			$ticket_replies_count = $numrows_andere + 1;
+
+			// don't forget the main-ticket!
+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/formfield.ticket_reply.php';
+			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
+
+			$title = $ticket_reply_data['ticket_reply']['title'];
+			$image = $ticket_reply_data['ticket_reply']['image'];
+
+			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
+		}
+	} elseif ($action == 'close' && $id != 0) {
+		if (isset($_POST['send']) && $_POST['send'] == 'send') {
+			$now = time();
+			try {
+				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+			} catch(Exception $e) {
+				standard_error($e->getMessage());
+			}
+			$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 {
+			try {
+				$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+			} catch(Exception $e) {
+				standard_error($e->getMessage());
+			}
+			ask_yesno('ticket_reallyclose', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $mainticket->Get('subject'));
+		}
+	} elseif ($action == 'reopen' && $id != 0) {
+		$ticketsopen = 0;
+		$opentickets_stmt = Database::prepare('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`
+			WHERE `customerid` = :customerid
+			AND `answerto` = "0"
+			AND (`status` = "0" OR `status` = "1" OR `status` = "2")'
+		);
+		$opentickets = Database::pexecute_first($opentickets_stmt, array("customerid" => $userinfo['customerid']));
+		$ticketsopen = (int)$opentickets['count'];
+
+		if ($ticketsopen > Settings::Get('ticket.concurrently_open') && Settings::Get('ticket.concurrently_open') != - 1 && Settings::Get('ticket.concurrently_open') != '') {
+			standard_error('notmorethanxopentickets', Settings::Get('ticket.concurrently_open'));
+		}
+
+		$now = time();
+		try {
+			$mainticket = ticket::getInstanceOf($userinfo, (int)$id);
+		} catch(Exception $e) {
+			standard_error($e->getMessage());
+		}
+		$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,16 +16,14 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'customer');
 $intrafficpage = 1;
 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');
+if (Settings::IsInList('panel.customer_hide_options','traffic')) {
+	redirectTo('customer_index.php');
 }
 
 $traffic = '';
@@ -38,7 +36,8 @@ if (isset($_POST['month']) && isset($_POST['year'])) {
 } elseif (isset($_GET['month']) && isset($_GET['year'])) {
 	$month = intval($_GET['month']);
 	$year = intval($_GET['year']);
-} // BAM! $_GET???
+}
+//BAM! $_GET???
 elseif (isset($_GET['page']) && $_GET['page'] == 'current') {
 	if (date('d') != '01') {
 		$month = date('m');
@@ -54,7 +53,7 @@ elseif (isset($_GET['page']) && $_GET['page'] == 'current') {
 	}
 }
 
-if (! is_null($month) && ! is_null($year)) {
+if (!is_null($month) && !is_null($year)) {
 	$traf['byte'] = 0;
 	$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 . "`
@@ -62,7 +61,8 @@ if (! is_null($month) && ! is_null($year)) {
 		AND `month` = :month
 		AND `year` = :year
 		GROUP BY `day`
-		ORDER BY `day` DESC");
+		ORDER BY `day` DESC"
+	);
 	$params = array(
 		"customerid" => $userinfo['customerid'],
 		"month" => $month,
@@ -86,39 +86,39 @@ if (! is_null($month) && ! is_null($year)) {
 
 		if (extension_loaded('bcmath')) {
 			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($row['ftp_down'], 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
 			$traf['ftp'] = bcdiv($ftp, 1024, Settings::Get('panel.decimal_places'));
+			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = bcdiv($traf['byte'], 1024, Settings::Get('panel.decimal_places'));
 		} else {
 			$traf['ftptext'] = round($row['ftp_up'] / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($row['ftp_down'] / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
-			$traf['ftp'] = round($ftp / 1024, Settings::Get('panel.decimal_places'));
+			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
+			$traf['http'] = round($http, Settings::Get('panel.decimal_places'));
+			$traf['ftp'] = round($ftp, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = round($mail, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = round($traf['byte'] / 1024, Settings::Get('panel.decimal_places'));
 		}
 
-		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') . "\";");
+		eval("\$traffic.=\"" . getTemplate('traffic/traffic_month') . "\";");
 		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
 	}
 
-	$traffic_complete['http'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['ftp'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['mail'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_details') . "\";");
+	eval("echo \"" . getTemplate('traffic/traffic_details') . "\";");
 } else {
-	$result_stmt = Database::prepare("
-		SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
+	$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']
-	));
+		GROUP BY `year` DESC, `month` DESC
+		LIMIT 12"
+	);
+	Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
 	$traffic_complete['http'] = 0;
 	$traffic_complete['ftp'] = 0;
 	$traffic_complete['mail'] = 0;
@@ -138,33 +138,28 @@ if (! is_null($month) && ! is_null($year)) {
 
 		if (extension_loaded('bcmath')) {
 			$traf['ftptext'] = bcdiv($ftp_up, 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . bcdiv($ftp_down, 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
 			$traf['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, Settings::Get('panel.decimal_places'));
+			$traf['http'] = bcdiv($http, 1024, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = bcdiv($mail, 1024, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, Settings::Get('panel.decimal_places'));
 		} else {
 			$traf['ftptext'] = round($ftp_up / 1024, Settings::Get('panel.decimal_places')) . " MiB up/ " . round($ftp_down / 1024, Settings::Get('panel.decimal_places')) . " MiB down (FTP)";
+			$traf['httptext'] = round($http / 1024, Settings::Get('panel.decimal_places')) . " MiB (HTTP)";
+			$traf['mailtext'] = round($mail / 1024, Settings::Get('panel.decimal_places')) . " MiB (Mail)";
 			$traf['ftp'] = round(($ftp_up + $ftp_down) / 1024, Settings::Get('panel.decimal_places'));
+			$traf['http'] = round($http / 1024, Settings::Get('panel.decimal_places'));
+			$traf['mail'] = round($mail / 1024, Settings::Get('panel.decimal_places'));
+			$traf['byte'] = round($traf['byte'] / (1024 * 1024), Settings::Get('panel.decimal_places'));
 		}
 
-		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') . "\";");
+		eval("\$traffic.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
 	}
 
-	$traffic_complete['http'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['ftp'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
-	$traffic_complete['mail'] = \Froxlor\PhpHelper::sizeReadable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s');
+	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
+	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)Settings::Get('panel.decimal_places').'f %s');
 
-	eval("echo \"" . \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 : "");
-	}
+	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
 }

dns_editor.php

@@ -1,8 +1,6 @@
 <?php
-if (! defined('AREA')) {
-	header("Location: index.php");
-	exit();
-}
+if (! defined('AREA'))
+	die('You cannot access this file directly!');
 
 /**
  * This file is part of the Froxlor project.
@@ -16,14 +14,11 @@ if (! defined('AREA')) {
  * @author Froxlor team <team@froxlor.org> (2016-)
  * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package Panel
- *         
+ *
  */
 
-use Froxlor\Database\Database;
-use Froxlor\Api\Commands\DomainZones as DomainZones;
-
 // This file is being included in admin_domains and customer_domains
-// and therefore does not need to require lib/init.php
+	// and therefore does not need to require lib/init.php
 
 $domain_id = isset($_GET['domain_id']) ? (int) $_GET['domain_id'] : null;
 
@@ -34,64 +29,263 @@ $content = isset($_POST['record']['content']) ? trim($_POST['record']['content']
 $ttl = isset($_POST['record']['ttl']) ? (int) $_POST['record']['ttl'] : 18000;
 
 // get domain-name
-$domain = \Froxlor\Dns\Dns::getAllowedDomainEntry($domain_id, AREA, $userinfo);
+$domain = getAllowedDomainEntry($domain_id, AREA, $userinfo, $idna_convert);
 
 // 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'];
+$sel_stmt = Database::prepare("SELECT * FROM `" . TABLE_DOMAIN_DNS . "` WHERE domain_id = :did");
+Database::pexecute($sel_stmt, array(
+	'did' => $domain_id
+));
+$dom_entries = $sel_stmt->fetchAll(PDO::FETCH_ASSOC);
 
-$errors = "";
+$errors = array();
 $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();
+
+	// validation
+	if (empty($record)) {
+		$record = "@";
+	}
+
+	$record = strtolower($record);
+
+	if ($record != '@' && $record != '*') {
+		// validate record
+		if (strpos($record, '--') !== false) {
+			$errors[] = $lng['error']['domain_nopunycode'];
+		} else {
+			// check for wildcard-record
+			$add_wildcard_again = false;
+			if (substr($record, 0, 2) == '*.') {
+				$record = substr($record, 2);
+				$add_wildcard_again = true;
+			}
+			// convert entry
+			$record = $idna_convert->encode($record);
+
+			if ($add_wildcard_again) {
+				$record = '*.'.$record;
+			}
+
+			/*
+			 * see https://redmine.froxlor.org/issues/1697
+			 *
+			if ($type != 'SRV' && $type != 'TXT') {
+				$check_dom = $record . '.example.com';
+				if (! validateDomain($check_dom)) {
+					$errors[] = sprintf($lng['error']['subdomainiswrong'], $idna_convert->decode($record));
+				}
+			}
+			*/
+			if (strlen($record) > 63) {
+				$errors[] = $lng['error']['dns_record_toolong'];
+			}
+		}
+	}
+
+	// TODO regex validate content for invalid characters
+
+	if ($ttl <= 0) {
+		$ttl = 18000;
+	}
+
+	if (empty($content)) {
+		$errors[] = $lng['error']['dns_content_empty'];
+	}
+
+	// types
+	if ($type == 'A' && filter_var($content, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
+		$errors[] = $lng['error']['dns_arec_noipv4'];
+	} elseif ($type == 'AAAA' && filter_var($content, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
+		$errors[] = $lng['error']['dns_aaaarec_noipv6'];
+	} elseif ($type == 'MX') {
+		if ($prio === null || $prio < 0) {
+			$errors[] = $lng['error']['dns_mx_prioempty'];
+		}
+		// check for trailing dot
+		if (substr($content, - 1) == '.') {
+			// remove it for checks
+			$content = substr($content, 0, - 1);
+		}
+		if (! validateDomain($content)) {
+			$errors[] = $lng['error']['dns_mx_needdom'];
+		} else {
+			// check whether there is a CNAME-record for the same resource
+			foreach ($dom_entries as $existing_entries) {
+				$fqdn = $existing_entries['record'] . '.' . $domain;
+				if ($existing_entries['type'] == 'CNAME' && $fqdn == $content) {
+					$errors[] = $lng['error']['dns_mx_noalias'];
+					break;
+				}
+			}
+		}
+		// append trailing dot (again)
+		$content .= '.';
+	} elseif ($type == 'CNAME') {
+		// check for trailing dot
+		if (substr($content, - 1) == '.') {
+			// remove it for checks
+			$content = substr($content, 0, - 1);
+		} else {
+			// add domain name
+			$content .= '.' . $domain;
+		}
+		if (! validateDomain($content)) {
+			$errors[] = $lng['error']['dns_cname_invaliddom'];
+		} else {
+			// check whether there are RR-records for the same resource
+			foreach ($dom_entries as $existing_entries) {
+				if (($existing_entries['type'] == 'A' || $existing_entries['type'] == 'AAAA' || $existing_entries['type'] == 'MX' || $existing_entries['type'] == 'NS') && $existing_entries['record'] == $record) {
+					$errors[] = $lng['error']['dns_cname_nomorerr'];
+					break;
+				}
+			}
+		}
+		// append trailing dot (again)
+		$content .= '.';
+	} elseif ($type == 'NS') {
+		// check for trailing dot
+		if (substr($content, - 1) == '.') {
+			// remove it for checks
+			$content = substr($content, 0, - 1);
+		}
+		if (! validateDomain($content)) {
+			$errors[] = $lng['error']['dns_ns_invaliddom'];
+		}
+		// append trailing dot (again)
+		$content .= '.';
+	} elseif ($type == 'TXT' && ! empty($content)) {
+		// check that TXT content is enclosed in " "
+		$content = encloseTXTContent($content);
+	} elseif ($type == 'SRV') {
+		if ($prio === null || $prio < 0) {
+			$errors[] = $lng['error']['dns_srv_prioempty'];
+		}
+		// check only last part of content, as it can look like:
+		// _service._proto.name. TTL class SRV priority weight port target.
+		$_split_content = explode(" ", $content);
+		// SRV content must be [weight] [port] [target]
+		if (count($_split_content) != 3) {
+			$errors[] = $lng['error']['dns_srv_invalidcontent'];
+		}
+		$target = trim($_split_content[count($_split_content) - 1]);
+		if ($target != '.') {
+			// check for trailing dot
+			if (substr($target, - 1) == '.') {
+				// remove it for checks
+				$target = substr($target, 0, - 1);
+			}
+		}
+		if ($target != '.' && ! validateDomain($target)) {
+			$errors[] = $lng['error']['dns_srv_needdom'];
+		} else {
+			// check whether there is a CNAME-record for the same resource
+			foreach ($dom_entries as $existing_entries) {
+				$fqdn = $existing_entries['record'] . '.' . $domain;
+				if ($existing_entries['type'] == 'CNAME' && $fqdn == $target) {
+					$errors[] = $lng['error']['dns_srv_noalias'];
+					break;
+				}
+			}
+		}
+		// append trailing dot if there's none
+		if (substr($content, - 1) != '.') {
+			$content .= '.';
+		}
+	}
+
+	$new_entry = array(
+		'record' => $record,
+		'type' => $type,
+		'prio' => $prio,
+		'content' => $content,
+		'ttl' => $ttl,
+		'domain_id' => $domain_id
+	);
+	ksort($new_entry);
+
+	// check for duplicate
+	foreach ($dom_entries as $existing_entry) {
+		// compare json-encoded string of array
+		$check_entry = $existing_entry;
+		// new entry has no ID yet
+		unset($check_entry['id']);
+		// sort by key
+		ksort($check_entry);
+		// format integer fields to real integer (as they are read as string from the DB)
+		$check_entry['prio'] = (int) $check_entry['prio'];
+		$check_entry['ttl'] = (int) $check_entry['ttl'];
+		$check_entry['domain_id'] = (int) $check_entry['domain_id'];
+		// encode both
+		$check_entry = json_encode($check_entry);
+		$new = json_encode($new_entry);
+		// compare
+		if ($check_entry === $new) {
+			$errors[] = $lng['error']['dns_duplicate_entry'];
+			unset($check_entry);
+			break;
+		}
+	}
+
+	if (empty($errors)) {
+		$ins_stmt = Database::prepare("
+			INSERT INTO `" . TABLE_DOMAIN_DNS . "` SET
+			`record` = :record,
+			`type` = :type,
+			`prio` = :prio,
+			`content` = :content,
+			`ttl` = :ttl,
+			`domain_id` = :domain_id
+		");
+
+		Database::pexecute($ins_stmt, $new_entry);
+
+		$new_entry_id = Database::lastInsertId();
+
+		// add temporary to the entries-array (no reread of DB necessary)
+		$new_entry['id'] = $new_entry_id;
+		$dom_entries[] = $new_entry;
+
+		// success message (inline)
 		$success_message = $lng['success']['dns_record_added'];
-	} catch (Exception $e) {
-		\Froxlor\UI\Response::dynamic_error($e->getMessage());
+
+		$record = "";
+		$type = 'A';
+		$prio = "";
+		$content = "";
+		$ttl = "";
+
+		// re-generate bind configs
+		inserttask('4');
+	} else {
+		// show $errors
+		$errors = implode("<br>", $errors);
 	}
 } elseif ($action == 'delete') {
 	// remove entry
 	$entry_id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
 	if ($entry_id > 0) {
-		try {
-			DomainZones::getLocal($userinfo, array(
-				'entry_id' => $entry_id,
-				'id' => $domain_id
-			))->delete();
-		} catch (Exception $e) {
-			$errors = str_replace("\n", "<br>", $e->getMessage());
-		}
+		$del_stmt = Database::prepare("DELETE FROM `" . TABLE_DOMAIN_DNS . "` WHERE `id` = :id");
+		Database::pexecute($del_stmt, array(
+			'id' => $entry_id
+		));
 
-		if (empty($errors)) {
-			// remove deleted entry from internal data array (no reread of DB necessary)
-			$_t = $dom_entries;
-			foreach ($_t as $idx => $entry) {
-				if ($entry['id'] == $entry_id) {
-					unset($dom_entries[$idx]);
-					break;
-				}
+		// remove deleted entry from internal data array (no reread of DB necessary)
+		$_t = $dom_entries;
+		foreach ($_t as $idx => $entry) {
+			if ($entry['id'] == $entry_id) {
+				unset($dom_entries[$idx]);
+				break;
 			}
-			unset($_t);
-			// success message (inline)
-			$success_message = $lng['success']['dns_record_deleted'];
 		}
+		unset($_t);
+		// success message (inline)
+		$success_message = $lng['success']['dns_record_deleted'];
+
+		// re-generate bind configs
+		inserttask('4');
 	}
 }
 
@@ -105,7 +299,7 @@ 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) . "\";");
+		eval("\$existing_entries.=\"" . getTemplate("dns_editor/entry_bit", true) . "\";");
 	}
 }
 
@@ -113,32 +307,19 @@ if (! empty($dom_entries)) {
 $type_select_values = array(
 	'A',
 	'AAAA',
-	'CAA',
-	'CNAME',
-	'DNAME',
-	'LOC',
-	'MX',
 	'NS',
-	'RP',
+	'MX',
 	'SRV',
-	'SSHFP',
-	'TXT'
+	'TXT',
+	'CNAME'
 );
 asort($type_select_values);
 foreach ($type_select_values as $_type) {
-	$type_select .= \Froxlor\UI\HTML::makeoption($_type, $_type, $type);
+	$type_select .= makeoption($_type, $_type, $type);
 }
 
-eval("\$record_list=\"" . \Froxlor\UI\Template::getTemplate("dns_editor/list", true) . "\";");
+eval("\$record_list=\"" . 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) . "\";");
+$zone = createDomainZone($domain_id);
+$zonefile = (string) $zone;
+eval("echo \"" . getTemplate("dns_editor/index", true) . "\";");

doc/example/FroxlorAPI.php

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

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

@@ -1,22 +0,0 @@
-<?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,102 +16,23 @@
  * @package    Panel
  *
  */
+
 define('AREA', 'login');
 require './lib/init.php';
 
-use Froxlor\Database\Database;
-use Froxlor\Settings;
-use Froxlor\FroxlorLogger;
-
 if ($action == '') {
 	$action = 'login';
 }
 
-if (session_status() == PHP_SESSION_NONE) {
-	session_start();
-}
-
-if ($action == '2fa_entercode') {
-	// page for entering the 2FA code after successful login
-	if (! isset($_SESSION) || ! isset($_SESSION['secret_2fa'])) {
-		// 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 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 ($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');
+		$loginname = validate($_POST['loginname'], 'loginname');
+		$password = validate($_POST['password'], 'password');
 
 		$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-			WHERE `loginname`= :loginname");
-		Database::pexecute($stmt, array(
-			"loginname" => $loginname
-		));
+			WHERE `loginname`= :loginname"
+		);
+		Database::pexecute($stmt, array("loginname" => $loginname));
 		$row = $stmt->fetch(PDO::FETCH_ASSOC);
 
 		if ($row['customer'] == $loginname) {
@@ -121,26 +42,21 @@ if ($action == '2fa_entercode') {
 			$is_admin = false;
 		} else {
 			$is_admin = true;
-			if ((int) Settings::Get('login.domain_login') == 1) {
-				$domainname = $idna_convert->encode(preg_replace(array(
-					'/\:(\d)+$/',
-					'/^https?\:\/\//'
-				), '', $loginname));
+			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
-				));
+					WHERE `domain` = :domain"
+				);
+				Database::pexecute($stmt, array("domain" => $domainname));
 				$row2 = $stmt->fetch(PDO::FETCH_ASSOC);
 
 				if (isset($row2['customerid']) && $row2['customerid'] > 0) {
-					$loginname = \Froxlor\Customer\Customer::getCustomerDetail($row2['customerid'], 'loginname');
+					$loginname = getCustomerDetail($row2['customerid'], 'loginname');
 					if ($loginname !== false) {
 						$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
-							WHERE `loginname`= :loginname");
-						Database::pexecute($stmt, array(
-							"loginname" => $loginname
-						));
+							WHERE `loginname`= :loginname"
+						);
+						Database::pexecute($stmt, array("loginname" => $loginname));
 						$row3 = $stmt->fetch(PDO::FETCH_ASSOC);
 						if ($row3['customer'] == $loginname) {
 							$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
@@ -153,31 +69,29 @@ if ($action == '2fa_entercode') {
 			}
 		}
 
-		if ((\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) && $is_admin == false) {
-			\Froxlor\UI\Response::redirectTo('index.php');
-			exit();
+		if ((hasUpdates($version) || hasDbUpdates($dbversion)) && $is_admin == false) {
+			redirectTo('index.php');
+			exit;
 		}
 
 		if ($is_admin) {
-			if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+			if (hasUpdates($version) || hasDbUpdates($dbversion)) {
 				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
 					WHERE `loginname`= :loginname
-					AND `change_serversettings` = '1'");
-				Database::pexecute($stmt, array(
-					"loginname" => $loginname
-				));
+					AND `change_serversettings` = '1'"
+				);
+				Database::pexecute($stmt, array("loginname" => $loginname));
 				$row = $stmt->fetch(PDO::FETCH_ASSOC);
-				if (! isset($row['admin'])) {
+				if (!isset($row['admin'])) {
 					// not an admin who can see updates
-					\Froxlor\UI\Response::redirectTo('index.php');
-					exit();
+					redirectTo('index.php');
+					exit;
 				}
 			} else {
 				$stmt = Database::prepare("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "`
-					WHERE `loginname`= :loginname");
-				Database::pexecute($stmt, array(
-					"loginname" => $loginname
-				));
+					WHERE `loginname`= :loginname"
+				);
+				Database::pexecute($stmt, array("loginname" => $loginname));
 				$row = $stmt->fetch(PDO::FETCH_ASSOC);
 			}
 
@@ -187,193 +101,202 @@ if ($action == '2fa_entercode') {
 				$adminsession = '1';
 			} else {
 				// 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.");
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => $_SERVER['REMOTE_ADDR']));
+				$rstlog->logAction(LOGIN_ACTION, LOG_WARNING, "Unknown user '" . $loginname . "' tried to login.");
 
-				\Froxlor\UI\Response::redirectTo('index.php', array(
-					'showmessage' => '2'
-				));
-				exit();
+				redirectTo('index.php', array('showmessage' => '2'));
+				exit;
 			}
 		}
 
 		$userinfo_stmt = Database::prepare("SELECT * FROM $table
-			WHERE `loginname`= :loginname");
-		Database::pexecute($userinfo_stmt, array(
-			"loginname" => $loginname
-		));
+			WHERE `loginname`= :loginname"
+		);
+		Database::pexecute($userinfo_stmt, array("loginname" => $loginname));
 		$userinfo = $userinfo_stmt->fetch(PDO::FETCH_ASSOC);
 
 		if ($userinfo['loginfail_count'] >= Settings::Get('login.maxloginattempts') && $userinfo['lastlogin_fail'] > (time() - Settings::Get('login.deactivatetime'))) {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
-				'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
+			redirectTo('index.php', array('showmessage' => '3'));
+			exit;
+		} elseif (validatePasswordLogin($userinfo, $password, $table, $uid)) {
+		    // only show "you're banned" if the login was successful
+		    // because we don't want to publish that the user does exist
+		    if ($userinfo['deactivated']) {
+		        unset($userinfo);
+		        redirectTo('index.php', array('showmessage' => '5'));
+		        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;
-			}
+		              WHERE `$uid`= :uid"
+		        );
+		        Database::pexecute($stmt, array("lastlogin_succ" => time(), "uid" => $userinfo[$uid]));
+		        $userinfo['userid'] = $userinfo[$uid];
+		        $userinfo['adminsession'] = $adminsession;
+		    }
 		} else {
 			// login incorrect
 			$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]
-			));
+				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.");
+			$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => $_SERVER['REMOTE_ADDR']));
+			$rstlog->logAction(LOGIN_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to login with wrong password.");
 
 			unset($userinfo);
-			\Froxlor\UI\Response::redirectTo('index.php', array(
-				'showmessage' => '2'
-			));
-			exit();
+			redirectTo('index.php', array('showmessage' => '2'));
+			exit;
 		}
 
-		// 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($userinfo['userid']) && $userinfo['userid'] != '') {
+			$s = md5(uniqid(microtime(), 1));
 
-				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;
+			if (isset($_POST['language'])) {
+				$language = validate($_POST['language'], 'language');
+				if ($language == 'profile') {
+					$language = $userinfo['def_language'];
+				} elseif (!isset($languages[$language])) {
+					$language = Settings::Get('panel.standardlanguage');
 				}
-
-				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();
-				}
-
-				$mail->ClearAddresses();
+			} else {
+				$language = Settings::Get('panel.standardlanguage');
 			}
-			\Froxlor\UI\Response::redirectTo('index.php', array(
-				'action' => '2fa_entercode'
-			));
-			exit();
-		}
 
-		if (! finishLogin($userinfo)) {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
-				'showmessage' => '2'
-			));
+			if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
+				$theme = $userinfo['theme'];
+			} else {
+				$theme = Settings::Get('panel.default_theme');
+			}
+
+			if (Settings::Get('session.allow_multiple_login') != '1') {
+				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "`
+					WHERE `userid` = :uid
+					AND `adminsession` = :adminsession"
+				);
+				Database::pexecute($stmt, array("uid" => $userinfo['userid'], "adminsession" => $userinfo['adminsession']));
+			}
+
+			// check for field 'theme' in session-table, refs #607
+			// Changed with #1287 to new method
+			$theme_field = false;
+			$stmt = Database::query("SHOW COLUMNS FROM panel_sessions LIKE 'theme'");
+			while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+				if ($row['Field'] == "theme") {
+					$has_theme = true;
+				}
+			}
+
+			$params = array(
+				"hash" => $s,
+				"userid" => $userinfo['userid'],
+				"ipaddress" => $remote_addr,
+				"useragent" => $http_user_agent,
+				"lastactivity" => time(),
+				"language" => $language,
+				"adminsession" => $userinfo['adminsession']
+			);
+
+			if ($has_theme) {
+				$params["theme"] = $theme;
+				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
+					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`)
+					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession, :theme)"
+				);
+			} else {
+				$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
+					(`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`)
+					VALUES (:hash, :userid, :ipaddress, :useragent, :lastactivity, :language, :adminsession)"
+				);
+			}
+			Database::pexecute($stmt, $params);
+
+			$qryparams = array();
+			if (isset($_POST['qrystr']) && $_POST['qrystr'] != "") {
+				parse_str(urldecode($_POST['qrystr']), $qryparams);
+			}
+			$qryparams['s'] = $s;
+
+			if ($userinfo['adminsession'] == '1') {
+				if (hasUpdates($version) || hasDbUpdates($dbversion)) {
+					redirectTo('admin_updates.php', array('s' => $s));
+				} else {
+					if (isset($_POST['script']) && $_POST['script'] != "") {
+						if (preg_match("/customer\_/", $_POST['script']) === 1) {
+							redirectTo('admin_customers.php', array("page" => "customers"));
+						} else {
+							redirectTo($_POST['script'], $qryparams);
+						}
+					} else {
+						redirectTo('admin_index.php', $qryparams);
+					}
+				}
+			} else {
+				if (isset($_POST['script']) && $_POST['script'] != "") {
+					redirectTo($_POST['script'], $qryparams);
+				} else {
+					redirectTo('customer_index.php', $qryparams);
+				}
+			}
+		} else {
+			redirectTo('index.php', array('showmessage' => '2'));
 		}
-		exit();
+		exit;
 	} else {
 		$language_options = '';
-		$language_options .= \Froxlor\UI\HTML::makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
+		$language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
 
 		foreach ($languages as $language_file => $language_name) {
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, 'profile', true);
+			$language_options .= 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 = '';
 
 		switch ($smessage) {
-			case 1:
-				$successmessage = $lng['pwdreminder']['success'];
-				break;
-			case 2:
-				$message = $lng['error']['login'];
-				break;
-			case 3:
-				$message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime'));
-				break;
-			case 4:
-				$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
-				$message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']);
-				break;
-			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;
+		case 1:
+			$successmessage = $lng['pwdreminder']['success'];
+			break;
+		case 2:
+			$message = $lng['error']['login'];
+			break;
+		case 3:
+			$message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime'));
+			break;
+		case 4:
+			$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
+			$message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']);
+			break;
+		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 (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) {
+		if (hasUpdates($version) || hasDbUpdates($dbversion)) {
 			$update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
 		}
-
+		
 		// Pass the last used page if needed
 		$lastscript = "";
 		if (isset($_REQUEST['script']) && $_REQUEST['script'] != "") {
 			$lastscript = $_REQUEST['script'];
 
-			if (! file_exists(__DIR__ . "/" . $lastscript)) {
+			if (!file_exists(__DIR__."/".$lastscript)) {
 				$lastscript = "";
 			}
 		}
@@ -382,7 +305,7 @@ if ($action == '2fa_entercode') {
 			$lastqrystr = htmlspecialchars($_REQUEST['qrystr'], ENT_QUOTES);
 		}
 
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('login') . "\";");
+		eval("echo \"" . getTemplate('login') . "\";");
 	}
 }
 
@@ -391,24 +314,20 @@ if ($action == 'forgotpwd') {
 	$message = '';
 
 	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 . "`
+		$loginname = validate($_POST['loginname'], 'loginname');
+		$email = validateEmail($_POST['loginemail'], 'email');
+		$result_stmt = Database::prepare("SELECT `adminid`, `customerid`, `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
-		));
+			AND `email`= :email"
+		);
+		Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
 
 		if (Database::num_rows() == 0) {
 			$result_stmt = Database::prepare("SELECT `adminid`, `name`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_ADMINS . "`
 				WHERE `loginname`= :loginname
-				AND `email`= :email");
-			Database::pexecute($result_stmt, array(
-				"loginname" => $loginname,
-				"email" => $email
-			));
+				AND `email`= :email"
+			);
+			Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
 
 			if (Database::num_rows() > 0) {
 				$adminchecked = true;
@@ -422,24 +341,23 @@ if ($action == 'forgotpwd') {
 
 			/* Check whether user is banned */
 			if ($user['deactivated']) {
-				\Froxlor\UI\Response::redirectTo('index.php', array(
-					'showmessage' => '8'
-				));
-				exit();
+				redirectTo('index.php', array('showmessage' => '8'));
+				exit;
 			}
 
 			if (($adminchecked && Settings::Get('panel.allow_preset_admin') == '1') || $adminchecked == false) {
 				if ($user !== false) {
 					// build a activation code
 					$timestamp = time();
-					$first = substr(md5($user['loginname'] . $timestamp . \Froxlor\PhpHelper::randomStr(16)), 0, 15);
-					$third = substr(md5($user['email'] . $timestamp . \Froxlor\PhpHelper::randomStr(16)), - 15);
+					$first = substr(md5($user['loginname'] . $timestamp . randomStr(16)), 0, 15);
+					$third = substr(md5($user['email'] . $timestamp . randomStr(16)), -15);
 					$activationcode = $first . $timestamp . $third . substr(md5($third . $timestamp), 0, 10);
 
 					// Drop all existing activation codes for this user
 					$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
 						WHERE `userid` = :userid
-						AND `admin` = :admin");
+						AND `admin` = :admin"
+					);
 					$params = array(
 						"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
 						"admin" => $adminchecked ? 1 : 0
@@ -449,7 +367,8 @@ if ($action == 'forgotpwd') {
 					// Add new activation code to database
 					$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_ACTIVATION . "`
 						(userid, admin, creation, activationcode)
-						VALUES (:userid, :admin, :creation, :activationcode)");
+						VALUES (:userid, :admin, :creation, :activationcode)"
+					);
 					$params = array(
 						"userid" => $adminchecked ? $user['adminid'] : $user['customerid'],
 						"admin" => $adminchecked ? 1 : 0,
@@ -458,13 +377,11 @@ if ($action == 'forgotpwd') {
 					);
 					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.");
+					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+					$rstlog->logAction(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';
+					$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'] : '';
@@ -475,16 +392,12 @@ if ($action == 'forgotpwd') {
 					// there can be only one script to handle this so we can use a fixed value here
 					$script = "/index.php"; // $_SERVER['SCRIPT_NAME'];
 					if (Settings::Get('system.froxlordirectlyviahostname') == 0) {
-						$script = \Froxlor\FileDir::makeCorrectFile("/" . basename(__DIR__) . "/" . $script);
+						$script = makeCorrectFile("/".basename(__DIR__)."/".$script);
 					}
 					$activationlink = $protocol . '://' . $host . $port . $script . '?action=resetpwd&resetcode=' . $activationcode;
 
 					$replace_arr = array(
-						'SALUTATION' => \Froxlor\User::getCorrectUserSalutation($user),
-						'NAME' => $user['name'],
-						'FIRSTNAME' => $user['firstname'] ?? "",
-						'COMPANY' => $user['company'] ?? "",
-						'CUSTOMER_NO' => $user['customernumber'] ?? 0,
+						'SALUTATION' => getCorrectUserSalutation($user),
 						'USERNAME' => $loginname,
 						'LINK' => $activationlink
 					);
@@ -494,35 +407,30 @@ if ($action == 'forgotpwd') {
 						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
-					));
+						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));
+					$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['subject']), $replace_arr));
 
 					$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
 						WHERE `adminid`= :adminid
 						AND `language`= :lang
 						AND `templategroup`=\'mails\'
-						AND `varname`=\'password_reset_mailbody\'');
-					Database::pexecute($result_stmt, array(
-						"adminid" => $user['adminid'],
-						"lang" => $def_language
-					));
+						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));
+					$mail_body = html_entity_decode(replace_variables((($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'], \Froxlor\User::getCorrectUserSalutation($user));
+						$mail->AddAddress($user['email'], getCorrectUserSalutation($user));
 						$mail->Send();
-					} catch (\PHPMailer\PHPMailer\Exception $e) {
+					} catch(phpmailerException $e) {
 						$mailerr_msg = $e->errorMessage();
 						$_mailerror = true;
 					} catch (Exception $e) {
@@ -531,27 +439,18 @@ if ($action == 'forgotpwd') {
 					}
 
 					if ($_mailerror) {
-						$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();
+						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+						$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+						redirectTo('index.php', array('showmessage' => '4', 'customermail' => $user['email']));
+						exit;
 					}
 
 					$mail->ClearAddresses();
-					\Froxlor\UI\Response::redirectTo('index.php', array(
-						'showmessage' => '1'
-					));
-					exit();
+					redirectTo('index.php', array('showmessage' => '1'));
+					exit;
 				} else {
-					$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!");
+					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!");
 					$message = $lng['login']['combination_not_found'];
 				}
 
@@ -565,7 +464,7 @@ if ($action == 'forgotpwd') {
 	if ($adminchecked) {
 		if (Settings::Get('panel.allow_preset_admin') != '1') {
 			$message = $lng['pwdreminder']['notallowed'];
-			unset($adminchecked);
+			unset ($adminchecked);
 		}
 	} else {
 		if (Settings::Get('panel.allow_preset') != '1') {
@@ -573,7 +472,7 @@ if ($action == 'forgotpwd') {
 		}
 	}
 
-	eval("echo \"" . \Froxlor\UI\Template::getTemplate('fpwd') . "\";");
+	eval("echo \"" . getTemplate('fpwd') . "\";");
 }
 
 if ($action == 'resetpwd') {
@@ -581,10 +480,9 @@ if ($action == 'resetpwd') {
 
 	// Remove old activation codes
 	$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_ACTIVATION . "`
-		WHERE creation < :oldest");
-	Database::pexecute($stmt, array(
-		"oldest" => time() - 86400
-	));
+		WHERE creation < :oldest"
+	);
+	Database::pexecute($stmt, array("oldest" => time() - 86400));
 
 	if (isset($_GET['resetcode']) && strlen($_GET['resetcode']) == 50) {
 		// Check if activation code is valid
@@ -596,170 +494,63 @@ if ($action == 'resetpwd') {
 		if (substr(md5($third . $timestamp), 0, 10) == $check && $timestamp >= time() - 86400) {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				$stmt = Database::prepare("SELECT `userid`, `admin` FROM `" . TABLE_PANEL_ACTIVATION . "`
-					WHERE `activationcode` = :activationcode");
-				$result = Database::pexecute_first($stmt, array(
-					"activationcode" => $activationcode
-				));
+					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 ($result['admin'] == 1) {
+						$new_password = validate($_POST['new_password'], 'new password');
+						$new_password_confirm = validate($_POST['new_password_confirm'], 'new password confirm');
+					} else {
+						$new_password = validatePassword($_POST['new_password'], 'new password');
+						$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
 					}
 
-					if (empty($message) && (empty($new_password) || $new_password != $new_password_confirm)) {
-						$message = $lng['error']['newpasswordconfirmerror'];
-					}
-
-					if (empty($message)) {
+					if ($new_password == '') {
+						$message = $new_password;
+					} elseif ($new_password_confirm == '') {
+						$message = $new_password_confirm;
+					} elseif ($new_password != $new_password_confirm) {
+						$message = $new_password . " != " . $new_password_confirm;
+					} else {
 						// Update user password
 						if ($result['admin'] == 1) {
 							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_ADMINS . "`
 								SET `password` = :newpassword
-								WHERE `adminid` = :userid");
+								WHERE `adminid` = :userid"
+							);
 						} else {
 							$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
 								SET `password` = :newpassword
-								WHERE `customerid` = :userid");
+								WHERE `customerid` = :userid"
+							);
 						}
-						Database::pexecute($stmt, array(
-							"newpassword" => \Froxlor\System\Crypt::makeCryptPassword($new_password),
-							"userid" => $result['userid']
-						));
+						Database::pexecute($stmt, array("newpassword" => 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.");
+						$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'));
+						$rstlog->logAction(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'
-						));
+							AND `userid` = :userid"
+						);
+						Database::pexecute($stmt, array("activationcode" => $activationcode, "userid" => $result['userid']));
+						redirectTo('index.php', array("showmessage" => '6'));
 					}
 				} else {
-					\Froxlor\UI\Response::redirectTo('index.php', array(
-						"showmessage" => '7'
-					));
+					redirectTo('index.php', array("showmessage" => '7'));
 				}
 			}
 
-			eval("echo \"" . \Froxlor\UI\Template::getTemplate('rpwd') . "\";");
+			eval("echo \"" . getTemplate('rpwd') . "\";");
+
 		} else {
-			\Froxlor\UI\Response::redirectTo('index.php', array(
-				"showmessage" => '7'
-			));
+			redirectTo('index.php', array("showmessage" => '7'));
 		}
+
 	} else {
-		\Froxlor\UI\Response::redirectTo('index.php');
+		redirectTo('index.php');
 	}
 }
-
-function finishLogin($userinfo)
-{
-	global $version, $dbversion, $remote_addr, $http_user_agent, $languages;
-
-	if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
-		$s = md5(uniqid(microtime(), 1));
-
-		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/froxlor.sql

@@ -8,7 +8,7 @@ CREATE TABLE `ftp_groups` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `groupname` (`groupname`),
   KEY `customerid` (`customerid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -33,7 +33,7 @@ CREATE TABLE `ftp_users` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`),
   KEY `customerid` (`customerid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -57,7 +57,7 @@ CREATE TABLE `mail_users` (
   `mboxsize` bigint(30) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `email` (`email`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -73,7 +73,7 @@ CREATE TABLE `mail_virtual` (
   `iscatchall` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `email` (`email`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 DROP TABLE IF EXISTS `panel_activation`;
@@ -84,7 +84,7 @@ CREATE TABLE `panel_activation` (
   `creation` int(11) unsigned NOT NULL default '0',
   `activationcode` varchar(50) default NULL,
   PRIMARY KEY (id)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM  CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 DROP TABLE IF EXISTS `panel_admins`;
@@ -94,8 +94,8 @@ CREATE TABLE `panel_admins` (
   `password` varchar(255) NOT NULL default '',
   `name` varchar(255) NOT NULL default '',
   `email` varchar(255) NOT NULL default '',
-  `def_language` varchar(100) NOT NULL default '',
-  `ip` varchar(500) NOT NULL default '-1',
+  `def_language` varchar(255) NOT NULL default '',
+  `ip` tinyint(4) NOT NULL default '-1',
   `customers` int(15) NOT NULL default '0',
   `customers_used` int(15) NOT NULL default '0',
   `customers_see_all` tinyint(1) NOT NULL default '0',
@@ -118,6 +118,9 @@ CREATE TABLE `panel_admins` (
   `email_quota_used` bigint(13) NOT NULL default '0',
   `ftps` int(15) NOT NULL default '0',
   `ftps_used` int(15) NOT NULL default '0',
+  `tickets` int(15) NOT NULL default '-1',
+  `tickets_used` int(15) NOT NULL default '0',
+  `tickets_see_all` tinyint(1) NOT NULL default '0',
   `subdomains` int(15) NOT NULL default '0',
   `subdomains_used` int(15) NOT NULL default '0',
   `traffic` bigint(30) NOT NULL default '0',
@@ -127,15 +130,12 @@ CREATE TABLE `panel_admins` (
   `lastlogin_fail` int(11) unsigned NOT NULL default '0',
   `loginfail_count` int(11) unsigned NOT NULL default '0',
   `reportsent` tinyint(4) unsigned NOT NULL default '0',
-  `theme` varchar(50) NOT NULL default 'Sparkle',
+  `theme` varchar(255) NOT NULL default 'Sparkle',
   `custom_notes` text,
   `custom_notes_show` tinyint(1) NOT NULL default '0',
-  `type_2fa` tinyint(1) NOT NULL default '0',
-  `data_2fa` varchar(25) NOT NULL default '',
-  `api_allowed` tinyint(1) NOT NULL default '1',
    PRIMARY KEY  (`adminid`),
    UNIQUE KEY `loginname` (`loginname`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -150,13 +150,13 @@ CREATE TABLE `panel_customers` (
   `gender` int(1) NOT NULL DEFAULT '0',
   `company` varchar(255) NOT NULL default '',
   `street` varchar(255) NOT NULL default '',
-  `zipcode` varchar(25) NOT NULL default '',
+  `zipcode` varchar(255) NOT NULL default '',
   `city` varchar(255) NOT NULL default '',
-  `phone` varchar(50) NOT NULL default '',
-  `fax` varchar(50) NOT NULL default '',
+  `phone` varchar(255) NOT NULL default '',
+  `fax` varchar(255) NOT NULL default '',
   `email` varchar(255) NOT NULL default '',
   `customernumber` varchar(255) NOT NULL default '',
-  `def_language` varchar(100) NOT NULL default '',
+  `def_language` varchar(255) NOT NULL default '',
   `diskspace` bigint(30) NOT NULL default '0',
   `diskspace_used` bigint(30) NOT NULL default '0',
   `mysqls` int(15) NOT NULL default '0',
@@ -171,6 +171,8 @@ CREATE TABLE `panel_customers` (
   `email_quota_used` bigint(13) NOT NULL default '0',
   `ftps` int(15) NOT NULL default '0',
   `ftps_used` int(15) NOT NULL default '0',
+  `tickets` int(15) NOT NULL default '0',
+  `tickets_used` int(15) NOT NULL default '0',
   `subdomains` int(15) NOT NULL default '0',
   `subdomains_used` int(15) NOT NULL default '0',
   `traffic` bigint(30) NOT NULL default '0',
@@ -190,20 +192,17 @@ CREATE TABLE `panel_customers` (
   `imap` tinyint(1) NOT NULL default '1',
   `perlenabled` tinyint(1) NOT NULL default '0',
   `dnsenabled` tinyint(1) NOT NULL default '0',
-  `theme` varchar(50) NOT NULL default 'Sparkle',
+  `theme` varchar(255) NOT NULL default 'Sparkle',
   `custom_notes` text,
   `custom_notes_show` tinyint(1) NOT NULL default '0',
   `lepublickey` mediumtext default NULL,
   `leprivatekey` mediumtext default NULL,
   `leregistered` tinyint(1) NOT NULL default '0',
+  `leaccount` varchar(255) default '',
   `allowed_phpconfigs` varchar(500) NOT NULL default '',
-  `type_2fa` tinyint(1) NOT NULL default '0',
-  `data_2fa` varchar(25) NOT NULL default '',
-  `api_allowed` tinyint(1) NOT NULL default '1',
-  `logviewenabled` tinyint(1) NOT NULL default '0',
    PRIMARY KEY  (`customerid`),
    UNIQUE KEY `loginname` (`loginname`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -216,7 +215,7 @@ CREATE TABLE `panel_databases` (
   `dbserver` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -224,7 +223,6 @@ DROP TABLE IF EXISTS `panel_domains`;
 CREATE TABLE `panel_domains` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `domain` varchar(255) NOT NULL default '',
-  `domain_ace` varchar(255) NOT NULL default '',
   `adminid` int(11) unsigned NOT NULL default '0',
   `customerid` int(11) unsigned NOT NULL default '0',
   `aliasdomain` int(11) unsigned NULL,
@@ -248,8 +246,6 @@ CREATE TABLE `panel_domains` (
   `speciallogfile` tinyint(1) NOT NULL default '0',
   `ssl_redirect` tinyint(4) NOT NULL default '0',
   `specialsettings` text,
-  `ssl_specialsettings` text,
-  `include_specialsettings` tinyint(1) NOT NULL default '0',
   `deactivated` tinyint(1) NOT NULL default '0',
   `bindserial` varchar(10) NOT NULL default '2000010100',
   `add_date` int( 11 ) NOT NULL default '0',
@@ -266,20 +262,11 @@ CREATE TABLE `panel_domains` (
   `ocsp_stapling` tinyint(1) DEFAULT '0',
   `http2` tinyint(1) DEFAULT '0',
   `notryfiles` tinyint(1) DEFAULT '0',
-  `writeaccesslog` tinyint(1) DEFAULT '1',
-  `writeerrorlog` tinyint(1) DEFAULT '1',
-  `override_tls` tinyint(1) DEFAULT '0',
-  `ssl_protocols` text,
-  `ssl_cipher_list` text,
-  `tlsv13_cipher_list` text,
-  `ssl_enabled` tinyint(1) DEFAULT '1',
-  `ssl_honorcipherorder` tinyint(1) DEFAULT '0',
-  `ssl_sessiontickets` tinyint(1) DEFAULT '1',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`),
   KEY `parentdomain` (`parentdomainid`),
   KEY `domain` (`domain`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -300,13 +287,9 @@ CREATE TABLE `panel_ipsandports` (
   `default_vhostconf_domain` text,
   `ssl_cert_chainfile` varchar(255) NOT NULL default '',
   `docroot` varchar(255) NOT NULL default '',
-  `ssl_specialsettings` text,
-  `include_specialsettings` tinyint(1) NOT NULL default '0',
-  `ssl_default_vhostconf_domain` text,
-  `include_default_vhostconf_domain` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `ip_port` (`ip`,`port`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -322,7 +305,7 @@ CREATE TABLE `panel_htaccess` (
   `error401path` varchar(255) NOT NULL default '',
   `options_cgi` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -336,7 +319,7 @@ CREATE TABLE `panel_htpasswds` (
   `authname` varchar(255) NOT NULL default 'Restricted Area',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -365,7 +348,7 @@ CREATE TABLE `panel_settings` (
   `varname` varchar(255) NOT NULL default '',
   `value` text NOT NULL,
   PRIMARY KEY  (`settingid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('catchall', 'catchall_enabled', '1'),
@@ -377,6 +360,17 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('customer', 'ftpatdomain', '0'),
 	('customer', 'show_news_feed', '0'),
 	('customer', 'news_feed_url', ''),
+	('ticket', 'noreply_email', 'NO-REPLY@SERVERNAME'),
+	('ticket', 'worktime_all', '1'),
+	('ticket', 'worktime_begin', '00:00'),
+	('ticket', 'worktime_end', '23:59'),
+	('ticket', 'worktime_sat', '0'),
+	('ticket', 'worktime_sun', '0'),
+	('ticket', 'archiving_days', '5'),
+	('ticket', 'enabled', '1'),
+	('ticket', 'concurrently_open', '5'),
+	('ticket', 'noreply_name', 'Hosting Support'),
+	('ticket', 'reset_cycle', '2'),
 	('logger', 'enabled', '1'),
 	('logger', 'log_cron', '0'),
 	('logger', 'logfile', ''),
@@ -390,18 +384,20 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('admin', 'show_news_feed', '0'),
 	('admin', 'show_version_login', '0'),
 	('admin', 'show_version_footer', '0'),
-	('caa', 'caa_entry', ''),
 	('spf', 'use_spf', '0'),
 	('spf', 'spf_entry', '"v=spf1 a mx -all"'),
 	('dkim', 'dkim_algorithm', 'all'),
+	('dkim', 'dkim_add_adsp', '1'),
 	('dkim', 'dkim_keylength', '1024'),
 	('dkim', 'dkim_servicetype', '0'),
+	('dkim', 'dkim_add_adsppolicy', '1'),
 	('dkim', 'dkim_notes', ''),
 	('defaultwebsrverrhandler', 'enabled', '0'),
 	('defaultwebsrverrhandler', 'err401', ''),
 	('defaultwebsrverrhandler', 'err403', ''),
 	('defaultwebsrverrhandler', 'err404', ''),
 	('defaultwebsrverrhandler', 'err500', ''),
+	('ticket', 'default_priority', '2'),
 	('customredirect', 'enabled', '1'),
 	('customredirect', 'default', '1'),
 	('perl', 'suexecworkaround', '0'),
@@ -420,7 +416,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('phpfpm', 'defaultini', '1'),
 	('phpfpm', 'vhost_defaultini', '2'),
 	('phpfpm', 'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'),
-	('phpfpm', 'use_mod_proxy', '1'),
+	('phpfpm', 'use_mod_proxy', '0'),
 	('phpfpm', 'ini_flags', 'asp_tags
 display_errors
 display_startup_errors
@@ -536,7 +532,6 @@ opcache.interned_strings_buffer'),
 	('system', 'mysql_access_host', 'localhost'),
 	('system', 'lastcronrun', ''),
 	('system', 'defaultip', '1'),
-	('system', 'defaultsslip', ''),
 	('system', 'phpappendopenbasedir', '/tmp/'),
 	('system', 'deactivateddocroot', ''),
 	('system', 'mailpwcleartext', '0'),
@@ -573,12 +568,10 @@ opcache.interned_strings_buffer'),
 	('system', 'stdsubdomain', ''),
 	('system', 'awstats_path', '/usr/bin/'),
 	('system', 'awstats_conf', '/etc/awstats/'),
-	('system', 'awstats_logformat', '1'),
 	('system', 'defaultttl', '604800'),
 	('system', 'mod_fcgid_defaultini', '1'),
 	('system', 'ftpserver', 'proftpd'),
 	('system', 'dns_createmailentry', '0'),
-	('system', 'dns_createcaaentry', '1'),
 	('system', 'froxlordirectlyviahostname', '0'),
 	('system', 'report_enable', '1'),
 	('system', 'report_webmax', '90'),
@@ -631,10 +624,10 @@ opcache.interned_strings_buffer'),
 	('system', 'letsencryptkeysize', '4096'),
 	('system', 'letsencryptreuseold', 0),
 	('system', 'leenabled', '0'),
-	('system', 'leapiversion', '2'),
+	('system', 'leapiversion', '1'),
 	('system', 'backupenabled', '0'),
 	('system', 'dnsenabled', '0'),
-	('system', 'dns_server', 'Bind'),
+	('system', 'dns_server', 'bind'),
 	('system', 'apacheglobaldiropt', ''),
 	('system', 'allow_customer_shell', '0'),
 	('system', 'available_shells', ''),
@@ -652,26 +645,14 @@ opcache.interned_strings_buffer'),
 	('system', 'hsts_incsub', '0'),
 	('system', 'hsts_preload', '0'),
 	('system', 'leregistered', '0'),
-	('system', 'leaccount', ''),
+  ('system', 'leaccount', ''),
 	('system', 'nssextrausers', '0'),
-	('system', 'le_domain_dnscheck', '1'),
-	('system', 'ssl_protocols', 'TLSv1.2'),
-	('system', 'tlsv13_cipher_list', ''),
-	('system', 'honorcipherorder', '0'),
-	('system', 'sessiontickets', '1'),
-	('system', 'sessionticketsenabled', '1'),
+	('system', 'disable_le_selfcheck', '0'),
+	('system', 'ssl_protocols', 'TLSv1,TLSv1.2'),
 	('system', 'logfiles_format', ''),
 	('system', 'logfiles_type', '1'),
 	('system', 'logfiles_piped', '0'),
 	('system', 'logfiles_script', ''),
-	('system', 'dhparams_file', ''),
-	('system', 'errorlog_level', 'warn'),
-	('system', 'leecc', '0'),
-	('system', 'froxloraliases', ''),
-	('system', 'apply_specialsettings_default', '1'),
-	('system', 'apply_phpconfigs_default', '1'),
-	('api', 'enabled', '0'),
-	('2fa', 'enabled', '1'),
 	('panel', 'decimal_places', '4'),
 	('panel', 'adminmail', 'admin@SERVERNAME'),
 	('panel', 'phpmyadmin_url', ''),
@@ -703,9 +684,8 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char_required', '0'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
-	('panel', 'is_configured', '0'),
-	('panel', 'version', '0.10.21'),
-	('panel', 'db_version', '202009070');
+	('panel', 'version', '0.9.40.1'),
+	('panel', 'db_version', '201809280');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
@@ -714,7 +694,7 @@ CREATE TABLE `panel_tasks` (
   `type` int(11) NOT NULL default '0',
   `data` text,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO `panel_tasks` (`type`) VALUES ('99');
 
@@ -729,7 +709,7 @@ CREATE TABLE `panel_templates` (
   `value` longtext NOT NULL,
   PRIMARY KEY  (id),
   KEY adminid (adminid)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -747,7 +727,7 @@ CREATE TABLE `panel_traffic` (
   `mail` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -765,7 +745,7 @@ CREATE TABLE `panel_traffic_admins` (
   `mail` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `adminid` (`adminid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -782,7 +762,24 @@ CREATE TABLE `panel_diskspace` (
   `mysql` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
+
+
+
+DROP TABLE IF EXISTS `panel_diskspace_admins`;
+CREATE TABLE `panel_diskspace_admins` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `adminid` int(11) unsigned NOT NULL default '0',
+  `year` int(4) unsigned zerofill NOT NULL default '0000',
+  `month` int(2) unsigned zerofill NOT NULL default '00',
+  `day` int(2) unsigned zerofill NOT NULL default '00',
+  `stamp` int(11) unsigned NOT NULL default '0',
+  `webspace` bigint(30) unsigned NOT NULL default '0',
+  `mail` bigint(30) unsigned NOT NULL default '0',
+  `mysql` bigint(30) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `adminid` (`adminid`)
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -793,7 +790,7 @@ CREATE TABLE `panel_languages` (
   `iso` char(3) NOT NULL DEFAULT 'foo',
   `file` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -807,6 +804,41 @@ INSERT INTO `panel_languages` (`id`, `language`, `iso`, `file`) VALUES
     (7, 'Svenska', 'sv', 'lng/swedish.lng.php');
 
 
+
+DROP TABLE IF EXISTS `panel_tickets`;
+CREATE TABLE `panel_tickets` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `customerid` int(11) NOT NULL,
+  `adminid` int(11) NOT NULL,
+  `category` smallint(5) unsigned NOT NULL default '1',
+  `priority` enum('1','2','3') NOT NULL default '3',
+  `subject` varchar(70) NOT NULL,
+  `message` text NOT NULL,
+  `dt` int(15) NOT NULL,
+  `lastchange` int(15) NOT NULL,
+  `ip` varchar(39) NOT NULL default '',
+  `status` enum('0','1','2','3') NOT NULL default '1',
+  `lastreplier` enum('0','1') NOT NULL default '0',
+  `answerto` int(11) unsigned NOT NULL,
+  `by` enum('0','1') NOT NULL default '0',
+  `archived` enum('0','1') NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `customerid` (`customerid`)
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
+
+
+
+DROP TABLE IF EXISTS `panel_ticket_categories`;
+CREATE TABLE `panel_ticket_categories` (
+  `id` smallint(5) unsigned NOT NULL auto_increment,
+  `name` varchar(60) NOT NULL,
+  `adminid` int(11) NOT NULL,
+  `logicalorder` int(3) NOT NULL default '1',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
+
+
+
 DROP TABLE IF EXISTS `panel_syslog`;
 CREATE TABLE IF NOT EXISTS `panel_syslog` (
   `logid` bigint(20) NOT NULL auto_increment,
@@ -816,7 +848,7 @@ CREATE TABLE IF NOT EXISTS `panel_syslog` (
   `user` varchar(50) NOT NULL,
   `text` text NOT NULL,
   PRIMARY KEY  (`logid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -826,24 +858,23 @@ CREATE TABLE `panel_fpmdaemons` (
   `description` varchar(50) NOT NULL,
   `reload_cmd` varchar(255) NOT NULL,
   `config_dir` varchar(255) NOT NULL,
-  `pm` varchar(15) NOT NULL DEFAULT 'dynamic',
-  `max_children` int(4) NOT NULL DEFAULT '5',
-  `start_servers` int(4) NOT NULL DEFAULT '2',
-  `min_spare_servers` int(4) NOT NULL DEFAULT '1',
-  `max_spare_servers` int(4) NOT NULL DEFAULT '3',
+  `pm` varchar(15) NOT NULL DEFAULT 'static',
+  `max_children` int(4) NOT NULL DEFAULT '1',
+  `start_servers` int(4) NOT NULL DEFAULT '20',
+  `min_spare_servers` int(4) NOT NULL DEFAULT '5',
+  `max_spare_servers` int(4) NOT NULL DEFAULT '35',
   `max_requests` int(4) NOT NULL DEFAULT '0',
-  `idle_timeout` int(4) NOT NULL DEFAULT '10',
+  `idle_timeout` int(4) NOT NULL DEFAULT '30',
   `limit_extensions` varchar(255) NOT NULL default '.php',
-  `custom_config` text,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `reload` (`reload_cmd`),
   UNIQUE KEY `config` (`config_dir`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
 INSERT INTO `panel_fpmdaemons` (`id`, `description`, `reload_cmd`, `config_dir`) VALUES
-(1, 'System default', 'service php7.3-fpm restart', '/etc/php/7.3/fpm/pool.d/');
+(1, 'System default', 'service php7.0-fpm restart', '/etc/php/7.0/fpm/pool.d/');
 
 
 
@@ -863,23 +894,23 @@ CREATE TABLE `panel_phpconfigs` (
   `fpmsettingid` int(11) NOT NULL DEFAULT '1',
   `pass_authorizationheader` tinyint(1) NOT NULL default '0',
   `override_fpmconfig` tinyint(1) NOT NULL DEFAULT '0',
-  `pm` varchar(15) NOT NULL DEFAULT 'dynamic',
-  `max_children` int(4) NOT NULL DEFAULT '5',
-  `start_servers` int(4) NOT NULL DEFAULT '2',
-  `min_spare_servers` int(4) NOT NULL DEFAULT '1',
-  `max_spare_servers` int(4) NOT NULL DEFAULT '3',
+  `pm` varchar(15) NOT NULL DEFAULT 'static',
+  `max_children` int(4) NOT NULL DEFAULT '1',
+  `start_servers` int(4) NOT NULL DEFAULT '20',
+  `min_spare_servers` int(4) NOT NULL DEFAULT '5',
+  `max_spare_servers` int(4) NOT NULL DEFAULT '35',
   `max_requests` int(4) NOT NULL DEFAULT '0',
-  `idle_timeout` int(4) NOT NULL DEFAULT '10',
+  `idle_timeout` int(4) NOT NULL DEFAULT '30',
   `limit_extensions` varchar(255) NOT NULL default '.php',
   PRIMARY KEY  (`id`),
   KEY `fpmsettingid` (`fpmsettingid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
 INSERT INTO `panel_phpconfigs` (`id`, `description`, `binary`, `file_extensions`, `mod_fcgid_starter`, `mod_fcgid_maxrequests`, `phpsettings`) VALUES
-(1, 'Default Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_url_fopen = Off\r\nallow_url_include = Off\r\nauto_append_file =\r\nauto_globals_jit = On\r\nauto_prepend_file =\r\nbcmath.scale = 0\r\ncli_server.color = On\r\ndefault_charset = "UTF-8"\r\ndefault_mimetype = "text/html"\r\ndefault_socket_timeout = 60\r\nasp_tags = Off\r\ndisable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,curl_exec,curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\ndoc_root =\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\nhtml_errors = On\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nimplicit_flush = Off\r\nldap.max_links = -1\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmail.add_x_header = Off\r\nmax_execution_time = 30\r\nmax_file_uploads = 20\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\n{OPEN_BASEDIR_C}open_basedir = "{OPEN_BASEDIR}"\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nreport_memleaks = On\r\nrequest_order = "GP"\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nserialize_precision = -1\r\nsession.auto_start = 0\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_httponly =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.cookie_samesite =\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 0\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.sid_bits_per_character = 5\r\nsession.sid_length = 26\r\nsession.trans_sid_tags = "a=href,area=href,frame=src,form="\r\nsession.use_cookies = 1\r\nsession.use_only_cookies = 1\r\nsession.use_strict_mode = 0\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\nopcache.restrict_api = "{DOCUMENT_ROOT}"\r\n'),
-(2, 'Froxlor Vhost Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_url_fopen = On\r\nallow_url_include = Off\r\nauto_append_file =\r\nauto_globals_jit = On\r\nauto_prepend_file =\r\nbcmath.scale = 0\r\ncli_server.color = On\r\ndefault_charset = "UTF-8"\r\ndefault_mimetype = "text/html"\r\ndefault_socket_timeout = 60\r\nasp_tags = Off\r\ndisable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,curl_multi_exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\ndoc_root =\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\nhtml_errors = On\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nimplicit_flush = Off\r\nldap.max_links = -1\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmail.add_x_header = Off\r\nmax_execution_time = 60\r\nmax_file_uploads = 20\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nreport_memleaks = On\r\nrequest_order = "GP"\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nserialize_precision = -1\r\nsession.auto_start = 0\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_httponly =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.cookie_samesite =\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 0\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.sid_bits_per_character = 5\r\nsession.sid_length = 26\r\nsession.trans_sid_tags = "a=href,area=href,frame=src,form="\r\nsession.use_cookies = 1\r\nsession.use_only_cookies = 1\r\nsession.use_strict_mode = 0\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\nopcache.restrict_api = ""\r\n');
+(1, 'Default Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_call_time_pass_reference = Off\r\nallow_url_fopen = Off\r\nasp_tags = Off\r\ndisable_classes =\r\ndisable_functions = curl_exec,curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\ncgi.force_redirect = 1\r\ngpc_order = "GPC"\r\nhtml_errors = Off\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\nmax_execution_time = 30\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\n{OPEN_BASEDIR_C}open_basedir = "{OPEN_BASEDIR}"\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nregister_globals = Off\r\nreport_memleaks = On\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nsession.auto_start = 0\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.entropy_file = /dev/urandom\r\nsession.entropy_length = 16\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 1\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.use_cookies = 1\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nsuhosin.mail.protect = 1\r\nsuhosin.simulation = Off\r\ntrack_errors = Off\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\n;mail.add_x_header = On\r\n;mail.log = "/var/log/phpmail.log"\r\nopcache.restrict_api = "{DOCUMENT_ROOT}"\r\n'),
+(2, 'Froxlor Vhost Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_call_time_pass_reference = Off\r\nallow_url_fopen = On\r\nasp_tags = Off\r\ndisable_classes =\r\ndisable_functions = curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\ncgi.force_redirect = 1\r\ngpc_order = "GPC"\r\nhtml_errors = Off\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\nmax_execution_time = 60\r\nmax_input_time = 60\r\nmemory_limit = 128M\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nregister_globals = Off\r\nreport_memleaks = On\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nsession.auto_start = 0\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.entropy_file = /dev/urandom\r\nsession.entropy_length = 16\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 1\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.use_cookies = 1\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nsuhosin.mail.protect = 1\r\nsuhosin.simulation = Off\r\ntrack_errors = Off\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\n;mail.add_x_header = On\r\n;mail.log = "/var/log/phpmail.log"\r\nopcache.restrict_api = ""\r\n');
 
 
 DROP TABLE IF EXISTS `cronjobs_run`;
@@ -887,22 +918,23 @@ CREATE TABLE IF NOT EXISTS `cronjobs_run` (
   `id` bigint(20) NOT NULL auto_increment,
   `module` varchar(250) NOT NULL,
   `cronfile` varchar(250) NOT NULL,
-  `cronclass` varchar(500) NOT NULL,
   `lastrun` int(15) NOT NULL DEFAULT '0',
   `interval` varchar(100) NOT NULL DEFAULT '5 MINUTE',
   `isactive` tinyint(1) DEFAULT '1',
   `desc_lng_key` varchar(100) NOT NULL DEFAULT 'cron_unknown_desc',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
-INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `cronclass`, `interval`, `isactive`, `desc_lng_key`) VALUES
-	(1, 'froxlor/core', 'tasks', '\\Froxlor\\Cron\\System\\TasksCron', '5 MINUTE', '1', 'cron_tasks'),
-	(2, 'froxlor/core', 'traffic', '\\Froxlor\\Cron\\Traffic\\TrafficCron', '1 DAY', '1', 'cron_traffic'),
-	(3, 'froxlor/reports', 'usage_report', '\\Froxlor\\Cron\\Traffic\\ReportsCron', '1 DAY', '1', 'cron_usage_report'),
-	(4, 'froxlor/core', 'mailboxsize', '\\Froxlor\\Cron\\System\\MailboxsizeCron', '6 HOUR', '1', 'cron_mailboxsize'),
-	(5, 'froxlor/letsencrypt', 'letsencrypt', '\\Froxlor\\Cron\\Http\\LetsEncrypt\\AcmeSh', '5 MINUTE', '0', 'cron_letsencrypt'),
-	(6, 'froxlor/backup', 'backup', '\\Froxlor\\Cron\\System\\BackupCron', '1 DAY', '1', 'cron_backup');
+INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES
+	(1, 'froxlor/core', 'tasks', '5 MINUTE', '1', 'cron_tasks'),
+	(2, 'froxlor/core', 'traffic', '1 DAY', '1', 'cron_traffic'),
+	(3, 'froxlor/ticket', 'used_tickets_reset', '1 DAY', '1', 'cron_ticketsreset'),
+	(4, 'froxlor/ticket', 'ticketarchive', '1 MONTH', '1', 'cron_ticketarchive'),
+	(5, 'froxlor/reports', 'usage_report', '1 DAY', '1', 'cron_usage_report'),
+	(6, 'froxlor/core', 'mailboxsize', '6 HOUR', '1', 'cron_mailboxsize'),
+	(7, 'froxlor/letsencrypt', 'letsencrypt', '5 MINUTE', '0', 'cron_letsencrypt'),
+	(8, 'froxlor/backup', 'backup', '1 DAY', '1', 'cron_backup');
 
 
 
@@ -918,7 +950,7 @@ CREATE TABLE IF NOT EXISTS `ftp_quotalimits` (
   `files_in_avail` int(10) unsigned NOT NULL,
   `files_out_avail` int(10) unsigned NOT NULL,
   `files_xfer_avail` int(10) unsigned NOT NULL
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -937,7 +969,7 @@ CREATE TABLE IF NOT EXISTS `ftp_quotatallies` (
   `files_in_used` int(10) unsigned NOT NULL,
   `files_out_used` int(10) unsigned NOT NULL,
   `files_xfer_used` int(10) unsigned NOT NULL
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -948,7 +980,7 @@ CREATE TABLE IF NOT EXISTS `redirect_codes` (
   `desc` varchar(200) NOT NULL,
   `enabled` tinyint(1) DEFAULT '1',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 
@@ -966,7 +998,7 @@ CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
   `rid` int(5) NOT NULL,
   `did` int(11) unsigned NOT NULL,
   UNIQUE KEY `rc` (`rid`, `did`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 DROP TABLE IF EXISTS `domain_ssl_settings`;
@@ -980,9 +1012,8 @@ CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
   `ssl_csr_file` mediumtext,
   `ssl_fullchain_file` mediumtext,
   `expirationdate` datetime DEFAULT NULL,
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY (`domainid`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 DROP TABLE IF EXISTS `panel_domaintoip`;
@@ -990,7 +1021,7 @@ CREATE TABLE IF NOT EXISTS `panel_domaintoip` (
   `id_domain` int(11) unsigned NOT NULL,
   `id_ipandports` int(11) unsigned NOT NULL,
   PRIMARY KEY (`id_domain`,`id_ipandports`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 DROP TABLE IF EXISTS `domain_dns_entries`;
@@ -1003,7 +1034,7 @@ CREATE TABLE `domain_dns_entries` (
   `ttl` int(11) NOT NULL DEFAULT '18000',
   `prio` int(11) DEFAULT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
 
 DROP TABLE IF EXISTS `panel_plans`;
@@ -1016,20 +1047,5 @@ CREATE TABLE `panel_plans` (
   `ts` int(15) NOT NULL default '0',
   PRIMARY KEY  (id),
   KEY adminid (adminid)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
-
-
-DROP TABLE IF EXISTS `api_keys`;
-CREATE TABLE `api_keys` (
-  `id` int(11) NOT NULL auto_increment,
-  `adminid` int(11) NOT NULL default '0',
-  `customerid` int(11) NOT NULL default '0',
-  `apikey` varchar(500) NOT NULL default '',
-  `secret` varchar(500) NOT NULL default '',
-  `allowed_from` text NOT NULL,
-  `valid_until` int(15) NOT NULL default '0',
-  PRIMARY KEY  (id),
-  KEY adminid (adminid),
-  KEY customerid (customerid)
-) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 

install/install.php

@@ -15,16 +15,8 @@
  * @package    Install
  *
  */
-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';
+
+require 'lib/class.FroxlorInstall.php';
 
 $frxinstall = new FroxlorInstall();
 $frxinstall->run();

install/lib/class.FroxlorInstall.php

@@ -103,8 +103,10 @@ class FroxlorInstall
 		$this->_sendHeaders();
 		// check if we have a valid installation already
 		$this->_checkUserdataFile();
+		// include the functions
+		require $this->_basepath . '/lib/functions.php';
 		// include the MySQL-Table-Definitions
-		require_once $this->_basepath . '/lib/tables.inc.php';
+		require $this->_basepath . '/lib/tables.inc.php';
 		// include language
 		$this->_includeLanguageFile();
 		// show the action
@@ -159,8 +161,7 @@ class FroxlorInstall
 		$this->_guessServerName();
 		$this->_guessServerIP();
 		$this->_guessWebserver();
-		$this->_guessDistribution();
-
+		
 		$this->_getPostField('mysql_host', '127.0.0.1');
 		$this->_getPostField('mysql_database', 'froxlor');
 		$this->_getPostField('mysql_unpriv_user', 'froxlor');
@@ -175,22 +176,22 @@ class FroxlorInstall
 		$this->_getPostField('httpuser', $posixusername['name']);
 		$posixgroup = posix_getgrgid(posix_getgid());
 		$this->_getPostField('httpgroup', $posixgroup['name']);
-
+		
 		if ($this->_data['mysql_host'] == 'localhost' || $this->_data['mysql_host'] == '127.0.0.1') {
 			$this->_data['mysql_access_host'] = $this->_data['mysql_host'];
 		} else {
 			$this->_data['mysql_access_host'] = $this->_data['serverip'];
 		}
-
+		
 		// check system-hostname to be a FQDN
 		if ($this->_validate_ip($this->_data['servername']) !== false) {
 			$this->_data['servername'] = '';
 		}
-
+		
 		if (empty($this->_data['serverip']) || $this->_validate_ip($this->_data['serverip']) == false) {
 			return false;
 		}
-
+		
 		if (isset($_POST['installstep']) && $_POST['installstep'] == '1' && $this->_data['admin_pass1'] == $this->_data['admin_pass2'] && $this->_data['admin_pass1'] != '' && $this->_data['admin_pass2'] != '' && $this->_data['mysql_unpriv_pass'] != '' && $this->_data['mysql_root_pass'] != '' && $this->_data['servername'] != '' && $this->_data['serverip'] != '' && $this->_data['httpuser'] != '' && $this->_data['httpgroup'] != '' && $this->_data['mysql_unpriv_user'] != $this->_data['mysql_root_user']) {
 			return true;
 		}
@@ -205,12 +206,12 @@ class FroxlorInstall
 	private function _doInstall()
 	{
 		$content = "<table class=\"noborder\">";
-
+		
 		// check for mysql-root-connection
 		$content .= $this->_status_message('begin', $this->_lng['install']['testing_mysql']);
-
+		
 		$options = array(
-			'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8'
+			'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8,sql_mode="NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
 		);
 		$dsn = "mysql:host=" . $this->_data['mysql_host'] . ";";
 		$fatal_fail = false;
@@ -233,15 +234,9 @@ class FroxlorInstall
 				$fatal_fail = true;
 			}
 		}
-
+		
 		if (! $fatal_fail) {
-			$version_server = $db_root->getAttribute(PDO::ATTR_SERVER_VERSION);
-			$sql_mode = 'NO_ENGINE_SUBSTITUTION';
-			if (version_compare($version_server, '8.0.11', '<')) {
-				$sql_mode .= ',NO_AUTO_CREATE_USER';
-			}
-			$db_root->exec('SET sql_mode = "' . $sql_mode . '"');
-
+			
 			// ok, if we are here, the database connection is up and running
 			$content .= $this->_status_message('green', "OK");
 			// check for existing db and create backup if so
@@ -253,18 +248,12 @@ class FroxlorInstall
 			if (! $this->_abort) {
 				// create DB object for new database
 				$options = array(
-					'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8'
+					'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8,sql_mode="NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
 				);
 				$dsn = "mysql:host=" . $this->_data['mysql_host'] . ";dbname=" . $this->_data['mysql_database'] . ";";
 				$another_fail = false;
 				try {
 					$db = new PDO($dsn, $this->_data['mysql_unpriv_user'], $this->_data['mysql_unpriv_pass'], $options);
-					$version_server = $db->getAttribute(PDO::ATTR_SERVER_VERSION);
-					$sql_mode = 'NO_ENGINE_SUBSTITUTION';
-					if (version_compare($version_server, '8.0.11', '<')) {
-						$sql_mode .= ',NO_AUTO_CREATE_USER';
-					}
-					$db->exec('SET sql_mode = "' . $sql_mode . '"');
 				} catch (PDOException $e) {
 					// dafuq? this should have happened in _importDatabaseData()
 					$content .= $this->_status_message('red', $e->getMessage());
@@ -282,9 +271,9 @@ class FroxlorInstall
 				}
 			}
 		}
-
+		
 		$content .= "</table>";
-
+		
 		// check if we have unrecoverable errors
 		if ($fatal_fail || $another_fail || $this->_abort) {
 			// D'oh
@@ -301,9 +290,9 @@ class FroxlorInstall
 			$link = '../index.php';
 			$linktext = $this->_lng['click_here_to_login'];
 		}
-
+		
 		eval("\$navigation .= \"" . $this->_getTemplate("pagebottom") . "\";");
-
+		
 		return array(
 			'pagecontent' => $content,
 			'pagenavigation' => $navigation
@@ -316,7 +305,7 @@ class FroxlorInstall
 	private function _createUserdataConf()
 	{
 		$content = "";
-
+		
 		$content .= $this->_status_message('begin', $this->_lng['install']['creating_configfile']);
 		$userdata = "<?php\n";
 		$userdata .= "// automatically generated userdata.inc.php for Froxlor\n";
@@ -331,32 +320,25 @@ class FroxlorInstall
 		$userdata .= "// enable debugging to browser in case of SQL errors\n";
 		$userdata .= "\$sql['debug'] = false;\n";
 		$userdata .= "?>";
-
+		
 		// test if we can store the userdata.inc.php in ../lib
-		$umask = @umask(077);
 		$userdata_file = dirname(dirname(dirname(__FILE__))) . '/lib/userdata.inc.php';
-		if (@touch($userdata_file) && @is_writable($userdata_file)) {
-			$fp = @fopen($userdata_file, 'w');
-			@fputs($fp, $userdata, strlen($userdata));
+		if ($fp = @fopen($userdata_file, 'w')) {
+			$result = @fputs($fp, $userdata, strlen($userdata));
 			@fclose($fp);
 			$content .= $this->_status_message('green', 'OK');
+			chmod($userdata_file, 0440);
+		} elseif ($fp = @fopen('/tmp/userdata.inc.php', 'w')) {
+			$result = @fputs($fp, $userdata, strlen($userdata));
+			@fclose($fp);
+			$content .= $this->_status_message('orange', $this->_lng['install']['creating_configfile_temp']);
+			chmod('/tmp/userdata.inc.php', 0440);
 		} else {
-			@unlink($userdata_file);
-			// try creating it in a temporary file
-			$temp_file = @tempnam(sys_get_temp_dir(), 'fx');
-			if ($temp_file) {
-				$fp = @fopen($temp_file, 'w');
-				@fputs($fp, $userdata, strlen($userdata));
-				@fclose($fp);
-				$content .= $this->_status_message('orange', sprintf($this->_lng['install']['creating_configfile_temp'], $temp_file));
-			} else {
-				$content .= $this->_status_message('red', $this->_lng['install']['creating_configfile_failed']);
-				$escpduserdata = nl2br(htmlspecialchars($userdata));
-				eval("\$content .= \"" . $this->_getTemplate("textarea") . "\";");
-			}
+			$content .= $this->_status_message('red', $this->_lng['install']['creating_configfile_failed']);
+			$escpduserdata = nl2br(htmlspecialchars($userdata));
+			eval("\$content .= \"" . $this->_getTemplate("textarea") . "\";");
 		}
-		@umask($umask);
-
+		
 		return $content;
 	}
 
@@ -370,9 +352,9 @@ class FroxlorInstall
 	private function _doDataEntries(&$db)
 	{
 		$content = "";
-
+		
 		$content .= $this->_status_message('begin', $this->_lng['install']['creating_entries']);
-
+		
 		// and lets insert the default ip and port
 		$stmt = $db->prepare("
 				INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "` SET
@@ -386,7 +368,7 @@ class FroxlorInstall
 			'serverip' => $this->_data['serverip']
 		));
 		$defaultip = $db->lastInsertId();
-
+		
 		// insert the defaultip
 		$upd_stmt = $db->prepare("
 				UPDATE `" . TABLE_PANEL_SETTINGS . "` SET
@@ -396,9 +378,9 @@ class FroxlorInstall
 		$upd_stmt->execute(array(
 			'defaultip' => $defaultip
 		));
-
+		
 		$content .= $this->_status_message('green', 'OK');
-
+		
 		// last but not least create the main admin
 		$content .= $this->_status_message('begin', $this->_lng['install']['adding_admin_user']);
 		$ins_data = array(
@@ -415,7 +397,6 @@ class FroxlorInstall
 				`name` = 'Froxlor-Administrator',
 				`email` = :email,
 				`def_language` = :deflang,
-				`api_allowed` = 1,
 				`customers` = -1,
 				`customers_see_all` = 1,
 				`caneditphpsettings` = 1,
@@ -429,14 +410,16 @@ class FroxlorInstall
 				`email_forwarders` = -1,
 				`email_quota` = -1,
 				`ftps` = -1,
+				`tickets` = -1,
+				`tickets_see_all` = 1,
 				`subdomains` = -1,
 				`traffic` = -1048576
 				");
-
+		
 		$ins_stmt->execute($ins_data);
-
+		
 		$content .= $this->_status_message('green', 'OK');
-
+		
 		return $content;
 	}
 
@@ -467,14 +450,14 @@ class FroxlorInstall
 	private function _doSettings(&$db)
 	{
 		$content = "";
-
+		
 		$content .= $this->_status_message('begin', $this->_lng['install']['changing_data']);
 		$upd_stmt = $db->prepare("
 				UPDATE `" . TABLE_PANEL_SETTINGS . "` SET
 				`value` = :value
 				WHERE `settinggroup` = :group AND `varname` = :varname
 				");
-
+		
 		$this->_updateSetting($upd_stmt, 'admin@' . $this->_data['servername'], 'panel', 'adminmail');
 		$this->_updateSetting($upd_stmt, $this->_data['serverip'], 'system', 'ipaddress');
 		$this->_updateSetting($upd_stmt, $this->_data['servername'], 'system', 'hostname');
@@ -483,7 +466,7 @@ class FroxlorInstall
 		$this->_updateSetting($upd_stmt, $this->_data['webserver'], 'system', 'webserver');
 		$this->_updateSetting($upd_stmt, $this->_data['httpuser'], 'system', 'httpuser');
 		$this->_updateSetting($upd_stmt, $this->_data['httpgroup'], 'system', 'httpgroup');
-
+		
 		// necessary changes for webservers != apache2
 		if ($this->_data['webserver'] == "apache24") {
 			$this->_updateSetting($upd_stmt, 'apache2', 'system', 'webserver');
@@ -502,35 +485,26 @@ class FroxlorInstall
 			$this->_updateSetting($upd_stmt, '/etc/init.d/nginx reload', 'system', 'apachereload_command');
 			$this->_updateSetting($upd_stmt, '/etc/nginx/nginx.pem', 'system', 'ssl_cert_file');
 			$this->_updateSetting($upd_stmt, '/var/run/', 'phpfpm', 'fastcgi_ipcdir');
-			$this->_updateSetting($upd_stmt, 'error', 'system', 'errorlog_level');
 		}
-
-		$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml');
-		foreach ($distros as $_distribution) {
-			if($this->_data['distribution'] == str_replace(".xml", "", strtolower(basename($_distribution)))) {
-				$dist = new \Froxlor\Config\ConfigParser($_distribution);
-				$defaults = $dist->getDefaults();
-				foreach ($defaults->property as $property) {
-					$this->_updateSetting($upd_stmt, $property->value, $property->settinggroup, $property->varname);
-				}
-			}
-		}
-
+		
 		$this->_updateSetting($upd_stmt, $this->_data['activate_newsfeed'], 'admin', 'show_news_feed');
 		$this->_updateSetting($upd_stmt, dirname(dirname(dirname(__FILE__))), 'system', 'letsencryptchallengepath');
-
+		
 		// insert the lastcronrun to be the installation date
 		$this->_updateSetting($upd_stmt, time(), 'system', 'lastcronrun');
-
+		
 		// set specific times for some crons (traffic only at night, etc.)
 		$ts = mktime(0, 0, 0, date('m', time()), date('d', time()), date('Y', time()));
-		$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `lastrun` = '" . $ts . "' WHERE `cronfile` ='cron_traffic';");
-
+		$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `lastrun` = '" . $ts . "' WHERE `cronfile` ='cron_traffic.php';");
+		$ts = mktime(1, 0, 0, date('m', time()), date('d', time()), date('Y', time()));
+		$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `lastrun` = '" . $ts . "' WHERE `cronfile` ='cron_used_tickets_reset.php';");
+		$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `lastrun` = '" . $ts . "' WHERE `cronfile` ='cron_ticketarchive.php';");
+		
 		// insert task 99 to generate a correct cron.d-file automatically
 		$db->query("INSERT INTO `" . TABLE_PANEL_TASKS . "` SET `type` = '99';");
-
+		
 		$content .= $this->_status_message('green', 'OK');
-
+		
 		return $content;
 	}
 
@@ -546,7 +520,7 @@ class FroxlorInstall
 		$content = "";
 		$content .= $this->_status_message('begin', $this->_lng['install']['testing_new_db']);
 		$options = array(
-			'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8'
+			'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8,sql_mode="NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
 		);
 		$dsn = "mysql:host=" . $this->_data['mysql_host'] . ";dbname=" . $this->_data['mysql_database'] . ";";
 		$fatal_fail = false;
@@ -559,21 +533,15 @@ class FroxlorInstall
 			foreach ($attributes as $k => $v) {
 				$db->setAttribute(constant("PDO::" . $k), constant("PDO::" . $v));
 			}
-			$version_server = $db->getAttribute(PDO::ATTR_SERVER_VERSION);
-			$sql_mode = 'NO_ENGINE_SUBSTITUTION';
-			if (version_compare($version_server, '8.0.11', '<')) {
-				$sql_mode .= ',NO_AUTO_CREATE_USER';
-			}
-			$db->exec('SET sql_mode = "' . $sql_mode . '"');
 		} catch (PDOException $e) {
 			$content .= $this->_status_message('red', $e->getMessage());
 			$fatal_fail = true;
 		}
-
+		
 		if (! $fatal_fail) {
-
+			
 			$content .= $this->_status_message('green', 'OK');
-
+			
 			$content .= $this->_status_message('begin', $this->_lng['install']['importing_data']);
 			$db_schema = dirname(dirname(__FILE__)) . '/froxlor.sql';
 			$sql_query = @file_get_contents($db_schema);
@@ -582,7 +550,7 @@ class FroxlorInstall
 			for ($i = 0; $i < sizeof($sql_query); $i ++) {
 				if (trim($sql_query[$i]) != '') {
 					try {
-						$db->query($sql_query[$i]);
+						$result = $db->query($sql_query[$i]);
 					} catch (\PDOException $e) {
 						$content .= $this->_status_message('red', $e->getMessage());
 						$fatal_fail = true;
@@ -591,13 +559,13 @@ class FroxlorInstall
 					}
 				}
 			}
-
+			
 			if (! $fatal_fail) {
 				$content .= $this->_status_message('green', 'OK');
 			}
 			$db = null;
 		}
-
+		
 		return $content;
 	}
 
@@ -611,101 +579,82 @@ class FroxlorInstall
 	private function _createDatabaseAndUser(&$db_root)
 	{
 		$content = "";
-
+		
 		// so first we have to delete the database and
 		// the user given for the unpriv-user if they exit
 		$content .= $this->_status_message('begin', $this->_lng['install']['prepare_db']);
-
+		
 		$del_stmt = $db_root->prepare("DELETE FROM `mysql`.`user` WHERE `User` = :user AND `Host` = :accesshost");
 		$del_stmt->execute(array(
 			'user' => $this->_data['mysql_unpriv_user'],
 			'accesshost' => $this->_data['mysql_access_host']
 		));
-
+		
 		$del_stmt = $db_root->prepare("DELETE FROM `mysql`.`db` WHERE `User` = :user AND `Host` = :accesshost");
 		$del_stmt->execute(array(
 			'user' => $this->_data['mysql_unpriv_user'],
 			'accesshost' => $this->_data['mysql_access_host']
 		));
-
+		
 		$del_stmt = $db_root->prepare("DELETE FROM `mysql`.`tables_priv` WHERE `User` = :user AND `Host` =:accesshost");
 		$del_stmt->execute(array(
 			'user' => $this->_data['mysql_unpriv_user'],
 			'accesshost' => $this->_data['mysql_access_host']
 		));
-
+		
 		$del_stmt = $db_root->prepare("DELETE FROM `mysql`.`columns_priv` WHERE `User` = :user AND `Host` = :accesshost");
 		$del_stmt->execute(array(
 			'user' => $this->_data['mysql_unpriv_user'],
 			'accesshost' => $this->_data['mysql_access_host']
 		));
-
+		
 		$del_stmt = $db_root->prepare("DROP DATABASE IF EXISTS `" . str_replace('`', '', $this->_data['mysql_database']) . "`;");
 		$del_stmt->execute();
-
+		
 		$db_root->query("FLUSH PRIVILEGES;");
 		$content .= $this->_status_message('green', 'OK');
-
+		
 		// we have to create a new user and database for the froxlor unprivileged mysql access
 		$content .= $this->_status_message('begin', $this->_lng['install']['create_mysqluser_and_db']);
 		$ins_stmt = $db_root->prepare("CREATE DATABASE `" . str_replace('`', '', $this->_data['mysql_database']) . "` CHARACTER SET=utf8 COLLATE=utf8_general_ci");
 		$ins_stmt->execute();
-
+		
 		$mysql_access_host_array = array_map('trim', explode(',', $this->_data['mysql_access_host']));
-
+		
 		if (in_array('127.0.0.1', $mysql_access_host_array) && ! in_array('localhost', $mysql_access_host_array)) {
 			$mysql_access_host_array[] = 'localhost';
 		}
-
+		
 		if (! in_array('127.0.0.1', $mysql_access_host_array) && in_array('localhost', $mysql_access_host_array)) {
 			$mysql_access_host_array[] = '127.0.0.1';
 		}
-
+		
 		$mysql_access_host_array[] = $this->_data['serverip'];
 		foreach ($mysql_access_host_array as $mysql_access_host) {
-			$frox_db = str_replace('`', '', $this->_data['mysql_database']);
-			$this->_grantDbPrivilegesTo($db_root, $frox_db, $this->_data['mysql_unpriv_user'], $this->_data['mysql_unpriv_pass'], $mysql_access_host);
+			$_db = str_replace('`', '', $this->_data['mysql_database']);
+			$stmt = $db_root->prepare("
+					GRANT ALL PRIVILEGES ON `" . $_db . "`.*
+					TO :username@:host
+					IDENTIFIED BY 'password'");
+			$stmt->execute(array(
+				"username" => $this->_data['mysql_unpriv_user'],
+				"host" => $mysql_access_host
+			));
+			$stmt = $db_root->prepare("SET PASSWORD FOR :username@:host = PASSWORD(:password)");
+			$stmt->execute(array(
+				"username" => $this->_data['mysql_unpriv_user'],
+				"host" => $mysql_access_host,
+				"password" => $this->_data['mysql_unpriv_pass']
+			));
 		}
-
+		
 		$db_root->query("FLUSH PRIVILEGES;");
 		$this->_data['mysql_access_host'] = implode(',', $mysql_access_host_array);
 		$content .= $this->_status_message('green', 'OK');
-
+		
 		return $content;
 	}
 
-	private function _grantDbPrivilegesTo(&$db_root, $database, $username, $password, $access_host)
-	{
-		// mysql8 compatibility
-		if (version_compare($db_root->getAttribute(\PDO::ATTR_SERVER_VERSION), '8.0.11', '>=')) {
-			// create user
-			$stmt = $db_root->prepare("
-				CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED BY :password
-			");
-			$stmt->execute(array(
-				"password" => $password
-			));
-			// grant privileges
-			$stmt = $db_root->prepare("
-				GRANT ALL ON `" . $database . "`.* TO :username@:host
-			");
-			$stmt->execute(array(
-				"username" => $username,
-				"host" => $access_host
-			));
-		} else {
-			// grant privileges
-			$stmt = $db_root->prepare("
-				GRANT ALL PRIVILEGES ON `" . $database . "`.* TO :username@:host IDENTIFIED BY :password
-			");
-			$stmt->execute(array(
-				"username" => $username,
-				"host" => $access_host,
-				"password" => $password
-			));
-		}
-	}
-
 	/**
 	 * Check if an old database exists and back it up if necessary
 	 *
@@ -716,7 +665,7 @@ class FroxlorInstall
 	private function _backupExistingDatabase(&$db_root)
 	{
 		$content = "";
-
+		
 		// check for existing of former database
 		$tables_exist = false;
 		$sql = "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = :database";
@@ -725,19 +674,19 @@ class FroxlorInstall
 			'database' => $this->_data['mysql_database']
 		));
 		$rows = $db_root->query("SELECT FOUND_ROWS()")->fetchColumn();
-
+		
 		// check result
 		if ($result_stmt !== false && $rows > 0) {
 			$tables_exist = true;
 		}
-
+		
 		if ($tables_exist) {
 			// tell whats going on
 			$content .= $this->_status_message('begin', $this->_lng['install']['backup_old_db']);
-
+			
 			// create temporary backup-filename
 			$filename = "/tmp/froxlor_backup_" . date('YmdHi') . ".sql";
-
+			
 			// look for mysqldump
 			$do_backup = false;
 			if (file_exists("/usr/bin/mysqldump")) {
@@ -747,9 +696,9 @@ class FroxlorInstall
 				$do_backup = true;
 				$mysql_dump = '/usr/local/bin/mysqldump';
 			}
-
+			
 			if ($do_backup) {
-				$command = $mysql_dump . " " . escapeshellarg($this->_data['mysql_database']) . " -u " . escapeshellarg($this->_data['mysql_root_user']) . " --password='" . escapeshellarg($this->_data['mysql_root_pass']) . "' --result-file=" . $filename;
+				$command = $mysql_dump . " " . $this->_data['mysql_database'] . " -u " . $this->_data['mysql_root_user'] . " --password='" . $this->_data['mysql_root_pass'] . "' --result-file=" . $filename;
 				$output = exec($command);
 				if (stristr($output, "error")) {
 					$content .= $this->_status_message('red', $this->_lng['install']['backup_failed']);
@@ -760,7 +709,7 @@ class FroxlorInstall
 				$content .= $this->_status_message('red', $this->_lng['install']['backup_binary_missing']);
 			}
 		}
-
+		
 		return $content;
 	}
 
@@ -778,11 +727,11 @@ class FroxlorInstall
 		// language selection
 		$language_options = '';
 		foreach ($this->_languages as $language_name => $language_file) {
-			$language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $this->_activelng, true, true);
+			$language_options .= makeoption($language_name, $language_file, $this->_activelng, true, true);
 		}
 		// get language-form-template
 		eval("\$content .= \"" . $this->_getTemplate("lngform") . "\";");
-
+		
 		// form-data
 		$formdata = "";
 		/**
@@ -822,7 +771,7 @@ class FroxlorInstall
 			$style = '';
 		}
 		$formdata .= $this->_getSectionItemString('mysql_root_pass', true, $style, 'password');
-
+		
 		/**
 		 * admin data
 		 */
@@ -846,38 +795,12 @@ class FroxlorInstall
 		$formdata .= $this->_getSectionItemString('admin_pass2', true, $style, 'password');
 		// activate newsfeed?
 		$formdata .= $this->_getSectionItemYesNo('activate_newsfeed', true);
-
+		
 		/**
 		 * Server data
 		 */
 		$section = $this->_lng['install']['serversettings'];
 		eval("\$formdata .= \"" . $this->_getTemplate("datasection") . "\";");
-		// distribution
-		if (! empty($_POST['installstep']) && $this->_data['distribution'] == '') {
-			$diststyle = 'color:red;';
-		} else {
-			$diststyle = '';
-		}
-
-		// show list of available distro's
-		$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml');
-		foreach ($distros as $_distribution) {
-			$dist = new \Froxlor\Config\ConfigParser($_distribution);
-			$dist_display = $dist->distributionName." ".$dist->distributionCodename." (" . $dist->distributionVersion . ")";
-			$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, $this->_data['distribution']);
-			//$this->_data['distribution']
-		}
-
-		$formdata .= $this->_getSectionItemSelectbox('distribution', $distributions_select, $diststyle);
-
 		// servername
 		if (! empty($_POST['installstep']) && $this->_data['servername'] == '') {
 			$style = 'color:red;';
@@ -899,12 +822,12 @@ class FroxlorInstall
 			$websrvstyle = '';
 		}
 		// apache
-		$formdata .= $this->_getSectionItemCheckbox('webserver', 'apache2', ($this->_data['webserver'] == 'apache2'), $websrvstyle);
-		$formdata .= $this->_getSectionItemCheckbox('webserver', 'apache24', ($this->_data['webserver'] == 'apache24'), $websrvstyle);
+		$formdata .= $this->_getSectionItemCheckbox('apache2', ($this->_data['webserver'] == 'apache2'), $websrvstyle);
+		$formdata .= $this->_getSectionItemCheckbox('apache24', ($this->_data['webserver'] == 'apache24'), $websrvstyle);
 		// lighttpd
-		$formdata .= $this->_getSectionItemCheckbox('webserver', 'lighttpd', ($this->_data['webserver'] == 'lighttpd'), $websrvstyle);
+		$formdata .= $this->_getSectionItemCheckbox('lighttpd', ($this->_data['webserver'] == 'lighttpd'), $websrvstyle);
 		// nginx
-		$formdata .= $this->_getSectionItemCheckbox('webserver', 'nginx', ($this->_data['webserver'] == 'nginx'), $websrvstyle);
+		$formdata .= $this->_getSectionItemCheckbox('nginx', ($this->_data['webserver'] == 'nginx'), $websrvstyle);
 		// webserver-user
 		if (! empty($_POST['installstep']) && $this->_data['httpuser'] == '') {
 			$style = 'color:red;';
@@ -919,11 +842,11 @@ class FroxlorInstall
 			$style = '';
 		}
 		$formdata .= $this->_getSectionItemString('httpgroup', true, $style);
-
+		
 		// get data-form-template
 		$language = htmlspecialchars($this->_activelng);
 		eval("\$content .= \"" . $this->_getTemplate("dataform2") . "\";");
-
+		
 		$navigation = '';
 		return array(
 			'pagecontent' => $content,
@@ -956,7 +879,7 @@ class FroxlorInstall
 	}
 
 	/**
-	 * generate form radio field 
+	 * generate form radio field for webserver-selection
 	 *
 	 * @param string $fieldname
 	 * @param boolean $checked
@@ -964,9 +887,8 @@ class FroxlorInstall
 	 *
 	 * @return string
 	 */
-	private function _getSectionItemCheckbox($groupname = null, $fieldname = null, $checked = false, $style = "")
+	private function _getSectionItemCheckbox($fieldname = null, $checked = false, $style = "")
 	{
-		$groupname = $this->_lng['install'][$groupname];
 		$fieldlabel = $this->_lng['install'][$fieldname];
 		if ($checked) {
 			$checked = 'checked="checked"';
@@ -976,25 +898,6 @@ class FroxlorInstall
 		return $sectionitem;
 	}
 
-	/**
-	 * generate form selectbox
-	 *
-	 * @param string $fieldname
-	 * @param boolean $options
-	 * @param string $style
-	 *
-	 * @return string
-	 */
-	private function _getSectionItemSelectbox($fieldname = null, $options = null, $style = "")
-	{
-		$groupname = $this->_lng['install'][$groupname];
-		$fieldlabel = $this->_lng['install'][$fieldname];
-
-		$sectionitem = "";
-		eval("\$sectionitem .= \"" . $this->_getTemplate("dataitemselect") . "\";");
-		return $sectionitem;
-	}
-
 	/**
 	 * generate form checkbox field
 	 *
@@ -1020,29 +923,41 @@ class FroxlorInstall
 	 */
 	private function _requirementCheck()
 	{
-
+		
 		// indicator whether we need to abort or not
 		$_die = false;
-
+		
 		$content = "<table class=\"noborder\">";
-
+		
 		// check for correct php version
 		$content .= $this->_status_message('begin', $this->_lng['requirements']['phpversion']);
-
-		if (version_compare("7.0.0", PHP_VERSION, ">=")) {
+		
+		if (version_compare("5.3.0", PHP_VERSION, ">=")) {
 			$content .= $this->_status_message('red', $this->_lng['requirements']['notfound'] . ' (' . PHP_VERSION . ')');
 			$_die = true;
 		} else {
-			if (version_compare("7.1.0", PHP_VERSION, ">=")) {
+			if (version_compare("5.6.0", PHP_VERSION, ">=")) {
 				$content .= $this->_status_message('orange', $this->_lng['requirements']['newerphpprefered'] . ' (' . PHP_VERSION . ')');
 			} else {
 				$content .= $this->_status_message('green', PHP_VERSION);
 			}
 		}
-
+		
+		// Check if magic_quotes_runtime is active | get_magic_quotes_runtime() is always FALSE since 5.4
+		if (version_compare(PHP_VERSION, "5.4.0", "<")) {
+			$content .= $this->_status_message('begin', $this->_lng['requirements']['phpmagic_quotes_runtime']);
+			if (get_magic_quotes_runtime()) {
+				// deactivate it
+				set_magic_quotes_runtime(false);
+				$content .= $this->_status_message('orange', $this->_lng['requirements']['not_true'] . "<br />" . $this->_lng['requirements']['phpmagic_quotes_runtime_description']);
+			} else {
+				$content .= $this->_status_message('green', 'off');
+			}
+		}
+		
 		// check for php_pdo and pdo_mysql
 		$content .= $this->_status_message('begin', $this->_lng['requirements']['phppdo']);
-
+		
 		if (! extension_loaded('pdo') || in_array("mysql", PDO::getAvailableDrivers()) == false) {
 			$content .= $this->_status_message('red', $this->_lng['requirements']['notinstalled']);
 			$_die = true;
@@ -1061,16 +976,16 @@ class FroxlorInstall
 
 		// check for xml-extension
 		$this->_requirementCheckFor($content, $_die, 'xml', false, 'phpxml');
-
+		
 		// check for filter-extension
 		$this->_requirementCheckFor($content, $_die, 'filter', false, 'phpfilter');
-
+		
 		// check for posix-extension
 		$this->_requirementCheckFor($content, $_die, 'posix', false, 'phpposix');
 
 		// check for mbstring-extension
 		$this->_requirementCheckFor($content, $_die, 'mbstring', false, 'phpmbstring');
-
+		
 		// check for curl extension
 		$this->_requirementCheckFor($content, $_die, 'curl', false, 'phpcurl');
 
@@ -1079,7 +994,7 @@ class FroxlorInstall
 
 		// check for bcmath extension
 		$this->_requirementCheckFor($content, $_die, 'bcmath', true, 'phpbcmath', 'bcmathdescription');
-
+		
 		// check for zip extension
 		$this->_requirementCheckFor($content, $_die, 'zip', true, 'phpzip', 'zipdescription');
 
@@ -1091,7 +1006,7 @@ class FroxlorInstall
 		} else {
 			$content .= $this->_status_message('green', 'off');
 		}
-
+		
 		// check for mysqldump binary in order to backup existing database
 		$content .= $this->_status_message('begin', $this->_lng['requirements']['mysqldump']);
 
@@ -1100,9 +1015,9 @@ class FroxlorInstall
 		} else {
 			$content .= $this->_status_message('orange', $this->_lng['requirements']['notinstalled'] . "<br />" . $this->_lng['requirements']['mysqldumpmissing']);
 		}
-
+		
 		$content .= "</table>";
-
+		
 		// check if we have unrecoverable errors
 		$navigation = '';
 		if ($_die) {
@@ -1117,19 +1032,19 @@ class FroxlorInstall
 			$linktext = $this->_lng['click_here_to_continue'];
 		}
 		eval("\$navigation .= \"" . $this->_getTemplate("pagebottom") . "\";");
-
+		
 		return array(
 			'pagecontent' => $content,
 			'pagenavigation' => $navigation
 		);
 	}
-
+	
 	private function _requirementCheckFor(&$content, &$_die, $ext = '', $optional = false, $lng_txt = "", $lng_desc = "")
 	{
 		$content .= $this->_status_message('begin', $this->_lng['requirements'][$lng_txt]);
-
+		
 		if (! extension_loaded($ext)) {
-			if (! $optional) {
+			if (!$optional) {
 				$content .= $this->_status_message('red', $this->_lng['requirements']['notinstalled']);
 				$_die = true;
 			} else {
@@ -1145,13 +1060,12 @@ class FroxlorInstall
 	 */
 	private function _sendHeaders()
 	{
-		if (@php_sapi_name() !== 'cli') {
-			// no caching
-			header("Cache-Control: no-store, no-cache, must-revalidate");
-			header("Pragma: no-cache");
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
-			header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
-		}
+		// no caching
+		header("Cache-Control: no-store, no-cache, must-revalidate");
+		header("Pragma: no-cache");
+		header('Last-Modified: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+		header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+		
 		// ensure that default timezone is set
 		if (function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get")) {
 			@date_default_timezone_set(@date_default_timezone_get());
@@ -1168,8 +1082,8 @@ class FroxlorInstall
 		if (file_exists($userdata)) {
 			// includes the usersettings (MySQL-Username/Passwort)
 			// to test if Froxlor is already installed
-			require_once $this->_basepath . '/lib/userdata.inc.php';
-
+			require $this->_basepath . '/lib/userdata.inc.php';
+			
 			if (isset($sql) && is_array($sql)) {
 				// use sparkle theme for the notice
 				$installed_hint = file_get_contents($this->_basepath . '/templates/Sparkle/misc/alreadyinstalledhint.tpl');
@@ -1186,7 +1100,7 @@ class FroxlorInstall
 	{
 		// set default
 		$standardlanguage = 'english';
-
+		
 		// check either _GET or _POST
 		if (isset($_GET['language']) && isset($this->_languages[$_GET['language']])) {
 			$this->_activelng = $_GET['language'];
@@ -1207,21 +1121,22 @@ class FroxlorInstall
 					break;
 			}
 		}
-
+		
 		// require english base language as fallback
 		$lngfile = $this->_basepath . '/install/lng/' . $standardlanguage . '.lng.php';
 		if (file_exists($lngfile)) {
 			// includes file /lng/$language.lng.php if it exists
-			require_once $lngfile;
+			require $lngfile;
 			$this->_lng = $lng;
 		}
-
+		
 		// require chosen language if not english
-		if ($this->_activelng != $standardlanguage) {
+		if ($this->_activelng != $standardlanguage)
+		{
 			$lngfile = $this->_basepath . '/install/lng/' . $this->_activelng . '.lng.php';
 			if (file_exists($lngfile)) {
 				// includes file /lng/$language.lng.php if it exists
-				require_once $lngfile;
+				require $lngfile;
 				$this->_lng = $lng;
 			}
 		}
@@ -1249,7 +1164,7 @@ class FroxlorInstall
 		} else {
 			$templatefile = 'TEMPLATE NOT FOUND: ' . $filename;
 		}
-
+		
 		return $templatefile;
 	}
 
@@ -1331,39 +1246,6 @@ class FroxlorInstall
 		}
 	}
 
-
-	/**
-	 * get/guess linux distribution
-	 */
-	private function _guessDistribution()
-	{
-		// post
-		if (! empty($_POST['distribution'])) {
-			$this->_data['distribution'] = $_POST['distribution'];
-		} else {
-			//set default os.
-			$os_dist = array('ID' => 'buster');
-			$os_version = array('0' => '10');
-
-			//read os-release
-			if(file_exists('/etc/os-release')) {
-				$os_dist = parse_ini_file('/etc/os-release', false);
-				if(is_array($os_dist) && array_key_exists('ID', $os_dist) && array_key_exists('VERSION_ID', $os_dist)) {
-					$os_version = explode('.',$os_dist['VERSION_ID'])[0];
-				}
-			}
-
-			$distros = glob(\Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/') . '*.xml');
-			foreach ($distros as $_distribution) {
-				$dist = new \Froxlor\Config\ConfigParser($_distribution);
-				$ver = explode('.', $dist->distributionVersion)[0];
-				if (strtolower($os_dist['ID']) == strtolower($dist->distributionName) && $os_version == $ver) {
-					$this->_data['distribution'] = str_replace(".xml", "", strtolower(basename($_distribution)));
-				}
-			}
-		}
-	}
-
 	/**
 	 * check if POST field is set and get value for the
 	 * internal data array, if not set use either '' or $default if != null
@@ -1438,17 +1320,17 @@ class FroxlorInstall
 	 */
 	private function _split_sql_file($sql, $delimiter)
 	{
-
+		
 		// Split up our string into "possible" SQL statements.
 		$tokens = explode($delimiter, $sql);
-
+		
 		// try to save mem.
 		$sql = "";
 		$output = array();
-
+		
 		// we don't actually care about the matches preg gives us.
 		$matches = array();
-
+		
 		// this is faster than calling count($tokens) every time through the loop.
 		$token_count = count($tokens);
 		for ($i = 0; $i < $token_count; $i ++) {
@@ -1456,12 +1338,12 @@ class FroxlorInstall
 			if (($i != ($token_count - 1)) || (strlen($tokens[$i] > 0))) {
 				// This is the total number of single quotes in the token.
 				$total_quotes = preg_match_all("/'/", $tokens[$i], $matches);
-
+				
 				// Counts single quotes that are preceded by an odd number of backslashes,
 				// which means they're escaped quotes.
 				$escaped_quotes = preg_match_all("/(?<!\\\\)(\\\\\\\\)*\\\\'/", $tokens[$i], $matches);
 				$unescaped_quotes = $total_quotes - $escaped_quotes;
-
+				
 				// If the number of unescaped quotes is even, then the delimiter
 				// did NOT occur inside a string literal.
 				if (($unescaped_quotes % 2) == 0) {
@@ -1484,7 +1366,7 @@ class FroxlorInstall
 						// which means they're escaped quotes.
 						$escaped_quotes = preg_match_all("/(?<!\\\\)(\\\\\\\\)*\\\\'/", $tokens[$j], $matches);
 						$unescaped_quotes = $total_quotes - $escaped_quotes;
-
+						
 						if (($unescaped_quotes % 2) == 1) {
 							// odd number of unescaped quotes. In combination with the previous incomplete
 							// statement(s), we now have a complete statement. (2 odds always make an even)

install/lib/updateFunctions.php

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

install/lng/english.lng.php

@@ -16,14 +16,17 @@
  * @package    Language
  *
  */
+
 $lng['requirements']['title'] = 'Checking system requirements...';
 $lng['requirements']['installed'] = 'installed';
 $lng['requirements']['not_true'] = 'no';
 $lng['requirements']['notfound'] = 'not found';
 $lng['requirements']['notinstalled'] = 'not installed';
 $lng['requirements']['activated'] = 'enabled';
-$lng['requirements']['phpversion'] = 'PHP version >= 7.0';
-$lng['requirements']['newerphpprefered'] = 'Good, but php-7.1 is prefered.';
+$lng['requirements']['phpversion'] = 'PHP version >= 5.3';
+$lng['requirements']['newerphpprefered'] = 'Good, but php-5.6 is prefered.';
+$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']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...';
 $lng['requirements']['phpsession'] = 'PHP session-extension...';
 $lng['requirements']['phpctype'] = 'PHP ctype-extension...';
@@ -63,7 +66,6 @@ $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';
@@ -87,8 +89,8 @@ $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 %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']['creating_configfile_temp'] = 'File was saved in /tmp/userdata.inc.php, please move to '.dirname(dirname(__DIR__)).'/lib/.';
+$lng['install']['creating_configfile_failed'] = 'Could not create '.dirname(dirname(__DIR__)).'/lib/userdata.inc.php, please create it manually with the following content:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor was installed successfully.';
 
 $lng['click_here_to_refresh'] = 'Click here to check again';

install/lng/french.lng.php

@@ -16,13 +16,16 @@
  * @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']['phpversion'] = 'PHP version >= 5.3';
+$lng['requirements']['phpmagic_quotes_runtime'] = 'magic_quotes_runtime...';
+$lng['requirements']['phpmagic_quotes_runtime_description'] = 'Le réglage PHP "magic_quotes_runtime" doit être positionné à "Off". Nous l\'avons désactivé temporairement pour l\'instant; merci de corriger le php.ini correspondant.';
 $lng['requirements']['phppdo'] = 'extension PHP PDO et pilote PDO-MySQL ...';
 $lng['requirements']['phpxml'] = 'extension PHP XML...';
 $lng['requirements']['phpfilter'] = 'extension PHP filter ...';
@@ -53,7 +56,6 @@ $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';
@@ -77,8 +79,8 @@ $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']['creating_configfile_temp'] = 'Le fichier a été enregistré dans /tmp/userdata.inc.php, merci de le déplacer dans '.dirname(dirname(__DIR__)).'/lib/.';
+$lng['install']['creating_configfile_failed'] = 'Impossible de créer '.dirname(dirname(__DIR__)).'/lib/userdata.inc.php, merci de le créer manuellement avec le contenu suivant:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor a été installé avec succès.';
 
 $lng['click_here_to_refresh'] = 'Cliquez ici pour vérifier à nouveau';

install/lng/german.lng.php

@@ -16,14 +16,17 @@
  * @package    Language
  *
  */
+
 $lng['requirements']['title'] = 'Prüfe Systemvoraussetzungen...';
 $lng['requirements']['installed'] = 'installiert';
 $lng['requirements']['not_true'] = 'nein';
 $lng['requirements']['notfound'] = 'nicht gefunden';
 $lng['requirements']['notinstalled'] = 'nicht installiert';
 $lng['requirements']['activated'] = 'ist aktiviert.';
-$lng['requirements']['phpversion'] = 'PHP Version >= 7.0';
-$lng['requirements']['newerphpprefered'] = 'Passt, aber php-7.1 wird bevorzugt.';
+$lng['requirements']['phpversion'] = 'PHP Version >= 5.3';
+$lng['requirements']['newerphpprefered'] = 'Passt, aber php-5.6 wird bevorzugt.';
+$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']['phppdo'] = 'PHP PDO Erweiterung und PDO-MySQL Treiber...';
 $lng['requirements']['phpsession'] = 'PHP session-Erweiterung...';
 $lng['requirements']['phpctype'] = 'PHP ctype-Erweiterung...';
@@ -63,7 +66,6 @@ $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';
@@ -87,8 +89,8 @@ $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 %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']['creating_configfile_temp'] = 'Datei wurde in /tmp/userdata.inc.php gespeichert, bitte nach '.dirname(dirname(__DIR__)).'/lib/ verschieben.';
+$lng['install']['creating_configfile_failed'] = 'Konnte '.dirname(dirname(__DIR__)).'/lib/userdata.inc.php nicht erstellen, bitte manuell mit folgendem Inhalt anlegen:';
 $lng['install']['froxlor_succ_installed'] = 'Froxlor wurde erfolgreich installiert.';
 
 $lng['click_here_to_refresh'] = 'Hier klicken, um erneut zu prüfen';

install/scripts/config-services.php

@@ -21,11 +21,469 @@ if (@php_sapi_name() !== 'cli') {
 	die('This script will only work in the shell.');
 }
 
-require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+require dirname(dirname(__DIR__)) . '/lib/classes/output/class.CmdLineHandler.php';
+
+class ConfigServicesCmd extends CmdLineHandler
+{
+
+	/**
+	 * list of valid switches
+	 *
+	 * @var array
+	 */
+	public static $switches = array(
+		'h'
+	);
+
+	/**
+	 * list of valid parameters
+	 *
+	 * @var array
+	 */
+	public static $params = array(
+		'create',
+		'apply',
+		'import-settings',
+		'daemon',
+		'list-daemons',
+		'froxlor-dir',
+		'help'
+	);
+
+	public static $action_class = 'Action';
+
+	public static function printHelp()
+	{
+		self::println("");
+		self::println("Help / command line parameters:");
+		self::println("");
+		// commands
+		self::println("--create\t\tlets you create a services list configuration for the 'apply' command");
+		self::println("");
+		self::println("--apply\t\t\tconfigure your services by given configuration file. To create one run the --create command");
+		self::println("\t\t\tExample: --apply=/path/to/my-config.json or --apply=http://domain.tld/my-config.json");
+		self::println("");
+		self::println("--list-daemons\t\tOutput the services that are going to be configured using a given config file. No services will be configured.");
+		self::println("\t\t\tExample: --apply=/path/to/my-config.json --list-daemons");
+		self::println("");
+		self::println("--daemon\t\tWhen running --apply you can specify a daemon. This will be the only service that gets configured");
+		self::println("\t\t\tExample: --apply=/path/to/my-config.json --daemon=apache24");
+		self::println("");
+		self::println("--import-settings\tImport settings from another froxlor installation. This should be done prior to running --apply or alternatively in the same command together.");
+		self::println("\t\t\tExample: --import-settings=/path/to/Froxlor_settings-[version]-[dbversion]-[date].json or --import-settings=http://domain.tld/Froxlor_settings-[version]-[dbversion]-[date].json");
+		self::println("");
+		self::println("--froxlor-dir\t\tpath to froxlor installation");
+		self::println("\t\t\tExample: --froxlor-dir=/var/www/froxlor/");
+		self::println("");
+		self::println("--help\t\t\tshow help screen (this)");
+		self::println("");
+		// switches
+		// self::println("-d\t\t\tenable debug output");
+		self::println("-h\t\t\tsame as --help");
+		self::println("");
+		
+		die(); // end of execution
+	}
+}
+
+class Action
+{
+
+	private $_args = null;
+
+	private $_name = null;
+
+	private $_db = null;
+
+	public function __construct($args)
+	{
+		$this->_args = $args;
+		$this->_validate();
+	}
+
+	public function getActionName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * validates the parsed command line parameters
+	 *
+	 * @throws Exception
+	 */
+	private function _validate()
+	{
+		$this->_checkConfigParam(true);
+		$this->_parseConfig();
+		
+		require FROXLOR_INSTALL_DIR . '/lib/tables.inc.php';
+		require FROXLOR_INSTALL_DIR . '/lib/functions.php';
+		require FROXLOR_INSTALL_DIR . '/lib/classes/settings/class.Settings.php';
+		require FROXLOR_INSTALL_DIR . '/lib/classes/settings/class.SImExporter.php';
+		require FROXLOR_INSTALL_DIR . '/lib/classes/config/class.ConfigParser.php';
+		require FROXLOR_INSTALL_DIR . '/lib/classes/config/class.ConfigService.php';
+		require FROXLOR_INSTALL_DIR . '/lib/classes/config/class.ConfigDaemon.php';
+		
+		if (array_key_exists("import-settings", $this->_args)) {
+			$this->_importSettings();
+		}
+		
+		if (array_key_exists("create", $this->_args)) {
+			$this->_createConfig();
+		} elseif (array_key_exists("apply", $this->_args)) {
+			$this->_applyConfig();
+		} elseif (array_key_exists("list-daemons", $this->_args) || array_key_exists("daemon", $this->_args)) {
+			CmdLineHandler::printwarn("--list-daemons and --daemon only work together with --apply");
+		}
+	}
+
+	private function _importSettings()
+	{
+		if (strtoupper(substr($this->_args["import-settings"], 0, 4)) == 'HTTP') {
+			echo "Settings file seems to be an URL, trying to download" . PHP_EOL;
+			$target = "/tmp/froxlor-import-settings-" . time() . ".json";
+			if (@file_exists($target)) {
+				@unlink($target);
+			}
+			$this->downloadFile($this->_args["import-settings"], $target);
+			$this->_args["import-settings"] = $target;
+		}
+		if (! is_file($this->_args["import-settings"])) {
+			throw new Exception("Given settings file is not a file");
+		} elseif (! file_exists($this->_args["import-settings"])) {
+			throw new Exception("Given settings file cannot be found ('" . $this->_args["import-settings"] . "')");
+		} elseif (! is_readable($this->_args["import-settings"])) {
+			throw new Exception("Given settings file cannot be read ('" . $this->_args["import-settings"] . "')");
+		}
+		$imp_content = file_get_contents($this->_args["import-settings"]);
+		SImExporter::import($imp_content);
+		CmdLineHandler::printsucc("Successfully imported settings from '" . $this->_args["import-settings"] . "'");
+	}
+
+	private function _createConfig()
+	{
+		$_daemons_config = array(
+			'distro' => ""
+		);
+		
+		$config_dir = FROXLOR_INSTALL_DIR . '/lib/configfiles/';
+		// show list of available distro's
+		$distros = glob($config_dir . '*.xml');
+		// tmp array
+		$distributions_select_data = array();
+		// read in all the distros
+		foreach ($distros as $_distribution) {
+			// get configparser object
+			$dist = new ConfigParser($_distribution);
+			// get distro-info
+			$dist_display = $this->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);
+		
+		// list all distributions
+		$mask = "|%-50.50s |%-50.50s |\n";
+		printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+		printf($mask, 'dist', 'name');
+		printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+		foreach ($distributions_select_data as $name => $filename) {
+			printf($mask, $filename, $name);
+		}
+		printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+		echo PHP_EOL;
+		
+		while (! in_array($_daemons_config['distro'], $distributions_select_data)) {
+			$_daemons_config['distro'] = CmdLineHandler::getInput("choose distribution", "stretch");
+		}
+		
+		// go through all services and let user check whether to include it or not
+		$configfiles = new ConfigParser($config_dir . '/' . $_daemons_config['distro'] . ".xml");
+		$services = $configfiles->getServices();
+		
+		foreach ($services as $si => $service) {
+			echo PHP_EOL . "--- " . strtoupper($si) . " ---" . PHP_EOL . PHP_EOL;
+			$_daemons_config[$si] = "";
+			
+			$daemons = $service->getDaemons();
+			$mask = "|%-50.50s |%-50.50s |\n";
+			printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+			printf($mask, 'value', 'name');
+			printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+			$default_daemon = "";
+			foreach ($daemons as $di => $dd) {
+				$title = $dd->title;
+				if ($dd->default) {
+					$default_daemon = $di;
+					$title = $title . " (default)";
+				}
+				printf($mask, $di, $title);
+			}
+			printf($mask, "x", "No " . $si);
+			$daemons['x'] = 'x';
+			printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+			echo PHP_EOL;
+			if ($si == 'system') {
+				$_daemons_config[$si] = array();
+				// for the system/other services we need a multiple choice possibility
+				CmdLineHandler::println("Select every service you need. Enter empty value when done");
+				$sysservice = "";
+				do {
+					$sysservice = CmdLineHandler::getInput("choose service");
+					if (! empty($sysservice)) {
+						$_daemons_config[$si][] = $sysservice;
+					}
+				} while (! empty($sysservice));
+			} else {
+				// for all others -> only one value
+				while (! array_key_exists($_daemons_config[$si], $daemons)) {
+					$_daemons_config[$si] = CmdLineHandler::getInput("choose service", $default_daemon);
+				}
+			}
+		}
+		
+		echo PHP_EOL . PHP_EOL;
+		$daemons_config = json_encode($_daemons_config);
+		$output = CmdLineHandler::getInput("choose output-filename", "/tmp/froxlor-config-" . date('Ymd') . ".json");
+		file_put_contents($output, $daemons_config);
+		CmdLineHandler::printsucc("Successfully generated service-configfile '" . $output . "'");
+	}
+
+	private 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;
+	}
+
+	private function _applyConfig()
+	{
+		if (strtoupper(substr($this->_args["apply"], 0, 4)) == 'HTTP') {
+			echo "Config file seems to be an URL, trying to download" . PHP_EOL;
+			$target = "/tmp/froxlor-config-" . time() . ".json";
+			if (@file_exists($target)) {
+				@unlink($target);
+			}
+			$this->downloadFile($this->_args["apply"], $target);
+			$this->_args["apply"] = $target;
+		}
+		if (! is_file($this->_args["apply"])) {
+			throw new Exception("Given config file is not a file");
+		} elseif (! file_exists($this->_args["apply"])) {
+			throw new Exception("Given config file cannot be found ('" . $this->_args["apply"] . "')");
+		} elseif (! is_readable($this->_args["apply"])) {
+			throw new Exception("Given config file cannot be read ('" . $this->_args["apply"] . "')");
+		}
+		
+		$config = file_get_contents($this->_args["apply"]);
+		$decoded_config = json_decode($config, true);
+		
+		if (array_key_exists("list-daemons", $this->_args)) {
+			$mask = "|%-50.50s |%-50.50s |\n";
+			printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+			printf($mask, 'service', 'daemon');
+			printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+			foreach ($decoded_config as $service => $daemon) {
+				if (is_array($daemon) && count($daemon) > 0) {
+					foreach ($daemon as $sysdaemon) {
+						printf($mask, $service, $sysdaemon);
+					}
+				} else {
+					if ($daemon == 'x') {
+						$daemon = '--- skipped ---';
+					}
+					printf($mask, $service, $daemon);
+				}
+			}
+			printf($mask, str_repeat("-", 50), str_repeat("-", 50));
+			echo PHP_EOL;
+			exit();
+		}
+		
+		$only_daemon = null;
+		if (array_key_exists("daemon", $this->_args)) {
+			$only_daemon = $this->_args['daemon'];
+		}
+		
+		if (! empty($decoded_config)) {
+			$config_dir = FROXLOR_INSTALL_DIR . '/lib/configfiles/';
+			$configfiles = new ConfigParser($config_dir . '/' . $decoded_config['distro'] . ".xml");
+			$services = $configfiles->getServices();
+			$replace_arr = $this->_getReplacerArray();
+			
+			foreach ($services as $si => $service) {
+				echo PHP_EOL . "--- Configuring: " . strtoupper($si) . " ---" . PHP_EOL . PHP_EOL;
+				if (! isset($decoded_config[$si]) || $decoded_config[$si] == 'x') {
+					CmdLineHandler::printwarn("Skipping " . strtoupper($si) . " configuration as desired");
+					continue;
+				}
+				$daemons = $service->getDaemons();
+				foreach ($daemons as $di => $dd) {
+					// check for desired service
+					if (($si != 'system' && $decoded_config[$si] != $di) || (is_array($decoded_config[$si]) && ! in_array($di, $decoded_config[$si]))) {
+						continue;
+					}
+					CmdLineHandler::println("Configuring '" . $di . "'");
+					
+					if (! empty($only_daemon) && $only_daemon != $di) {
+						CmdLineHandler::printwarn("Skipping " . $di . " configuration as desired");
+						continue;
+					}
+					// run all cmds
+					$confarr = $dd->getConfig();
+					foreach ($confarr as $idx => $action) {
+						switch ($action['type']) {
+							case "install":
+								CmdLineHandler::println("Installing required packages");
+								passthru(strtr($action['content'], $replace_arr), $result);
+								if (strlen($result) > 1) {
+									echo $result;
+								}
+								break;
+							case "command":
+								exec(strtr($action['content'], $replace_arr));
+								break;
+							case "file":
+								if (array_key_exists('content', $action)) {
+									CmdLineHandler::printwarn("Creating file '" . $action['name'] . "'");
+									file_put_contents($action['name'], trim(strtr($action['content'], $replace_arr)));
+								} elseif (array_key_exists('subcommands', $action)) {
+									foreach ($action['subcommands'] as $fileaction) {
+										if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") {
+											exec(strtr($fileaction['content'], $replace_arr));
+										} elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") {
+											exec(strtr($fileaction['content'], $replace_arr));
+										} elseif ($fileaction['type'] == 'file') {
+											CmdLineHandler::printwarn("Creating file '" . $fileaction['name'] . "'");
+											file_put_contents($fileaction['name'], trim(strtr($fileaction['content'], $replace_arr)));
+										}
+									}
+								}
+								break;
+						}
+					}
+				}
+			}
+			// run cronjob at the end to ensure configs are all up to date
+			exec('php ' . FROXLOR_INSTALL_DIR . '/scripts/froxlor_master_cronjob.php --force');
+			// and done
+			CmdLineHandler::printsucc("All services have been configured");
+		} else {
+			CmdLineHandler::printerr("Unable to decode given JSON file");
+		}
+	}
+
+	private function _getReplacerArray()
+	{
+		$customer_tmpdir = '/tmp/';
+		if (Settings::Get('system.mod_fcgid') == '1' && Settings::Get('system.mod_fcgid_tmpdir') != '') {
+			$customer_tmpdir = Settings::Get('system.mod_fcgid_tmpdir');
+		} elseif (Settings::Get('phpfpm.enabled') == '1' && Settings::Get('phpfpm.tmpdir') != '') {
+			$customer_tmpdir = Settings::Get('phpfpm.tmpdir');
+		}
+		
+		// try to convert namserver hosts to ip's
+		$ns_ips = "";
+		if (Settings::Get('system.nameservers') != '') {
+			$nameservers = explode(',', Settings::Get('system.nameservers'));
+			foreach ($nameservers as $nameserver) {
+				$nameserver = trim($nameserver);
+				$nameserver_ips = gethostbynamel($nameserver);
+				if (is_array($nameserver_ips) && count($nameserver_ips) > 0) {
+					$ns_ips .= implode(",", $nameserver_ips);
+				}
+			}
+		}
+		
+		Database::needSqlData();
+		$sql = Database::getSqlData();
+		
+		$replace_arr = array(
+			'<SQL_UNPRIVILEGED_USER>' => $sql['user'],
+			'<SQL_UNPRIVILEGED_PASSWORD>' => $sql['passwd'],
+			'<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>' => makeCorrectDir($customer_tmpdir),
+			'<BASE_PATH>' => makeCorrectDir(FROXLOR_INSTALL_DIR),
+			'<BIND_CONFIG_PATH>' => makeCorrectDir(Settings::Get('system.bindconf_directory')),
+			'<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
+			'<CUSTOMER_LOGS>' => makeCorrectDir(Settings::Get('system.logfiles_directory')),
+			'<FPM_IPCDIR>' => makeCorrectDir(Settings::Get('phpfpm.fastcgi_ipcdir')),
+			'<WEBSERVER_GROUP>' => Settings::Get('system.httpgroup')
+		);
+		return $replace_arr;
+	}
+
+	private function _parseConfig()
+	{
+		define('FROXLOR_INSTALL_DIR', $this->_args['froxlor-dir']);
+		if (! file_exists(FROXLOR_INSTALL_DIR . '/lib/classes/database/class.Database.php')) {
+			throw new Exception("Could not find froxlor's Database class. Is froxlor really installed to '" . FROXLOR_INSTALL_DIR . "'?");
+		}
+		if (! file_exists(FROXLOR_INSTALL_DIR . '/lib/userdata.inc.php')) {
+			throw new Exception("Could not find froxlor's userdata.inc.php file. You should use this script only with a fully installed and setup froxlor system.");
+		}
+		require FROXLOR_INSTALL_DIR . '/lib/classes/database/class.Database.php';
+	}
+
+	private function _checkConfigParam($needed = false)
+	{
+		if ($needed) {
+			if (! isset($this->_args["froxlor-dir"])) {
+				throw new Exception("No configuration given (missing --froxlor-dir parameter?)");
+			} elseif (! is_dir($this->_args["froxlor-dir"])) {
+				throw new Exception("Given --froxlor-dir parameter is not a directory");
+			} elseif (! file_exists($this->_args["froxlor-dir"])) {
+				throw new Exception("Given froxlor directory cannot be found ('" . $this->_args["froxlor-dir"] . "')");
+			} elseif (! is_readable($this->_args["froxlor-dir"])) {
+				throw new Exception("Given froxlor direcotry cannot be read ('" . $this->_args["froxlor-dir"] . "')");
+			}
+		}
+	}
+
+	private function downloadFile($src, $dest)
+	{
+		set_time_limit(0);
+		// This is the file where we save the information
+		$fp = fopen($dest, 'w+');
+		// Here is the file we are downloading, replace spaces with %20
+		$ch = curl_init(str_replace(" ", "%20", $src));
+		curl_setopt($ch, CURLOPT_TIMEOUT, 50);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		// write curl response to file
+		curl_setopt($ch, CURLOPT_FILE, $fp);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		// get curl response
+		curl_exec($ch);
+		curl_close($ch);
+		fclose($fp);
+	}
+}
 
 // give control to command line handler
 try {
-	\Froxlor\Cli\ConfigServicesCmd::processParameters($argc, $argv);
+	ConfigServicesCmd::processParameters($argc, $argv);
 } catch (Exception $e) {
-	\Froxlor\Cli\ConfigServicesCmd::printerr($e->getMessage());
+	ConfigServicesCmd::printerr($e->getMessage());
 }

install/scripts/language-check.php

@@ -0,0 +1,157 @@
+<?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];
+$_f = isset($argv[2]) ? $argv[2] : null;
+$files = array();
+
+if ($dh = opendir($path)) {
+	while (false !== ($file = readdir($dh))) {
+		if ($file != "."
+		   && $file != ".."
+		   && !is_dir($file)
+		   && preg_match('/(.+)\.lng\.php/i', $file)
+		) {
+			if (is_null($_f) || (!is_null($_f) && ($file == $_f || $file == $baseLanguage))) {
+				$files[$file] = str_replace('//', '/', $path . '/' . $file);
+			}
+		}
+	}
+
+	closedir($dh);
+} else {
+	print "ERROR: The path you requested cannot be read! \n ";
+	print "\n";
+	print_help($argv);
+	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($argv);
+	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

@@ -21,11 +21,253 @@ if (@php_sapi_name() !== 'cli') {
 	die('This script will only work in the shell.');
 }
 
-require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+require dirname(dirname(__DIR__)) . '/lib/classes/output/class.CmdLineHandler.php';
+
+class SwitchServerIp extends CmdLineHandler
+{
+
+	/**
+	 * list of valid switches
+	 *
+	 * @var array
+	 */
+	public static $switches = array(
+		'h'
+	);
+
+	/**
+	 * list of valid parameters
+	 *
+	 * @var array
+	 */
+	public static $params = array(
+		'switch',
+		'list',
+		'froxlor-dir',
+		'help'
+	);
+
+	public static $action_class = 'Action';
+
+	public static function printHelp()
+	{
+		self::println("");
+		self::println("Help / command line parameters:");
+		self::println("");
+		// commands
+		self::println("--switch\t\tlets you switch ip-address A with ip-address B");
+		self::println("\t\t\tExample: --switch=A,B");
+		self::println("\t\t\tExample: --switch=\"A1,B1 A2,B2 A3,B3 ...\"");
+		self::println("");
+		self::println("--list\t\t\tshow all currently used ip-addresses in froxlor");
+		self::println("");
+		self::println("--froxlor-dir\t\tpath to froxlor installation");
+		self::println("\t\t\tExample: --froxlor-dir=/var/www/froxlor/");
+		self::println("");
+		self::println("--help\t\t\tshow help screen (this)");
+		self::println("");
+		// switches
+		// self::println("-d\t\t\tenable debug output");
+		self::println("-h\t\t\tsame as --help");
+		self::println("");
+		
+		die(); // end of execution
+	}
+}
+
+class Action
+{
+
+	private $_args = null;
+
+	private $_name = null;
+
+	private $_db = null;
+
+	public function __construct($args)
+	{
+		$this->_args = $args;
+		$this->_validate();
+	}
+
+	public function getActionName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * validates the parsed command line parameters
+	 *
+	 * @throws Exception
+	 */
+	private function _validate()
+	{
+		$need_config = false;
+		if (array_key_exists("list", $this->_args) || array_key_exists("switch", $this->_args)) {
+			$need_config = true;
+		}
+		
+		$this->_checkConfigParam($need_config);
+		
+		$this->_parseConfig();
+		
+		if (array_key_exists("list", $this->_args)) {
+			$this->_listIPs();
+		}
+		if (array_key_exists("switch", $this->_args)) {
+			$this->_switchIPs();
+		}
+	}
+
+	private function _listIPs()
+	{
+		$sel_stmt = Database::prepare("SELECT * FROM panel_ipsandports ORDER BY ip ASC, port ASC");
+		Database::pexecute($sel_stmt);
+		$ips = $sel_stmt->fetchAll(PDO::FETCH_ASSOC);
+		$mask = "|%-10.10s |%-50.50s | %10.10s |\n";
+		printf($mask, str_repeat("-", 10), str_repeat("-", 50), str_repeat("-", 10));
+		printf($mask, 'id', 'IP address', 'port');
+		printf($mask, str_repeat("-", 10), str_repeat("-", 50), str_repeat("-", 10));
+		foreach ($ips as $ipdata) {
+			printf($mask, $ipdata['id'], $ipdata['ip'], $ipdata['port']);
+		}
+		printf($mask, str_repeat("-", 10), str_repeat("-", 50), str_repeat("-", 10));
+		echo PHP_EOL . PHP_EOL;
+	}
+
+	private function _switchIPs()
+	{
+		$ip_list = $this->_args['switch'];
+		
+		if (empty($ip_list) || is_bool($ip_list)) {
+			throw new Exception("No paramters given for --switch action.");
+		}
+		
+		$ips_to_switch = array();
+		$ip_list = explode(" ", $ip_list);
+		foreach ($ip_list as $ips_combo) {
+			$ip_pair = explode(",", $ips_combo);
+			if (count($ip_pair) != 2) {
+				throw new Exception("Invalid parameter given for --switch");
+			} else {
+				if (filter_var($ip_pair[0], FILTER_VALIDATE_IP) == false) {
+					throw new Exception("Invalid source ip address: " . $ip_pair[0]);
+				}
+				if (filter_var($ip_pair[1], FILTER_VALIDATE_IP) == false) {
+					throw new Exception("Invalid target ip address: " . $ip_pair[1]);
+				}
+				if ($ip_pair[0] == $ip_pair[1]) {
+					throw new Exception("Source and target ip address are equal");
+				}
+			}
+			$ips_to_switch[] = $ip_pair;
+		}
+		
+		if (count($ips_to_switch) > 0) {
+			$check_stmt = Database::prepare("SELECT `id` FROM panel_ipsandports WHERE `ip` = :newip");
+			$upd_stmt = Database::prepare("UPDATE panel_ipsandports SET `ip` = :newip WHERE `ip` = :oldip");
+			
+			// system.ipaddress
+			$check_sysip_stmt = Database::prepare("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'system' and `varname` = 'ipaddress'");
+			$check_sysip = Database::pexecute_first($check_sysip_stmt);
+			
+			// system.mysql_access_host
+			$check_mysqlip_stmt = Database::prepare("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'system' and `varname` = 'mysql_access_host'");
+			$check_mysqlip = Database::pexecute_first($check_mysqlip_stmt);
+			
+			// system.axfrservers
+			$check_axfrip_stmt = Database::prepare("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'system' and `varname` = 'axfrservers'");
+			$check_axfrip = Database::pexecute_first($check_axfrip_stmt);
+			
+			foreach ($ips_to_switch as $ip_pair) {
+				echo "Switching IP \033[1m" . $ip_pair[0] . "\033[0m to IP \033[1m" . $ip_pair[1] . "\033[0m" . PHP_EOL;
+
+				$ip_check = Database::pexecute_first($check_stmt, array('newip' => $ip_pair[1]));
+				if ($ip_check) {
+					CmdLineHandler::printwarn("Note: " . $ip_pair[0] . " not updated to " . $ip_pair[1] . " - IP already exists in froxlor's database");
+					continue;
+				}
+
+				Database::pexecute($upd_stmt, array(
+					'newip' => $ip_pair[1],
+					'oldip' => $ip_pair[0]
+				));
+				$rows_updated = $upd_stmt->rowCount();
+				
+				if ($rows_updated == 0) {
+					CmdLineHandler::printwarn("Note: " . $ip_pair[0] . " not updated to " . $ip_pair[1] . " (possibly no entry found in froxlor database. Use --list to see what IP addresses are added in froxlor");
+				}
+				
+				// check whether the system.ipaddress needs updating
+				if ($check_sysip['value'] == $ip_pair[0]) {
+					$upd2_stmt = Database::prepare("UPDATE `panel_settings` SET `value` = :newip WHERE `settinggroup` = 'system' and `varname` = 'ipaddress'");
+					Database::pexecute($upd2_stmt, array(
+						'newip' => $ip_pair[1]
+					));
+					CmdLineHandler::printsucc("Updated system-ipaddress from '" . $ip_pair[0] . "' to '" . $ip_pair[1] . "'");
+				}
+				
+				// check whether the system.mysql_access_host needs updating
+				if (strstr($check_mysqlip['value'], $ip_pair[0]) !== false) {
+					$new_mysqlip = str_replace($ip_pair[0], $ip_pair[1], $check_mysqlip['value']);
+					$upd2_stmt = Database::prepare("UPDATE `panel_settings` SET `value` = :newmysql WHERE `settinggroup` = 'system' and `varname` = 'mysql_access_host'");
+					Database::pexecute($upd2_stmt, array(
+						'newmysql' => $new_mysqlip
+					));
+					CmdLineHandler::printsucc("Updated mysql_access_host from '" . $check_mysqlip['value'] . "' to '" . $new_mysqlip . "'");
+				}
+				
+				// check whether the system.axfrservers needs updating
+				if (strstr($check_axfrip['value'], $ip_pair[0]) !== false) {
+					$new_axfrip = str_replace($ip_pair[0], $ip_pair[1], $check_axfrip['value']);
+					$upd2_stmt = Database::prepare("UPDATE `panel_settings` SET `value` = :newaxfr WHERE `settinggroup` = 'system' and `varname` = 'axfrservers'");
+					Database::pexecute($upd2_stmt, array(
+						'newaxfr' => $new_axfrip
+					));
+					CmdLineHandler::printsucc("Updated axfrservers from '" . $check_axfrip['value'] . "' to '" . $new_axfrip . "'");
+				}
+			}
+		}
+		
+		echo PHP_EOL;
+		CmdLineHandler::printwarn("*** ATTENTION *** Remember to replace IP addresses in configuration files if used anywhere.");
+		CmdLineHandler::printsucc("IP addresses updated");
+	}
+
+	private function _parseConfig()
+	{
+		define('FROXLOR_INSTALL_DIR', $this->_args['froxlor-dir']);
+		if (! file_exists(FROXLOR_INSTALL_DIR . '/lib/classes/database/class.Database.php')) {
+			throw new Exception("Could not find froxlor's Database class. Is froxlor really installed to '" . FROXLOR_INSTALL_DIR . "'?");
+		}
+		if (! file_exists(FROXLOR_INSTALL_DIR . '/lib/userdata.inc.php')) {
+			throw new Exception("Could not find froxlor's userdata.inc.php file. You should use this script only with a fully installed and setup froxlor system.");
+		}
+		require FROXLOR_INSTALL_DIR . '/lib/functions/filedir/function.makeSecurePath.php';
+		require FROXLOR_INSTALL_DIR . '/lib/functions/filedir/function.makeCorrectDir.php';
+		require FROXLOR_INSTALL_DIR . '/lib/functions/filedir/function.makeCorrectFile.php';
+		require FROXLOR_INSTALL_DIR . '/lib/classes/database/class.Database.php';
+	}
+
+	private function _checkConfigParam($needed = false)
+	{
+		if ($needed) {
+			if (! isset($this->_args["froxlor-dir"])) {
+				throw new Exception("No configuration given (missing --froxlor-dir parameter?)");
+			} elseif (! is_dir($this->_args["froxlor-dir"])) {
+				throw new Exception("Given --froxlor-dir parameter is not a directory");
+			} elseif (! file_exists($this->_args["froxlor-dir"])) {
+				throw new Exception("Given froxlor directory cannot be found ('" . $this->_args["froxlor-dir"] . "')");
+			} elseif (! is_readable($this->_args["froxlor-dir"])) {
+				throw new Exception("Given froxlor direcotry cannot be read ('" . $this->_args["froxlor-dir"] . "')");
+			}
+		}
+	}
+}
 
 // give control to command line handler
 try {
-	\Froxlor\Cli\SwitchServerIpCmd::processParameters($argc, $argv);
+	SwitchServerIp::processParameters($argc, $argv);
 } catch (Exception $e) {
-	\Froxlor\Cli\SwitchServerIpCmd::printerr($e->getMessage());
+	SwitchServerIp::printerr($e->getMessage());
 }

install/templates/assets/css/install.css

@@ -1,65 +1,37 @@
 @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 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial,
-		Verdana, sans-serif;
+html,body {
+	font:12px/18px 'Lucida Grande','Lucida Sans Unicode',Helvetica,Arial,Verdana,sans-serif;
 	background-color: #f5f5f5;
-	color: #444;
+	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 {
@@ -69,43 +41,47 @@ 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) 0 1px 3px 0;
+	box-shadow: rgba(0, 0, 0, 0.34902) 0px 1px 3px 0px;
 }
 
 /* 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 auto 12px;
+	background-color:#fff;
+	margin: 20px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 12px;
 	width: 800px;
 }
 
@@ -114,14 +90,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;
 }
 
@@ -133,46 +109,42 @@ 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;
-}
-
-.installsec fieldset p, .installsec fieldset h3 {
-	clear: both;
+	border:0;
+	float:left;
+	clear:left;
+	width:600px;
+	margin:0 100px 10px;
+	padding:0;
 }
 
 .installsec legend {
-	display: none;
+	display:none;
 }
 
 .installsec label {
-	float: left;
-	margin-right: 0;
-	margin-top: 8px;
-	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;
 }
@@ -180,183 +152,182 @@ 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: 0 0 0 black;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px 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: 0 0 0 black;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px 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: 0 0 0 black;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px 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: 0 0 0 black;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px 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: 105px 10px 0 240px;
-	background-color: #fff;
+	margin-left:240px;
+	margin-right:10px;
+	margin-top:105px;
+	margin-bottom:0;
+	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: 0 0 0 black !important;
+	width:100%;
+	border-spacing:0;
+	border:1px solid #d1d5d8;
+	border-collapse:separate;
+	box-shadow:0px 0px 0px black !important;
 }
 
 table thead th, table th {
 	border-top: 1px solid #d1d5d8;
 	border-bottom: 1px solid #d1d5d8;
 	height: 25px !important;
-	padding: 5px 0 5px 8px;
+	padding: 5px 0px 5px 8px;
 	background-color: #e9edf0;
 	font-weight: bold;
 }
-
 table thead:first-child th, table:first-child th {
 	border-top: none !important;
 }
@@ -364,21 +335,16 @@ 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;
@@ -394,83 +360,85 @@ 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: 5px 10px;
+	padding-top:5px;
+	padding-left:10px;
+	padding-right: 10px;
+	padding-bottom:5px;
 	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;
 	color: #333;
-	padding: 2px 4px 2px 24px;
-	height: 22px;
+	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;
+	background:#fff url(../img/text_align_left.png) no-repeat 5px 4px;
 	color: #333;
-	padding: 4px 4px 2px 24px;
-	border: 1px solid #d9d9d9;
+	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;
 }
 
 /*
  *  BUTTONS
  */
-input[type="button"], input[type="submit"], input[type="reset"] {
+input[type="button"],input[type="submit"],input[type="reset"] {
 	margin: 0 5px;
 	padding: 5px 14px;
 	outline: 0;
@@ -479,57 +447,47 @@ input[type="button"], input[type="submit"], input[type="reset"] {
 	min-width: 80px;
 	height: 26px;
 	background-image: none;
+	border-width: 0px;
 }
-
-.loginsec input[type="button"], .loginsec input[type="submit"],
-	.loginsec input[type="reset"] {
+.loginsec input[type="button"], .loginsec input[type="submit"], .loginsec input[type="reset"] {
 	margin: 0 1px;
 }
-
-input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover
-	{
-	color: #333;
-	background-color: #dcdcdc;
+input[type="button"]:hover,input[type="submit"]:hover,input[type="reset"]:hover {
+    color: #333;
+    background-color: #dcdcdc;
 }
-
-input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active
-	{
-	-webkit-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-	-moz-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-	box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-	color: white !important;
+input[type="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"] {
+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[type="submit"]:hover, input[class="yesbutton"]:hover {
+input[class="nobutton"],input[type="reset"] {
+    color: white;
+    background-color: #d84a38;
+}
+input[class="nobutton"]:hover,input[type="reset"]:hover {
 	color: white;
-	background-color: #1d943b;
+    background-color: #c53727;
+}
+input[class="nobutton"]:active,input[type="reset"]:active {
+    background-color: #dd4b39;
 }
 
-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 5px 0 0;
 	vertical-align: middle;
@@ -537,101 +495,73 @@ input[type="checkbox"] {
 }
 
 input[type="radio"] {
-	vertical-align: middle;
 	margin: 0 10px 0 10px;
-	height: 22px;
+	height:22px;
 }
 
 select {
-	background: #fff;
-	padding: 4px;
+	background:#fff;
+	padding:4px;
 	color: #333;
-	border: 1px solid #d9d9d9;
+	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;
+	background: url(../../../../templates/Sparkle/assets/img/icons/down.png) no-repeat 9px;
 	-webkit-appearance: none;
-	-moz-appearance: none;
-	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;
+	background-color:#e4e4e4;
+	height:5px;
+	border-bottom:1px solid #d1d5d8;
 }
-
 .installprogress .bar {
 	background-color: #35aa47;
-	height: 5px;
+	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;
-}
+.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; }

install/templates/dataitem.tpl

@@ -1,4 +1,4 @@
 <p>
-	<label for="{$fieldname}" class="install-block {$style}">{$fieldlabel}:</label>
+	<label for="{$fieldname}" class="install-block {$style}">{$fieldlabel}:</label>&nbsp;
 	<input type="{$type}" name="{$fieldname}" id="{$fieldname}" value="{$fieldvalue}" {$required} />
 </p>

install/templates/dataitemchk.tpl

@@ -1,4 +1,4 @@
 <p>
-	<label for="{$fieldname}" class="install-block {$style}">{$groupname} {$fieldlabel}:</label>
-	<input type="radio" name="{$groupname}" id="{$fieldname}" value="{$fieldname}" {$checked} /><span>{$fieldlabel}</span>
+	<label for="{$fieldname}" class="install-block {$style}">{$this->_lng['install']['webserver']} {$fieldlabel}:</label>
+	<input type="radio" name="webserver" id="{$fieldname}" value="{$fieldname}" {$checked} /><span>{$fieldlabel}</span>
 </p>