Changeset 1446

Timestamp:

02/11/10 17:34:27 (3 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

Location:

branches/newtoken

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (5 diffs)
• wifidog/admin/user_gen.php (added)
• wifidog/auth/index.php (modified) (2 diffs)
• wifidog/classes/AbstractDb.php (modified) (1 diff)
• wifidog/classes/Authenticator.php (modified) (1 diff)
• wifidog/classes/Connection.php (added)
• wifidog/classes/ContentTypeFilter.php (modified) (1 diff)
• wifidog/classes/HotspotGraph.php (modified) (1 diff)
• wifidog/classes/HotspotGraphElement.php (modified) (2 diffs)
• wifidog/classes/Mail.php (modified) (1 diff)
• wifidog/classes/MainUI.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (7 diffs)
• wifidog/classes/Node.php (modified) (4 diffs)
• wifidog/classes/NodeGroup.php (modified) (2 diffs)
• wifidog/classes/Role.php (modified) (1 diff)
• wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• wifidog/classes/Token.php (modified) (4 diffs)
• wifidog/classes/TokenTemplate.php (modified) (13 diffs)
• wifidog/classes/User.php (modified) (3 diffs)
• wifidog/include/common.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (2 diffs)
• wifidog/login/index.php (modified) (5 diffs)
• wifidog/signup.php (modified) (1 diff)
• wifidog/templates/classes/MainUI_ToolContent.tpl (modified) (1 diff)
• wifidog/ws/classes/Exceptions/WSException.php (modified) (1 diff)
• wifidog/ws/classes/WifidogWS/V1.php (modified) (18 diffs)
• wifidog/ws/index.php (modified) (2 diffs)

branches/newtoken/CHANGELOG

@@ -1 +1 @@
 # $Id$
 
-2009-12-17
+2010-01-28 Geneviève Bastien <gbastien@versatic.net>
+ * Modification to the web service to include authentication
+ * Added function generateConnectionTokenNoSession in User.php for the web service to generate tokens
+ * Fixed #691, content for login page, introduced in [1435]
+
+2010-01-21 Geneviève Bastien <gbastien@versatic.net>
+ * Permission error when deleting user role (#689)
+ * Patch by Steven Kurylo to remove white spaces from authenticator arguments (#612)
+ * Search for stakeholders has now same case-sensitivity as the user's network (#662)
+ * Corrected (#613) patch by Hélène Gauthier
+
+2009-12-17 Geneviève Bastien <gbastien@versatic.net>
  * Code refactoring: Network, NodeGroup, Node inherit from HotspotGraphElement (#677)
 
-2009-12-08
+2009-12-08 Geneviève Bastien <gbastien@versatic.net>
  * Added the concept of node group and hierarchy (in a not too clean way to start with, I will refactor the code before adding new functionalities to nodes and groups) (#246)
  * Login and signup and logout script now receive the mac address as parameter (#675)

branches/newtoken/wifidog/admin/generic_object_admin.php

@@ -74 +74 @@
 $supportsPreview = true;
 $supportsDeletion = true;
+$readOnly = false;
 /*
  * Check for the object class to use
@@ -357 +358 @@
             case "ContentTypeFilter" :
             case "ProfileTemplate" :
+            case "Connection":
+            case "TokenTemplate":
                 $supportsPreview = false;
                 break;
@@ -367 +370 @@
         switch ($_REQUEST['object_class']) {
             case "User" :
+            case "Connection":
                 $supportsDeletion = false;
                 break;
@@ -379 +383 @@
                 break;
         }
+        
+        // Process deletion abilities
+        switch ($_REQUEST['object_class']) {
+            case "Connection":
+                $readOnly = true;
+                break;
+
+            default :
+                break;
+        }
+       
 
         if (!$object) {
@@ -396 +411 @@
         $html .= $object->getAdminUI();
         $html .= "<div class='generic_object_admin_edit'>";
-        $html .= "<input type='hidden' name='action' value='save'>";
-        $html .= "<input type='submit' class='submit' name='save_submit' value='" . _("Save") . " " . get_class($object) . "'>";
+        if (!$readOnly) {
+            $html .= "<input type='hidden' name='action' value='save'>";
+            $html .= "<input type='submit' class='submit' name='save_submit' value='" . _("Save") . " " . get_class($object) . "'>";
+        }
 
         if ($supportsDeletion) {

branches/newtoken/wifidog/auth/index.php

@@ -52 +52 @@
 require_once('classes/Network.php');
 require_once('classes/User.php');
+require_once('classes/Connection.php');
 $db = AbstractDb::getObject();
 $auth_response = ACCOUNT_STATUS_DENIED;
@@ -60 +61 @@
 {
     $token = $db->escapeString($_REQUEST['token']);
-    $dbRetval = $db->execSqlUniqueRes("SELECT CURRENT_TIMESTAMP, *, CASE WHEN ((CURRENT_TIMESTAMP - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN tokens USING (token_id) JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.token_id='$token'", $info, false);
+    try {
+        $connection  = Connection::getObject($token);
+        $info = $connection->getRow();
+    } catch (Exception $e) {
+        $auth_message .= "| Error: couldn't retrieve the requested token: $token because of a SQL error. ";
+        $auth_response = ACCOUNT_STATUS_ERROR;
+    }
+    /* $dbRetval = $db->execSqlUniqueRes("SELECT CURRENT_TIMESTAMP, *, CASE WHEN ((CURRENT_TIMESTAMP - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired 
+                FROM connections 
+                JOIN tokens USING (token_id) 
+                JOIN users ON (users.user_id=connections.user_id) 
+                JOIN networks ON (users.account_origin = networks.network_id) 
+                WHERE connections.token_id='$token' ORDER BY conn_id DESC LIMIT 1", $info, false);
+    
     if($dbRetval==false){
         $auth_message .= "| Error: couldn't retrieve the requested token: $token because of a SQL error. ";
         $auth_response = ACCOUNT_STATUS_ERROR;
-    }
+    }*/
 }
 else {

branches/newtoken/wifidog/classes/AbstractDb.php

@@ -357 +357 @@
     {
         // WARNING : magic quotes must be off
-        if (is_null($string))
-            return "null";
         return pg_escape_string($string);
     }

branches/newtoken/wifidog/classes/Authenticator.php

@@ -358 +358 @@
         // Stop traffic counters update
         $conn_id = $db->escapeString($conn_id);
-        $sql = "UPDATE connections SET timestamp_out=CURRENT_TIMESTAMP WHERE conn_id='{$conn_id}';\n";
+        $sql = "UPDATE connections SET timestamp_out=CURRENT_TIMESTAMP, logout_reason=" . LOGOUT_REASON_USER_LOGOUT . " WHERE conn_id='{$conn_id}';\n";
         $sql .= "UPDATE tokens SET token_status='".TOKEN_USED."' FROM connections WHERE connections.token_id=tokens.token_id AND conn_id='{$conn_id}';\n";
         

branches/newtoken/wifidog/classes/ContentTypeFilter.php

@@ -288 +288 @@
 
                 !empty($userData['preSelectedId'])?$selectedId=$userData['preSelectedId']:$selectedId=null;
-                !empty($userData['additionalWhere'])?$additional_where=$userData['additionalWhere']:$additional_where=null;
+                !empty($userData['additionalWhere'])?$additional_where=$userData['additionalWhere']:$additional_where='';
                 
                 $additional_where = $db->escapeString($additional_where);

branches/newtoken/wifidog/classes/HotspotGraph.php

@@ -56 +56 @@
 {
 
+    /**
+     * Adds a relation to the hotspot graph
+     * @param parentId the id of the parent
+     * @param childId the id of the child
+     */
+    public static function addRelation($parentId, $childId) {
+        $db = AbstractDb :: getObject();
+        $parentIdStr = $db->escapeString($parentId);
+        $childIdStr = $db->escapeString($childId);
+        $sql = "INSERT INTO hotspot_graph (child_element_id, parent_element_id) VALUES ('{$childIdStr}', '{$parentIdStr}');";
+        $db->execSqlUpdate($sql, false);
+    }
+    
     /**
      * Gets recursively all parents of the given object

branches/newtoken/wifidog/classes/HotspotGraphElement.php

@@ -116 +116 @@
      * @access public
      */
-    public static function createNewObject($element_id, $element_type)
+    public static function createNewObject($element_id, $element_type, $parent_element = null)
     {
         $db = AbstractDb::getObject();
@@ -130 +130 @@
         }
         $object = self::getObject($element_id, $element_type);
+        
+        if (!is_null($parent_element)) {
+            if (method_exists($parent_element, 'getHgeId')) {
+                $parentid = $parent_element->getHgeId();
+                $childid = $object->getHgeId();
+                HotspotGraph::addRelation($parentid, $childid);
+            }
+        }
+        
         return $object;
     }

branches/newtoken/wifidog/classes/Mail.php

@@ -368 +368 @@
          */
         public function send() {
-            $phpmailerPath = 'lib/PHPMailer_v2.0.0/';
+            $dir = new DirectoryIterator('lib');
+            foreach ($dir as $fileinfo) {
+                if ($fileinfo->isDir() && (substr($fileinfo->getFilename(), 0, 9) == 'PHPMailer')) {
+                    $phpmailerPath = 'lib/' . $fileinfo->getFilename() . '/';
+                }
+            }
             require_once ($phpmailerPath.'class.phpmailer.php');
             require_once ($phpmailerPath.'class.smtp.php');

branches/newtoken/wifidog/classes/MainUI.php

@@ -329 +329 @@
         // Get all network content and node "everywhere" content
         $content_rows = null;
-        $network_id = $db->escapeString(Network :: getCurrentNetwork()->getId());
-        $sql_network = "(SELECT content_id, display_area, display_order, subscribe_timestamp FROM network_has_content WHERE network_id='$network_id'  AND display_page='everywhere') ";
         $node = Node :: getCurrentNode();
-        $sql_node = null;
+        // Get all the parent objects of the node
         if ($node) {
-            // Get all node content
-            $node_id = $db->escapeString($node->getId());
-            $sql_node = "UNION (SELECT content_id, display_area, display_order, subscribe_timestamp FROM node_has_content WHERE node_id='$node_id'  AND display_page='everywhere')";
-        }
-        $sql = "SELECT * FROM ($sql_network $sql_node) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
-
+            $parents = HotspotGraph::getAllParents($node);
+        } else {
+            $parents = array(Network :: getCurrentNetwork()->getHgeId());
+        }
+        
+        $first = $db->escapeString(array_shift($parents));
+        $sql_from = "(SELECT content_id, display_area, display_order, subscribe_timestamp 
+                                FROM hotspot_graph_element_has_content hgehc 
+                                WHERE hotspot_graph_element_id='$first' AND display_page='everywhere')";
+        
+        // Get the contents for all elements parents of and including the node, but exclude user subscribed content if user is known
+        foreach($parents as $parentid) {
+            $parent_id = $db->escapeString($parentid);
+            $sql_from .= " UNION (SELECT content_id, display_area, display_order, subscribe_timestamp 
+                                FROM hotspot_graph_element_has_content hgehc 
+                                WHERE hotspot_graph_element_id='$parent_id' AND display_page='everywhere')";
+        }
+        $sql = "SELECT * FROM ($sql_from) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
         $db->execSql($sql, $content_rows, false);
         if ($content_rows) {

branches/newtoken/wifidog/classes/Network.php

@@ -56 +56 @@
 require_once('classes/Security.php');
 require_once('classes/HotspotGraphElement.php');
+require_once('classes/TokenTemplate.php');
+
 
 /**
@@ -688 +690 @@
             }
         }
+        $params = array_map('trim',$params);
         return call_user_func_array(array (new ReflectionClass($this->_row['network_authenticator_class']), 'newInstance'), $params);
 
@@ -1694 +1697 @@
          * Content management
          */
-       /* $title = _("Network content");
-        $name = "network_".$this->_id."_content";
-        $data = Content::getLinkedContentUI($name, "network_has_content", "network_id", $this->_id, $display_page = "portal");
-        $html .= InterfaceElements::generateAdminSectionContainer("network_content", $title, $data);*/
         
         $html .= parent::getContentAdminUI();
@@ -1928 +1927 @@
         $html .= InterfaceElements::generateAdminSectionContainer("network_profile_templates", $title, $data);
         
+        // Token templates
+        $title = _("Network token templates");
+        $name = "network_".$this->_id."_token_templates";
+        $data = TokenTemplate::getTemplatesForNetworkUI($name, $this);
+        $html .= InterfaceElements::generateAdminSectionContainer("network_token_templates", $title, $data);
+        
         // objects hierarchy
         $html .= parent::getGraphAdminUI($this);
@@ -1950 +1955 @@
         // Content management
         parent::processContentAdminUI();
-        /* $name = "network_".$this->_id."_content";
-        Content :: processLinkedContentUI($name, 'network_has_content', 'network_id', $this->_id);*/
 
         // name
@@ -2069 +2072 @@
         ProfileTemplate :: processLinkedProfileTemplateUI($name, 'network_has_profile_templates', 'network_id', $this->_id);
         
+        // Token templates
+        $name = "network_".$this->_id."_token_templates";
+        TokenTemplate :: processTemplatesForNetworkUI($name, $this);
+        
         parent::processGraphAdminUI($errMsg, $this);
         if(!empty($errMsg)) {
@@ -2082 +2089 @@
         }
     }
-
-    /**
-     * Add network-wide content to this network
-     *
-     * @param object Content object
-     *
-     * @return void
-     *
-     * @access public
-     */
- /*   public function addContent(Content $content)
-    {
-        $db = AbstractDb::getObject();
-
-        $content_id = $db->escapeString($content->getId());
-        $sql = "INSERT INTO network_has_content (network_id, content_id) VALUES ('$this->_id','$content_id')";
-        $db->execSqlUpdate($sql, false);
-    }*/
-
-    /**
-     * Remove network-wide content from this network
-     *
-     * @param object Content object
-     *
-     * @return void
-     *
-     * @access public
-     */
- /*   public function removeContent(Content $content)
-    {
-        $db = AbstractDb::getObject();
-
-        $content_id = $db->escapeString($content->getId());
-        $sql = "DELETE FROM network_has_content WHERE network_id='$this->_id' AND content_id='$content_id'";
-        $db->execSqlUpdate($sql, false);
-    }*/
-
 
     /**

branches/newtoken/wifidog/classes/Node.php

@@ -281 +281 @@
         }
 
-        HotspotGraphElement::createNewObject($node_id, 'Node');
+        HotspotGraphElement::createNewObject($node_id, 'Node', $network);
         
         $object = self::getObject($node_id);
@@ -1185 +1185 @@
 
         //Node content
-        /*$_html_content = array();
-        $_title = _("Node content");
-        $_data = Content::getLinkedContentUI("node_" . $node_id . "_content", "node_has_content", "node_id", $this->id, "portal");
-        $html .= InterfaceElements::generateAdminSectionContainer("node_content", $_title, $_data);*/
+       
         $html .= parent::getContentAdminUI();
             
@@ -1407 +1404 @@
         // Content processing
         parent::processContentAdminUI();
-        /*$name = "node_{$node_id}_content";
-        Content::processLinkedContentUI($name, 'node_has_content', 'node_id', $this->id);*/
 
         // Name
@@ -1589 +1584 @@
     }
 
-    /** 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);
-    }*/
-
     /**
      * The list of the 5 most recent users who have logged into this node in the past week,

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()

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());

branches/newtoken/wifidog/classes/SmartyWifidog.php

@@ -189 +189 @@
      Node::assignSmartyValues($this);
      User::assignSmartyValues($this);
+     Token::assignSmartyValues($this);
      return parent::fetch($resource_name, $cache_id, $compile_id, $display);
     }

branches/newtoken/wifidog/classes/Token.php

@@ -55 +55 @@
 class Token 
 {
-    public static function generateConnectionToken($mac, $network, $user) {
+    /**
+     * Generate a new access token for the connection
+     *
+     * @param string $mac              The mac address of the computer connecting
+     *
+     * @param string $network          The network the person is connecting to
+     *
+     * @param string $node             The node from which the connection originates
+     *
+     * TODO: eventually, the user should not be necessary for userless authentication.  But much
+     * of the code would need to be changed in order to support this kind of authentication.
+     * @param string $user             The user authenticating
+     * 
+     * @param string $node_ip=null     The ip address from which the connection originates
+     *
+     * @return tokenid | false
+     *
+     */
+    public static function generateConnectionToken($mac, $network, $node, $user, $node_ip = null) {
         $retval = false;
         if ($user->isUserValid()) {
             $db = AbstractDb::getObject();
-            $session = Session::getObject();
-            
+                        
             // Delete unused connection token
 
             $token = self :: generateToken();
-            if ($_SERVER['REMOTE_ADDR']) {
+            if (is_null($node_ip) && $_SERVER['REMOTE_ADDR']) {
                 $node_ip = $db->escapeString($_SERVER['REMOTE_ADDR']);
             }
             
-            if ($session && $node_ip && $session->get(SESS_NODE_ID_VAR)) {
+            if ($node_ip && $node) {
                 //echo "$session && $node_ip && {$session->get(SESS_NODE_ID_VAR)}";
-                $node_id = $db->escapeString($session->get(SESS_NODE_ID_VAR));
-                $abuseControlFault = User::isAbuseControlViolated($user, $mac, Node::getObject($node_id));
+                $node_id = $db->escapeString($node->getId());
+                $abuseControlFault = User::isAbuseControlViolated($user, $mac, $node);
                 if($abuseControlFault) {
                     throw new Exception ($abuseControlFault);
@@ -82 +99 @@
                 $sql = "DELETE FROM connections USING tokens "."WHERE tokens.token_id=connections.token_id AND token_status='".TOKEN_UNUSED."' AND user_id = '".$user->getId()."';\n";
                 $db->execSqlUpdate($sql, false);
-                // TODO:  Try to find a reusable token before creating a brand new one!
 
                // Check if we have any token templates
-                // TODO: token templates should be from a specific template and there should always be a template
                 $templates = TokenTemplate::getTemplatesForNetwork($network);
                 if (count($templates) == 0) {
                     // No templates found
-                    // create and return new token - we don't enforce token limits
+                    // create and return new token - we don't enforce token limits, this is for backward compatibility
                     $token = self :: generateToken();
                     $sql = "INSERT INTO tokens (token_owner, token_issuer, token_id, token_status) VALUES ('" . $user->getId() . "', '" . $user->getId() . "', '$token', '" . TOKEN_UNUSED . "');\n";
@@ -144 +159 @@
                                 $max_incoming_data_value = (!is_null($template->getMaxIncomingData())?$template->getMaxIncomingData():"null");
                                 $max_outgoing_data_value = (!is_null($template->getMaxOutgoingData())?$template->getMaxOutgoingData():"null");
-                                if (!is_null($template->getMaxUsageDuration()))
+                                
+                                if (!is_null($template->getMaxConnectionDuration()))
+                                    $expiry_date = "CURRENT_TIMESTAMP + '" . $template->getMaxConnectionDuration() . "'";
+                                elseif (!is_null($template->getMaxUsageDuration()))
                                     $expiry_date = "CURRENT_TIMESTAMP + '" . $template->getMaxUsageDuration() . "'";
                                 elseif (!is_null($template->getMaxWallClockDuration()))
@@ -164 +182 @@
             }
         }
-       
+        self::setCurrentToken($retval);
         return $retval;
     } 
     
-                /**
-     * Generate a new access token for the specified user
-     *
-     * @param string $validated_user       The user to generate a token for
-     *
-     * @param string $creator              The user generating the token
-     *
-     * @param string $token_template_id    The token template that the token should be associated with.
-     *                                     If templates aren't used then this the auth process will create
-     *                                     tokens automatically and we don't need to create tokens elsewhere.
-     *
-     * @param string $token_lot=null       Optional. The token lot the token is part of.
-     *
-     * @return tokenid
-     *
-     */
-    public static function generateTokenForUser($validated_user, $creator, $token_template_id, $token_lot = null) {
-        $db = AbstractDb::getObject();
-        $token = self::generateToken();
-
-        $db->execSqlUpdate("INSERT INTO tokens (token_owner, token_issuer, token_id, token_template_id, token_status) VALUES ('" . $validated_user->getId() . "', '" . $creator->getId() . "', '$token', '" . $token_template_id . "', '" . TOKEN_UNUSED . "');");
-
-        return $token;
-    }
-    
     public static function generateToken() {
         return md5(uniqid(rand(), 1));
+    }
+    
+    /**
+     * Instantiate the current user
+     *
+     * @return mixed A User object, or null if there was an error
+
+     */
+    public static function getCurrentToken() {
+        require_once ('classes/Session.php');
+        $session = Session::getObject();
+        $sessTokenId = $session->get('SESS_TOKEN_ID');
+        
+       /* if(!empty($sessCurrentUserId)){
+            try {
+                $user = self :: getObject($sessCurrentUserId);
+                //$user = new User($session->get(SESS_USER_ID_VAR));
+            } catch (Exception $e) {
+                $session->set(SESS_TOKEN_ID, null);
+            }
+        }*/
+        return $sessTokenId;
+    }
+
+    /**
+     * Associates the user passed in parameter with the session
+     *
+     * This should NOT be called by anything except the Authenticators
+     *
+     * @param object $user User a user object, or null
+     *
+     * @return bool True if everything went well setting the session
+
+     */
+    public static function setCurrentToken($tokenId) {
+
+        try {
+            $session = Session::getObject();
+            $session->set('SESS_TOKEN_ID', $tokenId);
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+    
+                /** Set Smarty template values.  Standardization routine. 
+     * // TODO: implement this*/
+    public static function assignSmartyValues($smarty) {
+        
+        $tokenId = Token :: getCurrentToken();
+     
+        /**
+         * Define user security levels for the template
+         *
+         * These values are used in the default template of WiFoDog but could be
+         * used in a customized template to restrict certain links to specific
+         * user access levels.  Note however that they will all be deprecateb by the
+         * new roles system.
+         */
+        $smarty->assign('hasConnection', !empty($tokenId) ? true : false);
+        $smarty->assign('tokenId', $tokenId);
+        /*$smarty->assign('userIsValid', $user && !$user->isSplashOnlyUser() ? true : false);
+        $smarty->assign('userDEPRECATEDisSuperAdmin', $user && $user->DEPRECATEDisSuperAdmin());
+
+        if (isset ($_REQUEST['debug_request']) && ($user && $user->DEPRECATEDisSuperAdmin())) {
+            // Tell Smarty everything it needs to know
+            $smarty->assign('debugRequested', true);
+            $smarty->assign('debugOutput', print_r($_REQUEST, true));
+        }*/
     }
 }

branches/newtoken/wifidog/classes/TokenTemplate.php

@@ -48 +48 @@
 require_once('classes/Token.php');
 
+// Token templates context constants
+define('TT_CONTEXT_USER_ALLOWED', 1);
+define('TT_CONTEXT_USER_VALIDATING', 2);
+define('TT_CONTEXT_USER_FORGOT_PASSWORD', 3);
+define('TT_CONTEXT_GUEST', 4);
+define('TT_CONTEXT_SPLASH_ONLY', 5);
+
+
 /**
  * Abstract a token template
@@ -77 +85 @@
     }
 
-    static function createNewObject() {
-        echo "<h1>Use TokenTemplate::createTokenTemplate() instead</h1>";
+    static function createNewObject($tt_id = null, $network = null, $context = null) {
+        
+        $db = AbstractDb::getObject();
+        if (empty ($tt_id)) {
+            $tt_id = get_guid();
+        }
+        $tt_id = $db->escapeString($tt_id);
+        if (is_null($network)) {
+            $netwok = Network::getDefaultNetwork();
+        }
+        $network_id = $db->escapeString($network->getId());
+
+        if (is_null($context)) {
+            $contexts = self::getContexts();
+            $context = TT_CONTEXT_USER_ALLOWED;
+        }
+        
+    
+        $sql = "INSERT INTO token_templates (token_template_id, token_template_network, token_template_context) 
+                VALUES ('$tt_id', '$network_id', '$context')";
+
+        if (!$db->execSqlUpdate($sql, false)) {
+            throw new Exception(_('Unable to insert the new token template in the database!'));
+        }
+        $object = self::getObject($tt_id);
+        return $object;
     }
     
@@ -120 +152 @@
     }
 
-    /** Create a new User in the database
-     * @param $id The id to be given to the new user
-     * @return the newly created User object, or null if there was an error
-     * TODO: implement this
-     */
-    static function createTokenTemplate($id, $username, Network $network, $email, $password) {
-      /*  $db = AbstractDb::getObject();
-
-        $object = null;
-        $id_str = $db->escapeString($id);
-        $username_str = $db->escapeString($username);
-        $account_origin_str = $db->escapeString($account_origin->getId());
-        $email_str = $db->escapeString($email);
-
-        $password_hash = $db->escapeString(User :: passwordHash($password));
-        $status = ACCOUNT_STATUS_VALIDATION;
-        $token = User :: generateToken();
-
-        $db->execSqlUpdate("INSERT INTO users (user_id,username, account_origin,email,pass,account_status,validation_token,reg_date) VALUES ('$id_str','$username_str','$account_origin_str','$email_str','$password_hash','$status','$token',CURRENT_TIMESTAMP)");
-
-        $object = self::getObject($id);
-        return $object;*/
+    
+    static function getContexts() {
+        return array(TT_CONTEXT_USER_ALLOWED => "Authenticated user",
+                TT_CONTEXT_USER_VALIDATING => "Validating user",
+                TT_CONTEXT_USER_FORGOT_PASSWORD => "User forgot password",
+                TT_CONTEXT_GUEST => "Guest user (from another network)",
+                TT_CONTEXT_SPLASH_ONLY => "Splash-only user", );
+
     }
 
@@ -235 +253 @@
     }
 
-    function getCreationDate() {
-        return $this->_row['token_template_creation_date'];
-    }
-
-    public function setCreationDate($value) {
-        // Init values
-        $retVal = true;
-
-        if ($value != $this->getCreationDate()) {
-            $db = AbstractDb::getObject();
-            $value = $db->escapeString($value);
-            $retVal = $db->execSqlUpdate("UPDATE token_templates SET creation_date = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
-            $this->refresh();
-        }
-        return $retVal;
-    }
-    
     function getMaxIncomingData() {
         return $this->_row['token_max_incoming_data'];
@@ -313 +314 @@
         if ($value != $this->getMaxConnectionDuration()) {
             $db = AbstractDb::getObject();
-            $value = $db->escapeString($value);
-            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_connection_duration = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
+            $value = ($value != ''?"'".$db->escapeString($value)."'": 'null');
+            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_connection_duration = {$value} WHERE token_template_id = '{$this->getId()}'", false);
             $this->refresh();
         }
@@ -330 +331 @@
         if ($value != $this->getMaxUsageDuration()) {
             $db = AbstractDb::getObject();
-            $value = $db->escapeString($value);
+            $value = ($value != ''?"'".$db->escapeString($value)."'": 'null');
             $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_usage_duration = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
             $this->refresh();
@@ -338 +339 @@
     
     function getMaxWallClockDuration() {
-        return $this->_row['token_max_usage_duration'];
+        return $this->_row['token_max_wall_clock_duration'];
     }
 
@@ -347 +348 @@
         if ($value != $this->getMaxWallClockDuration()) {
             $db = AbstractDb::getObject();
-            $value = $db->escapeString($value);
-            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_usage_duration = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
+            $value = ($value != ''?"'".$db->escapeString($value)."'": 'null');
+            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_wall_clock_duration = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
             $this->refresh();
         }
@@ -363 +364 @@
         if ($value != $this->getMaxAge()) {
             $db = AbstractDb::getObject();
+            $value = ($value != ''?"'".$db->escapeString($value)."'": 'null');
+            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_age = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+        return $retVal;
+    }
+    
+    function getContext() {
+        return $this->_row['token_template_context'];
+    }
+
+    public function setContext($value) {
+        $retVal = true;
+
+        if ($value != $this->getContext()) {
+            $db = AbstractDb::getObject();
             $value = $db->escapeString($value);
-            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_max_age = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
+            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_template_context = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+        return $retVal;
+    }
+    
+    function getDescription() {
+        return $this->_row['token_template_description'];
+    }
+
+    public function setDescription($value) {
+        $retVal = true;
+
+        if ($value != $this->getDescription()) {
+            $db = AbstractDb::getObject();
+            $value = $db->escapeString($value);
+            $retVal = $db->execSqlUpdate("UPDATE token_templates SET token_template_description = '{$value}' WHERE token_template_id = '{$this->getId()}'", false);
             $this->refresh();
         }
@@ -386 +419 @@
         return $retVal;
     }
+    
 
     public static function generateToken() {
@@ -443 +477 @@
         return $html;
     }
-
-    /** Get the selected user, IF one was selected and is valid
-     * @param $user_prefix A identifier provided by the programmer to recognise it's generated form
-     * @param &$errMsg An error message will be appended to this is the username is not empty, but the user doesn't exist.
-     * @return the User object, or null if the user is invalid or none was selected
-     * TODO: implement this
+    
+    /**
+     * Get an interface to add/edit token templates linked to a network
+     *
+     * @param string $user_prefix            A identifier provided by the
+     *                                       programmer to recognise it's
+     *                                       generated HTML form
+     * @param Network $network               The network to get the ui for
+     * @return string HTML markup
+
      */
-    static function processSelectUserUI($user_prefix, &$errMsg) {
-        /*$object = null;
-        try {
-            $network = Network :: processSelectUI($user_prefix);
-            $name = "select_user_{$user_prefix}_username";
-            if (!empty ($_REQUEST[$name])) {
-                $username = $_REQUEST[$name];
-                return self :: getUserByUsernameOrEmail($username, $errMsg);
-            } else
-            return null;
-        } catch (Exception $e) {
-            return null;
-        }*/
-    }
-
-    // TODO: implement this
+    public static function getTemplatesForNetworkUI($user_prefix, $network) {
+
+        $db = AbstractDb :: getObject();
+
+        $networktemplates = self::getTemplatesForNetwork($network);
+        $object_id = $db->escapeString($network->getId());
+        
+        // Get the list of all contexts to see which are taken
+        $contexts = self::getContexts();
+        $html = "<table class='token_template_management'>\n";
+        $html .= "<th>" . _('Context') . '</th><th>' . _('Actions') . '</th>' . "\n";
+        
+       
+        foreach ($networktemplates as $template) {
+            
+            $html .= "<tr class='token_template'>\n";
+            /* Display page */
+            $html .= "<td>" . $contexts[$template->getContext()] . "</td>\n";
+            $html .= "<td>";
+            $name = $object_id . "_tt_" . $template->getId() . "_" . $template->getContext() . "_edit";
+            $html .= "<input type='button' class='submit' name='$name' value='" . _("Edit") . "' onClick='window.open(\"" . GENERIC_OBJECT_ADMIN_ABS_HREF . "?object_class=TokenTemplate&action=edit&object_id=" . $template->getId() . "\");'>\n";
+            $html .= "</td>\n";
+            $html .= "</tr>\n";
+            unset($contexts[$template->getContext()]);
+        }
+        
+        // Add new token for remaining context
+        if (!empty($contexts)) {
+            $choices = array();
+            $i = 0;
+            foreach ($contexts as $key => $value) {
+                $choices[$i][0] = $key;
+                $choices[$i][1] = $value;
+                $i++;
+            }
+            $html .= "<tr>";
+            $html .= "<td>" . FormSelectGenerator::generateFromArray($choices, null, $user_prefix, 'tt_add', false) . "</td>\n";
+            $name = $object_id . "_tt_add";
+            $html .= "<td><input type='submit' class='submit' name='$name' value='" . _("Add") . "'></td>\n";
+            $html .= "</tr>\n";
+   
+        }
+        $html .= "</table>\n";
+        
+        return $html;
+    }
+    
+    /**
+     * processes the interface to add / edit token templates
+     * 
+     * @param string $user_prefix            A identifier provided by the
+     *                                       programmer to recognise it's
+     *                                       generated HTML form
+     * @param Network $network               The network to get the ui for
+     * @return string HTML markup
+
+     */
+    public static function processTemplatesForNetworkUI($user_prefix, $network) {
+
+        $db = AbstractDb :: getObject();
+
+        $networktemplates = self::getTemplatesForNetwork($network);
+        $object_id = $db->escapeString($network->getId());
+        
+        // Get the list of all contexts to see which are taken
+        $contexts = self::getContexts();
+        
+        $name = $object_id . "_tt_add";
+        if (!empty($_REQUEST[$name])) {
+            $context = FormSelectGenerator::getResult($user_prefix, 'tt_add');
+            self::createNewObject(null, $network, $context);
+        }
+  
+    }
+
     public function getAdminUI() {
+        Security::requirePermission(Permission::P('NETWORK_PERM_EDIT_NETWORK_CONFIG'), $this->getNetwork());
+        require_once('classes/InterfaceElements.php');
+        // Init values
+        $html = '';
+        
         /*
-        $db = AbstractDb::getObject();
-        $currentUser = self :: getCurrentUser();
-        $userPreferencesItems = array();
-        $finalHtml = '';
-        if(Security::hasPermission(Permission::P('NETWORK_PERM_VIEW_STATISTICS'), $this->getNetwork())) {
-            // Statistics 
-            $content = "<a href='".BASE_SSL_PATH."admin/stats.php?Statistics=".$this->getNetwork()->getId()."&distinguish_users_by=user_id&stats_selected_users=".$this->getUsername()."&UserReport=on&user_id=".$this->getId()."&action=generate'>"._("Get user statistics")."</a>\n";
-            $administrationItems[] = InterfaceElements::genSectionItem($content);
-
-            // Account status 
-            $title = _("Account Status");
-            $help = _("Note that Error is for internal use only");
-            $name = "user_" . $this->getId() . "_accountstatus";
-            global $account_status_to_text;
-            $content = FormSelectGenerator::generateFromKeyLabelArray($account_status_to_text, $this->getAccountStatus(), $name, null, false);
-            $administrationItems[] = InterfaceElements::genSectionItem($content, $title, $help);
-
-            $finalHtml .= InterfaceElements::genSection($administrationItems, _("Administrative options"));
-        }
-
-        if (($this == $currentUser && !$this->isSplashOnlyUser() )|| Security::hasPermission(Permission::P('NETWORK_PERM_EDIT_ANY_USER'), $this->getNetwork())) {
-            // Username 
-            $title = _("Username");
-            $name = "user_" . $this->getId() . "_username";
-            $content = "<input type='text' name='$name' value='" . htmlentities($this->getUsername()) . "' size=30><br/>\n";
-            $content .= _("Be careful when changing this: it's the username you use to log in!");
-            $userPreferencesItems[] = InterfaceElements::genSectionItem($content, $title);
-
-
-            // Email 
-            $title = _("Email");
-            $name = "email_" . $this->getId() . "_email";
-            $content = "<input type='text' name='$name' disabled='disabled' value='" . htmlentities($this->getEmail()) . "' size=30><br/>\n";
-            $content .= _("If you wish to change this address, please Email Support!");
-            $userPreferencesItems[] = InterfaceElements::genSectionItem($content, $title);
-
-
-
-            // Change password 
-            $changePasswordItems=array();
-            if($this == $currentUser) {//Don't enter the old password if changing password for another user
-                $title = _("Your current password");
-                $name = "user_" . $this->getId() . "_oldpassword";
-                $content = "<input type='password' name='$name' size='20'>\n";
-                $changePasswordItems[] = InterfaceElements::genSectionItem($content, $title);
-            }
-
-            $title = _("Your new password");
-            $name = "user_" . $this->getId() . "_newpassword";
-            $content = "<input type='password' name='$name' size='20'>\n";
-            $changePasswordItems[] = InterfaceElements::genSectionItem($content, $title);
-
-            $title = _("Your new password (again)");
-            $name = "user_" . $this->getId() . "_newpassword_again";
-            $content = "<input type='password' name='$name' size='20'>\n";
-            $changePasswordItems[] = InterfaceElements::genSectionItem($content, $title);
-
-            $userPreferencesItems[] = InterfaceElements::genSection($changePasswordItems, _("Change my password"));
-
-            $finalHtml .= InterfaceElements::genSection($userPreferencesItems, _("User preferences"), false, false, get_class($this));
-
-            //N.B: For now, let pretend we have only one profile per use...
-            $profiles = $this->getAllProfiles();
-            $current_profile = null;
-            if(!empty($profiles)) {
-                $current_profile = $profiles[0];
-            }
-
-            if($current_profile != null) {
-                $finalHtml .= $current_profile->getAdminUI();
-                $name = "user_" . $this->getId() . "_delete_profile_".$current_profile->getId();
-                $value = _("Completely delete my public profile");
-                $finalHtml .= "<div class='admin_element_tools'>";
-                $finalHtml .= '<input type="submit" class="submit" name="' . $name . '" value="' . $value . '">';
-                $finalHtml .= "</div>";
-            }
-            else {                    // Get the list of profile templates for the users' network
-                $profile_templates = ProfileTemplate::getAllProfileTemplates($this->getNetwork());
-                if(!empty($profile_templates)) {
-                    $name = "user_" . $this->getId() . "_add_profile";
-                    $value = _("Create my public profile");
-                    $finalHtml .= "<div class='admin_element_tools'>";
-                    $finalHtml .= '<input type="submit" class="submit" name="' . $name . '" value="' . $value . '">';
-                    $finalHtml .= "</div>";
-                }
-            }
-        }
-
-        return $finalHtml;*/
-    }
-
-    // TODO Implement this
+         * Verify if an error message was registered before outputting the form
+         */
+        if (isset($this->errorMsg)) {
+             $html .= "<div class='errormsg'>" . $this->errorMsg . "</div>";
+        }
+        $tt_id = $this->getId();
+        
+        /*
+         * Begin with admin interface
+         */
+        $html .= "<fieldset class='admin_container ".get_class($this)."'>\n";
+        $html .= "<legend>"._("Token template")."</legend>\n";
+        $html .= "<ul class='admin_element_list'>\n";
+
+        /*
+         * Template information
+         */
+        $html_tt_information = array();
+
+        // template id
+        $title = _("Token Template Id");
+        $data = htmlspecialchars($tt_id, ENT_QUOTES);
+        $html_tt_information[] = InterfaceElements::generateAdminSectionContainer("tt_id", $title, $data);
+        
+        // template context
+        $title = _("Token Template Context");
+        $contexts = self::getContexts();
+        $data = htmlspecialchars(_($contexts[$this->getContext()]), ENT_QUOTES);
+        $html_tt_information[] = InterfaceElements::generateAdminSectionContainer("tt_context", $title, $data);
+        
+         // template description
+        $_title = _("Description");
+        $name = "tt_" . $tt_id . "_description";
+        $data = "<textarea name='$name' cols=80 rows=5 id='tt_description_textarea'>\n".$this->getDescription()."\n</textarea>\n";
+        $html_tt_information[] = InterfaceElements::generateAdminSectionContainer("tt_description", $_title, $data);
+        
+        // is reusable
+        $title = _("Template reusable");
+        $help = _("Are tokens generated from this template reusable?");
+        $data = InterfaceElements::generateInputCheckbox("tt_" . $tt_id . "_reusable", "", _("Yes"), $this->getIsReusable(), "tt_reusable_radio");
+        $html_tt_information[] = InterfaceElements::generateAdminSectionContainer("tt_reusable", $title, $data, $help);
+        
+        // Build section
+        $html .= InterfaceElements::generateAdminSectionContainer("tt_information", _("Information about the token template"), implode(null, $html_tt_information));
+        
+        
+        /*
+         * TT's data information
+         */
+        $html_tt_data_properties = array();
+           
+        // max incoming data
+        $title = _("Max incoming data");
+        $help = _("The maximum number of bytes of data this token can receive");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_incoming", $this->getMaxIncomingData(), "tt_max_incoming_input");
+        $html_tt_data_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_incoming", $title, $data, $help);
+        
+        // max outoing data
+        $title = _("Max outgoing data");
+        $help = _("The maximum number of bytes of data this token can send");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_outgoing", $this->getMaxOutgoingData(), "tt_max_outgoing_input");
+        $html_tt_data_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_outgoing", $title, $data, $help);
+        
+         // max total data
+        $title = _("Max total data");
+        $help = _("The maximum total number of bytes this token can send and receive");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_total_data", $this->getMaxTotalData(), "tt_max_total_data_input");
+        $html_tt_data_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_data", $title, $data, $help);
+        
+        // Build section
+        $html .= InterfaceElements::generateAdminSectionContainer("tt_data", _("Data limits"), implode(null, $html_tt_data_properties));
+       
+        
+        /*
+         * TT's data information
+         */
+        $html_tt_duration_properties = array();
+           
+        // max incoming data
+        $title = _("Max connection duration");
+        $help = _("The length of a single connection.");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_conn_duration", $this->getMaxConnectionDuration(), "tt_max_conn_duration_input");
+        $html_tt_duration_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_conn_duration", $title, $data, $help);
+        
+        // max outoing data
+        $title = _("Max usage");
+        $help = _("The maximum time a user can be online (counting only when used).  Allows access by the hour.");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_usage", $this->getMaxUsageDuration(), "tt_max_usage_input");
+        $html_tt_duration_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_usage", $title, $data, $help);
+        
+         // max total data
+        $title = _("Max wall clock duration");
+        $help = _("The maximum amount of time a token can be used, starting count when first used.  Allows weekly, daily tokens.");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_wc_duration", $this->getMaxWallClockDuration(), "tt_max_wc_duration_input");
+        $html_tt_duration_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_wc_duration", $title, $data, $help);
+        
+        // max total data
+        $title = _("Max age");
+        $help = _("The maximum age before a token expires, starting count when issued.");
+        $data = InterfaceElements::generateInputText("tt_" . $tt_id . "_max_age", $this->getMaxAge(), "tt_max_age_input");
+        $html_tt_duration_properties[] = InterfaceElements::generateAdminSectionContainer("tt_max_age", $title, $data, $help);
+        
+        // Build section
+        $html .= InterfaceElements::generateAdminSectionContainer("tt_duration", _("Duration limits"), implode(null, $html_tt_duration_properties),
+                 _("For these values, any postgresql interval is acceptable, for example '1 day', '1 month', '3 week'"));
+       
+        return $html;
+    }
+
     public function processAdminUI() {
-       /* $db = AbstractDb::getObject();
-        $currentUser = self :: getCurrentUser();
-        if (Security::hasPermission(Permission::P('NETWORK_PERM_EDIT_ANY_USER'), $this->getNetwork())) {
-            // Account status 
-            $name = "user_" . $this->getId() . "_accountstatus";
-            $status = FormSelectGenerator::getResult($name, null);
-            $this->setAccountStatus($status);
-        }
-
-        if ($this == $currentUser || Security::requirePermission(Permission::P('NETWORK_PERM_EDIT_ANY_USER'), $this->getNetwork())) {
-            // Username 
-            $name = "user_" . $this->getId() . "_username";
-            $this->setUsername($_REQUEST[$name]);
-
-            // Change password 
-            $nameOldpassword = "user_" . $this->getId() . "_oldpassword";
-            $nameNewpassword = "user_" . $this->getId() . "_newpassword";
-            $nameNewpasswordAgain = "user_" . $this->getId() . "_newpassword_again";
-            if($_REQUEST[$nameNewpassword]!=null){
-                if ($this == $currentUser && $this->getPasswordHash() != User::passwordHash($_REQUEST[$nameOldpassword])) {
-                    throw new Exception(_("Wrong password."));
-                }
-                if ($_REQUEST[$nameNewpassword] != $_REQUEST[$nameNewpasswordAgain]){
-                    throw new Exception(_("Passwords do not match."));
-                }
-                $this->setPassword($_REQUEST[$nameNewpassword]);
-            }
-
-            // Pretend there is only one
-            $profiles = $this->getAllProfiles();
-            if(!empty($profiles)) {
-                $current_profile = $profiles[0];
-                if($current_profile != null) {
-                    $current_profile->processAdminUI();
-                    $name = "user_" . $this->getId() . "_delete_profile_".$current_profile->getId();
-                    if(!empty($_REQUEST[$name])) {
-                        $errmsg=null;
-                        $current_profile->delete($errmsg);
-                    }
-                }
-            }
-            else {
-                $name = "user_" . $this->getId() . "_add_profile";
-                if(!empty($_REQUEST[$name])) {
-                    // Get the list of profile templates for the users' network
-                    $profile_templates = ProfileTemplate::getAllProfileTemplates($this->getNetwork());
-                    if(!empty($profile_templates)) {
-                        // Create a blank profile and link it to the user
-                        $current_profile = Profile::createNewObject(null, $profile_templates[0]);
-                        $this->addProfile($current_profile);
-                    }
-                }
-
-            }
-
-        }*/
+        Security::requirePermission(Permission::P('NETWORK_PERM_EDIT_NETWORK_CONFIG'), $this->getNetwork());
+        $tt_id = $this->getId();
+            
+        // template description
+        $name = "tt_" . $tt_id . "_description";
+        $this->setDescription($_REQUEST[$name]);
+            
+        // is reusable
+        $name = "tt_" . $tt_id . "_reusable";
+        $this->setIsReusable(empty ($_REQUEST[$name]) ? false : true);
+        
+        // max incoming data
+        $name = "tt_" . $tt_id . "_max_incoming";
+        $this->setMaxIncomingData($_REQUEST[$name]);
+            
+        // max outoing data
+        $name = "tt_" . $tt_id . "_max_outgoing";
+        $this->setMaxOutgoingData($_REQUEST[$name]);
+         
+        // max total data
+        $name = "tt_" . $tt_id . "_max_total_data";
+        $this->setMaxTotalData($_REQUEST[$name]);
+        
+        // max incoming data
+        $name = "tt_" . $tt_id . "_max_conn_duration";
+        $this->setMaxConnectionDuration($_REQUEST[$name]);
+        
+        // max outoing data
+        $name = "tt_" . $tt_id . "_max_usage";
+        $this->setMaxUsageDuration($_REQUEST[$name]);
+       
+        // max total data
+        $name = "tt_" . $tt_id . "_max_wc_duration";
+        $this->setMaxWallClockDuration($_REQUEST[$name]);
+        
+        // max total data
+        $name = "tt_" . $tt_id . "_max_age";
+        $this->setMaxAge($_REQUEST[$name]);
+        
     }
     
@@ -626 +728 @@
      */
     public function canGenerateForUser($user, $mac) {
-        return true;
+        // First make sure the user has the right status for this template
+        $retval = true;
+        if ($user instanceof User) {
+            switch($this->getContext()) {
+                case TT_CONTEXT_USER_ALLOWED:
+                    $retval = ($user->getAccountStatus() == ACCOUNT_STATUS_ALLOWED);                       
+                    break;
+                case TT_CONTEXT_USER_VALIDATING:
+                    $retval = ($user->getAccountStatus() == ACCOUNT_STATUS_VALIDATION); 
+                    break;
+                case TT_CONTEXT_USER_FORGOT_PASSWORD:
+                    
+                    break;
+                case TT_CONTEXT_GUEST:
+                    $retval = ($user->getNetwork()->getId() != Network::getCurrentNetwork()->getId());
+                    break;
+                case TT_CONTEXT_SPLASH_ONLY:
+                    $retval = ($user->isSplashOnlyUser()); 
+                    break;
+                default:
+                    $retval = false;
+            }
+            
+        }
+        return $retval;
        /* $retval = false;
         // A new token can be generated if
@@ -687 +813 @@
     }
 
-    /** Set Smarty template values.  Standardization routine. 
-     * // TODO: implement this*/
-    public static function assignSmartyValues($smarty, $user = null) {
-        /*if (!$user)
-        $user = User :: getCurrentUser();
-        $session = Session :: getObject();
-        $smarty->assign('userOriginallyRequestedURL', $session ? $session->get(SESS_ORIGINAL_URL_VAR) : '');
-        $smarty->assign('userId', $user ? $user->getId() : '');
-        $smarty->assign('userName', $user ? $user->getUsername() : '');*/
-        /**
-         * Define user security levels for the template
-         *
-         * These values are used in the default template of WiFoDog but could be
-         * used in a customized template to restrict certain links to specific
-         * user access levels.  Note however that they will all be deprecateb by the
-         * new roles system.
-         */
-        /*$smarty->assign('userIsValid', $user && !$user->isSplashOnlyUser() ? true : false);
-        $smarty->assign('userDEPRECATEDisSuperAdmin', $user && $user->DEPRECATEDisSuperAdmin());
-
-        if (isset ($_REQUEST['debug_request']) && ($user && $user->DEPRECATEDisSuperAdmin())) {
-            // Tell Smarty everything it needs to know
-            $smarty->assign('debugRequested', true);
-            $smarty->assign('debugOutput', print_r($_REQUEST, true));
-        }*/
-    }
 }
 

branches/newtoken/wifidog/classes/User.php

@@ -172 +172 @@
         return $object;
     }
+    
+                /** Instantiate a user object
+     * @param $username The username of the user
+     * @param $account_origin Network:  The account origin
+     * @param &$errMsg An error message will be appended to this if the username is not empty, but the user doesn't exist.
+     * @return a User object, or null if there was an error
+     */
+    public static function getUserByUsernameOrEmailAndOrigin($usernameOrEmail, Network $account_origin, &$errMsg = null) {
+        $db = AbstractDb::getObject();
+        $object = null;
+
+        $username_str = $db->escapeString($usernameOrEmail);
+        $comparison = ($account_origin->getUsernamesCaseSensitive()? '=': 'ILike');
+        $account_origin_str = $db->escapeString($account_origin->getId());
+        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE (username {$comparison} '$username_str' OR email ILike '$username_str') AND account_origin = '$account_origin_str'", $user_info, false);
+
+        if ($user_info != null) {
+            $object = self::getObject($user_info['user_id']);
+        }
+        else if (!empty($usernameOrEmail)) {
+            $errMsg .= sprintf(_("There is no user with username or email %s"),$usernameOrEmail);
+        }
+        return $object;
+    }
 
     /** Instantiate a user object
@@ -653 +677 @@
                 $node_id = $db->escapeString($session->get(SESS_NODE_ID_VAR));
                 $abuseControlFault = User::isAbuseControlViolated($this, $mac, Node::getObject($node_id));
+                if($abuseControlFault) {
+                    throw new Exception ($abuseControlFault);
+                }
+                $mac = (is_null($mac)?'': $db->escapeString($mac));
+                /*
+                 * Delete all unused tokens for this user, so we don't fill the database
+                 * with them
+                 */
+                $sql = "DELETE FROM connections USING tokens "."WHERE tokens.token_id=connections.token_id AND token_status='".TOKEN_UNUSED."' AND user_id = '".$this->getId()."';\n";
+                // TODO:  Try to find a reusable token before creating a brand new one!
+
+                $sql .= "INSERT INTO tokens (token_owner, token_issuer, token_id, token_status) VALUES ('" . $this->getId() . "', '" . $this->getId() . "', '$token', '" . TOKEN_UNUSED . "');\n";
+                $sql .= "INSERT INTO connections (user_id, token_id, timestamp_in, node_id, node_ip, last_updated, user_mac) VALUES ('" . $this->getId() . "', '$token', CURRENT_TIMESTAMP, '$node_id', '$node_ip', CURRENT_TIMESTAMP, '$mac')";
+                $db->execSqlUpdate($sql, false);
+                $retval = $token;
+            }
+            else {
+                $retval = false;
+            }
+        }
+        else {
+            $retval = false;
+        }
+        return $retval;
+    }
+    
+    /** Generate a token in the connection table so the user can actually use the internet
+    @return true on success, false on failure
+    */
+    function generateConnectionTokenNoSession($node, $node_ip = null, $mac = null ) {
+        if ($this->isUserValid()) {
+            $db = AbstractDb::getObject();
+            
+            $token = self :: generateToken();
+            if ($node_ip && $node) {
+                //echo "$session && $node_ip && {$session->get(SESS_NODE_ID_VAR)}";
+                $node_id = $node->getId();
+                $abuseControlFault = User::isAbuseControlViolated($this, $mac, $node);
                 if($abuseControlFault) {
                     throw new Exception ($abuseControlFault);
@@ -857 +919 @@
             if (!empty ($_REQUEST[$name])) {
                 $username = $_REQUEST[$name];
-                return self :: getUserByUsernameOrEmail($username, $errMsg);
+                return self :: getUserByUsernameOrEmailAndOrigin($username, $network, $errMsg);
             } else
             return null;

branches/newtoken/wifidog/include/common.php

@@ -156 +156 @@
 define('LOGOUT_REASON_GARBAGE_COLLECTED', 3);
 define('LOGOUT_REASON_UNKNOWN', 0);
+define('LOGOUT_REASON_USER_LOGOUT', 1);
+
 /* End of Other constants */
 

branches/newtoken/wifidog/include/schema_validate.php

@@ -1529 +1529 @@
         printUpdateVersion($new_schema_version);
         $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+        $sql .= "ALTER TABLE token_templates ADD COLUMN token_template_context integer;\n";
+        $sql .= "ALTER TABLE token_templates ALTER COLUMN token_template_context SET DEFAULT NULL;\n";
+        $sql .= "ALTER TABLE token_templates ADD COLUMN token_template_description text;\n";
+        $sql .= "ALTER TABLE token_templates ALTER COLUMN token_template_description SET DEFAULT NULL;\n";
         
         //$networks = Network::getAllNetworks();
@@ -1535 +1539 @@
         foreach ($networks as $network) {
             $new_guid = get_guid();
-            $sql .= "INSERT INTO token_templates(token_template_id, token_template_network) values('{$new_guid}', '{$network['network_id']}');\n ";
+            $sql .= "INSERT INTO token_templates(token_template_id, token_template_network, token_template_context, token_template_description) values('{$new_guid}', '{$network['network_id']}', 1, 'Created when the database schema was updated');\n ";
         }
+        
     }
     

branches/newtoken/wifidog/login/index.php

@@ -197 +197 @@
         $user = $network->getSplashOnlyUser();
         //$token = $user->generateConnectionToken($mac);
-        $token = Token::generateConnectionToken($mac, $network, $user);
+        $token = Token::generateConnectionToken($mac, $network, $node, $user);
         User::setCurrentUser($user);
         header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
@@ -222 +222 @@
             // Login from a gateway, redirect to the gateway to activate the token
             // $token = $user->generateConnectionToken($mac);
-            $token = Token::generateConnectionToken($mac, $network, $user);
+            $token = Token::generateConnectionToken($mac, $network, $node, $user);
             if(!$token)
             {
@@ -280 +280 @@
 $html .= "<h1>"._("I'm having difficulties:")."</h1>\n";
 $html .= "<ul>\n";
-$html .= "<li><a href='".BASE_URL_PATH."lost_username.php'>"._("I Forgot my username")."</a></li>\n";
-$html .= "<li><a href='".BASE_URL_PATH."lost_password.php'>"._("I Forgot my password")."</a></li>\n";
-$html .= "<li><a href='".BASE_URL_PATH."resend_validation.php'>"._("Re-send the validation email")."</a></li>\n";
+$html .= "<li><a href='".BASE_URL_PATH."lost_username.php?" . $_SERVER['QUERY_STRING']. "'>"._("I Forgot my username")."</a></li>\n";
+$html .= "<li><a href='".BASE_URL_PATH."lost_password.php?" . $_SERVER['QUERY_STRING']. "'>"._("I Forgot my password")."</a></li>\n";
+$html .= "<li><a href='".BASE_URL_PATH."resend_validation.php?" . $_SERVER['QUERY_STRING']. "'>"._("Re-send the validation email")."</a></li>\n";
 $html .= "</ul>\n";
 $html .= "</div>\n";
@@ -309 +309 @@
 
 // Get all network content and node "login" content
-$content_rows = null;
-$network_id = $network->getId();
-$sql_network = "(SELECT content_id, display_area, display_order, subscribe_timestamp FROM network_has_content WHERE network_id='$network_id'  AND display_page='login') ";
-$sql_node = null;
+// Get all the parent objects of the node
 if ($node) {
-    // Get all node content
-    $node_id = $db->escapeString($node->getId());
-    $sql_node = "UNION (SELECT content_id, display_area, display_order, subscribe_timestamp FROM node_has_content WHERE node_id='$node_id'  AND display_page='login')";
-}
-$sql = "SELECT * FROM ($sql_network $sql_node) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
-
+    $parents = HotspotGraph::getAllParents($node);
+} else {
+    $parents = array($network->getHgeId());
+}
+
+$first = $db->escapeString(array_shift($parents));
+$sql_from = "(SELECT content_id, display_area, display_order, subscribe_timestamp 
+                        FROM hotspot_graph_element_has_content 
+                        WHERE hotspot_graph_element_id='$first' AND display_page='login')";
+
+// Get the contents for all elements parents of and including the node, but exclude user subscribed content if user is known
+foreach($parents as $parentid) {
+    $parent_id = $db->escapeString($parentid);
+    $sql_from .= " UNION (SELECT content_id, display_area, display_order, subscribe_timestamp 
+                        FROM hotspot_graph_element_has_content hgehc 
+                        WHERE hotspot_graph_element_id='$parent_id' AND display_page='login')";
+}
+$sql = "SELECT * FROM ($sql_from) AS content_everywhere ORDER BY display_area, display_order, subscribe_timestamp DESC";
 $db->execSql($sql, $content_rows, false);
 if ($content_rows) {
@@ -329 +338 @@
     }
 }
+$showMoreLink = false;
+
 
 /*

branches/newtoken/wifidog/signup.php

@@ -233 +233 @@
             // Make sure the user IDs match
             if(($created_user->getId() == $authenticated_user->getId())) {
-                $token = $created_user->generateConnectionToken($mac);
+                $node = Node::getObjectByGatewayId($gw_id);
+                $network = $node->getNetwork();
+                $token = Token::generateConnectionToken($mac, $network, $node, $created_user);
 
                 $redirURL = "http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token;

branches/newtoken/wifidog/templates/classes/MainUI_ToolContent.tpl

@@ -55 +55 @@
                     <div>{"Logged in as"|_}: {$userListUI}</div>
                     <a id="preferences_link" href="{$base_ssl_path}admin/generic_object_admin.php?object_id={$userId}&amp;object_class=User&amp;action=edit"><img src="{$common_images_url}profile.gif">&nbsp;{"Profile / Settings"|_}</a>
+                    {if $hasConnection}<a id="preferences_link" href="{$base_ssl_path}admin/generic_object_admin.php?object_id={$tokenId}&amp;object_class=Connection&amp;action=edit"><img src="{$common_images_url}profile.gif">&nbsp;{"Connection information"|_}</a>{/if}
                     <a id="logout_link" href="{$base_ssl_path}login/?logout=true{$logoutParameters}"><img src="{$common_images_url}logout.gif">&nbsp;{"Logout"|_}</a>
                 {else}

branches/newtoken/wifidog/ws/classes/Exceptions/WSException.php

@@ -50 +50 @@
 class WSException extends Exception
 {
+    CONST INVALID_PARAMETER = 8801;
+    CONST GENERIC_EXCEPTION = 8800;
+    CONST PROCESS_ERROR = 8802;
+    
     // Redefine the exception so message isn't optional
-    public function __construct($message, $code = 0) {
+    public function __construct($message, $code = 8800) {
         // some code
    

branches/newtoken/wifidog/ws/classes/WifidogWS/V1.php

@@ -43 +43 @@
  * Web service V1 class
  *
- * Actions are:
+ * mandatory parameters:
+ * action: get|list|auth
+ *
+ * Each action has its own set of parameters:
+ * 
  * get: get some information concerning a given object, identified by its id
+ *              parameters: object_class  The class of the object to get
+ *               object_id  The id of the object
+ *               fields  The list of fields to fetch (absent: all the allowed fields)
+ *               id_type (o)  Not used yet
+ *               
  * list: get some informations concerning a list of objects
- * auth: verify the users credential. 
+ *    parameters:  object_class The class of objects to list
+ *               fields   The fields to list for each object
+ *               parent_class (o)  The class of the parent object (for the nodes of a network, the class would be network)
+ *               parent_id (o)  The id of the parent object
+ *               
+ * auth: verify the users credential. And in part authenticate the user
+ *    parameters: username  The username to authenticate
+ *               password   The password
+ *               gw_id (o)  The gateway id if the request comes from a gateway
+ *               gw_address (o)  The gateway address as sent in the original request from gateway
+ *               gw_port (o)  The gateway port as sent from the original request from gateway
+ *               from_ip (o)  The ip of the user, as can be got from the $_SERVER['REMOTE_ADDR'] variable
+ *               mac (o)  The user mac as sent in the original request from gateway
  *     NOTE: This action DOES NOT authenticate the user on the gateway and hence, DOES NOT grant access to the internet.
  *           There is an authentication protocol that needs to be respected (http://dev.wifidog.org/wiki/doc/developer/WiFiDogProtocol_V1)
- *           An authentication token must be generated and the response redirects to the gateway's auth server that redirects to the portal page
+ *           However, this action will return the url that should be used as a next step of this protocol, so the calling system may do what it must
  *
  * @package    WiFiDogAuthServer
@@ -125 +146 @@
     }
     
+    protected function mapFields($objectClass, $infields = array()) {
+        $fields = array()   ;    
+        foreach($infields as $field) {
+            if (isset(self::$_allowedFields[$objectClass][$field]))
+                $fields[] = self::$_allowedFields[$objectClass][$field];
+            else
+                $fields[] = "$field.forbidden";
+        }
+        return $fields;
+    }
+    
     /**
      * This function executes the action requested by the web service
@@ -132 +164 @@
     protected function executeAction() {
         if (!isset($this->_action)) {
-            throw new WSException("No action was specified.  Please use GET parameter 'action=list|get|auth' to specify an action"); 
+            throw new WSException("No action was specified.  Please use GET parameter 'action=list|get|auth' to specify an action", WSException::INVALID_PARAMETER); 
         }
         switch($this->_action) {
@@ -151 +183 @@
             case 'auth':
                 $gw_id = (isset($this->_params['gw_id']) ? $this->_params['gw_id']:null);
-                $gw_ip = (isset($this->_params['gw_ip']) ? $this->_params['gw_ip']:null);
+                $gw_address = (isset($this->_params['gw_address']) ? $this->_params['gw_address']:null);
+                $gw_port = (isset($this->_params['gw_port']) ? $this->_params['gw_port']:null);
+                $mac = (isset($this->_params['mac']) ? $this->_params['mac']:null);
+                $from = (isset($this->_params['from_ip']) ? $this->_params['from_ip']:null);
                 $username = (isset($this->_params['username']) ? $this->_params['username']:'');
                 $password = (isset($this->_params['password']) ? $this->_params['password']:'');
-                $this->executeAuth($username, $password, $gw_id, $gw_ip);
+                $this->executeAuth($username, $password, $gw_id, $gw_address, $mac, $gw_port, $from);
                 break;
             default:
-                throw new WSException("Action {$this->_action} is not defined.  Please use GET parameter 'action=list|get|auth' to specify an action");
+                throw new WSException("Action {$this->_action} is not defined.  Please use GET parameter 'action=list|get|auth' to specify an action", WSException::INVALID_PARAMETER);
                 break;
         }
@@ -171 +206 @@
      * @return unknown_type
      */
-    protected function executeAuth($username = null, $password = null, $gw_id = null, $gw_ip = null) {
+    protected function executeAuth($username = null, $password = null, $gw_id = null, $gw_ip = null, $mac = null, $gw_port = null, $from = null) {
         $this->_outputArr['auth'] = 0;
         
@@ -180 +215 @@
         
         if (!is_null($gw_id)) {
-            if (is_null($gw_ip)) {
-                throw new WSException("Missing information on the gateway.  Must specify parameter 'gw_ip' if there is a gateway id.");
+            if (is_null($gw_ip) || is_null($gw_port) || is_null($from)) {
+                throw new WSException("Missing information on the gateway.  You must specify parameter 'gw_address' AND 'gw_port' AND 'from_ip' if the parameter 'gw_id' is specified.", WSException::INVALID_PARAMETER);
             }
             $node = Node::getObjectByGatewayId($gw_id);
@@ -187 +222 @@
                 $network = $node->getNetwork();
             } else {
-                throw new WSException("Node identified by $gw_id cannot be found");
+                throw new WSException("Node identified by $gw_id cannot be found", WSException::PROCESS_ERROR);
             }
         } else {
@@ -198 +233 @@
          * If this is a splash-only node, then the user is automatically authenticated
          */
+        $token = null;
         if (!empty($node) && $node->isSplashOnly()) {
             $this->_outputArr['auth'] = 1;
             $user = $network->getSplashOnlyUser();
+            $token = Token::generateConnectionToken($mac, $network, $node, $user, $from);
+            if (!$token) throw new WSException("User authenticated but cannot generate connection token.", WSException::PROCESS_ERROR);
         } else {
             // Authenticate the user on the requested network
@@ -209 +247 @@
             } else {
                 $this->_outputArr['auth'] = 1;
-            }
+                if (!is_null($node)) {
+                    $token = Token::generateConnectionToken($mac, $network, $node, $user, $from);
+                   
+                    if (!$token) throw new WSException("User authenticated but cannot generate connection token.", WSException::PROCESS_ERROR);
+                }
+            }
+        }
+        if ($this->_outputArr['auth'] == 1 && !is_null($token)) {
+            $this->_outputArr['forwardTo'] = "http://" . $gw_ip . ":" . $gw_port . "/wifidog/auth?token=" . $token;
         }
     }
@@ -222 +268 @@
     protected function executeGet($objectClass, $objectId, $fields = array(), $idtype = null) {
         if (is_null($objectClass)) {
-            throw new WSException("Missing parameter 'object_class' in the request.");
+            throw new WSException("Missing parameter 'object_class' in the request.", WSException::INVALID_PARAMETER);
         }
         if (is_null($objectId)) {
-            throw new WSException("Missing parameter 'object_id' in the request.");
+            throw new WSException("Missing parameter 'object_id' in the request.", WSException::INVALID_PARAMETER);
         }
         if (!in_array($objectClass,self::$_allowedObjectClass)) {
-            throw new WSException("Wrong object class '{$objectClass}' requested.  Possible values are " . implode(', ', self::$_allowedObjectClass));
+            throw new WSException("Wrong object class '{$objectClass}' requested.  Possible values are " . implode(', ', self::$_allowedObjectClass), WSException::INVALID_PARAMETER);
         }
         
@@ -247 +293 @@
         // IF the object still is not found, then return an error
         if (is_null($object)) {
-            throw new WSException("Object of class {$objectClass} with id {$objectId} not found");
+            throw new WSException("Object of class {$objectClass} with id {$objectId} not found", WSException::PROCESS_ERROR);
         }
   
+        $fields = $this->mapFields($objectClass, $fields);
         if (empty($fields)) {
             $fields = array_keys(self::$_allowedFields[$objectClass]);
@@ -255 +302 @@
         $allowedFields = self::$_allowedFields[$objectClass];
         
+        $this->_outputArr = self::filterRet($object, $fields);
+        /*
         foreach($fields as $field) {
             if (isset($allowedFields[ucfirst(strtolower($field))])) {
@@ -268 +317 @@
             }
         }
-        
+        */
         
     }
@@ -282 +331 @@
     protected function executeList($objectClass, $fields = array(), $parentClass = null, $parentId = null) {
         if (is_null($objectClass)) {
-            throw new WSException("Missing parameter 'object_class' in the request.");
+            throw new WSException("Missing parameter 'object_class' in the request.", WSException::INVALID_PARAMETER);
         }
         if (!in_array($objectClass,self::$_allowedObjectClass)) {
-            throw new WSException("Wrong object class '{$objectClass}' requested.  Possible values are " . implode(', ', self::$_allowedObjectClass));
+            throw new WSException("Wrong object class '{$objectClass}' requested.  Possible values are " . implode(', ', self::$_allowedObjectClass), WSException::INVALID_PARAMETER);
         }
         
@@ -294 +343 @@
             if (!is_null($parentId)) {
                 if (!in_array($parentClass,self::$_allowedObjectClass)) {
-                    throw new WSException("Wrong parent class '{$parentClass}' specified.  Possible values are " . implode(', ', self::$_allowedObjectClass));
+                    throw new WSException("Wrong parent class '{$parentClass}' specified.  Possible values are " . implode(', ', self::$_allowedObjectClass), WSException::INVALID_PARAMETER);
                 }
                 include_once('classes/'.$parentClass.'.php');
                 $parentObject = call_user_func($parentClass.'::getObject', $parentId);
             } else {
-                throw new WSException("If parent class is specified, must specify 'parent_id'");
+                throw new WSException("If parent class is specified, must specify 'parent_id'", WSException::INVALID_PARAMETER);
             }
         }
@@ -308 +357 @@
             }
         }
+        $fields = $this->mapFields($objectClass, $fields);
         if (empty($fields)) {
             $fields = self::$_allowedFields[$objectClass];
-        }
+        } 
 
         $this->_outputArr = self::filterRet($objectList, $fields);
@@ -326 +376 @@
         }
         $filtered = array();
+
         foreach($retVals as $key => $value) {
             // If the return is one object we filter, return only the allowed fields
@@ -339 +390 @@
                     $retFields = array();
                     foreach ($fields as $field) {
-                        $methodName = 'get'.$field;
-                        if (method_exists($value, $methodName)) {
-                            $retFields[$field] = self::filterRet($value->$methodName());
-                        } else {
-                            $retFields[$field] = 'unknown';
-                        }
+                        $forbiddenfield = explode(".", $field);
+                        if (! (count($forbiddenfield) == 2)) {
+                            $methodName = 'get'.$field;
+                            if (method_exists($value, $methodName)) {
+                                
+                                $retFields[$field] = self::filterRet($value->$methodName());
+                            } else {
+                                $retFields[$field] = 'unknown';
+                            }
+                        } else
+                            $retFields[$forbiddenfield[0]] = 'Not allowed';
                     }
                     $filtered[] = $retFields;

branches/newtoken/wifidog/ws/index.php

@@ -95 +95 @@
     $exceptionClass = get_class($e);
     if (!is_null($output)) {
-        echo $output->outputError(array('type' => $exceptionClass, 
+        if ($exceptionClass == 'WSException') {
+            echo $output->outputError(array('type' => $exceptionClass, 
+                                    'message' => sprintf(_("Web service exception:  %s (%s)"), $e->getMessage(), $e->getCode())));
+        } else
+            echo $output->outputError(array('type' => $exceptionClass, 
                                     'message' => sprintf(_("Detailed error was:  Uncaught %s %s (%s) thrown in file %s, line %d"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine())));
     } else {
-        echo sprintf(_("Detailed error was:  Uncaught %s %s (%s) thrown in file %s, line %d"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine());
+        if ($exceptionClass == 'WSException') {
+            echo sprintf(_("Web service exception:  %s => %s (%s)"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine());
+        } else
+            echo sprintf(_("Detailed error was:  Uncaught %s %s (%s) thrown in file %s, line %d"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine());
     }
 
@@ -105 +112 @@
 set_exception_handler('wifidog_exception_handler');
 
-throw (new WSException(_("The Wifidog API module is not fit for production yet.  The source code has been released to share ideas and help development, but it has not been thoroughly tested yet and may represent a security issue for now.  If you'd like to test the module, you can do so by commenting this line in the auth server's source code.  But it is highly not advised to do so in a production environment for now.  Please stay tuned for more development")));
+//throw (new WSException(_("The Wifidog API module is not fit for production yet.  The source code has been released to share ideas and help development, but it has not been thoroughly tested yet and may represent a security issue for now.  If you'd like to test the module, you can do so by commenting this line in the auth server's source code.  But it is highly not advised to do so in a production environment for now.  Please stay tuned for more development")));
 
 $service->setParams($_GET);