{{$title}}
-
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index a606f06296..f37c02e636 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1240,7 +1240,7 @@ aside #group-sidebar li .group-edit-tool:first-child {
}
/* Tag cloud widget */
-.tagblock.widget > .tags {
+.tagblock.widget > .tag-cloud {
text-align: center;
}
/* Section */
From 19afabd2682e3ae88afc90bf47f726e03eadc8c4 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 23 Nov 2017 00:59:20 +0100
Subject: [PATCH 3/8] tags: possibility to filter posts for tags and profile
owner (profile)
---
include/tags.php | 22 +++++++++++++++-------
mod/profile.php | 7 +++++++
view/templates/tagblock_widget.tpl | 2 +-
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/include/tags.php b/include/tags.php
index fb3315441c..8a6b3ba746 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -151,7 +151,7 @@ function update_items() {
dba::close($messages);
}
-function tagadelic($uid, $count = 0, $owner = 0, $flags = 0, $type = TERM_HASHTAG) {
+function tagadelic($uid, $count = 0, $owner_id = 0, $flags = 0, $type = TERM_HASHTAG) {
require_once('include/security.php');
$item_condition = item_condition();
@@ -163,8 +163,8 @@ function tagadelic($uid, $count = 0, $owner = 0, $flags = 0, $type = TERM_HASHTA
}
}
- if ($owner) {
- $sql_options .= " AND `item`.`owner-id` = ".intval($owner)." ";
+ if ($owner_id) {
+ $sql_options .= " AND `item`.`owner-id` = ".intval($owner_id)." ";
}
// Fetch tags
@@ -186,13 +186,21 @@ function tagadelic($uid, $count = 0, $owner = 0, $flags = 0, $type = TERM_HASHTA
return tag_calc($r);
}
-function wtagblock($uid, $count = 0,$owner = 0, $flags = 0, $type = TERM_HASHTAG) {
+function wtagblock($uid, $count = 0,$owner_id = 0, $flags = 0, $type = TERM_HASHTAG) {
$o = '';
- $r = tagadelic($uid, $count, $owner, $flags, $type);
- if($r) {
+ $r = tagadelic($uid, $count, $owner_id, $flags, $type);
+ if($r && $owner_id) {
+ $contact = dba::select(
+ "contact",
+ array("url"),
+ array("id" => $owner_id),
+ array("limit" => 1)
+ );
+ $url = System::removedBaseUrl($contact['url']);
+
foreach ($r as $rr) {
$tag['level'] = $rr[2];
- $tag['url'] = urlencode($rr[0]);
+ $tag['url'] = $url."?tag=".urlencode($rr[0]);
$tag['name'] = $rr[0];
$tags[] = $tag;
diff --git a/mod/profile.php b/mod/profile.php
index 9ad24ccd17..59835bd4cb 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -98,6 +98,8 @@ function profile_content(App $a, $update = 0) {
$category = ((x($_GET,'category')) ? $_GET['category'] : '');
}
+ $hashtags = (x($_GET, 'tag') ? $_GET['tag'] : '');
+
if (Config::get('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
@@ -255,6 +257,11 @@ function profile_content(App $a, $update = 0) {
//$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
}
+ if (x($hashtags)) {
+ $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+ dbesc(protect_sprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
+ }
+
if ($datequery) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
}
diff --git a/view/templates/tagblock_widget.tpl b/view/templates/tagblock_widget.tpl
index 602d762aa5..114d32290b 100644
--- a/view/templates/tagblock_widget.tpl
+++ b/view/templates/tagblock_widget.tpl
@@ -5,7 +5,7 @@
From f1b86d31caca533054841c2da323af9e9289a981 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 23 Nov 2017 03:43:39 +0100
Subject: [PATCH 4/8] tags-cloud: respect remote perms
---
include/tags.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/tags.php b/include/tags.php
index 8a6b3ba746..01c39d925a 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -171,8 +171,8 @@ function tagadelic($uid, $count = 0, $owner_id = 0, $flags = 0, $type = TERM_HAS
$r = q("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 AND `item`.`private` = 0
- $sql_options AND $item_condition
+ AND `term`.`otype` = %d
+ AND $item_condition $sql_options
GROUP BY `term` ORDER BY `total` DESC %s",
intval($uid),
intval($type),
From 2844947f5c284748ff30012fbc4caecb2c59c794 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sun, 26 Nov 2017 04:33:21 +0100
Subject: [PATCH 5/8] tag cloud: add doxygen docu
---
include/tags.php | 60 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 50 insertions(+), 10 deletions(-)
diff --git a/include/tags.php b/include/tags.php
index 01c39d925a..6c13b82962 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -151,7 +151,19 @@ function update_items() {
dba::close($messages);
}
-function tagadelic($uid, $count = 0, $owner_id = 0, $flags = 0, $type = TERM_HASHTAG) {
+/**
+ * @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) {
require_once('include/security.php');
$item_condition = item_condition();
@@ -186,14 +198,25 @@ function tagadelic($uid, $count = 0, $owner_id = 0, $flags = 0, $type = TERM_HAS
return tag_calc($r);
}
-function wtagblock($uid, $count = 0,$owner_id = 0, $flags = 0, $type = TERM_HASHTAG) {
+/**
+ * @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) {
$o = '';
$r = tagadelic($uid, $count, $owner_id, $flags, $type);
- if($r && $owner_id) {
+ if (count($r)) {
$contact = dba::select(
"contact",
array("url"),
- array("id" => $owner_id),
+ array("id" => $uid),
array("limit" => 1)
);
$url = System::removedBaseUrl($contact['url']);
@@ -216,6 +239,12 @@ function wtagblock($uid, $count = 0,$owner_id = 0, $flags = 0, $type = TERM_HASH
return $o;
}
+/**
+ * @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.
+ */
function tag_calc($arr) {
$tags = array();
$min = 1e9;
@@ -245,23 +274,34 @@ function tag_calc($arr) {
return $tags;
}
-function tags_sort($a,$b) {
+/**
+ * @brief Compare function to sort tags/terms alphabetically.
+ *
+ * @param type $a
+ * @param type $b
+ *
+ * @return int
+ */
+function tags_sort($a, $b) {
if (strtolower($a[0]) == strtolower($b[0])) {
return 0;
}
- return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
+ return ((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
}
-
-function tagcloud_wall_widget($arr = array()) {
+/**
+ * @brief Insert a tag cloud widget for the present profile.
+ *
+ * @param int $limit Max number of displayed tags.
+ * @return string HTML formattat output.
+ */
+function tagcloud_wall_widget($limit = 50) {
$a = get_app();
if(!$a->profile['profile_uid'] || !$a->profile['url']) {
return "";
}
- $limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50);
-
if(feature_enabled($a->profile['profile_uid'], 'tagadelic')) {
$owner_id = Contact::getIdForURL($a->profile['url']);
From 655b2cd0d379d1b15cf432400515496c0a963d74 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sun, 26 Nov 2017 04:36:45 +0100
Subject: [PATCH 6/8] tag cloud: clear align settings in the tagcloud widget
---
view/templates/tagblock_widget.tpl | 1 +
1 file changed, 1 insertion(+)
diff --git a/view/templates/tagblock_widget.tpl b/view/templates/tagblock_widget.tpl
index 114d32290b..fd007c9c10 100644
--- a/view/templates/tagblock_widget.tpl
+++ b/view/templates/tagblock_widget.tpl
@@ -9,4 +9,5 @@
{{/foreach}}
+