/ - Diff - Synnefo - Greek Research and Technology Network's projects

         ProjectApplication, Project)
     from astakos.im.settings import (
         INVITATIONS_PER_LEVEL, BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY,
         RECAPTCHA_ENABLED, DEFAULT_CONTACT_EMAIL, LOGGING_LEVEL,
         RECAPTCHA_ENABLED, CONTACT_EMAIL, LOGGING_LEVEL,
         PASSWORD_RESET_EMAIL_SUBJECT, NEWPASSWD_INVALIDATE_TOKEN,
         MODERATION_ENABLED, PROJECT_MEMBER_JOIN_POLICIES,
         PROJECT_MEMBER_LEAVE_POLICIES, EMAILCHANGE_ENABLED,
-...
                     'site_name': SITENAME,
                     'user': user,
                     'baseurl': BASEURL,
                     'support': DEFAULT_CONTACT_EMAIL
                     'support': CONTACT_EMAIL
+                }
                 from_email = settings.SERVER_EMAIL
                 send_mail(_(PASSWORD_RESET_EMAIL_SUBJECT),

     import astakos.im.settings as astakos_settings
     from astakos.im.settings import (
         DEFAULT_CONTACT_EMAIL, SITENAME, BASEURL, LOGGING_LEVEL,
         CONTACT_EMAIL, SITENAME, BASEURL, LOGGING_LEVEL,
         VERIFICATION_EMAIL_SUBJECT, ACCOUNT_CREATION_SUBJECT,
         GROUP_CREATION_SUBJECT, HELPDESK_NOTIFICATION_EMAIL_SUBJECT,
         INVITATION_EMAIL_SUBJECT, GREETING_EMAIL_SUBJECT, FEEDBACK_EMAIL_SUBJECT,
-...
         PROJECT_CREATION_SUBJECT, PROJECT_APPROVED_SUBJECT,
         PROJECT_TERMINATION_SUBJECT, PROJECT_SUSPENSION_SUBJECT,
         PROJECT_MEMBERSHIP_CHANGE_SUBJECT,
         PROJECT_MEMBER_JOIN_POLICIES, PROJECT_MEMBER_LEAVE_POLICIES)
         PROJECT_MEMBER_JOIN_POLICIES, PROJECT_MEMBER_LEAVE_POLICIES, HELPDESK,
         ADMINS, MANAGERS)
     from astakos.im.notifications import build_notification, NotificationError
     from astakos.im.models import (
         AstakosUser, Invitation, ProjectMembership, ProjectApplication, Project,
-...
                                    'url': url,
                                    'baseurl': BASEURL,
                                    'site_name': SITENAME,
                                    'support': DEFAULT_CONTACT_EMAIL})
                                    'support': CONTACT_EMAIL})
         sender = settings.SERVER_EMAIL
         try:
             send_mail(_(VERIFICATION_EMAIL_SUBJECT), message, sender, [user.email],
-...
                                  dictionary=None,
                                  subject='alpha2 testing notification',):
         """
         Send notification email to settings.ADMINS.
         Send notification email to settings.HELPDESK + settings.MANAGERS.
         Raises SendNotificationError
         """
         if not settings.ADMINS:
             return
         dictionary = dictionary or {}
         message = render_to_string(template_name, dictionary)
         sender = settings.SERVER_EMAIL
         recipient_list = [e[1] for e in HELPDESK + MANAGERS]
         try:
             send_mail(subject, message, sender, [i[1] for i in settings.ADMINS],
             send_mail(subject, message, sender, recipient_list,
                       connection=get_connection())
         except (SMTPException, socket.error) as e:
             logger.exception(e)
-...
     def send_helpdesk_notification(user, template_name='im/helpdesk_notification.txt'):
         """
         Send email to DEFAULT_CONTACT_EMAIL to notify for a new user activation.
         Send email to settings.HELPDESK list to notify for a new user activation.
         Raises SendNotificationError
         """
         if not DEFAULT_CONTACT_EMAIL:
             return
         message = render_to_string(
             template_name,
             {'user': user}
+        )
         sender = settings.SERVER_EMAIL
         recipient_list = [e[1] for e in HELPDESK + MANAGERS]
         try:
             send_mail(_(HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % {'user': user.email},
                       message, sender, [DEFAULT_CONTACT_EMAIL],
                       connection=get_connection())
                       message, sender, recipient_list, connection=get_connection())
         except (SMTPException, socket.error) as e:
             logger.exception(e)
             raise SendNotificationError()
-...
                                    'url': url,
                                    'baseurl': BASEURL,
                                    'site_name': SITENAME,
                                    'support': DEFAULT_CONTACT_EMAIL})
                                    'support': CONTACT_EMAIL})
         sender = settings.SERVER_EMAIL
         try:
             send_mail(subject, message, sender, [invitation.username],
-...
                                    'url': urljoin(BASEURL, reverse('index')),
                                    'baseurl': BASEURL,
                                    'site_name': SITENAME,
                                    'support': DEFAULT_CONTACT_EMAIL})
                                    'support': CONTACT_EMAIL})
         sender = settings.SERVER_EMAIL
         try:
             send_mail(subject, message, sender, [user.email],
-...
     def send_feedback(msg, data, user, email_template_name='im/feedback_mail.txt'):
         subject = _(FEEDBACK_EMAIL_SUBJECT)
         from_email = settings.SERVER_EMAIL
         recipient_list = [DEFAULT_CONTACT_EMAIL]
         recipient_list = [e[1] for e in HELPDESK]
         content = render_to_string(email_template_name, {
             'message': msg,
             'data': data,
-...
             url = request.build_absolute_uri(url)
             t = loader.get_template(email_template_name)
             c = {'url': url, 'site_name': SITENAME,
                  'support': DEFAULT_CONTACT_EMAIL, 'ec': ec}
                  'support': CONTACT_EMAIL, 'ec': ec}
             from_email = settings.SERVER_EMAIL
             send_mail(_(EMAIL_CHANGE_EMAIL_SUBJECT), t.render(Context(c)),
                       from_email, [ec.new_email_address],

+        }
     SENDER = settings.SERVER_EMAIL
     ADMINS = settings.ADMINS
     NOTIFY_RECIPIENTS = [e[1] for e in settings.MANAGERS + settings.HELPDESK]
     def membership_change_notify(project, user, action):
         try:
-...
     def application_submit_notify(application):
         try:
             notification = build_notification(
                 SENDER,
                 [i[1] for i in ADMINS],
                 SENDER, NOTIFY_RECIPIENTS,
                 _(settings.PROJECT_CREATION_SUBJECT) % application.__dict__,
                 template='im/projects/project_creation_notification.txt',
                 dictionary={'object':application})

 : 0
     })
     # Address to use for outgoing emails
     DEFAULT_CONTACT_EMAIL = getattr(
         settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@example.synnefo.org')
     ADMINS = getattr(settings, 'ADMINS', ())
     MANAGERS = getattr(settings, 'MANAGERS', ADMINS)
     HELPDESK = getattr(settings, 'HELPDESK', ADMINS)
     SERVER_EMAIL = getattr(settings, 'SERVER_EMAIL', None)
     ADMINS = getattr(settings, 'ADMINS', None)
     CONTACT_EMAIL = settings.CONTACT_EMAIL
     SERVER_EMAIL = settings.SERVER_EMAIL
     # Identity Management enabled modules
     # Supported modules are: 'local', 'twitter' and 'shibboleth'

             if not eppn:
                 raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_EPPN) % {
                     'domain': settings.BASEURL,
                     'contact_email': settings.DEFAULT_CONTACT_EMAIL
                     'contact_email': settings.CONTACT_EMAIL
                 })
             if Tokens.SHIB_DISPLAYNAME in tokens:
                 realname = tokens[Tokens.SHIB_DISPLAYNAME]

             r = client.get('/im/login/shibboleth?', follow=True)
             self.assertContains(r, messages.SHIBBOLETH_MISSING_EPPN % {
                 'domain': astakos_settings.BASEURL,
                 'contact_email': astakos_settings.DEFAULT_CONTACT_EMAIL
                 'contact_email': settings.CONTACT_EMAIL
             })
             client.set_tokens(eppn="kpapeppn")

     #    4   :   0
     #}
     # Address to use for outgoing emails
     #ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@example.synnefo.org'
     #SERVER_EMAIL = None
     #ADMINS = None
     # Identity Management enabled modules
     # Supported modules are: 'local', 'twitter' and 'shibboleth'
     #ASTAKOS_IM_MODULES = ['local']

Synnefo

Revision 31bc3a62