send the administrator emails

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@999 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum_modules/updater/base.py b/forum_modules/updater/base.py
index 995c70ce2929ce0d0660faa6693f44671943022c..7635b60b00ac6d44b03e86ac88197037e37d554a 100644 (file)
--- a/forum_modules/updater/base.py
+++ b/forum_modules/updater/base.py
@@ -4,7 +4,7 @@ import re
 
 import urllib2
 
 
 import urllib2
 

-from forum.models import Question
+from forum.models import Question, User

 from forum.settings import APP_URL
 
 def generate_installation_key():
 from forum.settings import APP_URL
 
 def generate_installation_key():


@@ -38,3 +38,11 @@ def get_server_name():
         return server_name
     except:
         return 'Unknown'
         return server_name
     except:
         return 'Unknown'

+
+def get_admin_emails():
+    emails = []
+
+    for user in User.objects.filter(is_superuser=True):
+        emails.append(user.email)
+
+    return emails
\ No newline at end of file

diff --git a/forum_modules/updater/views.py b/forum_modules/updater/views.py
index 5d68e57f530fce0c373e91c48178d378ccf00ac6..083819f7b30ae3535709f9e0711fce82984fa972 100644 (file)
--- a/forum_modules/updater/views.py
+++ b/forum_modules/updater/views.py
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext as _
 from django.utils import simplejson
 from django.conf import settings
 
 from django.utils import simplejson
 from django.conf import settings
 

-from base import get_site_views, get_server_name
+from base import get_site_views, get_server_name, get_admin_emails

 from settings import SITE_KEY, UPDATE_SERVER_URL
 from forum.settings import APP_URL, SVN_REVISION
 from forum.views.admin import admin_tools_page, admin_page
 from settings import SITE_KEY, UPDATE_SERVER_URL
 from forum.settings import APP_URL, SVN_REVISION
 from forum.views.admin import admin_tools_page, admin_page


@@ -34,6 +34,11 @@ def updater_check(request):
         # Here we'll have to find another way of getting the SVN revision
         svn_revision = 0
 
         # Here we'll have to find another way of getting the SVN revision
         svn_revision = 0
 

+    admin_emails_xml = '<emails>'
+    for email in get_admin_emails():
+        admin_emails_xml += '<email value="%s" />' % email
+    admin_emails_xml += '</emails>'
+

     statistics = """<check>
     <key value="%(site_key)s" />
     <app_url value="%(app_url)s" />
     statistics = """<check>
     <key value="%(site_key)s" />
     <app_url value="%(app_url)s" />


@@ -45,6 +50,7 @@ def updater_check(request):
     <django_version value="%(django_version)s" />
     <database value="%(database)s" />
     <os value="%(os)s" />
     <django_version value="%(django_version)s" />
     <database value="%(database)s" />
     <os value="%(os)s" />

+    %(emails)s

 </check> """ % {
         'site_key' : SITE_KEY,
         'app_url' : APP_URL,
 </check> """ % {
         'site_key' : SITE_KEY,
         'app_url' : APP_URL,


@@ -55,6 +61,7 @@ def updater_check(request):
         'django_version' : str(DJANGO_VERSION),
         'database' : settings.DATABASE_ENGINE,
         'os' : str(os.uname()),
         'django_version' : str(DJANGO_VERSION),
         'database' : settings.DATABASE_ENGINE,
         'os' : str(os.uname()),

+        'emails' : admin_emails_xml,

     }
 
     # Compress the statistics XML dump
     }
 
     # Compress the statistics XML dump