mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:15:19 +00:00
Merge pull request #668 from git-marijus/master
change the way tagrm works to allow tag removal on the fly
This commit is contained in:
commit
4891eb5b01
3 changed files with 72 additions and 35 deletions
|
@ -918,7 +918,7 @@ function photos_content(&$a) {
|
|||
foreach($link_item['term'] as $t) {
|
||||
$tags[$cnt] = array(0 => format_term_for_display($t));
|
||||
if($can_post && ($ph[0]['uid'] == $owner_uid)) {
|
||||
$tags[$cnt][1] = 'tagrm?f=&item=' . $link_item['id'];
|
||||
$tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']); //?f=&item=' . $link_item['id'];
|
||||
$tags[$cnt][2] = t('Remove');
|
||||
}
|
||||
$cnt ++;
|
||||
|
|
103
mod/tagrm.php
103
mod/tagrm.php
|
@ -52,53 +52,90 @@ function tagrm_post(&$a) {
|
|||
|
||||
function tagrm_content(&$a) {
|
||||
|
||||
$o = '';
|
||||
|
||||
if(! local_user()) {
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
$item = intval($_GET['item']);
|
||||
if(! $item) {
|
||||
// remove tag on the fly if item and tag are provided
|
||||
if((argc() == 4) && (argv(1) === 'drop') && intval(argv(2))) {
|
||||
|
||||
$item = intval(argv(2));
|
||||
$tag = argv(3);
|
||||
|
||||
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($item),
|
||||
intval(local_user())
|
||||
);
|
||||
|
||||
if(! $r)
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
|
||||
$r = fetch_post_tags($r,true);
|
||||
|
||||
$item = $r[0];
|
||||
|
||||
$new_tags = array();
|
||||
|
||||
if($item['term']) {
|
||||
for($x = 0; $x < count($item['term']); $x ++) {
|
||||
if($item['term'][$x]['term'] !== hex2bin($tag))
|
||||
$new_tags[] = $item['term'][$x];
|
||||
}
|
||||
}
|
||||
|
||||
if($new_tags)
|
||||
$item['term'] = $new_tags;
|
||||
else
|
||||
unset($item['term']);
|
||||
|
||||
item_store_update($item);
|
||||
|
||||
info( t('Tag removed') . EOL );
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
// NOTREACHED
|
||||
|
||||
}
|
||||
|
||||
//if we got only the item print a list of tags to select
|
||||
if((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) {
|
||||
|
||||
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($item),
|
||||
intval(local_user())
|
||||
);
|
||||
$o = '';
|
||||
|
||||
$item = intval(argv(2));
|
||||
|
||||
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($item),
|
||||
intval(local_user())
|
||||
);
|
||||
|
||||
if(! $r)
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
|
||||
$r = fetch_post_tags($r,true);
|
||||
|
||||
if(! count($r[0]['term']))
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
|
||||
$o .= '<h3>' . t('Remove Item Tag') . '</h3>';
|
||||
|
||||
$o .= '<p id="tag-remove-desc">' . t('Select a tag to remove: ') . '</p>';
|
||||
|
||||
$o .= '<form id="tagrm" action="tagrm" method="post" >';
|
||||
$o .= '<input type="hidden" name="item" value="' . $item . '" />';
|
||||
$o .= '<ul>';
|
||||
|
||||
|
||||
if(! $r)
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
foreach($r[0]['term'] as $x) {
|
||||
$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x['term']) . '" >' . bbcode($x['term']) . '</input></li>';
|
||||
}
|
||||
|
||||
$r = fetch_post_tags($r,true);
|
||||
$o .= '</ul>';
|
||||
$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . t('Remove') .'" />';
|
||||
$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . t('Cancel') .'" />';
|
||||
$o .= '</form>';
|
||||
|
||||
return $o;
|
||||
|
||||
if(! count($r[0]['term']))
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
|
||||
$o .= '<h3>' . t('Remove Item Tag') . '</h3>';
|
||||
|
||||
$o .= '<p id="tag-remove-desc">' . t('Select a tag to remove: ') . '</p>';
|
||||
|
||||
$o .= '<form id="tagrm" action="tagrm" method="post" >';
|
||||
$o .= '<input type="hidden" name="item" value="' . $item . '" />';
|
||||
$o .= '<ul>';
|
||||
|
||||
|
||||
foreach($r[0]['term'] as $x) {
|
||||
$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x['term']) . '" >' . bbcode($x['term']) . '</input></li>';
|
||||
}
|
||||
|
||||
$o .= '</ul>';
|
||||
$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . t('Remove') .'" />';
|
||||
$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . t('Cancel') .'" />';
|
||||
$o .= '</form>';
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
|
|
@ -85,7 +85,7 @@
|
|||
<div class="photo-item-tools-left" id="in-this-photo">
|
||||
<span id="in-this-photo-text">{{$tag_hdr}}</span>
|
||||
{{foreach $tags as $t}}
|
||||
{{$t.0}}{{if $edit}}<span id="tag-remove"> <a href="{{$t.1}}"><i class="icon-remove"></i></a> </span>{{/if}}
|
||||
{{$t.0}}{{if $edit}}<span id="tag-remove"> <a href="{{$t.1}}" onclick="return confirmDelete();"><i class="icon-remove"></i></a> </span>{{/if}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
Loading…
Reference in a new issue