Merge branch 'master' of github.com:designcreateplay/NodeBB

package.json

@@ -1,64 +1,72 @@
 {
-	"name": "nodebb",
+  "name": "nodebb",
-	"license": "GPLv3 or later",
+  "license": "GPLv3 or later",
-	"description": "NodeBB Forum",
+  "description": "NodeBB Forum",
-	"version": "0.0.6",
+  "version": "0.0.6",
-	"homepage": "http://www.nodebb.org",
+  "homepage": "http://www.nodebb.org",
-	"repository": {
+  "repository": {
-		"type": "git",
+    "type": "git",
-		"url": "https://github.com/designcreateplay/NodeBB/"
+    "url": "https://github.com/designcreateplay/NodeBB/"
-	},
+  },
-	"main": "app.js",
+  "main": "app.js",
-	"dependencies": {
+  "dependencies": {
-		"socket.io": "~0.9.16",
+    "socket.io": "~0.9.16",
-		"redis": "0.8.3",
+    "redis": "0.8.3",
-		"express": "3.2.0",
+    "express": "3.2.0",
-		"express-namespace": "0.1.1",
+    "express-namespace": "0.1.1",
-		"emailjs": "0.3.4",
+    "emailjs": "0.3.4",
-		"cookie": "0.0.6",
+    "cookie": "0.0.6",
-		"connect-redis": "1.4.5",
+    "connect-redis": "1.4.5",
-		"passport": "0.1.17",
+    "passport": "0.1.17",
-		"passport-local": "0.1.6",
+    "passport-local": "0.1.6",
-		"passport-twitter": "0.1.5",
+    "passport-twitter": "0.1.5",
-		"passport-google-oauth": "0.1.5",
+    "passport-google-oauth": "0.1.5",
-		"passport-facebook": "0.1.5",
+    "passport-facebook": "0.1.5",
-		"less-middleware": "0.1.12",
+    "less-middleware": "0.1.12",
-		"marked": "0.2.8",
+    "marked": "0.2.8",
-		"bcrypt": "0.7.5",
+    "bcrypt": "0.7.5",
-		"async": "0.2.8",
+    "async": "0.2.8",
-		"node-imagemagick": "0.1.8",
+    "node-imagemagick": "0.1.8",
-		"gravatar": "1.0.6",
+    "gravatar": "1.0.6",
-		"nconf": "~0.6.7",
+    "nconf": "~0.6.7",
-		"sitemap": "~0.6.0",
+    "sitemap": "~0.6.0",
-		"request": "~2.25.0",
+    "cheerio": "~0.12.0",
-		"reds": "~0.2.4",
+    "request": "~2.25.0",
-		"winston": "~0.7.2",
+    "reds": "~0.2.4",
-		"nodebb-plugin-mentions": "~0.1.0",
+    "winston": "~0.7.2",
-		"nodebb-plugin-markdown": "~0.1.0",
+    "nodebb-plugin-mentions": "~0.1.0",
-		"rss": "~0.2.0",
+    "nodebb-plugin-markdown": "~0.1.0",
-		"prompt": "~0.2.11",
+    "rss": "~0.2.0",
-		"uglify-js": "~2.4.0"
+    "prompt": "~0.2.11",
-	},
+    "uglify-js": "~2.4.0",
-	"bugs": {
+    "validator": "~1.5.1"
-		"url": "https://github.com/designcreateplay/NodeBB/issues"
+  },
-	},
+  "bugs": {
-	"engines": {
+    "url": "https://github.com/designcreateplay/NodeBB/issues"
-		"node": ">=0.8"
+  },
-	},
+  "engines": {
-	"contributors": [{
+    "node": ">=0.8"
-		"name": "Andrew Rodrigues",
+  },
-		"email": "andrew@designcreateplay.com"
+  "contributors": [
-	}, {
+    {
-		"name": "Julian Lam",
+      "name": "Andrew Rodrigues",
-		"email": "julian@designcreateplay.com"
+      "email": "andrew@designcreateplay.com"
-	}, {
+    },
-		"name": "Barış Soner Uşaklı",
+    {
-		"email": "baris@designcreateplay.com"
+      "name": "Julian Lam",
-	}, {
+      "email": "julian@designcreateplay.com"
-		"name": "Damian Bushong",
+    },
-		"url": "https://github.com/damianb"
+    {
-	}, {
+      "name": "Barış Soner Uşaklı",
-		"name": "Matt Smith",
+      "email": "baris@designcreateplay.com"
-		"url": "https://github.com/soimafreak"
+    },
-	}]
+    {
+      "name": "Damian Bushong",
+      "url": "https://github.com/damianb"
+    },
+    {
+      "name": "Matt Smith",
+      "url": "https://github.com/soimafreak"
+    }
+  ]
 }

src/topics.js

@@ -12,7 +12,8 @@ schema = require('./schema.js'),
 	feed = require('./feed.js'),
 	favourites = require('./favourites.js'),
 	reds = require('reds'),
-	topicSearch = reds.createSearch('nodebbtopicsearch');
+	topicSearch = reds.createSearch('nodebbtopicsearch'),
+	validator = require('validator');
 
 
 (function(Topics) {
@@ -655,7 +656,7 @@ schema = require('./schema.js'),
 
 				var slug = tid + '/' + utils.slugify(title);
 				var timestamp = Date.now();
-
+				title = validator.sanitize(title).escape();
 				RDB.hmset('topic:' + tid, {
 					'tid': tid,
 					'uid': uid,