From 15b9a3b8ca1719494005b2551340e4ae75d0cc2e Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Sun, 5 Feb 2017 17:12:19 +0100 Subject: [PATCH] [fix] Attachment urls don't seems to be local if using different server in config --- actions/qvitter.php | 10 +++++++++- js/misc-functions.js | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/actions/qvitter.php b/actions/qvitter.php index 0cc23e4..9d5c288 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -84,7 +84,15 @@ class QvitterAction extends ApiAction $siterootdomain = common_config('site','server'); $qvitterpath = Plugin::staticPath('Qvitter', ''); $apiroot = common_path('api/', StatusNet::isHTTPS()); - $attachmentroot = common_path('attachment/', StatusNet::isHTTPS()); + + $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()); + } $instanceurl = common_path('', StatusNet::isHTTPS()); $favicon_path = QvitterPlugin::settings("favicon_path"); diff --git a/js/misc-functions.js b/js/misc-functions.js index 06f9663..76ce067 100644 --- a/js/misc-functions.js +++ b/js/misc-functions.js @@ -730,7 +730,12 @@ function isLocalURL(url) { return true; } else { - return false; + if(url.substring(0,window.siteAttachmentURLBase.length) == window.siteAttachmentURLBase) { + return true; + } + else { + return false; + } } }