Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 23:52:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2014-01-14 17:03:13 -05:00
parent 442c543d27 8c5a458798
commit facacc65aa
6 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/forum/category.js
View File

@@ -4,25 +4,27 @@ define(['composer'], function(composer) {
Category.init = function() {
var cid = templates.get('category_id'),
categoryName = templates.get('category_name'),
twitterEl = jQuery('#twitter-intent'),
facebookEl = jQuery('#facebook-share'),
googleEl = jQuery('#google-share'),
twitter_url = templates.get('twitter-intent-url'),
facebook_url = templates.get('facebook-share-url'),
google_url = templates.get('google-share-url');
categoryUrl = encodeURIComponent(window.location.href),
twitterUrl = "https://twitter.com/intent/tweet?url=" + categoryUrl + "&text=" + encodeURIComponent(categoryName),
facebookUrl = "https://www.facebook.com/sharer/sharer.php?u=" + categoryUrl,
googleUrl = "https://plus.google.com/share?url=" + categoryUrl;
app.enterRoom('category_' + cid);
twitterEl.on('click', function () {
window.open(twitter_url, '_blank', 'width=550,height=420,scrollbars=no,status=no');
window.open(twitterUrl, '_blank', 'width=550,height=420,scrollbars=no,status=no');
return false;
});
facebookEl.on('click', function () {
window.open(facebook_url, '_blank', 'width=626,height=436,scrollbars=no,status=no');
window.open(facebookUrl, '_blank', 'width=626,height=436,scrollbars=no,status=no');
return false;
});
googleEl.on('click', function () {
window.open(google_url, '_blank', 'width=500,height=570,scrollbars=no,status=no');
window.open(googleUrl, '_blank', 'width=500,height=570,scrollbars=no,status=no');
return false;
});

4
public/templates/category.tpl
View File

@@ -118,6 +118,4 @@
</div>
<input type="hidden" template-variable="category_id" value="{category_id}" />
<input type="hidden" template-variable="twitter-intent-url" value="{twitter-intent-url}" />
<input type="hidden" template-variable="facebook-share-url" value="{facebook-share-url}" />
<input type="hidden" template-variable="google-share-url" value="{google-share-url}" />
<input type="hidden" template-variable="category_name" value="{category_name}" />

3
public/templates/topic.tpl
View File

@@ -5,9 +5,6 @@
<input type="hidden" template-variable="pinned" value="{pinned}" />
<input type="hidden" template-variable="topic_name" value="{topic_name}" />
<input type="hidden" template-variable="postcount" value="{postcount}" />
<input type="hidden" template-variable="twitter-intent-url" value="{twitter-intent-url}" />
<input type="hidden" template-variable="facebook-share-url" value="{facebook-share-url}" />
<input type="hidden" template-variable="google-share-url" value="{google-share-url}" />
<div class="topic">

21
src/categories.js
View File

@@ -82,9 +82,6 @@ var db = require('./database.js'),
'active_users': [],
'topics': [],
'disableSocialButtons': meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false,
'twitter-intent-url': 'https://twitter.com/intent/tweet?url=' + encodeURIComponent(nconf.get('url') + 'category/' + categoryData.slug) + '&text=' + encodeURIComponent(categoryData.name),
'facebook-share-url': 'https://www.facebook.com/sharer/sharer.php?u=' + encodeURIComponent(nconf.get('url') + 'category/' + categoryData.slug),
'google-share-url': 'https://plus.google.com/share?url=' + encodeURIComponent(nconf.get('url') + 'category/' + categoryData.slug),
'sidebars': sidebars
};
@@ -397,8 +394,8 @@ var db = require('./database.js'),
};
Categories.moveActiveUsers = function(tid, oldCid, cid, callback) {
function updateUser(uid) {
Categories.addActiveUser(cid, uid, Date.now());
function updateUser(uid, timestamp) {
Categories.addActiveUser(cid, uid, timestamp);
Categories.isUserActiveIn(oldCid, uid, function(err, active) {
if (!err && !active) {
@@ -407,11 +404,15 @@ var db = require('./database.js'),
});
}
topics.getUids(tid, function(err, uids) {
if (!err && uids) {
for (var i = 0; i < uids.length; ++i) {
updateUser(uids[i]);
}
topics.getTopicField(tid, 'timestamp', function(err, timestamp) {
if(!err) {
topics.getUids(tid, function(err, uids) {
if (!err && uids) {
for (var i = 0; i < uids.length; ++i) {
updateUser(uids[i], timestamp);
}
}
});
}
});
};

3
src/routes/admin.js
View File

@@ -19,7 +19,8 @@ var nconf = require('nconf'),
Admin.isAdmin = function (req, res, next) {
user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
if (!isAdmin) {
res.redirect(403, '/403');
res.status(403);
res.redirect('/403');
} else {
next();
}

6
src/threadTools.js
View File

@@ -188,11 +188,7 @@ var winston = require('winston'),
}
});
categories.moveActiveUsers(tid, oldCid, cid, function(err, data) {
if (err) {
winston.err(err);
}
});
categories.moveActiveUsers(tid, oldCid, cid);
categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1);
categories.incrementCategoryFieldBy(cid, 'topic_count', 1);