aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-05-30 17:35:34 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-05-30 17:35:34 -0400
commite943812dc9802d134f2d9627a6c4fc94fe9c26f9 (patch)
tree1701440755ca77c14ee59c03f3b025fe6c3d6c88 /templates
parenta436a064d2cb04e328bbd391fe3eb1c3a79d25bb (diff)
downloadikiwiki-e943812dc9802d134f2d9627a6c4fc94fe9c26f9.tar
ikiwiki-e943812dc9802d134f2d9627a6c4fc94fe9c26f9.tar.gz
hashed password support, and empty password security fix
This implements the previously documented hashed password support. While implementing that, I noticed a security hole, which this commit also fixes..
Diffstat (limited to 'templates')
-rw-r--r--templates/passwordmail.tmpl13
1 files changed, 9 insertions, 4 deletions
diff --git a/templates/passwordmail.tmpl b/templates/passwordmail.tmpl
index 8484d39b2..df86be109 100644
--- a/templates/passwordmail.tmpl
+++ b/templates/passwordmail.tmpl
@@ -1,10 +1,15 @@
-Someone[1], possibly you, requested that you be emailed the password for user
-<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2].
+Someone[1], possibly you, requested that the password for
+<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2] be reset.
-The password is: <TMPL_VAR USER_PASSWORD>
+To change your password, visit the following url, and enter a new password:
+
+<TMPL_VAR PASSWORDURL>
+
+This url can only be used once to change your password, and it will also
+stop working the next time you successfully log in.
--
ikiwiki
-[1] The user requesting the password was at IP address <TMPL_VAR REMOTE_ADDR>
+[1] The IP address was <TMPL_VAR REMOTE_ADDR>
[2] Located at <TMPL_VAR WIKIURL>