CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-03 11:24:48 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:appwrite/appwrite into restify

Browse source
This commit is contained in:
Eldad Fux 2020-02-08 01:21:04 +02:00
parent eb2528b139 2d4aaa2aa4
commit 0c2b24d1d5
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -20,6 +20,7 @@
* Upgraded MariaDB image to version 1.0.2
* Upgraded SMTP image to version 1.0.1
* File upload route (POST /v1/storage/files) now accept a single file per request
* Added ENV vars to change system email sender name and address
## Bug Fixes

7
app/init.php
View file

@ -124,8 +124,11 @@ $register->set('smtp', function () use ($request) {
$mail->SMTPSecure = $request->getServer('_APP_SMTP_SECURE', false);
$mail->SMTPAutoTLS = false;
$mail->setFrom('team@appwrite.io', APP_NAME.' Team');
$mail->addReplyTo('team@appwrite.io', APP_NAME.' Team');
$from = $request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Team');
$email = $request->getServer('_APP_SYSTEM_EMAIL_ADDRESS', 'team@appwrite.io');
$mail->setFrom($email, $from);
$mail->addReplyTo($email, $from);
$mail->isHTML(true);

10
docs/tutorials/environment-variables.md
View file

@ -117,3 +117,13 @@ SMTP server user name. Empty by default.
### _APP_SMTP_PASSWORD
SMTP server user password. Empty by default.
## System Settings
### _APP_SYSTEM_EMAIL_NAME
This is the sender name value that will appear on email messages sent to developers from the Appwrite console. The default value is: 'Appwrite Team'.
### _APP_SYSTEM_EMAIL_ADDRESS
This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is 'team@appwrite.io'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users' SPAM folders.