From 0118be48b0272147aa63fd8910b99acbfaa52102 Mon Sep 17 00:00:00 2001
From: piskvorky <radimrehurek@seznam.cz>
Date: Wed, 7 Dec 2011 02:21:06 +0100
Subject: added support for django.contrib.staticfiles

* staticfiles used to be a separate Python package, before being integrated into django 1.3
* this patch ignores the legacy package and references only the built-in django.contrib.staticfiles, so it requires django >= 1.3
* with staticfiles, serving media in development (runserver) vs. production is handled automatically, so i completely removed the /m/ media view.
---
 askbot/setup_templates/settings.py | 21 ++++++++++++++++++++-
 askbot/skins/utils.py              |  9 ++-------
 askbot/urls.py                     |  5 -----
 askbot_requirements.txt            |  2 +-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 9e847eba..7964368b 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -5,7 +5,8 @@ import sys
 import askbot
 
 #this line is added so that we can import pre-packaged askbot dependencies
-sys.path.append(os.path.join(os.path.dirname(askbot.__file__), 'deps'))
+ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__))
+sys.path.append(os.path.join(ASKBOT_ROOT, 'deps'))
 
 DEBUG = False#set to True to enable debugging
 TEMPLATE_DEBUG = False#keep false when debugging jinja2 templates
@@ -222,3 +223,21 @@ djcelery.setup_loader()
 
 CSRF_COOKIE_NAME = 'askbot_csrf'
 CSRF_COOKIE_DOMAIN = ''#enter domain name here - e.g. example.com
+
+# === Settings for django.contrib.staticfiles
+STATIC_ROOT = os.path.join(PROJECT_ROOT, "site_media", "static")
+
+STATIC_URL = "/site_media/static/"
+
+# Additional directories which hold static files
+STATICFILES_DIRS = [
+    os.path.join(PROJECT_ROOT, "static"),
+    os.path.join(ASKBOT_ROOT, 'skins'),
+]
+
+STATICFILES_FINDERS = [
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+#    "django.contrib.staticfiles.finders.LegacyAppDirectoriesFinder",
+    "compressor.finders.CompressorFinder",
+]
diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py
index da3a8a06..64f11c75 100644
--- a/askbot/skins/utils.py
+++ b/askbot/skins/utils.py
@@ -149,13 +149,8 @@ def get_media_url(url, ignore_missing = False):
             logging.critical(log_message)
         return None
 
-    url = use_skin + '/media/' + url
-    url = '///' + django_settings.ASKBOT_URL + 'm/' + url
-    url = os.path.normpath(url).replace(
-                                    '\\', '/'
-                                ).replace(
-                                    '///', '/'
-                                )
+    url = django_settings.STATIC_URL + use_skin + '/media/' + url
+    url = os.path.normpath(url).replace('\\', '/')
     
     if resource_revision:
         url +=  '?v=%d' % resource_revision
diff --git a/askbot/urls.py b/askbot/urls.py
index 2c3d143d..235973d0 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -36,11 +36,6 @@ urlpatterns = patterns('',
         {'sitemaps': sitemaps}, 
         name='sitemap'
     ),
-    url(
-        r'^m/(?P<skin>[^/]+)/media/(?P<resource>.*)$', 
-        views.meta.media,
-        name='askbot_media',
-    ),
     url(
         r'^%s(?P<path>.*)$' % settings.ASKBOT_UPLOADED_FILES_URL, 
         'django.views.static.serve',
diff --git a/askbot_requirements.txt b/askbot_requirements.txt
index fc11d9d1..6f7a170c 100644
--- a/askbot_requirements.txt
+++ b/askbot_requirements.txt
@@ -1,5 +1,5 @@
 akismet
-django>=1.1.2
+django>=1.3
 Jinja2
 Coffin>=0.3
 South>=0.7.1
-- 
cgit v1.2.3-1-g7c22


From 53cd343ea0f33f3b269ae5fd5e3890a3a3ad934d Mon Sep 17 00:00:00 2001
From: piskvorky <radimrehurek@seznam.cz>
Date: Wed, 7 Dec 2011 02:57:32 +0100
Subject: added the staticfiles app itself =)

---
 askbot/setup_templates/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 7964368b..f41500f7 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -142,6 +142,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'askbot.user_messages.context_processors.user_messages',#must be before auth
     'django.core.context_processors.auth', #this is required for admin
     'django.core.context_processors.csrf', #necessary for csrf protection
+    "django.core.context_processors.static",
 )
 
 
@@ -150,6 +151,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
+    "django.contrib.staticfiles",
 
     #all of these are needed for the askbot
     'django.contrib.admin',
-- 
cgit v1.2.3-1-g7c22


From 4a2d5f0ff27a5d993f71bcc3b05cbcf9f8a8f833 Mon Sep 17 00:00:00 2001
From: piskvorky <radimrehurek@seznam.cz>
Date: Sun, 18 Dec 2011 08:48:23 +0100
Subject: updated static urls in javascript

---
 askbot/context.py                                       | 1 +
 askbot/skins/common/media/js/utils.js                   | 2 +-
 askbot/skins/default/templates/meta/bottom_scripts.html | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/askbot/context.py b/askbot/context.py
index f3665240..f3819481 100644
--- a/askbot/context.py
+++ b/askbot/context.py
@@ -15,6 +15,7 @@ def application_settings(request):
     my_settings = askbot_settings.as_dict()
     my_settings['LANGUAGE_CODE'] = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE)
     my_settings['ASKBOT_URL'] = settings.ASKBOT_URL
+    my_settings['STATIC_URL'] = settings.STATIC_URL
     my_settings['ASKBOT_CSS_DEVEL'] = getattr(settings, 'ASKBOT_CSS_DEVEL', False)
     my_settings['DEBUG'] = settings.DEBUG
     my_settings['ASKBOT_VERSION'] = askbot.get_version()
diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js
index 0afd03a7..60ac8d97 100644
--- a/askbot/skins/common/media/js/utils.js
+++ b/askbot/skins/common/media/js/utils.js
@@ -1,6 +1,6 @@
 //var $, scriptUrl, askbotSkin
 var mediaUrl = function(resource){
-    return scriptUrl + 'm/' + askbotSkin + '/' + resource;
+    return askbot['settings']['static_url'] + askbotSkin + '/' + resource;
 };
 
 var cleanUrl = function(url){
diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html
index 0df25e7c..980059da 100644
--- a/askbot/skins/default/templates/meta/bottom_scripts.html
+++ b/askbot/skins/default/templates/meta/bottom_scripts.html
@@ -28,6 +28,7 @@
     askbot['urls']['follow_user'] = scriptUrl + 'followit/follow/user/{{'{{'}}userId{{'}}'}}/';
     askbot['urls']['unfollow_user'] = scriptUrl + 'followit/unfollow/user/{{'{{'}}userId{{'}}'}}/';
     askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}';
+    askbot['settings']['static_url'] = '{{ settings.STATIC_URL }}';
 </script>
 <script 
     type="text/javascript"
-- 
cgit v1.2.3-1-g7c22


From cd27a074dbe66de033b3bbf8d25eafc44578729e Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 11 Jan 2012 01:03:10 -0300
Subject: xss vulnerability fix and new release

---
 askbot/__init__.py                                           | 2 +-
 askbot/doc/source/changelog.rst                              | 4 ++++
 askbot/skins/common/templates/authopenid/signin.html         | 4 ++--
 askbot/skins/default/templates/close.html                    | 2 +-
 askbot/skins/default/templates/question.html                 | 2 +-
 askbot/skins/default/templates/question/question_card.html   | 2 +-
 askbot/skins/default/templates/question/sidebar.html         | 2 +-
 askbot/skins/default/templates/question_retag.html           | 2 +-
 askbot/skins/default/templates/question_widget.html          | 2 +-
 askbot/skins/default/templates/reopen.html                   | 2 +-
 askbot/skins/default/templates/revisions.html                | 2 +-
 askbot/skins/default/templates/user_profile/user_recent.html | 2 +-
 askbot/skins/default/templates/user_profile/user_stats.html  | 6 +++---
 askbot/skins/default/templates/widgets/ask_form.html         | 2 +-
 14 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/askbot/__init__.py b/askbot/__init__.py
index 7b12329c..eba7d205 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -9,7 +9,7 @@ import smtplib
 import sys
 import logging
 
-VERSION = (0, 7, 37)
+VERSION = (0, 7, 38)
 
 #keys are module names used by python imports,
 #values - the package qualifier to use for pip
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index ce18fe11..bd67fd48 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,6 +1,10 @@
 Changes in Askbot
 =================
 
+0.7.38 (Jan 11, 2012)
+---------------------
+* xss vulnerability fix, issue found by Radim Řehůřek (Evgeny)
+
 0.7.37 (Jan 8, 2012)
 --------------------
 * added basic slugification treatment to question titles with 
diff --git a/askbot/skins/common/templates/authopenid/signin.html b/askbot/skins/common/templates/authopenid/signin.html
index 4c894aa3..7fdbe203 100644
--- a/askbot/skins/common/templates/authopenid/signin.html
+++ b/askbot/skins/common/templates/authopenid/signin.html
@@ -11,14 +11,14 @@
 {% endif %}
     {% if answer %}
         <div class="message">
-        {% trans title=answer.question.title, summary=answer.summary %}
+        {% trans title=answer.question.title|escape, summary=answer.summary|escape %}
         Your answer to {{title}} {{summary}} will be posted once you log in
         {% endtrans %}
         </div>
     {% endif %}
     {% if question %}
         <div class="message">
-        {% trans title=question.title, summary=question.summary %}Your question 
+        {% trans title=question.title|escape, summary=question.summary|escape %}Your question 
         {{title}} {{summary}} will be posted once you log in
         {% endtrans %}
         </div>
diff --git a/askbot/skins/default/templates/close.html b/askbot/skins/default/templates/close.html
index d8160865..bac2b3ee 100644
--- a/askbot/skins/default/templates/close.html
+++ b/askbot/skins/default/templates/close.html
@@ -4,7 +4,7 @@
 {% block content %}
 <h1>{% trans %}Close question{% endtrans %}</h1>
     <p>{% trans %}Close the question{% endtrans %}: <a href="{{ question.get_absolute_url() }}">
-    <strong>{{ question.get_question_title() }}</strong></a>
+    <strong>{{ question.get_question_title()|escape }}</strong></a>
     </p>
     <form id="fmclose" action="{% url close question.id %}" method="post" >{% csrf_token %}
         <p>
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 7dc85d84..bfabd634 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -1,6 +1,6 @@
 {% extends "two_column_body.html" %}
 <!-- question.html -->
-{% block title %}{% spaceless %}{{ question.get_question_title() }}{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{{ question.get_question_title()|escape }}{% endspaceless %}{% endblock %}
 {% block meta_description %}
         <meta name="description" content="{{question.summary|striptags|escape}}" />
 {% endblock %}
diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html
index 87f92209..3691a224 100644
--- a/askbot/skins/default/templates/question/question_card.html
+++ b/askbot/skins/default/templates/question/question_card.html
@@ -4,7 +4,7 @@
 </div>
 <div class="question-content">
 
-    <h1><a href="{{ question.get_absolute_url() }}">{{ question.get_question_title() }}</a></h1>
+    <h1><a href="{{ question.get_absolute_url() }}">{{ question.get_question_title()|escape }}</a></h1>
     {% include "question/question_tags.html" %}
     <div id="question-table" {% if question.deleted %}class="deleted"{%endif%}>
         <div class="question-body">
diff --git a/askbot/skins/default/templates/question/sidebar.html b/askbot/skins/default/templates/question/sidebar.html
index 918c7662..f5c3273d 100644
--- a/askbot/skins/default/templates/question/sidebar.html
+++ b/askbot/skins/default/templates/question/sidebar.html
@@ -64,7 +64,7 @@
         <div class="questions-related">
             {% for question in similar_questions.data() %}
             <p>
-                <a href="{{ question.get_absolute_url() }}">{{ question.get_question_title() }}</a>
+                <a href="{{ question.get_absolute_url() }}">{{ question.get_question_title()|escape }}</a>
             </p>
             {% endfor %}
         </div>
diff --git a/askbot/skins/default/templates/question_retag.html b/askbot/skins/default/templates/question_retag.html
index 883dc3aa..e5632820 100644
--- a/askbot/skins/default/templates/question_retag.html
+++ b/askbot/skins/default/templates/question_retag.html
@@ -5,7 +5,7 @@
 <h1>{% trans %}Change tags{% endtrans %} [<a href="{{ question.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]</h1>
 <form id="fmretag" action="{% url retag_question question.id %}" method="post" >{% csrf_token %}
     <h2>
-        {{ question.get_question_title() }}
+        {{ question.get_question_title()|escape }}
     </h2>
     <div id="description" class="edit-content-html">
         {{ question.html }}
diff --git a/askbot/skins/default/templates/question_widget.html b/askbot/skins/default/templates/question_widget.html
index bb883c71..89e56898 100644
--- a/askbot/skins/default/templates/question_widget.html
+++ b/askbot/skins/default/templates/question_widget.html
@@ -12,7 +12,7 @@
         <ul>
             {% for question in questions %}
                 <li><a href="{{settings.APP_URL}}{{ question.get_absolute_url() }}">
-                  {{ question.title }}</a></li>
+                  {{ question.title|escape }}</a></li>
             {% endfor %}
         </ul>
     </div> 
diff --git a/askbot/skins/default/templates/reopen.html b/askbot/skins/default/templates/reopen.html
index d68e8bdc..b287da6f 100644
--- a/askbot/skins/default/templates/reopen.html
+++ b/askbot/skins/default/templates/reopen.html
@@ -5,7 +5,7 @@
 <h1>{% trans %}Reopen question{% endtrans %}</h1>
 <p>{% trans %}Title{% endtrans %}: 
     <a href="{{ question.get_absolute_url() }}">
-        <span class="big">{{ question.get_question_title() }}</span>
+        <span class="big">{{ question.get_question_title()|escape }}</span>
     </a>
 </p>
 <p>{% trans %}This question has been closed by 
diff --git a/askbot/skins/default/templates/revisions.html b/askbot/skins/default/templates/revisions.html
index 7fb985e2..f86a37ff 100644
--- a/askbot/skins/default/templates/revisions.html
+++ b/askbot/skins/default/templates/revisions.html
@@ -30,7 +30,7 @@
                 <td width="200px" style="vertical-align:middle">
                     {% if revision.summary %}
                         <div class="summary">
-                            <span>{{ revision.summary }}</span>
+                            <span>{{ revision.summary|escape }}</span>
                         </div>
                     {% endif %}
                     {% if request.user|can_edit_post(post) %}
diff --git a/askbot/skins/default/templates/user_profile/user_recent.html b/askbot/skins/default/templates/user_profile/user_recent.html
index cbd59202..502af7b6 100644
--- a/askbot/skins/default/templates/user_profile/user_recent.html
+++ b/askbot/skins/default/templates/user_profile/user_recent.html
@@ -17,7 +17,7 @@
                         {% if act.related_object_type == 'question' %}{# question #}
                             {% for question in questions %}{# could also create a new dict #}
                                 {% if question.question_id == act.obj %}
-                                    (<a title="{{question.summary|collapse}}" 
+                                    (<a title="{{question.summary|collapse|escape}}" 
                                       href="{% url question question.question_id %}{{question.title|slugify}}">{% trans %}source{% endtrans %}</a>)
                                 {% endif %}   
                             {% endfor %}   
diff --git a/askbot/skins/default/templates/user_profile/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html
index 2551015c..d74ecf77 100644
--- a/askbot/skins/default/templates/user_profile/user_stats.html
+++ b/askbot/skins/default/templates/user_profile/user_stats.html
@@ -18,7 +18,7 @@
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
-                <a title="{{answered_question.summary|collapse}}" 
+                <a title="{{answered_question.summary|collapse|escape}}" 
                     href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">
                     <span class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
                           title="{% trans answer_score=answered_question.answer_score %}the answer has been voted for {{ answer_score }} times{% endtrans %} {% if answered_question.accepted %}{% trans %}this answer has been selected as correct{% endtrans %}{%endif%}">
@@ -27,7 +27,7 @@
                 </a>
                 <div class="answer-link">
                     {% spaceless %}
-                    <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title|escape}}</a> 
                     {% endspaceless %}
                     {% if answered_question.comment_count %}
                     <span>
@@ -119,7 +119,7 @@
                                         <a 
                                             title="{{ award.content_object.get_snippet()|collapse }}"
                                             href="{{ award.content_object.get_absolute_url() }}"
-                                        >{% if award.content_type == answer_type %}{% trans %}Answer to:{% endtrans %}{% endif %} {{ award.content_object.get_origin_post().title }}</a>
+                                        >{% if award.content_type == answer_type %}{% trans %}Answer to:{% endtrans %}{% endif %} {{ award.content_object.get_origin_post().title|escape }}</a>
                                     </li>
                                     {% endif %}
                                 {% endfor %}
diff --git a/askbot/skins/default/templates/widgets/ask_form.html b/askbot/skins/default/templates/widgets/ask_form.html
index 18196d93..17dc89f5 100644
--- a/askbot/skins/default/templates/widgets/ask_form.html
+++ b/askbot/skins/default/templates/widgets/ask_form.html
@@ -14,7 +14,7 @@
                 {% endif %}
             {% endif %}
             <input id="id_title" class="questionTitleInput" name="title" autocomplete="off"
-                value="{% if form.initial.title %}{{form.initial.title}}{% endif %}"/>
+                value="{% if form.initial.title %}{{form.initial.title|escape}}{% endif %}"/>
             <span class="form-error">{{ form.title.errors }}</span>
         </div>
         <div class="title-desc">
-- 
cgit v1.2.3-1-g7c22


From abce97feacaff96a6881746f038e82f3f35566a9 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 11 Jan 2012 02:16:48 -0300
Subject: fixed facebook login

---
 askbot/__init__.py                    |  2 +-
 askbot/deps/django_authopenid/util.py | 64 ++++++++++++++++++++++++-----------
 askbot/doc/source/changelog.rst       |  4 +++
 3 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/askbot/__init__.py b/askbot/__init__.py
index eba7d205..2989d660 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -9,7 +9,7 @@ import smtplib
 import sys
 import logging
 
-VERSION = (0, 7, 38)
+VERSION = (0, 7, 39)
 
 #keys are module names used by python imports,
 #values - the package qualifier to use for pip
diff --git a/askbot/deps/django_authopenid/util.py b/askbot/deps/django_authopenid/util.py
index 4468a6d2..28f6b2dd 100644
--- a/askbot/deps/django_authopenid/util.py
+++ b/askbot/deps/django_authopenid/util.py
@@ -29,7 +29,7 @@ try:
 except:
     from yadis import xri
 
-import time, base64, hashlib, operator, logging
+import time, base64, hmac, hashlib, operator, logging
 from models import Association, Nonce
 
 __all__ = ['OpenID', 'DjangoOpenIDStore', 'from_openid_response', 'clean_next']
@@ -787,30 +787,54 @@ class FacebookError(Exception):
     """
     pass
 
-def get_facebook_user_id(request):
-    try:
-        key = askbot_settings.FACEBOOK_KEY
-        secret = askbot_settings.FACEBOOK_SECRET
+def urlsafe_b64decode(input):
+    length = len(input)
+    return base64.urlsafe_b64decode(
+        input.ljust(length + length % 4, '=')
+    )
 
-        fb_cookie = request.COOKIES['fbs_%s' % key]
-        fb_response = dict(cgi.parse_qsl(fb_cookie))
+def parse_signed_facebook_request(signed_request, secret):
+    """
+    Parse signed_request given by Facebook (usually via POST),
+    decrypt with app secret.
 
-        signature = None
-        payload = ''
-        for key in sorted(fb_response.keys()):
-            if key != 'sig':
-                payload += '%s=%s' % (key, fb_response[key])
+    Arguments:
+    signed_request -- Facebook's signed request given through POST
+    secret -- Application's app_secret required to decrpyt signed_request
 
-        if 'sig' in fb_response:
-            if md5(payload + secret).hexdigest() != fb_response['sig']:
-                raise ValueError('signature does not match')
-        else:
-            raise ValueError('no signature in facebook response')
+    slightly edited copy from https://gist.github.com/1190267
+    """
+
+    if "." in signed_request:
+        esig, payload = signed_request.split(".")
+    else:
+        return {}
 
-        if 'uid' not in fb_response:
-            raise ValueError('no user id in facebook response')
+    sig = urlsafe_b64decode(str(esig))
+    data = simplejson.loads(urlsafe_b64decode(str(payload)))
 
-        return fb_response['uid'] 
+    if not isinstance(data, dict):
+        raise ValueError("Pyload is not a json string!")
+        return {}
+
+    if data["algorithm"].upper() == "HMAC-SHA256":
+        if hmac.new(str(secret), str(payload), hashlib.sha256).digest() == sig:
+            return data
+    else:
+        raise ValueError("Not HMAC-SHA256 encrypted!")
+
+    return {}
+
+def get_facebook_user_id(request):
+    try:
+        key = askbot_settings.FACEBOOK_KEY
+        fb_cookie = request.COOKIES['fbsr_%s' % key]
+        if not fb_cookie:
+            raise ValueError('cannot access facebook cookie')
+
+        secret = askbot_settings.FACEBOOK_SECRET
+        response = parse_signed_facebook_request(fb_cookie, secret)
+        return response['user_id']
     except Exception, e:
         raise FacebookError(e)
 
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index bd67fd48..7751cba6 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,6 +1,10 @@
 Changes in Askbot
 =================
 
+0.7.39 (Jan 11, 2012)
+---------------------
+* restored facebook login after FB changed the procedure (Evgeny)
+
 0.7.38 (Jan 11, 2012)
 ---------------------
 * xss vulnerability fix, issue found by Radim Řehůřek (Evgeny)
-- 
cgit v1.2.3-1-g7c22


From f57127cc0f40ad2c55367acd0451f4a1b54422d3 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 11 Jan 2012 19:53:45 -0300
Subject: removed words "askbot" from the messages in send_email_alerts

---
 askbot/management/commands/send_email_alerts.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py
index c904cdde..a9d69678 100644
--- a/askbot/management/commands/send_email_alerts.py
+++ b/askbot/management/commands/send_email_alerts.py
@@ -452,7 +452,7 @@ class Command(NoArgsCommand):
                 #              )
 
                 text += _(
-                            'Please visit the askbot and see what\'s new! '
+                            'Please visit us and see what\'s new! '
                             'Could you spread the word about it - '
                             'can somebody you know help answering those questions or '
                             'benefit from posting one?'
@@ -465,12 +465,12 @@ class Command(NoArgsCommand):
                     text += _('Your most frequent subscription setting is \'daily\' '
                                'on selected questions. If you are receiving more than one '
                                'email per day'
-                               'please tell about this issue to the askbot administrator.'
+                               'please tell about this issue to the site administrator.'
                                )
                 elif 'w' in feed_freq:
                     text += _('Your most frequent subscription setting is \'weekly\' '
                                'if you are receiving this email more than once a week '
-                               'please report this issue to the askbot administrator.'
+                               'please report this issue to the site administrator.'
                                )
                 text += ' '
                 text += _(
-- 
cgit v1.2.3-1-g7c22


From aad065ccf96d21a4eb4d59949c2429c5deff6596 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Thu, 12 Jan 2012 17:38:51 -0300
Subject: made email recovery link work when askbot is deployed on subdirectory

---
 askbot/deps/django_authopenid/views.py | 5 ++++-
 askbot/doc/source/changelog.rst        | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py
index e9059c61..5f332a1a 100644
--- a/askbot/deps/django_authopenid/views.py
+++ b/askbot/deps/django_authopenid/views.py
@@ -48,6 +48,7 @@ from django.utils.safestring import mark_safe
 from django.core.mail import send_mail
 from recaptcha_works.decorators import fix_recaptcha_remote_ip
 from askbot.skins.loaders import render_into_skin, get_template
+from urlparse import urlparse
 
 from openid.consumer.consumer import Consumer, \
     SUCCESS, CANCEL, FAILURE, SETUP_NEEDED
@@ -1094,8 +1095,10 @@ def _send_email_key(user):
     to user's email address
     """
     subject = _("Recover your %(site)s account") % {'site': askbot_settings.APP_SHORT_NAME}
+
+    url = urlparse(askbot_settings.APP_URL)
     data = {
-        'validation_link': askbot_settings.APP_URL + \
+        'validation_link': url.scheme + '://' + url.netloc + \
                             reverse(
                                     'user_account_recover',
                                     kwargs={'key':user.email_key}
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 7751cba6..33a6dbb2 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,6 +1,10 @@
 Changes in Askbot
 =================
 
+Development version (not released yet)
+--------------------------------------
+* Made email recovery link work when askbot is deployed on subdirectory (Evgeny)
+
 0.7.39 (Jan 11, 2012)
 ---------------------
 * restored facebook login after FB changed the procedure (Evgeny)
-- 
cgit v1.2.3-1-g7c22


From cbbfc6ad51f196b9b4f626a8ff5219e8fd0312bf Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 00:16:15 -0300
Subject: added test for CSRF_COOKIE_DOMAIN setting in the startup_procedures

---
 .gitignore                      |  1 +
 askbot/doc/source/changelog.rst |  1 +
 askbot/startup_procedures.py    | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/.gitignore b/.gitignore
index d6a06e66..b4e6ec96 100755
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ settings.py
 *.iml
 lint
 env
+/static
 django
 django/*
 nbproject
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 33a6dbb2..c26ce8c2 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -4,6 +4,7 @@ Changes in Askbot
 Development version (not released yet)
 --------------------------------------
 * Made email recovery link work when askbot is deployed on subdirectory (Evgeny)
+* Added tests for the CSRF_COOKIE_DOMAIN setting in the startup_procedures (Evgeny)
 
 0.7.39 (Jan 11, 2012)
 ---------------------
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 05426898..8d3f4a75 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -9,6 +9,7 @@ the main function is run_startup_tests
 """
 import sys
 import os
+import re
 from django.db import transaction
 from django.conf import settings as django_settings
 from django.core.exceptions import ImproperlyConfigured
@@ -272,6 +273,33 @@ class SettingsTester(object):
                 '\n\n* '.join(self.messages)
             )
 
+def test_csrf_cookie_domain():
+    """makes sure that csrf cookie domain setting is acceptable"""
+    #todo: maybe use the same steps to clean domain name
+    csrf_cookie_domain = django_settings.CSRF_COOKIE_DOMAIN
+    if csrf_cookie_domain == 'localhost':
+        raise ImproperlyConfigured(
+            PREAMBLE + 
+            '\n\nPlease do not use value "localhost" for the setting '
+            'CSRF_COOKIE_DOMAIN\n'
+            'instead use 127.0.0.1, a real IP '
+            'address or domain name.'
+            '\nThe value must match the network location you type in the '
+            'web browser to reach your site.'
+        )
+    if re.match(r'https?://', csrf_cookie_domain):
+        raise ImproperlyConfigured(
+            PREAMBLE +
+            '\n\nplease remove http(s):// prefix in the CSRF_COOKIE_DOMAIN '
+            'setting'
+        )
+    if ':' in csrf_cookie_domain:
+        raise ImproperlyConfigured(
+            PREAMBLE + 
+            '\n\nPlease do not use port number in the CSRF_COOKIE_DOMAIN '
+            'setting'
+        )
+
 def run_startup_tests():
     """function that runs
     all startup tests, mainly checking settings config so far
@@ -285,6 +313,7 @@ def run_startup_tests():
     #test_postgres()
     test_middleware()
     test_celery()
+    test_csrf_cookie_domain()
     settings_tester = SettingsTester({
         'CACHE_MIDDLEWARE_ANONYMOUS_ONLY': {
             'value': True,
-- 
cgit v1.2.3-1-g7c22


From a4637405df6574c66e8cfcba2c1cbac5d8825665 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 19:45:48 -0300
Subject: staticfiles app seems to work with askbot for django 1.2 and 1.3

---
 askbot/context.py                               |   2 ++
 askbot/doc/source/deployment.rst                |  29 +++++++++++-----
 askbot/setup_templates/settings.py              |   2 +-
 askbot/setup_templates/settings.py.mustache     |   2 +-
 askbot/skins/common/templates/debug_header.html |  27 +++++++++++++++
 askbot/skins/default/templates/base.html        |   1 +
 askbot/startup_procedures.py                    |  44 +++++++++++++++++++-----
 askbot/tests/images/logo.gif                    | Bin
 askbot/tests/skin_tests.py                      |   6 +---
 9 files changed, 89 insertions(+), 24 deletions(-)
 create mode 100644 askbot/skins/common/templates/debug_header.html
 mode change 100755 => 100644 askbot/tests/images/logo.gif

diff --git a/askbot/context.py b/askbot/context.py
index c967931e..41298fc1 100644
--- a/askbot/context.py
+++ b/askbot/context.py
@@ -2,6 +2,7 @@
 from the django settings, all parameters from the askbot livesettings
 and the application available for the templates
 """
+import sys
 from django.conf import settings
 import askbot
 from askbot import api
@@ -18,6 +19,7 @@ def application_settings(request):
     my_settings['STATIC_URL'] = settings.STATIC_URL
     my_settings['ASKBOT_CSS_DEVEL'] = getattr(settings, 'ASKBOT_CSS_DEVEL', False)
     my_settings['DEBUG'] = settings.DEBUG
+    my_settings['USING_RUNSERVER'] = 'runserver' in sys.argv
     my_settings['ASKBOT_VERSION'] = askbot.get_version()
     my_settings['LOGIN_URL'] = url_utils.get_login_url()
     my_settings['LOGOUT_URL'] = url_utils.get_logout_url()
diff --git a/askbot/doc/source/deployment.rst b/askbot/doc/source/deployment.rst
index 8baa99c0..1ca7553f 100644
--- a/askbot/doc/source/deployment.rst
+++ b/askbot/doc/source/deployment.rst
@@ -6,18 +6,30 @@ Deploying Askbot
 
 Deploying askbot (assuming that it is already installed) entails:
 
+* collecting static media files
 * setting correct file access permissions
 * configuring the webserver to work with your application
 
 This document currently explains the configuration under Apache and mod_wsgi_.
 
+Collecting static media files
+-----------------------------
+Static media must be collected into a single location with a command::
+
+    python manage.py collectstatic
+
+There are several options on where to put the static files - the simplest is 
+a local directory, but it is also possible to use a dedicated static files
+storage or a CDN, for more information see django documentation about
+serving static files.
+
 Setting up file access permissions
 ----------------------------------
 
 Webserver process must be able to write to the following locations within your project::
 
- log/
- askbot/upfiles
+    log/
+    askbot/upfiles
 
 If you know user name or the group name under which the webserver runs,
 you can make those directories writable by setting the permissons
@@ -26,11 +38,11 @@ accordingly:
 For example, if you are using Linux installation of apache webserver running under
 group name 'apache' you could do the following::
 
- cd /path/to/django-project
- cd .. #go one level up
- chown -R yourlogin:apache django-project 
- chmod -R g+w django-project/askbot/upfiles
- chmod -R g+w django-project/log
+    cd /path/to/django-project
+    cd .. #go one level up
+    chown -R yourlogin:apache django-project 
+    chmod -R g+w django-project/askbot/upfiles
+    chmod -R g+w django-project/log
 
 If your account somehow limits you from running such commands - please consult your
 system administrator.
@@ -71,9 +83,8 @@ Settings below are not perfect but may be a good starting point::
 
          #aliases to serve static media directly
          #will probably need adjustment
-         Alias /m/ /usr/local/lib/python2.6/site-packages/askbot/skins/
+         Alias /static/ /path/to/django-project/static/
          Alias /upfiles/ /path/to/django-project/askbot/upfiles/
-         Alias /admin/media/ /usr/local/lib/python2.6/site-packages/django/contrib/admin/media/
          <DirectoryMatch "/path/to/django-project/askbot/skins/([^/]+)/media">
             Order deny,allow
             Allow from all
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 1efb4e75..00bbcc11 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -80,7 +80,7 @@ STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')#path to files collected by co
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/admin/media/'
+ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'#must be this value
 
 # Make up some unique string, and don't share it with anybody.
 SECRET_KEY = 'sdljdfjkldsflsdjkhsjkldgjlsdgfs s '
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index 5a02cd35..d231bf64 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -80,7 +80,7 @@ STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/admin/media/'
+ADMIN_MEDIA_PREFIX = STATIC_ROOT + 'admin/'
 
 # Make up some unique string, and don't share it with anybody.
 SECRET_KEY = 'sdljdfjkldsflsdjkhsjkldgjlsdgfs s ' 
diff --git a/askbot/skins/common/templates/debug_header.html b/askbot/skins/common/templates/debug_header.html
new file mode 100644
index 00000000..e1230265
--- /dev/null
+++ b/askbot/skins/common/templates/debug_header.html
@@ -0,0 +1,27 @@
+{% if settings.USING_RUNSERVER %}
+    {% if settings.DEBUG == False %}
+    <div>
+        <p>
+            You are seeing this message because you are using Django runserver
+            and DEBUG_MODE is False. Runserver should not be used in production.
+        </p>
+        <p>
+            To serve static media in production - please run:
+            <pre>python manage.py collectstatic</pre>
+        </p>
+        <p>
+            If you do not see page styling - set DEBUG_MODE = True.
+        </p>
+    </div>
+    {% endif %}
+{% else %}
+    {% if settings.DEBUG == True %}
+        <div>
+            <p> 
+                Debug mode is on, do not use it in production.
+                To turn it off, use DEBUG = False in your 
+                settings.py file.
+            </p>
+        </div>
+    {% endif %}
+{% endif %}
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 8287f5ba..39b89fe8 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -16,6 +16,7 @@
     {% endspaceless %}
     <body class="{% block body_class %}{% endblock %}{% if user_messages %} user-messages{% endif %}{% if page_class %} {{page_class}}{% endif %}{% if request.user.is_anonymous() %} anon{% endif %} lang-{{settings.LANGUAGE_CODE}}">
         {% include "widgets/system_messages.html" %}
+        {% include "debug_header.html" %}
         {% include "custom_header.html" ignore missing %}
         {% if settings.CUSTOM_HEADER|trim != '' %}
         <div id="custom-header">
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index f002c3d5..691f0a03 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -309,16 +309,25 @@ class SettingsTester(object):
 def test_staticfiles():
     """tests configuration of the staticfiles app"""
     errors = list()
-    if 'django.contrib.staticfiles' not in django_settings.INSTALLED_APPS:
+    import django
+    django_version = django.VERSION
+    if django_version[0] == 1 and django_version[1] < 3:
+        staticfiles_app_name = 'staticfiles'
+        try_import('staticfiles', 'django-staticfiles')
+        import staticfiles
+        if staticfiles.__version__[0] != 1:
+            raise AskbotConfigError(
+                'Please use the newest available version of '
+                'django-staticfiles app, type\n'
+                'pip install --upgrade django-staticfiles'
+            )
+    else:
+        staticfiles_app_name = 'django.contrib.staticfiles'
+
+    if staticfiles_app_name not in django_settings.INSTALLED_APPS:
         errors.append(
             'Add to the INSTALLED_APPS section of your settings.py:\n'
-            "    'django.contrib.staticfiles',"
-        )
-    if 'django.core.context_processors.static' not in \
-        django_settings.TEMPLATE_CONTEXT_PROCESSORS:
-        errors.append(
-            'Add to the TEMPLATE_CONTEXT_PROCESSORS section of your settings.py:\n'
-            "    'django.core.context_processors.static',"
+            "    '%s'," % staticfiles_app_name
         )
     static_url = django_settings.STATIC_URL
     if static_url is None or str(static_url).strip() == '':
@@ -333,6 +342,12 @@ def test_staticfiles():
         errors.append(
             'Path in the STATIC_URL must start and end with the /.'
         )
+    if django_settings.ADMIN_MEDIA_PREFIX != static_url + 'admin/':
+        errors.append(
+            'Set ADMIN_MEDIA_PREFIX as: \n'
+            "    ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'"
+        )
+
     askbot_root = os.path.dirname(askbot.__file__)
     skin_dir = os.path.abspath(os.path.join(askbot_root, 'skins'))
     if skin_dir not in map(os.path.abspath, django_settings.STATICFILES_DIRS):
@@ -355,7 +370,20 @@ def test_staticfiles():
                 'ASKBOT_EXTRA_SKINS_DIR just above STATICFILES_DIRS.'
             )
 
+    if errors:
+        errors.append(
+            'Run command (after fixing the above errors)\n'
+            '    python manage.py collectstatic\n'
+        )
     print_errors(errors)
+    if django_settings.DEBUG and django_settings.STATICFILES_STORAGE != \
+        'django.contrib.staticfiles.storage.StaticFilesStorage':
+        if not os.path.isdir(django_settings.STATIC_ROOT):
+            askbot_warning(
+                'Please run command\n\n'
+                '    python manage.py collectstatic'
+
+            )
 
 def run_startup_tests():
     """function that runs
diff --git a/askbot/tests/images/logo.gif b/askbot/tests/images/logo.gif
old mode 100755
new mode 100644
diff --git a/askbot/tests/skin_tests.py b/askbot/tests/skin_tests.py
index ecbea77d..5226e6d6 100644
--- a/askbot/tests/skin_tests.py
+++ b/askbot/tests/skin_tests.py
@@ -41,13 +41,9 @@ class SkinTests(TestCase):
     def assert_default_logo_in_skin(self, skin_name):
         url = skin_utils.get_media_url(askbot_settings.SITE_LOGO_URL)
         self.assertTrue('/' + skin_name + '/' in url)
-        response = self.client.get(url)
-        self.assertTrue(response.status_code == 200)
 
     def test_default_skin_logo(self):
-        """make sure that default logo
-        is where it is expected
-        """
+        """make sure that default logo is where it is expected"""
         self.assert_default_logo_in_skin('default')
 
     def test_switch_to_custom_skin_logo(self):
-- 
cgit v1.2.3-1-g7c22


From 9a244434389e11ea2d5a229b8dd8da9d79d856b4 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 19:49:51 -0300
Subject: reverted minimum django version to 1.1.2 in the requirements.txt

---
 askbot_requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/askbot_requirements.txt b/askbot_requirements.txt
index 6f7a170c..fc11d9d1 100644
--- a/askbot_requirements.txt
+++ b/askbot_requirements.txt
@@ -1,5 +1,5 @@
 akismet
-django>=1.3
+django>=1.1.2
 Jinja2
 Coffin>=0.3
 South>=0.7.1
-- 
cgit v1.2.3-1-g7c22


From 89ba4e0652ec517385c6b997e64109935d5cc73c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 20:48:15 -0300
Subject: fixed bugs in the settings.py templates

---
 askbot/setup_templates/settings.py          | 2 +-
 askbot/setup_templates/settings.py.mustache | 6 +++---
 askbot/startup_procedures.py                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 00bbcc11..34fba64d 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -9,7 +9,7 @@ import site
 ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__))
 site.addsitedir(os.path.join(ASKBOT_ROOT, 'deps'))
 
-DEBUG = False#set to True to enable debugging
+DEBUG = True#set to True to enable debugging
 TEMPLATE_DEBUG = False#keep false when debugging jinja2 templates
 INTERNAL_IPS = ('127.0.0.1',)
 
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index d231bf64..b9a52d16 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -6,10 +6,10 @@ import askbot
 import site
 
 #this line is added so that we can import pre-packaged askbot dependencies
-ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__)
+ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__))
 site.addsitedir(os.path.join(ASKBOT_ROOT, 'deps'))
 
-DEBUG = False#set to True to enable debugging
+DEBUG = True#set to True to enable debugging
 TEMPLATE_DEBUG = False#keep false when debugging jinja2 templates
 INTERNAL_IPS = ('127.0.0.1',)
 
@@ -80,7 +80,7 @@ STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = STATIC_ROOT + 'admin/'
+ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
 
 # Make up some unique string, and don't share it with anybody.
 SECRET_KEY = 'sdljdfjkldsflsdjkhsjkldgjlsdgfs s ' 
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 691f0a03..88b717bc 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -376,7 +376,7 @@ def test_staticfiles():
             '    python manage.py collectstatic\n'
         )
     print_errors(errors)
-    if django_settings.DEBUG and django_settings.STATICFILES_STORAGE != \
+    if django_settings.DEBUG and django_settings.STATICFILES_STORAGE == \
         'django.contrib.staticfiles.storage.StaticFilesStorage':
         if not os.path.isdir(django_settings.STATIC_ROOT):
             askbot_warning(
-- 
cgit v1.2.3-1-g7c22


From eb3501e4b14bf3ad785e8cfc641f28fb0d7f24f6 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 21:14:30 -0300
Subject: made deployer omit staticfiles app with django < 1.3 so that users
 are forced to install it manually

---
 askbot/deployment/__init__.py               | 7 +++++++
 askbot/setup_templates/settings.py          | 1 -
 askbot/setup_templates/settings.py.mustache | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py
index 6f7a86f6..d7eb017e 100644
--- a/askbot/deployment/__init__.py
+++ b/askbot/deployment/__init__.py
@@ -3,6 +3,7 @@ module for deploying askbot
 """
 import os.path
 import sys
+import django
 from optparse import OptionParser
 from askbot.utils import console
 from askbot.deployment import messages
@@ -126,6 +127,12 @@ def deploy_askbot(directory, options):
 
     path_utils.create_path(directory)
 
+    if django.VERSION[0] == 1 and django.VERSION[1] < 3:
+        #force people install the django-staticfiles app
+        context['staticfiles_app'] = None
+    else:
+        context['staticfiles_app'] = 'django.contrib.staticfiles'
+
     path_utils.deploy_into(
         directory,
         new_project = create_new_project,
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 34fba64d..7e285d03 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -146,7 +146,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'askbot.user_messages.context_processors.user_messages',#must be before auth
     'django.core.context_processors.auth', #this is required for admin
     'django.core.context_processors.csrf', #necessary for csrf protection
-    'django.core.context_processors.static',
 )
 
 
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index b9a52d16..e1b485b2 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -145,7 +145,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'askbot.user_messages.context_processors.user_messages',#must be before auth
     'django.core.context_processors.auth', #this is required for admin
     'django.core.context_processors.csrf', #necessary for csrf protection
-    'django.core.context_processors.static', #adds STATIC_URL to the context
 )
 
 
@@ -154,7 +153,9 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'django.contrib.staticfiles',
+    {#staticfiles_app?}
+    '{{ staticfiles_app }}',
+    {/staticfiles_app?}
 
     #all of these are needed for the askbot
     'django.contrib.admin',
-- 
cgit v1.2.3-1-g7c22


From 4f9d8ebbb2ff636829e0a4e6f632e8fd2ce735b5 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 21:26:30 -0300
Subject: removed conditional statement from mustache template as it is not
 working in pystache

---
 askbot/deployment/__init__.py               | 2 +-
 askbot/setup_templates/settings.py.mustache | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py
index d7eb017e..6aa866cc 100644
--- a/askbot/deployment/__init__.py
+++ b/askbot/deployment/__init__.py
@@ -129,7 +129,7 @@ def deploy_askbot(directory, options):
 
     if django.VERSION[0] == 1 and django.VERSION[1] < 3:
         #force people install the django-staticfiles app
-        context['staticfiles_app'] = None
+        context['staticfiles_app'] = 'staticfiles'
     else:
         context['staticfiles_app'] = 'django.contrib.staticfiles'
 
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index e1b485b2..2e82f273 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -153,9 +153,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    {#staticfiles_app?}
     '{{ staticfiles_app }}',
-    {/staticfiles_app?}
 
     #all of these are needed for the askbot
     'django.contrib.admin',
-- 
cgit v1.2.3-1-g7c22


From a742aa5317b9ab023f38310f4aa88129be3004fb Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 22:17:56 -0300
Subject: added default value requirement for STATICFILES_STORAGE setting

---
 askbot/deployment/__init__.py               | 4 ++--
 askbot/setup_templates/settings.py.mustache | 2 +-
 askbot/startup_procedures.py                | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py
index 6aa866cc..8832cd01 100644
--- a/askbot/deployment/__init__.py
+++ b/askbot/deployment/__init__.py
@@ -129,9 +129,9 @@ def deploy_askbot(directory, options):
 
     if django.VERSION[0] == 1 and django.VERSION[1] < 3:
         #force people install the django-staticfiles app
-        context['staticfiles_app'] = 'staticfiles'
+        context['staticfiles_app'] = ''
     else:
-        context['staticfiles_app'] = 'django.contrib.staticfiles'
+        context['staticfiles_app'] = "'django.contrib.staticfiles',"
 
     path_utils.deploy_into(
         directory,
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index 2e82f273..3bca11ba 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -153,7 +153,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    '{{ staticfiles_app }}',
+    {{ staticfiles_app }}
 
     #all of these are needed for the askbot
     'django.contrib.admin',
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 88b717bc..65877fdf 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -321,6 +321,12 @@ def test_staticfiles():
                 'django-staticfiles app, type\n'
                 'pip install --upgrade django-staticfiles'
             )
+        if not hasattr(django_settings, 'STATICFILES_STORAGE'):
+            raise AskbotConfigError(
+                'Configure STATICFILES_STORAGE setting as desired, '
+                'a reasonable default is\n'
+                "STATICFILES_STORAGE = 'staticfiles.storage.StaticFilesStorage'"
+            )
     else:
         staticfiles_app_name = 'django.contrib.staticfiles'
 
-- 
cgit v1.2.3-1-g7c22


From 7b301e703d9e9f5d46056a055c5d31f47b7af7d6 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 23:01:01 -0300
Subject: added test on wrong staticfiles app used

---
 askbot/startup_procedures.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 8f51a9ad..f4452e29 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -314,6 +314,7 @@ def test_staticfiles():
     django_version = django.VERSION
     if django_version[0] == 1 and django_version[1] < 3:
         staticfiles_app_name = 'staticfiles'
+        wrong_staticfiles_app_name = 'django.contrib.staticfiles'
         try_import('staticfiles', 'django-staticfiles')
         import staticfiles
         if staticfiles.__version__[0] != 1:
@@ -330,12 +331,18 @@ def test_staticfiles():
             )
     else:
         staticfiles_app_name = 'django.contrib.staticfiles'
+        wrong_staticfiles_app_name = 'staticfiles'
 
     if staticfiles_app_name not in django_settings.INSTALLED_APPS:
         errors.append(
             'Add to the INSTALLED_APPS section of your settings.py:\n'
             "    '%s'," % staticfiles_app_name
         )
+    if wrong_staticfiles_app_name in django_settings.INSTALLED_APPS:
+        errors.append(
+            'Remove from the INSTALLED_APPS section of your settings.py:\n'
+            "    '%s'," % wrong_staticfiles_app_name
+        )
     static_url = django_settings.STATIC_URL
     if static_url is None or str(static_url).strip() == '':
         errors.append(
-- 
cgit v1.2.3-1-g7c22


From 3035bd461f02ff238ddcede43ccea428fd03c20c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Jan 2012 23:02:59 -0300
Subject: removed bad copywriting from the send_email_alerts management command

---
 askbot/management/commands/send_email_alerts.py | 27 -------------------------
 1 file changed, 27 deletions(-)

diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py
index a9d69678..46ee555f 100644
--- a/askbot/management/commands/send_email_alerts.py
+++ b/askbot/management/commands/send_email_alerts.py
@@ -451,33 +451,6 @@ class Command(NoArgsCommand):
                 #                'the askbot and see what\'s new!<br>'
                 #              )
 
-                text += _(
-                            'Please visit us and see what\'s new! '
-                            'Could you spread the word about it - '
-                            'can somebody you know help answering those questions or '
-                            'benefit from posting one?'
-                        )
-
-                feeds = EmailFeedSetting.objects.filter(subscriber = user)
-                feed_freq = [feed.frequency for feed in feeds]
-                text += '<p></p>'
-                if 'd' in feed_freq:
-                    text += _('Your most frequent subscription setting is \'daily\' '
-                               'on selected questions. If you are receiving more than one '
-                               'email per day'
-                               'please tell about this issue to the site administrator.'
-                               )
-                elif 'w' in feed_freq:
-                    text += _('Your most frequent subscription setting is \'weekly\' '
-                               'if you are receiving this email more than once a week '
-                               'please report this issue to the site administrator.'
-                               )
-                text += ' '
-                text += _(
-                            'There is a chance that you may be receiving links seen '
-                            'before - due to a technicality that will eventually go away. '
-                        )
-
                 link = url_prefix + reverse(
                                         'user_subscriptions', 
                                         kwargs = {
-- 
cgit v1.2.3-1-g7c22