IMPORTANT: myslice/manifold folder REMOVED due to conflicts with Manifold Server...

[myslice.git] / portal / django_passresetview.py

diff --git a/portal/django_passresetview.py b/portal/django_passresetview.py
index 769e9f5..1d84a20 100644 (file)
--- a/portal/django_passresetview.py
+++ b/portal/django_passresetview.py
@@ -34,7 +34,7 @@ If the email address provided does not exist in the system, this view won't send
 This prevents information leaking to potential attackers. If you want to provide an error message in this case, you can subclass PasswordResetForm 
 and use the password_reset_form argument.
 
-Users flagged with an unusable password (see set_unusable_password() aren't allowed to request a password reset to prevent misuse when using an external 
+Users flagged with an unusable password - see set_unusable_password() - aren't allowed to request a password reset to prevent misuse when using an external 
 authentication source like LDAP. Note that they won't receive any error message since this would expose their account's existence but no mail will be sent either.
 
 More Detail: https://docs.djangoproject.com/en/dev/topics/auth/default/#topics-auth-creating-users
@@ -64,7 +64,7 @@ from django.contrib.auth.decorators import login_required
 from portal.forms import PasswordResetForm, SetPasswordForm
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import get_current_site
-from django.contrib.auth.hashers import UNUSABLE_PASSWORD, identify_hasher
+from django.contrib.auth.hashers import identify_hasher
 
 ##
 import os.path, re
@@ -81,9 +81,9 @@ from django.http                        import HttpResponse, HttpResponseRedirec
 from unfold.loginrequired       import FreeAccessView
 from ui.topmenu                 import topmenu_items_live
 
-from manifold.manifoldapi       import execute_admin_query
+from manifoldapi.manifoldapi    import execute_admin_query
 from manifold.core.query        import Query
-from portal.actions                     import manifold_update_user
+from portal.actions             import manifold_update_user
 
 from portal.forms               import PassResetForm
 from portal.actions             import manifold_update_user