Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/newtoken/wifidog/classes/Node.php

    r1436 r1446  
    281281        } 
    282282 
    283         HotspotGraphElement::createNewObject($node_id, 'Node'); 
     283        HotspotGraphElement::createNewObject($node_id, 'Node', $network); 
    284284         
    285285        $object = self::getObject($node_id); 
    … …  
    11851185 
    11861186        //Node content 
    1187         /*$_html_content = array(); 
    1188         $_title = _("Node content"); 
    1189         $_data = Content::getLinkedContentUI("node_" . $node_id . "_content", "node_has_content", "node_id", $this->id, "portal"); 
    1190         $html .= InterfaceElements::generateAdminSectionContainer("node_content", $_title, $_data);*/ 
     1187        
    11911188        $html .= parent::getContentAdminUI(); 
    11921189             
    … …  
    14071404        // Content processing 
    14081405        parent::processContentAdminUI(); 
    1409         /*$name = "node_{$node_id}_content"; 
    1410         Content::processLinkedContentUI($name, 'node_has_content', 'node_id', $this->id);*/ 
    14111406 
    14121407        // Name 
    … …  
    15891584    } 
    15901585 
    1591     /** Add content to this node */ 
    1592    /* public function addContent(Content $content) 
    1593     { 
    1594         $db = AbstractDb::getObject(); 
    1595         $content_id = $db->escapeString($content->getId()); 
    1596         $sql = "INSERT INTO node_has_content (node_id, content_id) VALUES ('$this->id','$content_id')"; 
    1597         $db->execSqlUpdate($sql, false); 
    1598         exit; 
    1599     }*/ 
    1600  
    1601     /** Remove content from this node */ 
    1602    /* public function removeContent(Content $content) 
    1603     { 
    1604         $db = AbstractDb::getObject(); 
    1605         $content_id = $db->escapeString($content->getId()); 
    1606         $sql = "DELETE FROM node_has_content WHERE node_id='$this->id' AND content_id='$content_id'"; 
    1607         $db->execSqlUpdate($sql, false); 
    1608     }*/ 
    1609  
    16101586    /** 
    16111587     * The list of the 5 most recent users who have logged into this node in the past week,