From 309abc615073a704fb19f8ce566b053f90b18387 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Sat, 21 May 2022 17:03:34 +0200
Subject: [PATCH] remove some already fixed todo markers

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 lib/Froxlor/Ajax/Ajax.php                    | 2 +-
 lib/Froxlor/Install/Install/Core.php         | 6 +++---
 lib/Froxlor/Language.php                     | 1 -
 lib/configfiles/gentoo.xml                   | 2 +-
 lib/formfields/install/formfield.install.php | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/Froxlor/Ajax/Ajax.php b/lib/Froxlor/Ajax/Ajax.php
index 073af4ab..09bd9550 100644
--- a/lib/Froxlor/Ajax/Ajax.php
+++ b/lib/Froxlor/Ajax/Ajax.php
@@ -194,7 +194,7 @@ class Ajax
 	}
 
 	/**
-	 * @todo $userinfo
+	 * search globally in various resources
 	 */
 	private function searchGlobal()
 	{
diff --git a/lib/Froxlor/Install/Install/Core.php b/lib/Froxlor/Install/Install/Core.php
index 7c8c054b..effcfee4 100644
--- a/lib/Froxlor/Install/Install/Core.php
+++ b/lib/Froxlor/Install/Install/Core.php
@@ -199,7 +199,6 @@ class Core
 	/**
 	 * Create database and database-user
 	 *
-	 * @todo add exceptions?
 	 * @param object $db_root
 	 * @return void
 	 * @throws Exception
@@ -271,7 +270,6 @@ class Core
 	/**
 	 * Grant privileges to given user.
 	 *
-	 * @todo add exceptions?
 	 * @param $db_root
 	 * @param $database
 	 * @param $username
@@ -665,11 +663,13 @@ class Core
 		} elseif ($this->validatedData['webserver_backend'] == 'fcgid') {
 			$system_params[] = 'fcgid';
 		}
-		// @todo ftp,mail,smtp
 		$json_params = [
 			'distro' => $this->validatedData['distribution'],
 			'dns' => 'x',
 			'http' => $this->validatedData['webserver'],
+			'smtp' => 'postfix_dovecot',
+			'mail' => 'dovecot_postfix',
+			'ftp' => 'proftpd',
 			'system' => $system_params
 		];
 		$_SESSION['installation']['json_params'] = json_encode($json_params);
diff --git a/lib/Froxlor/Language.php b/lib/Froxlor/Language.php
index 77c68161..a7e76977 100644
--- a/lib/Froxlor/Language.php
+++ b/lib/Froxlor/Language.php
@@ -36,7 +36,6 @@ class Language
 
 	/**
 	 * @return array
-	 * @fixme iso seems to be not used in froxlor?
 	 */
 	public static function getLanguages(): array
 	{
diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index ba22c593..2f63c357 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -1983,7 +1983,7 @@ sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email=
 			<!-- IMAP/POP3 services -->
 			<service type="mail" title="{{lng.admin.configfiles.mail}}">
 				<!-- Dovecot -->
-				<daemon name="dovecot" version="2" title="Dovecot"
+				<daemon name="dovecot_postfix" version="2" title="Dovecot"
 					default="true">
 					<command><![CDATA[echo "net-mail/dovecot mysql managesieve sieve" >> /etc/portage/package.use/froxlor]]></command>
 					<install><![CDATA[emerge net-mail/dovecot]]></install>
diff --git a/lib/formfields/install/formfield.install.php b/lib/formfields/install/formfield.install.php
index f45fd6de..e7cc2fd1 100644
--- a/lib/formfields/install/formfield.install.php
+++ b/lib/formfields/install/formfield.install.php
@@ -45,14 +45,14 @@ return [
 						'placeholder' => lng('mysql.mysql_ssl_ca_file'),
 						'type' => 'text',
 						'value' => old('mysql_ssl_ca_file', null, 'installation'),
-						'advanced' => true, // @todo
+						'advanced' => true,
 					],
 					'mysql_ssl_verify_server_certificate' => [
 						'label' => lng('mysql.mysql_ssl_verify_server_certificate'),
 						'type' => 'checkbox',
 						'value' => '1',
 						'checked' => old('mysql_ssl_verify_server_certificate', '0', 'installation'),
-						'advanced' => true // @todo
+						'advanced' => true,
 					],
 					'mysql_root_user' => [
 						'label' => lng('mysql.privileged_user'),