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

fix setting incorrect acme-challenge path on installation; fixes #1097

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-02-11 08:54:09 +01:00
parent c9b2bfe53c
commit 256a52a5da
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,7 +420,7 @@ class Core
} }
$this->updateSetting($upd_stmt, $this->validatedData['activate_newsfeed'], 'admin', 'show_news_feed'); $this->updateSetting($upd_stmt, $this->validatedData['activate_newsfeed'], 'admin', 'show_news_feed');
$this->updateSetting($upd_stmt, dirname(__FILE__, 3), 'system', 'letsencryptchallengepath'); $this->updateSetting($upd_stmt, dirname(__FILE__, 5), 'system', 'letsencryptchallengepath');
// insert the lastcronrun to be the installation date // insert the lastcronrun to be the installation date
$this->updateSetting($upd_stmt, time(), 'system', 'lastcronrun'); $this->updateSetting($upd_stmt, time(), 'system', 'lastcronrun');

4
lib/Froxlor/PhpHelper.php
View File

@@ -324,7 +324,7 @@ class PhpHelper
* Return human-readable sizes * Return human-readable sizes
* *
* @param int $size size in bytes * @param int $size size in bytes
* @param string $max maximum unit * @param ?string $max maximum unit
* @param string $system 'si' for SI, 'bi' for binary prefixes * @param string $system 'si' for SI, 'bi' for binary prefixes
* @param string $retstring string-format * @param string $retstring string-format
* *
@@ -332,7 +332,7 @@ class PhpHelper
*/ */
public static function sizeReadable( public static function sizeReadable(
int $size, int $size,
string $max = '', ?string $max = '',
string $system = 'si', string $system = 'si',
string $retstring = '%01.2f %s' string $retstring = '%01.2f %s'
): string { ): string {