Grrr, not fixed. So adding debug lines.

[quix0rs-gnu-social.git] / plugins / TagCloud / actions / publictagcloud.php

diff --git a/plugins/TagCloud/actions/publictagcloud.php b/plugins/TagCloud/actions/publictagcloud.php
index e557b75fd034705c3249d7805a72c07a7924d20e..4d8c07edeaf56dc7653af7d8fb4efefa3edfdd96 100644 (file)
--- a/plugins/TagCloud/actions/publictagcloud.php
+++ b/plugins/TagCloud/actions/publictagcloud.php
@@ -108,6 +108,8 @@ class PublictagcloudAction extends Action
         #even though MySQL seems to let it slide...
         $tags->selectAdd();
         $tags->selectAdd('tag');
+        $tags->selectAdd('notice_id');
+        $tags->selectAdd('scope');
 
         #Add the aggregated columns...
         $tags->selectAdd('max(notice_id) as last_notice_id');
@@ -115,6 +117,7 @@ class PublictagcloudAction extends Action
         $cutoff = sprintf("notice_tag.created > '%s'",
                           common_sql_date(time() - common_config('tag', 'cutoff')));
         $tags->selectAdd($calc . ' as weight');
+        $tags->joinAdd(array('notice_id', 'notice:id'));
         $tags->whereAdd($cutoff);
         $tags->groupBy('tag');
         $tags->orderBy('weight DESC');
@@ -130,6 +133,32 @@ class PublictagcloudAction extends Action
             $tw = array();
             $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;
+                    }
+                }
+
+                /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] tags->tag=' . $tags->tag . ',tags->weight=' . $tags->weight . ' - Added!');
                 $tw[$tags->tag] = $tags->weight;
                 $sum += $tags->weight;
             }