harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

we must now provide the full path to the profile image for the cavatar plugin to work

Browse Source
This commit is contained in:
Mario Vavti 2018-05-15 10:20:20 +02:00
parent 803e85caeb
commit de63e40a70
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Chatsvc.php
View File

@ -119,10 +119,10 @@ class Chatsvc extends \Zotlabs\Web\Controller {
$rv['xchan_network'] = 'unknown'; $rv['xchan_network'] = 'unknown';
$rv['xchan_url'] = z_root(); $rv['xchan_url'] = z_root();
$rv['xchan_hidden'] = 1; $rv['xchan_hidden'] = 1;
$rv['xchan_photo_mimetype'] = 'image/jpeg'; $rv['xchan_photo_mimetype'] = 'image/png';
$rv['xchan_photo_l'] = get_default_profile_photo(300); $rv['xchan_photo_l'] = z_root() . '/' . get_default_profile_photo(300);
$rv['xchan_photo_m'] = get_default_profile_photo(80); $rv['xchan_photo_m'] = z_root() . '/' . get_default_profile_photo(80);
$rv['xchan_photo_s'] = get_default_profile_photo(48); $rv['xchan_photo_s'] = z_root() . '/' . get_default_profile_photo(48);
} }

12
Zotlabs/Module/Photo.php
View File

@ -31,7 +31,7 @@ class Photo extends \Zotlabs\Web\Controller {
$observer_xchan = get_observer_hash(); $observer_xchan = get_observer_hash();
$default = get_default_profile_photo(); $default = z_root() . '/' . get_default_profile_photo();
if(isset($type)) { if(isset($type)) {
@ -45,11 +45,11 @@ class Photo extends \Zotlabs\Web\Controller {
case 'm': case 'm':
$resolution = 5; $resolution = 5;
$default = get_default_profile_photo(80); $default = z_root() . '/' . get_default_profile_photo(80);
break; break;
case 's': case 's':
$resolution = 6; $resolution = 6;
$default = get_default_profile_photo(48); $default = z_root() . '/' . get_default_profile_photo(48);
break; break;
case 'l': case 'l':
default: default:
@ -183,15 +183,15 @@ class Photo extends \Zotlabs\Web\Controller {
switch($resolution) { switch($resolution) {
case 4: case 4:
$data = file_get_contents(get_default_profile_photo()); $data = file_get_contents(z_root() . '/' . get_default_profile_photo());
$mimetype = 'image/png'; $mimetype = 'image/png';
break; break;
case 5: case 5:
$data = file_get_contents(get_default_profile_photo(80)); $data = file_get_contents(z_root() . '/' . get_default_profile_photo(80));
$mimetype = 'image/png'; $mimetype = 'image/png';
break; break;
case 6: case 6:
$data = file_get_contents(get_default_profile_photo(48)); $data = file_get_contents(z_root() . '/' . get_default_profile_photo(48));
$mimetype = 'image/png'; $mimetype = 'image/png';
break; break;
default: default:

2
Zotlabs/Module/Ping.php
View File

@ -401,7 +401,7 @@ class Ping extends \Zotlabs\Web\Controller {
'notify_link' => z_root() . '/admin/accounts', 'notify_link' => z_root() . '/admin/accounts',
'name' => $rr['account_email'], 'name' => $rr['account_email'],
'url' => '', 'url' => '',
'photo' => get_default_profile_photo(48), 'photo' => z_root() . '/' . get_default_profile_photo(48),
'when' => relative_date($rr['account_created']), 'when' => relative_date($rr['account_created']),
'hclass' => ('notify-unseen'), 'hclass' => ('notify-unseen'),
'message' => t('requires approval') 'message' => t('requires approval')

8
include/security.php
View File

@ -118,10 +118,10 @@ function atoken_xchan($atoken) {
'xchan_network' => 'unknown', 'xchan_network' => 'unknown',
'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], 'xchan_url' => z_root() . '/guest/' . substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'],
'xchan_hidden' => 1, 'xchan_hidden' => 1,
'xchan_photo_mimetype' => 'image/jpeg', 'xchan_photo_mimetype' => 'image/png',
'xchan_photo_l' => get_default_profile_photo(300), 'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(300),
'xchan_photo_m' => get_default_profile_photo(80), 'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80),
'xchan_photo_s' => get_default_profile_photo(48) 'xchan_photo_s' => z_root() . '/' . get_default_profile_photo(48)
]; ];
} }