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

public/src/forum/admin/users.js

@@ -64,6 +64,39 @@ define(function() {
 			});
 		}
 
+		function handleUserCreate() {
+			$('#createUser').on('click', function() {
+				$('#create-modal').modal('show');
+			});
+
+			$('#create-modal-go').on('click', function() {
+				var username = $('#create-user-name').val(),
+					email = $('#create-user-email').val(),
+					password = $('#create-user-password').val(),
+					passwordAgain = $('#create-user-password-again').val(),
+					errorEl = $('#create-modal-error');
+
+				if(password !== passwordAgain) {
+					return errorEl.html('<strong>Error</strong><p>Passwords must match!</p>').removeClass('hide');
+				}
+
+				var user = {
+					username: username,
+					email: email,
+					password: password
+				};
+
+				socket.emit('api:admin.user.createUser', user, function(err, data) {
+					if(err) {
+						return errorEl.html('<strong>Error</strong><p>' + err + '</p>').removeClass('hide');
+					}
+					$('#create-modal').modal('hide');
+					app.alertSuccess('User created!');
+				});
+
+			});
+		}
+
 
 		jQuery('document').ready(function() {
 
@@ -99,6 +132,8 @@ define(function() {
 
 			initUsers();
 
+			handleUserCreate();
+
 			socket.removeAllListeners('api:admin.user.search');
 
 			socket.on('api:admin.user.search', function(data) {

public/src/forum/register.js

@@ -41,11 +41,12 @@ define(function() {
 
 			if (!utils.isEmailValid(emailEl.val())) {
 				showError(email_notify, 'Invalid email address.');
-			} else
+			} else {
 				socket.emit('user.email.exists', {
 					email: emailEl.val()
 				});
 			}
+		}
 
 		emailEl.on('blur', function() {
 			validateEmail();

public/templates/admin/settings.tpl

@@ -77,6 +77,11 @@
 <form>
 	<h3>User Settings</h3>
 	<div class="alert alert-warning">
+		<div class="checkbox">
+			<label>
+				<input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong>
+			</label>
+		</div>
 		<strong>Minimum Username Length</strong><br />
 		<input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br />
 		<strong>Maximum Username Length</strong><br />

public/templates/admin/users.tpl

@@ -1,4 +1,6 @@
 <h1>Users</h1>
+
+<button id="createUser" class="btn btn-primary">Create User</button>
 <hr />
 <ul class="nav nav-pills">
 	<li class='active'><a href='/admin/users/latest'>Latest Users</a></li>
@@ -38,6 +40,47 @@
 	<!-- END users -->
 </ul>
 
+<div class="modal fade" id="create-modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h4 class="modal-title">Create User</h4>
+			</div>
+			<div class="modal-body">
+				<div class="alert alert-danger hide" id="create-modal-error"></div>
+				<form>
+					<div class="form-group">
+						<label for="group-name">User Name</label>
+						<input type="text" class="form-control" id="create-user-name" placeholder="User Name" />
+					</div>
+					<div class="form-group">
+						<label for="group-name">Email</label>
+						<input type="text" class="form-control" id="create-user-email" placeholder="Email of this user" />
+					</div>
+
+					<div class="form-group">
+						<label for="group-name">Password</label>
+						<input type="password" class="form-control" id="create-user-password" placeholder="Password" />
+					</div>
+
+					<div class="form-group">
+						<label for="group-name">Password Confirm</label>
+						<input type="password" class="form-control" id="create-user-password-again" placeholder="Password" />
+					</div>
+
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+				<button type="button" class="btn btn-primary" id="create-modal-go">Create</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+
 <div class="text-center {loadmore_display}">
 	<button id="load-more-users-btn" class="btn btn-primary">Load More</button>
 </div>

public/templates/header.tpl

@@ -51,16 +51,16 @@
 			<div class="navbar-collapse collapse navbar-ex1-collapse">
 				<ul id="main-nav" class="nav navbar-nav">
 					<li>
-						<a href="/recent">[[global:header.recent]]</a>
+						<a href="/recent"><i class="fa fa-clock-o" title="[[global:header.recent]]"></i></a>
 					</li>
 					<li class="nodebb-loggedin">
-						<a href="/unread"><span id="numUnreadBadge" class="badge badge-inverse">0</span> [[global:header.unread]]</a>
+						<a href="/unread"><i class="fa fa-envelope" title="[[global:header.unread]]"> <span id="numUnreadBadge" class="">0</span></i></a>
 					</li>
 					<li>
-						<a href="/users">[[global:header.users]]</a>
+						<a href="/users"><i class="fa fa-users" title="[[global:header.users]]"></i></a>
 					</li>
 					<li class="{adminDisplay}">
-						<a href="/admin"><i class="fa fa-cogs"></i> [[global:header.admin]]</a>
+						<a href="/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a>
 					</li>
 					<li class="visible-xs">
 						<a href="/search">[[global:header.search]]</a>
@@ -112,9 +112,11 @@
 				</ul>
 
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
+					<!-- IF allowRegistration -->
 					<li class="visible-lg visible-md visible-sm">
 						<a href="/register">[[global:register]]</a>
 					</li>
+					<!-- ENDIF allowRegistration -->
 					<li class="visible-lg visible-md visible-sm">
 						<a href="/login">[[global:login]]</a>
 					</li>

src/admin/user.js

@@ -4,6 +4,21 @@ var utils = require('../../public/src/utils'),
 
 (function(UserAdmin) {
 
+	UserAdmin.createUser = function(uid, userData, callback) {
+		user.isAdministrator(uid, function(err, isAdmin) {
+			if (isAdmin) {
+				user.create(userData.username, userData.password, userData.email, function(err) {
+					if(err) {
+						return callback(err.message);
+					}
+					callback(null);
+				});
+			} else {
+				callback(new Error('You are not an administrator'));
+			}
+		});
+	}
+
 	UserAdmin.makeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(err, isAdmin) {
 			if (isAdmin) {

src/install.js

@@ -209,6 +209,9 @@ var async = require('async'),
 						}, {
 							field: 'allowGuestSearching',
 							value: 0
+						}, {
+							field: 'allowRegistration',
+							value: 1
 						}, {
 							field: 'minimumTitleLength',
 							value: 3

src/postTools.js

@@ -87,7 +87,12 @@ var winston = require('winston'),
 					posts.getPostField(pid, 'tid', function(err, tid) {
 						PostTools.isMain(pid, tid, function(err, isMainPost) {
 							if (isMainPost) {
+								title = title.trim();
+								var slug = tid + '/' + utils.slugify(title);
+
 								topics.setTopicField(tid, 'title', title);
+								topics.setTopicField(tid, 'slug', slug);
+
 								db.searchRemove('topic', tid, function() {
 									db.searchIndex('topic', title, tid);
 								});

src/routes/api.js

@@ -37,6 +37,7 @@ var path = require('path'),
 				config.maximumSignatureLength = meta.config.maximumSignatureLength;
 				config.useOutgoingLinksPage = meta.config.useOutgoingLinksPage;
 				config.allowGuestPosting = meta.config.allowGuestPosting;
+				config.allowRegistration = meta.config.allowRegistration || '1';
 				config.emailSetup = !!meta.config['email:from'];
 
 				res.json(200, config);

src/routes/authentication.js

@@ -193,6 +193,10 @@
 		});
 
 		app.post('/register', function(req, res) {
+			if(parseInt(meta.config.allowRegistration, 10) === 0) {
+				return res.send(403);
+			}
+
 			user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
 				if (err === null && uid) {
 					req.login({

src/webserver.js

@@ -98,7 +98,8 @@ var path = require('path'),
 					link_tags: linkTags,
 					clientScripts: clientScripts,
 					navigation: custom_header.navigation,
-					'cache-buster': meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : ''
+					'cache-buster': meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '',
+					allowRegistration: parseInt(meta.config.allowRegistration, 10) === 1
 				};
 
 			var uid = '0';
@@ -389,6 +390,8 @@ var path = require('path'),
 							res.redirect('/user/' + userslug);
 						});
 						return;
+					} else if(route === 'register' && parseInt(meta.config.allowRegistration, 10) === 0) {
+						return res.redirect('/403');
 					} else if (loginRequired.indexOf(route) !== -1 && !req.user) {
 						return res.redirect('/403');
 					}

src/websockets.js

@@ -623,10 +623,10 @@ websockets.init = function(io) {
 					timeout: 2000
 				});
 				return;
-			} else if (!data.title || data.title.length < topics.minimumTitleLength) {
+			} else if (!data.title || data.title.length < parseInt(meta.config.minimumTitleLength, 10)) {
 				topics.emitTitleTooShortAlert(socket);
 				return;
-			} else if (!data.content || data.content.length < require('../public/config.json').minimumPostLength) {
+			} else if (!data.content || data.content.length < parseInt(meta.config.minimumPostLength, 10)) {
 				posts.emitContentTooShortAlert(socket);
 				return;
 			}
@@ -960,9 +960,10 @@ websockets.init = function(io) {
 			}
 		});
 
-		socket.on('api:admin.user.deleteUser', function(theirid) {
+		socket.on('api:admin.user.createUser', function(user, callback) {
+			console.log('heeerp');
 			if (uid && uid > 0) {
-				admin.user.deleteUser(uid, theirid, socket);
+				admin.user.createUser(uid, user, callback);
 			}
 		});