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

Fix it too for $avatarconfig['server']

Browse Source
This commit is contained in:
Denis Chenu 2017-04-29 14:16:54 +02:00
parent cec634f99d
commit 015927621d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/qvitter.php
View File

@ -98,27 +98,27 @@ 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());
$instanceurl = common_path('', StatusNet::isHTTPS());
$favicon_path = QvitterPlugin::settings("favicon_path");
$attachmentconfig=common_config('attachments'); $attachmentconfig=common_config('attachments');
if(StatusNet::isHTTPS() && $attachmentconfig['sslserver']){ if(StatusNet::isHTTPS() && $attachmentconfig['sslserver']){
$attachmentroot ='https://'.$attachmentconfig['sslserver'].$attachmentconfig['path']; $attachmentroot ='https://'.$attachmentconfig['sslserver'].$attachmentconfig['path'];
} elseif(!StatusNet::isHTTPS() && $attachmentconfig['server']) { } elseif(!StatusNet::isHTTPS() && $attachmentconfig['server']) {
$attachmentroot ='http://'.$attachmentconfig['server'].$attachmentconfig['path']; $attachmentroot ='http://'.$attachmentconfig['server'].$attachmentconfig['path'];
} else { } else {
$attachmentroot = common_path('attachment/', StatusNet::isHTTPS()); $attachmentroot = $instanceurl.$attachmentconfig['path'];
} }
$avatarconfig=common_config('avatar'); $avatarconfig=common_config('avatar');
if($avatarconfig['server']) { if($avatarconfig['server']) {
if(StatusNet::isHTTPS() ){ if(StatusNet::isHTTPS() ){
$avatarroot ='https://'.$avatarconfig['server'].$avatarconfig['path']; $avatarroot ='https://'.$avatarconfig['server'].$avatarconfig['path'];
} elseif(!StatusNet::isHTTPS()) { } else {
$avatarroot ='http://'.$avatarconfig['server'].$avatarconfig['path']; $avatarroot ='http://'.$avatarconfig['server'].$avatarconfig['path'];
} }
} else { } 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's browser's language setting
$user_browser_language = 'en'; // use english if we can't find the browser language $user_browser_language = 'en'; // use english if we can't find the browser language