keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6003 from JonnyTischbein/issue_phototag

Browse source 
Fix adding / removing photo tags
This commit is contained in:
Hypolite Petovan 2018-10-25 20:48:03 -04:00 committed by GitHub
commit 884ab0d71d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mod/photos.php
View file

@ -612,7 +612,7 @@ function photos_post(App $a)
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
$str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
$str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
}
}
}
@ -1417,17 +1417,17 @@ function photos_content(App $a)
if (count($linked_items) && strlen($link_item['tag'])) {
$arr = explode(',', $link_item['tag']);
// parse tags and add links
$tag_str = '';
foreach ($arr as $t) {
if (strlen($tag_str)) {
$tag_str .= ', ';
}
$tag_str .= BBCode::convert($t);
$tag_arr = [];
foreach ($arr as $tag) {
$tag_arr[] = [
'name' => BBCode::convert($tag),
'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag)
];
}
$tags = [L10n::t('Tags: '), $tag_str];
$tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr];
if ($cmd === 'edit') {
$tags[] = 'tagrm/' . $link_item['id'];
$tags[] = L10n::t('[Remove any tag]');
$tags['removeanyurl'] = 'tagrm/' . $link_item['id'];
$tags['removetitle'] = L10n::t('[Select tags to remove]');
}
}

65
mod/tagrm.php
View file

@ -6,9 +6,9 @@
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Item;
use Friendica\Model\Term;
function tagrm_post(App $a)
{
@ -20,33 +20,48 @@ function tagrm_post(App $a)
$a->internalRedirect($_SESSION['photo_return']);
}
$tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : '');
$item_id = (x($_POST,'item') ? intval($_POST['item']) : 0);
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) {
$a->internalRedirect($_SESSION['photo_return']);
$tags = [];
foreach (defaults($_POST, 'tag', []) as $tag) {
$tags[] = hex2bin(notags(trim($tag)));
}
$arr = explode(',', $item['tag']);
for ($x = 0; $x < count($arr); $x ++) {
if ($arr[$x] === $tag) {
unset($arr[$x]);
break;
}
}
$item_id = defaults($_POST,'item', 0);
update_tags($item_id, $tags);
info(L10n::t('Tag(s) removed') . EOL);
$tag_str = implode(',',$arr);
Item::update(['tag' => $tag_str], ['id' => $item_id]);
info(L10n::t('Tag removed') . EOL );
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
/**
* Updates tags from an item
* @param $item_id
* @param $tags array
*/
function update_tags($item_id, $tags){
if (empty($item_id) || empty($tags)){
return;
}
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) {
return;
}
$old_tags = explode(',', $item['tag']);
foreach ($tags as $new_tag) {
foreach ($old_tags as $index => $old_tag) {
if (strcmp($old_tag, $new_tag) == 0) {
unset($old_tags[$index]);
break;
}
}
}
$tag_str = implode(',', $old_tags);
Term::insertFromTagFieldByItemId($item_id, $tag_str);
}
function tagrm_content(App $a)
{
@ -57,6 +72,11 @@ function tagrm_content(App $a)
// NOTREACHED
}
if ($a->argc == 3) {
update_tags($a->argv[1], [notags(trim(hex2bin($a->argv[2])))]);
$a->internalRedirect($_SESSION['photo_return']);
}
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item_id) {
$a->internalRedirect($_SESSION['photo_return']);
@ -70,7 +90,8 @@ function tagrm_content(App $a)
$arr = explode(',', $item['tag']);
if (!count($arr)) {
if (empty($item['tag'])) {
$a->internalRedirect($_SESSION['photo_return']);
}
@ -83,7 +104,7 @@ function tagrm_content(App $a)
$o .= '<ul>';
foreach ($arr as $x) {
$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
$o .= '<li><input type="checkbox" name="tag[]" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
}
$o .= '</ul>';

4
src/Model/Item.php
View file

@ -816,7 +816,7 @@ class Item extends BaseObject
$tags = $fields['tag'];
$fields['tag'] = null;
} else {
$tags = '';
$tags = null;
}
if (array_key_exists('file', $fields)) {
@ -895,7 +895,7 @@ class Item extends BaseObject
}
}
if (!empty($tags)) {
if (!is_null($tags)) {
Term::insertFromTagFieldByItemId($item['id'], $tags);
if (!empty($item['tag'])) {
DBA::update('item', ['tag' => ''], ['id' => $item['id']]);

18
src/Model/Term.php
View file

@ -76,7 +76,7 @@ class Term
$message['tag'] = $tags;
// Clean up all tags
DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
self::deleteByItemId($itemid);
if ($message['deleted']) {
return;
@ -290,4 +290,20 @@ class Term
return $return;
}
/**
* Delete all tags from an item
* @param int itemid - choose from which item the tags will be removed
* @param array type - items type. default is [TERM_HASHTAG, TERM_MENTION]
*/
public static function deleteByItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION])
{
if (empty($itemid)) {
return;
}
// Clean up all tags
DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => $type]);
}
}

13
view/theme/frio/templates/photo_view.tpl
View file

@ -51,12 +51,19 @@
{{* Tags and mentions *}}
{{if $tags}}
<div id="photo-tags">{{$tags.1}}</div>
<div id="photo-tags">{{$tags.title}}
{{foreach $tags.tags as $t}}
<span class="category label btn-success sm">
<span class="p-category">{{$t.name}}</span>
{{if $t.removeurl}} <a href="{{$t.removeurl}}">(X)</a> {{/if}}
</span>
{{/foreach}}
</div>
{{/if}}
{{if $tags.2}}
{{if $tags.removeanyurl}}
<div id="tag-remove">
<a href="{{$tags.2}}">{{$tags.3}}</a>
<a href="{{$tags.removeanyurl}}">{{$tags.removetitle}}</a>
</div>
{{/if}}