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

provide default photo mimetype

Browse Source
This commit is contained in:
zotlabs 2017-09-20 00:00:26 -07:00
parent 61d9b34929
commit 9e46472ca2
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/channel.php
View File

@ -278,11 +278,13 @@ function create_identity($arr) {
intval($arr['account_id']) intval($arr['account_id'])
); );
$photo_type = null;
$z = [ 'account' => $a[0], 'channel' => $r[0], 'photo_url' => '' ]; $z = [ 'account' => $a[0], 'channel' => $r[0], 'photo_url' => '' ];
call_hooks('create_channel_photo',$z); call_hooks('create_channel_photo',$z);
if($z['photo_url']) { if($z['photo_url']) {
import_channel_photo_from_url($z['photo_url'],$arr['account_id'],$r[0]['channel_id']); $photo_type = import_channel_photo_from_url($z['photo_url'],$arr['account_id'],$r[0]['channel_id']);
} }
if($role_permissions && array_key_exists('limits',$role_permissions)) if($role_permissions && array_key_exists('limits',$role_permissions))
@ -330,6 +332,7 @@ function create_identity($arr) {
'xchan_guid' => $guid, 'xchan_guid' => $guid,
'xchan_guid_sig' => $sig, 'xchan_guid_sig' => $sig,
'xchan_pubkey' => $key['pubkey'], 'xchan_pubkey' => $key['pubkey'],
'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'),
'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}", 'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}",
'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}", 'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}",
'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}", 'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}",

3
include/perm_upgrade.php
View File

@ -135,6 +135,9 @@ function translate_abook_perms_outbound(&$abook) {
$my_perms = 0; $my_perms = 0;
$their_perms = 0; $their_perms = 0;
if(! $abook)
return;
if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && $abook['abconfig']) { if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && $abook['abconfig']) {
foreach($abook['abconfig'] as $p) { foreach($abook['abconfig'] as $p) {
if($p['cat'] === 'their_perms') { if($p['cat'] === 'their_perms') {

1
include/photo/photo_driver.php
View File

@ -666,6 +666,7 @@ function import_channel_photo_from_url($photo,$aid,$uid) {
import_channel_photo($img_str,$type,$aid,$uid); import_channel_photo($img_str,$type,$aid,$uid);
return $type;
} }