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

Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

Browse Source
This commit is contained in:
Mario Vavti 2019-04-07 22:48:33 +02:00
commit b026be410c
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Zotlabs/Module/Photo.php
View File

@ -71,29 +71,32 @@ class Photo extends \Zotlabs\Web\Controller {
$modified = filemtime($default); $modified = filemtime($default);
$default = z_root() . '/' . $default; $default = z_root() . '/' . $default;
$uid = $person; $uid = $person;
$data = '';
$d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '' ]; $r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
call_hooks('get_profile_photo',$d); intval($resolution),
intval($uid),
$resolution = $d['imgscale']; intval(PHOTO_PROFILE)
$uid = $d['channel_id']; );
$default = $d['default']; if($r) {
$data = $d['data']; $modified = strtotime($r[0]['edited'] . "Z");
$mimetype = $d['mimetype']; $mimetype = $r[0]['mimetype'];
if(intval($r[0]['os_storage']))
$data = file_get_contents($data);
else
$data = dbunescbin($r[0]['content']);
}
if(! $data) { if(! $data) {
$r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1", $d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '' ];
intval($resolution), call_hooks('get_profile_photo',$d);
intval($uid),
intval(PHOTO_PROFILE) $resolution = $d['imgscale'];
); $uid = $d['channel_id'];
if($r) { $default = $d['default'];
$modified = strtotime($r[0]['edited'] . "Z"); $data = $d['data'];
$data = dbunescbin($r[0]['content']); $mimetype = $d['mimetype'];
$mimetype = $r[0]['mimetype'];
}
if(intval($r[0]['os_storage']))
$data = file_get_contents($data);
} }
if(! $data) { if(! $data) {

6
include/permissions.php
View File

@ -192,7 +192,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
// They are in your address book, but haven't been approved // They are in your address book, but haven't been approved
if($channel_perm & PERMS_PENDING) { if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
$ret[$perm_name] = true; $ret[$perm_name] = true;
continue; continue;
} }
@ -316,6 +316,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
if(! $x) { if(! $x) {
// not in address book and no guest token, see if they've got an xchan // not in address book and no guest token, see if they've got an xchan
$y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1", $y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1",
dbesc($observer_xchan) dbesc($observer_xchan)
); );
@ -327,7 +328,6 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
} }
$abperms = load_abconfig($uid,$observer_xchan,'my_perms'); $abperms = load_abconfig($uid,$observer_xchan,'my_perms');
} }
// system is blocked to anybody who is not authenticated // system is blocked to anybody who is not authenticated
@ -382,7 +382,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
// They are in your address book, but haven't been approved // They are in your address book, but haven't been approved
if($channel_perm & PERMS_PENDING) { if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
return true; return true;
} }