password recovery integrated

config_example/config.py

@@ -9,6 +9,12 @@ STARTPAGE = "startpage"
 # Activate content management system (view)
 # CMS_MODE = True
 
+#
+# Themes library
+#
+# This defines the default theme, if no theme is set in the django parameters
+DEFAULT_THEME = 'clear-teal'
+
 #
 # Users library
 #
@@ -19,6 +25,8 @@ USERS_SELF_REGISTRATION = False
 USERS_MAIL_VALIDATION = True
 # This enables or disables the account activation by an admin after self registration
 USERS_ADMIN_ACTIVATION = True
+# The timeout for password recovery and mail validation tokens send via email
+PASSWORD_RESET_TIMEOUT = 60 * 60 * 3    # 3 hours
 
 #
 # Django mail / smtp settings
@@ -44,12 +52,6 @@ USERS_ADMIN_ACTIVATION = True
 # Define an ssl certificate
 # EMAIL_SSL_CERTFILE =
 
-#
-# Themes library
-#
-# This defines the default theme, if no theme is set in the django parameters
-DEFAULT_THEME = 'clear-teal'
-
 #
 # Django
 #

piki/settings.py

@@ -165,6 +165,7 @@ USER_CONFIG_DEFAULTS = {
     'ALLOWED_HOSTS': ['127.0.0.1', 'localhost', ],
     'CSRF_TRUSTED_ORIGINS': [],
     'ADMINS': [],
+    'PASSWORD_RESET_TIMEOUT': 60 * 60 * 3,
     #
     'EMAIL_HOST': None,
     'EMAIL_PORT': None,

themes

@@ -1 +1 @@
-Subproject commit 47e9f3104c5016ef9405c90ee5dfca6e638e7d82
+Subproject commit b7673fa82763830009c7dc95ecf93d7e96f692f9

users

@@ -1 +1 @@
-Subproject commit f31771b5882af0468ae077ebb8246eead0895fae
+Subproject commit 12526f44d736b360a2c92a46eabed1c455e1b4fa