* merge cnodeclub to nodeclub;

* add more settings for custom site;
* fixed upload.js not worked bug;

Author: fengmk2

.gitignore

@@ -0,0 +1,2 @@
+config.js
+node_modules

README.md

@@ -1,34 +1,47 @@
-##Node Club
-
-###### 介绍
-Node Club 是用 **Node.js** 和 **MongoDb** 开发的新型社区软件，界面优雅，功能丰富，小巧迅速，已在Node.js 中文技术社区 [CNode](http://cnodejs.org) 得到应用，但你完全可以用它搭建自己的社区。
-
-###### 安装部署
-    // install node npm mongodb  
-    // run mongod
-    cd nodeclub
-    npm install ./
-    cp config.default.js config.js
-    // modify the config file as yours
-    node app.js
+# nodeclub
+
+基于nodejs的社区系统
+
+## 介绍
+
+Node Club 是用 **Node.js** 和 **MongoDb** 开发的新型社区软件，界面优雅，功能丰富，小巧迅速，
+已在Node.js 中文技术社区 [CNode](http://cnodejs.org) 得到应用，但你完全可以用它搭建自己的社区。
+
+## 安装部署
+
+```
+// install node npm mongodb  
+// run mongod
+cd nodeclub
+npm install ./
+cp config.default.js config.js
+// modify the config file as yours
+node app.js
+```
 
-###### 其它
+## 其它
+
 小量修改了两个依赖模块：node-markdown，express
 
-   1.node-markdown/lib/markdown.js  
-   allowedTags 添加：
-   
-    embed  //支持 flash 视频
-    table|thead|tbody|tr|td|th|caption  //支持表格
-   
-   
-   allowedAttributes 添加：
-   
-    embed:'src|quality|width|height|align|allowScriptAccess|allowFullScreen|mode|type'
-    table: 'class'
-       
-   2.express/node_modules/connect/lib/middleware/csrf.js 添加：
+* node-markdown/lib/markdown.js  
+
+allowedTags 添加：
+
+```   
+embed  //支持 flash 视频
+table|thead|tbody|tr|td|th|caption  //支持表格
+```
 
-    if (req.xhr === true) return next();
-    if (req.body.user_action && req.body.user_action == 'upload_image') return next();
-  
+allowedAttributes 添加：
+
+```   
+embed:'src|quality|width|height|align|allowScriptAccess|allowFullScreen|mode|type'
+table: 'class'
+```
+
+* express/node_modules/connect/lib/middleware/csrf.js 添加：
+
+```
+if (req.body && req.body.user_action === 'upload_image') return next();
+```
+

app.js

@@ -1,46 +1,62 @@
-var express = require('express'),
-	routes = require('./routes'),
-	config = require('./config').config;
+/*!
+ * nodeclub - app.js
+ */
 
-var app = express.createServer();
+/**
+ * Module dependencies.
+ */
+
+var path = require('path');
+var express = require('express');
+var routes = require('./routes');
+var config = require('./config').config;
 
-var static_dir = __dirname+'/public';
+var app = express.createServer();
 
 // configuration in all env
-app.configure(function(){
+app.configure(function() {
+	var viewsRoot = path.join(__dirname, 'views');
 	app.set('view engine', 'html');
-	app.set('views', __dirname + '/views');
-	app.register('.html',require('ejs'));
+	app.set('views', viewsRoot);
+	app.register('.html', require('ejs'));
 	app.use(express.bodyParser());
 	app.use(express.cookieParser());
 	app.use(express.session({
-		secret:config.session_secret,
+		secret: config.session_secret,
 	}));
 	// custom middleware
 	app.use(routes.auth_user);
 	app.use(express.csrf());
+
+	// plugins
+	var plugins = config.plugins || [];
+	for (var i = 0, l = plugins.length; i < l; i++) {
+		var p = plugins[i];
+		app.use(require('./plugins/' + p[0])(p[1]));
+	}
 });
 
-//set static,dynamic helpers
+// set static, dynamic helpers
 app.helpers({
-	config:config
+	config: config
 });
 app.dynamicHelpers({
-	csrf: function(req,res){
+	csrf: function(req,res) {
 		return req.session ? req.session._csrf : '';
 	},
 });
 
+var static_dir = path.join(__dirname, 'public');
 app.configure('development', function(){
 	app.use(express.static(static_dir));
 	app.use(express.errorHandler({ dumpExceptions: true, showStack: true })); 
 });
 
 app.configure('production', function(){
-	var one_year=1000*60*60*24*365;
-	app.use(express.static(static_dir,{maxAge:one_year}));
+	var maxAge = 3600000 * 24 * 30;
+	app.use(express.static(static_dir, { maxAge: maxAge }));
 	app.use(express.errorHandler()); 
-	app.set('view cache',true);
+	app.set('view cache', true);
 });
 
 // routes

config.default.js

@@ -5,12 +5,23 @@
 exports.config = {
 	name: 'Node Club',
 	description: 'Node Club 是用Node.js开发的社区软件',
-	host: 'http://127.0.0.1', //host 结尾不要添加'/'
+	version: '0.2.0',
+
+	// site settings
+	site_headers: [
+		'<meta name="author" content="慕远@TaoBao" />',
+	],
+	host: 'http://127.0.0.1', // host 结尾不要添加'/'
+	site_logo: '', // default is `name`
+	site_navs: [
+		// [ path, title, [target=''] ]
+		[ '/about', '关于' ],
+	],
+
 	db: 'mongodb://127.0.0.1/node_club',
 	session_secret: 'node_club',
 	auth_cookie_name: 'node_club',
 	port: 80,
-	version: '0.0.1',
 
 	// 话题列表显示的话题数量
 	list_topic_count: 20,
@@ -26,8 +37,14 @@ exports.config = {
 	//weibo app key
 	weibo_key: 10000000,
 
-	// admins
 	// admin 可删除话题，编辑标签，设某人为达人
-	admins: {admin:true, obama:true}
+	admins: { admin: true },
+
+	// [ [ plugin_name, options ], ... ]
+	plugins: []
 };
 
+var host = exports.config.host;
+if (host[host.length - 1] === '/') {
+	exports.config.host = host.substring(0, host.length - 1)
+}

controllers/tools.js

@@ -10,3 +10,28 @@ var EventProxy = require('eventproxy').EventProxy;
 exports.run_site_tools = function(req,res,next){
 	res.send('<h3>The White Castle</h3>');
 };
+
+// exports.reset_data = function(req,res,next){
+// 	Topic.find({},function(err,topics){
+// 		for(var i=0; i<topics.length; i++){
+// 			var topic = topics[i];
+// 			if(topic){
+// 				topic.reply_count = 0;
+// 				topic.save();
+// 			}
+// 		}
+// 	});	
+// 	res.end('end');
+// };
+
+// exports.cal_data = function(req,res,next){
+// 	Reply.find({},function(err,replies){
+// 		for(var i=0; i<replies.length; i++){
+// 			var reply = replies[i];
+// 			if(reply.topic_id){
+// 				Topic.update({_id:reply.topic_id},{$inc:{reply_count:1}}).exec();	
+// 			}
+// 		}
+// 	});
+// 	res.end('end');
+// };

controllers/upload.js

@@ -1,18 +1,17 @@
 var fs = require('fs');
 var path = require('path');
-var config = require('../config').config;
 var EventProxy = require('eventproxy').EventProxy;
 
 var mod = require('express/node_modules/connect/node_modules/formidable');
-var upload_path = process.cwd() + '/public/user_data/images/';
+var upload_path = path.join(path.dirname(__dirname), 'public/user_data/images');
 mod.IncomingForm.UPLOAD_DIR = upload_path;
 
-exports.upload_image = function(req,res,next) {
+exports.upload_image = function(req, res, next) {
 	if (!req.session || !req.session.user) {
 		res.send('forbidden!');
 		return;
 	}
-
+	var host = req.headers.host;
 	var file = req.files.userfile;
 	// sould use async
 	if (file) {
@@ -22,34 +21,35 @@ exports.upload_image = function(req,res,next) {
 		var time = new Date().getTime();
 		var new_name = uid + time + ext;
 		var proxy = new EventProxy();
+		var userDir = path.join(upload_path, uid);
 		function ensureDir() {
-			path.exists(upload_path + uid, function(exists) {
+			path.exists(userDir, function(exists) {
 				if (!exists) {
-					fs.mkdir(upload_path + uid, function(err) {
+					fs.mkdir(userDir, function(err) {
 						if (err) {
 							return next(err);
 						}
 						proxy.emit('ensureDir');
-					})
+					});
 				} else {
 					proxy.emit('ensureDir');
 				}
-			})
+			});
 		}
 		function moveImg() {
-			var new_path = upload_path + uid +'/' +new_name;
-			fd.rename(file.path, new_path, function(err) {
+			var new_path = path.join(userDir, new_name);
+			fs.rename(file.path, new_path, function(err) {
 				if (err) {
 					return next(err);
 				}
-				var url = config.host + '/user_data/images/'+ uid + '/' +new_name;
-				res.json({status:'success',url: url});
-			})
+				var url = 'http://' + host + '/user_data/images/' + uid + '/' + new_name;
+				res.json({ status: 'success', url: url });
+			});
 		}
 		proxy.once('ensureDir', moveImg);
 		ensureDir();
 	} else {
-		res.json({status:'failed'});
+		res.json({ status: 'failed' });
 		return;
 	}
 };