Changeset 608 for trunk/wifidog-auth/wifidog/classes/Node.php

Timestamp:

05/01/05 20:16:26 (8 years ago)

Author:

fproulx

Message:

2005-04-30 Francois Proulx <francois.proulx@…>

• Fixed bug that could potentially let non owners add content in /content through content groups
• Admin menu won't show node selector if the user is not owner of at least one hotspot
• Added Width, height support for Picture

Files:

• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (2 diffs)

trunk/wifidog-auth/wifidog/classes/Node.php

@@ -454 +454 @@
         global $db;
         $retval = array ();
-        $sql = "SELECT * FROM content_group JOIN content ON (content.content_id = content_group.content_group_id) WHERE is_persistent = true AND is_artistic_content = true AND is_locative_content = true";
+        $sql = "SELECT * FROM content_group JOIN content ON (content.content_id = content_group.content_group_id) JOIN node_has_content ON (node_has_content.content_id = content_group.content_group_id AND node_has_content.node_id = '{$this->getId()}') WHERE is_persistent = true AND is_artistic_content = true AND is_locative_content = true";
         $db->ExecSql($sql, $content_rows, false);
         if ($content_rows != null)
@@ -464 +464 @@
                 if($content_group->getDisplayNumElements() >= 1)
                 {
-                    // Disable logging and allow content to expand ( if possible )
-                    $content_group->setExpandStatus(true);
-                    $content_group->setLoggingStatus(false);
-                    $retval[] = $content_group;
+                                if($content_group->isDisplayableAt($this))
+                                {
+                                                // Disable logging and allow content to expand ( if possible )
+                                                $content_group->setExpandStatus(true);
+                                                $content_group->setLoggingStatus(false);
+                                                $retval[] = $content_group;
+                                }
                 }
             }