X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=cf76f621b0760a086f2d6112c55c68fb9173c83f;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=70b3ef048f1be1bd2041beb4fbe1335ac51cf540;hpb=0c67c89715df801e0c887be50c9739db3bae7ca3;p=friendica.git

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 70b3ef048f..cf76f621b0 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,16 +1,20 @@
 <?php
 
-require_once('include/bbcode.php');
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-if(! function_exists('tagrm_post')) {
-function tagrm_post(&$a) {
+require_once('include/bbcode.php');
 
-	if(! local_user())
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+function tagrm_post(App $a) {
 
+	if (! local_user()) {
+		goaway(System::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(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
 	$item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
@@ -20,12 +24,13 @@ function tagrm_post(&$a) {
 		intval(local_user())
 	);
 
-	if(! count($r))
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! DBM::is_result($r)) {
+		goaway(System::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;
 		}
@@ -40,42 +45,43 @@ function tagrm_post(&$a) {
 	);
 
 	info( t('Tag removed') . EOL );
-	goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 
 	// NOTREACHED
-}
+
 }
 
 
-if(! function_exists('tagrm_content')) {
-function tagrm_content(&$a) {
+
+function tagrm_content(App $a) {
 
 	$o = '';
 
-	if(! local_user()) {
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! local_user()) {
+		goaway(System::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(System::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(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$arr = explode(',', $r[0]['tag']);
 
-	if(! count($arr))
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! count($arr)) {
+		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$o .= '<h3>' . t('Remove Item Tag') . '</h3>';
 
@@ -85,8 +91,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>';
 	}
 
@@ -96,5 +101,5 @@ function tagrm_content(&$a) {
 	$o .= '</form>';
 
 	return $o;
-}
+
 }