Changeset 1446 for branches/newtoken/wifidog/classes/Role.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/Role.php (modified) (1 diff)

branches/newtoken/wifidog/classes/Role.php

@@ -485 +485 @@
 
         $retval = false;
-        if (Security::hasPermission('SERVER_PERM_EDIT_ROLES', Server::getServer())) {
+        if (Security::hasPermission(Permission::P('SERVER_PERM_EDIT_ROLES'), Server::getServer())) {
             $db = AbstractDb::getObject();
             $id = $db->escapeString($this->getId());