From 353efcf7512c5449f35b32e3ea64be67e5d58b7e Mon Sep 17 00:00:00 2001
From: Henner <hg@miadi.net>
Date: Wed, 17 Jul 2013 22:46:15 +0200
Subject: [PATCH] += use send_mail_to_admins if recipient
 admins@APP-ID.appspotmail.com

---
 djangoappengine/mail.py | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/djangoappengine/mail.py b/djangoappengine/mail.py
index 044bf6f..64e66d9 100644
--- a/djangoappengine/mail.py
+++ b/djangoappengine/mail.py
@@ -4,13 +4,41 @@
 from django.core.mail import EmailMultiAlternatives
 from django.core.exceptions import ImproperlyConfigured
 
+from google.appengine.api.app_identity import get_application_id
 from google.appengine.api import mail as aeemail
 from google.appengine.runtime import apiproxy_errors
 
+def _check_for_app_admins(message):
+    # "admins@APP-ID.appspotmail.com"
+    # ignore multiple admins adresses...
+    for to in message.to:
+        if 'admins@%s.appspotmail.com' % get_application_id() in to or '<admins@%s.appspotmail.com>' % get_application_id() in to:
+            return True
+
+def _send_app_admins(message):
+    kw = {}
+
+    # kw['to'] = message.to => unused warning
+    # those sould be empty
+    # kw['cc'] = message.cc
+    # kw['bcc'] = message.bcc
+    if hasattr(message, 'reply_to'):
+        kw['reply_to'] = message.reply_to    
+    if hasattr(message, 'html'):
+        kw['html'] = message.html
+    if hasattr(message, 'attachments'):
+        kw['attachments'] = message.attachments
+    if hasattr(message, 'headers'):
+        kw['headers'] = message.headers
+    
+    aeemail.send_mail_to_admins(message.sender, message.subject, message.body, **kw)
 
 def _send_deferred(message, fail_silently=False):
     try:
-        message.send()
+        if _check_for_app_admins(message):
+            _send_app_admins(message)
+        else:
+            message.send()
     except (aeemail.Error, apiproxy_errors.Error):
         if not fail_silently:
             raise
@@ -71,7 +99,10 @@ def _send(self, message):
             self._defer_message(message)
             return True
         try:
-            message.send()
+            if _check_for_app_admins(message):
+                _send_app_admins(message)
+            else:
+                message.send()
         except (aeemail.Error, apiproxy_errors.Error):
             if not self.fail_silently:
                 raise