maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

remove some already fixed todo markers

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-05-21 17:03:34 +02:00
parent f6c265dfa1
commit 309abc6150
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Ajax/Ajax.php
View File

@@ -194,7 +194,7 @@ class Ajax
} }
/** /**
* @todo $userinfo * search globally in various resources
*/ */
private function searchGlobal() private function searchGlobal()
{ {

6
lib/Froxlor/Install/Install/Core.php
View File

@@ -199,7 +199,6 @@ class Core
/** /**
* Create database and database-user * Create database and database-user
* *
* @todo add exceptions?
* @param object $db_root * @param object $db_root
* @return void * @return void
* @throws Exception * @throws Exception
@@ -271,7 +270,6 @@ class Core
/** /**
* Grant privileges to given user. * Grant privileges to given user.
* *
* @todo add exceptions?
* @param $db_root * @param $db_root
* @param $database * @param $database
* @param $username * @param $username
@@ -665,11 +663,13 @@ class Core
} elseif ($this->validatedData['webserver_backend'] == 'fcgid') { } elseif ($this->validatedData['webserver_backend'] == 'fcgid') {
$system_params[] = 'fcgid'; $system_params[] = 'fcgid';
} }
// @todo ftp,mail,smtp
$json_params = [ $json_params = [
'distro' => $this->validatedData['distribution'], 'distro' => $this->validatedData['distribution'],
'dns' => 'x', 'dns' => 'x',
'http' => $this->validatedData['webserver'], 'http' => $this->validatedData['webserver'],
'smtp' => 'postfix_dovecot',
'mail' => 'dovecot_postfix',
'ftp' => 'proftpd',
'system' => $system_params 'system' => $system_params
]; ];
$_SESSION['installation']['json_params'] = json_encode($json_params); $_SESSION['installation']['json_params'] = json_encode($json_params);

1
lib/Froxlor/Language.php
View File

@@ -36,7 +36,6 @@ class Language
/** /**
* @return array * @return array
* @fixme iso seems to be not used in froxlor?
*/ */
public static function getLanguages(): array public static function getLanguages(): array
{ {

2
lib/configfiles/gentoo.xml
View File

@@ -1983,7 +1983,7 @@ sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email=
<!-- IMAP/POP3 services --> <!-- IMAP/POP3 services -->
<service type="mail" title="{{lng.admin.configfiles.mail}}"> <service type="mail" title="{{lng.admin.configfiles.mail}}">
<!-- Dovecot --> <!-- Dovecot -->
<daemon name="dovecot" version="2" title="Dovecot" <daemon name="dovecot_postfix" version="2" title="Dovecot"
default="true"> default="true">
<command><![CDATA[echo "net-mail/dovecot mysql managesieve sieve" >> /etc/portage/package.use/froxlor]]></command> <command><![CDATA[echo "net-mail/dovecot mysql managesieve sieve" >> /etc/portage/package.use/froxlor]]></command>
<install><![CDATA[emerge net-mail/dovecot]]></install> <install><![CDATA[emerge net-mail/dovecot]]></install>

4
lib/formfields/install/formfield.install.php
View File

@@ -45,14 +45,14 @@ return [
'placeholder' => lng('mysql.mysql_ssl_ca_file'), 'placeholder' => lng('mysql.mysql_ssl_ca_file'),
'type' => 'text', 'type' => 'text',
'value' => old('mysql_ssl_ca_file', null, 'installation'), 'value' => old('mysql_ssl_ca_file', null, 'installation'),
'advanced' => true, // @todo 'advanced' => true,
], ],
'mysql_ssl_verify_server_certificate' => [ 'mysql_ssl_verify_server_certificate' => [
'label' => lng('mysql.mysql_ssl_verify_server_certificate'), 'label' => lng('mysql.mysql_ssl_verify_server_certificate'),
'type' => 'checkbox', 'type' => 'checkbox',
'value' => '1', 'value' => '1',
'checked' => old('mysql_ssl_verify_server_certificate', '0', 'installation'), 'checked' => old('mysql_ssl_verify_server_certificate', '0', 'installation'),
'advanced' => true // @todo 'advanced' => true,
], ],
'mysql_root_user' => [ 'mysql_root_user' => [
'label' => lng('mysql.privileged_user'), 'label' => lng('mysql.privileged_user'),