From 3a77fc06bb3f5a80994fd3cd83b082ab25a1042e Mon Sep 17 00:00:00 2001
From: Slavik Svyrydiuk <svyrydiuk@gmail.com>
Date: Wed, 9 Dec 2015 21:44:01 +0100
Subject: [PATCH] reverted to hard-coded HTTPS scheme

---
 apps/reader/views.py                | 25 ++++++++++++-------------
 media/js/newsblur/models/folders.js |  4 ++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/reader/views.py b/apps/reader/views.py
index 8316315cf..66b77a048 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -5,7 +5,6 @@ import redis
 import requests
 import random
 import zlib
-#import ipdb
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
@@ -107,7 +106,9 @@ def dashboard(request, **kwargs):
         del request.session['import_from_google_reader']
     
     if not user.is_active:
-        return HttpResponseRedirect(reverse('stripe-form'))
+        url = "https://%s%s" % (Site.objects.get_current().domain,
+                                 reverse('stripe-form'))
+        return HttpResponseRedirect(url)
 
     logging.user(request, "~FBLoading dashboard")
 
@@ -181,7 +182,9 @@ def signup(request):
             login_user(request, new_user)
             logging.user(new_user, "~FG~SB~BBNEW SIGNUP: ~FW%s" % new_user.email)
             if not new_user.is_active:
-                return HttpResponseRedirect(reverse('stripe-form'))
+                url = "https://%s%s" % (Site.objects.get_current().domain,
+                                         reverse('stripe-form'))
+                return HttpResponseRedirect(url)
     
     return index(request)
         
@@ -960,7 +963,6 @@ def starred_stories_rss_feed(request, user_id, secret_token, tag_slug):
 
 def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
     domain = Site.objects.get_current().domain
-    scheme = 'https' if request.is_secure() else 'http'
     
     try:
         user = User.objects.get(pk=user_id)
@@ -1030,11 +1032,9 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
         
     data = {}
     data['title'] = "%s from %s (%s sites)" % (folder_title, user.username, len(feed_ids))
-    data['link'] = "%s://%s%s" % (
-        scheme,
+    data['link'] = "https://%s%s" % (
         domain,
-        reverse('folder', kwargs=dict(folder_name=folder_title))
-    )
+        reverse('folder', kwargs=dict(folder_name=folder_title)))
     data['description'] = "Unread stories in %s on NewsBlur. From %s's account and contains %s sites." % (
         folder_title,
         user.username,
@@ -1043,8 +1043,7 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
     data['generator'] = 'NewsBlur - %s' % settings.NEWSBLUR_URL
     data['docs'] = None
     data['author_name'] = user.username
-    data['feed_url'] = "%s://%s%s" % (
-        scheme,
+    data['feed_url'] = "https://%s%s" % (
         domain,
         reverse('folder-rss-feed', 
                 kwargs=dict(user_id=user_id, secret_token=secret_token, unread_filter=unread_filter, folder_slug=folder_slug)),
@@ -1064,7 +1063,7 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
             'link': story['story_permalink'],
             'description': story_content,
             'categories': story['story_tags'],
-            'unique_id': '%s://%s/site/%s/%s/' % (scheme, domain, story['story_feed_id'], story['guid_hash']),
+            'unique_id': 'https://%s/site/%s/%s/' % (domain, story['story_feed_id'], story['guid_hash']),
             'pubdate': localtime_for_timezone(story['story_date'], user.profile.timezone),
         }
         if story['story_authors']:
@@ -1074,9 +1073,9 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
     if not user.profile.is_premium:
         story_data = {
             'title': "You must have a premium account on NewsBlur to have RSS feeds for folders.",
-            'link': "%s://%s" % (scheme, domain),
+            'link': "https://%s" % domain,
             'description': "You must have a premium account on NewsBlur to have RSS feeds for folders.",
-            'unique_id': "%s://%s/premium_only" % (scheme, domain),
+            'unique_id': "https://%s/premium_only" % domain,
             'pubdate': localtime_for_timezone(datetime.datetime.now(), user.profile.timezone),
         }
         rss.add_item(**story_data)
diff --git a/media/js/newsblur/models/folders.js b/media/js/newsblur/models/folders.js
index a8054816f..708aa24b4 100644
--- a/media/js/newsblur/models/folders.js
+++ b/media/js/newsblur/models/folders.js
@@ -331,7 +331,7 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
         url = url.replace('{folder_title}', Inflector.sluggify(this.options.title));
         console.log(['rss_url', this]);
         
-        return document.location.protocol + "//" + NEWSBLUR.URLs.domain + url;
+        return "https://" + NEWSBLUR.URLs.domain + url;
     },
     
     view_setting: function(setting) {
@@ -391,4 +391,4 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
         }
     }
 
-});
+});
\ No newline at end of file