summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--server.js104
-rw-r--r--tools/sql/data.txt2
-rw-r--r--views/change_about.pug2
-rw-r--r--views/change_mail.pug2
-rw-r--r--views/change_name.pug2
-rw-r--r--views/change_password.pug2
-rw-r--r--views/forgot_password.pug2
-rw-r--r--views/login.pug2
-rw-r--r--views/profile.pug8
-rw-r--r--views/reset_password.pug2
10 files changed, 64 insertions, 64 deletions
diff --git a/server.js b/server.js
index d39a14e..df93c70 100644
--- a/server.js
+++ b/server.js
@@ -362,13 +362,13 @@ app.post('/signup',
})
);
-app.get('/forgot_password', function (req, res) {
- LOG(req, "GET /forgot_password");
+app.get('/forgot-password', function (req, res) {
+ LOG(req, "GET /forgot-password");
res.render('forgot_password.pug', { user: req.user, flash: req.flash('message') });
});
-app.post('/forgot_password', function (req, res) {
- LOG(req, "POST /forgot_password");
+app.post('/forgot-password', function (req, res) {
+ LOG(req, "POST /forgot-password");
let mail = req.body.mail;
let user = SQL_SELECT_LOGIN_BY_MAIL.get(mail);
if (user) {
@@ -378,47 +378,47 @@ app.post('/forgot_password', function (req, res) {
mail_password_reset_token(user, token);
}
req.flash('message', "A password reset token has been sent to " + mail + ".");
- return res.redirect('/reset_password/' + mail);
+ return res.redirect('/reset-password/' + mail);
}
req.flash('message', "User not found.");
- return res.redirect('/forgot_password');
+ return res.redirect('/forgot-password');
});
-app.get('/reset_password', function (req, res) {
- LOG(req, "GET /reset_password");
+app.get('/reset-password', function (req, res) {
+ LOG(req, "GET /reset-password");
res.render('reset_password.pug', { user: null, mail: "", token: "", flash: req.flash('message') });
});
-app.get('/reset_password/:mail', function (req, res) {
+app.get('/reset-password/:mail', function (req, res) {
let mail = req.params.mail;
- LOG(req, "GET /reset_password", mail);
+ LOG(req, "GET /reset-password", mail);
res.render('reset_password.pug', { user: null, mail: mail, token: "", flash: req.flash('message') });
});
-app.get('/reset_password/:mail/:token', function (req, res) {
+app.get('/reset-password/:mail/:token', function (req, res) {
let mail = req.params.mail;
let token = req.params.token;
- LOG(req, "GET /reset_password", mail, token);
+ LOG(req, "GET /reset-password", mail, token);
res.render('reset_password.pug', { user: null, mail: mail, token: token, flash: req.flash('message') });
});
-app.post('/reset_password', function (req, res) {
+app.post('/reset-password', function (req, res) {
let mail = req.body.mail;
let token = req.body.token;
let password = req.body.password;
- LOG(req, "POST /reset_password", mail, token);
+ LOG(req, "POST /reset-password", mail, token);
let user = SQL_SELECT_LOGIN_BY_MAIL.get(mail);
if (!user) {
req.flash('message', "User not found.");
- return res.redirect('/reset_password/'+mail+'/'+token);
+ return res.redirect('/reset-password/'+mail+'/'+token);
}
if (password.length < 4) {
req.flash('message', "Password is too short!");
- return res.redirect('/reset_password/'+mail+'/'+token);
+ return res.redirect('/reset-password/'+mail+'/'+token);
}
if (!SQL_VERIFY_TOKEN.get(user.user_id, token)) {
req.flash('message', "Invalid or expired token!");
- return res.redirect('/reset_password/'+mail);
+ return res.redirect('/reset-password/'+mail);
}
let salt = crypto.randomBytes(32).toString('hex');
let hash = hash_password(password, salt);
@@ -426,25 +426,25 @@ app.post('/reset_password', function (req, res) {
return res.redirect('/login');
});
-app.get('/change_password', must_be_logged_in, function (req, res) {
- LOG(req, "GET /change_password");
+app.get('/change-password', must_be_logged_in, function (req, res) {
+ LOG(req, "GET /change-password");
res.render('change_password.pug', { user: req.user, flash: req.flash('message') });
});
-app.post('/change_password', must_be_logged_in, function (req, res) {
+app.post('/change-password', must_be_logged_in, function (req, res) {
let oldpass = req.body.password;
let newpass = req.body.newpass;
- LOG(req, "POST /change_password", req.user.name);
+ LOG(req, "POST /change-password", req.user.name);
// Get full user record including password and salt
let user = SQL_SELECT_LOGIN_BY_MAIL.get(req.user.mail);
if (newpass.length < 4) {
req.flash('message', "Password is too short!");
- return res.redirect('/change_password');
+ return res.redirect('/change-password');
}
let oldhash = hash_password(oldpass, user.salt);
if (oldhash !== user.password) {
req.flash('message', "Wrong password.");
- return res.redirect('/change_password');
+ return res.redirect('/change-password');
}
let salt = crypto.randomBytes(32).toString('hex');
let hash = hash_password(newpass, salt);
@@ -469,69 +469,58 @@ app.get('/unsubscribe', must_be_logged_in, function (req, res) {
res.redirect('/profile');
});
-app.get('/change_name', must_be_logged_in, function (req, res) {
- LOG(req, "GET /change_name");
+app.get('/change-name', must_be_logged_in, function (req, res) {
+ LOG(req, "GET /change-name");
res.render('change_name.pug', { user: req.user, flash: req.flash('message') });
});
-app.post('/change_name', must_be_logged_in, function (req, res) {
+app.post('/change-name', must_be_logged_in, function (req, res) {
let newname = clean_user_name(req.body.newname);
- LOG(req, "POST /change_name", req.user, req.body, newname);
+ LOG(req, "POST /change-name", req.user, req.body, newname);
if (!is_valid_user_name(newname)) {
req.flash('message', "Invalid user name!");
- return res.redirect('/change_name');
+ return res.redirect('/change-name');
}
if (SQL_EXISTS_USER_NAME.get(newname)) {
req.flash('message', "That name is already taken!");
- return res.redirect('/change_name');
+ return res.redirect('/change-name');
}
SQL_UPDATE_USER_NAME.run(newname, req.user.user_id);
return res.redirect('/profile');
});
-app.get('/change_mail', must_be_logged_in, function (req, res) {
- LOG(req, "GET /change_mail");
+app.get('/change-mail', must_be_logged_in, function (req, res) {
+ LOG(req, "GET /change-mail");
res.render('change_mail.pug', { user: req.user, flash: req.flash('message') });
});
-app.post('/change_mail', must_be_logged_in, function (req, res) {
+app.post('/change-mail', must_be_logged_in, function (req, res) {
let newmail = req.body.newmail;
- LOG(req, "POST /change_mail", req.user, req.body);
+ LOG(req, "POST /change-mail", req.user, req.body);
if (!is_email(newmail)) {
req.flash('message', "Invalid mail address!");
- return res.redirect('/change_mail');
+ return res.redirect('/change-mail');
}
if (SQL_EXISTS_USER_MAIL.get(newmail)) {
req.flash('message', "That mail address is already taken!");
- return res.redirect('/change_mail');
+ return res.redirect('/change-mail');
}
SQL_UPDATE_USER_MAIL.run(newmail, req.user.user_id);
return res.redirect('/profile');
});
-app.get('/change_about', must_be_logged_in, function (req, res) {
- LOG(req, "GET /change_about");
+app.get('/change-about', must_be_logged_in, function (req, res) {
+ LOG(req, "GET /change-about");
let about = SQL_SELECT_USER_PROFILE.get(req.user.name).about;
res.render('change_about.pug', { user: req.user, about: about || "" });
});
-app.post('/change_about', must_be_logged_in, function (req, res) {
- LOG(req, "POST /change_about", req.user.name);
+app.post('/change-about', must_be_logged_in, function (req, res) {
+ LOG(req, "POST /change-about", req.user.name);
SQL_UPDATE_USER_ABOUT.run(req.body.about, req.user.user_id);
return res.redirect('/profile');
});
-app.get('/user/:who_name/stats', function (req, res) {
- LOG(req, "GET /user/" + req.params.who_name + "/stats");
- let who = SQL_SELECT_USER_BY_NAME.get(req.params.who_name);
- if (who) {
- let stats = SQL_USER_STATS.all(who.user_id);
- res.render('user_stats.pug', { user: req.user, who: who, stats: stats });
- } else {
- return res.status(404).send("Invalid user name.");
- }
-});
-
app.get('/user/:who_name', function (req, res) {
LOG(req, "GET /user/" + req.params.who_name);
let who = SQL_SELECT_USER_PROFILE.get(req.params.who_name);
@@ -545,7 +534,18 @@ app.get('/user/:who_name', function (req, res) {
}
});
-app.get('/user_list', function (req, res) {
+app.get('/user-stats/:who_name', function (req, res) {
+ LOG(req, "GET /user/" + req.params.who_name + "/stats");
+ let who = SQL_SELECT_USER_BY_NAME.get(req.params.who_name);
+ if (who) {
+ let stats = SQL_USER_STATS.all(who.user_id);
+ res.render('user_stats.pug', { user: req.user, who: who, stats: stats });
+ } else {
+ return res.status(404).send("Invalid user name.");
+ }
+});
+
+app.get('/users', function (req, res) {
LOG(req, "GET /users");
let rows = db.prepare("SELECT * FROM user_profile_view ORDER BY atime DESC").all();
rows.forEach(row => {
@@ -1414,7 +1414,7 @@ function mail_password_reset_token(user, token) {
let subject = "Rally the Troops - Password reset request";
let body =
"Your password reset token is: " + token + "\n\n" +
- "https://rally-the-troops.com/reset_password/" + user.mail + "/" + token + "\n\n" +
+ "https://rally-the-troops.com/reset-password/" + user.mail + "/" + token + "\n\n" +
"If you did not request a password reset you can ignore this mail.\n";
console.log("SENT MAIL:", mail_addr(user), subject);
if (mailer)
diff --git a/tools/sql/data.txt b/tools/sql/data.txt
index 7268acc..e9fc882 100644
--- a/tools/sql/data.txt
+++ b/tools/sql/data.txt
@@ -20,7 +20,7 @@ INSERT OR REPLACE INTO titles VALUES ( 'richard-iii', 'Richard III', 25277, 0 );
INSERT OR REPLACE INTO roles VALUES ( 'richard-iii', 'York' );
INSERT OR REPLACE INTO roles VALUES ( 'richard-iii', 'Lancaster' );
-INSERT OR REPLACE INTO titles VALUES ( 'shores-of-tripoli', 'The Shores of Tripoli', 237860, 0 );
+INSERT OR REPLACE INTO titles VALUES ( 'shores-of-tripoli', 'Shores of Tripoli', 237860, 0 );
INSERT OR REPLACE INTO roles VALUES ( 'shores-of-tripoli', 'Tripolitania' );
INSERT OR REPLACE INTO roles VALUES ( 'shores-of-tripoli', 'United States' );
diff --git a/views/change_about.pug b/views/change_about.pug
index 3232c26..b5e2c84 100644
--- a/views/change_about.pug
+++ b/views/change_about.pug
@@ -10,7 +10,7 @@ html
include header
article
h1 Change profile text
- form(method="post" action="/change_about")
+ form(method="post" action="/change-about")
p Name: #{user.name}
p Mail: #{user.mail}
p
diff --git a/views/change_mail.pug b/views/change_mail.pug
index 77ddfc2..32b399d 100644
--- a/views/change_mail.pug
+++ b/views/change_mail.pug
@@ -10,7 +10,7 @@ html
h1 Change mail address
if flash
p.error= flash
- form(method="post" action="/change_mail")
+ form(method="post" action="/change-mail")
p Name: #{user.name}
p Mail: #{user.mail}
p
diff --git a/views/change_name.pug b/views/change_name.pug
index 2cded48..ebf5dc6 100644
--- a/views/change_name.pug
+++ b/views/change_name.pug
@@ -10,7 +10,7 @@ html
h1 Change name
if flash
p.error= flash
- form(method="post" action="/change_name")
+ form(method="post" action="/change-name")
p Name: #{user.name}
p Mail: #{user.mail}
p
diff --git a/views/change_password.pug b/views/change_password.pug
index feaa46c..022a67c 100644
--- a/views/change_password.pug
+++ b/views/change_password.pug
@@ -11,7 +11,7 @@ html
if flash
p.error= flash
- form(method="post" action="/change_password")
+ form(method="post" action="/change-password")
p Name: #{user.name}
p Mail: #{user.mail}
p
diff --git a/views/forgot_password.pug b/views/forgot_password.pug
index ea53ea4..3724c59 100644
--- a/views/forgot_password.pug
+++ b/views/forgot_password.pug
@@ -14,7 +14,7 @@ html
if user
p You're already logged in!
else
- form(method="post" action="/forgot_password")
+ form(method="post" action="/forgot-password")
p
label Mail:
br
diff --git a/views/login.pug b/views/login.pug
index 58a1fd7..391debe 100644
--- a/views/login.pug
+++ b/views/login.pug
@@ -26,4 +26,4 @@ html
p
button(type="submit") Login
p
- a(href="/forgot_password") Forgot password
+ a(href="/forgot-password") Forgot password
diff --git a/views/profile.pug b/views/profile.pug
index e43a999..77cc597 100644
--- a/views/profile.pug
+++ b/views/profile.pug
@@ -24,10 +24,10 @@ html
br
| &#xbb;
| Change
- | <a href="/change_password">password</a>,
- | <a href="/change_mail">mail address</a>,
- | <a href="/change_name">name</a>,
- | or <a href="/change_about">profile text</a>.
+ | <a href="/change-password">password</a>,
+ | <a href="/change-mail">mail address</a>,
+ | <a href="/change-name">name</a>,
+ | or <a href="/change-about">profile text</a>.
br
| &#xbb; <a href="/chat">Chat log</a>
br
diff --git a/views/reset_password.pug b/views/reset_password.pug
index 856433e..20a5210 100644
--- a/views/reset_password.pug
+++ b/views/reset_password.pug
@@ -11,7 +11,7 @@ html
if flash
p.error= flash
- form(method="post" action="/reset_password")
+ form(method="post" action="/reset-password")
p
label Mail:
br