fix lng() usage in RunApiCommand-class; fix title-tag content if newerversion=0 in update-check
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
@@ -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')
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -2114,7 +2114,7 @@ Vielen Dank, Ihr Administrator',
|
||||
'part_a' => 'Die Froxlor-Dateien wurden aktualisiert. Neue Version ist <strong>%s</strong>. Die bisher installierte Version ist <strong>%s</strong>',
|
||||
'part_b' => '<br /><br />Ein Kunden-Login ist vor Abschluss des Aktualisierungsvorganges nicht möglich.<br /><strong>Aktualisierung ausführen?</strong>',
|
||||
],
|
||||
'noupdatesavail' => '<strong>Ihre Froxlor-Version ist aktuell.</strong>',
|
||||
'noupdatesavail' => 'Ihre Froxlor-Version ist aktuell.',
|
||||
'description' => 'Aktualisierung der froxlor Datenbank',
|
||||
],
|
||||
'usersettings' => [
|
||||
|
||||
@@ -2499,7 +2499,7 @@ Yours sincerely, your administrator',
|
||||
'part_a' => 'The Froxlor files have been updated to version <strong>%s</strong>. The installed version is <strong>%s</strong>.',
|
||||
'part_b' => '<br /><br />Customers will not be able to log in until the update has been finished.<br /><strong>Proceed?</strong>',
|
||||
],
|
||||
'noupdatesavail' => '<strong>You already have the latest Froxlor version.</strong>',
|
||||
'noupdatesavail' => 'You already have the latest Froxlor version.',
|
||||
'description' => 'Running database updates for your froxlor installation',
|
||||
],
|
||||
'usersettings' => [
|
||||
|
||||
Reference in New Issue
Block a user