Fix formatting and PHP notice in mod/photos

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 8379495a2dba75016f8acb9e7f34695d0df86837..cf76f621b0760a086f2d6112c55c68fb9173c83f 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,15 +1,19 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/bbcode.php');
 
-function tagrm_post(App &$a) {
+function tagrm_post(App $a) {
 
        if (! local_user()) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        if ((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel'))) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
@@ -20,8 +24,8 @@ function tagrm_post(App &$a) {
                intval(local_user())
        );
 
-       if (! dbm::is_result($r)) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (! DBM::is_result($r)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $arr = explode(',', $r[0]['tag']);
@@ -41,26 +45,26 @@ function tagrm_post(App &$a) {
        );
 
        info( t('Tag removed') . EOL );
-       goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
-       
+       goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+
        // NOTREACHED
 
 }
 
 
 
-function tagrm_content(App &$a) {
+function tagrm_content(App $a) {
 
        $o = '';
 
        if (! local_user()) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
        $item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-       if(! $item) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (! $item) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
@@ -69,14 +73,14 @@ function tagrm_content(App &$a) {
                intval(local_user())
        );
 
-       if (! dbm::is_result($r)) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (! DBM::is_result($r)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $arr = explode(',', $r[0]['tag']);
 
        if (! count($arr)) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $o .= '<h3>' . t('Remove Item Tag') . '</h3>';
@@ -87,8 +91,7 @@ function tagrm_content(App &$a) {
        $o .= '<input type="hidden" name="item" value="' . $item . '" />';
        $o .= '<ul>';
 
-
-       foreach($arr as $x) {
+       foreach ($arr as $x) {
                $o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
        }
 
@@ -98,5 +101,5 @@ function tagrm_content(App &$a) {
        $o .= '</form>';
 
        return $o;
-       
+
 }