CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-30 17:26:48 +13:00
Code Issues Projects Releases Wiki Activity

linter fix

Browse source
This commit is contained in:
Matej Bačo 2023-08-28 14:21:35 +02:00
parent 89c9f8da6a
commit f130a9ebc9
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/api/projects.php
View file

@ -1543,15 +1543,15 @@ App::patch('/v1/projects/:projectId/smtp')
if ($enabled) {
if (empty($senderName)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Sender name is required when enabling SMTP.');
} else if (empty($senderEmail)) {
} elseif (empty($senderEmail)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Sender email is required when enabling SMTP.');
} else if (empty($host)) {
} elseif (empty($host)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Host is required when enabling SMTP.');
} else if (empty($port)) {
} elseif (empty($port)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Port is required when enabling SMTP.');
} else if (empty($username)) {
} elseif (empty($username)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Username is required when enabling SMTP.');
} else if (empty($password)) {
} elseif (empty($password)) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Password is required when enabling SMTP.');
}
}
@ -1581,7 +1581,6 @@ App::patch('/v1/projects/:projectId/smtp')
// Save SMTP settings
if ($enabled) {
$smtp = [
'enabled' => $enabled,
'senderName' => $senderName,

4
app/controllers/api/teams.php
View file

@ -557,11 +557,11 @@ App::post('/v1/teams/:teamId/memberships')
$senderEmail = $customTemplate['senderEmail'] ?? '';
$senderEmail = $senderEmail ?: ($smtp['senderEmail'] ?? '');
$senderEmail = $senderEmail ?: App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
$senderName = $customTemplate['senderName'] ?? '';
$senderName = $senderName ?: ($smtp['senderName'] ?? '');
$senderName = $senderName ?: App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
$replyTo = $customTemplate['replyTo'] ?? '';
$replyTo = $replyTo ?: ($smtp['replyTo'] ?? '');
$replyTo = $senderEmail;