greylisting 2.0

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

.drone.yml

@@ -0,0 +1,53 @@
+kind: pipeline
+name: deploy-froxlor
+type: docker
+
+platform:
+  os: linux
+  arch: arm64
+
+trigger:
+  branch:
+    - upgrade-2.0
+  event:
+    include:
+     - push
+   
+environment:
+    DEPLOY_HOST: rechner.maketank.net
+    DEPLOY_DIR: ~/froxlor-test
+
+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', 'node_modules']
+    args: '-v --delete'
+    log_level: quiet
+    key: 
+      from_secret: ssh-www-data-maketank-rsa
+    command_timeout: 10m
+- name: compose
+  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
+- name: npm
+  image: appleboy/drone-ssh
+  settings:
+    host:
+        - rechner02.maketank.net
+    username: www-data
+    key:
+        from_secret: ssh-www-data-maketank-rsa
+    script:
+        - cd ~/froxlor-test && npm install && npm run build

.gitignore

@@ -18,7 +18,6 @@ img/
 vendor/
 node_modules/
 fonts/
-templates/*
 !templates/index.html
 !templates/Froxlor/
 templates/Froxlor/assets/mix-manifest.json

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_email.php

@@ -299,6 +299,30 @@ if ($page == 'email_domain') {
 			'action' => 'edit',
 			'id' => $id,
 		]);
+	} elseif ($action == 'togglegreylist' && $id != 0) {
+	    try {
+	        $json_result = Emails::getLocal($userinfo, [
+	            'id' => $id
+	        ])->get();
+	    } catch (Exception $e) {
+	        Response::dynamicError($e->getMessage());
+	    }
+	    $result = json_decode($json_result, true)['data'];
+	    
+	    try {
+	        Emails::getLocal($userinfo, [
+	            'id' => $id,
+	            'disablegreylist' => ($result['disablegreylist'] == '1' ? 0 : 1)
+	        ])->updateGreylist();
+	    } catch (Exception $e) {
+	        Response::dynamicError($e->getMessage());
+	    }
+	    Response::redirectTo($filename, [
+	        'page' => $page,
+	        'domainid' => $email_domainid,
+	        'action' => 'edit',
+	        'id' => $id,
+	    ]);
 	}
 } elseif ($page == 'accounts') {
 	$email_domainid = Request::any('domainid', 0);

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/Emails.php

@@ -75,6 +75,7 @@ class Emails extends ApiCommand implements ResourceEntity
 
 			// parameters
 			$iscatchall = $this->getBoolParam('iscatchall', true, 0);
+			$disablegreylist = $this->getBoolParam('disablegreylist', true, 0);
 			$description = $this->getParam('description', true, '');
 
 			// validation
@@ -118,7 +119,7 @@ class Emails extends ApiCommand implements ResourceEntity
 
 			// duplicate check
 			$stmt = Database::prepare("
-				SELECT `id`, `email`, `email_full`, `iscatchall`, `destination`, `customerid` FROM `" . TABLE_MAIL_VIRTUAL . "`
+				SELECT `id`, `email`, `email_full`, `iscatchall`, `destination`, `customerid`, `disablegreylist` FROM `" . TABLE_MAIL_VIRTUAL . "`
 				WHERE (`email` = :email OR `email_full` = :emailfull )
 				AND `customerid`= :cid
 			");
@@ -144,7 +145,8 @@ class Emails extends ApiCommand implements ResourceEntity
 				`email_full` = :email_full,
 				`iscatchall` = :iscatchall,
 				`domainid` = :domainid,
-				`description` = :description
+				`description` = :description,
+                `disablegreylist` = :disablegreylist
 			");
 			$params = [
 				"cid" => $customer['customerid'],
@@ -152,7 +154,8 @@ class Emails extends ApiCommand implements ResourceEntity
 				"email_full" => $email_full,
 				"iscatchall" => $iscatchall,
 				"domainid" => $domain_check['id'],
-				"description" => $description
+				"description" => $description,
+			    "disablegreylist" => $disablegreylist
 			];
 			Database::pexecute($stmt, $params, true, true);
 
@@ -191,7 +194,7 @@ class Emails extends ApiCommand implements ResourceEntity
 		$customer_ids = $this->getAllowedCustomerIds('email');
 		$params['idea'] = ($id <= 0 ? $emailaddr : $id);
 
-		$result_stmt = Database::prepare("SELECT v.`id`, v.`email`, v.`email_full`, v.`iscatchall`, v.`destination`, v.`customerid`, v.`popaccountid`, v.`domainid`, v.`description`, u.`quota`, u.`imap`, u.`pop3`, u.`postfix`, u.`mboxsize`
+		$result_stmt = Database::prepare("SELECT v.`id`, v.`email`, v.`email_full`, v.`iscatchall`, v.`disablegreylist`, v.`destination`, v.`customerid`, v.`popaccountid`, v.`domainid`, v.`description`, u.`quota`, u.`imap`, u.`pop3`, u.`postfix`, u.`mboxsize`
 			FROM `" . TABLE_MAIL_VIRTUAL . "` v
 			LEFT JOIN `" . TABLE_MAIL_USERS . "` u ON v.`popaccountid` = u.`id`
 			WHERE v.`customerid` IN (" . implode(", ", $customer_ids) . ")
@@ -302,6 +305,81 @@ class Emails extends ApiCommand implements ResourceEntity
 		return $this->response($result);
 	}
 
+	/**
+	 * toggle greylist flag of given email address either by id or email-address
+	 *
+	 * @param int $id
+	 *            optional, the email-address-id
+	 * @param string $emailaddr
+	 *            optional, the email-address
+	 * @param int $customerid
+	 *            optional, required when called as admin (if $loginname is not specified)
+	 * @param string $loginname
+	 *            optional, required when called as admin (if $customerid is not specified)
+	 * @param boolean $greylist
+	 *            optional
+	 * @param string $description
+	 *            optional custom description (currently not used/shown in the frontend), default empty
+	 *
+	 * @access admin, customer
+	 * @return string json-encoded array
+	 * @throws Exception
+	 */
+	public function updateGreylist()
+	{
+	    if ($this->isAdmin() == false && Settings::IsInList('panel.customer_hide_options', 'email')) {
+	        throw new Exception("You cannot access this resource", 405);
+	    }
+	    
+	    // if enabling catchall is not allowed by settings, we do not need
+	    // to run update()
+	    /** if (Settings::Get('catchall.catchall_enabled') != '1') {
+	        Response::standardError([
+	            'operationnotpermitted',
+	            'featureisdisabled'
+	        ], 'catchall', true);
+	    } */
+	    
+	    $id = $this->getParam('id', true, 0);
+	    $ea_optional = $id > 0;
+	    $emailaddr = $this->getParam('emailaddr', $ea_optional, '');
+	    
+	    $result = $this->apiCall('Emails.get', [
+	        'id' => $id,
+	        'emailaddr' => $emailaddr
+	    ]);
+	    $id = $result['id'];
+	    $email = $result['email'];
+	    
+	    
+	    // parameters
+	    $disablegreylist = $this->getBoolParam('disablegreylist', true, $result['disablegreylist']);
+	    $description = $this->getParam('description', true, $result['description']);
+	    
+	    // get needed customer info to reduce the email-address-counter by one
+	    $customer = $this->getCustomerData();
+	    
+	    // check for catchall-flag
+	    $stmt = Database::prepare("
+			UPDATE `" . TABLE_MAIL_VIRTUAL . "`
+			SET `email` = :email , `disablegreylist` = :grflag, `description` = :description
+			WHERE `customerid`= :cid AND `id`= :id
+		");
+	    $params = [
+	        "email" => $email,
+	        "grflag" => $disablegreylist,
+	        "description" => $description,
+	        "cid" => $customer['customerid'],
+	        "id" => $id
+	    ];
+	    Database::pexecute($stmt, $params, true, true);
+	    $this->logger()->logAction($this->isAdmin() ? FroxlorLogger::ADM_ACTION : FroxlorLogger::USR_ACTION, LOG_NOTICE, "[API] toggled greylist-flag for email address '" . $result['email_full'] . "'");
+	    
+	    $result = $this->apiCall('Emails.get', [
+	        'emailaddr' => $result['email_full']
+	    ]);
+	    return $this->response($result);
+	}
 	/**
 	 * list all email addresses, if called from an admin, list all email addresses of all customers you are allowed to
 	 * view, or specify id or loginname for one specific customer
@@ -331,7 +409,7 @@ class Emails extends ApiCommand implements ResourceEntity
 		$result = [];
 		$query_fields = [];
 		$result_stmt = Database::prepare("
-			SELECT m.`id`, m.`domainid`, m.`email`, m.`email_full`, m.`iscatchall`, m.`destination`, m.`popaccountid`, d.`domain`, u.`quota`, u.`imap`, u.`pop3`, u.`postfix`, u.`mboxsize`
+			SELECT m.`id`, m.`domainid`, m.`email`, m.`email_full`, m.`iscatchall`, m.`disablegreylist`, m.`destination`, m.`popaccountid`, d.`domain`, u.`quota`, u.`imap`, u.`pop3`, u.`postfix`, u.`mboxsize`
 			FROM `" . TABLE_MAIL_VIRTUAL . "` m
 			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` d ON (m.`domainid` = d.`id`)
 			LEFT JOIN `" . TABLE_MAIL_USERS . "` u ON (m.`popaccountid` = u.`id`)

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/formfields/customer/email/formfield.emails_add.php

@@ -52,7 +52,13 @@ return [
 						'type' => 'checkbox',
 						'value' => '1',
 						'checked' => false
-					]
+					],
+				    'disablegreylist' => [
+				        'label' => lng('emails.disablegreylist'),
+				        'type' => 'checkbox',
+				        'value' => '1',
+				        'checked' => false
+				    ]
 				]
 			]
 		]

lib/formfields/customer/email/formfield.emails_edit.php

@@ -102,6 +102,19 @@ return [
 							]
 						]
 					],
+				    'mail_disablegreylist' => [
+				        'label' => lng('emails.greylist'),
+				        'type' => 'label',
+				        'value' => ((int)$result['disablegreylist'] == 0 ? lng('panel.no') : lng('panel.yes')),
+				        'next_to' => [
+				            'add_link' => [
+				                'type' => 'link',
+				                'href' => $filename . '?page=' . $page . '&domainid=' . $result['domainid'] . '&action=togglegreylist&id=' . $result['id'],
+				                'label' => '<i class="fa-solid fa-arrow-right-arrow-left"></i> ' . lng('panel.toggle'),
+				                'classes' => 'btn btn-sm btn-secondary'
+				            ]
+				        ]
+				    ],
 					'mail_fwds' => [
 						'label' => lng('emails.forwarders') . ' (' . $forwarders_count . ')',
 						'type' => 'itemlist',

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'),

lib/tablelisting/customer/tablelisting.emails.php

@@ -55,6 +55,12 @@ return [
 				'callback' => [Text::class, 'boolean'],
 				'visible' => Settings::Get('catchall.catchall_enabled') == '1'
 			],
+		    'm.disablegreylist' => [
+		        'label' => lng('emails.greylist'),
+		        'field' => 'disablegreylist',
+		        'callback' => [Text::class, 'boolean'],
+		        '#visible' => Settings::Get('greylist.greylist_enabled') == '1'
+		    ],
 			'u.quota' => [
 				'label' => lng('emails.quota'),
 				'field' => 'quota',
@@ -66,6 +72,7 @@ return [
 			'm.destination',
 			'm.popaccountid',
 			'm.iscatchall',
+		    'm.disablegreylist',
 			'u.quota'
 		]),
 		'actions' => [

lng/de.lng.php

@@ -724,6 +724,8 @@ return [
 		'back_to_overview' => 'Zurück zur Domain-Übersicht',
 		'accounts' => 'Konten',
 		'emails' => 'Adressen',
+	    'disablegreylist' => 'Greylisting deaktivieren?',
+	    'greylist' => 'Greylisting aus?'
 	],
 	'error' => [
 		'error' => 'Fehlermeldung',

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',

notice.html

@@ -0,0 +1,55 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="robots" content="noindex, nofollow">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>froxlor - Domain not configured</title>
+	<style>
+		:root{--primary:#1872a2;--fonts:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"}
+		body{display:flex;flex-direction:column;background:#f8f9fa;color:#4b5563;align-items:center;justify-content:center;font-family:var(--fonts)}
+		main{background:#fff;margin:10% auto 12px;max-width:540px;padding:2rem;box-shadow:4px 8px 16px 0 rgba(0,0,0,.07);border-radius:.375rem}
+		main h2{margin:0}
+		main p{margin-bottom:1.5rem}
+		main p:last-child{margin-bottom:0}
+		main ul{list-style:none;margin-left:-40px}
+		main li{display:flex;align-items:center;margin-bottom:1rem}
+		main .icon{min-width:24px;width:24px;stroke:var(--primary);margin-right:.75rem}
+		code{background:#eee;padding:.1rem .25rem;border-radius:4px;color:rgba(0,0,0,.75)}
+		hr{margin:2rem 0;border:none;border-bottom:solid 1px rgba(0,0,0,.1)}
+		a,a:active,a:visited{color:var(--primary);text-decoration:none}
+		a:hover{text-decoration:underline}
+		footer{display:flex;align-items:center;margin-top:.5rem}
+		footer .logo{margin-right:.35rem}
+		@media (prefers-color-scheme: dark) {
+			:root{--primary:#29a2d6}
+			body{background:#212529;color:#f8f9fa}
+			main{background:#343a40}
+			hr{border-color:rgba(0,0,0,.2)}
+		}
+	</style>
+</head>
+<body>
+<main>
+	<h2>Domain not configured</h2>
+	<p>
+		This domain requires configuration via the froxlor server management panel, as it is currently not assigned to any customer.
+	</p>
+	<ul>
+		<li>
+			<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="icon">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" />
+			</svg>
+			<span>Please ask your provider/hoster if you have any questions.</span>
+		</li>
+	</ul>
+</main>
+<footer>
+	<img class="logo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAAAQCAYAAAC1MDndAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAy1JREFUeNrs1muIVlUUBuBnvqZkoswudKErZFOG0kWt6WpN0wWCDMOsgX4UmVS/KovKhIKYLhRBJvV1o/5VlJCmYEmUFYijaBYhSRQVBVE0ZnRBJ/vzfnA4nDN+wTh/pgWHc/baa6+z97v3et/d0Ww24SQ8ij5MNL7tN6zBvdjWiZOxDpP8b3JA5qAXPQ0MtAnOm9jZBvqbsQHbsGsMFrQLv+KPUc47CQONlFXZPsNfJd/buBrDFfHDWIDDcAZmohsPjwFAD+EQnL8Xcl/WqOGc+/FJyXcxVuHJivjX8Hx2cwGeweO4fIxOkL10Wg9o1HSsxUcl30V5P1JxnFuxp+M53I67cQ5mYwZexj2YlnarJBdl3BE4FfPxdfofSOwNhX+uwgXxf1Uz/024DpNxFHrwRIEiPs74XnyIq3A8Xion6qxIvj0TX1vyb8x7CJ/jrELfjrx/zgmS0p2bCWzHzejAQTgmO35J+OpInIcv8GLKeROuzcI24lAsRH/yzcGJFfMfDIB/B/ipeD8bNojX8W1hPR+gCxPwTzsAdaGRgTeGrAZLJXd4zc59l1Jr2dzC91S8g+PSXhFwGgGxO4s6Bd9gaQRkAHdhSQHso/FCzRweS56ezLmB1bgCb+DBCg67rwaLSud+uDAAvVLRfw1OqCO18JEKbusvgNMqA/F153sCpgegT+O7Iwt8NwrZwKsh5irbUuDMFoXMquhv2eKRSKiOg54OUFXSt3SEfPvi4Dz77IEAW/8uH+vdpf6dkXGF+F9GyNtRkXe4or8tqwNoWrigbDeFTEfDZhbKckuBy9blu0XkC1Pi++PK+Objy5q80/NeXSDl9wrgnDkaAIlyzCj5zh1FCb00JL07Jd2LKfgBx+LWXE6XJP6pcMiUiMg8/FmRd3GEYHNiZ+H6wgZP/i+T7MzPJo5wkjYU2t01cWfjp6hH2WZn0adVbM7KALAS3weYftwZIVgTIHtxS8YtD6kOYX2Uqi8iIKCsD6CDhXnNi+iI+vXhwD3g83tHs9l8K5JZZbfh2UL7x0jyeLFljVzUhtoc0DWOwBnCoga25s6wrHDhG8+2I1j0YOu/AwBUU7aBHvM/ZwAAAABJRU5ErkJggg==" alt="froxlor"/>
+	<small>&copy; 2009-<span id="year"></span> by <a href="https://froxlor.org" rel="external">the froxlor team</a></small>
+</footer>
+<script>
+	document.getElementById("year").innerHTML = new Date().getFullYear();
+</script>
+</body>
+</html>

templates/Froxlor/assets/js/main.js.LICENSE.txt

@@ -0,0 +1,45 @@
+/*!
+  * Bootstrap v5.3.2 (https://getbootstrap.com/)
+  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+
+/*!
+ * @kurkle/color v0.2.1
+ * https://github.com/kurkle/color#readme
+ * (c) 2022 Jukka Kurkela
+ * Released under the MIT License
+ */
+
+/*!
+ * Chart.js v3.9.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+
+/*!
+ * Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2023 Fonticons, Inc.
+ */
+
+/*!
+ * jQuery JavaScript Library v3.7.1
+ * https://jquery.com/
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2023-08-28T13:37Z
+ */
+
+/*!
+ * jQuery Validation Plugin v1.20.0
+ *
+ * https://jqueryvalidation.org/
+ *
+ * Copyright (c) 2023 Jörn Zaefferer
+ * Released under the MIT license
+ */

templates/Froxlor/assets/mix-manifest.json

@@ -0,0 +1,13 @@
+{
+    "/js/main.js": "/js/main.js?id=29451cc889431e973473738b93e6a626",
+    "/css/dark.css": "/css/dark.css?id=f965da97d900604705c3762bb9cd645a",
+    "/css/main.css": "/css/main.css?id=cbda89c88526530a66fe1e0d46a63a22",
+    "/webfonts/fa-brands-400.ttf": "/webfonts/fa-brands-400.ttf?id=69e5d8e4e818f05fd882cceb758d1eba",
+    "/webfonts/fa-brands-400.woff2": "/webfonts/fa-brands-400.woff2?id=189b85e9c72c6f75e464c3f58a6707cf",
+    "/webfonts/fa-regular-400.ttf": "/webfonts/fa-regular-400.ttf?id=ed4c23399d1013809882e90bfe396d1b",
+    "/webfonts/fa-regular-400.woff2": "/webfonts/fa-regular-400.woff2?id=be75b1958ae0da55e1eed562d9b7713d",
+    "/webfonts/fa-solid-900.ttf": "/webfonts/fa-solid-900.ttf?id=dfdc7801582dd0d20ea75faa3b96c296",
+    "/webfonts/fa-solid-900.woff2": "/webfonts/fa-solid-900.woff2?id=a0feb384c3c6071947a49708f2b0bc85",
+    "/webfonts/fa-v4compatibility.ttf": "/webfonts/fa-v4compatibility.ttf?id=e24ec0b8661f7fa333b29444df39e399",
+    "/webfonts/fa-v4compatibility.woff2": "/webfonts/fa-v4compatibility.woff2?id=e11465c0eff0549edd4e8ea6bbcf242f"
+}

templates/Maketank/assets/css/custom.css

@@ -0,0 +1,213 @@
+:root,[data-bs-theme=light] {
+    --bs-blue: #0d6efd;
+    --bs-indigo: #6610f2;
+    --bs-purple: #6f42c1;
+    --bs-pink: #d63384;
+    --bs-red: #dc3545;
+    --bs-orange: #fd7e14;
+    --bs-yellow: #ffc107;
+    --bs-green: #198754;
+    --bs-teal: #20c997;
+    --bs-cyan: #0dcaf0;
+    --bs-black: #000;
+    --bs-white: #fff;
+    --bs-gray: #6c757d;
+    /* --bs-gray-dark:#343a40; */
+    --bs-gray-100: #f8f9fa;
+    --bs-gray-200: #e9ecef;
+    --bs-gray-300: #dee2e6;
+    --bs-gray-400: #ced4da;
+    --bs-gray-500: #adb5bd;
+    --bs-gray-600: #6c757d;
+    --bs-gray-700: #495057;
+    --bs-gray-800: #343a40;
+    --bs-gray-900: #212529;
+    --bs-primary: #1872a2;
+    --bs-secondary: #6c757d;
+    --bs-success: #059669;
+    --bs-info: #0e5380;
+    --bs-warning: #fbbf24;
+    --bs-danger: #be123c;
+    --bs-light: #f8f9fa;
+    --bs-dark: #212529;
+    --bs-primary-rgb: 180,170,160;
+    --bs-secondary-rgb: 218,212,208;
+    --bs-success-rgb: 5,150,105;
+    --bs-info-rgb: 14,83,128;
+    --bs-warning-rgb: 251,191,36;
+    --bs-danger-rgb: 190,18,60;
+    --bs-light-rgb: 248,249,250;
+    --bs-dark-rgb: 218,212,208;
+    --bs-primary-text-emphasis: #0a2e41;
+    --bs-secondary-text-emphasis: #2b2f32;
+    --bs-success-text-emphasis: #023c2a;
+    --bs-info-text-emphasis: #062133;
+    --bs-warning-text-emphasis: #644c0e;
+    --bs-danger-text-emphasis: #4c0718;
+    --bs-light-text-emphasis: #495057;
+    --bs-dark-text-emphasis: #495057;
+    --bs-primary-bg-subtle: #d1e3ec;
+    --bs-secondary-bg-subtle: #e2e3e5;
+    --bs-success-bg-subtle: #cdeae1;
+    --bs-info-bg-subtle: #cfdde6;
+    --bs-warning-bg-subtle: #fef2d3;
+    --bs-danger-bg-subtle: #f2d0d8;
+    --bs-light-bg-subtle: #fcfcfd;
+    --bs-dark-bg-subtle: #ced4da;
+    --bs-primary-border-subtle: #a3c7da;
+    --bs-secondary-border-subtle: #c4c8cb;
+    --bs-success-border-subtle: #9bd5c3;
+    --bs-info-border-subtle: #9fbacc;
+    --bs-warning-border-subtle: #fde5a7;
+    --bs-danger-border-subtle: #e5a0b1;
+    --bs-light-border-subtle: #e9ecef;
+    --bs-dark-border-subtle: #adb5bd;
+    --bs-white-rgb: 255,255,255;
+    --bs-black-rgb: 0,0,0;
+    --bs-font-sans-serif: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
+    --bs-font-monospace: SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;
+    --bs-gradient: linear-gradient(180deg,hsla(0,0%,100%,.15),hsla(0,0%,100%,0));
+    --bs-root-font-size: 16px;
+    --bs-body-font-family: var(--bs-font-sans-serif);
+    --bs-body-font-size: 1rem;
+    --bs-body-font-weight: 400;
+    --bs-body-line-height: 1.5;
+    --bs-body-color: #343a40;
+    --bs-body-color-rgb: 52,58,64;
+    --bs-body-bg: #f8f9fa;
+    --bs-body-bg-rgb: 248,249,250;
+    --bs-emphasis-color: #000;
+    --bs-emphasis-color-rgb: 0,0,0;
+    --bs-secondary-color: rgba(52,58,64,.75);
+    --bs-secondary-color-rgb: 52,58,64;
+    --bs-secondary-bg: #e9ecef;
+    --bs-secondary-bg-rgb: 233,236,239;
+    --bs-tertiary-color: rgba(52,58,64,.5);
+    --bs-tertiary-color-rgb: 52,58,64;
+    --bs-tertiary-bg: #f8f9fa;
+    --bs-tertiary-bg-rgb: 248,249,250;
+    --bs-heading-color: inherit;
+    --bs-link-color: #1872a2;
+    --bs-link-color-rgb: 24,114,162;
+    --bs-link-decoration: underline;
+    --bs-link-hover-color: #135b82;
+    --bs-link-hover-color-rgb: 19,91,130;
+    --bs-code-color: #d63384;
+    --bs-highlight-color: #343a40;
+    --bs-highlight-bg: #fff3cd;
+    --bs-border-width: 1px;
+    --bs-border-style: solid;
+    --bs-border-color: #A08C78;
+    --bs-border-color-translucent: rgba(0,0,0,.175);
+    --bs-border-radius: 0.375rem;
+    --bs-border-radius-sm: 0.25rem;
+    --bs-border-radius-lg: 0.5rem;
+    --bs-border-radius-xl: 1rem;
+    --bs-border-radius-xxl: 2rem;
+    --bs-border-radius-2xl: var(--bs-border-radius-xxl);
+    --bs-border-radius-pill: 50rem;
+    --bs-box-shadow: 0 0.5rem 1rem rgba(0,0,0,.15);
+    --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0,0,0,.075);
+    --bs-box-shadow-lg: 0 1rem 3rem rgba(0,0,0,.175);
+    --bs-box-shadow-inset: inset 0 1px 2px rgba(0,0,0,.075);
+    --bs-focus-ring-width: 0.25rem;
+    --bs-focus-ring-opacity: 0.25;
+    --bs-focus-ring-color: rgba(24,114,162,.25);
+    --bs-form-valid-color: #059669;
+    --bs-form-valid-border-color: #059669;
+    --bs-form-invalid-color: #be123c;
+    --bs-form-invalid-border-color: #be123c
+}
+
+.navbar {
+    background: rgb(var(--bs-primary-rgb));
+}
+
+.form-control:focus {
+    background-color: #fff;
+    border-color: rgb(var(--bs-primary-rgb));
+    box-shadow: 0 0 0 .25rem rgba(24,114,162,.25);
+    color: var(--bs-body-color);
+    outline: 0;
+}
+
+
+.navbar .navbar-brand {
+    background: rgb(180,170,160);
+    flex-shrink: 0;
+    margin-right: 0;
+    width: 256px;
+}
+
+.sidebar>.nav>.nav-item>.nav-link:not(.collapsed) {
+    background: rgb(var(--bs-primaryu-rgb));
+    border-left: 3px solid #1872a2;
+    padding-left: calc(1rem - 3px);
+}
+
+.text-light {
+    --bs-text-opacity: 1;
+    color: rgba(var(--bs-gray-900),var(--bs-text-opacity))!important;
+}
+
+.sidebar>.nav>.nav-item>.collapse, .sidebar>.nav>.nav-item>.collapsing {
+   background: rgb(160,140,120);
+   color: rgba(var(--bs-light),var(--bs-text-opacity))!important;
+}
+
+img.header-logo {
+	width: 80%;
+	height: 80%;
+}
+
+.btn-primary {
+    --bs-btn-color: #fff;
+    --bs-btn-bg: rgb(180,170,160);
+    --bs-btn-border-color: rgb(160,140,120);
+    --bs-btn-hover-color: #000;
+    --bs-btn-hover-bg: #fff;
+    --bs-btn-hover-border-color: rgb(160,140,120);
+    --bs-btn-focus-shadow-rgb: 59,135,176;
+    --bs-btn-active-color: #fff;
+    --bs-btn-active-bg: #135b82;
+    --bs-btn-active-border-color: #12567a;
+    --bs-btn-active-shadow: inset 0 3px 5px rgba(0,0,0,.125);
+    --bs-btn-disabled-color: #fff;
+    --bs-btn-disabled-bg: #1872a2;
+    --bs-btn-disabled-border-color: #1872a2;
+}
+
+
+.btn-outline-primary {
+    --bs-btn-color: #000;
+    --bs-btn-border-color: rgb(160,140,120);
+    --bs-btn-hover-color: #fff;
+    --bs-btn-hover-bg: rgb(180,170,160);
+    --bs-btn-hover-border-color: rgb(160,140,120);
+    --bs-btn-focus-shadow-rgb: 24,114,162;
+    --bs-btn-active-color: #fff;
+    --bs-btn-active-bg: #1872a2;
+    --bs-btn-active-border-color: #1872a2;
+    --bs-btn-active-shadow: inset 0 3px 5px rgba(0,0,0,.125);
+    --bs-btn-disabled-color: #1872a2;
+    --bs-btn-disabled-bg: transparent;
+    --bs-btn-disabled-border-color: #1872a2;
+    --bs-gradient: none;
+}
+
+
+
+
+.alert, .card, .shadow-sm, .sub-sidebar {
+    box-shadow: var(--bs-box-shadow)!important;
+}
+
+
+body.d-flex {
+    display: flex!important;
+    background-color: rgb(var(--bs-secondary-rgb))!important;
+}
+
+
+
+

templates/Maketank/assets/js/main.js.LICENSE.txt

@@ -0,0 +1,45 @@
+/*!
+  * Bootstrap v5.3.2 (https://getbootstrap.com/)
+  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+
+/*!
+ * @kurkle/color v0.2.1
+ * https://github.com/kurkle/color#readme
+ * (c) 2022 Jukka Kurkela
+ * Released under the MIT License
+ */
+
+/*!
+ * Chart.js v3.9.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+
+/*!
+ * Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2023 Fonticons, Inc.
+ */
+
+/*!
+ * jQuery JavaScript Library v3.7.1
+ * https://jquery.com/
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2023-08-28T13:37Z
+ */
+
+/*!
+ * jQuery Validation Plugin v1.20.0
+ *
+ * https://jqueryvalidation.org/
+ *
+ * Copyright (c) 2023 Jörn Zaefferer
+ * Released under the MIT license
+ */

templates/Maketank/assets/mix-manifest.json

@@ -0,0 +1,13 @@
+{
+    "/js/main.js": "/js/main.js?id=29451cc889431e973473738b93e6a626",
+    "/css/dark.css": "/css/dark.css?id=f965da97d900604705c3762bb9cd645a",
+    "/css/main.css": "/css/main.css?id=cbda89c88526530a66fe1e0d46a63a22",
+    "/webfonts/fa-brands-400.ttf": "/webfonts/fa-brands-400.ttf?id=69e5d8e4e818f05fd882cceb758d1eba",
+    "/webfonts/fa-brands-400.woff2": "/webfonts/fa-brands-400.woff2?id=189b85e9c72c6f75e464c3f58a6707cf",
+    "/webfonts/fa-regular-400.ttf": "/webfonts/fa-regular-400.ttf?id=ed4c23399d1013809882e90bfe396d1b",
+    "/webfonts/fa-regular-400.woff2": "/webfonts/fa-regular-400.woff2?id=be75b1958ae0da55e1eed562d9b7713d",
+    "/webfonts/fa-solid-900.ttf": "/webfonts/fa-solid-900.ttf?id=dfdc7801582dd0d20ea75faa3b96c296",
+    "/webfonts/fa-solid-900.woff2": "/webfonts/fa-solid-900.woff2?id=a0feb384c3c6071947a49708f2b0bc85",
+    "/webfonts/fa-v4compatibility.ttf": "/webfonts/fa-v4compatibility.ttf?id=e24ec0b8661f7fa333b29444df39e399",
+    "/webfonts/fa-v4compatibility.woff2": "/webfonts/fa-v4compatibility.woff2?id=e11465c0eff0549edd4e8ea6bbcf242f"
+}

templates/Maketank/base.html.twig

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<!-- Required meta tags -->
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="robots" content="noindex, nofollow, noarchive"/>
+	<meta name="googlebot" content="nosnippet"/>
+	<link rel="icon" type="image/x-icon" href="{{ basehref|default('') }}templates/Froxlor/assets/img/icon.png">
+	{% if csrf_token %}<meta name="csrf-token" content="{{ csrf_token }}" />{% endif %}
+
+	<!-- CSS -->
+	{% if theme_css is empty %}
+		<link href="{{ basehref|default('') }}{{ mix('templates/Froxlor/assets/css/main.css') }}" rel="stylesheet" type="text/css" />
+	{% else %}
+		{{ theme_css|raw }}
+	{% endif %}
+	{% block custom_css %}{% endblock %}
+
+	<!-- Scripts -->
+	{% if theme_js is empty %}
+		<script type="text/javascript" src="{{ basehref|default('') }}{{ mix('templates/Froxlor/assets/js/main.js') }}"></script>
+	{% else %}
+		{{ theme_js|raw }}
+	{% endif %}
+	{% block custom_js %}{% endblock %}
+	<title>Froxlor{% if page_title %} | {{ page_title }}{% endif %}</title>
+</head>
+<body class="min-vh-100 d-flex flex-column">
+	{% block navigation %}{% endblock %}
+
+	{% block body %}
+		<div class="container-fluid">
+			{% block content %}{% endblock %}
+			{{ include('Froxlor/footer.html.twig') }}
+		</div>
+	{% endblock %}
+</body>
+</html>

templates/Maketank/config.json

@@ -0,0 +1,35 @@
+{
+	"variants": {
+		"default": {
+			"img": {
+				"login": "logo.svg",
+				"ui": "logo_white.png"
+			},
+			"css": [
+				"main.css",
+				"custom.css"
+			],
+			"js": [
+				"main.js",
+				"apikey.js"
+			],
+			"description": "Default"
+		},
+		"dark": {
+			"img": {
+				"login": "logo.svg",
+				"ui": "logo_white.png"
+			},
+			"css": [
+				"dark.css",
+				"custom.css"
+			],
+			"js": [
+				"main.js",
+				"apikey.js"
+			],
+			"description": "Darkmode"
+		}
+	},
+	"author": "Maketank"
+}

templates/Maketank/footer.html.twig

@@ -0,0 +1,23 @@
+<footer class="text-center mb-3">
+	<span>
+		<img src="{{ basehref|default("") }}templates/Froxlor/assets/img/logo_grey.png" alt="Froxlor"/>
+		{% if install_mode is not defined  %}
+			{% if (get_setting('admin.show_version_login') == '1'
+				and area == 'login') or (area != 'login'
+				and get_setting('admin.show_version_footer') == '1') %}
+				{{ call_static('\\Froxlor\\Froxlor', 'getFullVersion') }}
+			{% endif %}
+		{% endif %}
+		&copy; 2009-{{ "now"|date("Y") }} by <a href="https://www.froxlor.org/" rel="external" target="_blank">the Froxlor Team</a><br>
+		{% if install_mode is not defined %}
+			{% if (get_setting('panel.imprint_url') != '') %}<a href="{{ get_setting('panel.imprint_url') }}" target="_blank" class="footer-link">{{ lng('imprint') }}</a>{% endif %}
+			{% if (get_setting('panel.terms_url') != '') %}<a href="{{ get_setting('panel.terms_url') }}" target="_blank" class="footer-link">{{ lng('terms') }}</a>{% endif %}
+			{% if (get_setting('panel.privacy_url') != '') %}<a href="{{ get_setting('panel.privacy_url') }}" target="_blank" class="footer-link">{{ lng('privacy') }}</a>{% endif %}
+		{% endif %}
+	</span>
+
+    {% if lng('translator') %}
+		<br/>
+        <small class="mt-3">{{ lng('panel.translator') }}: {{ lng('translator') }}</small>
+    {% endif %}
+</footer>

templates/Maketank/form/form.html.twig

@@ -0,0 +1,56 @@
+{% macro form(form_data, formaction, title = "", hiddenid = "", nosubmit = false, idprefix = "") %}
+
+	{% import "Froxlor/form/formfields.html.twig" as formfields %}
+
+	<form action="{{ formaction|default("") }}" {% if form_data.id is defined %}id="{{ form_data.id }}"{% endif %} method="post" enctype="multipart/form-data" class="form">
+		{% for sid,section in form_data.sections %}
+			{% if section.visible is not defined or (section.visible is defined and section.visible == true) %}
+			<div class="card mb-3" id="{{ idprefix }}{{ sid }}">
+				{% if section.title is not empty %}
+					<div class="card-header">
+						{% if section.image is not empty %}
+							<i class="{{ section.image }}"></i>
+						{% endif %}
+						{{ section.title }}
+					</div>
+				{% endif %}
+				<div class="formfields">
+					{% for id,field in section.fields %}
+						{{ formfields.fieldrow(id, field) }}
+					{% endfor %}
+				</div>
+			</div>
+			{% endif %}
+		{% endfor %}
+
+		{% if nosubmit == false %}
+			<!-- submit buttons -->
+			<div>
+				<input type="hidden" name="csrf_token" value="{{ csrf_token }}"/>
+				{% if hiddenid is not empty %}
+					<input type="hidden" name="id" value="{{ hiddenid }}"/>
+				{% endif %}
+				<input type="hidden" name="page" value="{{ page }}"/>
+				<input type="hidden" name="action" value="{{ action }}"/>
+				<input type="hidden" name="send" value="send"/>
+
+				<div class="col-12 text-center mb-2 d-grid gap-2 d-md-block">
+					{% if form_data.buttons is defined and form_data.buttons is iterable %}
+						{% for btn in form_data.buttons %}
+							<button type="{{ btn.type|default("submit") }}" class="btn btn-lg {{ btn.class|default(" btn-primary") }}">{{ btn.label }}</button>
+						{% endfor %}
+					{% else %}
+						<button type="reset" class="btn btn-lg btn-outline-secondary me-md-3">{{ lng('panel.reset') }}</button>
+						<button type="submit" class="btn btn-lg btn-primary">{{ lng('panel.save') }}</button>
+					{% endif %}
+				</div>
+			</div>
+		{% endif %}
+		<span class="text-danger">*</span> {{ lng('panel.mandatoryfield') }}
+	</form>
+
+	{# add translation for custom validations #}
+	{% if form_data.id is defined and form_data.id in ['customer_add', 'customer_edit', 'domain_add', 'domain_edit'] %}
+		<script>$(function() { $.extend($.validator.messages, {required: "{{ lng('error.requiredfield') }}"}) });</script>
+	{% endif %}
+{% endmacro %}

templates/Maketank/form/formfields.html.twig

@@ -0,0 +1,250 @@
+{% macro fieldrow(id, field, norow = false, nohide = false, em = false) %}
+	{% if field.visible is not defined or (field.visible is defined and field.visible) or nohide == true %}
+		{% if norow == false and (field.type != 'hidden' or (field.type == 'hidden' and field.display is defined and field.display is not empty)) %}
+			<div class="row g-0 formfield d-flex align-items-center">
+				{% if field.prior_infotext is defined and field.prior_infotext|length > 0 %}
+					<h5>{{ field.prior_infotext }}</h5>
+				{% endif %}
+				{% if field.label is iterable %}
+					<label for="{{ id }}" class="col-sm-6 col-form-label pe-3">
+						{% if em %}
+							<mark>
+							{% endif %}
+							{{ field.label.title|raw }}
+							{% if field.mandatory is defined and field.mandatory %}
+								<span class="text-danger">*</span>
+							{% endif %}
+							{% if em %}
+							</mark>
+						{% endif %}
+						{% if field.label.description is defined and field.label.description is not empty %}<br><small>{{ field.label.description|raw }}</small>
+						{% endif %}
+						{% if field.requires_reconf is defined and field.requires_reconf is not empty %}
+							<div class="bg-info bg-opacity-25 rounded p-2 mt-2 d-flex align-items-center" role="alert">
+								<i class="fa-solid fa-circle-exclamation me-2"></i><p class="mb-0">{{ lng('serversettings.requires_reconfiguration', [field.requires_reconf|join(', ')])|raw }}</p>
+							</div>
+						{% endif %}
+					</label>
+				{% else %}
+					<label for="{{ id }}" class="col-sm-6 col-form-label pe-3">
+						{% if em %}
+							<mark>
+							{% endif %}
+							{{ field.label|raw }}
+							{% if field.mandatory is defined and field.mandatory %}
+								<span class="text-danger">*</span>
+							{% endif %}
+							{% if em %}
+							</mark>
+						{% endif %}
+						{% if field.desc is defined and field.desc is not empty %}<br><small>{{ field.desc|raw }}</small>
+						{% endif %}
+						{% if field.requires_reconf is defined and field.requires_reconf is not empty %}
+							<div class="bg-info bg-opacity-25 rounded p-2 mt-2 d-flex align-items-center" role="alert">
+								<i class="fa-solid fa-circle-exclamation me-2"></i><p class="mb-0">{{ lng('serversettings.requires_reconfiguration', [field.requires_reconf|join(', ')])|raw }}</p>
+							</div>
+						{% endif %}
+					</label>
+				{% endif %}
+				<div class="col-sm-6">
+				{% endif %}
+				{% if field.type == 'text' or field.type == 'password' or field.type == 'number' or field.type == 'file' or field.type == 'email' or field.type == 'url' or field.type == 'hidden' or field.type == 'date' or field.type == 'datetime-local' %}
+					{{ _self.input(id, field) }}
+				{% elseif field.type == 'textul' %}
+					{{ _self.input_ul(id, field) }}
+				{% elseif field.type == 'checkbox' %}
+					{{ _self.bool(id, field) }}
+				{% elseif field.type == 'checkrequired' %}
+					{{ _self.chk_required(id, field) }}
+				{% elseif field.type == 'select' %}
+					{{ _self.select(id, field) }}
+				{% elseif field.type == 'textarea' %}
+					{{ _self.textarea(id, field) }}
+				{% elseif field.type == 'label' %}
+					{{ _self.plain(id, field) }}
+				{% elseif field.type == 'link' %}
+					{{ _self.link(id, field) }}
+				{% elseif field.type == 'itemlist' %}
+					{{ _self.itemlist(id, field) }}
+				{% elseif field.type == 'infotext' %}
+					{{ _self.infotext(id, field) }}
+				{% elseif field.type == 'image' %}
+					{{ _self.image(id, field) }}
+				{% else %}
+					<div class="alert alert-warning" role="alert">Unknown field-type
+						{{ field.type }}</div>
+				{% endif %}
+				{% if field.note is defined and field.note is not empty %}
+					<small class="text-info">{{ field.note|raw }}</small>
+				{% endif %}
+
+				{% if norow == false and (field.type != 'hidden' or (field.type == 'hidden' and field.display is defined and field.display is not empty)) %}
+				</div>
+			</div>
+		{% endif %}
+	{% endif %}
+{% endmacro %}
+
+{# installation specific format #}
+{% macro field(id, field, norow = true, nohide = false, em = false) %}
+	{% if field.type == 'checkbox' %}
+		<div class="form-check form-switch mb-3">
+			<input type="hidden" value="0" name="{{ id }}"/>
+			<input type="checkbox" {% if (field.visible is defined and field.visible == false) or (field.disabled is defined and field.disabled == true) %} disabled {% endif %} value="{{ field.value }}" id="{{ id }}" name="{{ id }}" class="form-check-input {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.checked is defined and field.checked == 1 %} checked="checked" {% endif %}>
+			<label for="{{ id }}" class="form-check-label">{{ field.label|raw }}</label>
+		</div>
+	{% elseif field.type == 'hidden' %}
+		{{ _self.fieldrow(id, field, norow, nohide, em) }}
+	{% else %}
+		<div class="form-floating mb-3">
+			{{ _self.fieldrow(id, field, norow, nohide, em) }}
+			<label for="{{ id }}" class="form-label">{{ field.label|raw }}</label>
+		</div>
+	{% endif %}
+{% endmacro %}
+
+{% macro bool(id, field) %}
+	{% if field.is_array is defined and field.is_array == 1 and field.values is not empty %}
+		{% for subfield in field.values %}
+			<div class="form-check form-switch">
+				<input type="checkbox" {% if (field.visible is defined and field.visible == false) or (field.disabled is defined and field.disabled == true) %} disabled {% endif %} value="{{ subfield.value }}" name="{{ id }}[]" class="form-check-input" {% if field.value is defined and subfield.value in field.value %} checked="checked" {% endif %} {% if field.mandatory is defined and field.mandatory %} required {% endif %}>
+				<label class="form-check-label">
+					{{ subfield.label|raw }}
+				</label>
+			</div>
+		{% endfor %}
+	{% else %}
+		<div class="form-check form-switch">
+			<input type="hidden" value="0" name="{{ id }}"/>
+			<input type="checkbox" {% if (field.visible is defined and field.visible == false) or (field.disabled is defined and field.disabled == true) %} disabled {% endif %} value="{{ field.value }}" id="{{ id }}" name="{{ id }}" class="form-check-input {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.checked is defined and field.checked == 1 %} checked="checked" {% endif %}>
+		</div>
+	{% endif %}
+{% endmacro %}
+
+{% macro chk_required(id, field) %}
+	<div class="form-check form-switch">
+		<input type="checkbox" value="{{ field.value }}" id="{{ id }}" name="{{ id }}" class="form-check-input" {% if field.mandatory is defined and field.mandatory == 1 %} required {% endif %} />
+	</div>
+{% endmacro %}
+
+{% macro infotext(id, field) %}
+	{% if field.next_to is defined %}
+		<div class="input-group">
+		{% endif %}
+		<span {% if field.classes is defined %} class="{{ field.classes }}" {% endif %}>{{ field.value|raw }}</span>
+		{% if field.next_to is defined %}
+			{% for nid, nfield in field.next_to %}
+				{% if nfield.next_to_prefix is defined %}
+					<span class="input-group-text">{{ nfield.next_to_prefix }}</span>
+				{% endif %}
+				{{ _self.fieldrow(nid, nfield, true) }}
+			{% endfor %}
+		</div>
+	{% endif %}
+{% endmacro %}
+
+{% macro plain(id, field) %}
+	<input type="text" readonly class="form-control-plaintext" id="{{ id }}" name="{{ id }}" value="{{ field.value|raw }}">
+	{% if field.next_to is defined %}
+		{% for nid, nfield in field.next_to %}
+			{% if nfield.next_to_prefix is defined %}
+				<span class="input-group-text">{{ nfield.next_to_prefix }}</span>
+			{% endif %}
+			{{ _self.fieldrow(nid, nfield, true) }}
+		{% endfor %}
+	{% endif %}
+{% endmacro %}
+
+{% macro input(id, field) %}
+	{% if field.next_to is defined %}
+		<div class="input-group">
+		{% endif %}
+		<input type="{{ field.type }}" {% if field.visible is defined and field.visible == false %} disabled {% endif %} {% if field.type == 'number' and field.min is defined %} min="{{ field.min }}" {% endif %} {% if field.type == 'number' and field.max is defined %} max="{{ field.max }}" {% endif %} {% if field.type != 'number' and field.maxlength is defined %} maxlength="{{ field.maxlength }}" {% endif %} id="{{ id }}" name="{{ id }}" value="{{ field.value|raw }}" class="form-control {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.mandatory is defined and field.mandatory %} required {% endif %} {% if field.readonly is defined and field.readonly %} readonly {% endif %} {% if field.autocomplete is defined %} autocomplete="{{ field.autocomplete }}" {% endif %} {% if field.placeholder is defined %} placeholder="{{ field.placeholder }}" {% endif %} {% if field.type == 'file' and field.accept is defined %} accept="{{ field.accept }}" {% endif %} {% if field.pattern is defined %} pattern="{{ field.pattern }}" {% endif %}/>
+		{% if field.type == 'hidden' and field.display is defined %}
+			<input type="text" readonly class="form-control-plaintext" value="{{ field.display|raw }}">
+		{% endif %}
+		{% if field.next_to is defined %}
+			{% for nid, nfield in field.next_to %}
+				{% if nfield.next_to_prefix is defined %}
+					<span class="input-group-text">{{ nfield.next_to_prefix }}</span>
+				{% endif %}
+				{{ _self.fieldrow(nid, nfield, true) }}
+			{% endfor %}
+		</div>
+	{% endif %}
+{% endmacro %}
+
+{% macro image(id, field) %}
+	{% if field.value is not empty %}
+		<img src="{{ field.value }}" alt="Current Image" class="field-image-preview"><br>
+		<div class="form-check form-switch mb-2">
+			<input type="checkbox" value="1" name="{{ id }}_delete" class="form-check-input">
+			<label class="form-check-label">
+				{{ lng('panel.image_field_delete') }}
+			</label>
+		</div>
+	{% endif %}
+	{% set field = field|merge({'type':'file'}) %}
+	{{ _self.input(id, field) }}
+{% endmacro %}
+
+{% macro input_ul(id, field) %}
+	{% set max = "" %}
+	{% if field.maxlength is defined %}
+		{% for i in 1..field.maxlength %}
+			{% set max = max ~ "9" %}
+		{% endfor %}
+	{% endif %}
+	<div class="input-group">
+		<input type="number" min="0" {% if max is not empty %} max="{{ max }}" {% endif %} id="{{ id }}" name="{{ id }}" value="{% if field.value >= 0 %}{{ field.value }}{% endif %}" class="form-control {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.mandatory is defined and field.mandatory %} required {% endif %} {% if field.readonly is defined and field.readonly %} readonly {% endif %} {% if field.autocomplete is defined %} autocomplete="{{ field.autocomplete }}" {% endif %} {% if field.placeholder is defined %} placeholder="{{ field.placeholder }}" {% endif %}/>
+		<div class="input-group-text">
+			<input class="form-check-input mt-0" type="checkbox" name="{{ id }}_ul" value="1" {% if field.value == -1 %} checked="checked" {% endif %}>
+		</div>
+	</div>
+{% endmacro %}
+
+
+{% macro select(id, field) %}
+	{% if field.next_to is defined %}
+		<div class="input-group">
+		{% endif %}
+		<select {% if field.visible is defined and field.visible == false %} disabled {% endif %} class="form-select {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" name="{{ id }}{% if field.select_mode is defined and field.select_mode == 'multiple' %}[]{% endif %}" id="{{ id }}" {% if field.mandatory is defined and field.mandatory %} required {% endif %} {% if field.select_mode is defined and field.select_mode == 'multiple' %} multiple="multiple" {% endif %}{% if field.readonly is defined and field.readonly %} readonly {% endif %}>
+			{% for val,txt in field.select_var %}
+				<option value="{{ val }}" {% if field.selected is defined and ((field.selected is not iterable and field.selected == val) or (field.selected is iterable and val in field.selected|keys)) %} selected="selected" {% endif %}>{{ txt|raw }}</option>
+			{% endfor %}
+		</select>
+		{% if field.next_to is defined %}
+			{% for nid, nfield in field.next_to %}
+				{% if nfield.next_to_prefix is defined %}
+					<span class="input-group-text">{{ nfield.next_to_prefix }}</span>
+				{% endif %}
+				{{ _self.fieldrow(nid, nfield, true) }}
+			{% endfor %}
+		</div>
+	{% endif %}
+{% endmacro %}
+
+{% macro textarea(id, field) %}
+	<textarea {% if field.visible is defined and field.visible == false %} disabled {% endif %} rows="{{ field.rows|default('12') }}" cols="{{ field.cols|default('60') }}" id="{{ id }}" name="{{ id }}" class="form-control {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.mandatory is defined and field.mandatory %} required {% endif %} {% if field.readonly is defined and field.readonly %} readonly {% endif %} {% if field.placeholder is defined %} placeholder="{{ field.placeholder }}" {% endif %} {% if field.style is defined %} style="{{ field.style }}" {% endif %}>{{ field.value|raw }}</textarea>
+{% endmacro %}
+
+{% macro link(id, field) %}
+	<a href="{{ field.href|raw }}" class="{{ field.classes }}">{{ field.label|raw }}</a>
+{% endmacro %}
+
+{% macro itemlist(id, field) %}
+	{% if field.values is not empty %}
+		{% for value in field.values %}
+			<p>{{ value.item|raw }}
+				{% if value.href is defined and value.href is not empty %}
+					{{ _self.link(id, value) }}
+				{% endif %}
+			</p>
+		{% endfor %}
+	{% endif %}
+	{% if field.next_to is defined %}
+		{% for nid, nfield in field.next_to %}
+			{{ _self.fieldrow(nid, nfield, true) }}
+		{% endfor %}
+	{% endif %}
+{% endmacro %}

templates/Maketank/form/yesnoquestion.html.twig

@@ -0,0 +1,37 @@
+{% extends "Froxlor/userarea.html.twig" %}
+
+{% block content %}
+
+	<form action="{{ action|default("") }}" method="post" enctype="application/x-www-form-urlencoded" class="form">
+
+		<div class="alert alert-warning" role="alert">
+			<h4 class="alert-heading">{{ lng('panel.security_question') }}</h4>
+			<p>{{ question|raw }}</p>
+			{% if with_checkbox is defined and with_checkbox is iterable %}
+				{% if with_checkbox.show %}
+					<div class="form-check form-switch">
+						<input class="form-check-input" type="checkbox" id="delete_userfiles" name="delete_userfiles" value="1">
+						<label class="form-check-label" for="delete_userfiles">{{ with_checkbox.chk_text|raw }}</label>
+					</div>
+				{% else %}
+					<input type="hidden" name="delete_userfiles" value="0"/>
+				{% endif %}
+			{% endif %}
+			<p>
+				<input type="hidden" name="csrf_token" value="{{ csrf_token }}"/>
+				<input type="hidden" name="send" value="send"/>
+				{% for id,field in url_params %}
+					<input type="hidden" name="{{ id }}" value="{{ field }}"/>
+				{% endfor %}
+				<button class="btn btn-danger" type="submit" name="submitbutton">{{ lng('panel.yes') }}</button>&nbsp;
+				{% if back_link is defined and back_link is iterable and back_link|length > 0 %}
+					<a href="{{ linker(back_link) }}" class="btn btn-secondary">{{ lng('panel.no') }}</a>
+				{% else %}
+					<a href="javascript:history.back(-1)" class="btn btn-secondary">{{ lng('panel.no') }}</a>
+				{% endif %}
+			</p>
+		</div>
+
+	</form>
+
+{% endblock %}

templates/Maketank/install/form.html.twig

@@ -0,0 +1,89 @@
+<!-- language select -->
+<form action="{{ pagecontent.form.formaction }}" method="get">
+	<div class="row mb-3">
+		<label for="language" class="col-sm-4 col-form-label">{{ lng('install.language') }}</label>
+		<div class="col-sm-8">
+			<select class="form-select" id="language" name="language">
+				{% for lngfile,lngname in pagecontent.form.languages %}
+					<option value="{{ lngfile }}" {% if lngfile == pagecontent.form.activelang %} selected="selected" {% endif %}>{{ lngname }}</option>
+				{% endfor %}
+			</select>
+		</div>
+	</div>
+	<aside class="text-end">
+		<input type="hidden" name="check" value="1"/>
+		<button class="btn btn-sm btn-primary" type="submit" name="chooselang">{{ lng('install.lngbtn_go') }}</button>
+	</aside>
+</form>
+<!-- main install form -->
+<div class="alert alert-primary mt-md-3" role="alert">{{ lng('install.welcometext')|raw }}</div>
+{% if pagecontent.form.result is not empty %}
+	<div class="alert alert-warning" role="alert">
+		{% for emsg in pagecontent.form.result %}
+			<p>{{ emsg }}</p>
+		{% endfor %}
+	</div>
+{% endif %}
+<form action="{{ pagecontent.form.formaction }}" method="post">
+	{% for fdata in pagecontent.form.data %}
+		<fieldset>
+			<legend>{{ fdata.title }}</legend>
+			{% for field in fdata.fields %}
+				{% if field is iterable %}
+					{% if field.type is defined %}
+						{% if field.type == 'text' or field.type == 'password' %}
+							<div class="row mb-3">
+								<label for="{{ field.id }}" class="col-sm-4 col-form-label">{{ field.label|raw }}</label>
+								<div class="col-sm-8">
+									<input type="{{ field.type }}" class="form-control {% if field.style == 'red' %}is-invalid{% endif %}" id="{{ field.id }}" name="{{ field.name }}" value="{{ field.value }}" {% if field.required %} required {% endif %}/>
+								</div>
+							</div>
+						{% elseif field.type == 'select' %}
+							<div class="row mb-3">
+								<label for="{{ field.id }}" class="col-sm-4 col-form-label">{{ field.label|raw }}</label>
+								<div class="col-sm-8">
+									<select class="form-select {% if field.style == 'red' %}is-invalid{% endif %}" id="{{ field.id }}" name="{{ field.name }}" {% if field.required %} required {% endif %}>
+										{% for opts in field.options %}
+											<option value="{{ opts.value }}" {% if opts.selected %} selected="selected" {% endif %}>{{ opts.label }}</option>
+										{% endfor %}
+									</select>
+								</div>
+							</div>
+						{% elseif field.type == 'checkbox' %}
+							<div class="row mb-3">
+								<label for="{{ field.id }}" class="col-sm-4 col-form-label">{{ field.label|raw }}</label>
+								<div class="col-sm-8">
+									<div class="form-check form-switch">
+										<input class="form-check-input {% if field.style == 'red' %}is-invalid{% endif %}" type="checkbox" value="{{ field.value }}" id="{{ field.id }}" name="{{ field.name }}" {% if field.checked %} checked="checked" {% endif %}>
+									</div>
+								</div>
+							</div>
+						{% endif %}
+					{% else %}
+						<div class="row mb-3">
+							<label class="col-sm-4 col-form-label">{{ field.label|raw }}</label>
+							<div class="col-sm-8">
+								{% for radios in field.fields %}
+									<div class="form-check">
+										<input class="form-check-input {% if field.style == 'red' %}is-invalid{% endif %}" type="radio" name="{{ radios.name }}" id="{{ radios.id }}" value="{{ radios.value }}" {% if radios.checked %}checked="checked"{% endif %}>
+										<label class="form-check-label" for="{{ radios.id }}">
+											{{ radios.label }}
+										</label>
+									</div>
+								{% endfor %}
+							</div>
+						</div>
+					{% endif %}
+				{% endif %}
+			{% endfor %}
+		</fieldset>
+	{% endfor %}
+	<aside class="text-end mt-3">
+		<input type="hidden" name="check" value="1"/>
+		<input type="hidden" name="language" value="{{ pagecontent.form.activelang }}"/>
+		<input type="hidden" name="installstep" value="1"/>
+		<button class="btn btn-lg btn-success" type="submit" name="submitbutton">
+			{{ lng('click_here_to_continue') }} &raquo;
+		</button>
+	</aside>
+</form>

templates/Maketank/install/index.html.twig

@@ -0,0 +1,126 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container max-w-lg flex align-content-center mt-5">
+		<img src="{{ basehref|default('') }}templates/Froxlor/assets/img/logo.png" class="mb-5" alt="{{ lng('install.slogan') }}"/>
+
+		{% if error is not null %}
+			<div class="alert alert-danger mb-4">{{ error }}</div>
+		{% endif %}
+
+		<div class="row text-center gx-0">
+			<div class="col p-3{{ setup.step == 0 ? ' bg-white shadow rounded-top' : '' }}">
+				<i class="far fa-circle{{ setup.step > 0 ? '-check' : '' }}"></i>
+				{% if setup.step > 0 %}<a href="?step=0" class="text-decoration-none">{{ lng('install.preflight') }}</a>{% else %}{{ lng('install.preflight') }}{% endif %}
+			</div>
+			<div class="col p-3{{ setup.step == 1 ? ' bg-white shadow rounded-top' : '' }}">
+				<i class="far fa-circle{{ setup.step > 1 ? '-check' : '' }}"></i>
+				{% if setup.step > 1 %}<a href="?step=1" class="text-decoration-none">{{ lng('install.database.top') }}</a>{% else %}{{ lng('install.database.top') }}{% endif %}
+			</div>
+			<div class="col p-3{{ setup.step == 2 ? ' bg-white shadow rounded-top' : '' }}">
+				<i class="far fa-circle{{ setup.step > 2 ? '-check' : '' }}"></i>
+				{% if setup.step > 2 %}<a href="?step=2" class="text-decoration-none">{{ lng('install.admin.top') }}</a>{% else %}{{ lng('install.admin.top') }}{% endif %}
+			</div>
+			<div class="col p-3{{ setup.step == 3 ? ' bg-white shadow rounded-top' : '' }}">
+				<i class="far fa-circle{{ setup.step > 3 ? '-check' : '' }}"></i>
+				{% if setup.step > 3 %}<a href="?step=3" class="text-decoration-none">{{ lng('install.system.top') }}</a>{% else %}{{ lng('install.system.top') }}{% endif %}
+			</div>
+			<div class="col p-3{{ setup.step == 4 ? ' bg-white shadow rounded-top' : '' }}">
+				<i class="far fa-circle{{ setup.step > 4 ? '-check' : '' }}"></i>
+				{% if setup.step > 4 %}<a href="?step=4" class="text-decoration-none">{{ lng('install.install.top') }}</a>{% else %}{{ lng('install.install.top') }}{% endif %}
+			</div>
+		</div>
+
+		<div class="card border-0 shadow">
+			<div class="card-body p-5">
+				<form method="post" action="?step={{ setup.step }}">
+					{% if setup.step > 0 %}
+						<div class="d-block d-lg-flex justify-content-between align-items-center mb-3">
+							<h4 class="mb-3 mb-lg-0">{{ section.title }}</h4>
+							<div class="form-check form-switch">
+								<input class="form-check-input" type="checkbox" id="switchInstallMode" {% if extended is defined and extended %}checked{% endif %}>
+								<label class="form-check-label" for="switchInstallMode">{% if extended is defined and extended %}{{ lng('install.switchmode_basic') }}{% else %}{{ lng('install.switchmode_advanced') }}{% endif %}</label>
+							</div>
+						</div>
+						<p class="lead">{{ section.description|raw }}</p>
+						<hr />
+
+						{% import "Froxlor/form/formfields.html.twig" as formfields %}
+
+						{% for id, field in section.fields %}
+							{% if field.advanced is defined and field.advanced == true and extended == false %}
+								{# hide advanced fields #}
+								{% set field = field|merge({'type': 'hidden'})  %}
+							{% endif %}
+							{{ formfields.field(id, field) }}
+						{% endfor %}
+
+						<div class="d-flex {% if setup.step < setup.max_steps %}justify-content-between{% else %}justify-content-end{% endif %} mt-4">
+							{% if setup.step < setup.max_steps %}
+							<a href="?step={{ setup.step - 1 }}" class="btn btn-secondary">&laquo; {{ lng('panel.back') }}</a>
+							<button type="submit" name="submit" class="btn btn-primary">{{ lng('panel.next') }} &raquo;</button>
+							{% else %}
+							<span id="submitAuto"><i class="fas fa-spinner fa-pulse"></i> {{ lng('install.install.waitforconfig') }}</span>
+							<button id="submitManual" type="submit" name="submit" class="btn btn-success d-none">{{ lng('install.install.top') }} &raquo;</button>
+							{% endif %}
+						</div>
+					{% else %}
+						<h4 class="mb-3">{{ lng('install.dependency_check.title') }}</h4>
+						<p class="lead">{{ lng('install.dependency_check.description') }}</p>
+
+						<p class="lead {{ preflight.criticals ? 'text-danger' : preflight.suggestions ? 'text-warning' : 'text-success'}}">
+							<i class="{{ preflight.criticals ? 'fa-solid fa-triangle-exclamation' : preflight.suggestions ? 'fa-solid fa-circle-info' : 'far fa-circle-check' }}"></i>
+							{{ preflight.text }}
+						</p>
+
+						{% if preflight.criticals %}
+							<p class="text-muted">{{ lng('install.critical_error') }}</p>
+							<ul>
+								{% for ctype, critical in preflight.criticals %}
+									{% if ctype == 'wrong_ownership' %}
+									<li>{{ lng('install.errors.' ~ ctype, [critical.user, critical.group]) }}</li>
+									{% elseif ctype == 'missing_extensions' %}
+									<li>{{ lng('install.errors.' ~ ctype) }}<ul>
+										{% for missext in critical %}
+										<li>{{ missext }}</li>
+										{% endfor %}
+										</ul>
+									</li>
+									{% else %}
+									<li>{{ critical|raw }}</li>
+									{% endif %}
+								{% endfor %}
+							</ul>
+						{% endif %}
+
+						{% if preflight.suggestions %}
+							<p class="text-muted">{{ lng('install.suggestions') }}</p>
+							<ul>
+								{% for ctype, suggestion in preflight.suggestions %}
+									{% if ctype == 'missing_extensions' %}
+									<li>{{ lng('install.errors.suggestedextensions') }}<ul>
+										{% for missext in suggestion %}
+										<li>{{ missext }}</li>
+										{% endfor %}
+										</ul>
+									</li>
+									{% else %}
+									<li>{{ suggestion|raw }}</li>
+									{% endif %}
+								{% endfor %}
+							</ul>
+						{% endif %}
+
+						<div class="d-flex justify-content-end mt-4">
+							{% if preflight.criticals %}
+								<a href="" class="btn btn-secondary"><i class="fa-solid fa-arrow-rotate-left"></i> {{ lng('install.check_again') }}</a>
+							{% else %}
+								<a href="?step=1" class="btn btn-primary">{{ lng('install.start_installation') }}</a>
+							{% endif %}
+						</div>
+					{% endif %}
+				</form>
+			</div>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/install/update.html.twig

@@ -0,0 +1,48 @@
+{% extends "Froxlor/userarea.html.twig" %}
+
+{% block heading %}
+	<div>
+		<h5 class="mb-1">
+			<i class="fa-solid fa-download me-1"></i>
+			{{ lng('update.update') }}
+		</h5>
+		<span class="text-muted">{{ lng('update.description') }}</span>
+	</div>
+{% endblock %}
+
+{% block content %}
+	<div class="card table-responsive">
+		<div class="card-body">
+			<table class="table table-borderless align-middle mb-0 px-3">
+				<tbody>
+				{% for check in checks %}
+					<tr class="{% if check.result == 1 %}table-danger{% elseif check.result == 2 %}table-warning{% endif %}">
+						<td class="w-75" scope="row">{{ check.title }}</td>
+						<td class="col-auto text-end{% if check.result == 0 %} text-success{% endif %}">
+							<span class="d-none d-md-inline">{{ check.result_txt }}</span>
+							{% if check.result == 0 %}&nbsp;<i class="fa-solid fa-check-circle" {% elseif check.result == 2 %}<span class="d-md-none">&nbsp;???</span>{% elseif check.result == 1 %}<span class="d-md-none">&nbsp;!!!</span>
+							{% endif %}
+						</td>
+					</tr>
+					{% if check.result_desc is not empty %}
+						<tr>
+							<td colspan="2">
+								<span>{{ check.result_desc|raw }}</span>
+							</td>
+						</tr>
+					{% endif %}
+				{% endfor %}
+				</tbody>
+			</table>
+
+			<div class="row pt-md-3">
+				<div class="col-12 text-end mt-4 mt-md-0">
+					<a class="btn btn-lg btn-block btn-primary" href="admin_index.php">
+						{{ lng('success.clickheretocontinue') }}
+						&raquo;
+					</a>
+				</div>
+			</div>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/login/enter2fa.html.twig

@@ -0,0 +1,36 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container">
+		<div class="row justify-content-center">
+			<form action="index.php" class="col-12 max-w-420 d-flex flex-column" method="post" enctype="application/x-www-form-urlencoded">
+				<img class="align-self-center my-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
+
+				<div class="card shadow">
+					<div class="card-body">
+						<h5 class="card-title">{{ pagetitle }}</h5>
+
+						{% if message is not empty %}
+							<div class="alert alert-danger" role="alert">
+								<h4 class="alert-heading">{{ lng('error.error') }}</h4>
+								<p>{{ message|raw }}</p>
+							</div>
+						{% endif %}
+
+						<div class="mb-3">
+							<label for="2fa_code" class="col-form-label">{{ lng('login.2facode') }}</label>
+							<input class="form-control" type="text" name="2fa_code" id="2fa_code" value="" autocomplete="off" autofocus required/>
+						</div>
+
+					</div>
+
+					<div class="card-body d-grid gap-2">
+						<input type="hidden" name="action" value="2fa_verify"/>
+						<input type="hidden" name="send" value="send"/>
+						<button class="btn btn-primary rounded-top-0" type="submit" name="2faverify">{{ lng('2fa.2fa_verify') }}</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/login/fpwd.html.twig

@@ -0,0 +1,53 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container">
+		<div class="row justify-content-center">
+			<form action="{{ formaction }}" class="col-12 max-w-420 d-flex flex-column" method="post" enctype="application/x-www-form-urlencoded">
+				<img class="align-self-center my-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
+
+				<div class="card shadow">
+					<div class="card-body">
+						<h5 class="card-title">{{ pagetitle }}</h5>
+
+						{% if upd_in_progress %}
+							<div class="alert alert-warning" role="alert">
+								{{ lng('update.updateinprogress_onlyadmincanlogin')|raw }}
+							</div>
+						{% elseif successmsg is not empty %}
+							<div class="alert alert-success" role="alert">
+								<h4 class="alert-heading">{{ lng('success.success') }}</h4>
+								<p>{{ successmsg|raw }}</p>
+							</div>
+						{% elseif message is not empty %}
+							<div class="alert alert-danger" role="alert">
+								<h4 class="alert-heading">{{ lng('error.error') }}</h4>
+								<p>{{ message|raw }}</p>
+							</div>
+						{% endif %}
+
+						<div class="mb-3">
+							<label for="loginname" class="col-form-label">{{ lng('login.username') }}</label>
+							<input class="form-control" type="text" name="loginname" id="loginname" value="" required autofocus/>
+						</div>
+
+						<div class="mb-3">
+							<label for="loginemail" class="col-form-label">{{ lng('login.email') }}</label>
+							<input class="form-control" type="email" name="loginemail" id="loginemail" value="" required/>
+						</div>
+					</div>
+
+					<div class="card-body d-grid gap-2">
+						<button class="btn btn-primary rounded-top-0" type="submit" name="doremind">{{ lng('login.remind') }}</button>
+					</div>
+
+					<div class="card-footer">
+						<a class="card-link text-muted" href="index.php">
+							<i class="fa-solid fa-angles-left"></i>
+							{{ lng('login.backtologin') }}</a>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/login/login.html.twig

@@ -0,0 +1,54 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container">
+		<div class="row justify-content-center">
+			<form class="col-12 max-w-420 d-flex flex-column" method="post" enctype="application/x-www-form-urlencoded">
+				<img class="align-self-center my-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
+
+				<div class="card shadow">
+					<div class="card-body">
+						<h5 class="card-title">{{ pagetitle }}</h5>
+						<p>{{ lng('login.welcomemsg') }}</p>
+
+						{% if upd_in_progress %}
+							<div class="alert alert-warning" role="alert">
+								{{ lng('update.updateinprogress_onlyadmincanlogin')|raw }}
+							</div>
+						{% elseif successmsg is not empty %}
+							<div class="alert alert-success" role="alert">
+								<h4 class="alert-heading">{{ lng('success.success') }}</h4>
+								<p>{{ successmsg|raw }}</p>
+							</div>
+						{% elseif message is not empty %}
+							<div class="alert alert-danger" role="alert">
+								<h4 class="alert-heading">{{ lng('error.error') }}</h4>
+								<p>{{ message|raw }}</p>
+							</div>
+						{% endif %}
+
+						<div class="mb-3">
+							<label for="loginname" class="col-form-label">{{ lng('login.username') }}</label>
+							<input class="form-control" type="text" name="loginname" id="loginname" value="" required autofocus/>
+						</div>
+
+						<div class="mb-3">
+							<label for="password" class="col-form-label">{{ lng('login.password') }}</label>
+							<input class="form-control" type="password" name="password" id="password" value="" required/>
+						</div>
+					</div>
+
+					<div class="card-body d-grid gap-2">
+						<button class="btn btn-primary rounded-top-0" type="submit" name="dologin">{{ lng('login.login') }}</button>
+					</div>
+
+					{% if get_setting('panel.allow_preset') == '1' %}
+						<div class="card-footer">
+							<a class="card-link text-muted" href="index.php?action=forgotpwd">{{ lng('login.forgotpwd') }}</a>
+						</div>
+					{% endif %}
+				</div>
+			</form>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/login/rpwd.html.twig

@@ -0,0 +1,45 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container">
+		<div class="row justify-content-center">
+			<form action="{{ formaction }}" class="col-12 max-w-420 d-flex flex-column" method="post" enctype="application/x-www-form-urlencoded">
+				<img class="align-self-center my-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
+
+				<div class="card shadow">
+					<div class="card-body">
+						<h5 class="card-title">{{ pagetitle }}</h5>
+						<p>{{ lng('login.presend') }}</p>
+
+						{% if message is not empty %}
+							<div class="alert alert-danger" role="alert">
+								<h4 class="alert-heading">{{ lng('error.error') }}</h4>
+								<p>{{ message|raw }}</p>
+							</div>
+						{% endif %}
+
+						<div class="mb-3">
+							<label for="new_password" class="col-form-label">{{ lng('changepassword.new_password') }}</label>
+							<input class="form-control" type="password" name="new_password" id="new_password" value="" required autofocus/>
+						</div>
+
+						<div class="mb-3">
+							<label for="new_password_confirm" class="col-form-label">{{ lng('changepassword.new_password_confirm') }}</label>
+							<input class="form-control" type="password" name="new_password_confirm" id="new_password_confirm" value="" required/>
+						</div>
+					</div>
+
+					<div class="card-body d-grid gap-2">
+						<button class="btn btn-primary rounded-top-0" type="submit" name="doremind">{{ lng('login.remind') }}</button>
+					</div>
+
+					<div class="card-footer">
+						<a class="card-link text-muted" href="index.php">
+							<i class="fa-solid fa-angles-left"></i>
+							{{ lng('login.backtologin') }}</a>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/misc/alert.html.twig

@@ -0,0 +1,5 @@
+{% extends "Froxlor/userarea.html.twig" %}
+
+{% block content %}
+	{% include 'Froxlor/misc/alertbox.html.twig' %}
+{% endblock %}

templates/Maketank/misc/alert_nosession.html.twig

@@ -0,0 +1,5 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	{% include 'Froxlor/misc/alertbox.html.twig' %}
+{% endblock %}

templates/Maketank/misc/alertbox.html.twig

@@ -0,0 +1,27 @@
+<div class="alert alert-{{ type|default("info") }} fade show" role="alert">
+	{% if heading is defined and heading is not empty %}
+		<h4 class="alert-heading">
+			{{ heading }}
+		</h4>
+	{% endif %}
+	<p>
+		{{ alert_msg|raw }}
+	</p>
+	{% if alert_info %}
+		<hr>
+		<p class="mb-0">
+			<pre>{{ alert_info|raw }}</pre>
+		</p>
+	{% endif %}
+	{% if redirect_link %}
+		<p>
+			<a href="{{ redirect_link|raw }}" class="btn btn-{{ btntype }}">
+				{% if type == 'danger' %}
+					{{ lng('panel.back') }}
+				{% else %}
+					{{ lng('success.clickheretocontinue') }}
+				{% endif %}
+			</a>
+		</p>
+	{% endif %}
+</div>

templates/Maketank/misc/configurehint.html.twig

@@ -0,0 +1,22 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container max-w-lg flex align-content-center mt-5">
+		<img src="templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
+
+		<div class="row gx-0 rounded shadow bg-primary text-white mt-5">
+			<div class="col p-5 rounded-start">
+				<h2 class="card-title">Welcome to Froxlor</h2>
+				<p class="lead mt-5">It seems that Froxlor has not been installed yet.</p>
+				<p class="lead">Click on the button below to start the installation.</p>
+			</div>
+
+			<div class="col text-white position-relative">
+				<img class="h-75 position-absolute bottom-0 end-0 rounded-tl-bl" src="{{ basehref }}templates/Froxlor/assets/img/preview.jpg">
+			</div>
+		</div>
+		<div class="mt-5 text-end">
+			<a class="btn btn-lg btn-primary" href="./install/install.php" title="Click to start the install process">Start install</a>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/misc/dberrornice.html.twig

@@ -0,0 +1,26 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container my-auto">
+		<div class="alert alert-danger fade show" role="alert">
+			<h4 class="alert-heading">
+				A database error occurred
+			</h4>
+			<p>
+				{{ message }}
+			</p>
+			{% if debug is not empty %}
+				<hr>
+				<p class="mb-0">
+					<pre>{{ debug }}</pre>
+				</p>
+			{% endif %}
+			<p class="mt-1 text-center">
+				<a href="#" class="btn btn-primary" title="Click here to go back" id="historyback">Go back</a>
+				{% if report is not empty %}
+					<a href="{{ report|raw }}" class="btn btn-warning" title="Click here to report error">Report error</a>
+				{% endif %}
+			</p>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/misc/ownershiphint.html.twig

@@ -0,0 +1,18 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+<div class="container my-auto">
+<div class="alert alert-warning fade show" role="alert">
+	<h4 class="alert-heading">
+		Whoops!
+	</h4>
+	<p>The configuration file <b>lib/userdata.inc.php</b> cannot be read from the webserver.</p>
+	<p>This mostly happens due to wrong ownership.<br />Try the following command to correct the ownership:</p>
+	<pre>chown -R {{ user }}:{{ group }} {{ installdir }}</pre>
+	<hr>
+	<p class="mt-1 text-center">
+		<a href="" class="btn btn-primary" title="Reload page">Reload</a>
+	</p>
+</div>
+</div>
+{% endblock %}

templates/Maketank/misc/phprequirementfailed.html.twig

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="robots" content="noindex, nofollow, noarchive" />
+    <meta name="googlebot" content="nosnippet" />
+
+    <!-- CSS -->
+    <link href="{{ basehref }}templates/Froxlor/assets/css/main.css" rel="stylesheet">
+
+    <!-- Scripts -->
+    <script src="{{ basehref }}templates/Froxlor/assets/js/main.js"></script>
+
+    <title>Froxlor - Error</title>
+</head>
+<body class="min-vh-100 d-flex align-items-center">
+    <div class="container-fluid">
+        <div class="container max-w-lg">
+            <div class="card bg-danger text-white">
+                <div class="card-body">
+                    <h4 class="card-title">
+                        Whoops!
+                    </h4>
+                    <p>It seems you are using an older version of PHP</p>
+                    <p>Froxlor requires at least PHP version {{ froxlor_min_version }}</p>
+                    <p>The installed version is: {{ current_version }}</p>
+                </div>
+                <div class="card-footer text-end">
+                    <a href="" class="btn btn-primary" title="Click to refresh">Refresh</a>
+                </div>
+            </div>
+        </div>
+        <footer class="pý-5 text-center">
+            <span>
+                <img src="{{ basehref }}templates/Froxlor/assets/img/logo_grey.png" alt="Froxlor" />
+                &copy; 2009-{{ current_year }} by <a href="https://www.froxlor.org/" rel="external">the Froxlor Team</a>
+            </span>
+        </footer>
+    </div>
+</body>
+</html>

templates/Maketank/misc/ratelimithint.html.twig

@@ -0,0 +1,17 @@
+{% extends "Froxlor/base.html.twig" %}
+
+{% block content %}
+	<div class="container my-auto">
+		<div class="alert alert-warning fade show" role="alert">
+			<h4 class="alert-heading">
+				Whoops!
+			</h4>
+			<p>It seems like you've hit the rate limit.</p>
+			<p>Please slow down your requests and retry after {{ retry|date('d.m.Y H:i:s') }}</p>
+			<hr>
+			<p class="mt-1 text-center">
+				<a href="" class="btn btn-primary" title="Reload page">Reload</a>
+			</p>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/misc/vendormissinghint.html.twig

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="robots" content="noindex, nofollow, noarchive" />
+    <meta name="googlebot" content="nosnippet" />
+
+    <!-- CSS -->
+    <link href="{{ basehref }}templates/Froxlor/assets/css/main.css" rel="stylesheet">
+
+    <!-- Scripts -->
+    <script src="{{ basehref }}templates/Froxlor/assets/js/main.js"></script>
+
+    <title>Froxlor - Error</title>
+</head>
+<body class="min-vh-100 d-flex align-items-center">
+    <div class="container-fluid">
+        <div class="container max-w-lg">
+            <div class="card bg-danger text-white">
+                <div class="card-body">
+                    <h4 class="card-title">
+                        Whoops!
+                    </h4>
+                    <p>It seems you are missing some required files.</p>
+                    <p>Froxlor uses composer for its external requirements. Try the following command to install them:</p>
+                    <pre>cd {{ froxlor_install_dir }} && composer install --no-dev</pre>
+                </div>
+                <div class="card-footer text-end">
+                    <a href="" class="btn btn-primary" title="Click to refresh">Refresh</a>
+                </div>
+            </div>
+        </div>
+        <footer class="py-5 text-center">
+            <span>
+                <img src="{{ basehref }}templates/Froxlor/assets/img/logo_grey.png" alt="Froxlor" />
+                &copy; 2009-{{ current_year }} by <a href="https://www.froxlor.org/" rel="external">the Froxlor Team</a>
+            </span>
+        </footer>
+    </div>
+</body>
+</html>

templates/Maketank/misc/version_popover.html.twig

@@ -0,0 +1,26 @@
+{% macro vpopover(isnewerversion, additional_info, full_version, dbversion, channel, last_update_check, message) %}
+	{% if isnewerversion == 0 %}
+		<p>{{ additional_info }}</p>
+		<div class='d-flex justify-content-between'>
+			<div class='fw-bold'>Version:</div>
+			<div>{{ full_version }}</div>
+		</div>
+		<div class='d-flex justify-content-between'>
+			<div class='fw-bold'>Database version:</div>
+			<div>{{ dbversion }}</div>
+		</div>
+		<div class='d-flex justify-content-between'>
+			<div class='fw-bold'>Channel:</div>
+			<div>{{ channel }}</div>
+		</div>
+		<div class='d-flex justify-content-between'>
+			<div class='fw-bold'>Last checked:</div>
+			<div>{{ last_update_check|date('d.m.Y H:i') }}</div>
+		</div>
+	{% else %}
+		<p>{{ message }}</p>
+		{% if get_config('enable_webupdate') %}
+			<a class='btn d-block btn-outline-warning' href='admin_autoupdate.php?page=overview'>Open updater</a>
+		{% endif %}
+	{% endif %}
+{% endmacro %}

templates/Maketank/misc/version_top.html.twig

@@ -0,0 +1,12 @@
+{% import "Froxlor/misc/version_popover.html.twig" as vc %}
+<span id="ucheck" class="nav-link {% if isnewerversion == 0 and aucheck < 0 %}text-muted{% elseif isnewerversion == 0 %}text-success{% else %}text-warning{% endif %}"
+	  data-bs-container="body" data-bs-toggle="popover" data-bs-placement="bottom" data-bs-trigger="hover focus click" data-bs-html="true"
+	  data-bs-content="{{ vc.vpopover(isnewerversion, additional_info, full_version, dbversion, channel, last_update_check, message) }}"
+>
+	{% if isnewerversion == 0 and aucheck == 0 %}
+		<i class="fa-solid fa-circle-check me-1"></i>
+	{% else %}
+		<i class="fa-solid fa-circle-exclamation me-1"></i>
+	{% endif %}
+	<span class="d-none d-xl-inline">{{ version }}</span>
+</span>

templates/Maketank/settings/apcuinfo.html.twig

@@ -0,0 +1,176 @@
+{% extends "Froxlor/userarea.html.twig" %}
+
+{% block heading %}
+	<h5>
+		<i class="fa-solid fa-hard-drive me-1"></i>
+		{{ lng('admin.apcuinfo') }}
+	</h5>
+{% endblock %}
+
+{% block actions %}
+	<a class="btn btn-warning" href="{{ linker({'section':'apcuinfo','page':'showinfo','action':'delete'}) }}">
+		<i class="fa-solid fa-trash-can me-1"></i>
+		{{ lng('apcuinfo.clearcache') }}
+	</a>
+{% endblock %}
+
+{% block content %}
+	<div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 mb-4">
+		<div class="col">
+			<div class="card h-100 mb-3">
+				<div class="card-body">
+					<h5 class="card-title">{{ lng('apcuinfo.memnote') }}</h5>
+					<div class="progress position-relative">
+						<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.mem_used_percentage }}%" aria-valuenow="{{ apcuinfo.mem_used }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.mem_avail }}"></div>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.mem_used_percentage }}%</small>
+					</div>
+				</div>
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.total') }}
+						<span class="badge bg-secondary">{{ apcuinfo.readable.mem_size }}</span>
+					</li>
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.used') }}
+						<span class="badge bg-secondary">{{ apcuinfo.readable.mem_used }}</span>
+					</li>
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.free') }}
+						<span class="badge bg-secondary">{{ apcuinfo.readable.mem_avail }}</span>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="col">
+			<div class="card h-100 mb-3">
+				<div class="card-body">
+					<h5 class="card-title">{{ lng('apcuinfo.hitmiss') }}</h5>
+					<div class="progress position-relative">
+						<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.num_hits_percentage }}%" aria-valuenow="{{ apcuinfo.num_hits }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.num_hits_and_misses }}"></div>
+						<div class="progress-bar bg-danger" role="progressbar" style="width: {{ 100 - apcuinfo.num_misses_percentage }}%" aria-valuenow="{{ apcuinfo.num_misses }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.num_hits_and_misses }}"></div>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.num_hits_percentage }}%</small>
+					</div>
+				</div>
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.hit') }}
+						<span class="badge bg-secondary">{{ apcuinfo.readable.num_hits }}</span>
+					</li>
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.miss') }}
+						<span class="badge bg-secondary">{{ apcuinfo.readable.num_misses }}</span>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="col">
+			<div class="card h-100 mb-3">
+				<div class="card-body">
+					<h5 class="card-title">{{ lng('apcuinfo.cachetitle') }}</h5>
+				</div>
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.cvar') }}
+						<span class="badge bg-secondary">{{ apcuinfo.readable.number_vars }}
+							({{ apcuinfo.size_vars }})</span>
+					</li>
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.reqrate') }}
+						<span class="badge bg-secondary">{{ apcuinfo.req_rate_user }}
+							{{ lng('apcuinfo.creqsec') }}</span>
+					</li>
+					<li class="list-group-item d-flex justify-content-between align-items-center">
+						{{ lng('apcuinfo.hitrate') }}
+						<span class="badge bg-secondary">{{ apcuinfo.hit_rate_user }}
+							{{ lng('apcuinfo.creqsec') }}</span>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="col">
+			<div class="card h-100 mb-3">
+				<div class="card-body">
+					<h5 class="card-title">{{ lng('apcuinfo.detailmem') }}</h5>
+					{% if apcuinfo.fragmentation is not iterable %}
+						{{ lng('apcuinfo.nofragment') }}
+					{% endif %}
+				</div>
+				{% if apcuinfo.fragmentation is iterable %}
+					<div class="progress position-relative">
+						<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.fragmentation.used_percentage }}%" aria-valuenow="{{ apcuinfo.fragmentation.used_bytes }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.fragmentation.total_bytes }}"></div>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.fragmentation.used_percentage }}%</small>
+					</div>
+					<ul class="list-group list-group-flush">
+						<li class="list-group-item d-flex justify-content-between align-items-center">
+							{{ lng('apcuinfo.total') }}
+							<span class="badge bg-secondary">{{ apcuinfo.fragmentation.readable.total_bytes }}</span>
+						</li>
+						<li class="list-group-item d-flex justify-content-between align-items-center">
+							{{ lng('apcuinfo.used') }}
+							<span class="badge bg-secondary">{{ apcuinfo.fragmentation.readable.used_bytes }}</span>
+						</li>
+						<li class="list-group-item d-flex justify-content-between align-items-center">
+							{{ lng('apcuinfo.fragments') }}
+							<span class="badge bg-secondary">{{ apcuinfo.fragmentation.readable.num_frags }}</span>
+						</li>
+					</ul>
+				{% endif %}
+			</div>
+		</div>
+	</div>
+
+	<div class="row row-cols-1 row-cols-md-2">
+		<div class="col">
+			<div class="card table-responsive mb-3">
+				<table class="table table-borderless table-striped align-middle mb-0 px-3">
+					<tbody>
+						<tr>
+							<th class="text-center" colspan="2" scope="row">{{ lng('apcuinfo.generaltitle') }}</th>
+						</tr>
+						<tr>
+							<th class="fw-bold" scope="row">{{ lng('apcuinfo.version') }}</th>
+							<td class="text-end">{{ apcuinfo.apcversion }}</td>
+						</tr>
+						<tr>
+							<th class="fw-bold" scope="row">{{ lng('apcuinfo.phpversion') }}</th>
+							<td class="text-end">{{ apcuinfo.phpversion }}</td>
+						</tr>
+						<tr>
+							<th class="fw-bold" scope="row">{{ lng('admin.hostname') }}</th>
+							<td class="text-end">{{ apcuinfo.host }}</td>
+						</tr>
+						<tr>
+							<th class="fw-bold" scope="row">{{ lng('admin.serversoftware') }}</th>
+							<td class="text-end">{{ apcuinfo.server }}</td>
+						</tr>
+						<tr>
+							<th class="fw-bold" scope="row">{{ lng('apcuinfo.start') }}</th>
+							<td class="text-end">{{ apcuinfo.start_time|date('d.m.Y H:i:s') }}</td>
+						</tr>
+						<tr>
+							<th class="fw-bold" scope="row">{{ lng('apcuinfo.uptime') }}</th>
+							<td class="text-end">{{ apcuinfo.uptime }}</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+		<div class="col">
+			<div class="card table-responsive">
+				<table class="table table-borderless table-striped align-middle mb-0 px-3">
+					<tbody>
+						<tr>
+							<th class="text-center" colspan="2" scope="row">{{ lng('apcuinfo.runtime') }}</th>
+						</tr>
+						{% for k,v in apcuinfo.runtimelines %}
+							<tr>
+								<th class="fw-bold" scope="row">{{ k|raw }}</th>
+								<td class="text-end">{{ v|raw }}</td>
+							</tr>
+						{% endfor %}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+{% endblock %}

templates/Maketank/settings/conf/command.html.twig

@@ -0,0 +1 @@
+<textarea class="form-control bg-secondary text-light mb-2" rows="{{ numbrows }}" readonly>{{ commands|raw }}</textarea>