Add warning to setup checks if the default mailer is still php
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
0cf0bcba61
commit
6a0c54d5bf
|
@ -293,6 +293,18 @@
|
|||
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
|
||||
})
|
||||
}
|
||||
if (data.isPhpMailerUsed) {
|
||||
messages.push({
|
||||
msg: t(
|
||||
'core',
|
||||
'Use of the the built in php mailer is no longer supported. <a target="_blank" rel="noreferrer noopener" href="{docLink}">Please update your email server settings ↗<a/>.',
|
||||
{
|
||||
docLink: data.mailSettingsDocumentation,
|
||||
}
|
||||
),
|
||||
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
|
||||
});
|
||||
}
|
||||
} else {
|
||||
messages.push({
|
||||
msg: t('core', 'Error occurred while checking server setup'),
|
||||
|
|
|
@ -523,6 +523,10 @@ Raw output
|
|||
return [];
|
||||
}
|
||||
|
||||
protected function isPhpMailerUsed(): bool {
|
||||
return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php';
|
||||
}
|
||||
|
||||
/**
|
||||
* @return DataResponse
|
||||
*/
|
||||
|
@ -557,6 +561,8 @@ Raw output
|
|||
'missingIndexes' => $this->hasMissingIndexes(),
|
||||
'isSqliteUsed' => $this->isSqliteUsed(),
|
||||
'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
|
||||
'isPhpMailerUsed' => $this->isPhpMailerUsed(),
|
||||
'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin')
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
|
@ -119,7 +119,22 @@ class CheckSetupControllerTest extends TestCase {
|
|||
$this->lockingProvider,
|
||||
$this->dateTimeFormatter,
|
||||
])
|
||||
->setMethods(['isReadOnlyConfig', 'hasValidTransactionIsolationLevel', 'hasFileinfoInstalled', 'hasWorkingFileLocking', 'getLastCronInfo', 'getSuggestedOverwriteCliURL', 'getOutdatedCaches', 'getCurlVersion', 'isPhpOutdated', 'isOpcacheProperlySetup', 'hasFreeTypeSupport', 'hasMissingIndexes', 'isSqliteUsed'])->getMock();
|
||||
->setMethods([
|
||||
'isReadOnlyConfig',
|
||||
'hasValidTransactionIsolationLevel',
|
||||
'hasFileinfoInstalled',
|
||||
'hasWorkingFileLocking',
|
||||
'getLastCronInfo',
|
||||
'getSuggestedOverwriteCliURL',
|
||||
'getOutdatedCaches',
|
||||
'getCurlVersion',
|
||||
'isPhpOutdated',
|
||||
'isOpcacheProperlySetup',
|
||||
'hasFreeTypeSupport',
|
||||
'hasMissingIndexes',
|
||||
'isSqliteUsed',
|
||||
'isPhpMailerUsed',
|
||||
])->getMock();
|
||||
}
|
||||
|
||||
public function testIsInternetConnectionWorkingDisabledViaConfig() {
|
||||
|
@ -352,6 +367,10 @@ class CheckSetupControllerTest extends TestCase {
|
|||
->method('linkToDocs')
|
||||
->with('admin-db-conversion')
|
||||
->willReturn('http://docs.example.org/server/go.php?to=admin-db-conversion');
|
||||
$this->urlGenerator->expects($this->at(6))
|
||||
->method('getAbsoluteURL')
|
||||
->with('index.php/settings/admin')
|
||||
->willReturn('https://server/index.php/settings/admin');
|
||||
$this->checkSetupController
|
||||
->method('hasFreeTypeSupport')
|
||||
->willReturn(false);
|
||||
|
@ -392,6 +411,10 @@ class CheckSetupControllerTest extends TestCase {
|
|||
'relativeTime' => '2 hours ago',
|
||||
'backgroundJobsUrl' => 'https://example.org',
|
||||
]);
|
||||
$this->checkSetupController
|
||||
->expects($this->once())
|
||||
->method('isPhpMailerUsed')
|
||||
->willReturn(false);
|
||||
$this->checker
|
||||
->expects($this->once())
|
||||
->method('hasPassedCheck')
|
||||
|
@ -434,6 +457,8 @@ class CheckSetupControllerTest extends TestCase {
|
|||
'isSqliteUsed' => false,
|
||||
'databaseConversionDocumentation' => 'http://docs.example.org/server/go.php?to=admin-db-conversion',
|
||||
'missingIndexes' => [],
|
||||
'isPhpMailerUsed' => false,
|
||||
'mailSettingsDocumentation' => 'https://server/index.php/settings/admin',
|
||||
]
|
||||
);
|
||||
$this->assertEquals($expected, $this->checkSetupController->check());
|
||||
|
|
Loading…
Reference in New Issue