From 47b6feaa8ae7d187c0642a832fef55dcf4945d23 Mon Sep 17 00:00:00 2001
From: Dan Traviglia <dtraviglia@gmail.com>
Date: Thu, 5 Nov 2015 21:47:09 -0500
Subject: [PATCH] moved email authorization to allow registration emails

---
 developer/views.py  |  2 +-
 exp_portal/email.py | 38 +++++++++++++++++++++-----------------
 xdata/settings.py   |  2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/developer/views.py b/developer/views.py
index 3c4970c..9108112 100644
--- a/developer/views.py
+++ b/developer/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from op_tasks.models import UserProfile, Product, Dataset, OpTask
 
 # Create your views here.
diff --git a/exp_portal/email.py b/exp_portal/email.py
index d8b38c1..2b123e9 100644
--- a/exp_portal/email.py
+++ b/exp_portal/email.py
@@ -1,31 +1,35 @@
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from op_tasks.models import UserProfile
 from django.core import mail
 from django.conf import settings
 from tasks import user_authorized
+from xdata.settings import LOGIN_URL
 
 from django.contrib.auth.decorators import login_required
 
 
-@login_required(login_url='/tasking/login')
 def send_email(request):
+    print request
+    if request.method == 'POST':
+        email_to = request.POST.get('email_to', 'xdataonlineerrors@gmail.com')
+        subject = request.POST.get('email_subject', 'error')
+        message = request.POST.get('email_message', 'error')
+        print email_to, subject, message
+        status = mail.send_mail(subject, message, settings.EMAIL_HOST_USER, [email_to], fail_silently=False)
+    else:
+        status = 2
+
+    userprofiles = UserProfile.objects.all()
+    if status == 0:
+        statusMessage = "The email did not send. Try again."
+    elif status == 1:
+        statusMessage = "Email sent!"
+    elif status == 2:
+        statusMessage = ""
     if user_authorized(request):
-        if request.method == 'POST':
-            email_to = request.POST.get('email_to', 'xdataonlineerrors@gmail.com')
-            subject = request.POST.get('email_subject', 'error')
-            message = request.POST.get('email_message', 'error')
-            print email_to, subject, message
-            status = mail.send_mail(subject, message, settings.EMAIL_HOST_USER, [email_to], fail_silently=False)
-        else:
-            status = 2
-        userprofiles = UserProfile.objects.all()
-        if status == 0:
-            statusMessage = "The email did not send. Try again."
-        elif status == 1:
-            statusMessage = "Email sent!"
-        elif status == 2:
-            statusMessage = ""
         return render(request, 'email_form.html', {'userprofiles': userprofiles, 'status': status, 'statusMessage': statusMessage})
+    else:
+        return redirect(LOGIN_URL)
 
 
 def printme(string):
diff --git a/xdata/settings.py b/xdata/settings.py
index fc3530d..70d3805 100755
--- a/xdata/settings.py
+++ b/xdata/settings.py
@@ -26,7 +26,7 @@
 
 TEMPLATE_DEBUG = True
 
-ADMINS = ADMIN_EMAILS
+# ADMINS = ADMIN_EMAILS
 
 ALLOWED_HOSTS = ['*']