simple css fix on answer-body

[osqa.git] / forum_modules / updater / base.py

diff --git a/forum_modules/updater/base.py b/forum_modules/updater/base.py
index 44af2ea987e97c41ccdee339b6f4cfc1002997cc..3ccf97d2025d7233a59c0e8ec11cbac991a8919d 100644 (file)
--- a/forum_modules/updater/base.py
+++ b/forum_modules/updater/base.py
@@ -14,9 +14,10 @@ import logging
 
 from xml.dom.minidom import parse, parseString
 from forum.models import Question, User
 
 from xml.dom.minidom import parse, parseString
 from forum.models import Question, User

-from forum.settings import APP_URL, SVN_REVISION
+from forum.settings import APP_URL, SVN_REVISION, APP_TITLE, APP_DESCRIPTION

 from django import VERSION as DJANGO_VERSION
 from django.utils import simplejson
 from django import VERSION as DJANGO_VERSION
 from django.utils import simplejson

+from django.utils.html import escape

 from django.utils.encoding import smart_unicode
 from django.conf import settings as django_settings
 from django.utils.translation import ugettext as _
 from django.utils.encoding import smart_unicode
 from django.conf import settings as django_settings
 from django.utils.translation import ugettext as _


@@ -36,6 +37,18 @@ def get_site_views():
 
     return views
 
 
     return views
 

+# Gets the active users count since the last visit
+def get_active_users():
+    users_count = 0
+
+    try:
+        if settings.LATEST_UPDATE_DATETIME:
+            users_count = User.objects.filter(last_login__gt=settings.LATEST_UPDATE_DATETIME).count()
+    except:
+        pass
+
+    return users_count
+

 def get_server_name():
     url = '%s/' % APP_URL
 
 def get_server_name():
     url = '%s/' % APP_URL
 


@@ -78,9 +91,11 @@ def check_for_updates():
     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" />

+    <app_title value="%(app_title)s" />
+    <app_description value="%(app_description)s" />

     <svn_revision value="%(svn_revision)d" />
     <views value="%(site_views)d" />
     <svn_revision value="%(svn_revision)d" />
     <views value="%(site_views)d" />

-    <active_users value="11959" />
+    <active_users value="%(active_users)d" />

     <server value="%(server_name)s" />
     <python_version value="%(python_version)s" />
     <django_version value="%(django_version)s" />
     <server value="%(server_name)s" />
     <python_version value="%(python_version)s" />
     <django_version value="%(django_version)s" />


@@ -90,9 +105,12 @@ def check_for_updates():
 </check> """ % {
         'site_key' : settings.SITE_KEY,
         'app_url' : APP_URL,
 </check> """ % {
         'site_key' : settings.SITE_KEY,
         'app_url' : APP_URL,

+        'app_title' : escape(APP_TITLE.value),
+        'app_description' : escape(APP_DESCRIPTION.value),

         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),
         'svn_revision' : svn_revision,
         'site_views' : get_site_views(),
         'server_name' : get_server_name(),

+        'active_users' : get_active_users(),

         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),
         'database' : django_settings.DATABASE_ENGINE,
         'python_version' : ''.join(sys.version.splitlines()),
         'django_version' : str(DJANGO_VERSION),
         'database' : django_settings.DATABASE_ENGINE,


@@ -137,6 +155,10 @@ def check_for_updates():
     messages_dom = parseString(messages_xml)
     messages_count = len(messages_dom.getElementsByTagName('message'))
 
     messages_dom = parseString(messages_xml)
     messages_count = len(messages_dom.getElementsByTagName('message'))
 

+    # Set the latest update datetime to now.
+    now = datetime.datetime.now()
+    settings.LATEST_UPDATE_DATETIME.set_value(now)
+

     return _('%d update messages have been downloaded.') % messages_count
 
 def update_trigger():
     return _('%d update messages have been downloaded.') % messages_count
 
 def update_trigger():


@@ -146,6 +168,4 @@ def update_trigger():
         update_status = check_for_updates()
 
         logging.error(smart_unicode("Update process has been triggered: %s" % update_status))
         update_status = check_for_updates()
 
         logging.error(smart_unicode("Update process has been triggered: %s" % update_status))

-
-        # Set the latest update datetime to now.

         settings.LATEST_UPDATE_DATETIME.set_value(now)
         settings.LATEST_UPDATE_DATETIME.set_value(now)