public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access

Browse source 
Conflicts:
	views/users/api.hbs
This commit is contained in:
Tomas Bures 2017-07-09 23:34:03 +02:00
commit ad1e4c58f5
21 changed files with 5088 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

4
routes/editorapi.js
View file

@ -375,6 +375,7 @@ router.post('/upload', passport.csrfProtection, (req, res) => {
};
const dirName = getDirName();
const serviceUrlParts = url.parse(serviceUrl);
if (dirName === false) {
return res.status(500).send(_('Invalid resource type or ID'));
@ -391,7 +392,8 @@ router.post('/upload', passport.csrfProtection, (req, res) => {
uploadDir: path.join(__dirname, '..', 'public', req.query.editor, 'uploads', dirName),
uploadUrl: '/' + req.query.editor + '/uploads/' + dirName, // must be root relative
acceptFileTypes: /\.(gif|jpe?g|png)$/i,
hostname: url.parse(serviceUrl).host // include port
hostname: serviceUrlParts.host, // include port
ssl: serviceUrlParts.protocol === 'https:'
};
const mockres = httpMocks.createResponse({