From d3e3aa1343e31cd8daa73337d0dfc08a80f66c83 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sat, 17 Mar 2018 19:39:03 +0100
Subject: [PATCH] reset emailbounced when user changes email

---
 rowers/views.py         | 8 ++++++++
 templates/basebase.html | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/rowers/views.py b/rowers/views.py
index f2ba6f6b..69efcd63 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11231,11 +11231,16 @@ def rower_edit_view(request,rowerid=0,message=""):
             getemailnotifications = cd['getemailnotifications']
             defaulttimezone=cd['defaulttimezone']
             u = r.user
+            if u.email != email and len(email):
+                resetbounce = True
+            else:
+                resetbounce = False
             if len(first_name):
                 u.first_name = first_name
             u.last_name = last_name
             if len(email): ## and check_email_freeforuse(u,email):
                 u.email = email
+                resetbounce = True
 
 
             u.save()
@@ -11246,6 +11251,9 @@ def rower_edit_view(request,rowerid=0,message=""):
             r.showfavoritechartnotes = showfavoritechartnotes
             r.sex = sex
             r.birthdate = birthdate
+            if resetbounce and r.emailbounced:
+                print "aap"
+                r.emailbounced = False
             r.save()
             form = RowerForm(instance=r)
 	    powerform = RowerPowerForm(instance=r)
diff --git a/templates/basebase.html b/templates/basebase.html
index 6aaaac8a..f88878fe 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -247,6 +247,11 @@
           {{ user.rower.protrialexpires|date_dif|ddays }} days left in Pro trial
         </p>
         {% endif %}
+        {% if user.rower.emailbounced %}
+        <p class="message">
+          Your email bounced. Please update your email address in the <a href="/rowers/me/edit/">user settings</a>
+        </p>
+        {% endif %}
         {% if messages %}
         {% for message in messages %}
         {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}