Changeset 1446 for branches/newtoken/wifidog/classes/MainUI.php

Timestamp:

02/11/10 17:34:27 (2 years ago)

Author:

gbastien

Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

• can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
• Users connected through a wifidog gateway can view their connection token information

Files:

• branches/newtoken/wifidog/classes/MainUI.php (modified) (1 diff)

branches/newtoken/wifidog/classes/MainUI.php

@@ -329 +329 @@
         // Get all network content and node "everywhere" content
         $content_rows = null;
-        $network_id = $db->escapeString(Network :: getCurrentNetwork()->getId());
-        $sql_network = "(SELECT content_id, display_area, display_order, subscribe_timestamp FROM network_has_content WHERE network_id='$network_id'  AND display_page='everywhere') ";
         $node = Node :: getCurrentNode();
-        $sql_node = null;
+        // Get all the parent objects of the node
         if ($node) {
-            // Get all node content
-            $node_id = $db->escapeString($node->getId());
-            $sql_node = "UNION (SELECT content_id, display_area, display_order, subscribe_timestamp FROM node_has_content WHERE node_id='$node_id'  AND display_page='everywhere')";
-        }
-        $sql = "SELECT * FROM ($sql_network $sql_node) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
-
+            $parents = HotspotGraph::getAllParents($node);
+        } else {
+            $parents = array(Network :: getCurrentNetwork()->getHgeId());
+        }
+        
+        $first = $db->escapeString(array_shift($parents));
+        $sql_from = "(SELECT content_id, display_area, display_order, subscribe_timestamp 
+                                FROM hotspot_graph_element_has_content hgehc 
+                                WHERE hotspot_graph_element_id='$first' AND display_page='everywhere')";
+        
+        // Get the contents for all elements parents of and including the node, but exclude user subscribed content if user is known
+        foreach($parents as $parentid) {
+            $parent_id = $db->escapeString($parentid);
+            $sql_from .= " UNION (SELECT content_id, display_area, display_order, subscribe_timestamp 
+                                FROM hotspot_graph_element_has_content hgehc 
+                                WHERE hotspot_graph_element_id='$parent_id' AND display_page='everywhere')";
+        }
+        $sql = "SELECT * FROM ($sql_from) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
         $db->execSql($sql, $content_rows, false);
         if ($content_rows) {