From f0786ee8fe37effd87c52e26b2194466efb5d9ff Mon Sep 17 00:00:00 2001
From: Hannes Mannerheim <h@nnesmannerhe.im>
Date: Tue, 29 Dec 2015 16:35:09 +0100
Subject: [PATCH] fixes for quitter.se https setup

---
 actions/qvitter.php | 6 +++---
 js/qvitter.js       | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/actions/qvitter.php b/actions/qvitter.php
index 48b39c2..16e8600 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -88,7 +88,6 @@ class QvitterAction extends ApiAction
 		$instanceurl = common_path('', StatusNet::isHTTPS());
 
 
-
 		common_set_returnto(''); // forget this
 
 		// if this is a profile we add a link header for LRDD Discovery (see WebfingerPlugin.php)
@@ -201,9 +200,10 @@ class QvitterAction extends ApiAction
 					window.thisSiteThinksItIsHttpButIsActuallyHttps = <?php
 
                         // this is due to a crazy setup at quitter.se, sorry about that
-						if(isset($_SERVER['HTTPS'])
+                        $siteSSL = common_config('site', 'ssl');
+                        if(isset($_SERVER['HTTPS'])
 						&& $_SERVER['HTTPS'] != 'off'
-						&& substr($instanceurl,0,7) == 'http://') {
+						&& $siteSSL == 'never' ) {
                             $this_site_thinks_it_is_http_but_is_actually_https = true;
                             print 'true';
 							}
diff --git a/js/qvitter.js b/js/qvitter.js
index efc62cf..092f4e7 100644
--- a/js/qvitter.js
+++ b/js/qvitter.js
@@ -3731,12 +3731,6 @@ function uploadAttachment(e, thisUploadButton) {
 
 				var mediaurl = rsp.find('mediaurl').text();
 
-				// if this site is like quitter.se, we have to do this, otherwise
-				// gnusocial will not recognize the link to the image as a local attachment
-				if(window.thisSiteThinksItIsHttpButIsActuallyHttps) {
-					mediaurl = mediaurl.replace('https://','http://');
-					}
-
 				$('img.to-upload').attr('data-shorturl', mediaurl);
 				$('img.to-upload').addClass('uploaded');
 				$('img.to-upload').removeClass('to-upload');