Introduced isCurrentProfileInScope() which shall check if current profile is

allowed (in scope of) to see the tag.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index ddbee053880a6248edd066515db0d49010f433c5..8daf18d5042bd8b4dbe2653f6b3a8edb7f551b00 100644 (file)
--- 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);

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 3d7658a1acfe19ed64e08f2c0d6ee152f43c2e4c..5567b06093aa4ab8372cff0a930ce235f7f572d0 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -82,4 +82,41 @@ class Notice_tag extends Managed_DataObject
 
                return $url;
        }
+
+    /**
+     * Checks whether the current profile is allowed (in scope) to see this tag.
+     *
+     * @return $inScope Whether the current profile is allowed to see this tag
+     */
+    public function isCurrentProfileInScope () {
+        // Check scope, default is allowed
+        $inScope = TRUE;
+
+        // 1) Get notice object and set id
+        $notice = new Notice();
+        $notice->id    = $this->notice_id;
+        $notice->scope = $this->scope;
+        /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] this->tag=' . $this->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 ...');
+                $inScope = FALSE;
+            } 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 ...');
+                $inScope = FALSE;
+            }
+        }
+
+        // Return result
+        /* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] this->tag=' . $this->tag . ',this->weight=' . $this->weight . ',inScope=' . intval($inScope) . ' - EXIT!');
+        return $inScope;
+    }
 }

diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 24a3bd98af96bf6c2baac39b53630217efe06a50..ccdf89f0b4c2f583a3a750d2126867b3c81cc406 100644 (file)
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -63,8 +63,10 @@ class TagCloudSection extends Section
         $sum = 0;
 
         while ($tags->fetch() && ++$cnt <= TAGS_PER_SECTION) {
-            $tw[$tags->tag] = $tags->weight;
-            $sum += $tags->weight;
+            if ($tags->isCurrentProfileInScope()) {
+                $tw[$tags->tag] = $tags->weight;
+                $sum += $tags->weight;
+            }
         }
 
         if ($cnt == 0) {