Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 02:15:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

redirect editpost to mod_photos correctly and open the form if photo

Browse source
This commit is contained in:
nobody 2021-07-20 02:29:52 -07:00
parent 8f3ae4e600
commit 34adec27a6
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Zotlabs/Module/Editpost.php
View file

@ -35,7 +35,6 @@ class Editpost extends Controller {
); );
// don't allow web editing of potentially binary content (item_obscured = 1) // don't allow web editing of potentially binary content (item_obscured = 1)
// @FIXME how do we do it instead?
if ((! $item) || intval($item[0]['item_obscured'])) { if ((! $item) || intval($item[0]['item_obscured'])) {
notice( t('Item is not editable') . EOL); notice( t('Item is not editable') . EOL);
@ -44,16 +43,17 @@ class Editpost extends Controller {
$item = array_shift($item); $item = array_shift($item);
if ($item['resource_type'] === 'photo' && $item['resource_id']) { $owner_uid = intval($item['uid']);
notice( t('Item is not editable') . EOL); $owner = channelx_by_n($owner_uid);
return;
if ($item['resource_type'] === 'photo' && $item['resource_id'] && $owner) {
goaway(z_root() . '/photos/' . $owner['channel_address'] . '/image/' . $item['resource_id'] . '?expandform=1');
} }
if ($item['resource_type'] === 'event' && $item['resource_id']) { if ($item['resource_type'] === 'event' && $item['resource_id']) {
goaway(z_root() . '/events/' . $item['resource_id'] . '?expandform=1'); goaway(z_root() . '/events/' . $item['resource_id'] . '?expandform=1');
} }
$owner_uid = $item['uid'];
$channel = App::get_channel(); $channel = App::get_channel();

3
Zotlabs/Module/Photos.php
View file

@ -1108,7 +1108,8 @@ class Photos extends Controller {
'adult_enabled' => feature_enabled($owner_uid,'adult_photo_flagging'), 'adult_enabled' => feature_enabled($owner_uid,'adult_photo_flagging'),
'adult' => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''), 'adult' => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''),
'submit' => t('Submit'), 'submit' => t('Submit'),
'delete' => t('Delete Photo') 'delete' => t('Delete Photo'),
'expandform' => ((x($_GET,'expandform')) ? true : false)
]; ];
} }

2
view/tpl/photo_view.tpl
View file

@ -44,7 +44,7 @@
<div id="photo-map"> <div id="photo-map">
{{$map}} {{$map}}
</div> </div>
<div id="photo-edit" class="section-content-tools-wrapper"> <div id="photo-edit" class="section-content-tools-wrapper" style="display:{{if $edit.expandform}} block; {{else}} none;{{/if}}" >
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'>
<input type="hidden" name="item_id" value="{{$edit.item_id}}" /> <input type="hidden" name="item_id" value="{{$edit.item_id}}" />
{{* album renaming is not supported atm. {{* album renaming is not supported atm.