Revision 751d24cf snf-astakos-app/astakos/im/activation_backends.py
b/snf-astakos-app/astakos/im/activation_backends.py | ||
---|---|---|
45 | 45 |
from astakos.im.models import AstakosUser, Invitation |
46 | 46 |
from astakos.im.forms import * |
47 | 47 |
from astakos.im.util import get_invitation |
48 |
from astakos.im.functions import send_verification, send_admin_notification, activate, SendMailError |
|
49 |
from astakos.im.settings import INVITATIONS_ENABLED, DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, MODERATION_ENABLED, SITENAME, DEFAULT_ADMIN_EMAIL, RE_USER_EMAIL_PATTERNS |
|
48 |
from astakos.im.functions import send_verification, send_activation, \ |
|
49 |
send_admin_notification, activate, SendMailError |
|
50 |
from astakos.im.settings import INVITATIONS_ENABLED, DEFAULT_CONTACT_EMAIL, \ |
|
51 |
DEFAULT_FROM_EMAIL, MODERATION_ENABLED, SITENAME, DEFAULT_ADMIN_EMAIL, RE_USER_EMAIL_PATTERNS |
|
50 | 52 |
|
51 | 53 |
import socket |
52 | 54 |
import logging |
... | ... | |
100 | 102 |
return globals()[formclass](initial_data, instance=instance, request=request) |
101 | 103 |
|
102 | 104 |
def handle_activation(self, user, \ |
103 |
verification_template_name='im/activation_email.txt', \
|
|
105 |
activation_template_name='im/activation_email.txt', \
|
|
104 | 106 |
greeting_template_name='im/welcome_email.txt', \ |
105 | 107 |
admin_email_template_name='im/admin_notification.txt', \ |
106 | 108 |
switch_accounts_email_template_name='im/switch_accounts_email.txt'): |
... | ... | |
127 | 129 |
activate(user, greeting_template_name) |
128 | 130 |
return RegistationCompleted() |
129 | 131 |
else: |
130 |
send_verification(user, verification_template_name)
|
|
132 |
send_activation(user, activation_template_name)
|
|
131 | 133 |
return VerificationSent() |
132 | 134 |
else: |
133 | 135 |
send_admin_notification(user, admin_email_template_name) |
Also available in: Unified diff