wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix84_attachmenturl' into 'master'

Browse Source 
[fix] Attachment urls don't seems to be local if using different server in config

See merge request !83
This commit is contained in:
hannes 2017-02-05 18:30:22 +00:00
commit 65c18a252c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/qvitter.php
View File

@ -84,7 +84,15 @@ class QvitterAction extends ApiAction
$siterootdomain = common_config('site','server'); $siterootdomain = common_config('site','server');
$qvitterpath = Plugin::staticPath('Qvitter', ''); $qvitterpath = Plugin::staticPath('Qvitter', '');
$apiroot = common_path('api/', StatusNet::isHTTPS()); $apiroot = common_path('api/', 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()); $attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
}
$instanceurl = common_path('', StatusNet::isHTTPS()); $instanceurl = common_path('', StatusNet::isHTTPS());
$favicon_path = QvitterPlugin::settings("favicon_path"); $favicon_path = QvitterPlugin::settings("favicon_path");

5
js/misc-functions.js
View File

@ -729,10 +729,15 @@ function isLocalURL(url) {
if(url.substring(0,window.siteInstanceURL.length) == window.siteInstanceURL) { if(url.substring(0,window.siteInstanceURL.length) == window.siteInstanceURL) {
return true; return true;
} }
else {
if(url.substring(0,window.siteAttachmentURLBase.length) == window.siteAttachmentURLBase) {
return true;
}
else { else {
return false; return false;
} }
} }
}
/* · /* ·