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

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);
-    }*/
-
 
     /**