Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

strip tags from signature when they are saving, separated info in user profile and added signature box

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-05-21 22:36:21 -04:00
parent 26781157b3
commit ef304a712f
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/templates/account.tpl
View File

@@ -43,7 +43,7 @@
<span class="account-bio-label">age</span> <span class="account-bio-label">age</span>
<span>{age}</span> <span>{age}</span>
<br/> <br/>
<hr/>
<span class="account-bio-label">member for</span> <span class="account-bio-label">member for</span>
<span>{joindate}</span> <span>{joindate}</span>
<br/> <br/>
@@ -55,9 +55,11 @@
<span class="account-bio-label">posts</span> <span class="account-bio-label">posts</span>
<span id='postcount'>{postcount}</span> <span id='postcount'>{postcount}</span>
<br/> <br/>
<hr/>
<span class="account-bio-label">signature</span> <span class="account-bio-label">signature</span>
<span id='signature'>{signature}</span> <div class="post-signature">
<span id='signature'>{signature}</span>
</div>
</div> </div>
</div> </div>
</div> </div>

8
src/routes/user.js
View File

@@ -3,7 +3,8 @@
var user = require('./../user.js'), var user = require('./../user.js'),
fs = require('fs'), fs = require('fs'),
utils = require('./../utils.js'), utils = require('./../utils.js'),
config = require('../../config.js'); config = require('../../config.js'),
marked = require('marked');
(function(User) { (function(User) {
@@ -265,10 +266,15 @@ var user = require('./../user.js'),
}); });
} else { } else {
getUserDataByUserName(req.params.username, callerUID, function(userData) { getUserDataByUserName(req.params.username, callerUID, function(userData) {
user.isFriend(callerUID, userData.theirid, function(isFriend) { user.isFriend(callerUID, userData.theirid, function(isFriend) {
userData.isFriend = isFriend; userData.isFriend = isFriend;
userData.signature = marked(userData.signature || '');
res.send(JSON.stringify(userData)); res.send(JSON.stringify(userData));
}); });
}); });
} }

2
src/topics.js
View File

@@ -52,7 +52,7 @@ marked.setOptions({
'username' : user_data[uid].username || 'anonymous', 'username' : user_data[uid].username || 'anonymous',
'user_rep' : user_data[uid].reputation || 0, 'user_rep' : user_data[uid].reputation || 0,
'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e', 'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
'signature' : marked(utils.strip_tags(user_data[uid].signature || '')), 'signature' : marked(user_data[uid].signature || ''),
'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty', 'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none', 'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none',
'edited-class': post_data.editor[i] !== null ? '' : 'none', 'edited-class': post_data.editor[i] !== null ? '' : 'none',

3
src/user.js
View File

@@ -100,6 +100,9 @@ var config = require('../config.js'),
User.setUserField(uid, 'gravatarpicture', User.createGravatarURLFromEmail(data[key])); User.setUserField(uid, 'gravatarpicture', User.createGravatarURLFromEmail(data[key]));
RDB.set('email:' + data['email'] +':uid', uid); RDB.set('email:' + data['email'] +':uid', uid);
} }
else if(key === 'signature') {
data[key] = utils.strip_tags(data[key]);
}
User.setUserField(uid, key, data[key]); User.setUserField(uid, key, data[key]);
} }