From 332730575fcd2b415de789f908be96e77d2103de Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 22 Nov 2013 12:26:21 -0500 Subject: [PATCH 1/6] closes #529 --- public/src/forum/admin/groups.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/src/forum/admin/groups.js b/public/src/forum/admin/groups.js index 8485263ce4..d6cf314171 100644 --- a/public/src/forum/admin/groups.js +++ b/public/src/forum/admin/groups.js @@ -45,10 +45,12 @@ define(function() { errorEl.html(errorText).removeClass('hide'); } else { - createModal.modal('hide'); errorEl.addClass('hide'); createNameEl.val(''); - ajaxify.go('admin/groups'); + createModal.on('hidden.bs.modal', function() { + ajaxify.go('admin/groups'); + }); + createModal.modal('hide'); } }); }); From 83f18c191598da1a37901796205b07a68f3ed55e Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 22 Nov 2013 14:08:02 -0500 Subject: [PATCH 2/6] closes #526 --- public/templates/account.tpl | 2 +- src/routes/user.js | 2 ++ src/user.js | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/public/templates/account.tpl b/public/templates/account.tpl index 5c7678f10c..720489b63a 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -36,7 +36,7 @@
- {website} + {websiteName}
diff --git a/src/routes/user.js b/src/routes/user.js index 9b6d0d4a9d..5bdee2c5d0 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -543,6 +543,8 @@ var user = require('./../user.js'), else data.emailClass = "hide"; + data.websiteName = data.website.replace('http://', '').replace('https://', ''); + data.show_banned = data.banned === '1' ? '' : 'hide'; data.uid = uid; diff --git a/src/user.js b/src/user.js index a51d842e60..55c0516394 100644 --- a/src/user.js +++ b/src/user.js @@ -4,6 +4,8 @@ var bcrypt = require('bcrypt'), nconf = require('nconf'), winston = require('winston'), userSearch = require('reds').createSearch('nodebbusersearch'), + check = require('validator').check, + sanitize = require('validator').sanitize, utils = require('./../public/src/utils'), RDB = require('./redis'), @@ -13,6 +15,7 @@ var bcrypt = require('bcrypt'), notifications = require('./notifications'), topics = require('./topics'); + (function(User) { 'use strict'; User.create = function(username, password, email, callback) { @@ -244,6 +247,9 @@ var bcrypt = require('bcrypt'), function updateField(field, next) { if (data[field] !== undefined && typeof data[field] === 'string') { + data[field] = data[field].trim(); + data[field] = sanitize(data[field]).escape(); + if (field === 'email') { var gravatarpicture = User.createGravatarURLFromEmail(data[field]); User.setUserField(uid, 'gravatarpicture', gravatarpicture); @@ -265,6 +271,10 @@ var bcrypt = require('bcrypt'), return; } else if (field === 'signature') { data[field] = utils.strip_tags(data[field]); + } else if (field === 'website') { + if(data[field].substr(0, 7) !== 'http://' && data[field].substr(0, 8) !== 'https://') { + data[field] = 'http://' + data[field]; + } } User.setUserField(uid, field, data[field]); From 156950ac2fae363cf2b960e048c2a56db5d24b57 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 22 Nov 2013 14:51:45 -0500 Subject: [PATCH 3/6] cleaned up app.createNewPosts --- public/src/app.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index b30465eb55..02ded35449 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -372,18 +372,14 @@ var socket, var html = templates.prepare(templates['topic'].blocks['posts']).parse(data); translator.translate(html, function(translatedHTML) { - var uniqueid = new Date().getTime(), - tempContainer = jQuery('
') - .appendTo("#post-container") - .hide() - .append(translatedHTML) - .fadeIn('slow'); + $(translatedHTML).appendTo("#post-container") + .hide() + .fadeIn('slow'); for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) { socket.emit('api:post.privileges', data.posts[x].pid); } - tempContainer.replaceWith(tempContainer.contents()); app.infiniteLoaderActive = false; app.populate_online_users(); From 7d3adb9275673e129d64a83e78aa90166c85e570 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 22 Nov 2013 15:01:00 -0500 Subject: [PATCH 4/6] removed unused stuff from getLatestTopics and recent.tpl --- public/templates/recent.tpl | 5 ++--- src/topics.js | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl index 20fc857660..92d241d592 100644 --- a/public/templates/recent.tpl +++ b/public/templates/recent.tpl @@ -1,7 +1,6 @@
  1. Home
    2. -
  2. {category_name}
    3. -
    +
  3. Recent
    @@ -21,7 +20,7 @@
    -
    +
    • diff --git a/src/topics.js b/src/topics.js index 171d204cc1..6f210b25dd 100644 --- a/src/topics.js +++ b/src/topics.js @@ -226,12 +226,7 @@ var RDB = require('./redis.js'), } var latestTopics = { - 'category_name': 'Recent', - 'show_sidebar': 'hidden', - 'show_topic_button': 'hidden', 'no_topics_message': 'hidden', - 'topic_row_size': 'col-md-12', - 'category_id': false, 'topics': [] }; From d02bd72764f825be76e2fa6bb9cf87a8718a3f3d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 22 Nov 2013 15:32:15 -0500 Subject: [PATCH 5/6] closes #535 --- public/templates/header.tpl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/public/templates/header.tpl b/public/templates/header.tpl index faf0d80928..fa3fb89c15 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -116,7 +116,17 @@