Changeset 1446 for branches/newtoken/wifidog/classes/NodeGroup.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/NodeGroup.php (modified) (2 diffs)

branches/newtoken/wifidog/classes/NodeGroup.php

@@ -170 +170 @@
         }
         
-        HotspotGraphElement::createNewObject($node_group_id, 'NodeGroup');
+        HotspotGraphElement::createNewObject($node_group_id, 'NodeGroup', $network);
 
         $object = self::getObject($node_group_id);
@@ -538 +538 @@
     }
 
-    /** Add content to this node */
-   /* public function addContent(Content $content)
-    {
-        $db = AbstractDb::getObject();
-        $content_id = $db->escapeString($content->getId());
-        $sql = "INSERT INTO node_has_content (node_id, content_id) VALUES ('$this->id','$content_id')";
-        $db->execSqlUpdate($sql, false);
-        exit;
-    }*/
-
-    /** Remove content from this node */
-  /*  public function removeContent(Content $content)
-    {
-        $db = AbstractDb::getObject();
-        $content_id = $db->escapeString($content->getId());
-        $sql = "DELETE FROM node_has_content WHERE node_id='$this->id' AND content_id='$content_id'";
-        $db->execSqlUpdate($sql, false);
-    }*/
-
-
     /** Reloads the object from the database.  Should normally be called after a set operation */
     protected function refresh()