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

[dev] One function to rules them all

Browse Source
This commit is contained in:
Shnoulle (Denis Chenu) 2017-04-21 00:48:41 +02:00
parent 1f31150932
commit cec634f99d
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/qvitter.php
View File

@ -107,6 +107,16 @@ class QvitterAction extends ApiAction
} else { } else {
$attachmentroot = common_path('attachment/', StatusNet::isHTTPS()); $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()); $instanceurl = common_path('', StatusNet::isHTTPS());
$favicon_path = QvitterPlugin::settings("favicon_path"); $favicon_path = QvitterPlugin::settings("favicon_path");
@ -383,6 +393,7 @@ class QvitterAction extends ApiAction
window.commonSessionToken = '<?php print common_session_token(); ?>'; window.commonSessionToken = '<?php print common_session_token(); ?>';
window.siteMaxThumbnailSize = <?php print common_config('thumbnail', 'maxsize'); ?>; window.siteMaxThumbnailSize = <?php print common_config('thumbnail', 'maxsize'); ?>;
window.siteAttachmentURLBase = '<?php print $attachmentroot; ?>'; window.siteAttachmentURLBase = '<?php print $attachmentroot; ?>';
window.siteAvatarURLBase = '<?php print $avatarroot; ?>';
window.siteEmail = '<?php print common_config('site', 'email'); ?>'; window.siteEmail = '<?php print common_config('site', 'email'); ?>';
window.siteLicenseTitle = '<?php print common_config('license', 'title'); ?>'; window.siteLicenseTitle = '<?php print common_config('license', 'title'); ?>';
window.siteLicenseURL = '<?php print common_config('license', 'url'); ?>'; window.siteLicenseURL = '<?php print common_config('license', 'url'); ?>';

22
js/misc-functions.js
View File

@ -726,18 +726,14 @@ function updateAllQueetsTimes() {
· · · · · · · · · */ · · · · · · · · · */
function isLocalURL(url) { 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; 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) { function detectLocalOrExternalUserObject(userObject) {
var dataProfileImageUrlWithoutProtocol = removeProtocolFromUrl(userObject.profile_image_url);
var siteInstanceURLWithoutProtocol = removeProtocolFromUrl(window.siteInstanceURL); if(isLocalURL(userObject.profile_image_url) ) {
if(dataProfileImageUrlWithoutProtocol.substring(0,siteInstanceURLWithoutProtocol.length) == siteInstanceURLWithoutProtocol
|| dataProfileImageUrlWithoutProtocol.substring(0,window.avatarServer.length) == window.avatarServer
){
return 'local'; return 'local';
} } else {
else {
return 'external'; return 'external';
} }
} }