TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix photo permission if a photo description is available and use the filename as default photo description if uploading via the editor

Browse Source
This commit is contained in:
Mario
2022-05-23 18:56:09 +00:00
parent 162d86983a
commit e146a67f4b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/items.php
View File

@@ -4831,7 +4831,10 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
$match = null;
// match img and zmg image links
if(preg_match_all("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/",$body,$match)) {
$images = $match[2];
// The URI can be in both places
$images = array_merge($match[1], $match[2]);
if($images) {
foreach($images as $image) {
if(! stristr($image,z_root() . '/photo/'))
@@ -4849,6 +4852,7 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
dbesc($image_uri),
intval($uid)
);
if($r && $r[0]['folder']) {
$f = q("select * from attach where hash = '%s' and is_dir = 1 and uid = %d limit 1",
dbesc($r[0]['folder']),

6
include/photos.php
View File

@@ -359,13 +359,13 @@ function photo_upload($channel, $observer, $args) {
$scale = 1;
$width = $url[1]['width'];
$height = $url[1]['height'];
$tag = (($r1) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
$tag = (($r1) ? '[zmg=' . $url[1]['href'] . ']' : '[zmg]');
}
else {
$scale = 2;
$width = $url[2]['width'];
$height = $url[2]['height'];
$tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
$tag = (($r2) ? '[zmg=' .$url[2]['href'] . ']' : '[zmg]');
}
$author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]';
@@ -379,7 +379,7 @@ function photo_upload($channel, $observer, $args) {
$summary = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
$obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
. $tag . $filename . '[/zmg]'
. '[/zrl]';
$url[] = [