committing hotfix to registration

v1.18.x
Julian Lam 12 years ago
parent dec9a3bef9
commit 7f77ec2c5f

@ -638,7 +638,7 @@ footer.footer {
.category-row h4 { .category-row h4 {
font-weight: 700; font-weight: 700;
text-align: left; text-align: left;
color: #555; /*color: #555;*/
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

@ -6,6 +6,7 @@
<meta name="title" CONTENT="NodeBB"> <meta name="title" CONTENT="NodeBB">
<meta name="description" content="Node.js/Redis/Socket.io powered forums for a new generation"> <meta name="description" content="Node.js/Redis/Socket.io powered forums for a new generation">
<link href="/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen"> <link href="/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<!-- <link href="{cssSrc}" rel="stylesheet" media="screen"> -->
<link href="/vendor/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen"> <link href="/vendor/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="/vendor/fontawesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/vendor/fontawesome/css/font-awesome.min.css">
<script type="text/javascript" src="http://code.jquery.com/jquery.js"></script> <script type="text/javascript" src="http://code.jquery.com/jquery.js"></script>

@ -355,6 +355,7 @@ var utils = require('./../public/src/utils.js'),
} }
User.sendConfirmationEmail = function (email) { User.sendConfirmationEmail = function (email) {
if (global.config['email:host'] && global.config['email:port'] && global.config['email:from']) {
var confirm_code = utils.generateUUID(), var confirm_code = utils.generateUUID(),
confirm_link = config.url + 'confirm/' + confirm_code, confirm_link = config.url + 'confirm/' + confirm_code,
confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({'CONFIRM_LINK': confirm_link}) + global.templates['emails/footer'], confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({'CONFIRM_LINK': confirm_link}) + global.templates['emails/footer'],
@ -389,6 +390,7 @@ var utils = require('./../public/src/utils.js'),
console.log(err); console.log(err);
}); });
} }
}
User.addFriend = function(uid, friendid, callback) { User.addFriend = function(uid, friendid, callback) {
RDB.sadd('user:'+uid+':friends', friendid, function(err, data){ RDB.sadd('user:'+uid+':friends', friendid, function(err, data){

@ -85,7 +85,10 @@ var express = require('express'),
return; return;
} }
res.send(templates['header'] + app.create_route(route) + templates['footer']); res.send(
templates['header'].parse({ cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css' }) +
app.create_route(route) + templates['footer']
);
}); });
}(routes[i])); }(routes[i]));
} }

Loading…
Cancel
Save