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/HotspotGraphElement.php

    r1436 r1446  
    116116     * @access public 
    117117     */ 
    118     public static function createNewObject($element_id, $element_type) 
     118    public static function createNewObject($element_id, $element_type, $parent_element = null) 
    119119    { 
    120120        $db = AbstractDb::getObject(); 
     
    130130        } 
    131131        $object = self::getObject($element_id, $element_type); 
     132         
     133        if (!is_null($parent_element)) { 
     134            if (method_exists($parent_element, 'getHgeId')) { 
     135                $parentid = $parent_element->getHgeId(); 
     136                $childid = $object->getHgeId(); 
     137                HotspotGraph::addRelation($parentid, $childid); 
     138            } 
     139        } 
     140         
    132141        return $object; 
    133142    }