Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index d6e57d36a93fe3e3664799b8158580e07bc49761..8379495a2dba75016f8acb9e7f34695d0df86837 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -2,14 +2,15 @@
 
 require_once('include/bbcode.php');
 
-function tagrm_post(&$a) {
+function tagrm_post(App &$a) {
 
-       if(! local_user())
+       if (! local_user()) {
                goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
-
-       if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
+       if ((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel'))) {
                goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
        $tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
        $item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
@@ -24,8 +25,8 @@ function tagrm_post(&$a) {
        }
 
        $arr = explode(',', $r[0]['tag']);
-       for($x = 0; $x < count($arr); $x ++) {
-               if($arr[$x] === $tag) {
+       for ($x = 0; $x < count($arr); $x ++) {
+               if ($arr[$x] === $tag) {
                        unset($arr[$x]);
                        break;
                }
@@ -48,11 +49,11 @@ function tagrm_post(&$a) {
 
 
 
-function tagrm_content(&$a) {
+function tagrm_content(App &$a) {
 
        $o = '';
 
-       if(! local_user()) {
+       if (! local_user()) {
                goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
@@ -63,7 +64,6 @@ function tagrm_content(&$a) {
                // NOTREACHED
        }
 
-
        $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($item),
                intval(local_user())
@@ -75,8 +75,9 @@ function tagrm_content(&$a) {
 
        $arr = explode(',', $r[0]['tag']);
 
-       if(! count($arr))
+       if (! count($arr)) {
                goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
        $o .= '<h3>' . t('Remove Item Tag') . '</h3>';