Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index d4b483a522f970afec8f66a84cd481591cd2282d..2a9a26e37bfd4ead658a459076ae082abfa8f4c9 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -2,14 +2,15 @@
 
 require_once('include/bbcode.php');
 
-function tagrm_post(&$a) {
-
-       if(! local_user())
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+function tagrm_post(App &$a) {
 
+       if (! local_user()) {
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
-       if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       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 );
@@ -19,12 +20,13 @@ 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 ++) {
-               if($arr[$x] === $tag) {
+       for ($x = 0; $x < count($arr); $x ++) {
+               if ($arr[$x] === $tag) {
                        unset($arr[$x]);
                        break;
                }
@@ -32,14 +34,14 @@ function tagrm_post(&$a) {
 
        $tag_str = implode(',',$arr);
 
-       q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+       q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d AND `uid` = %d",
                dbesc($tag_str),
                intval($item),
                intval(local_user())
        );
 
        info( t('Tag removed') . EOL );
-       goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
        
        // NOTREACHED
 
@@ -47,34 +49,35 @@ function tagrm_post(&$a) {
 
 
 
-function tagrm_content(&$a) {
+function tagrm_content(App &$a) {
 
        $o = '';
 
-       if(! local_user()) {
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (! local_user()) {
+               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']);
+       if (! $item) {
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
-
        $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($item),
                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']);
+       if (! count($arr)) {
+               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       }
 
        $o .= '<h3>' . t('Remove Item Tag') . '</h3>';
 
@@ -84,8 +87,7 @@ function tagrm_content(&$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>';
        }
 
@@ -95,5 +97,5 @@ function tagrm_content(&$a) {
        $o .= '</form>';
 
        return $o;
-       
+
 }