dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #1455

Browse Source
This commit is contained in:
niphlod
2016-09-21 22:35:04 +02:00
parent 075f493332
commit 40d6a72b90
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+10 -8
View File
@@ -12,9 +12,11 @@ Auth, Mail, PluginManager and various utilities
import base64 import base64
from functools import reduce from functools import reduce
from gluon._compat import pickle, thread, urllib2, Cookie, StringIO, configparser, MIMEBase, MIMEMultipart, \ from gluon._compat import pickle, thread, urllib2, Cookie, StringIO
MIMEText, Encoders, Charset, long, urllib_quote, iteritems, to_bytes, to_native, add_charset, \ from gluon._compat import configparser, MIMEBase, MIMEMultipart, MIMEText
charset_QP, basestring, unicodeT, to_unicode from gluon._compat import Encoders, Charset, long, urllib_quote, iteritems
from gluon._compat import to_bytes, to_native, add_charset
from gluon._compat import charset_QP, basestring, unicodeT, to_unicode
import datetime import datetime
import logging import logging
import sys import sys
@@ -40,8 +42,9 @@ from gluon.utils import web2py_uuid, compare
from gluon.fileutils import read_file, check_credentials from gluon.fileutils import read_file, check_credentials
from gluon import * from gluon import *
from gluon.contrib.autolinks import expand_one from gluon.contrib.autolinks import expand_one
from gluon.contrib.markmin.markmin2html import \ from gluon.contrib.markmin.markmin2html import replace_at_urls
replace_at_urls, replace_autolinks, replace_components from gluon.contrib.markmin.markmin2html import replace_autolinks
from gluon.contrib.markmin.markmin2html import replace_components
from pydal.objects import Row, Set, Query from pydal.objects import Row, Set, Query
import gluon.serializers as serializers import gluon.serializers as serializers
@@ -1578,7 +1581,6 @@ class Auth(object):
logged_out='Logged out', logged_out='Logged out',
registration_successful='Registration successful', registration_successful='Registration successful',
invalid_email='Invalid email', invalid_email='Invalid email',
unable_send_email='Unable to send email',
invalid_login='Invalid login', invalid_login='Invalid login',
invalid_user='Invalid user', invalid_user='Invalid user',
invalid_password='Invalid password', invalid_password='Invalid password',
@@ -3633,7 +3635,7 @@ class Auth(object):
message=self.messages.retrieve_password % dict(password=password)): message=self.messages.retrieve_password % dict(password=password)):
session.flash = self.messages.email_sent session.flash = self.messages.email_sent
else: else:
session.flash = self.messages.unable_to_send_email session.flash = self.messages.unable_send_email
self.log_event(log, user) self.log_event(log, user)
callback(onaccept, form) callback(onaccept, form)
if not next: if not next:
@@ -3930,7 +3932,7 @@ class Auth(object):
if self.email_reset_password(user): if self.email_reset_password(user):
session.flash = self.messages.email_sent session.flash = self.messages.email_sent
else: else:
session.flash = self.messages.unable_to_send_email session.flash = self.messages.unable_send_email
self.log_event(log, user) self.log_event(log, user)
callback(onaccept, form) callback(onaccept, form)
if not next: if not next: