X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublictagcloud.php;h=8daf18d5042bd8b4dbe2653f6b3a8edb7f551b00;hb=c04c91bb8974671ee093f444b3d180993bc4987c;hp=ddbee053880a6248edd066515db0d49010f433c5;hpb=dfdcfcfa7e9660cd98102ec344bceb57de466dbf;p=quix0rs-gnu-social.git diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php index ddbee05388..8daf18d504 100644 --- a/actions/publictagcloud.php +++ b/actions/publictagcloud.php @@ -136,33 +136,10 @@ class PublictagcloudAction extends Action $sum = 0; while ($tags->fetch()) { // Check scope: - - // 1) Get notice object and set id - $notice = new Notice(); - $notice->id = $tags->notice_id; - $notice->scope = $tags->scope; - /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] tags->tag=' . $tags->tag . ',notice->id=' . $notice->id . ',notice->scope=' . $notice->scope); - - // Is it private scope? - if ($notice->isPrivateScope()) { - // 2) Get current profile - $profile = Profile::current(); - - // Is the profile not set? - if (!$profile instanceof Profile) { - // Public viewer shall not see a tag from a private dent (privacy leak) - /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] Not logged in, skipping ...'); - continue; - } elseif (!$notice->inScope($profile)) { - // Current profile is not in scope (not allowed to see) of notice - /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] profile->id=' . $profile->id . ' is not allowed to see this tag, skipping ...'); - continue; - } + if ($tags->isCurrentProfileInScope()) { + $tw[$tags->tag] = $tags->weight; + $sum += $tags->weight; } - - /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] tags->tag=' . $tags->tag . ',tags->weight=' . $tags->weight . ' - Added!'); - $tw[$tags->tag] = $tags->weight; - $sum += $tags->weight; } ksort($tw);