From 66c3694809c02d53f9d90209d74a04766813cdcd Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 26 May 2022 13:29:26 +0200 Subject: [PATCH] fix lng() usage in RunApiCommand-class; fix title-tag content if newerversion=0 in update-check Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/Froxlor.php | 8 ++++---- lib/Froxlor/Cli/RunApiCommand.php | 3 +++ lng/de.lng.php | 2 +- lng/en.lng.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/Froxlor/Api/Commands/Froxlor.php b/lib/Froxlor/Api/Commands/Froxlor.php index 22f54a34..aebb408b 100644 --- a/lib/Froxlor/Api/Commands/Froxlor.php +++ b/lib/Froxlor/Api/Commands/Froxlor.php @@ -93,17 +93,17 @@ class Froxlor extends ApiCommand return $this->response([ 'isnewerversion' => 0, 'version' => $this->version, - 'message' => $errmsg, + 'message' => '', 'link' => '', - 'additional_info' => '' + 'additional_info' => $errmsg ]); } else { return $this->response([ 'isnewerversion' => 0, 'version' => $this->version, - 'message' => lng('update.noupdatesavail'), + 'message' => '', 'link' => '', - 'additional_info' => '' + 'additional_info' => lng('update.noupdatesavail') ]); } } diff --git a/lib/Froxlor/Cli/RunApiCommand.php b/lib/Froxlor/Cli/RunApiCommand.php index 8efcd223..d9afce69 100644 --- a/lib/Froxlor/Cli/RunApiCommand.php +++ b/lib/Froxlor/Cli/RunApiCommand.php @@ -33,6 +33,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; use Froxlor\Database\Database; +use Froxlor\Froxlor; final class RunApiCommand extends CliCommand { @@ -53,6 +54,8 @@ final class RunApiCommand extends CliCommand $result = $this->validateRequirements($input, $output); + require Froxlor::getInstallDir() . '/lib/functions.php'; + if ($result == self::SUCCESS) { try { $loginname = $input->getArgument('user'); diff --git a/lng/de.lng.php b/lng/de.lng.php index 0a338c51..8e72a014 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -2114,7 +2114,7 @@ Vielen Dank, Ihr Administrator', 'part_a' => 'Die Froxlor-Dateien wurden aktualisiert. Neue Version ist %s. Die bisher installierte Version ist %s', 'part_b' => '

Ein Kunden-Login ist vor Abschluss des Aktualisierungsvorganges nicht möglich.
Aktualisierung ausführen?', ], - 'noupdatesavail' => 'Ihre Froxlor-Version ist aktuell.', + 'noupdatesavail' => 'Ihre Froxlor-Version ist aktuell.', 'description' => 'Aktualisierung der froxlor Datenbank', ], 'usersettings' => [ diff --git a/lng/en.lng.php b/lng/en.lng.php index 5fc52531..7de1cfe3 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -2499,7 +2499,7 @@ Yours sincerely, your administrator', 'part_a' => 'The Froxlor files have been updated to version %s. The installed version is %s.', 'part_b' => '

Customers will not be able to log in until the update has been finished.
Proceed?', ], - 'noupdatesavail' => 'You already have the latest Froxlor version.', + 'noupdatesavail' => 'You already have the latest Froxlor version.', 'description' => 'Running database updates for your froxlor installation', ], 'usersettings' => [