From: Jonny Tischbein Date: Thu, 25 Oct 2018 22:18:47 +0000 (+0200) Subject: Code Standards: var name, spaces, array_push short form X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=deed949ff0aa21c134a3bf695b5d81efc1356a5f;p=friendica.git Code Standards: var name, spaces, array_push short form --- diff --git a/mod/photos.php b/mod/photos.php index d50dc6fec8..b80350221b 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1419,13 +1419,15 @@ function photos_content(App $a) // parse tags and add links $tag_arr = []; foreach ($arr as $tag) { - array_push($tag_arr, ['name' => BBCode::convert($tag), - 'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag)]); + $tag_arr[] = [ + 'name' => BBCode::convert($tag), + 'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag) + ]; } $tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr]; if ($cmd === 'edit') { - $tags += ['removeanyurl' => 'tagrm/' . $link_item['id']]; - $tags += ['removetitle' => L10n::t('[Select tags to remove]')]; + $tags['removeanyurl'] = 'tagrm/' . $link_item['id']; + $tags['removetitle'] = L10n::t('[Select tags to remove]'); } } diff --git a/mod/tagrm.php b/mod/tagrm.php index 6f9cf553a7..2678748de5 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -22,14 +22,14 @@ function tagrm_post(App $a) $tags = []; foreach (defaults($_POST, 'tag', []) as $tag) { - array_push($tags, hex2bin(notags(trim($tag)))); + $tags[] = hex2bin(notags(trim($tag))); } $item_id = defaults($_POST,'item', 0); update_tags($item_id, $tags); + info(L10n::t('Tag(s) removed') . EOL); $a->internalRedirect($_SESSION['photo_return']); - // NOTREACHED } @@ -51,18 +51,16 @@ function update_tags($item_id, $tags){ $old_tags = explode(',', $item['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) { - unset($old_tags[$count]); + unset($old_tags[$index]); break; } } } - $tag_str = implode(',',$old_tags); + $tag_str = implode(',', $old_tags); Term::insertFromTagFieldByItemId($item_id, $tag_str); - - info(L10n::t('Tag(s) removed') . EOL); } function tagrm_content(App $a) @@ -75,7 +73,7 @@ function tagrm_content(App $a) } 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']); }