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

#4154

Browse Source
This commit is contained in:
barisusakli
2016-02-13 09:35:48 +02:00
parent 414762d382
commit 2fd121dc15
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/groups.js
View File

@@ -241,8 +241,8 @@ var utils = require('../public/src/utils');
if (group) { if (group) {
group.nameEncoded = encodeURIComponent(group.name); group.nameEncoded = encodeURIComponent(group.name);
group.displayName = validator.escape(group.name); group.displayName = validator.escape(group.name);
group.description = validator.escape(group.description); group.description = validator.escape(group.description || '');
group.userTitle = validator.escape(group.userTitle) || group.displayName; group.userTitle = validator.escape(group.userTitle || '') || group.displayName;
} }
}; };

57
src/search.js
View File

@@ -1,45 +1,44 @@
'use strict'; 'use strict';
var async = require('async'), var async = require('async');
validator = require('validator'), var validator = require('validator');
db = require('./database'), var db = require('./database');
posts = require('./posts'), var posts = require('./posts');
topics = require('./topics'), var topics = require('./topics');
categories = require('./categories'), var categories = require('./categories');
user = require('./user'), var user = require('./user');
plugins = require('./plugins'), var plugins = require('./plugins');
privileges = require('./privileges'), var privileges = require('./privileges');
utils = require('../public/src/utils'); var utils = require('../public/src/utils');
var search = {}; var search = {};
module.exports = search; module.exports = search;
search.search = function(data, callback) { search.search = function(data, callback) {
function done(err, result) {
if (err) {
return callback(err);
}
result.search_query = validator.escape(data.query);
result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2);
callback(null, result);
}
var start = process.hrtime(); var start = process.hrtime();
var searchIn = data.searchIn || 'titlesposts'; var searchIn = data.searchIn || 'titlesposts';
if (searchIn === 'posts' || searchIn === 'titles' || searchIn === 'titlesposts') { async.waterfall([
searchInContent(data, done); function (next) {
} else if (searchIn === 'users') { if (searchIn === 'posts' || searchIn === 'titles' || searchIn === 'titlesposts') {
user.search(data, done); searchInContent(data, next);
} else if (searchIn === 'tags') { } else if (searchIn === 'users') {
topics.searchAndLoadTags(data, done); user.search(data, next);
} else { } else if (searchIn === 'tags') {
callback(new Error('[[error:unknown-search-filter]]')); topics.searchAndLoadTags(data, next);
} } else {
next(new Error('[[error:unknown-search-filter]]'));
}
},
function (result, next) {
result.search_query = validator.escape(data.query || '');
result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2);
next(null, result);
}
], callback);
}; };
function searchInContent(data, callback) { function searchInContent(data, callback) {