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

    r1421 r1446  
    189189     Node::assignSmartyValues($this); 
    190190     User::assignSmartyValues($this); 
     191     Token::assignSmartyValues($this); 
    191192     return parent::fetch($resource_name, $cache_id, $compile_id, $display); 
    192193    }