From 1f311509321973e11301ca460b9e80340eee0edb Mon Sep 17 00:00:00 2001
From: Denis Chenu <denis@sondages.pro>
Date: Sat, 15 Apr 2017 20:29:21 +0200
Subject: [PATCH 1/3] [fix] Local profil are not detected with static avatar
 server - detectLocalOrExternalUserObject compare with base url of the server
 - if static avatar used : return always external (even with local user)

---
 actions/qvitter.php  | 3 +--
 js/misc-functions.js | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/actions/qvitter.php b/actions/qvitter.php
index 5ea9ded..6462bc9 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -302,10 +302,8 @@ class QvitterAction extends ApiAction
                     }
                 }
 
-
 				?>
 				<script>
-
 					/*
 					@licstart  The following is the entire license notice for the
 					JavaScript code in this page.
@@ -373,6 +371,7 @@ class QvitterAction extends ApiAction
 					window.fullUrlToThisQvitterApp = '<?php print $qvitterpath; ?>';
 					window.siteRootDomain = '<?php print $siterootdomain; ?>';
 					window.siteInstanceURL = '<?php print $instanceurl; ?>';
+					window.avatarServer= <?php print json_encode(common_config('avatar', 'server')) ?>;
 					window.defaultLinkColor = '<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>';
 					window.defaultBackgroundColor = '<?php print QvitterPlugin::settings("defaultbackgroundcolor"); ?>';
 					window.siteBackground = '<?php print QvitterPlugin::settings("sitebackground"); ?>';
diff --git a/js/misc-functions.js b/js/misc-functions.js
index b53f9be..47a0d8e 100644
--- a/js/misc-functions.js
+++ b/js/misc-functions.js
@@ -1054,7 +1054,9 @@ function userArrayCacheGetUserNicknameById(id) {
 function detectLocalOrExternalUserObject(userObject) {
 	var dataProfileImageUrlWithoutProtocol = removeProtocolFromUrl(userObject.profile_image_url);
 	var siteInstanceURLWithoutProtocol = removeProtocolFromUrl(window.siteInstanceURL);
-	if(dataProfileImageUrlWithoutProtocol.substring(0,siteInstanceURLWithoutProtocol.length) == siteInstanceURLWithoutProtocol){
+	if(dataProfileImageUrlWithoutProtocol.substring(0,siteInstanceURLWithoutProtocol.length) == siteInstanceURLWithoutProtocol
+		|| dataProfileImageUrlWithoutProtocol.substring(0,window.avatarServer.length) == window.avatarServer
+	){
 		return 'local';
 		}
 	else {

From cec634f99ddbdbea91b60b484fff83aa084b34e8 Mon Sep 17 00:00:00 2001
From: "Shnoulle (Denis Chenu)" <denis@shnoulle.net>
Date: Fri, 21 Apr 2017 00:48:41 +0200
Subject: [PATCH 2/3] [dev] One function to rules them all

---
 actions/qvitter.php  | 27 +++++++++++++++++++--------
 js/misc-functions.js | 24 ++++++++----------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/actions/qvitter.php b/actions/qvitter.php
index 6462bc9..6a00124 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -107,14 +107,24 @@ class QvitterAction extends ApiAction
 		} else {
 			$attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
 		}
+		$avatarconfig=common_config('avatar');
+		if($avatarconfig['server']) {
+			if(StatusNet::isHTTPS() ){
+				$avatarroot ='https://'.$avatarconfig['server'].$avatarconfig['path'];
+			} elseif(!StatusNet::isHTTPS()) {
+				$avatarroot ='http://'.$avatarconfig['server'].$avatarconfig['path'];
+			}
+		} else {
+			$attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
+		}
 		$instanceurl = common_path('', StatusNet::isHTTPS());
-        $favicon_path = QvitterPlugin::settings("favicon_path");
+		$favicon_path = QvitterPlugin::settings("favicon_path");
 
-        // user's browser's language setting
-        $user_browser_language = 'en'; // use english if we can't find the browser language
-        if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $user_browser_language = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-            }
+		// user's browser's language setting
+		$user_browser_language = 'en'; // use english if we can't find the browser language
+		if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+				$user_browser_language = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+				}
 
 
 		common_set_returnto(''); // forget this
@@ -379,15 +389,16 @@ class QvitterAction extends ApiAction
 					window.customWelcomeText = <?php print json_encode(QvitterPlugin::settings("customwelcometext")); ?>;
 					window.urlShortenerAPIURL = '<?php print QvitterPlugin::settings("urlshortenerapiurl"); ?>';
 					window.urlShortenerSignature = '<?php print QvitterPlugin::settings("urlshortenersignature"); ?>';
-                    window.urlshortenerFormat = '<?php print QvitterPlugin::settings("urlshortenerformat"); ?>';
+					window.urlshortenerFormat = '<?php print QvitterPlugin::settings("urlshortenerformat"); ?>';
 					window.commonSessionToken = '<?php print common_session_token(); ?>';
 					window.siteMaxThumbnailSize = <?php print common_config('thumbnail', 'maxsize'); ?>;
 					window.siteAttachmentURLBase = '<?php print $attachmentroot; ?>';
+					window.siteAvatarURLBase = '<?php print $avatarroot; ?>';
 					window.siteEmail = '<?php print common_config('site', 'email'); ?>';
 					window.siteLicenseTitle = '<?php print common_config('license', 'title'); ?>';
 					window.siteLicenseURL = '<?php print common_config('license', 'url'); ?>';
 					window.customTermsOfUse = <?php print json_encode(QvitterPlugin::settings("customtermsofuse")); ?>;
-                    window.siteLocalOnlyDefaultPath = <?php print (common_config('public', 'localonly') ? 'true' : 'false'); ?>;
+					window.siteLocalOnlyDefaultPath = <?php print (common_config('public', 'localonly') ? 'true' : 'false'); ?>;
                     <?php
 
                         // Get all topics in Qvitter's namespace in Profile_prefs
diff --git a/js/misc-functions.js b/js/misc-functions.js
index 47a0d8e..93e3e41 100644
--- a/js/misc-functions.js
+++ b/js/misc-functions.js
@@ -726,17 +726,13 @@ function updateAllQueetsTimes() {
    · · · · · · · · · */
 
 function isLocalURL(url) {
-	if(url.substring(0,window.siteInstanceURL.length) == window.siteInstanceURL) {
+	if(url.substring(0,window.siteInstanceURL.length) == window.siteInstanceURL // site url
+		|| url.substring(0,window.siteAttachmentURLBase.length) == window.siteAttachmentURLBase // attachment url
+		|| url.substring(0,window.siteAvatarURLBase.length) == window.siteAvatarURLBase // avatar url
+	) {
 		return true;
 		}
-	else {
-		if(url.substring(0,window.siteAttachmentURLBase.length) == window.siteAttachmentURLBase) {
-			return true;
-			}
-		else {
-			return false;
-			}
-		}
+	return false;
 	}
 
 
@@ -1052,14 +1048,10 @@ function userArrayCacheGetUserNicknameById(id) {
    · · · · · · · · · */
 
 function detectLocalOrExternalUserObject(userObject) {
-	var dataProfileImageUrlWithoutProtocol = removeProtocolFromUrl(userObject.profile_image_url);
-	var siteInstanceURLWithoutProtocol = removeProtocolFromUrl(window.siteInstanceURL);
-	if(dataProfileImageUrlWithoutProtocol.substring(0,siteInstanceURLWithoutProtocol.length) == siteInstanceURLWithoutProtocol
-		|| dataProfileImageUrlWithoutProtocol.substring(0,window.avatarServer.length) == window.avatarServer
-	){
+
+	if(isLocalURL(userObject.profile_image_url) ) {
 		return 'local';
-		}
-	else {
+	} else {
 		return 'external';
 		}
 	}

From 015927621d6f5563999f01722119bf95f461ccd9 Mon Sep 17 00:00:00 2001
From: Denis Chenu <denis@sondages.pro>
Date: Sat, 29 Apr 2017 14:16:54 +0200
Subject: [PATCH 3/3] Fix it too for $avatarconfig['server']

---
 actions/qvitter.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/actions/qvitter.php b/actions/qvitter.php
index 6a00124..35dff5c 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -98,27 +98,27 @@ class QvitterAction extends ApiAction
 		$siterootdomain = common_config('site','server');
 		$qvitterpath = Plugin::staticPath('Qvitter', '');
 		$apiroot = common_path('api/', StatusNet::isHTTPS());
-
+		$instanceurl = common_path('', StatusNet::isHTTPS());
+		$favicon_path = QvitterPlugin::settings("favicon_path");
 		$attachmentconfig=common_config('attachments');
 		if(StatusNet::isHTTPS() && $attachmentconfig['sslserver']){
 			$attachmentroot ='https://'.$attachmentconfig['sslserver'].$attachmentconfig['path'];
 		} elseif(!StatusNet::isHTTPS() && $attachmentconfig['server']) {
 			$attachmentroot ='http://'.$attachmentconfig['server'].$attachmentconfig['path'];
 		} else {
-			$attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
+			$attachmentroot = $instanceurl.$attachmentconfig['path'];
 		}
 		$avatarconfig=common_config('avatar');
 		if($avatarconfig['server']) {
 			if(StatusNet::isHTTPS() ){
 				$avatarroot ='https://'.$avatarconfig['server'].$avatarconfig['path'];
-			} elseif(!StatusNet::isHTTPS()) {
+			} else {
 				$avatarroot ='http://'.$avatarconfig['server'].$avatarconfig['path'];
 			}
 		} else {
-			$attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
+			$avatarroot = $instanceurl.$avatarconfig['path'];
 		}
-		$instanceurl = common_path('', StatusNet::isHTTPS());
-		$favicon_path = QvitterPlugin::settings("favicon_path");
+
 
 		// user's browser's language setting
 		$user_browser_language = 'en'; // use english if we can't find the browser language