2.0 upgrade test first

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

.drone.yml

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

admin_admins.php

@@ -77,6 +77,7 @@ if (($page == 'admins' || $page == 'overview') && $userinfo['change_serversettin
 			$result['switched_user'] = CurrentUser::getData();
 			$result['adminsession'] = 1;
 			$result['userid'] = $result['adminid'];
+			session_regenerate_id(true);
 			CurrentUser::setData($result);
 
 			$log->logAction(

admin_configfiles.php

@@ -33,6 +33,7 @@ use Froxlor\Settings;
 use Froxlor\UI\Panel\UI;
 use Froxlor\UI\Request;
 use Froxlor\UI\Response;
+use Froxlor\Validate\Validate;
 
 if ($userinfo['change_serversettings'] == '1') {
 	if ($action == 'setconfigured') {
@@ -91,6 +92,7 @@ if ($userinfo['change_serversettings'] == '1') {
 	}
 
 	if ($distribution != "" && isset($_POST['finish'])) {
+		$valid_keys = ['http', 'dns', 'smtp', 'mail', 'ftp', 'system', 'distro'];
 		unset($_POST['finish']);
 		unset($_POST['csrf_token']);
 		$params = $_POST;
@@ -99,6 +101,20 @@ if ($userinfo['change_serversettings'] == '1') {
 		foreach ($_POST['system'] as $sysdaemon) {
 			$params['system'][] = $sysdaemon;
 		}
+		// validate params
+		foreach ($params as $key => $value) {
+			if (!in_array($key, $valid_keys)) {
+				unset($params[$key]);
+				continue;
+			}
+			if (!is_array($value)) {
+				$params[$key] = Validate::validate($value, $key);
+			} else {
+				foreach ($value as $subkey => $subvalue) {
+					$params[$key][$subkey] = Validate::validate($subvalue, $key.'.'.$subkey);
+				}
+			}
+		}
 		$params_content = json_encode($params);
 		$params_filename = FileDir::makeCorrectFile(Froxlor::getInstallDir() . 'install/' . Froxlor::genSessionId() . '.json');
 		file_put_contents($params_filename, $params_content);

admin_customers.php

@@ -93,6 +93,7 @@ if (($page == 'customers' || $page == 'overview') && $userinfo['customers'] != '
 			$result['switched_user'] = CurrentUser::getData();
 			$result['adminsession'] = 0;
 			$result['userid'] = $result['customerid'];
+			session_regenerate_id(true);
 			CurrentUser::setData($result);
 
 			$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "switched user and is now '" . $destination_user . "'");

admin_index.php

@@ -53,6 +53,7 @@ if ($action == 'logout') {
 	if (is_array(CurrentUser::getField('switched_user'))) {
 		$result = CurrentUser::getData();
 		$result = $result['switched_user'];
+		session_regenerate_id(true);
 		CurrentUser::setData($result);
 		$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
 		$redirect = "admin_" . $target . ".php";

bin/froxlor-cli

@@ -26,6 +26,7 @@
 
 declare(strict_types=1);
 
+use Froxlor\Cli\ConfigDiff;
 use Symfony\Component\Console\Application;
 use Froxlor\Cli\RunApiCommand;
 use Froxlor\Cli\ConfigServices;
@@ -61,4 +62,5 @@ $application->add(new InstallCommand());
 $application->add(new MasterCron());
 $application->add(new UserCommand());
 $application->add(new ValidateAcmeWebroot());
+$application->add(new ConfigDiff());
 $application->run();

customer_index.php

@@ -52,6 +52,7 @@ if ($action == 'logout') {
 	if (is_array(CurrentUser::getField('switched_user'))) {
 		$result = CurrentUser::getData();
 		$result = $result['switched_user'];
+		session_regenerate_id(true);
 		CurrentUser::setData($result);
 		$target = (isset($_GET['target']) ? $_GET['target'] : 'index');
 		$redirect = "admin_" . $target . ".php";

index.php

@@ -40,7 +40,6 @@ use Froxlor\UI\Panel\UI;
 use Froxlor\UI\Response;
 use Froxlor\User;
 use Froxlor\Validate\Validate;
-use Froxlor\Language;
 
 if ($action == '') {
 	$action = 'login';
@@ -433,8 +432,13 @@ if ($action == '2fa_entercode') {
 		if (isset($_REQUEST['qrystr']) && $_REQUEST['qrystr'] != "") {
 			$lastqrystr = urlencode($_REQUEST['qrystr']);
 		}
-		$_SESSION['lastscript'] = $lastscript;
-		$_SESSION['lastqrystr'] = $lastqrystr;
+
+		if (!empty($lastscript)) {
+			$_SESSION['lastscript'] = $lastscript;
+		}
+		if (!empty($lastqrystr)) {
+			$_SESSION['lastqrystr'] = $lastqrystr;
+		}
 
 		UI::view('login/login.html.twig', [
 			'pagetitle' => 'Login',
@@ -633,7 +637,7 @@ if ($action == 'forgotpwd') {
 
 	UI::view('login/fpwd.html.twig', [
 		'pagetitle' => lng('login.presend'),
-		'formaction' => 'index.php?action='.$action,
+		'formaction' => 'index.php?action=' . $action,
 		'message' => $message,
 	]);
 }
@@ -733,6 +737,7 @@ if ($action == 'resetpwd') {
 function finishLogin($userinfo)
 {
 	if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
+		session_regenerate_id(true);
 		CurrentUser::setData($userinfo);
 
 		$language = $userinfo['def_language'] ?? Settings::Get('panel.standardlanguage');
@@ -746,7 +751,7 @@ function finishLogin($userinfo)
 		}
 
 		$qryparams = [];
-		if (isset($_SESSION['lastqrystr']) && !empty($_SESSION['lastqrystr'])) {
+		if (!empty($_SESSION['lastqrystr'])) {
 			parse_str(urldecode($_SESSION['lastqrystr']), $qryparams);
 			unset($_SESSION['lastqrystr']);
 		}
@@ -755,7 +760,7 @@ function finishLogin($userinfo)
 			if (Froxlor::hasUpdates() || Froxlor::hasDbUpdates()) {
 				Response::redirectTo('admin_updates.php?page=overview');
 			} else {
-				if (isset($_SESSION['lastscript']) && !empty($_SESSION['lastscript'])) {
+				if (!empty($_SESSION['lastscript'])) {
 					$lastscript = $_SESSION['lastscript'];
 					unset($_SESSION['lastscript']);
 					if (preg_match("/customer\_/", $lastscript) === 1) {
@@ -770,7 +775,7 @@ function finishLogin($userinfo)
 				}
 			}
 		} else {
-			if (isset($_SESSION['lastscript']) && !empty($_SESSION['lastscript'])) {
+			if (!empty($_SESSION['lastscript'])) {
 				$lastscript = $_SESSION['lastscript'];
 				unset($_SESSION['lastscript']);
 				Response::redirectTo($lastscript, $qryparams);

install/froxlor.sql.php

@@ -697,7 +697,7 @@ opcache.validate_timestamps'),
 	('system', 'distribution', ''),
 	('system', 'update_channel', 'stable'),
 	('system', 'updatecheck_data', ''),
-	('system', 'update_notify_last', '2.0.20'),
+	('system', 'update_notify_last', '2.0.24'),
 	('system', 'traffictool', 'goaccess'),
 	('system', 'req_limit_per_interval', 60),
 	('system', 'req_limit_interval', 60),
@@ -744,7 +744,7 @@ opcache.validate_timestamps'),
 	('panel', 'logo_overridetheme', '0'),
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
-	('panel', 'version', '2.0.20'),
+	('panel', 'version', '2.0.24'),
 	('panel', 'db_version', '202304260');
 
 

install/updates/froxlor/update_2.x.inc.php

@@ -149,7 +149,7 @@ if (Froxlor::isFroxlorVersion('0.10.38.3')) {
 	Update::showUpdateStep("Adding new settings");
 	$panel_settings_mode = isset($_POST['panel_settings_mode']) ? (int)$_POST['panel_settings_mode'] : 0;
 	Settings::AddNew("panel.settings_mode", $panel_settings_mode);
-	$system_distribution = isset($_POST['system_distribution']) ? $_POST['system_distribution'] : '';
+	$system_distribution = isset($_POST['system_distribution']) ? $_POST['system_distribution'] : 'bullseye';
 	Settings::AddNew("system.distribution", $system_distribution);
 	Settings::AddNew("system.update_channel", 'stable');
 	Settings::AddNew("system.updatecheck_data", '');
@@ -497,3 +497,23 @@ if (Froxlor::isFroxlorVersion('2.0.19')) {
 	Update::showUpdateStep("Updating from 2.0.19 to 2.0.20", false);
 	Froxlor::updateToVersion('2.0.20');
 }
+
+if (Froxlor::isFroxlorVersion('2.0.20')) {
+	Update::showUpdateStep("Updating from 2.0.20 to 2.0.21", false);
+	Froxlor::updateToVersion('2.0.21');
+}
+
+if (Froxlor::isFroxlorVersion('2.0.21')) {
+	Update::showUpdateStep("Updating from 2.0.21 to 2.0.22", false);
+	Froxlor::updateToVersion('2.0.22');
+}
+
+if (Froxlor::isFroxlorVersion('2.0.22')) {
+	Update::showUpdateStep("Updating from 2.0.22 to 2.0.23", false);
+	Froxlor::updateToVersion('2.0.23');
+}
+
+if (Froxlor::isFroxlorVersion('2.0.23')) {
+	Update::showUpdateStep("Updating from 2.0.23 to 2.0.24", false);
+	Froxlor::updateToVersion('2.0.24');
+}

install/updates/preconfig/preconfig_2.x.inc.php

@@ -54,7 +54,7 @@ if (Update::versionInUpdate($current_version, '2.0.0-beta1')) {
 	$config_dir = FileDir::makeCorrectDir(Froxlor::getInstallDir() . '/lib/configfiles/');
 	// show list of available distro's
 	$distros = glob($config_dir . '*.xml');
-	$distributions_select[''] = '-';
+	// selection is required $distributions_select[''] = '-';
 	// read in all the distros
 	foreach ($distros as $_distribution) {
 		// get configparser object

lib/Froxlor/Api/ApiParameter.php

@@ -39,12 +39,12 @@ abstract class ApiParameter
 
 	/**
 	 *
-	 * @param array $params
+	 * @param array|null $params
 	 *            optional, array of parameters (var=>value) for the command
 	 *
 	 * @throws Exception
 	 */
-	public function __construct($params = null)
+	public function __construct(array $params = null)
 	{
 		if (!is_null($params)) {
 			$params = $this->trimArray($params);
@@ -57,7 +57,7 @@ abstract class ApiParameter
 	 *
 	 * @param array $input
 	 *
-	 * @return array
+	 * @return string|array
 	 */
 	private function trimArray($input)
 	{
@@ -79,9 +79,9 @@ abstract class ApiParameter
 	/**
 	 * get specific parameter which also has and unlimited-field
 	 *
-	 * @param string $param
+	 * @param string|null $param
 	 *            parameter to get out of the request-parameter list
-	 * @param string $ul_field
+	 * @param string|null $ul_field
 	 *            parameter to get out of the request-parameter list
 	 * @param bool $optional
 	 *            default: false
@@ -91,7 +91,7 @@ abstract class ApiParameter
 	 * @return mixed
 	 * @throws Exception
 	 */
-	protected function getUlParam($param = null, $ul_field = null, $optional = false, $default = 0)
+	protected function getUlParam(string $param = null, string $ul_field = null, bool $optional = false, $default = 0)
 	{
 		$param_value = (int)$this->getParam($param, $optional, $default);
 		$ul_field_value = $this->getBoolParam($ul_field, true, 0);
@@ -102,11 +102,11 @@ abstract class ApiParameter
 	}
 
 	/**
-	 * get specific parameter from the parameterlist;
+	 * get specific parameter from the parameter list;
 	 * check for existence and != empty if needed.
 	 * Maybe more in the future
 	 *
-	 * @param string $param
+	 * @param string|null $param
 	 *            parameter to get out of the request-parameter list
 	 * @param bool $optional
 	 *            default: false
@@ -116,7 +116,7 @@ abstract class ApiParameter
 	 * @return mixed
 	 * @throws Exception
 	 */
-	protected function getParam($param = null, $optional = false, $default = '')
+	protected function getParam(string $param = null, bool $optional = false, $default = '')
 	{
 		// does it exist?
 		if (!isset($this->cmd_params[$param])) {
@@ -128,7 +128,7 @@ abstract class ApiParameter
 			return $default;
 		}
 		// is it empty? - test really on string, as value 0 is being seen as empty by php
-		if ($this->cmd_params[$param] === "") {
+		if (!is_array($this->cmd_params[$param]) && trim($this->cmd_params[$param]) === "") {
 			if ($optional === false) {
 				// get module + function for better error-messages
 				$inmod = $this->getModFunctionString();
@@ -142,7 +142,7 @@ abstract class ApiParameter
 
 	/**
 	 * returns "module::function()" for better error-messages (missing parameter etc.)
-	 * makes debugging a whole lot more comfortable
+	 * makes debugging a lot more comfortable
 	 *
 	 * @param int $level
 	 *            depth of backtrace, default 2
@@ -152,7 +152,7 @@ abstract class ApiParameter
 	 *
 	 * @return string
 	 */
-	private function getModFunctionString($level = 1, $max_level = 5, $trace = null)
+	private function getModFunctionString(int $level = 1, int $max_level = 5, $trace = null)
 	{
 		// which class called us
 		$_class = get_called_class();
@@ -174,7 +174,7 @@ abstract class ApiParameter
 	/**
 	 * getParam wrapper for boolean parameter
 	 *
-	 * @param string $param
+	 * @param string|null $param
 	 *            parameter to get out of the request-parameter list
 	 * @param bool $optional
 	 *            default: false
@@ -183,7 +183,7 @@ abstract class ApiParameter
 	 *
 	 * @return string
 	 */
-	protected function getBoolParam($param = null, $optional = false, $default = false)
+	protected function getBoolParam(string $param = null, bool $optional = false, $default = false)
 	{
 		$_default = '0';
 		if ($default) {

lib/Froxlor/Api/Commands/Admins.php

@@ -584,6 +584,18 @@ class Admins extends ApiCommand implements ResourceEntity
 					$theme = Settings::Get('panel.default_theme');
 				}
 
+				if (empty(trim($name))) {
+					Response::standardError([
+						'stringisempty',
+						'admin.name'
+					], '', true);
+				}
+				if (empty(trim($email))) {
+					Response::standardError([
+						'stringisempty',
+						'admin.email'
+					], '', true);
+				}
 				if (!Validate::validateEmail($email)) {
 					Response::standardError('emailiswrong', $email, true);
 				} else {

lib/Froxlor/Api/Commands/HostingPlans.php

@@ -200,8 +200,8 @@ class HostingPlans extends ApiCommand implements ResourceEntity
 			$value_arr['logviewenabled'] = $this->getBoolParam('logviewenabled', true, 0);
 
 			// validation
-			$name = Validate::validate(trim($name), 'name', '', '', [], true);
-			$description = Validate::validate(str_replace("\r\n", "\n", $description), 'description', Validate::REGEX_DESC_TEXT);
+			$name = Validate::validate(trim($name), 'name', Validate::REGEX_DESC_TEXT, '', [], true);
+			$description = Validate::validate(str_replace("\r\n", "\n", $description), 'description', Validate::REGEX_CONF_TEXT);
 
 			if (Settings::Get('system.mail_quota_enabled') != '1') {
 				$value_arr['email_quota'] = -1;
@@ -382,8 +382,8 @@ class HostingPlans extends ApiCommand implements ResourceEntity
 			$value_arr['logviewenabled'] = $this->getBoolParam('logviewenabled', true, $result['logviewenabled']);
 
 			// validation
-			$name = Validate::validate(trim($name), 'name', '', '', [], true);
-			$description = Validate::validate(str_replace("\r\n", "\n", $description), 'description', Validate::REGEX_DESC_TEXT);
+			$name = Validate::validate(trim($name), 'name', Validate::REGEX_DESC_TEXT, '', [], true);
+			$description = Validate::validate(str_replace("\r\n", "\n", $description), 'description', Validate::REGEX_CONF_TEXT);
 
 			if (Settings::Get('system.mail_quota_enabled') != '1') {
 				$value_arr['email_quota'] = -1;

lib/Froxlor/Api/Commands/IpsAndPorts.php

@@ -175,9 +175,9 @@ class IpsAndPorts extends ApiCommand implements ResourceEntity
 			$docroot = Validate::validate($this->getParam('docroot', true, ''), 'docroot', Validate::REGEX_DIR, '', [], true);
 
 			if ((int)Settings::Get('system.use_ssl') == 1) {
-				$ssl = !empty($this->getBoolParam('ssl', true, 0)) ? intval($this->getBoolParam('ssl', true, 0)) : 0;
-				$ssl_cert_file = Validate::validate($this->getParam('ssl_cert_file', $ssl, ''), 'ssl_cert_file', '', '', [], true);
-				$ssl_key_file = Validate::validate($this->getParam('ssl_key_file', $ssl, ''), 'ssl_key_file', '', '', [], true);
+				$ssl = (bool)$this->getBoolParam('ssl', true, 0);
+				$ssl_cert_file = Validate::validate($this->getParam('ssl_cert_file', !$ssl, ''), 'ssl_cert_file', '', '', [], true);
+				$ssl_key_file = Validate::validate($this->getParam('ssl_key_file', !$ssl, ''), 'ssl_key_file', '', '', [], true);
 				$ssl_ca_file = Validate::validate($this->getParam('ssl_ca_file', true, ''), 'ssl_ca_file', '', '', [], true);
 				$ssl_cert_chainfile = Validate::validate($this->getParam('ssl_cert_chainfile', true, ''), 'ssl_cert_chainfile', '', '', [], true);
 				$sslss = $this->getParam('ssl_specialsettings', true, '');
@@ -414,9 +414,9 @@ class IpsAndPorts extends ApiCommand implements ResourceEntity
 			$docroot = Validate::validate($this->getParam('docroot', true, $result['docroot']), 'docroot', Validate::REGEX_DIR, '', [], true);
 
 			if ((int)Settings::Get('system.use_ssl') == 1) {
-				$ssl = $this->getBoolParam('ssl', true, $result['ssl']);
-				$ssl_cert_file = Validate::validate($this->getParam('ssl_cert_file', $ssl, $result['ssl_cert_file']), 'ssl_cert_file', '', '', [], true);
-				$ssl_key_file = Validate::validate($this->getParam('ssl_key_file', $ssl, $result['ssl_key_file']), 'ssl_key_file', '', '', [], true);
+				$ssl = (bool)$this->getBoolParam('ssl', true, $result['ssl']);
+				$ssl_cert_file = Validate::validate($this->getParam('ssl_cert_file', !$ssl, $result['ssl_cert_file']), 'ssl_cert_file', '', '', [], true);
+				$ssl_key_file = Validate::validate($this->getParam('ssl_key_file', !$ssl, $result['ssl_key_file']), 'ssl_key_file', '', '', [], true);
 				$ssl_ca_file = Validate::validate($this->getParam('ssl_ca_file', true, $result['ssl_ca_file']), 'ssl_ca_file', '', '', [], true);
 				$ssl_cert_chainfile = Validate::validate($this->getParam('ssl_cert_chainfile', true, $result['ssl_cert_chainfile']), 'ssl_cert_chainfile', '', '', [], true);
 				$sslss = $this->getParam('ssl_specialsettings', true, $result['ssl_specialsettings']);

lib/Froxlor/Cli/ConfigDiff.php

@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you can also view it online at
+ * https://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  the authors
+ * @author     Froxlor team <team@froxlor.org>
+ * @license    https://files.froxlor.org/misc/COPYING.txt GPLv2
+ */
+
+namespace Froxlor\Cli;
+
+use Froxlor\Config\ConfigParser;
+use Froxlor\FileDir;
+use Froxlor\Froxlor;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+final class ConfigDiff extends CliCommand
+{
+	protected function configure(): void
+	{
+		$this->setName('froxlor:config-diff')
+			->setDescription('Shows differences in config templates between OS versions')
+			->addArgument('from', InputArgument::OPTIONAL, 'OS version to compare against')
+			->addArgument('to', InputArgument::OPTIONAL, 'OS version to compare from')
+			->addOption('list', 'l', InputOption::VALUE_NONE, 'List all possible OS versions')
+			->addOption('diff-params', '', InputOption::VALUE_REQUIRED, 'Additional parameters for `diff`, e.g. --diff-params="--color=always"');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int
+	{
+		require Froxlor::getInstallDir() . '/lib/functions.php';
+
+		$parsers = $versions = [];
+		foreach (glob(Froxlor::getInstallDir() . '/lib/configfiles/*.xml') as $config) {
+			$name = str_replace(".xml", "", strtolower(basename($config)));
+			$parser = new ConfigParser($config);
+			$versions[$name] = $parser->getCompleteDistroName();
+			$parsers[$name] = $parser;
+		}
+		asort($versions);
+
+		if ($input->getOption('list') === true) {
+			$output->writeln('The following OS version templates are available:');
+			foreach ($versions as $k => $v) {
+				$output->writeln(str_pad($k, 20) . $v);
+			}
+			return self::SUCCESS;
+		}
+
+		if (!$input->hasArgument('from') || !array_key_exists($input->getArgument('from'), $versions)) {
+			$output->writeln('<error>Missing or invalid "from" argument.</error>');
+			$output->writeln('Available versions: ' . implode(', ', array_keys($versions)));
+			return self::INVALID;
+		}
+
+		if (!$input->hasArgument('to') || !array_key_exists($input->getArgument('to'), $versions)) {
+			$output->writeln('<error>Missing or invalid "to" argument.</error>');
+			$output->writeln('Available versions: ' . implode(', ', array_keys($versions)));
+			return self::INVALID;
+		}
+
+		// Make sure diff is installed
+		$check_diff_installed = FileDir::safe_exec('which diff');
+		if (count($check_diff_installed) === 0) {
+			$output->writeln('<error>Unable to find "diff" installation on your system.</error>');
+			return self::INVALID;
+		}
+
+		$parser_from = $parsers[$input->getArgument('from')];
+		$parser_to = $parsers[$input->getArgument('to')];
+		$tmp_from = tempnam(sys_get_temp_dir(), 'froxlor_config_diff_from');
+		$tmp_to = tempnam(sys_get_temp_dir(), 'froxlor_config_diff_to');
+		$files = [];
+		$titles_by_key = [];
+
+		// Aggregate content for each config file
+		foreach ([[$parser_from, 'from'], [$parser_to, 'to']] as $todo) {
+			foreach ($todo[0]->getServices() as $service_type => $service) {
+				foreach ($service->getDaemons() as $daemon_name => $daemon) {
+					foreach ($daemon->getConfig() as $instruction) {
+						if ($instruction['type'] !== 'file') {
+							continue;
+						}
+
+						if (isset($instruction['subcommands'])) {
+							foreach ($instruction['subcommands'] as $subinstruction) {
+								if ($subinstruction['type'] !== 'file') {
+									continue;
+								}
+
+								$content = $subinstruction['content'];
+							}
+						} else {
+							$content = $instruction['content'];
+						}
+
+						if (!isset($content)) {
+							throw new \Exception("Cannot find content for {$instruction['name']}");
+						}
+
+						$key = "{$service_type}_{$daemon_name}_{$instruction['name']}";
+						$titles_by_key[$key] = "{$service->title} : {$daemon->title} : {$instruction['name']}";
+						if (!isset($files[$key])) {
+							$files[$key] = ['from' => '', 'to' => ''];
+						}
+						$files[$key][$todo[1]] = $this->filterContent($content);
+					}
+				}
+			}
+		}
+		ksort($files);
+
+		$diff_params = '';
+		if ($input->hasOption('diff-params') && trim($input->getOption('diff-params')) !== '') {
+			$diff_params = trim($input->getOption('diff-params'));
+		}
+
+		// Run diff on each file and output, if anything changed
+		foreach ($files as $file_key => $content) {
+			file_put_contents($tmp_from, $content['from']);
+			file_put_contents($tmp_to, $content['to']);
+			$diff_output = FileDir::safe_exec("{$check_diff_installed[0]} {$diff_params} {$tmp_from} {$tmp_to}");
+
+			if (count($diff_output) === 0) {
+				continue;
+			}
+
+			$output->writeln('<info># ' . $titles_by_key[$file_key] . '</info>');
+			$output->writeln(implode("\n", $diff_output) . "\n");
+			unset($diff_output);
+		}
+
+		// Remove tmp files again
+		unlink($tmp_from);
+		unlink($tmp_to);
+
+		return self::SUCCESS;
+	}
+
+	private function filterContent(string $content): string
+	{
+		$new_content = '';
+
+		foreach (explode("\n", $content) as $n) {
+			$n = trim($n);
+			if (!$n) {
+				continue;
+			}
+
+			if (str_starts_with($n, '#')) {
+				continue;
+			}
+
+			$new_content .= $n . "\n";
+		}
+
+		return $new_content;
+	}
+}

lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php

@@ -236,9 +236,12 @@ class AcmeSh extends FroxlorCron
 		return false;
 	}
 
-	private static function checkFsFilesAreNewer($domain, $cert_date = 0)
+	private static function checkFsFilesAreNewer($domain, $cert_date = 0): bool
 	{
-		$certificate_folder = self::getWorkingDirFromEnv(strtolower($domain));
+		$certificate_folder = self::getCertificateFolder(strtolower($domain));
+		if (empty($certificate_folder)) {
+			return false;
+		}
 		$ssl_file = FileDir::makeCorrectFile($certificate_folder . '/' . strtolower($domain) . '.cer');
 
 		if (is_dir($certificate_folder) && file_exists($ssl_file) && is_readable($ssl_file)) {
@@ -250,9 +253,13 @@ class AcmeSh extends FroxlorCron
 		return false;
 	}
 
-	public static function getWorkingDirFromEnv($domain = "", $forced_noecc = false)
+	public static function getWorkingDirFromEnv($domain = "", $forced_ecc = false): string
 	{
-		if (Settings::Get('system.leecc') > 0 && !$forced_noecc) {
+		// first try without _ecc either if it's enabled currently or not as
+		// it might have been at some point so there is a chance we have certificates
+		// with and without _ecc - the method getCertificateFolder() will check both
+		// possibilities
+		if ($forced_ecc) {
 			$domain .= "_ecc";
 		}
 		$env_file = FileDir::makeCorrectFile(dirname(self::getAcmeSh()) . '/acme.sh.env');
@@ -262,7 +269,7 @@ class AcmeSh extends FroxlorCron
 cut -d'"' -f2
 EOC;
 			exec('grep "LE_WORKING_DIR" ' . escapeshellarg($env_file) . ' | ' . $cut, $output);
-			if (is_array($output) && !empty($output) && isset($output[0]) && !empty($output[0])) {
+			if (is_array($output) && !empty($output) && !empty($output[0])) {
 				return FileDir::makeCorrectDir($output[0] . "/" . $domain);
 			}
 		}
@@ -635,35 +642,21 @@ EOC;
 	 */
 	private static function readCertificateToVar($domain, &$return, &$cronlog)
 	{
-		$certificate_folder = self::getWorkingDirFromEnv($domain);
-		$certificate_folder_noecc = null;
-		if (Settings::Get('system.leecc') > 0) {
-			$certificate_folder_noecc = self::getWorkingDirFromEnv($domain, true);
-		}
-		$certificate_folder = FileDir::makeCorrectDir($certificate_folder);
+		$certificate_folder = self::getCertificateFolder($domain);
 
-		if (is_dir($certificate_folder) || is_dir($certificate_folder_noecc)) {
-			foreach (
-				[
-					'crt' => $domain . '.cer',
-					'key' => $domain . '.key',
-					'chain' => 'ca.cer',
-					'fullchain' => 'fullchain.cer',
-					'csr' => $domain . '.csr'
-				] as $index => $sslfile
-			) {
+		if (!empty($certificate_folder)) {
+			$certificate_files = [
+				'crt' => $domain . '.cer',
+				'key' => $domain . '.key',
+				'chain' => 'ca.cer',
+				'fullchain' => 'fullchain.cer',
+				'csr' => $domain . '.csr'
+			];
+			foreach ($certificate_files as $index => $sslfile) {
 				$ssl_file = FileDir::makeCorrectFile($certificate_folder . '/' . $sslfile);
 				if (file_exists($ssl_file)) {
 					$return[$index] = file_get_contents($ssl_file);
 				} else {
-					if (!empty($certificate_folder_noecc)) {
-						$ssl_file_fb = FileDir::makeCorrectFile($certificate_folder_noecc . '/' . $sslfile);
-						if (file_exists($ssl_file_fb)) {
-							$cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_WARNING, "ECC certificates activated but found only non-ecc file");
-							$return[$index] = file_get_contents($ssl_file_fb);
-							continue;
-						}
-					}
 					$cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_ERR, "Could not find file '" . $sslfile . "' in '" . $certificate_folder . "'");
 					$return[$index] = null;
 				}
@@ -672,4 +665,18 @@ EOC;
 			$cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_ERR, "Could not find certificate-folder '" . $certificate_folder . "'");
 		}
 	}
+
+	private static function getCertificateFolder(string $domain): string
+	{
+		$certificate_folder = self::getWorkingDirFromEnv(strtolower($domain));
+		if (file_exists($certificate_folder)) {
+			return $certificate_folder;
+		}
+		$certificate_folder_ecc = self::getWorkingDirFromEnv($domain, true);
+		if (file_exists($certificate_folder_ecc)) {
+			return $certificate_folder_ecc;
+		}
+		FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_ERR, "Could not find certificate-folder for domain '" . $domain . "'");
+		return "";
+	}
 }

lib/Froxlor/Cron/Http/Nginx.php

@@ -883,13 +883,7 @@ class Nginx extends HttpConfigBase
 		// remove comments
 		$vhost = implode("\n", preg_replace('/^(\s+)?#(.*)$/', '', explode("\n", $vhost)));
 		// Break blocks into lines
-		$vhost = str_replace([
-			"{",
-			"}"
-		], [
-			" {\n",
-			"\n}"
-		], $vhost);
+		$vhost = preg_replace("/^(\s+)?location(.+)\{(.+)\}$/misU", "location $2 {\n $3 \n}", $vhost);
 		// Break into array items
 		$vhost = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost))));
 		// Remove empty lines

lib/Froxlor/CurrentUser.php

@@ -25,10 +25,10 @@
 
 namespace Froxlor;
 
-use Froxlor\Database\Database;
-use Froxlor\UI\Collection;
 use Froxlor\Api\Commands\Customers;
 use Froxlor\Api\Commands\SubDomains;
+use Froxlor\Database\Database;
+use Froxlor\UI\Collection;
 
 /**
  * Class to manage the current user / session
@@ -151,9 +151,13 @@ class CurrentUser
 			]);
 			$addition = $result['emaildomains'] != 0;
 		} elseif ($resource == 'subdomains') {
-			$parentDomainCollection = (new Collection(SubDomains::class, $_SESSION['userinfo'],
-				['sql_search' => ['d.parentdomainid' => 0]]));
-			$addition = $parentDomainCollection != 0;
+			if (Settings::IsInList('panel.customer_hide_options', 'domains')) {
+				$addition = false;
+			} else {
+				$parentDomainCollection = (new Collection(SubDomains::class, $_SESSION['userinfo'],
+					['sql_search' => ['d.parentdomainid' => 0]]));
+				$addition = $parentDomainCollection->count() != 0;
+			}
 		} elseif ($resource == 'domains') {
 			$customerCollection = (new Collection(Customers::class, $_SESSION['userinfo']));
 			$addition = $customerCollection != 0;

lib/Froxlor/Domain/IpAddr.php

@@ -55,6 +55,7 @@ class IpAddr
 
 	/**
 	 * @return array
+	 * @throws \Exception
 	 */
 	public static function getSslIpPortCombinations(): array
 	{
@@ -75,7 +76,7 @@ class IpAddr
 		$additional_conditions_params = [];
 		$additional_conditions_array = [];
 
-		if ($userinfo['ip'] != '-1') {
+		if (!empty($userinfo) && $userinfo['ip'] != '-1') {
 			$admin_ip_stmt = Database::prepare("
 				SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = IN (:ipid)
 			");

lib/Froxlor/Froxlor.php

@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.0.20';
+	const VERSION = '2.0.24';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202304260';

lib/Froxlor/Install/Install/Core.php

@@ -448,7 +448,11 @@ class Core
 				$reload = "service php" . PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "-fpm restart";
 				$config_dir = "/etc/php/" . PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "/fpm/pool.d/";
 				// fcgid
-				$binary = "/usr/bin/php" . PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "-cgi";
+				if ($this->validatedData['distribution'] == 'bookworm') {
+					$binary = "/usr/bin/php-cgi" . PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;
+				} else {
+					$binary = "/usr/bin/php" . PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "-cgi";
+				}
 			}
 			$db_user->query("UPDATE `" . TABLE_PANEL_FPMDAEMONS . "` SET `reload_cmd` = '" . $reload . "', `config_dir` = '" . $config_dir . "' WHERE `id` ='1';");
 			$db_user->query("UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET `binary` = '" . $binary . "';");

lib/Froxlor/UI/Panel/UI.php

@@ -290,7 +290,8 @@ class UI
 		];
 	}
 
-	public static function validateThemeTemplate(string $name, string $theme = "") {
+	public static function validateThemeTemplate(string $name, string $theme = "")
+	{
 		if (empty(trim($theme))) {
 			$theme = self::getTheme();
 		}

lib/Froxlor/Validate/Validate.php

@@ -260,7 +260,7 @@ class Validate
 	}
 
 	/**
-	 * Returns if an emailaddress is in correct format or not
+	 * Returns if an email-address is in correct format or not
 	 *
 	 * @param string $email The email address to check
 	 *

lib/configfiles/bookworm.xml

@@ -2600,7 +2600,6 @@ ServerName                     "<SERVERNAME> FTP Server"
 ServerType			standalone
 DeferWelcome			off
 
-MultilineRFC2228		on
 DefaultServer			on
 ShowSymlinks			on
 
@@ -2939,7 +2938,6 @@ SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimit
 SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'"
 SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies
 SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies
-
 </IfModule>
 ]]>
 						</content>
@@ -2955,7 +2953,7 @@ TLSRSACertificateFile                   /etc/ssl/certs/proftpd.crt
 TLSRSACertificateKeyFile                /etc/ssl/private/proftpd.key
 TLSECCertificateFile                    /etc/ssl/certs/proftpd_ec.crt
 TLSECCertificateKeyFile                 /etc/ssl/private/proftpd_ec.key
-TLSOptions                              NoCertRequest NoSessionReuseRequired
+TLSOptions                              NoSessionReuseRequired
 TLSVerifyClient                         off
 
 # Are clients required to use FTP over TLS when talking to this server?
@@ -3317,7 +3315,7 @@ aliases:     files
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_configdir}}]]></command>
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
 						<command><![CDATA[chmod 1777 {{settings.system.mod_fcgid_tmpdir}}]]></command>
-						<command><![CDATA[a2dismod php8.1]]></command>
+						<command><![CDATA[a2dismod php8.2]]></command>
 					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the
 						dirty work -->
@@ -3350,7 +3348,7 @@ aliases:     files
 						</visibility>
 						<visibility mode="true">{{settings.phpfpm.enabled_ownvhost}}
 						</visibility>
-						<command><![CDATA[a2dismod php8.1]]></command>
+						<command><![CDATA[a2dismod php8.2]]></command>
 					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the
 						dirty work -->

lib/init.php

@@ -181,8 +181,10 @@ if (@file_exists('templates/' . $theme . '/config.json')) {
 }
 
 // check for existence of variant in theme
-if (is_array($_themeoptions) && (!array_key_exists('variants', $_themeoptions) || !array_key_exists($themevariant,
-			$_themeoptions['variants']))) {
+if (is_array($_themeoptions) && (!array_key_exists('variants', $_themeoptions) || !array_key_exists(
+    $themevariant,
+    $_themeoptions['variants']
+))) {
 	$themevariant = "default";
 }
 
@@ -216,12 +218,11 @@ UI::twig()->addGlobal('header_logo', $header_logo);
 if (!CurrentUser::hasSession() && AREA != 'login') {
 	unset($_SESSION['userinfo']);
 	CurrentUser::setData();
-	session_destroy();
-	$params = [
-		"script" => basename($_SERVER["SCRIPT_NAME"]),
-		"qrystr" => $_SERVER["QUERY_STRING"]
+	$_SESSION = [
+		"lastscript" => basename($_SERVER["SCRIPT_NAME"]),
+		"lastqrystr" => $_SERVER["QUERY_STRING"]
 	];
-	Response::redirectTo('index.php', $params);
+	Response::redirectTo('index.php');
 	exit();
 }
 

lib/navigation/00.froxlor.main.php

@@ -38,7 +38,7 @@ return [
 					'url' => 'customer_email.php?page=emails',
 					'label' => lng('menue.email.emails'),
 					'required_resources' => 'emails',
-					'add_shortlink' => CurrentUser::canAddResource('emails') ? 'customer_email.php?page=emails&action=add' : null,
+					'add_shortlink' => !CurrentUser::isAdmin() && CurrentUser::canAddResource('emails') ? 'customer_email.php?page=email_domain&action=add' : null,
 				],
 				[
 					'url' => Settings::Get('panel.webmail_url'),
@@ -60,7 +60,7 @@ return [
 					'url' => 'customer_mysql.php?page=mysqls',
 					'label' => lng('menue.mysql.databases'),
 					'required_resources' => 'mysqls',
-					'add_shortlink' => CurrentUser::canAddResource('mysqls')? 'customer_mysql.php?page=mysqls&action=add' : null,
+					'add_shortlink' => !CurrentUser::isAdmin() && CurrentUser::canAddResource('mysqls')? 'customer_mysql.php?page=mysqls&action=add' : null,
 				],
 				[
 					'url' => Settings::Get('panel.phpmyadmin_url'),
@@ -81,7 +81,7 @@ return [
 				[
 					'url' => 'customer_domains.php?page=domains',
 					'label' => lng('menue.domains.settings'),
-					'add_shortlink' => CurrentUser::canAddResource('subdomains') ? 'customer_domains.php?page=domains&action=add' : null,
+					'add_shortlink' => !CurrentUser::isAdmin() && CurrentUser::canAddResource('subdomains') ? 'customer_domains.php?page=domains&action=add' : null,
 				],
 				[
 					'url' => 'customer_domains.php?page=sslcertificates',
@@ -98,7 +98,7 @@ return [
 				[
 					'url' => 'customer_ftp.php?page=accounts',
 					'label' => lng('menue.ftp.accounts'),
-					'add_shortlink' => CurrentUser::canAddResource('ftps') ? 'customer_ftp.php?page=accounts&action=add' : null,
+					'add_shortlink' => !CurrentUser::isAdmin() && CurrentUser::canAddResource('ftps') ? 'customer_ftp.php?page=accounts&action=add' : null,
 				],
 				[
 					'url' => Settings::Get('panel.webftp_url'),

lng/en.lng.php

@@ -34,6 +34,7 @@ return [
 		'pt' => 'Portuguese',
 		'se' => 'Swedish',
 		'es' => 'Spanish',
+		'ca' => 'Catalan',
 	],
 	'2fa' => [
 		'2fa' => '2FA options',
@@ -1263,7 +1264,7 @@ Yours sincerely, your administrator',
 		'reset' => 'Discard changes',
 		'pathDescription' => 'If the directory doesn\'t exist, it will be created automatically.',
 		'pathDescriptionEx' => '<br /><br /><span class="text-danger">Please note:</span> The path <code>/</code> is not allowed due to administrative settings, it will automatically be set to <code>/chosen.subdomain.tld/</code> if not set to another directory.',
-		'pathDescriptionSubdomain' => 'If the directory doesn\'t exist, it will be created automatically.<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://.<br /><br />If the URL ends with / it is considered a folder, if not, it is treated as file.',
+		'pathDescriptionSubdomain' => 'If the directory doesn\'t exist, it will be created automatically.<br /><br />If you want a redirect to another domain then this entry has to start with http:// or https://.<br /><br />If the URL ends with / it is considered a folder, if not, it is treated as file.',
 		'back' => 'Back',
 		'reseller' => 'reseller',
 		'admin' => 'admin',

scripts/froxlor_master_cronjob.php

@@ -0,0 +1,5 @@
+<?php
+chmod('/app//bin/froxlor-cli', 0755);
+// re-create cron.d configuration file
+exec('/app//bin/froxlor-cli froxlor:cron -r 99');
+exit;

templates/Maketank/2fa/entercode.tpl

@@ -0,0 +1,26 @@
+$header
+	<article class="login bradius">
+		<header class="dark">
+			<img src="{$header_logo}" alt="Froxlor Server Management Panel" />
+		</header>
+			<section class="loginsec">
+				<form method="post" action="{$filename}" enctype="application/x-www-form-urlencoded">
+					<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$lng['login']['2fa']}</legend>
+					<p>
+						<label for="2fa_code">{$lng['login']['2facode']}:</label>&nbsp;
+						<input type="text" name="2fa_code" id="2fa_code" value="" autofocus required/>
+					</p>
+					<p class="submit">
+						<input type="hidden" name="action" value="2fa_verify" />
+						<input type="hidden" name="send" value="send" />
+						<input type="submit" value="{$lng['2fa']['2fa_verify']}" />
+					</p>
+					</fieldset>
+				</form>
+				<aside>
+					<a href="index.php">{$lng['login']['backtologin']}</a>
+				</aside>
+			</section>
+	</article>
+$footer

templates/Maketank/2fa/overview.tpl

@@ -0,0 +1,43 @@
+$header
+<article>
+	<header>
+		<h2>
+			<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
+			{$lng['login']['2fa']}
+		</h2>
+	</header>
+
+	<section>
+		<if $userinfo['type_2fa']=='0'>
+		<form method="post"
+			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'add'))}">
+			<p>{$lng['2fa']['2fa_overview_desc']}</p>
+			<br> <select id="type_2fa" name="type_2fa" class="small">{$type_select}
+			</select>&nbsp;<input type="submit" class="submit"
+				value="{$lng['2fa']['2fa_add']}" name="add" />
+		</form>
+		</if>
+
+		<if $userinfo['type_2fa']=='1'>
+		<form method="post"
+			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete'))}">
+			<p>{$lng['2fa']['2fa_email_desc']}</p>
+			<br> <input type="submit" class="cancel"
+				value="{$lng['2fa']['2fa_delete']}" name="delete" />
+		</form>
+		</if>
+
+		<if $userinfo['type_2fa']=='2'>
+		<form method="post"
+			action="{$linker->getLink(array('section' => 'index', 'page' => $page, 'action' => 'delete'))}">
+			<p>{$lng['2fa']['2fa_ga_desc']}</p>
+			<br> <img src="{$ga_qrcode}" alt="QRCode" /><br>
+			<br> <input type="submit" class="cancel"
+				value="{$lng['2fa']['2fa_delete']}" name="delete" />
+		</form>
+		</if>
+
+	</section>
+
+</article>
+$footer

templates/Maketank/AUTHORS

@@ -0,0 +1,2 @@
+created and maintained by Roman Schmerold <BNoiZe@froxlor.org>
+

templates/Maketank/admin/admins/admins.tpl

@@ -0,0 +1,60 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/group_edit_big.png" alt="" />&nbsp;
+				{$lng['admin']['admins']}&nbsp;({$admincount})
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
+					<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
+				</div>
+
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['customer']['name']}&nbsp;{$arrowcode['name']}</th>
+							<th>{$lng['login']['username']}&nbsp;{$arrowcode['loginname']}</th>
+							<th>{$lng['admin']['customers']}</th>
+							<th>&nbsp;</th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+			
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="5">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+					
+					<tbody>
+						$admins
+					</tbody>
+				</table>
+			</form>
+
+			<if 15 < $count >
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
+				<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
+			</div>
+			</if>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/admins/admins_add.tpl

@@ -0,0 +1,35 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/user_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$admin_add_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+	<br />
+	<article>
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
+				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
+			</p>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/admins/admins_admin.tpl

@@ -0,0 +1,86 @@
+<tr>
+	<td>
+		{$row['name']}
+	</td>
+	<td>
+		<if $row['adminid'] != $userinfo['userid']>
+		<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'su', 'id' => $row['adminid']))}" rel="external">{$row['loginname']}</a>
+		</if>
+		<if $row['adminid'] == $userinfo['userid']>
+		{$row['loginname']}
+		</if>
+	</td>
+	<td>
+		{$row['customers_used']}
+	</td>
+	<td>
+		<div>
+			<span class="overviewcustomerextras">
+				<span>Webspace:</span>
+				<if $row['diskspace'] != 'UL'>
+					<if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
+						<div class="progress progress-danger tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
+							<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+						</div>
+					<else>
+						<if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
+							<div class="progress progress-warn tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
+								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						<else>
+							<div class="progress tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
+								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						</if>
+					</if>
+				<else>
+					<div class="progress">∞
+							<div class="bar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+					</div>
+				</if>
+			</span>
+			<span class="overviewcustomerextras">
+				<span>Traffic:</span>
+				<if $row['traffic'] != 'UL'>
+					<if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
+						<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
+							<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+						</div>
+					<else>
+						<if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
+							<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
+								<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						<else>
+							<div class="progress tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
+								<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						</if>
+					</if>
+				<else>
+					<div class="progress">∞
+						<div class="bar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+					</div>
+				</if>
+			</span>
+		</div>
+	</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'edit', 'id' => $row['adminid']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'delete', 'id' => $row['adminid']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+		<if $row['custom_notes'] != ''>
+			&nbsp;<img src="templates/{$theme}/assets/img/icons/info.png" class="notes" data-id="{$row['loginname']}" alt="{$lng['usersettings']['custom_notes']['title']}" title="{$lng['usersettings']['custom_notes']['title']}" />
+		</if>
+	</td>
+</tr>
+<if $row['custom_notes'] != ''>
+	<tr class="notes_block" id="notes_{$row['loginname']}">
+		<td colspan="5">
+			{$row['custom_notes']}
+		</td>
+	</tr>
+</if>

templates/Maketank/admin/admins/admins_edit.tpl

@@ -0,0 +1,41 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/user_edit_big.png" alt="{$title}" />&nbsp;{$title}
+			</h2>
+		</header>
+
+		<if $result['adminid'] == $userinfo['userid']>
+			<div class="warningcontainer bradius">
+				<div class="warning">{$lng['error']['youcanteditallfieldsofyourself']}</div>
+			</div>
+		</if>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="id" value="$id" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$admin_edit_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+	<br />
+	<article>
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
+			</p>
+		</section>
+	</article>
+$footer
+

templates/Maketank/admin/configfiles/choose.tpl

@@ -0,0 +1,22 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="{$lng['admin']['configfiles']['serverconfiguration']}" />&nbsp;
+				{$lng['admin']['configfiles']['serverconfiguration']} &nbsp;
+				[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]
+			</h2>
+		</header>
+
+		<section>
+			<form action="{$linker->getLink(array('section' => 'configfiles'))}" method="get" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+
+				<table class="tiny center">
+					$distributions
+				</table>
+			</form>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/configfiles/choose_daemon.tpl

@@ -0,0 +1 @@
+<li><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution_name, 'service' => $service_name, 'daemon' => $daemon_name))}">{$daemon_details['label']}</a></li>

templates/Maketank/admin/configfiles/choose_distribution.tpl

@@ -0,0 +1,6 @@
+<tr class="section">
+	<th><strong>{$distribution_details['label']}</strong></th>
+</tr>
+<tr>
+	<td>$services</td>
+</tr>

templates/Maketank/admin/configfiles/choose_service.tpl

@@ -0,0 +1,5 @@
+<strong>{$service_details['label']}</strong>
+<br />
+<ul>
+$daemons
+</ul>

templates/Maketank/admin/configfiles/configfiles.tpl

@@ -0,0 +1,30 @@
+$header
+<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="" />&nbsp;
+				{$dist_display}&nbsp;&raquo;&nbsp;
+				{$services[$service]->title}&nbsp;&raquo;&nbsp;
+				{$daemons[$daemon]->title}&nbsp;[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]
+			</h2>
+		</header>
+
+		<section>
+			<div class="info">
+				<p>{$lng['admin']['configfiles']['legend']}</p>
+				<p>{$lng['admin']['configfiles']['commands']}</p>
+				<p>{$lng['admin']['configfiles']['files']}</p>
+				<p>
+				<form id="configfiles_setmysqlpw" action="#">
+					FROXLOR_MYSQL_PASSWORD: <input type="text" class="text" id="configfiles_mysqlpw" name="configfiles_mysqlpw" value="" />
+					<input type="submit" value="{$lng['panel']['set']}" />
+				</form>
+				</p>
+			</div>
+		</section>
+
+		<section>
+			{$configpage}
+		</section>
+</article>
+$footer

templates/Maketank/admin/configfiles/configfiles_commands.tpl

@@ -0,0 +1,3 @@
+<div class="pushbot">
+	<textarea class="shell" rows="{$numbrows}" readonly>{$commands}</textarea>
+</div>

templates/Maketank/admin/configfiles/configfiles_file.tpl

@@ -0,0 +1,4 @@
+<div class="pushbot">
+	<textarea class="shell" rows="1" readonly>{$distro_editor} {$realname}</textarea>
+	<textarea class="filecontent" rows="<if $numbrows <=20 >{$numbrows}<else>21</if>" readonly>{$file_content}</textarea>
+</div>

templates/Maketank/admin/configfiles/configfiles_subfileblock.tpl

@@ -0,0 +1,8 @@
+<div class="filesub">
+	<fieldset class="file">
+		<legend>{$realname}</legend>
+		{$commands_pre}
+		{$commands_file}
+		{$commands_post}
+	</fieldset>
+</div>

templates/Maketank/admin/configfiles/wizard.tpl

@@ -0,0 +1,82 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="{$lng['admin']['configfiles']['serverconfiguration']}" />&nbsp;
+				{$lng['admin']['configfiles']['serverconfiguration']} &nbsp;
+				[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]
+			</h2>
+		</header>
+
+		<div class="messagewrapperfull">
+		<div class="warningcontainer bradius">
+			<div class="warningtitle">{$lng['admin']['warning']}</div>
+			<div class="warning">{$lng['panel']['settings_before_configuration']}</div>
+		</div>
+		</div>
+
+		<section>
+			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<input type="hidden" name="s" value="$s" />
+					<input type="hidden" name="page" value="$page" />
+
+					<table class="tiny center">
+						<tr>
+							<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
+							<td>
+								<if $distribution != ''>
+									<input type="hidden" name="distribution" value="$distribution"/>
+									<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$dist_display}</a>
+								<else>
+									<select id="config_distribution" name="distribution">
+										<option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>
+										{$distributions_select}
+									</select>
+								</if>
+							</td>
+						</tr>
+						<tr>
+							<td><b>{$lng['admin']['configfiles']['service']}:</b></td>
+							<td>
+								<if $service != ''>
+									<input type="hidden" name="service" value="$service"/>
+									<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$services[$service]->title}</a>
+								<else>
+									<select id="config_service" name="service">
+										<option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>
+										{$services_select}
+									</select>
+								</if>
+							</td>
+						</tr>
+						<tr>
+							<td><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
+							<td><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
+							</tr>
+							<tr>
+								<if \Froxlor\Settings::Get('panel.is_configured') == '0'>
+								<td colspan="2" align="center">{$lng['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{$lng['panel']['ihave_configured']}</a><br><br></td>
+								<else>
+								<td colspan="2" align="center">{$lng['panel']['system_is_configured']}</td>
+								</if>
+							</tr>
+						</tfoot>
+					</table>
+				</fieldset>	
+			</form>
+		</section>
+
+		<br><br><br>
+		<section>
+		<p><strong>{$lng['panel']['alternative_cmdline_config']}:</strong></p>
+			<div class="pushbot">
+				<textarea class="shell" rows="2" readonly>php {$basedir}/install/scripts/config-services.php --froxlor-dir={$basedir} --create</textarea>
+			</div>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/cronjobs/cronjob_edit.tpl

@@ -0,0 +1,27 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/clock_edit_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'cronjobs'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="id" value="$id" />
+				<input type="hidden" name="send" value="send" />
+				
+				<table class="full">
+					{$cronjobs_edit_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/cronjobs/cronjobs.tpl

@@ -0,0 +1,33 @@
+$header
+        <article>
+                <header>
+			<h2><img src="templates/{$theme}/assets/img/icons/clock_big.png" alt="" />&nbsp;
+			{$lng['admin']['cron']['cronsettings']}</h2>
+                </header>
+                
+		<div class="messagewrapperfull">
+		<div class="warningcontainer bradius">
+			<div class="warningtitle">{$lng['admin']['warning']}</div>
+			<div class="warning">{$lng['cron']['changewarning']}</div>
+		</div>
+		</div>
+		
+		<section>
+			<table class="full">
+			<thead>
+				<tr>
+					<th>{$lng['cron']['description']}</th>
+					<th>{$lng['cron']['lastrun']}</th>
+					<th>{$lng['cron']['interval']}</th>
+					<th>{$lng['cron']['isactive']}</th>
+					<th>{$lng['panel']['options']}</th>
+				</tr>
+			</thead>
+			<tbody>
+				$crons
+			</tbody>
+			</table>
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/cronjobs/cronjobs_cronjob.tpl

@@ -0,0 +1,11 @@
+<tr>
+	<td>{$description}</td>
+	<td>{$row['lastrun']}</td>
+	<td>{$row['interval']}</td>
+	<td>{$row['isactive']}</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'cronjobs', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>
+	</td>
+</tr>

templates/Maketank/admin/cronjobs/cronjobs_cronjobmodule.tpl

@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="5"><b>{$module}</b></td>
+</tr>

templates/Maketank/admin/customers/customers.tpl

@@ -0,0 +1,71 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/group_edit_big.png" alt="" /> 
+				{$lng['admin']['customers']} ({$customercount})
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+			
+				<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
+				</div>
+				</if>
+
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>
+								{$lng['customer']['name']},
+								{$lng['customer']['firstname']}&nbsp;{$arrowcode['c.name']}
+							</th>
+							<th>
+								{$lng['login']['username']}&nbsp;{$arrowcode['c.loginname']}
+							</th>
+							<th>
+								{$lng['admin']['admin']}&nbsp;{$arrowcode['a.loginname']}
+							</th>
+							<th>{$lng['admin']['lastlogin_succ']}</th>
+							<th></th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+			
+					<tbody>
+						$customers
+					</tbody>
+			
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="6">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+				</table>
+
+			</form>
+
+			<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used'] >
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+				<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
+			</div>
+			</if>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/customers/customers_add.tpl

@@ -0,0 +1,36 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/user_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+		<script type="text/javascript" src="templates/{$theme}/assets/js/customers.js"></script>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+				
+				<table class="full">
+					{$customer_add_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+	<br />
+	<article>
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
+				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
+			</p>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/customers/customers_customer.tpl

@@ -0,0 +1,98 @@
+<tr <if $row['deactivated'] == 1>class="disabled"</if>>
+	<td>
+		<if $row['company'] != '' && $row['name'] != ''>
+			{$row['company']}<br />
+			<small>{$row['name']}, {$row['firstname']}</small>
+		</if>
+		<if $row['company'] != '' && $row['name'] == ''>
+			{$row['company']}
+		</if>
+		<if $row['company'] == ''>
+			{$row['name']}, {$row['firstname']}
+		</if>
+	</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'su', 'sort' => $row['loginname'], 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a>
+	</td>
+	<td>
+		{$row['adminname']}
+	</td>
+	<td>
+		{$last_login}
+	</td>
+	<td>
+		<div>
+			<span class="overviewcustomerextras">
+				<span>Webspace:</span>
+				<if $row['diskspace'] != 'UL'>
+					<if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
+						<div class="progress progress-danger tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
+							<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+						</div>
+					<else>
+						<if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
+							<div class="progress progress-warn tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
+								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						<else>
+							<div class="progress tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
+								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						</if>
+					</if>
+				<else>
+					<div class="progress">∞
+							<div class="bar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+					</div>
+				</if>
+			</span>
+			<span class="overviewcustomerextras">
+				<span>Traffic:</span>
+				<if $row['traffic'] != 'UL'>
+					<if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
+						<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
+							<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+						</div>
+					<else>
+						<if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
+							<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
+								<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						<else>
+							<div class="progress tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
+								<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+							</div>
+						</if>
+					</if>
+				<else>
+					<div class="progress">∞
+						<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
+					</div>
+				</if>
+			</span>
+		</div>
+	</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+		<if $islocked == 1>
+			&nbsp;<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'unlock', 'id' => $row['customerid']))}">
+				<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['panel']['unlock']}" title="{$lng['panel']['unlock']}" />
+			</a>
+		</if>
+		<if $row['custom_notes'] != ''>
+			&nbsp;<img src="templates/{$theme}/assets/img/icons/info.png" class="notes" data-id="{$row['loginname']}" alt="{$lng['usersettings']['custom_notes']['title']}" title="{$lng['usersettings']['custom_notes']['title']}" />
+		</if>
+	</td>
+</tr>
+<if $row['custom_notes'] != ''>
+	<tr class="notes_block" id="notes_{$row['loginname']}">
+		<td colspan="6">
+			{$row['custom_notes']}
+		</td>
+	</tr>
+</if>

templates/Maketank/admin/customers/customers_edit.tpl

@@ -0,0 +1,37 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/user_edit_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+		<script type="text/javascript" src="templates/{$theme}/assets/js/customers.js"></script>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="id" value="$id" />
+				<input type="hidden" name="send" value="send" />
+			
+				<table class="full">
+					{$customer_edit_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+	<br />
+	<article>
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
+				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
+			</p>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/domains/domains.tpl

@@ -0,0 +1,73 @@
+ $header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/domains_big.png" alt="" />&nbsp;
+				{$lng['admin']['domains']}&nbsp;({$domainscount})
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+	
+				<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers !=0 >
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
+					&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/archive.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'import'))}">{$lng['domains']['domain_import']}</a>
+				</div>
+				</if>
+	
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain_ace']}</th>
+							<th>{$lng['admin']['ipsandports']['ip']}</th>
+							<th>{$lng['admin']['customer']}&nbsp;{$arrowcode['c.loginname']}</th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+	
+					<tbody>
+						{$domains}
+					</tbody>
+					
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="4">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+				</table>
+
+			</form>
+
+			<if $countcustomers == 0 >
+			<div class="warningcontainer bradius">
+				<div class="warningtitle">{$lng['admin']['warning']}</div>
+				<div class="warning">
+					<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{$lng['admin']['domain_nocustomeraddingavailable']}</a>
+				</div>
+			</div>
+			</if>
+
+			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+				<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
+			</div>
+			</if>
+
+		</section>
+	</article>
+$footer

templates/Maketank/admin/domains/domains_add.tpl

@@ -0,0 +1,32 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/domain_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+		<script type="text/javascript" src="templates/{$theme}/assets/js/domains.js"></script>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$domain_add_form}
+				</table>
+			</form>
+
+		</section>
+		<br />
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
+			</p>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/domains/domains_domain.tpl

@@ -0,0 +1,45 @@
+<if $row['termination_css'] != ''>
+	<tr class="{$row['termination_css']}<if $row['deactivated'] == 1> disabled</if>">
+</if>
+<if $row['termination_css'] == ''>
+	<tr <if $row['deactivated'] == 1>class="disabled"</if>>
+</if>
+	<td><b>{$row['domain']}</b>
+		<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
+			&nbsp;({$lng['admin']['stdsubdomain']})
+		</if>
+		<if $row['registration_date'] != ''>
+			<br><small>{$lng['domains']['registration_date']}: {$row['registration_date']}</small>
+		</if>
+		<if $row['termination_date'] != ''>
+			<br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small>
+		</if>
+	</td>
+	<td>{$row['ipandport']}</td>
+	<td>{$row['customername']}&nbsp;
+		<if !empty($row['loginname'])>(<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a>)</if>
+	</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>
+		<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'logfiles', 'domain_id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['panel']['viewlogs']}" title="{$lng['panel']['viewlogs']}" />
+		</a>
+		<if $row['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
+			&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}">
+				<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" />
+			</a>
+		</if>
+		<if $row['letsencrypt'] == '1'>
+			&nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
+		</if>
+		<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != \Froxlor\Settings::Get('system.hostname_id')>
+			<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
+				&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
+					<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+				</a>
+			</if>
+		</if>
+	</td>
+</tr>

templates/Maketank/admin/domains/domains_edit.tpl

@@ -0,0 +1,46 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp;
+				{$title}
+				<if $result['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
+					&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>)
+				</if>
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="delete_statistics_str" id="delete_statistics_str" value="{$lng['admin']['delete_statistics']}">
+				<input type="hidden" name="speciallogverified" id="speciallogverified" value="0" />
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="id" value="$id" />
+				<input type="hidden" name="send" value="send" />
+			
+				<div id="speciallogwarningpopup" name="speciallogwarningpopup" align="center">
+					<div class="warningtitle">{$lng['admin']['delete_statistics']}</div>
+					</p>{$speciallogwarning}</p>
+					<input type="text" name="delete_stats" id="delete_stats"></p>
+					<div>
+						<input type="button" class="yesbutton" name="verifybutton" value="{$lng['panel']['delete']}" id="speciallogyesbutton" />&nbsp;
+						<input type="button" class="nobutton" value="{$lng['panel']['cancel']}" id="speciallognobutton" />
+					</div>
+				</div>
+
+				<table class="full">
+					{$domain_edit_form}
+				</table>
+			</form>
+		</section>
+		<br />
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
+			</p>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/domains/domains_import.tpl

@@ -0,0 +1,38 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/domain_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<div class="messagewrapperfull">
+		<div class="warningcontainer bradius">
+			<div class="warningtitle">{$lng['admin']['note']}</div>
+			<div class="warning">{$lng['domains']['import_description']}</div>
+		</div>
+		</div>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="multipart/form-data">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$domain_import_form}
+				</table>
+			</form>
+
+		</section>
+		<br />
+		<section>
+			<p>
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
+			</p>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/index/change_language.tpl

@@ -0,0 +1,33 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/flag.png" alt="" />&nbsp;
+				{$lng['menue']['main']['changelanguage']}
+			</h2>
+		</header>
+
+		<section>
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<input type="hidden" name="s" value="$s" />
+					<input type="hidden" name="page" value="$page" />
+					<input type="hidden" name="send" value="send" />
+					<table class="tiny center">
+						<tr>
+							<td><label for="def_language">{$lng['login']['language']}:</label></td>
+							<td><select id="def_language" name="def_language">$language_options</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input type="submit" value="{$lng['menue']['main']['changelanguage']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
+				</fieldset>
+			</form>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/index/change_password.tpl

@@ -0,0 +1,41 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
+				{$lng['menue']['main']['changepassword']}
+			</h2>
+		</header>
+
+		<section>
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<input type="hidden" name="s" value="$s" />
+					<input type="hidden" name="page" value="$page" />
+					<input type="hidden" name="send" value="send" />
+					<table class="middle center">
+						<tr>
+							<td><label for="old_password">{$lng['changepassword']['old_password']}:</label></td>
+							<td><input type="password" id="old_password" name="old_password" /></td>
+						</tr>
+						<tr>
+							<td><label for="new_password">{$lng['changepassword']['new_password']}:</label></td>
+							<td><input type="password" id="new_password" name="new_password" /></td>
+						</tr>
+						<tr>
+							<td><label for="new_password_confirm">{$lng['changepassword']['new_password_confirm']}:</label></td>
+							<td><input type="password" id="new_password_confirm" name="new_password_confirm" /></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input type="submit" value="{$lng['menue']['main']['changepassword']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
+				</fieldset>
+			</form>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/index/change_theme.tpl

@@ -0,0 +1,33 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
+				{$lng['menue']['main']['changetheme']}
+			</h2>
+		</header>
+
+		<section>
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<input type="hidden" name="s" value="$s" />
+					<input type="hidden" name="page" value="$page" />
+					<input type="hidden" name="send" value="send" />
+					<table class="tiny center">
+						<tr>
+							<td><label for="theme">{$lng['panel']['theme']}:</label></td>
+							<td><select id="theme" name="theme">$theme_options</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
+				</fieldset>
+			</form>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/index/index.tpl

@@ -0,0 +1,279 @@
+$header
+	<article>
+		<h2>
+			<img src="templates/{$theme}/assets/img/icons/domains_big.png" alt="" />
+			{$lng['panel']['dashboard']}
+		</h2>
+
+		<div class="grid-g">
+			<div class="grid-u-1-2" id="statsbox">
+				<div class="canvasbox">
+					<input type="hidden" id="customers" class="circular" data-used="{$overview['number_customers']}" data-available="{$userinfo['customers']}">
+					<canvas id="customers-canvas" width="120" height="76"></canvas><br/>
+					{$lng['admin']['customers']}<br />
+					<small>
+						{$overview['number_customers']} {$lng['panel']['used']}<br />
+						<if $userinfo['customers'] != '∞'>
+						{$userinfo['customers']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="domains" class="circular" data-used="{$overview['number_domains']}" data-available="{$userinfo['domains']}">
+					<canvas id="domains-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['domains']}<br />
+					<small>
+						{$overview['number_domains']} {$lng['panel']['used']}<br />
+						<if $userinfo['domains'] != '∞'>
+						{$userinfo['domains']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="subdomains" class="circular" data-used="{$overview['subdomains_used']}" data-available="{$userinfo['subdomains']}" data-assigned="{$userinfo['subdomains_used']}">
+					<canvas id="subdomains-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['subdomains']}<br />
+					<small>
+						{$overview['subdomains_used']} {$lng['panel']['used']}<br />
+						{$userinfo['subdomains_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['subdomains'] != '∞'>
+						{$userinfo['subdomains']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="diskspace" class="circular" data-used="{$overview['diskspace_used']}" data-available="{$userinfo['diskspace']}" data-assigned="{$userinfo['diskspace_used']}">
+					<canvas id="diskspace-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['diskspace']}<br />
+					<small>
+						{$overview['diskspace_used']} {$lng['panel']['used']}<br />
+						{$userinfo['diskspace_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['diskspace'] != '∞'>
+						{$userinfo['diskspace']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="traffic" class="circular" data-used="{$overview['traffic_used']}" data-available="{$userinfo['traffic']}" data-assigned="{$userinfo['traffic_used']}">
+					<canvas id="traffic-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['traffic']}<br />
+					<small>
+						{$overview['traffic_used']} {$lng['panel']['used']}<br />
+						{$userinfo['traffic_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['traffic'] != '∞'>
+						{$userinfo['traffic']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="mysqls" class="circular" data-used="{$overview['mysqls_used']}" data-available="{$userinfo['mysqls']}" data-assigned="{$userinfo['mysqls_used']}">
+					<canvas id="mysqls-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['mysqls']}<br />
+					<small>
+						{$overview['mysqls_used']} {$lng['panel']['used']}<br />
+						{$userinfo['mysqls_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['mysqls'] != '∞'>
+						{$userinfo['mysqls']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+				<input type="hidden" id="emails" class="circular" data-used="{$overview['emails_used']}" data-available="{$userinfo['emails']}" data-assigned="{$userinfo['emails_used']}">
+				<canvas id="emails-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['emails']}<br />
+					<small>
+						{$overview['emails_used']} {$lng['panel']['used']}<br />
+						{$userinfo['emails_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['emails'] != '∞'>
+						{$userinfo['emails']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="email_accounts" class="circular" data-used="{$overview['email_accounts_used']}" data-available="{$userinfo['email_accounts']}" data-assigned="{$userinfo['email_accounts_used']}">
+					<canvas id="email_accounts-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['accounts']}<br />
+					<small>
+						{$overview['email_accounts_used']} {$lng['panel']['used']}<br />
+						{$userinfo['email_accounts_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['email_accounts'] != '∞'>
+						{$userinfo['email_accounts']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<div class="canvasbox">
+					<input type="hidden" id="email_forwarders" class="circular" data-used="{$overview['email_forwarders_used']}" data-available="{$userinfo['email_forwarders']}" data-assigned="{$userinfo['email_forwarders_used']}">
+					<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['forwarders']}<br />
+					<small>
+						{$overview['email_forwarders_used']} {$lng['panel']['used']}<br />
+						{$userinfo['email_forwarders_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['email_forwarders'] != '∞'>
+						{$userinfo['email_forwarders']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+
+				<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
+				<div class="canvasbox">
+					<input type="hidden" id="email_quota" class="circular" data-used="{$overview['email_quota_used']}" data-available="{$userinfo['email_quota']}" data-assigned="{$userinfo['email_quota_used']}">
+					<canvas id="email_quota-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['email_quota']}<br />
+					<small>
+						{$overview['email_quota_used']} {$lng['panel']['used']}<br />
+						{$userinfo['email_quota_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['email_quota'] != '∞'>
+						{$userinfo['email_quota']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+				</if>
+
+				<div class="canvasbox">
+					<input type="hidden" id="ftps" class="circular" data-used="{$overview['ftps_used']}" data-available="{$userinfo['ftps']}" data-assigned="{$userinfo['ftps_used']}">
+					<canvas id="ftps-canvas" width="120" height="76"></canvas><br/>
+					{$lng['customer']['ftps']}<br />
+					<small>
+						{$overview['ftps_used']} {$lng['panel']['used']}<br />
+						{$userinfo['ftps_used']} {$lng['panel']['assigned']}<br />
+						<if $userinfo['ftps'] != '∞'>
+						{$userinfo['ftps']} {$lng['panel']['available']}
+						</if>
+					</small>
+				</div>
+			</div>
+
+			<div class="grid-u-1-2">
+				<if \Froxlor\Settings::Get('admin.show_news_feed') == '1'>
+				<table class="dboarditem full" id="newsfeed">
+					<thead>
+						<tr>
+							<th>News</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>
+								<ul class="newsfeed" id="newsfeeditems"></ul>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				<else>
+				<table class="dboarditem full">
+					<tbody>
+						<tr><td>
+							<img src="templates/{$theme}/assets/img/icons/warning_big.png" alt="" />&nbsp;
+							{$lng['panel']['newsfeed_disabled']}&nbsp;
+							<a href="{$linker->getLink(array('section' => 'settings', 'part' => 'panel'))}">
+								<img src="templates/{$theme}/assets/img/icons/edit_20.png" alt="" />
+							</a>
+						</td></tr>
+					</tbody>
+				</table>
+				</if>
+
+				<if $userinfo['custom_notes'] != '' && $userinfo['custom_notes_show'] == '1'>
+				<table class="dboarditem full">
+					<tbody>
+						<tr><td>{$userinfo['custom_notes']}</td></tr>
+					</tbody>
+				</table>
+				</if>
+
+				<table class="dboarditem">
+					<thead>
+						<tr>
+							<th colspan="2">{$lng['admin']['systemdetails']}</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>{$lng['admin']['hostname']}:</td>
+							<td>{$system_hostname}</td>
+						</tr>
+						<tr>
+							<td>{$lng['admin']['serversoftware']}:</td>
+							<td>{$_SERVER['SERVER_SOFTWARE']}</td>
+						</tr>
+						<tr>
+							<td>{$lng['admin']['phpversion']}:</td>
+							<td><a href="{$linker->getLink(array('section' => 'settings', 'page' => 'phpinfo'))}">$phpversion</a></td>
+						</tr>
+						<tr>
+							<td class="nowrap">{$lng['admin']['mysqlserverversion']}:</td>
+							<td>$mysqlserverversion</td>
+						</tr>
+						<tr>
+							<td>{$lng['admin']['webserverinterface']}:</td>
+							<td>$webserverinterface</td>
+						</tr>
+						<tr>
+							<td>{$lng['admin']['memory']}:</td>
+							<td><pre>$memory</pre></td>
+						</tr>
+						<tr>
+							<td>{$lng['admin']['sysload']}:</td>
+							<td>$load</td>
+						</tr>
+						<if $showkernel == 1>
+							<tr>
+								<td>Kernel:</td>
+								<td>$kernel</td>
+							</tr>
+						</if>
+						<if $uptime != ''>
+						<tr>
+							<td>Uptime:</td>
+							<td>$uptime</td>
+						</tr>
+						</if>
+					</tbody>
+				</table>
+
+				<table class="dboarditem">
+					<thead>
+						<tr>
+							<th colspan="2">{$lng['admin']['froxlordetails']}</th>
+						</tr>
+					</thead>
+					<tbody>
+						{$outstanding_tasks}
+						{$cron_last_runs}
+						<tr>
+							<td>{$lng['admin']['installedversion']}:</td>
+							<td>{$version}{$branding} (DB: {$dbversion})</td>
+						</tr>
+						<tr>
+							<td>{$lng['admin']['latestversion']}:</td>
+							<if $isnewerversion != 0 >
+								<td><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td>
+							<else>
+								<td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
+							</if>
+						</tr>
+						<if $lookfornewversion_message != ''>
+						<tr>
+							<td colspan="2"><strong>$lookfornewversion_message</strong></td>
+						</tr>
+						</if>
+						<if $lookfornewversion_addinfo != ''>
+						<tr>
+							<td colspan="2">$lookfornewversion_addinfo</td>
+						</tr>
+						</if>
+					</tbody>
+				</table>
+			</div>
+		</div>
+
+	</article>
+$footer

templates/Maketank/admin/index/overview_item.tpl

@@ -0,0 +1,4 @@
+<tr>
+	<td>{$text}:</td>
+	<td>{$value}</td>
+</tr>

templates/Maketank/admin/index/send_error_report.tpl

@@ -0,0 +1,43 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/error_report_big.png" alt="" />&nbsp;
+				{$lng['error']['send_report_title']}
+			</h2>
+		</header>
+
+		<section>
+			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="send" value="send" />
+				<table class="full">
+					<thead>
+					<tr>
+						<th>
+							<p>{$lng['error']['send_report_desc']}</p>
+						</th>
+					</tr>
+					</thead>
+					<tbody>
+					<tr>
+						<td>
+							<code>{$mail_html}</code>
+						</td>
+					</tr>
+					</tbody>
+					<tfoot>
+						<tr>
+							<td align="center">					
+								<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
+							</td>
+						</tr>
+					</tfoot>
+				</table>
+				</fieldset>
+			</form>
+		</section>
+	</article>
+$footer

templates/Maketank/admin/ipsandports/ipsandports.tpl

@@ -0,0 +1,63 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/ipsports_big.png" alt="" />&nbsp;
+				{$lng['admin']['ipsandports']['ipsandports']}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
+				</div>
+
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['admin']['ipsandports']['ip']}&nbsp;{$arrowcode['ip']}</th>
+							<th>{$lng['admin']['ipsandports']['port']}&nbsp;{$arrowcode['port']}</th>
+							<if !$is_nginx><th>Listen</th></if>
+							<if $is_apache && !$is_apache24><th>NameVirtualHost</th></if>
+							<th>vHost-Container</th>
+							<th>Specialsettings</th>
+							<if $is_apache><th>ServerName</th></if>
+							<th>SSL</th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="<if $is_apache>8<else>6</if>">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+
+					<tbody>
+						$ipsandports
+					</tbody>
+				</table>
+			</form>
+
+			<if 15 < $count>
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+				<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
+			</div>
+			</if>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/ipsandports/ipsandports_add.tpl

@@ -0,0 +1,26 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/ipsports_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$ipsandports_add_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/ipsandports/ipsandports_edit.tpl

@@ -0,0 +1,27 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/ipsports_edit_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="id" value="$id" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$ipsandports_edit_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/ipsandports/ipsandports_ipandport.tpl

@@ -0,0 +1,18 @@
+<tr>
+	<td>{$row['ip']}</td>
+	<td>{$row['port']}</td>
+	<if !$is_nginx><td><if $row['listen_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td></if>
+	<if $is_apache && !$is_apache24><td><if $row['namevirtualhost_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td></if>
+	<td><if $row['vhostcontainer']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
+	<td><if $row['specialsettings']!=''>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
+	<if $is_apache><td><if $row['vhostcontainer_servername_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td></if>
+	<td><if $row['ssl']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+	</td>
+</tr>

templates/Maketank/admin/logger/logger.tpl

@@ -0,0 +1,53 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/syslog_big.png" alt="" />&nbsp;
+				{$lng['menue']['logger']['logger']}
+			</h2>
+		</header>
+
+		<section>
+			
+			<form action="{$linker->getLink(array('section' => 'logger'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<input type="hidden" name="send" value="send" />
+
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>	
+
+				<div class="overviewadd">
+					{$pagingcode}&nbsp;&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/delete.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a>
+				</div>
+	
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['logger']['date']}&nbsp;{$arrowcode['date']}</th>
+							<th>{$lng['logger']['type']}&nbsp;{$arrowcode['type']}</th>
+							<th>{$lng['logger']['user']}&nbsp;{$arrowcode['user']}</th>
+							<th>{$lng['logger']['action']}</th>
+						</tr>
+					</thead>
+					<tbody>
+						$log
+					</tbody>
+				</table>
+			</form>
+
+			<if 15 < $log_count >
+			<div class="overviewadd">
+				{$pagingcode}&nbsp;&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/delete.png" alt="" />&nbsp;
+				<a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a>
+			</div>
+			</if>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/logger/logger_action.tpl

@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="4"><strong>{$row['action']}</strong></td>
+</tr>

templates/Maketank/admin/logger/logger_log.tpl

@@ -0,0 +1,6 @@
+<tr>
+	<td>{$row['date']}</td>
+	<td>{$row['type']}</td>
+	<td>{$row['user']}</td>
+	<td>{$row['text']}</td>
+</tr>

templates/Maketank/admin/message/message.tpl

@@ -0,0 +1,50 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/messages_big.png" alt="" />&nbsp;
+				{$lng['admin']['message']}
+			</h2>
+		</header>
+
+		<if 0 < $success >
+			<div class="successcontainer bradius">
+				<div class="successtitle">{$lng['success']['success']}</div>
+				<div class="success">{$successmessage}</div>
+			</div>
+		</if>
+
+		<section>
+			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<input type="hidden" name="action" value="$action"/>
+				<input type="hidden" name="send" value="send"/>
+				
+				<table class="full">
+					<tr>
+						<td><b><label for="receipient">{$lng['admin']['receipient']}</label></b></td>
+						<td><select name="receipient" id="receipient">$receipients</select></td>
+					</tr>
+					<tr>
+						<td><b><label for="subject">{$lng['admin']['subject']}</label></b></td>
+						<td><input type="text" name="subject" id="subject" value="{$lng['admin']['nosubject']}"/></td>
+					</tr>
+					<tr>
+						<td><b><label for="message">{$lng['admin']['text']}</label></b></td>
+						<td><textarea rows="12" cols="80" name="message" id="message"></textarea></td>
+					</tr>
+					<tfoot>
+						<tr>
+							<td align="right" colspan="2">
+								<input type="submit" value="{$lng['panel']['send']}" />
+							</td>
+						</tr>
+					</tfoot>
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/phpconfig/fpmconfig_add.tpl

@@ -0,0 +1,98 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$fpmconfig_add_form}
+				</table>
+			</form>
+		</section>
+	</article>
+
+	<br />
+	<article>
+		<header>
+			<h3>
+				{$lng['admin']['templates']['template_replace_vars']}
+			</h3>
+		</header>
+		
+		<section>
+			
+			<table class="full">
+			<thead>
+				<tr>
+					<th>{$lng['panel']['variable']}</th>
+					<th>{$lng['panel']['description']}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td><em>{PEAR_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['pear_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_C}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_c']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_GLOBAL}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_global']}</td>
+				</tr>
+				<tr>
+					<td><em>{TMP_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['tmp_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOMAIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['domain']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOCUMENT_ROOT}</em></td>
+					<td>{$lng['admin']['phpconfig']['docroot']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_HOMEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['homedir']}</td>
+				</tr>
+			</tbody>
+			</table>
+
+		</section>
+
+	</article>
+
+$footer

templates/Maketank/admin/phpconfig/fpmconfig_edit.tpl

@@ -0,0 +1,99 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_edit_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<input type="hidden" name="action" value="edit"/>
+				<input type="hidden" name="id" value="$id"/>
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$fpmconfig_edit_form}
+				</table>
+			</form>
+		</section>
+	</article>
+
+	<br />
+	<article>
+		<header>
+			<h3>
+				{$lng['admin']['templates']['template_replace_vars']}
+			</h3>
+		</header>
+		
+		<section>
+			
+			<table class="full">
+			<thead>
+				<tr>
+					<th>{$lng['panel']['variable']}</th>
+					<th>{$lng['panel']['description']}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td><em>{PEAR_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['pear_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_C}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_c']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_GLOBAL}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_global']}</td>
+				</tr>
+				<tr>
+					<td><em>{TMP_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['tmp_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOMAIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['domain']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOCUMENT_ROOT}</em></td>
+					<td>{$lng['admin']['phpconfig']['docroot']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_HOMEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['homedir']}</td>
+				</tr>
+			</tbody>
+			</table>
+
+		</section>
+
+	</article>
+
+$footer

templates/Maketank/admin/phpconfig/fpmdaemons.tpl

@@ -0,0 +1,42 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png" alt="" />&nbsp;
+				{$lng['menue']['phpsettings']['fpmdaemons']}
+			</h2>
+		</header>
+
+		<section>
+
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+				<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['fpmsettings']['addnew']}</a>
+			</div>
+
+			<table class="full hl">
+				<thead>
+					<tr>
+						<th>{$lng['admin']['phpsettings']['description']}</th>
+						<th>{$lng['admin']['phpsettings']['activephpconfigs']}</th>
+						<th>{$lng['serversettings']['phpfpm_settings']['reload']}</th>
+						<th>{$lng['serversettings']['phpfpm_settings']['configdir']}</th>
+						<th>{$lng['serversettings']['phpfpm_settings']['pm']}</th>
+						<th>{$lng['panel']['options']}</th>
+				</thead>
+				<tbody>
+					$tablecontent
+				</tbody>
+			</table>
+			
+			<if 15 < $count>
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['fpmsettings']['addnew']}</a>
+				</div>
+			</if>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/phpconfig/fpmdaemons_overview.tpl

@@ -0,0 +1,17 @@
+<tr class="top">
+	<td><strong>{$row['description']}</strong></td>
+	<td>{$configs}</td>
+	<td>{$row['reload_cmd']}</td>
+	<td>{$row['config_dir']}</td>
+	<td>{$row['pm']}</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>
+		<if $row['id'] != 1>
+		&nbsp;<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+		</if>
+	</td>
+</tr>

templates/Maketank/admin/phpconfig/overview.tpl

@@ -0,0 +1,44 @@
+$header
+<article>
+	<header>
+		<h2>
+			<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png"
+				alt="" />&nbsp; {$lng['menue']['phpsettings']['maintitle']}
+		</h2>
+	</header>
+
+	<section>
+
+		<div class="overviewadd">
+			<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+			<a
+				href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
+		</div>
+
+		<table class="full hl">
+			<thead>
+				<tr>
+					<th>{$lng['admin']['phpsettings']['description']}</th>
+					<th>{$lng['admin']['phpsettings']['activedomains']}</th>
+					<if \Froxlor\Settings::Get('phpfpm.enabled')=='1'>
+					<th>{$lng['admin']['phpsettings']['fpmdesc']}</th>
+					<else>
+					<th>{$lng['admin']['phpsettings']['binary']}</th></if>
+					<th>{$lng['admin']['phpsettings']['file_extensions']}</th>
+					<th>{$lng['panel']['options']}</th>
+			</thead>
+			<tbody>$tablecontent
+			</tbody>
+		</table>
+
+		<if15 < $count>
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
+				</div>
+			</if>
+
+		</section>
+
+</article>
+$footer

templates/Maketank/admin/phpconfig/overview_add.tpl

@@ -0,0 +1,101 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_add_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$phpconfig_add_form}
+				</table>
+			</form>
+		</section>
+	</article>
+	<br />
+	<article>
+		<header>
+			<h3>
+				{$lng['admin']['templates']['template_replace_vars']}
+			</h3>
+		</header>
+		
+		<section>
+			
+			<table class="full">
+			<thead>
+				<tr>
+					<th>{$lng['panel']['variable']}</th>
+					<th>{$lng['panel']['description']}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td colspan="2">
+						<strong>{$lng['admin']['phpconfig']['template_replace_vars']}</strong>
+					</td>
+				</tr>
+				<tr>
+					<td><em>{PEAR_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['pear_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_C}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_c']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_GLOBAL}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_global']}</td>
+				</tr>
+				<tr>
+					<td><em>{TMP_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['tmp_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOMAIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['domain']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOCUMENT_ROOT}</em></td>
+					<td>{$lng['admin']['phpconfig']['docroot']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_HOMEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['homedir']}</td>
+				</tr>
+			</tbody>
+			</table>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/phpconfig/overview_edit.tpl

@@ -0,0 +1,97 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_edit_big.png" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<input type="hidden" name="action" value="edit"/>
+				<input type="hidden" name="id" value="$id"/>
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$phpconfig_edit_form}
+				</table>
+			</form>
+		</section>
+	</article>
+	<br />
+	<article>
+		<header>
+			<h3>
+				{$lng['admin']['templates']['template_replace_vars']}
+			</h3>
+		</header>
+		
+		<section>
+			
+			<table class="full">
+			<thead>
+				<tr>
+					<th>{$lng['panel']['variable']}</th>
+					<th>{$lng['panel']['description']}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td><em>{PEAR_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['pear_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_C}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_c']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir']}</td>
+				</tr>
+				<tr>
+					<td><em>{OPEN_BASEDIR_GLOBAL}</em></td>
+					<td>{$lng['admin']['phpconfig']['open_basedir_global']}</td>
+				</tr>
+				<tr>
+					<td><em>{TMP_DIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['tmp_dir']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN_EMAIL}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin_email']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOMAIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['domain']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER}</em></td>
+					<td>{$lng['admin']['phpconfig']['customer']}</td>
+				</tr>
+				<tr>
+					<td><em>{ADMIN}</em></td>
+					<td>{$lng['admin']['phpconfig']['admin']}</td>
+				</tr>
+				<tr>
+					<td><em>{DOCUMENT_ROOT}</em></td>
+					<td>{$lng['admin']['phpconfig']['docroot']}</td>
+				</tr>
+				<tr>
+					<td><em>{CUSTOMER_HOMEDIR}</em></td>
+					<td>{$lng['admin']['phpconfig']['homedir']}</td>
+				</tr>
+			</tbody>
+			</table>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/phpconfig/overview_overview.tpl

@@ -0,0 +1,20 @@
+<tr class="top">
+	<td><strong>{$row['description']}</strong></td>
+	<td>{$domains}<if 0 < $subdomains_count><if !empty($domains)>+ </if>{$subdomains_count} {$lng['customer']['subdomains']}</if></td>
+	<if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
+		<td>{$row['fpmdesc']}</td>
+	<else>
+		<td>{$row['binary']}</td>
+	</if>
+	<td>{$row['file_extensions']}</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>
+		<if $row['id'] != 1>
+		&nbsp;<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+		</if>
+	</td>
+</tr>

templates/Maketank/admin/plans/plans.tpl

@@ -0,0 +1,59 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/templates_big.png" alt="" />&nbsp;
+				{$lng['admin']['plans']['plans']}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'plans'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s"/>
+				<input type="hidden" name="page" value="$page"/>
+				<div class="overviewsearch">
+					{$searchcode}
+				</div>
+
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'plans', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['plans']['add']}</a>
+				</div>
+
+				<table class="full hl">
+					<thead>
+						<tr>
+							<th>{$lng['admin']['plans']['name']}&nbsp;{$arrowcode['p.name']}</th>
+							<th>{$lng['admin']['plans']['description']}&nbsp;{$arrowcode['p.description']}</th>
+							<th>{$lng['admin']['admin']}&nbsp;{$arrowcode['adminname']}</th>
+							<th>{$lng['admin']['plans']['last_update']}&nbsp;{$arrowcode['p.ts']}</th>
+							<th>{$lng['panel']['options']}</th>
+						</tr>
+					</thead>
+
+					<if $pagingcode != ''>
+					<tfoot>
+						<tr>
+							<td colspan="5">{$pagingcode}</td>
+						</tr>
+					</tfoot>
+					</if>
+
+					<tbody>
+						$plans
+					</tbody>
+				</table>
+			</form>
+
+			<if 15 < $count>
+			<div class="overviewadd">
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+				<a href="{$linker->getLink(array('section' => 'plans', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['plans']['add']}</a>
+			</div>
+			</if>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/plans/plans_add.tpl

@@ -0,0 +1,26 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/{$image}" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'plans'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$plans_add_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/plans/plans_edit.tpl

@@ -0,0 +1,27 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/{$image}" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section>
+
+			<form action="{$linker->getLink(array('section' => 'plans'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="action" value="$action" />
+				<input type="hidden" name="id" value="$id" />
+				<input type="hidden" name="send" value="send" />
+
+				<table class="full">
+					{$plans_edit_form}
+				</table>
+			</form>
+
+		</section>
+
+	</article>
+$footer

templates/Maketank/admin/plans/plans_plan.tpl

@@ -0,0 +1,14 @@
+<tr>
+	<td>{$row['name']}</td>
+	<td>{$row['description']}</td>
+	<td>{$row['adminname']}</td>
+	<td>{$row['ts_format']}</td>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'plans', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="{$linker->getLink(array('section' => 'plans', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
+		</a>
+	</td>
+</tr>

templates/Maketank/admin/settings/apcuinfo/img_line.tpl

@@ -0,0 +1,3 @@
+<tr>
+    <td colspan="2"><center><img class="responsive" src="{$img_src}"></center></td>
+</tr>

templates/Maketank/admin/settings/apcuinfo/runtime_line.tpl

@@ -0,0 +1,4 @@
+<tr>
+    <td>{$name}</td>
+    <td>{$value}</td>
+</tr>

templates/Maketank/admin/settings/apcuinfo/showinfo.tpl

@@ -0,0 +1,126 @@
+$header
+<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
+				{$lng['admin']['apcuinfo']}
+			</h2>
+		</header>
+
+		<section>
+			<table class="full">
+                            <tr class="section">
+                                <th>{$lng['apcuinfo']['generaltitle']}</th>
+                                <th class="right">
+                                        <a href="{$linker->getLink(array('section' => 'apcuinfo', 'page' => 'showinfo', 'action' => 'delete'))}">{$lng['apcuinfo']['clearcache']}</a>
+                                        &nbsp;
+                                </th>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['version']}</td>
+                                <td>{$apcversion}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['phpversion']}</td>
+                                <td>{$phpversion}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['sharedmem']}</td>
+                                <td>{$sharedmem}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['start']}</td>
+                                <td>{$starttime}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['uptime']}</td>
+                                <td>{$uptime_duration}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['upload']}</td>
+                                <td>{$cache['file_upload_progress']}</td>
+                            </tr>
+                            
+                            
+                            <tr class="section">
+                                <th colspan="2">{$lng['apcuinfo']['cachetitle']}</th>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['cvar']}</td>
+                                <td>{$number_vars} ({$size_vars})</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['hit']}</td>
+                                <td>{$cache['num_hits']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['miss']}</td>
+                                <td>{$cache['num_misses']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['reqrate']}</td>
+                                <td>{$req_rate_user} {$lng['apcuinfo']['creqsec']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['hitrate']}</td>
+                                <td>{$hit_rate_user} {$lng['apcuinfo']['creqsec']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['missrate']}</td>
+                                <td>{$miss_rate_user} {$lng['apcuinfo']['creqsec']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['insrate']}</td>
+                                <td>{$insert_rate_user} {$lng['apcuinfo']['creqsec']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['cachefull']}</td>
+                                <td>{$cache['num_expunges']}</td>
+                            </tr>
+                            
+                            <tr class="section">
+                                <th colspan="2">{$lng['apcuinfo']['memnote']}</th>
+                            </tr>
+                            {$img_src1}
+                            <tr>
+                                <td>{$lng['apcuinfo']['free']}</td>
+                                <td>{$freemem}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['used']}</td>
+                                <td>{$usedmem}</td>
+                            </tr>
+                            
+                            <tr class="section">
+                                <th colspan="2">{$lng['apcuinfo']['hitmiss']}</th>
+                            </tr>
+                            {$img_src2}
+                            <tr>
+                                <td>{$lng['apcuinfo']['hit']}</td>
+                                <td>{$hits}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['apcuinfo']['miss']}</td>
+                                <td>{$misses}</td>
+                            </tr>
+                            
+                            <tr class="section">
+                                <th colspan="2">{$lng['apcuinfo']['detailmem']}</th>
+                            </tr>
+                            {$img_src3}
+                            <tr>
+                                <td>{$lng['apcuinfo']['fragment']}</td>
+                                <td>{$frag}</td>
+                            </tr>
+                            
+                            <tr class="section">
+                                <th colspan="2">{$lng['apcuinfo']['runtime']}</th>
+                            </tr>
+                            {$runtimelines}
+			</table>
+                            
+		</section>
+                            
+                            
+</article>
+$footer

templates/Maketank/admin/settings/importexport/index.tpl

@@ -0,0 +1,26 @@
+$header
+<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="" />&nbsp;
+				{$lng['admin']['configfiles']['importexport']}
+			</h2>
+		</header>
+		
+		<section>
+			<a href="{$linker->getLink(array('section' => 'settings', 'page' => $page, 'action' => 'export'))}">
+				<input class="yesbutton" type="button" value="Download/Export {$lng['admin']['serversettings']}" />
+			</a>
+		</section>
+		<br><br>
+		<section>
+			<form action="{$linker->getLink(array('section' => 'settings', 'page' => $page, 'action' => 'import'))}" method="post" enctype="multipart/form-data">
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="send" value="send" />
+
+				<input type="file" name="import_file" id="import_file" placeholder="Chose file for import" />
+				<input type="submit" value="Import">
+			</form>
+		</section>
+</article>
+$footer

templates/Maketank/admin/settings/integritycheck.tpl

@@ -0,0 +1,28 @@
+$header
+<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
+				{$lng['admin']['integritycheck']}
+			</h2>
+		</header>
+
+		<section>
+			<table class="full">
+				<thead>
+				<tr>
+					<th>{$lng['admin']['integrityid']}</th>
+					<th>{$lng['admin']['integrityname']}</th>
+					<th>{$lng['admin']['integrityresult']}</th>
+				</tr>
+				</thead>
+				<tfoot>
+					<td colspan="3"><a href="{$linker->getLink(array('section' => 'settings', 'page' => $page, 'action' => 'fix'))}">{$lng['admin']['integrityfix']}</a></td>
+				</tfoot>
+				<tbody>
+					{$integritycheck}
+				</tbody>
+			</table>
+		</section>
+</article>
+$footer

templates/Maketank/admin/settings/integritycheck_row.tpl

@@ -0,0 +1,11 @@
+		<tr>
+			<td>{$displayid}</td>
+			<td>{$checkdesc}</td>
+			<td>
+				<if $result == '1'>
+					<span class="green">OK</span>
+				<else>
+					<span class="red">FAIL</span>
+				</if>
+			</td>
+		</tr>

templates/Maketank/admin/settings/opcacheinfo/blacklist_line.tpl

@@ -0,0 +1,3 @@
+<tr>
+    <td colspan="2">{$value}</td>
+</tr>

templates/Maketank/admin/settings/opcacheinfo/runtime_line.tpl

@@ -0,0 +1,4 @@
+<tr>
+    <td><a href="http://php.net/manual/en/opcache.configuration.php#ini.{$linkname}" target="_blank">{$name}</a></td>
+    <td>{$value}</td>
+</tr>

templates/Maketank/admin/settings/opcacheinfo/showinfo.tpl

@@ -0,0 +1,201 @@
+$header
+<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
+				{$lng['admin']['opcacheinfo']}
+			</h2>
+		</header>
+
+		<section>
+                        <div>
+                            
+                            <if ($totalmem) >
+                                <div class="canvasbox">
+					<input type="hidden" id="usedmem" class="circular" data-used="{$usedmem}" data-available="{$totalmem}">
+					<canvas id="usedmem-canvas" width="120" height="76"></canvas><br />
+                                        {$lng['opcacheinfo']['memusage']}<br />
+                                        <small>
+                                            {$lng['opcacheinfo']['used']}: {$usedmemstr} <br />
+                                            {$lng['opcacheinfo']['free']}: {$freememstr}
+                                        </small>
+				</div>                  
+                                <div class="canvasbox">
+					<input type="hidden" id="wastedmem" class="circular" data-used="{$wastedmem}" data-available="{$totalmem}">
+					<canvas id="wastedmem-canvas" width="120" height="76"></canvas><br />
+					{$lng['opcacheinfo']['wastedmem']}<br />
+                                        <small>
+                                            {$wastedmemstr}
+                                        </small>
+				</div>                  
+                            </if>
+                            <if (isset($stringbuffer)) >
+                                <div class="canvasbox">
+					<input type="hidden" id="stringused" class="circular" data-used="{$usedstring}" data-available="{$totalstring}">
+					<canvas id="stringused-canvas" width="120" height="76"></canvas><br />
+					{$lng['opcacheinfo']['strinterning']}<br />
+                                        <small>
+                                            {$lng['opcacheinfo']['used']}: {$usedstringstr} <br />
+                                            {$lng['opcacheinfo']['free']}: {$freestringstr}
+                                        </small>
+				</div>                  
+                            </if>
+                            <if ($totalkey) >
+                                <div class="canvasbox">
+					<input type="hidden" id="usedkeystat" class="circular" data-used="{$usedkey}" data-available="{$totalkey}">
+					<canvas id="usedkeystat-canvas" width="120" height="76"></canvas><br />
+					{$lng['opcacheinfo']['usedkey']}<br />
+                                        <small>
+                                            {$usedkeystr}
+                                        </small>
+				</div>                  
+                            </if>
+                            <if ($cachetotal) >
+                                <div class="canvasbox">
+					<input type="hidden" id="cachehit" class="circular" data-used="{$cachehits}" data-available="{$cachetotal}">
+					<canvas id="cachehit-canvas" width="120" height="76"></canvas><br />
+					{$lng['opcacheinfo']['hitsc']}
+				</div>                  
+                            </if>
+                                
+                        </div>
+                    
+			<table class="full">
+                            <tr class="section">
+                                <th>{$lng['opcacheinfo']['generaltitle']}</th>
+                                <th class="right">
+                                        <a href="{$linker->getLink(array('section' => 'opcacheinfo', 'page' => 'showinfo', 'action' => 'reset'))}">{$lng['opcacheinfo']['resetcache']}</a>
+                                        &nbsp;
+                                </th>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['version']}</td>
+                                <td>{$general['version']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['phpversion']}</td>
+                                <td>{$general['phpversion']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['start']}</td>
+                                <td>{$general['start_time']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['lastreset']}</td>
+                                <td>{$general['last_restart_time']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['oomrestarts']}</td>
+                                <td>{$general['oom_restarts']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['hashrestarts']}</td>
+                                <td>{$general['hash_restarts']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['manualrestarts']}</td>
+                                <td>{$general['manual_restarts']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['status']}</td>
+                                <td>{$general['status']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['cachedscripts']}</td>
+                                <td>{$general['cachedscripts']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['hitsc']}</td>
+                                <td>{$general['cachehits']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['missc']}</td>
+                                <td>{$general['cachemiss']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['blmissc']}</td>
+                                <td>{$general['blacklistmiss']}</td>
+                            </tr>
+
+                            <if ($totalmem) >
+                            <tr>
+                                <th colspan="2">{$lng['opcacheinfo']['memusage']}</th>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['totalmem']}</td>
+                                <td>{$memory['total']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['usedmem']}</td>
+                                <td>{$memory['used']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['freemem']}</td>
+                                <td>{$memory['free']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['wastedmem']}</td>
+                                <td>{$memory['wasted']}</td>
+                            </tr>
+                            </if>
+                            
+                            <if (isset($stringbuffer)) >
+                            <tr>
+                                <th colspan="2">{$lng['opcacheinfo']['strinterning']}</th>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['totalmem']}</td>
+                                <td>{$stringbuffer['total']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['usedmem']}</td>
+                                <td>{$stringbuffer['used']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['freemem']}</td>
+                                <td>{$stringbuffer['free']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['strcount']}</td>
+                                <td>{$stringbuffer['strcount']}</td>
+                            </tr>
+                            </if>
+                            
+                            <if (isset($keystat)) >
+                            <tr>
+                                <th colspan="2">{$lng['opcacheinfo']['keystat']}</th>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['maxkey']}</td>
+                                <td>{$keystat['total']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['usedkey']}</td>
+                                <td>{$keystat['used']}</td>
+                            </tr>
+                            <tr>
+                                <td>{$lng['opcacheinfo']['wastedkey']}</td>
+                                <td>{$keystat['wasted']}</td>
+                            </tr>
+                            </if>
+
+                            <if $runtimelines >
+                            <tr class="section">
+                                <th colspan="2">{$lng['opcacheinfo']['runtimeconf']}</th>
+                            </tr>
+                            {$runtimelines}
+                            </if>
+                            
+                            <if $blacklistlines >
+                            <tr class="section">
+                                <th colspan="2">{$lng['opcacheinfo']['blacklist']}</th>
+                            </tr>
+                            {$blacklistlines}
+                            </if>
+                            
+			</table>
+                            
+		</section>
+                            
+</article>
+$footer

templates/Maketank/admin/settings/phpinfo.tpl

@@ -0,0 +1,16 @@
+$header
+<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
+				{$lng['admin']['phpinfo']}
+			</h2>
+		</header>
+
+		<section>
+			<table class="full">
+				{$phpinfo}
+			</table>
+		</section>
+</article>
+$footer

templates/Maketank/admin/settings/phpinfo/phpinfo_1.tpl

@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="3" align="center">{$val}</td>
+</tr>

templates/Maketank/admin/settings/phpinfo/phpinfo_2.tpl

@@ -0,0 +1,4 @@
+<tr>
+	<td width="180">{$key}</td>
+	<td colspan="2">{$val}</td>
+</tr>

templates/Maketank/admin/settings/phpinfo/phpinfo_3.tpl

@@ -0,0 +1,6 @@
+<if $key != 'Directive'>
+<tr>
+	<td width="180">{$key}</td>
+	<td colspan="2">{$val[0]}<br/><small>(Master: {$val[1]})</small></td>
+</tr>
+</if>

templates/Maketank/admin/settings/phpinfo/phpinfo_table.tpl

@@ -0,0 +1,4 @@
+	<tr class="section">
+		<th colspan="3">{$name}</th>
+	</tr>
+	{$phpinfoentries}