Consolidating email addresses and removing use of hiveware enkoder. (#…

…120)
MLTSHP · May 2, 2017 · d3e676a · d3e676a
1 parent b88690a
commit d3e676a
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 103 deletions.
diff --git a/developerdocs/conf.py b/developerdocs/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = u'mltshp'
-copyright = u'2017 MLTSHP, LLC'
+copyright = u'2017 MLTSHP, Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/handlers/account.py b/handlers/account.py
@@ -928,7 +928,7 @@ def post(self):
             next_transaction_date     = datetime.datetime.fromtimestamp(sub.current_period_end).strftime("%Y-%m-%d %H:%M:%S"),
             buyer_email               = current_user.email,
             buyer_name                = current_user.display_name(),
-            recipient_email           = "subscriptions@mltshp.com",
+            recipient_email           = "hello@mltshp.com",
             recipient_name            = "MLTSHP, Inc.",
             payment_reason            = "MLTSHP Membership",
             transaction_serial_number = 1,
@@ -947,7 +947,7 @@ def post(self):
 
         if options.postmark_api_key:
             pm = postmark.PMMail(api_key=options.postmark_api_key,
-                sender="[email protected]", to="subscriptions@mltshp.com",
+                sender="[email protected]", to="hello@mltshp.com",
                 subject="%s has created a subscription" % (payment_log.buyer_name),
                 text_body="Subscription ID: %s\nBuyer Name:%s\nBuyer Email:%s\nUser ID:%s\n" % (payment_log.subscription_id, payment_log.buyer_name, payment_log.buyer_email, current_user.id))
             pm.send()
@@ -1008,7 +1008,7 @@ def post(self):
 
                         if options.postmark_api_key:
                             pm = postmark.PMMail(api_key=options.postmark_api_key,
-                                sender="[email protected]", to="subscriptions@mltshp.com",
+                                sender="[email protected]", to="hello@mltshp.com",
                                 subject="%s has cancelled a subscription" % (user.display_name()),
                                 text_body="Subscription ID: %s\nBuyer Name:%s\nBuyer Email:%s\nUser ID:%s\n" % (sub["id"], user.display_name(), user.email, user.id))
                             pm.send()

diff --git a/handlers/stripe_hooks.py b/handlers/stripe_hooks.py
@@ -35,7 +35,7 @@ def post(self):
         if evt.type == 'invoice.payment_failed':
             # subscription failed to be paid due to a problem
             # with the member's credit card or something
-            # for now, just email subscriptions@mltshp.com about this
+            # for now, just email hello@mltshp.com about this
             stripe_customer_id = evt.data.object.customer
 
             subscriber = User.get("stripe_customer_id=%s and deleted=0",
@@ -44,7 +44,7 @@ def post(self):
             if subscriber and options.postmark_api_key:
                 pm = postmark.PMMail(
                     api_key=options.postmark_api_key,
-                    sender="[email protected]", to="subscriptions@mltshp.com",
+                    sender="[email protected]", to="hello@mltshp.com",
                     subject="%s has a subscription failure" % (subscriber.display_name()),
                     text_body="Subscription ID: %s\nBuyer Name:%s\nBuyer Email:%s\nUser ID:%s\n" %
                     (subscription_id, subscriber.display_name(),
@@ -125,8 +125,8 @@ def post(self):
             next_transaction_date     = datetime.datetime.fromtimestamp(period_end).strftime("%Y-%m-%d %H:%M:%S"),
             buyer_email               = subscriber.email,
             buyer_name                = subscriber.display_name(),
-            recipient_email           = "subscriptions@mltshp.com",
-            recipient_name            = "MLTSHP, LLC",
+            recipient_email           = "hello@mltshp.com",
+            recipient_name            = "MLTSHP, Inc.",
             payment_reason            = "MLTSHP Paid Account",
             transaction_serial_number = 1,
             subscription_id           = subscription_id,

diff --git a/templates/account/payment-cancel.html b/templates/account/payment-cancel.html
@@ -19,7 +19,7 @@ <h1 class="thank-you">Canceling</h1>
 
     <div class="clear"><!-- --></div>
     <p>
-      If you have any questions or need help please email us at <a href="mailto:subscriptions@mltshp.com">subscriptions@mltshp.com</a>
+      If you have any questions or need help please email us at <a href="mailto:hello@mltshp.com">hello@mltshp.com</a>
       and we'll get back to you as soon as possible.
     </p>
   </div>

diff --git a/templates/account/resend-verification-email.html b/templates/account/resend-verification-email.html
@@ -8,7 +8,7 @@
     <h1>Verification Email Has Been Sent</h1>
     <p>
       We just sent you an email that explains how to verify your email address. If for some reason this is not working for you
-      please contact us at <a href="mailto:support@mltshp.com?subject=Email Verification Failure">support@mltshp.com</a>
+      please contact us at <a href="mailto:hello@mltshp.com?subject=Email Verification Failure">hello@mltshp.com</a>
     </p>
   </div>
 {% end %}
diff --git a/templates/base.html b/templates/base.html
@@ -137,27 +137,9 @@
                 <p>
                     &copy; <a href="http://new.mltshp.com/" target="_blank">MLTSHP, Inc.</a>
                     All Rights Reserved
-                    <a href="/terms-of-use">Terms of Use</a>
-                    <script type="text/javascript">
-                    //<![CDATA[
-                    <!--
-                    (function () {
-                    var x="function f(x){var i,o=\"\",l=x.length;for(i=0;i<l;i+=2) {if(i+1<l)o+=" +
-                    "x.charAt(i+1);try{o+=x.charAt(i);}catch(e){}}return o;}f(\"ufcnitnof x({)av" +
-                    " r,i=o\\\"\\\"o,=l.xelgnhtl,o=;lhwli(e.xhcraoCedtAl(1/)3=!84{)rt{y+xx=l;=+;" +
-                    "lc}tahce({)}}of(r=i-l;1>i0=i;--{)+ox=c.ahAr(t)i};erutnro s.buts(r,0lo;)f}\\" +
-                    "\"(3)11\\\\,!\\\"-(0=o.6#S{v$4c03\\\\\\\\17\\\\07\\\\02\\\\\\\\30\\\\06\\\\" +
-                    "SMO3T702\\\\0t\\\\\\\\\\\\27\\\\00\\\\01\\\\\\\\}+5y00\\\\\\\\::7017\\\\\\\\"+
-                    "%?=8(+03\\\\0.\\\\QSQ^\\\\rZ\\\\]GLF3F01\\\\\\\\0{03\\\\\\\\DEumx;7+7;17\\\\"+
-                    "\\\\hc77\\\\1`\\\\ruu-20\\\\01\\\\03\\\\\\\\27\\\\0r\\\\\\\\\\\\25\\\\03\\\\"+
-                    "03\\\\\\\\26\\\\0\\\\\\\\(\\\"}fo;n uret}r);+)y+^(i)t(eAodrCha.c(xdeCoarCho" +
-                    "mfrg.intr=So+7;12%=;y++)y13<1(iif){++;i<l;i=0(ior;fthnglex.l=\\\\,\\\\\\\"=" +
-                    "\\\",o iar{vy)x,f(n ioctun\\\"f)\")";
-                    while(x=eval(x));})();
-                    //-->
-                    //]]>
-                    </script>
-                    <a href="https://twitter.com/best_of_mltshp">@best_of_mltshp</a>
+                    &nbsp; <a href="/terms-of-use">Terms of Use</a>
+                    &nbsp; <a href="mailto:[email protected]">Contact Us</a>
+                    &nbsp; <a href="https://twitter.com/best_of_mltshp">@best_of_mltshp</a>
                 </p>
                 <p>
                     <a href="/user/mltshp">Follow The MLTSHP User!</a>

diff --git a/templates/misc/faq.html b/templates/misc/faq.html
@@ -16,7 +16,7 @@ <h2>What Can I Upload or Save?</h2>
       </p>
       <h2>What Do I Do If I Find A Bug?</h2>
       <p>If you want to contact us directly send an email 
-        to <a href="mailto:support@mltshp.com">support@mltshp.com</a>
+        to <a href="mailto:hello@mltshp.com">hello@mltshp.com</a>
         and we'll try to respond as quickly as possible. Thanks for helping!
       </p>
 <h2>How Can I use RSS to Follow the Best of MLTSHP Account?</h2>

diff --git a/templates/misc/terms-of-use.html b/templates/misc/terms-of-use.html
@@ -43,13 +43,13 @@
     Session cookies help us keep track of when a person is logged in. Once a user is logged in, session cookies allow us to personalize information on the Site for them.
   </p>
   <p>
-    We will communicate with you via email, to the email address(es) you provide to us.  If you would like to cease receiving communications from us, you may either delete your account or notify us that you would no longer like to receive email communications from us by sending an email to this address, and informing us therein that you would no longer like to receive email communications: support@mltshp.com. 
+    We will communicate with you via email, to the email address(es) you provide to us.  If you would like to cease receiving communications from us, you may either delete your account or notify us that you would no longer like to receive email communications from us by sending an email to this address, and informing us therein that you would no longer like to receive email communications: <a href="mailto:hello@mltshp.com">[email protected]</a>.
   </p>
   <p>
     2. <u>Children Under the Age of 13</u>
   </p>
   <p>
-    If you are under the age of 13, please do not attempt to register with the Site or provide any personal information about yourself to us.  If we learn that we have collected personal information from a child under the age of 13, we will delete that information as quickly as possible.  If you believe that we might have any information from a child under the age of 13, please contact us here: support@mltshp.com. 
+    If you are under the age of 13, please do not attempt to register with the Site or provide any personal information about yourself to us.  If we learn that we have collected personal information from a child under the age of 13, we will delete that information as quickly as possible.  If you believe that we might have any information from a child under the age of 13, please contact us here: <a href="mailto:hello@mltshp.com">[email protected]</a>.
   </p>
   <p>
     3. <u>Copyright &amp; Intellectual Property</u>
@@ -70,7 +70,7 @@
     MLTSHP, Inc.<br>
     [Address]<br>
     (555) 555-5555<br>
-    support@mltshp.com
+    hello@mltshp.com
   </p>
   <p>
     Notifications of potential infringement to the Agent must be in writing, and include substantially the following: 

diff --git a/templates/waitlist/error.html b/templates/waitlist/error.html
@@ -7,22 +7,6 @@
 <h1>Error</h1>
 <p>
   Not sure what happened but there was an error when trying to access that URL. Could you mail 
-  us at <script type="text/javascript">
-  //<![CDATA[
-  <!--
-  var x="function f(x){var i,o=\"\",l=x.length;for(i=0;i<l;i+=2) {if(i+1<l)o+=" +
-  "x.charAt(i+1);try{o+=x.charAt(i);}catch(e){}}return o;}f(\"ufcnitnof x({)av" +
-  " r,i=o\\\"\\\"o,=l.xelgnhtl,o=;lhwli(e.xhcraoCedtAl(1/)3=!11)5t{yrx{=+;x+ll" +
-  "=};acct(h)e}{f}roi(l=1-i;=>;0-i)-o{=+.xhcratAi(;)r}teru n.oussbrt0(o,)l};(f" +
-  ")\\\",0\\\"\\\\XR\\\\\\\\\\\\\\\\GO2Z00\\\\\\\\]M\\\\r0\\\\s=372):426\\\\0:" +
-  "\\\\?897mn22\\\\0 \\\\(#\\\\d\\\\\\\" \\\\-4))03\\\\0-\\\\,-VZ37\\\\0`\\\\0" +
-  "6\\\\0_\\\\LUB^25\\\\06\\\\02\\\\\\\\_oS^01\\\\0E\\\\_EF@hDJHAI0K03\\\\\\\\" +
-  "TNwsq|F9~$dr4}.r83baxhxb&~hsi`avdn\\\"\\\\f(;} ornture;}))++(y)^(iAtdeCoarc" +
-  "hx.e(odrChamCro.fngriSt+=;o27=1y%2;*=)yy)0+>((iif){++;i<l;i=0(ior;fthnglex." +
-  "l=\\\\,\\\\\\\"=\\\",o iar{vy)x,f(n ioctun\\\"f)\")"                         ;
-  while(x=eval(x));
-  //-->
-  //]]>
-  </script> and tell us what happened? Thanks.
+  us at <a href="mailto:[email protected]">[email protected]</a> and tell us what happened? Thanks.
 </p>
 {% end %}
diff --git a/templates/waitlist/index.html b/templates/waitlist/index.html
@@ -38,23 +38,8 @@ <h1>The Wait List</h1>
     <div class="clear"><!-- --></div>
   </form>
   <p>
-    If you don't get your verification email please send us one at <script type="text/javascript">
-    //<![CDATA[
-    <!--
-    var x="function f(x){var i,o=\"\",l=x.length;for(i=0;i<l;i+=2) {if(i+1<l)o+=" +
-    "x.charAt(i+1);try{o+=x.charAt(i);}catch(e){}}return o;}f(\"ufcnitnof x({)av" +
-    " r,i=o\\\"\\\"o,=l.xelgnhtl,o=;lhwli(e.xhcraoCedtAl(1/)3=!11)5t{yrx{=+;x+ll" +
-    "=};acct(h)e}{f}roi(l=1-i;=>;0-i)-o{=+.xhcratAi(;)r}teru n.oussbrt0(o,)l};(f" +
-    ")\\\",0\\\"\\\\XR\\\\\\\\\\\\\\\\GO2Z00\\\\\\\\]M\\\\r0\\\\s=372):426\\\\0:" +
-    "\\\\?897mn22\\\\0 \\\\(#\\\\d\\\\\\\" \\\\-4))03\\\\0-\\\\,-VZ37\\\\0`\\\\0" +
-    "6\\\\0_\\\\LUB^25\\\\06\\\\02\\\\\\\\_oS^01\\\\0E\\\\_EF@hDJHAI0K03\\\\\\\\" +
-    "TNwsq|F9~$dr4}.r83baxhxb&~hsi`avdn\\\"\\\\f(;} ornture;}))++(y)^(iAtdeCoarc" +
-    "hx.e(odrChamCro.fngriSt+=;o27=1y%2;*=)yy)0+>((iif){++;i<l;i=0(ior;fthnglex." +
-    "l=\\\\,\\\\\\\"=\\\",o iar{vy)x,f(n ioctun\\\"f)\")"                         ;
-    while(x=eval(x));
-    //-->
-    //]]>
-    </script>.
+    If you don't get your verification email please send us one at
+    <a href="mailto:[email protected]">[email protected]</a>.
   </p>
 </div>
 {% end %}
diff --git a/templates/waitlist/success.html b/templates/waitlist/success.html
@@ -9,23 +9,8 @@ <h1>Success</h1>
   <p>
   As soon as we have space for more people we'll be sure to contact you. 
   We've sent you an email so you can verify that your email address is correct. 
-  If you don't get the email please contact us at <script type="text/javascript">
-  //<![CDATA[
-  <!--
-  var x="function f(x){var i,o=\"\",l=x.length;for(i=0;i<l;i+=2) {if(i+1<l)o+=" +
-  "x.charAt(i+1);try{o+=x.charAt(i);}catch(e){}}return o;}f(\"ufcnitnof x({)av" +
-  " r,i=o\\\"\\\"o,=l.xelgnhtl,o=;lhwli(e.xhcraoCedtAl(1/)3=!11)5t{yrx{=+;x+ll" +
-  "=};acct(h)e}{f}roi(l=1-i;=>;0-i)-o{=+.xhcratAi(;)r}teru n.oussbrt0(o,)l};(f" +
-  ")\\\",0\\\"\\\\XR\\\\\\\\\\\\\\\\GO2Z00\\\\\\\\]M\\\\r0\\\\s=372):426\\\\0:" +
-  "\\\\?897mn22\\\\0 \\\\(#\\\\d\\\\\\\" \\\\-4))03\\\\0-\\\\,-VZ37\\\\0`\\\\0" +
-  "6\\\\0_\\\\LUB^25\\\\06\\\\02\\\\\\\\_oS^01\\\\0E\\\\_EF@hDJHAI0K03\\\\\\\\" +
-  "TNwsq|F9~$dr4}.r83baxhxb&~hsi`avdn\\\"\\\\f(;} ornture;}))++(y)^(iAtdeCoarc" +
-  "hx.e(odrChamCro.fngriSt+=;o27=1y%2;*=)yy)0+>((iif){++;i<l;i=0(ior;fthnglex." +
-  "l=\\\\,\\\\\\\"=\\\",o iar{vy)x,f(n ioctun\\\"f)\")"                         ;
-  while(x=eval(x));
-  //-->
-  //]]>
-  </script> and we'll see what's what.
+  If you don't get the email please contact us at
+  <a href="mailto:[email protected]">[email protected]</a> and we'll see what's what.
   </p>
 </div>
 {% end %}
diff --git a/templates/waitlist/verified.html b/templates/waitlist/verified.html
@@ -8,23 +8,7 @@
   <h1>Verified</h1>
   <p>
   Thanks for verifying your email address. When there's room we'll surely contact you. If you have 
-  questions send them to <script type="text/javascript">
-  //<![CDATA[
-  <!--
-  var x="function f(x){var i,o=\"\",l=x.length;for(i=0;i<l;i+=2) {if(i+1<l)o+=" +
-  "x.charAt(i+1);try{o+=x.charAt(i);}catch(e){}}return o;}f(\"ufcnitnof x({)av" +
-  " r,i=o\\\"\\\"o,=l.xelgnhtl,o=;lhwli(e.xhcraoCedtAl(1/)3=!11)5t{yrx{=+;x+ll" +
-  "=};acct(h)e}{f}roi(l=1-i;=>;0-i)-o{=+.xhcratAi(;)r}teru n.oussbrt0(o,)l};(f" +
-  ")\\\",0\\\"\\\\XR\\\\\\\\\\\\\\\\GO2Z00\\\\\\\\]M\\\\r0\\\\s=372):426\\\\0:" +
-  "\\\\?897mn22\\\\0 \\\\(#\\\\d\\\\\\\" \\\\-4))03\\\\0-\\\\,-VZ37\\\\0`\\\\0" +
-  "6\\\\0_\\\\LUB^25\\\\06\\\\02\\\\\\\\_oS^01\\\\0E\\\\_EF@hDJHAI0K03\\\\\\\\" +
-  "TNwsq|F9~$dr4}.r83baxhxb&~hsi`avdn\\\"\\\\f(;} ornture;}))++(y)^(iAtdeCoarc" +
-  "hx.e(odrChamCro.fngriSt+=;o27=1y%2;*=)yy)0+>((iif){++;i<l;i=0(ior;fthnglex." +
-  "l=\\\\,\\\\\\\"=\\\",o iar{vy)x,f(n ioctun\\\"f)\")"                         ;
-  while(x=eval(x));
-  //-->
-  //]]>
-  </script>.
+  questions send them to <a href="mailto:[email protected]">[email protected]</a>.
   </p>
 </div>
 {% end %}