allowed use of custom csrf cookie name in js

2 files changed, 17 insertions, 13 deletions

diff --git a/askbot/media/js/utils.js b/askbot/media/js/utils.js
index ef4309bd..a3eb2028 100644
--- a/askbot/media/js/utils.js
+++ b/askbot/media/js/utils.js
@@ -6,6 +6,21 @@ var mediaUrl = function(resource){
     return askbot['settings']['static_url'] + 'default' + '/' + resource;
 };
 
+var getCookie = function(name) {
+    var cookieValue = null;
+    if (document.cookie && document.cookie != '') {
+        var cookies = document.cookie.split(';');
+        for (var i = 0; i < cookies.length; i++) {
+            var cookie = $.trim(cookies[i]);
+            // Does this cookie string begin with the name we want?
+            if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                return decodeURIComponent(cookie.substring(name.length + 1));
+            }
+        }
+    }
+    return cookieValue;
+};
+
 var cleanUrl = function(url){
     var re = new RegExp('//', 'g');
     return url.replace(re, '/');
@@ -277,18 +292,6 @@ var notify = function() {
     };
 }();
 
-/*
- * CSRF token extractor
- */
-var getCSRFToken = function() {
-    var re = /_csrf=([^;]*)/;
-    var match = re.exec(document.cookie);
-    if(match)
-        return match[1];
-    else
-        return ''
-}
-
 
 /* **************************************************** */
 // Search query-string manipulation utils
@@ -1390,7 +1393,7 @@ CommentConvertLink.prototype.createDom = function(){
     var csrf_token = this.makeElement('input');
     csrf_token.attr('type', 'hidden');
     csrf_token.attr('name', 'csrfmiddlewaretoken');
-    csrf_token.attr('value', getCSRFToken());
+    csrf_token.attr('value', getCookie(askbot['settings']['csrfCookieName']));
     element.append(csrf_token);
 
     var submit = this.makeElement('input');
diff --git a/askbot/templates/meta/bottom_scripts.html b/askbot/templates/meta/bottom_scripts.html
index 3f1a6e57..c027258e 100644
--- a/askbot/templates/meta/bottom_scripts.html
+++ b/askbot/templates/meta/bottom_scripts.html
@@ -43,6 +43,7 @@
     {% endif %}
     askbot['data']['haveFlashNotifications'] = {{ user_messages|as_js_bool }};
     askbot['data']['activeTab'] = '{{ active_tab }}';
+    askbot['settings']['csrfCookieName'] = '{{ settings.CSRF_COOKIE_NAME }}';
     {% if search_state %}
         askbot['data']['searchUrl'] = '{{ search_state.query_string()|escapejs }}';
     {% else %}