Changeset 1435

Timestamp:

12/09/09 17:08:25 (2 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)

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Content.php (modified) (1 diff)
• wifidog/classes/Dependency.php (modified) (1 diff)
• wifidog/classes/HotspotGraph.php (copied) (copied from branches/gbastien/wifidog/classes/HotspotGraph.php)
• wifidog/classes/HotspotGraphElement.php (copied) (copied from branches/gbastien/wifidog/classes/HotspotGraphElement.php)
• wifidog/classes/MainUI.php (modified) (2 diffs)
• wifidog/classes/Menu.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (9 diffs)
• wifidog/classes/Node.php (modified) (8 diffs)
• wifidog/classes/NodeGroup.php (copied) (copied from branches/gbastien/wifidog/classes/NodeGroup.php)
• wifidog/classes/Permission.php (modified) (2 diffs)
• wifidog/classes/Session.php (modified) (1 diff)
• wifidog/classes/StakeholderType.php (modified) (1 diff)
• wifidog/classes/User.php (modified) (3 diffs)
• wifidog/include/schema_validate.php (modified) (2 diffs)
• wifidog/login/index.php (modified) (6 diffs)
• wifidog/portal/index.php (modified) (3 diffs)
• wifidog/signup.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
-
+2009-12-08
+ * 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)
+ 
 2009-10-30 Geneviève Bastien <gbastien@versatic.net>
   * Network can now be set as case insensitive.  Emails are now never case sensitive and usernames' case sensitivity is consistent with network settings (#616)

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

@@ -788 +788 @@
         $rows = null;
         $db->execSql($current_content_sql, $rows, false);
+     
         if ($rows)
         foreach ($rows as $row) {

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

@@ -128 +128 @@
        'mandatory' => true,
        "type" => "localLib",
-       "detectFiles" => "lib/PHPMailer_v2.0.0/class.phpmailer.php",
+       "detectFiles" => "lib/PHPMailer_v5.1/class.phpmailer.php",
        'description' => "Required for sending mail",
        'website' => "http://phpmailer.codeworxtech.com/",
-       'installSourceUrl' => "http://superb-west.dl.sourceforge.net/sourceforge/phpmailer/PHPMailer_v2.0.0.tar.gz",
+       'installSourceUrl' => "http://iweb.dl.sourceforge.net/sourceforge/phpmailer/PHPMailer_v5.1.tar.gz",
        'installMethod' => "tarball",
        'installDestination' => "/"

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

@@ -467 +467 @@
         $_gwAddress = null;
         $_gwPort = null;
+        $_mac = null;
         $_selected = "";
         $_languageChooser = array ();
@@ -499 +500 @@
             $_gwAddress = $session->get(SESS_GW_ADDRESS_VAR);
             $_gwPort = $session->get(SESS_GW_PORT_VAR);
+            $_mac = $session->get(SESS_USER_MAC_VAR);
 
             // If gateway information could be detected tell them to Smarty
             if ($_gwId && $_gwAddress && $_gwPort) {
-                $this->smarty->assign('logoutParameters', "&gw_id=" . $_gwId . "&gw_address=" . $_gwAddress . "&gw_port=" . $_gwPort);
+                $this->smarty->assign('logoutParameters', "&gw_id=" . $_gwId . "&gw_address=" . $_gwAddress . "&gw_port=" . $_gwPort . ($_mac? "&mac=".$_mac:""));
             }
         } else {

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

@@ -188 +188 @@
         $this->processHookMenu('Server');
         $this->processHookMenu('Node');
+        $this->processHookMenu('NodeGroup');
         $this->processHookMenu('Network');
         $this->processHookMenu('User');

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

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

@@ -50 +50 @@
 require_once('classes/Utils.php');
 require_once('classes/DateTimeWD.php');
+require_once('classes/HotspotGraphElement.php');
 
 /**
@@ -69 +70 @@
     private $id;
     private static $currentNode = null;
+    protected $_hotspotGraphElement;
 
     /**
@@ -287 +289 @@
         }
 
+        HotspotGraphElement::createNewObject($node_id, 'Node');
+        
         $object = self::getObject($node_id);
 
@@ -693 +697 @@
         $this->_row = $row;
         $this->id = $row['node_id'];
+        
+        $this->_hotspotGraphElement = HotspotGraphElement::getObject($this->id, 'Node');
     }
 
@@ -1187 +1193 @@
 
         //Node content
-        $_html_content = array();
+        /*$_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 .= InterfaceElements::generateAdminSectionContainer("node_content", $_title, $_data);*/
+        if (!is_null($this->_hotspotGraphElement))
+            $html .= $this->_hotspotGraphElement->getContentAdminUI();
+            
         // Name
         $permArray = null;
@@ -1362 +1370 @@
             $html .= InterfaceElements::generateAdminSectionContainer("access_rights", _("Access rights"), $html_access_rights);
         }
+        
+        //Node hierarchy
+        if (!is_null($this->_hotspotGraphElement))
+            $html .= $this->_hotspotGraphElement->getGraphAdminUI($network);
 
         $html .= "</ul>\n";
@@ -1404 +1416 @@
         }
         // Content processing
-        $name = "node_{$node_id}_content";
-        Content::processLinkedContentUI($name, 'node_has_content', 'node_id', $this->id);
+        if (!is_null($this->_hotspotGraphElement))
+            $this->_hotspotGraphElement->processContentAdminUI();
+        /*$name = "node_{$node_id}_content";
+        Content::processLinkedContentUI($name, 'node_has_content', 'node_id', $this->id);*/
 
         // Name
@@ -1566 +1580 @@
 
         // End Node configuration section
+        
+        if (!is_null($this->_hotspotGraphElement))
+            $this->_hotspotGraphElement->processGraphAdminUI($errMsg, $network);
+        if(!empty($errMsg)) {
+            echo $errMsg;
+            $errMsg = null;
+        }
 
         // Access rights

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

@@ -89 +89 @@
             $PERMISSIONS['NETWORK_PERM_VIEW_STATISTICS'] = array(_("User is allowed to view all statistics for this network"), StakeholderType::Network, true);
             $PERMISSIONS['NETWORK_PERM_EDIT_ANY_NODE_CONFIG'] = array(_("User is allowed to edit any configuration of any node on the network"), StakeholderType::Network, true);
+            $PERMISSIONS['NETWORK_PERM_EDIT_ANY_NODEGROUP_CONFIG'] = array(_("User is allowed to edit any configuration of any node group on the network"), StakeholderType::Network, true);
             $PERMISSIONS['NETWORK_PERM_ADD_NODE'] = array(_("User is allowed to create a new Node on this network"), StakeholderType::Network, true);
+            $PERMISSIONS['NETWORK_PERM_ADD_NODEGROUP'] = array(_("User is allowed to create a new Node Group on this network"), StakeholderType::Network, true);
             $PERMISSIONS['NETWORK_PERM_EDIT_DYNAMIC_ABUSE_CONTROL'] = array(_("User is allowed to set dynamic abuse control options for the network"), StakeholderType::Network, false);
+            $PERMISSIONS['NETWORK_PERM_ALLOW_GROUP_NODE'] = array(_("User is allowed group nodes into virtual node groups"), StakeholderType::Network, false);
 
             $PERMISSIONS['SERVER_PERM_EDIT_ROLES'] = array(_("User is allowed to edit user role definitions"), StakeholderType::Server, true);
@@ -107 +110 @@
             $PERMISSIONS['NODE_PERM_BYPASS_DYNAMIC_ABUSE_CONTROL'] = array(_("User is allowed to exceed dynamic abuse control limits at this node"), StakeholderType::Node, false);
             $PERMISSIONS['NODE_PERM_ALLOW_GENERATING_PUBLIC_STATS'] = array(_("User is allowed to turn on publicly accessible aggregate statistics for this node"), StakeholderType::Node, false);
+            
+            $PERMISSIONS['NODEGROUP_PERM_DELETE_NODEGROUP'] = array(_("User is allowed to delete this node group"), StakeholderType::NodeGroup, true);
+            $PERMISSIONS['NODEGROUP_PERM_EDIT_ANY_NODEGROUP_CONFIG'] = array(_("User is allowed to edit any configuration of any node group on the network"), StakeholderType::NodeGroup, true);
+            $PERMISSIONS['NODEGROUP_PERM_EDIT_NODEGROUP_CONFIG'] = array(_("User is allowed to edit any configuration of this node group"), StakeholderType::NodeGroup, true);
+            $PERMISSIONS['NODEGROUP_PERM_ADD_NODEGROUP'] = array(_("User is allowed to create a new Node Group on this network"), StakeholderType::NodeGroup, true);
             
             self::$_permissionArray = $PERMISSIONS;

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

@@ -45 +45 @@
 define('SESS_USERNAME_VAR', 'SESS_USERNAME');
 define('SESS_USER_ID_VAR', 'SESS_USER_ID');
+define('SESS_USER_MAC_VAR', 'SESS_USER_MAC');
 define('SESS_PASSWORD_HASH_VAR', 'SESS_PASSWORD_HASH');
 define('SESS_ORIGINAL_URL_VAR', 'SESS_ORIGINAL_URL');

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

@@ -64 +64 @@
     const Server = 'Server';
     const Content = 'Content';
+    const NodeGroup = 'NodeGroup';
+    
     /**
      * Get an instance of the object

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

@@ -639 +639 @@
     @return true on success, false on failure
     */
-    function generateConnectionToken() {
+    function generateConnectionToken($mac = null) {
         if ($this->isUserValid()) {
             $db = AbstractDb::getObject();
@@ -648 +648 @@
                 $node_ip = $db->escapeString($_SERVER['REMOTE_ADDR']);
             }
+            
             if ($session && $node_ip && $session->get(SESS_NODE_ID_VAR)) {
                 //echo "$session && $node_ip && {$session->get(SESS_NODE_ID_VAR)}";
                 $node_id = $db->escapeString($session->get(SESS_NODE_ID_VAR));
-                $abuseControlFault = User::isAbuseControlViolated($this, null, Node::getObject($node_id));
+                $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
@@ -663 +665 @@
 
                 $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) VALUES ('" . $this->getId() . "', '$token', CURRENT_TIMESTAMP, '$node_id', '$node_ip', CURRENT_TIMESTAMP)";
+                $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;

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -48 +48 @@
  * Define current database schema version
  */
-define('REQUIRED_SCHEMA_VERSION', 67);
+define('REQUIRED_SCHEMA_VERSION', 68);
 /** Used to test a new shecma version before modyfying the database */
 define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1456 +1456 @@
     }
     
+    $new_schema_version = 68;
+    if ($schema_version < $new_schema_version && $new_schema_version <= $targetSchema) {
+        printUpdateVersion($new_schema_version);
+        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+        
+        $sql .= "CREATE TABLE node_groups \n";
+        $sql .= "( \n";
+        $sql .= "node_group_id character varying(32) PRIMARY KEY, \n";
+        $sql .= "name text, \n";
+        $sql .= "description text , \n";
+        $sql .= "group_creation_date timestamp NOT NULL DEFAULT now() \n";
+        $sql .= ");\n\n";
+        
+        $sql .= "CREATE TABLE hotspot_graph_elements \n";
+        $sql .= "( \n";
+        $sql .= "hotspot_graph_element_id character varying(32) PRIMARY KEY, \n";
+        $sql .= "element_id text, \n";
+        $sql .= "element_type character varying(16) \n";
+        $sql .= ");\n\n";
+        
+        $sql .= "CREATE TABLE hotspot_graph \n";
+        $sql .= "( \n";
+        $sql .= "child_element_id character varying(32) REFERENCES hotspot_graph_elements (hotspot_graph_element_id) ON UPDATE CASCADE ON DELETE CASCADE NOT NULL , \n";
+        $sql .= "parent_element_id character varying(32) REFERENCES hotspot_graph_elements (hotspot_graph_element_id) ON UPDATE CASCADE ON DELETE CASCADE NOT NULL , \n";
+        $sql .= "link_order integer DEFAULT 1 , \n";
+        $sql .= "PRIMARY KEY(child_element_id, parent_element_id) \n";
+        $sql .= ");\n\n";
+        
+        $sql .= "CREATE TABLE hotspot_graph_element_has_content (\n";
+                                $sql .= "hotspot_graph_element_id character varying(32) REFERENCES hotspot_graph_elements (hotspot_graph_element_id) ON UPDATE CASCADE ON DELETE CASCADE NOT NULL ,\n";
+        $sql .= "content_id text NOT NULL,\n";
+                $sql .= "subscribe_timestamp timestamp without time zone DEFAULT now() NOT NULL,\n";
+        $sql .= "display_page text DEFAULT 'portal'::text NOT NULL,\n";
+                        $sql .= "display_area text DEFAULT 'main_area_middle'::text NOT NULL,\n";
+        $sql .= "display_order integer DEFAULT 1 NOT NULL\n";
+                                $sql .= ");\n\n";
+        
+        $sql .= "INSERT INTO stakeholder_types (stakeholder_type_id) VALUES ('NodeGroup');\n";
+        
+        //$networks = Network::getAllNetworks();
+        $networks = array();
+        $db->execSql("Select network_id from networks", $networks, false);
+        foreach ($networks as $network) {
+            $new_guid = get_guid();
+            $sql .= "INSERT INTO hotspot_graph_elements values('{$new_guid}', '{$network['network_id']}', 'Network' );\n ";
+            $nodes = array();
+            $db->execSql("SELECT node_id FROM nodes where network_id = '{$network['network_id']}'", $nodes, false);
+            foreach ($nodes as $node) {
+                $node_guid = get_guid();
+                $sql .= "INSERT INTO hotspot_graph_elements values('{$node_guid}', '{$node['node_id']}', 'Node' );\n ";
+                $sql .= "INSERT INTO hotspot_graph(child_element_id, parent_element_id) VALUES ('{$node_guid}', '{$new_guid}');\n";
+            }
+        }
+        
+        $sql .= "INSERT INTO hotspot_graph_element_has_content (\n";
+        $sql .= "SELECT hge.hotspot_graph_element_id, content_id, subscribe_timestamp, display_page, display_area, display_order \n";
+        $sql .= "FROM hotspot_graph_elements hge inner join network_has_content nhc on nhc.network_id = hge.element_id \n";
+        $sql .= "WHERE hge.element_type = 'Network');\n\n";
+        
+        $sql .= "INSERT INTO hotspot_graph_element_has_content (\n";
+        $sql .= "SELECT hge.hotspot_graph_element_id, content_id, subscribe_timestamp, display_page, display_area, display_order \n";
+        $sql .= "FROM hotspot_graph_elements hge inner join node_has_content nhc on nhc.node_id = hge.element_id \n";
+        $sql .= "WHERE hge.element_type = 'Node');\n\n";
+        
+        $sql .= "CREATE TABLE nodegroup_stakeholders (\n";
+                                $sql .= ")\n";
+        $sql .= "INHERITS (stakeholders);\n\n";
+    }
+    
+    
     /*
      $new_schema_version = ;

trunk/wifidog-auth/wifidog/login/index.php

@@ -88 +88 @@
 $gw_port = null;
 $gw_id = null;
+$mac = null;
 $logout = null;
 
@@ -118 +119 @@
     exit;
 }
+
+if (isset($_REQUEST["mac"])) {
+    $session->set(SESS_USER_MAC_VAR, $_REQUEST['mac']);
+    $mac = $_REQUEST['mac'];
+}
+
 
 /*
@@ -182 +189 @@
         // Login from a gateway, redirect to the gateway to activate the token
         $user = $network->getSplashOnlyUser();
-        $token = $user->generateConnectionToken();
+        $token = $user->generateConnectionToken($mac);
         User::setCurrentUser($user);
         header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
@@ -206 +213 @@
         if (!empty($gw_address) && !empty($gw_port)) {
             // Login from a gateway, redirect to the gateway to activate the token
-            $token = $user->generateConnectionToken();
+            $token = $user->generateConnectionToken($mac);
             if(!$token)
             {
@@ -245 +252 @@
 $smarty->assign('gw_port', $gw_port);
 $smarty->assign('gw_id', $gw_id);
+$smarty->assign('mac', $mac);
 
 // Get the login form
@@ -256 +264 @@
 if ($gw_id != null)
 $html .= "<input type='hidden' name='gw_id' value='{$gw_id}'>\n";
+if ($mac != null)
+$html .= "<input type='hidden' name='mac' value='{$mac}'>\n";
 $html .= Authenticator::getLoginUI();
 $html .= "</form>\n";

trunk/wifidog-auth/wifidog/portal/index.php

@@ -166 +166 @@
 }
 
+// Get all the parent objects of the node
+$parents = HotspotGraph::getAllParents(HotspotGraphElement::getObjectFor($node));
+
+// 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) {
+    $content_rows = array ();
+    $parent_id = $db->escapeString($parentid);
+    if ($current_user) {
+        $user_id = $db->escapeString($current_user->getId());
+        $sql = "SELECT content_id, display_area, display_order FROM hotspot_graph_element_has_content hgehc ";
+        $sql .= "INNER JOIN hotspot_graph_elements hge on hgehc.hotspot_graph_element_id = hge.hotspot_graph_element_id ";
+        $sql .= "WHERE hge.hotspot_graph_element_id='$parent_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    } else {
+        $sql = "SELECT content_id, display_area, display_order FROM hotspot_graph_element_has_content hgehc ";
+        $sql .= "INNER JOIN hotspot_graph_elements hge on hgehc.hotspot_graph_element_id = hge.hotspot_graph_element_id ";
+        $sql .= "WHERE hge.hotspot_graph_element_id='$parent_id' AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    }
+    $db->execSql($sql, $content_rows, false);
+    if ($content_rows) {
+        foreach ($content_rows as $content_row) {
+            $content = Content :: getObject($content_row['content_id']);
+            if ($content->isDisplayableAt($node)) {
+                $ui->addContent($content_row['display_area'], $content, $content_row['display_order']);
+            }
+        }
+    }
+}
+$showMoreLink = false;
+
 // Get all network content, but exclude user subscribed content if user is known
-$content_rows = array ();
+/*$content_rows = array ();
 $network_id = $db->escapeString($network->getId());
 if ($current_user) {
     $user_id = $db->escapeString($current_user->getId());
-    $sql = "SELECT content_id, display_area, display_order FROM network_has_content WHERE network_id='$network_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM hotspot_graph_element_has_content hgehc ";
+    $sql .= "INNER JOIN hotspot_graph_elements hge on hgehc.hotspot_graph_element_id = hge.hotspot_graph_element_id ";
+    $sql .= "WHERE hge.element_id='$network_id' AND hge.element_type = 'Network' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
 } else {
-    $sql = "SELECT content_id, display_area, display_order FROM network_has_content WHERE network_id='$network_id'  AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM hotspot_graph_element_has_content hgehc ";
+    $sql .= "INNER JOIN hotspot_graph_elements hge on hgehc.hotspot_graph_element_id = hge.hotspot_graph_element_id ";
+    $sql .= "WHERE hge.element_id='$network_id' AND hge.element_type = 'Network' AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
 }
 $db->execSql($sql, $content_rows, false);
@@ -183 +216 @@
         }
     }
-}
+}*/
 
 // Get all node content and EXCLUDE user subscribed content
-$content_rows = array ();
+/*$content_rows = array ();
 $node_id = $db->escapeString($node->getId());
 if ($current_user) {
     $user_id = $db->escapeString($current_user->getId());
-    $sql = "SELECT content_id, display_area, display_order FROM node_has_content WHERE node_id='$node_id' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM hotspot_graph_element_has_content hgehc ";
+    $sql .= "INNER JOIN hotspot_graph_elements hge on hgehc.hotspot_graph_element_id = hge.hotspot_graph_element_id ";
+    $sql .= "WHERE hge.element_id='$node_id' AND hge.element_type = 'Node' AND display_page='portal' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$user_id}') ORDER BY display_area, display_order, subscribe_timestamp DESC";
 } else {
-    $sql = "SELECT content_id, display_area, display_order FROM node_has_content WHERE node_id='$node_id'  AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
+    $sql = "SELECT content_id, display_area, display_order FROM hotspot_graph_element_has_content hgehc ";
+    $sql .= "INNER JOIN hotspot_graph_elements hge on hgehc.hotspot_graph_element_id = hge.hotspot_graph_element_id ";
+    $sql .= "WHERE hge.element_id='$node_id' AND hge.element_type = 'Node' AND display_page='portal' ORDER BY display_area, display_order, subscribe_timestamp DESC";
 }
 $db->execSql($sql, $content_rows, false);
@@ -203 +240 @@
         }
     }
-}
+}*/
 
 // Get all user content

trunk/wifidog-auth/wifidog/signup.php

@@ -228 +228 @@
         $gw_address = $session->get(SESS_GW_ADDRESS_VAR);
         $gw_port = $session->get(SESS_GW_PORT_VAR);
+        $mac = $session->get(SESS_USER_MAC_VAR);
 
         if ($gw_id && $gw_address && $gw_port) {
             // Make sure the user IDs match
             if(($created_user->getId() == $authenticated_user->getId())) {
-                $token = $created_user->generateConnectionToken();
+                $token = $created_user->generateConnectionToken($mac);
 
                 $redirURL = "http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token;