Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-04 21:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

path join on user routers

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-06-19 10:32:48 -04:00
parent b962972d21
commit 626423e01b
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/routes/user.js
View File

@@ -113,9 +113,8 @@ var user = require('./../user.js'),
return;
}
var filename = path.basename(oldpicture);
var absolutePath = global.configuration['ROOT_DIRECTORY'] + config.upload_path + filename;
var absolutePath = path.join(global.configuration['ROOT_DIRECTORY'], config.upload_path, path.basename(oldpicture));
fs.unlink(absolutePath, function(err) {
if(err) {
console.log(err);
@@ -124,18 +123,16 @@ var user = require('./../user.js'),
uploadUserPicture(req.user.uid, req.files.userPhoto.name, req.files.userPhoto.path, res);
});
});
});
function uploadUserPicture(uid, filename, tempPath, res) {
if(!filename){
res.send({
error: 'Error uploading file! Error : Invalid file name!'
error: 'Error uploading file! Error : Invalid file name!'
});
return;
return;
}
filename = uid + '-' + filename;
@@ -147,26 +144,28 @@ var user = require('./../user.js'),
var os = fs.createWriteStream(global.configuration['ROOT_DIRECTORY'] + uploadPath);
is.on('end', function() {
fs.unlinkSync(tempPath);
fs.unlinkSync(tempPath);
var imageUrl = config.upload_url + filename;
res.send({
res.send({
path: imageUrl
});
user.setUserField(uid, 'uploadedpicture', imageUrl);
user.setUserField(uid, 'picture', imageUrl);
});
var im = require('node-imagemagick');
user.setUserField(uid, 'uploadedpicture', imageUrl);
user.setUserField(uid, 'picture', imageUrl);
im.resize({
srcPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
dstPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
width: 128
var im = require('node-imagemagick');
im.resize({
srcPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
dstPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
width: 128
}, function(err, stdout, stderr){
if (err)
throw err;
if (err) {
console.log(err);
throw err;
}
});
});