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

Code Standards: var name, spaces, array_push short form

This commit is contained in:
Jonny Tischbein 2018-10-26 00:18:47 +02:00
parent 6bab8f1a43
commit deed949ff0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/photos.php
View File

@ -1419,13 +1419,15 @@ function photos_content(App $a)
// parse tags and add links // parse tags and add links
$tag_arr = []; $tag_arr = [];
foreach ($arr as $tag) { foreach ($arr as $tag) {
array_push($tag_arr, ['name' => BBCode::convert($tag), $tag_arr[] = [
'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag)]); 'name' => BBCode::convert($tag),
'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag)
];
} }
$tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr]; $tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr];
if ($cmd === 'edit') { if ($cmd === 'edit') {
$tags += ['removeanyurl' => 'tagrm/' . $link_item['id']]; $tags['removeanyurl'] = 'tagrm/' . $link_item['id'];
$tags += ['removetitle' => L10n::t('[Select tags to remove]')]; $tags['removetitle'] = L10n::t('[Select tags to remove]');
} }
} }

14
mod/tagrm.php
View File

@ -22,14 +22,14 @@ function tagrm_post(App $a)
$tags = []; $tags = [];
foreach (defaults($_POST, 'tag', []) as $tag) { foreach (defaults($_POST, 'tag', []) as $tag) {
array_push($tags, hex2bin(notags(trim($tag)))); $tags[] = hex2bin(notags(trim($tag)));
} }
$item_id = defaults($_POST,'item', 0); $item_id = defaults($_POST,'item', 0);
update_tags($item_id, $tags); update_tags($item_id, $tags);
info(L10n::t('Tag(s) removed') . EOL);
$a->internalRedirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED // NOTREACHED
} }
@ -51,18 +51,16 @@ function update_tags($item_id, $tags){
$old_tags = explode(',', $item['tag']); $old_tags = explode(',', $item['tag']);
foreach ($tags as $new_tag) { foreach ($tags as $new_tag) {
foreach ($old_tags as $count => $old_tag) { foreach ($old_tags as $index => $old_tag) {
if (strcmp($old_tag, $new_tag) == 0) { if (strcmp($old_tag, $new_tag) == 0) {
unset($old_tags[$count]); unset($old_tags[$index]);
break; break;
} }
} }
} }
$tag_str = implode(',',$old_tags); $tag_str = implode(',', $old_tags);
Term::insertFromTagFieldByItemId($item_id, $tag_str); Term::insertFromTagFieldByItemId($item_id, $tag_str);
info(L10n::t('Tag(s) removed') . EOL);
} }
function tagrm_content(App $a) function tagrm_content(App $a)
@ -75,7 +73,7 @@ function tagrm_content(App $a)
} }
if ($a->argc == 3) { if ($a->argc == 3) {
update_tags($a->argv[1], [hex2bin(notags(trim($a->argv[2])))]); update_tags($a->argv[1], [notags(trim(hex2bin($a->argv[2])))]);
$a->internalRedirect($_SESSION['photo_return']); $a->internalRedirect($_SESSION['photo_return']);
} }