diff --git a/include/features.php b/include/features.php index 4e9e7d9d9..fcd2148b4 100644 --- a/include/features.php +++ b/include/features.php @@ -114,6 +114,7 @@ function get_features($filtered = true) { 'advanced_profile' => array( t('Advanced Profile Settings'), array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile', false)), + array('tagadelic', t('Tag Cloud'), t('Provide a personal tag cloud on your profile page'), false, Config::get('feature_lock', 'tagadelic')), ), ); diff --git a/include/identity.php b/include/identity.php index b8f4727ad..2e6327d98 100644 --- a/include/identity.php +++ b/include/identity.php @@ -169,7 +169,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`, `profile`.`uid` AS `profile_uid`, `profile`.*, - `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* + `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.* FROM `profile` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` @@ -183,7 +183,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`, `profile`.`uid` AS `profile_uid`, `profile`.*, - `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* + `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.* FROM `profile` INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` diff --git a/include/tags.php b/include/tags.php index 8720367fa..ba8770e6f 100644 --- a/include/tags.php +++ b/include/tags.php @@ -2,6 +2,8 @@ use Friendica\App; use Friendica\Core\System; +use Friendica\Database\DBM; +use Friendica\Object\Contact; function create_tags_from_item($itemid) { $profile_base = System::baseUrl(); @@ -148,3 +150,166 @@ function update_items() { dba::close($messages); } + +/** + * @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(); + $sql_options = item_permissions_sql($uid); + $limit = $count ? sprintf("LIMIT %d", intval($count)) : ""; + + if ($flags) { + if ($flags === 'wall') { + $sql_options .= " AND `item`.`wall` "; + } + } + + if ($owner_id) { + $sql_options .= " AND `item`.`owner-id` = ".intval($owner_id)." "; + } + + // Fetch tags + $r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term` + LEFT JOIN `item` ON `term`.`oid` = `item`.`id` + WHERE `term`.`uid` = ? AND `term`.`type` = ? + AND `term`.`otype` = ? + AND $item_condition $sql_options + 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) { + $o = ''; + $r = tagadelic($uid, $count, $owner_id, $flags, $type); + if (count($r)) { + $contact = dba::select( + "contact", + array("url"), + array("id" => $uid), + array("limit" => 1) + ); + $url = System::removedBaseUrl($contact['url']); + + foreach ($r as $rr) { + $tag['level'] = $rr[2]; + $tag['url'] = $url."?tag=".urlencode($rr[0]); + $tag['name'] = $rr[0]; + + $tags[] = $tag; + } + + $tpl = get_markup_template("tagblock_widget.tpl"); + $o = replace_macros($tpl, array( + '$title' => t('Tags'), + '$tags' => $tags + )); + + } + 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; + $max = -1e9; + $x = 0; + + if (!$arr) { + return array(); + } + + foreach ($arr as $rr) { + $tags[$x][0] = $rr['term']; + $tags[$x][1] = log($rr['total']); + $tags[$x][2] = 0; + $min = min($min, $tags[$x][1]); + $max = max($max, $tags[$x][1]); + $x ++; + } + + usort($tags, 'tags_sort'); + $range = max(.01, $max - $min) * 1.0001; + + for ($x = 0; $x < count($tags); $x ++) { + $tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range); + } + + return $tags; +} + +/** + * @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); +} + +/** + * @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 ""; + } + + if(feature_enabled($a->profile['profile_uid'], 'tagadelic')) { + $owner_id = Contact::getIdForURL($a->profile['url']); + + if(!$owner_id) { + return ""; + } + return wtagblock($a->profile['profile_uid'], $limit, $owner_id, 'wall'); + } + + return ""; +} diff --git a/mod/profile.php b/mod/profile.php index 8a9b8b666..59835bd4c 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(); } @@ -185,6 +187,7 @@ function profile_content(App $a, $update = 0) { $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true); $a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : '')); + $a->page['aside'] .= tagcloud_wall_widget(); if (can_write_wall($a,$a->profile['profile_uid'])) { @@ -254,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/global.css b/view/global.css index e99006094..f3ca22b75 100644 --- a/view/global.css +++ b/view/global.css @@ -522,3 +522,51 @@ td.pendingnote > p > span { .invalid-src:after, .invalid-href:after { content: '⚠️'} img.invalid-src:after { vertical-align: top;} + +/* Tag cloud */ +.tag1, .tag1:hover { + font-size: 0.9em ; + color: DarkGray; +} +.tag2, .tag2:hover { + font-size: 1.0em; + color: LawnGreen; +} +.tag3, .tag3:hover { + font-size: 1.1em; + color: DarkOrange; +} +.tag4, .tag4:hover { + font-size: 1.2em; + color: Red; +} +.tag5, .tag5:hover { + font-size: 1.3em; + color: Gold; +} +.tag6, .tag6:hover { + font-size: 1.4em; + color: Teal; +} +.tag7, .tag7:hover { + font-size: 1.5em; + color: DarkMagenta; +} +.tag8, .tag8:hover { + font-size: 1.6em; + color: DarkGoldenRod; +} +.tag9, .tag9:hover { + font-size: 1.7em; + color: DarkBlue; +} +.tag10 .tag10:hover { + font-size: 1.8em; + color: DeepPink; +} +.tags > a:hover { + text-decoration: underline; +} +.tag-cloud { + word-wrap: break-word; +} \ No newline at end of file diff --git a/view/templates/tagblock_widget.tpl b/view/templates/tagblock_widget.tpl new file mode 100644 index 000000000..fd007c9c1 --- /dev/null +++ b/view/templates/tagblock_widget.tpl @@ -0,0 +1,13 @@ + +
+

{{$title}}

+ +
+ {{foreach $tags as $tag}} + + #{{$tag.name}} + + {{/foreach}} +
+
+
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index ab8e3d5a5..f37c02e63 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1238,6 +1238,11 @@ aside #group-sidebar li .group-edit-tool:first-child { width: 75px; border-radius: 4px; } + +/* Tag cloud widget */ +.tagblock.widget > .tag-cloud { + text-align: center; +} /* Section */ section ul.tabs { display: none !important;