X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Ftags.php;h=8d8fb765595ddd9f90f84325c94500db2abd0bc2;hb=5afedb28d4387eef580f7a6602016cc676d8d9e1;hp=6c13b82962f9e0b6103b5a8628f667d2e63432ed;hpb=2844947f5c284748ff30012fbc4caecb2c59c794;p=friendica.git

diff --git a/include/tags.php b/include/tags.php
index 6c13b82962..8d8fb76559 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,9 +1,12 @@
 <?php
-
+/**
+ * @file include/tags.php
+ */
 use Friendica\App;
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
 
 function create_tags_from_item($itemid) {
 	$profile_base = System::baseUrl();
@@ -154,13 +157,13 @@ function update_items() {
 /**
  * @brief Get alphabetical sorted array of used tags/terms of an user including
  * a weighting by frequency of use.
- * 
+ *
  * @param int $uid      The user ID.
  * @param int $count    Max number of displayed tags/terms.
  * @param int $owner_id The contact id of the owner of the tagged items.
  * @param string $flags Special item flags.
  * @param int $type     The tag/term type.
- * 
+ *
  * @return arr          Alphabetical sorted array of used tags of an user.
  */
 function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG) {
@@ -168,7 +171,8 @@ function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HA
 
 	$item_condition = item_condition();
 	$sql_options = item_permissions_sql($uid);
-	$count = intval($count);
+	$limit = $count ? sprintf("LIMIT %d", intval($count)) : "";
+
 	if ($flags) {
 		if ($flags === 'wall') {
 			$sql_options .= " AND `item`.`wall` ";
@@ -180,33 +184,32 @@ function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HA
 	}
 
 	// Fetch tags
-	$r = q("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
+	$r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
 		LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
-		WHERE `term`.`uid` = %d AND `term`.`type` = %d
-		AND `term`.`otype` = %d
+		WHERE `term`.`uid` = ? AND `term`.`type` = ?
+		AND `term`.`otype` = ?
 		AND $item_condition $sql_options
-		GROUP BY `term` ORDER BY `total` DESC %s",
-		intval($uid),
-		intval($type),
-		intval(TERM_OBJ_POST),
-		((intval($count)) ? "LIMIT $count" : '')
+		GROUP BY `term` ORDER BY `total` DESC $limit",
+		$uid,
+		$type,
+		TERM_OBJ_POST
 	);
 	if(!DBM::is_result($r)) {
 		return array();
 	}
-		
+
 	return tag_calc($r);
 }
 
 /**
  * @brief Construct a tag/term cloud block for an user.
- * 
+ *
  * @param int $uid      The user ID.
  * @param int $count    Max number of displayed tags/terms.
  * @param int $owner_id The contact ID of the owner of the tagged items.
  * @param string $flags Special item flags.
  * @param int $type     The tag/term type.
- * 
+ *
  * @return string       HTML formatted output.
  */
 function wtagblock($uid, $count = 0,$owner_id = 0, $flags = '', $type = TERM_HASHTAG) {
@@ -241,7 +244,7 @@ function wtagblock($uid, $count = 0,$owner_id = 0, $flags = '', $type = TERM_HAS
 
 /**
  * @brief Calculate weighting of tags according to the frequency of use.
- * 
+ *
  * @param array $arr Array of tags/terms with tag/term name and total count of use.
  * @return array     Alphabetical sorted array of used tags/terms of an user.
  */
@@ -276,10 +279,10 @@ function tag_calc($arr) {
 
 /**
  * @brief Compare function to sort tags/terms alphabetically.
- * 
+ *
  * @param type $a
  * @param type $b
- * 
+ *
  * @return int
  */
 function tags_sort($a, $b) {
@@ -291,7 +294,7 @@ function tags_sort($a, $b) {
 
 /**
  * @brief Insert a tag cloud widget for the present profile.
- * 
+ *
  * @param int     $limit Max number of displayed tags.
  * @return string HTML formattat output.
  */
@@ -302,7 +305,7 @@ function tagcloud_wall_widget($limit = 50) {
 		return "";
 	}
 
-	if(feature_enabled($a->profile['profile_uid'], 'tagadelic')) {
+	if(Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
 		$owner_id = Contact::getIdForURL($a->profile['url']);
 
 		if(!$owner_id) {