added spaces + curly braces

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 70b3ef048f1be1bd2041beb4fbe1335ac51cf540..d6e57d36a93fe3e3664799b8158580e07bc49761 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -2,15 +2,14 @@
 
 require_once('include/bbcode.php');
 
-if(! function_exists('tagrm_post')) {
 function tagrm_post(&$a) {
 
        if(! local_user())
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
 
 
        if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
 
        $tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
        $item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
@@ -20,8 +19,9 @@ function tagrm_post(&$a) {
                intval(local_user())
        );
 
-       if(! count($r))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (! dbm::is_result($r)) {
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
        $arr = explode(',', $r[0]['tag']);
        for($x = 0; $x < count($arr); $x ++) {
@@ -40,26 +40,26 @@ function tagrm_post(&$a) {
        );
 
        info( t('Tag removed') . EOL );
-       goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-
+       goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       
        // NOTREACHED
-}
+
 }
 
 
-if(! function_exists('tagrm_content')) {
+
 function tagrm_content(&$a) {
 
        $o = '';
 
        if(! local_user()) {
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
        $item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
        if(! $item) {
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
@@ -69,13 +69,14 @@ function tagrm_content(&$a) {
                intval(local_user())
        );
 
-       if(! count($r))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (! dbm::is_result($r)) {
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
        $arr = explode(',', $r[0]['tag']);
 
        if(! count($arr))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
 
        $o .= '<h3>' . t('Remove Item Tag') . '</h3>';
 
@@ -96,5 +97,5 @@ function tagrm_content(&$a) {
        $o .= '</form>';
 
        return $o;
-}
+       
 }