We have sent you a confirmation email. By click on the link in this email, you will confirm your email address and complete you subscription.
"
var blog_thanks = "
+ Hi
+ Thanks for subscribing to CKAN.org newsletter.
+ We will be sending you latest published news, articles on
CKAN.org. Mail frequency won't be more than twice a month.
+ We hate spamming as much as you do.
+
+ To confirm your subscription, please click on the link given below. If clicking doesn't work, copy paste the URL in browser.
+ If you think this is a mistake, just ignore this email and we won't bother you again.
+
+
+ {{ domain }}{% url 'subscription-activate' eidb64=eid token=token %}
+
+
+
+
+ Note:
+ This is notification only email. Please do not reply on this email.
+
+
diff --git a/ckanorg/templates/footer.html b/ckanorg/templates/footer.html
index 69dccac89..4d40ad671 100644
--- a/ckanorg/templates/footer.html
+++ b/ckanorg/templates/footer.html
@@ -16,11 +16,13 @@
Held in trust by
CKAN assets are held in trust by Open Knowledge Foundation, a non-profit organization, with best practice policies on governing openly and for use of the trademark.
diff --git a/ckanorg/urls.py b/ckanorg/urls.py
index eb36c5b32..8bbaa8789 100644
--- a/ckanorg/urls.py
+++ b/ckanorg/urls.py
@@ -21,6 +21,7 @@
path('search/', search_views.search, name='search'),
path('ajax-posting/', ajax_email, name='ajax_email'),
+ path('contacts/', include('contact.urls')),
path('csrf/', csrf, name='csrf'),
path('404/', ckanorg_views.not_found, name='not_found'),
path('500/', ckanorg_views.server_error, name='server_error'),
diff --git a/contact/admin.py b/contact/admin.py
index 09099c585..58829bcc8 100644
--- a/contact/admin.py
+++ b/contact/admin.py
@@ -10,8 +10,8 @@ class EmailAdmin(ModelAdmin):
menu_order = 290
add_to_settings_menu = False
exclude_from_explorer = False
- list_display = ['submitted', 'form_name', 'address']
- list_filter = ['form_name', 'submitted']
+ list_display = ['submitted', 'form_name', 'address', 'full_name', 'subscribed']
+ list_filter = ['form_name', 'submitted', 'subscribed']
search_fields = ['submitted', 'form_name', 'address']
diff --git a/contact/email.py b/contact/email.py
new file mode 100644
index 000000000..7952c349f
--- /dev/null
+++ b/contact/email.py
@@ -0,0 +1,60 @@
+import datetime
+import logging
+import traceback
+
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.utils.http import urlsafe_base64_encode
+from django.utils.encoding import force_bytes
+from django.core.mail import EmailMessage, send_mail
+from django.utils.html import strip_tags
+
+from managers.models import Manager
+
+
+EMAIL_SUBJECT = ''
+
+EMAIL_BODY = '''
+
{} was submitted on {}
+with the following e-mail: {}
+'''
+
+
+def send_subscription_email(email, current_site, token):
+ mail_subject = 'Please confirm CKAN newsletter subscription'
+ message = render_to_string('contact/subscription_email.html', {
+ 'domain': current_site,
+ 'eid': urlsafe_base64_encode(force_bytes(email)),
+ 'token': token,
+ })
+ try:
+ complete_email = EmailMessage(mail_subject, message, to=[email])
+ complete_email.content_subtype = 'html'
+ complete_email.send()
+ except Exception as e:
+ logging.getLogger("error").error(traceback.format_exc())
+ return False
+ return True
+
+
+def send_managers_email(form_name, email):
+ send_to = [x.email for x in Manager.objects.all()]
+ html_message = render_to_string('mail.html', {
+ 'form_name': form_name,
+ 'time': datetime.now().strftime("%A, %d %B %Y, %I:%M%p"),
+ 'email': email,
+ })
+ plain_message = strip_tags(html_message)
+ try:
+ send_mail(
+ subject='Form submition from ckan.org',
+ message=plain_message,
+ from_email=settings.DEFAULT_FROM_EMAIL,
+ recipient_list=send_to,
+ fail_silently=False,
+ html_message=html_message
+ )
+ except Exception as e:
+ logging.getLogger("error").error(traceback.format_exc())
+ return False
+ return True
diff --git a/contact/models.py b/contact/models.py
index 3e5192aeb..539a595a5 100644
--- a/contact/models.py
+++ b/contact/models.py
@@ -212,19 +212,31 @@ def render_landing_page(self, request, form_submission=None, *args, **kwargs):
@register_snippet
class Email(models.Model):
- submitted = models.DateTimeField(
- default=datetime.now,
- )
form_name = models.CharField(
max_length=64,
blank=False,
null=False,
)
+ full_name = models.CharField(
+ max_length=64,
+ blank=True,
+ null=True,
+ )
address = models.EmailField(
+ verbose_name="Email",
max_length=254,
blank=False,
null=False,
)
+ subscribed = models.BooleanField(
+ default=False,
+ )
+ submitted = models.DateTimeField(
+ auto_now_add=True,
+ )
+ updated = models.DateTimeField(
+ auto_now=True,
+ )
def __str__(self):
return self.address
diff --git a/contact/token.py b/contact/token.py
new file mode 100644
index 000000000..317450f20
--- /dev/null
+++ b/contact/token.py
@@ -0,0 +1,10 @@
+from django.contrib.auth.tokens import PasswordResetTokenGenerator
+from six import text_type
+
+
+class TokenGenerator(PasswordResetTokenGenerator):
+ def _make_hash_value(self, email, timestamp):
+ return (
+ text_type(email) + text_type(timestamp)
+ )
+user_activation_token = TokenGenerator()
\ No newline at end of file
diff --git a/contact/urls.py b/contact/urls.py
new file mode 100644
index 000000000..adc571d29
--- /dev/null
+++ b/contact/urls.py
@@ -0,0 +1,10 @@
+from django.urls import path
+from .views import activate_subscription
+from django.views.generic import TemplateView
+
+
+urlpatterns = [
+ path('subscription',
+ TemplateView.as_view(template_name='contact/subscription_page.html'), name='subscription_page'),
+ path(r'subscription/activate/
/', activate_subscription, name='subscription-activate'),
+]
\ No newline at end of file
diff --git a/contact/views.py b/contact/views.py
index a2e97af0c..6be556e90 100644
--- a/contact/views.py
+++ b/contact/views.py
@@ -1,64 +1,79 @@
-from datetime import datetime
+import time
+import logging
+import traceback
-from django.core.mail import send_mail
-from django.http import JsonResponse
-from django.conf import settings
+from django.http import JsonResponse, HttpResponse
+from django.shortcuts import redirect
+from django.utils.encoding import force_text
+from django.utils.http import urlsafe_base64_decode
from .models import Email, send_contact_info
-from managers.models import Manager
+from .token import user_activation_token
+from .email import send_subscription_email
-EMAIL_SUBJECT = 'Form submition from ckan.org'
-
-EMAIL_BODY = '''
-{} was submitted on {}
-with the following e-mail: {}
-'''
-
form_mapping = {
'#subscribe_email': 'Subscribe Form',
'#blog_subscribe_email': 'Subscribe Form',
'#blog_email': 'Blog Subscription Form',
}
+def activate_subscription(request, eidb64, token):
+ try:
+ eid = force_text(urlsafe_base64_decode(eidb64))
+ email = Email.objects.filter(address=eid).first()
+ url = request._current_scheme_host
+ except(TypeError, ValueError, OverflowError, email.DoesNotExist):
+ logging.getLogger("error_logger").error(traceback.format_exc())
+ email = None
+ if email is not None and user_activation_token.check_token(email, token):
+ email.subscribed = True
+ email.save()
+ return redirect(url)
+ else:
+ return HttpResponse('Activation link is invalid!')
+
+
def ajax_email(request):
if request.is_ajax():
form_id = request.POST.get('form_id', None)
form_name = form_mapping.get(form_id, 'Unknown form')
name = request.POST.get('name', 'Unknown')
email = request.POST.get('email', None)
+ token = user_activation_token.make_token(email)
+ current_site = request._current_scheme_host
+
response = {}
- Email.objects.create(
- form_name=form_name,
- address=email
- )
- send_to = [x.email for x in Manager.objects.all()]
- from django.template.loader import render_to_string
- from django.utils.html import strip_tags
- html_message = render_to_string('mail.html',
- {'form_name': form_name,
- 'time': datetime.now().strftime("%A, %d %B %Y, %I:%M%p"),
- 'email': email
- })
- plain_message = strip_tags(html_message)
- send_mail(
- EMAIL_SUBJECT,
- plain_message,
- settings.DEFAULT_FROM_EMAIL,
- send_to,
- fail_silently=False,
- html_message=html_message),
- response = {'success': True}
- member_info = {
- "email_address": email,
- "status": "subscribed",
- "merge_fields": {
- "FNAME": name.split(" ")[0],
- "LNAME": name.split(" ")[-1],
- "FORM": form_name,
+ status = True
+ if not Email.objects.filter(address=email).exists():
+ Email.objects.create(
+ form_name=form_name,
+ full_name=name,
+ address=email,
+ subscribed=False,
+ )
+ status = send_subscription_email(
+ email=email,
+ current_site=current_site,
+ token=token
+ )
+ else:
+ Email.objects.filter(address=email).first().update(subscribed=True)
+
+ if status is True:
+ member_info = {
+ "email_address": email,
+ "status": "subscribed",
+ "merge_fields": {
+ "FNAME": name.split(" ")[0],
+ "LNAME": name.split(" ")[-1],
+ "FORM": form_name,
+ }
}
- }
- send_contact_info(request, member_info)
+ send_contact_info(request, member_info)
+
+ response = {'success': True}
return JsonResponse(response)
+