Changeset 1435 for trunk/wifidog-auth/wifidog/classes/Network.php

Timestamp:

12/09/09 17:08:25 (3 years ago)

Author:

gbastien

Message:

Merged branch 'gbastien' for node group with the trunk:
* 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)
* Initial abuse control verification now made with the mac address (#676)

Files:

• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (9 diffs)

trunk/wifidog-auth/wifidog/classes/Network.php

@@ -55 +55 @@
 require_once('classes/ThemePack.php');
 require_once('classes/Security.php');
+require_once('classes/HotspotGraphElement.php');
 
 /**
@@ -71 +72 @@
     /** Object cache for the object factory (getObject())*/
     private static $instanceArray = array();
+    protected $_hotspotGraphElement;
 
     /**
@@ -201 +203 @@
             throw new Exception(_('Unable to insert the new network in the database!'));
         }
+        
+        HotspotGraphElement::createNewObject($network_id, 'Network');
+        
         $object = self::getObject($network_id);
         require_once('classes/Stakeholder.php');
@@ -378 +383 @@
     {
         $db = AbstractDb::getObject();
+        if ($p_network_id == "")
+            $p_network_id = self::getDefaultNetwork()->getId();
         $network_id_str = $db->escapeString($p_network_id);
-        if ($network_id_str == "")
-        $network_id_str = $db->escapeString(self::getDefaultNetwork()->getId());
 
         $sql = "SELECT *, EXTRACT(EPOCH FROM validation_grace_time) as validation_grace_time_seconds FROM networks WHERE network_id='$network_id_str'";
@@ -390 +395 @@
         $this->_row = $row;
         $this->_id = $p_network_id;
+        $this->_hotspotGraphElement = HotspotGraphElement::getObject($this->_id,'Network');
     }
 
@@ -1696 +1702 @@
          * Content management
          */
-        $title = _("Network content");
+       /* $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 .= InterfaceElements::generateAdminSectionContainer("network_content", $title, $data);*/
+        if (!is_null($this->_hotspotGraphElement))
+            $html .= $this->_hotspotGraphElement->getContentAdminUI();
 
         /*
@@ -1927 +1935 @@
         $data = ProfileTemplate::getLinkedProfileTemplateUI($name, "network_has_profile_templates", "network_id", $this->_id);
         $html .= InterfaceElements::generateAdminSectionContainer("network_profile_templates", $title, $data);
+        
+        // objects hierarchy
+        if (!is_null($this->_hotspotGraphElement))
+            $html .= $this->_hotspotGraphElement->getGraphAdminUI($this);
 
         $html .= "</ul>\n";
@@ -1946 +1958 @@
 
         // Content management
-        $name = "network_".$this->_id."_content";
-        Content :: processLinkedContentUI($name, 'network_has_content', 'network_id', $this->_id);
+        if (!is_null($this->_hotspotGraphElement))
+            $this->_hotspotGraphElement->processContentAdminUI();
+        /* $name = "network_".$this->_id."_content";
+        Content :: processLinkedContentUI($name, 'network_has_content', 'network_id', $this->_id);*/
 
         // name
@@ -2064 +2078 @@
         $name = "network_".$this->_id."_profile_templates";
         ProfileTemplate :: processLinkedProfileTemplateUI($name, 'network_has_profile_templates', 'network_id', $this->_id);
+        
+        if (!is_null($this->_hotspotGraphElement))
+            $this->_hotspotGraphElement->processGraphAdminUI($errMsg, $this);
+        if(!empty($errMsg)) {
+            echo $errMsg;
+            $errMsg = null;
+        }
 
         // Node creation