Changeset 708

Timestamp:

09/02/05 03:16:02 (8 years ago)

Author:

benoitg

Message:

2005-09-01 Benoit Gr�goire <bock@…>

WARNING: DO NOT use the CVS auth server in production until further notice.
Massive internal changes are underway.
Use the release tagged 1.0m1 in production.

• Network abstraction mostly complete, including UI. All that is missing is new network creation, network stakeholder UI and testing.
• Cleanup the config file of all the now unneeded constants. Note that the install script is currently broken. There can now be multiple networks on the server. The install script will have to make sure that there is at least one, with one super-admin

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• INSTALL (modified) (1 diff)
• wifidog/admin/incoming_outgoing_swap.php (modified) (1 diff)
• wifidog/auth/index.php (modified) (2 diffs)
• wifidog/change_password.php (modified) (3 diffs)
• wifidog/classes/AbstractDbPostgres.php (modified) (1 diff)
• wifidog/classes/Authenticator.php (modified) (1 diff)
• wifidog/classes/AuthenticatorLocalUser.php (modified) (1 diff)
• wifidog/classes/AuthenticatorRadius.php (modified) (1 diff)
• wifidog/classes/Content.php (modified) (1 diff)
• wifidog/classes/Content/ContentGroup.php (modified) (1 diff)
• wifidog/classes/MainUI.php (modified) (3 diffs)
• wifidog/classes/Network.php (modified) (14 diffs)
• wifidog/classes/Node.php (modified) (4 diffs)
• wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• wifidog/classes/User.php (modified) (7 diffs)
• wifidog/config.php (modified) (2 diffs)
• wifidog/content/index.php (modified) (2 diffs)
• wifidog/hotspot_status.php (modified) (17 diffs)
• wifidog/include/schema_validate.php (modified) (6 diffs)
• wifidog/index.php (modified) (1 diff)
• wifidog/install.php (modified) (3 diffs)
• wifidog/login/index.php (modified) (4 diffs)
• wifidog/lost_password.php (modified) (2 diffs)
• wifidog/lost_username.php (modified) (2 diffs)
• wifidog/portal/index.php (modified) (3 diffs)
• wifidog/resend_validation.php (modified) (2 diffs)
• wifidog/signup.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-01 Benoit Grégoire  <bock@step.polymtl.ca>
+        WARNING:  DO NOT use the CVS auth server in production until further notice.  
+        Massive internal changes are underway.  
+        Use the release tagged 1.0m1 in production.
+        * Network abstraction mostly complete, including UI.  
+        All that is missing is new network creation, network stakeholder UI and testing.  
+        * Cleanup the config file of all the now unneeded constants. 
+         Note that the install script is currently broken.  
+        There can now be multiple networks on the server.  
+        The install script will have to make sure that there is at least one, with one super-admin
+
 2005-08-31 Francois Proulx <francois.proulx@gmail.com>
         * Fixed bug where node ID containing periods, whitespaces or underscores would confuse PHP
         * MD5 hash is used to make sur the http vars are unique
         * This is only valid for Node administration
-        
+
+NOTE:  the 1.0m1 release was tagged here
+                
 2005-08-31 Benoit Grégoire  <bock@step.polymtl.ca>
         * Node.php:  Fix node creation

trunk/wifidog-auth/INSTALL

@@ -59 +59 @@
 *****************************************
 
+*****************************************
+Backup and restore
+*****************************************
+
+To backup:
+        pg_dump wifidog --blobs --file=wifidog_backup.sql --format=c --ignore-version --no-owner -v --compress=3 -U wifidog
+
+To restore from a backup:
+        dropdb wifidog
+        createdb wifidog --encoding=UTF-8 --owner=wifidog
+        pg_restore -U wifidog -d wifidog -v wifidog_backup.sql
 
 Enjoy!

trunk/wifidog-auth/wifidog/admin/incoming_outgoing_swap.php

@@ -26 +26 @@
 require_once 'admin_common.php';
 
-echo "<div id='head'><h1>". HOTSPOT_NETWORK_NAME ._(' cumulative user statistics')."</h1></div>\n";    
+echo "<div id='head'><h1>incoming_outgoing_swap</h1></div>\n";    
 echo "<div id='navLeft'>\n";
 //echo get_user_management_menu();

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

@@ -32 +32 @@
 $auth_message = '';
 
+$token = null;
+if(!empty($_REQUEST['token']))
+{
 $token = $db->EscapeString($_REQUEST['token']);
-$db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > interval '".VALIDATION_GRACE_TIME." minutes') THEN true ELSE false END AS validation_grace_time_expired FROM users,connections WHERE users.user_id=connections.user_id AND connections.token='$token'", $info, false);
+}
+
+$db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.token='$token'", $info, false);
 if ($info != null)
 {
         // Retrieve the associated authenticator
-        $authenticator = $AUTH_SOURCE_ARRAY[$info['account_origin']]['authenticator'];
-
-        if ($_REQUEST['stage'] == STAGE_LOGIN)
+        $authenticator = Network::getObject($info['account_origin'])->getAuthenticator();
+if(!$authenticator)
+{
+                        $auth_message .= "| Error: Unable to instanciate authenticator. ";
+                        $auth_response = ACCOUNT_STATUS_ERROR;
+}
+else
+{
+if ($_REQUEST['stage'] == STAGE_LOGIN)
         {
                 if ($info['token_status'] == TOKEN_UNUSED)
@@ -123 +134 @@
                 }
 }
+}
 else
 {

trunk/wifidog-auth/wifidog/change_password.php

@@ -26 +26 @@
 define('BASEPATH','./');
 require_once BASEPATH.'include/common.php';
+require_once BASEPATH.'classes/MainUI.php';
 require_once BASEPATH.'include/common_interface.php';
 require_once BASEPATH.'classes/User.php';
-require_once BASEPATH.'classes/MainUI.php';
 
 isset($_REQUEST["username"]) && $smarty->assign("username", $_REQUEST["username"]);
@@ -34 +34 @@
 if (isset($_REQUEST["submit"])) {
     try {
-        // If the source is present and that it's in our AUTH_SOURCE_ARRAY, save it to a var for later use
-                $_REQUEST['auth_source'] && in_array($_REQUEST['auth_source'], array_keys($AUTH_SOURCE_ARRAY)) && $account_origin = $_REQUEST['auth_source'];
+        // If the source is present and that it's in our, save it to a var for later use
+                $account_origin = Networt::getObject($_REQUEST['auth_source']);
                 
         if (!$account_origin || !$_REQUEST["username"] || !$_REQUEST["oldpassword"] || !$_REQUEST["newpassword"] || !$_REQUEST["newpassword_again"])
@@ -73 +73 @@
 $sources = array ();
 // Preserve keys
-foreach (array_keys($AUTH_SOURCE_ARRAY) as $auth_source_key)
-        if ($AUTH_SOURCE_ARRAY[$auth_source_key]['authenticator']->isRegistrationPermitted())
-                $sources[$auth_source_key] = $AUTH_SOURCE_ARRAY[$auth_source_key];
+$network_array=Network::getAllNetworks();
+foreach ($network_array as $network)
+        if ($network->getAuthenticator()->isRegistrationPermitted())
+                $sources[$network->getId()] = $network->getName();
                 
 isset ($sources) && $smarty->assign('auth_sources', $sources);

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

@@ -271 +271 @@
          @param $sql requête SELECT à exécuter
          @param $debug Si TRUE, affiche la requête brute
+         @return false on failure, true otherwise
          */
         function ExecSqlUpdate($sql, $debug=false)

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

@@ -23 +23 @@
  * Technologies Coeus inc.
  */
+require_once 'AuthenticatorLocalUser.php';
+require_once 'AuthenticatorRadius.php';
 
 /** Abstract class to represent an authentication source */

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

@@ -47 +47 @@
         {
                 return get_class($account_origin['authenticator']) == "AuthenticatorLocalUser";
-        }
-
-        /**
-         * Returns in array containing only Local User account origins
-         * @return array
-         */
-        public static function getAllLocalUserAccountOrigins()
-        {
-                global $AUTH_SOURCE_ARRAY;
-                return array_filter($AUTH_SOURCE_ARRAY, array("self", "isLocalUserAccountOrigin"));
         }
 

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

@@ -46 +46 @@
         /**
          * AuthenticatorRadius constructor
+         * Example:  new AuthenticatorRadius(IDRC_ACCOUNT_ORIGIN, "192.168.0.11",
+         * 1812, 1813, "secret_key", "CHAP_MD5");
          * @param $account_orgin : The origin of the account
          * @param $host : hostname of the RADIUS server

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

@@ -233 +233 @@
         public static function getSelectContentUI($user_prefix, $sql_additional_where = null)
         {
-                global $AUTH_SOURCE_ARRAY;
                 $html = '';
                 $name = "{$user_prefix}";

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

@@ -315 +315 @@
 
                 /* content_ordering_mode */
-                global $AUTH_SOURCE_ARRAY;
                 $html .= "<div class='admin_section_container'>\n";
                 $html .= "<div class='admin_section_title'>"._("In what order should the content displayed?").": </div>\n";

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

@@ -25 +25 @@
  */
 require_once BASEPATH.'include/common.php';
+        /** @note We put a call to validate_schema() here so it systematically called
+ * from any UI page, but not from any machine readable pages 
+ */ 
+                require_once BASEPATH.'include/schema_validate.php';
+                validate_schema();
+                
 require_once BASEPATH.'include/common_interface.php';
 
@@ -39 +45 @@
         private $footer_scripts = array ();
 
-        
-        /** @note We put a call to validate_schema() here so it systematically called
- * from any UI page, but not from any machine readable pages 
- */ 
         function __construct()
         {
-                require_once BASEPATH.'include/schema_validate.php';
-                validate_schema();
-
                 $this->smarty = new SmartyWifidog();
                 $this->title = Network :: getCurrentNetwork()->getName().' '._("authentication server"); //Default title
@@ -357 +356 @@
         {
                 $html = "<p>$errmsg</p>\n";
-                $html .= "<p>"._("Please get in touch with ")."<a href='{TECH_SUPPORT_EMAIL}'>{TECH_SUPPORT_EMAIL}</a></p>";
+                $email = Network::getCurrentNetwork()->getTechSupportEmail();
+                if(!empty($email))
+                {
+                $html .= "<p>"._("Please get in touch with ")."<a href='{$email}'>{$email}</a></p>";
+                }
                 $this->setMainContent($html);
                 $this->display();

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

@@ -1 +1 @@
 <?php
+
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
@@ -31 +32 @@
 {
         private $id; /**< The network id */
+        private $mRow;
 
         /** Get an instance of the object
@@ -42 +44 @@
         }
 
+        /** Get all the Networks configured on this server
+         * @return an array of Network objects.  The default network is returned
+         * first
+         */
+        static function getAllNetworks()
+        {
+                $retval = array ();
+                global $db;
+                $sql = "SELECT network_id FROM networks ORDER BY is_default_network DESC";
+                $network_rows = null;
+                $db->ExecSql($sql, $network_rows, false);
+                if ($network_rows == null)
+                {
+                        throw new Exception(_("Network::getAllNetworks:  Fatal error: No networks in the database!"));
+                }
+                foreach ($network_rows as $network_row)
+                {
+                        $retval[] = new self($network_row['network_id']);
+                }
+                return $retval;
+        }
+
+        /** Get the default network
+         * @return a Network object, NEVER returns null.
+         */
+        static function getDefaultNetwork($real_network_only = false)
+        {
+                $retval = null;
+                        global $db;
+                        $sql = "SELECT network_id FROM networks WHERE is_default_network=TRUE ORDER BY creation_date LIMIT 1";
+                        $network_row = null;
+                        $db->ExecSqlUniqueRes($sql, $network_row, false);
+                        if ($network_row == null)
+                        {
+                                throw new Exception(_("Network::getDefaultNetwork:  Fatal error: Unable to find the default network!"));
+                        }
+                        $retval = new self($network_row['network_id']);
+                return $retval;
+        }
+        
         /** Get the current network for which the portal is displayed or to which a user is physically connected.
-         * @param $real_network_only true or false.  If true, the real physical network where the user is connected is returned, and the node set by setCurrentNode is ignored.
-         * @return a Node object, or null if it can't be found.
+         * @param $real_network_only NOT IMPLEMENTED YET true or false.  If true,
+         * the real physical network where the user is connected is returned, and
+         * the node set by setCurrentNode is ignored.
+         * @return a Network object, NEVER returns null.
          */
         static function getCurrentNetwork($real_network_only = false)
         {
-                global $AUTH_SOURCE_ARRAY;
-                $keys = array_keys($AUTH_SOURCE_ARRAY);
-
-                return new self($keys[0]);
+                $retval = null;
+                $current_node = Node :: getCurrentNode();
+                if ($current_node != null)
+                {
+                        $retval = $current_node->getNetwork();
+                }
+                else
+                {
+                        $retval = Network::getDefaultNetwork();
+                }
+                return $retval;
         }
 
@@ -69 +120 @@
         public static function getSelectNetworkUI($user_prefix)
         {
-                global $AUTH_SOURCE_ARRAY;
                 $html = '';
                 $name = $user_prefix;
                 $html .= _("Network:")." \n";
-                $number_of_networks = count($AUTH_SOURCE_ARRAY);
+
+                global $db;
+                $sql = "SELECT network_id, name FROM networks ORDER BY is_default_network DESC";
+                $network_rows = null;
+                $db->ExecSql($sql, $network_rows, false);
+                if ($network_rows == null)
+                {
+                        throw new Exception(_("Network::getAllNetworks:  Fatal error: No networks in the database!"));
+                }
+
+                $network_array = self :: getAllNetworks();
+                $number_of_networks = count($network_rows);
                 if ($number_of_networks > 1)
                 {
                         $i = 0;
-                        foreach ($AUTH_SOURCE_ARRAY as $network_id => $network_info)
+                        foreach ($network_rows as $network_row)
                         {
-                                $tab[$i][0] = $network_id;
-                                $tab[$i][1] = $network_info['name'];
+                                $tab[$i][0] = $network_row['network_id'];
+                                $tab[$i][1] = $network_row['name'];
                                 $i ++;
                         }
@@ -88 +149 @@
                 else
                 {
-                        foreach ($AUTH_SOURCE_ARRAY as $network_id => $network_info) //iterates only once...
+                        foreach ($network_rows as $network_row) //iterates only once...
                         {
-                                $html .= " $network_info[name] ";
-                                $html .= "<input type='hidden' name='$name' value='$network_id'>";
+                                $html .= " $network_row[name] ";
+                                $html .= "<input type='hidden' name='$name' value='$network_row[network_id]'>";
                         }
                 }
@@ -105 +166 @@
                 $object = null;
                 $name = "{$user_prefix}";
-                if(!empty($_REQUEST[$name]))
+                if (!empty ($_REQUEST[$name]))
                         return new self($_REQUEST[$name]);
                 else
@@ -113 +174 @@
         private function __construct($p_network_id)
         {
-                global $AUTH_SOURCE_ARRAY;
-                $found = false;
-                foreach ($AUTH_SOURCE_ARRAY as $network_id => $network_info)
-                {
-                        if ($p_network_id == $network_id)
-                        {
-                                $found = true;
-                        }
-                }
-                if (!$found)
-                {
-                        throw new Exception(_("The specified network doesn't exist: ").$p_network_id);
-                }
-                $this->id = $p_network_id;
+                global $db;
+
+                $network_id_str = $db->EscapeString($p_network_id);
+                $sql = "SELECT *, EXTRACT(EPOCH FROM validation_grace_time) as validation_grace_time_seconds FROM networks WHERE network_id='$network_id_str'";
+                $row = null;
+                $db->ExecSqlUniqueRes($sql, $row, false);
+                if ($row == null)
+                {
+                        throw new Exception("The network with id $network_id_str could not be found in the database");
+                }
+                $this->mRow = $row;
+                $this->id = $db->EscapeString($row['network_id']);
         }
 
@@ -140 +199 @@
         public function getTechSupportEmail()
         {
-                return TECH_SUPPORT_EMAIL;
-        }
-
+                return $this->mRow['tech_support_email'];
+        }
+
+        /** Set the network's tech support and information email address
+         * @param $value The new value 
+         * @return true on success, false on failure */
+        function setTechSupportEmail($value)
+        {
+                $retval = true;
+                if ($value != $this->getName())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET tech_support_email = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+        
         /** Retreives the network name 
-         * @return The id */
+         * @return A string */
         public function getName()
         {
-                return HOTSPOT_NETWORK_NAME;
+                return $this->mRow['name'];
+        }
+
+        /** Set the network's name
+         * @param $value The new value 
+         * @return true on success, false on failure */
+        function setName($value)
+        {
+                $retval = true;
+                if ($value != $this->getName())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET name = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
         }
 
@@ -154 +245 @@
         public function getHomepageURL()
         {
-                return HOTSPOT_NETWORK_URL;
-        }
+                return $this->mRow['homepage_url'];
+        }
+
+        /** Set the network's homepage url
+         * @param $value The new value 
+         * @return true on success, false on failure */
+        function setHomepageURL($value)
+        {
+                $retval = true;
+                if ($value != $this->getName())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET homepage_url = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+
+        /** Retreives the network's authenticator's class.
+         *  @return    A string */
+        public function getAuthenticatorClassName()
+        {
+                return $this->mRow['network_authenticator_class'];
+        }
+
+        /** Set the network's authenticator's class.  The subclass of Authenticator to be used for user authentication (ex: AuthenticatorRadius)
+         * @param $value a string, the class name of a  subclass of Authenticator 
+         * @return true on success, false on failure */
+        function setAuthenticatorClassName($value)
+        {
+                $retval = true;
+                if ($value != $this->getAuthenticatorClassName())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET network_authenticator_class = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+                
+        /** Retreives the authenticator's parameters
+         * @return A string */
+        public function getAuthenticatorConstructorParams()
+        {
+                return $this->mRow['network_authenticator_params'];
+        }
+
+        /** The explicit parameters to be passed to the authenticator's constructor (ex: 'my_network_id', '192.168.0.11', 1812, 1813, 'secret_key', 'CHAP_MD5')
+         * @param $value The new value 
+         * @return true on success, false on failure */
+        function setAuthenticatorConstructorParams($value)
+        {
+                $retval = true;
+                if ($value != $this->getAuthenticatorConstructorParams())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET network_authenticator_params = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+        
+        /** Get the Authenticator object for this network 
+         * @return a subclass of Authenticator */
+        public function getAuthenticator()
+        {
+                require_once BASEPATH.'classes/Authenticator.php';
+                if (strpos($this->mRow['network_authenticator_params'], ';') != false)
+                {
+                        throw new Exception("Network::getAuthenticator():  Security error:  The parameters passed to the constructor of the authenticator are potentially unsafe");
+                }
+                $objstring = 'return new '.$this->mRow['network_authenticator_class'].'('.$this->mRow['network_authenticator_params'].');';
+                return eval ($objstring);
+        }
+                
+        /** Is the network the default network?
+         * @return true or false */
+        public function isDefaultNetwork()
+        {
+                ($this->mRow['is_default_network']=='t')?$retval=true:$retval=false;
+                return $retval;
+        }
+
+        /** Set as the default network.  The can only be one default network, so this method will unset is_default_network for all other network 
+         * @return true on success, false on failure */
+        function setAsDefaultNetwork()
+        {
+                $retval = true;
+                if (!$this->isDefaultNetwork())
+                {
+                        global $db;
+                        $sql = "UPDATE networks SET is_default_network = FALSE;\n";
+                        $sql .= "UPDATE networks SET is_default_network = TRUE WHERE network_id = '{$this->getId()}';\n";
+                        $retval = $db->ExecSqlUpdate($sql, false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+
+        /** Retreives the network's validation grace period
+         * @return An integer (seconds) */
+        public function getValidationGraceTime()
+        {
+                return $this->mRow['validation_grace_time_seconds'];
+        }
+
+        /** Set the network's validation grace period in seconds.  A new user is granted Internet access for this period check his email and validate his account.
+         * @param $value The new value 
+         * @return true on success, false on failure */
+        function setValidationGraceTime($value)
+        {
+                $retval = true;
+                if ($value != $this->getValidationGraceTime())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET validation_grace_time = '{$value} seconds' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+                        
+        /** Retreives the FROM adress of the validation email
+         * @return A string */
+        public function getValidationEmailFromAddress()
+        {
+                return $this->mRow['validation_email_from_address'];
+        }
+
+        /** Set the FROM adress of the validation email
+         * @param $value The new value 
+         * @return true on success, false on failure */
+        function setValidationEmailFromAddress($value)
+        {
+                $retval = true;
+                if ($value != $this->getValidationEmailFromAddress())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET validation_email_from_address = '{$value}' WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+                
+        /** Can an account be connected more than once at the same time?
+         * @return true or false */
+        public function getMultipleLoginAllowed()
+        {
+                ($this->mRow['allow_multiple_login']=='t')?$retval=true:$retval=false;
+                return $retval;
+        }
+
+        /** Set if a account be connected more than once at the same time?
+         * @param $value The new value, true or false
+         * @return true on success, false on failure */
+        function setMultipleLoginAllowed($value)
+        {
+                $retval = true;
+                if ($value != $this->getMultipleLoginAllowed())
+                {
+                        global $db;
+                        $value?$value='TRUE':$value='FALSE';
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET allow_multiple_login = {$value} WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+
+        /** Are nodes allowed to be set as splash-only (no login)?
+         * @return true or false */
+        public function getSplashOnlyNodesAllowed()
+        {
+                ($this->mRow['allow_splash_only_nodes']=='t')?$retval=true:$retval=false;
+                return $retval;
+        }
+
+        /** Set if nodes are allowed to be set as splash-only (no login)
+         * @param $value The new value, true or false
+         * @return true on success, false on failure */
+        function setSplashOnlyNodesAllowed($value)
+        {
+                $retval = true;
+                if ($value != $this->getSplashOnlyNodesAllowed())
+                {
+                        global $db;
+                        $value?$value='TRUE':$value='FALSE';
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET allow_splash_only_nodes = {$value} WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }               
+        
+        /** Are nodes allowed to redirect users to an arbitrary web page instead of the portal?
+         * @return true or false */
+        public function getCustomPortalRedirectAllowed()
+        {
+                ($this->mRow['allow_custom_portal_redirect']=='t')?$retval=true:$retval=false;
+                return $retval;
+        }
+
+        /** Set if nodes are allowed to redirect users to an arbitrary web page instead of the portal?
+         * @param $value The new value, true or false
+         * @return true on success, false on failure */
+        function setCustomPortalRedirectAllowed($value)
+        {
+                $retval = true;
+                if ($value != $this->getCustomPortalRedirectAllowed())
+                {
+                        global $db;
+                        $value?$value='TRUE':$value='FALSE';
+                        $retval = $db->ExecSqlUpdate("UPDATE networks SET allow_custom_portal_redirect = {$value} WHERE network_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }               
 
         /**Get an array of all Content linked to the network
         * @param boolean $exclude_subscribed_content
-    * @param User $subscriber The User object used to discriminate the content
+        * @param User $subscriber The User object used to discriminate the content
         * @return an array of Content or an empty arrray */
         function getAllContent($exclude_subscribed_content = false, $subscriber = null)
         {
-           global $db;
+                global $db;
                 $retval = array ();
-        // Get all network, but exclude user subscribed content if asked
+                // Get all network, but exclude user subscribed content if asked
                 if ($exclude_subscribed_content == true && $subscriber)
                         $sql = "SELECT content_id FROM network_has_content WHERE network_id='$this->id' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$subscriber->getId()}') ORDER BY subscribe_timestamp DESC";
@@ -171 +479 @@
                         $sql = "SELECT content_id FROM network_has_content WHERE network_id='$this->id' ORDER BY subscribe_timestamp DESC";
                 $db->ExecSql($sql, $content_rows, false);
-        
+
                 if ($content_rows != null)
                 {
@@ -185 +493 @@
          * @return The HTML fragment for this interface */
 
-        /** Get the Authenticator object for this network */
-        public function getAuthenticator()
-        {
-                global $AUTH_SOURCE_ARRAY;
-                return $AUTH_SOURCE_ARRAY[$this->id]['authenticator'];
-        }
-
         public function getAdminUI()
         {
@@ -199 +500 @@
                 $html .= "<div class='admin_class'>Network (".get_class($this)." instance)</div>\n";
 
+                // network_id
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network ID")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_name";
+                $value = htmlspecialchars($this->getId(), ENT_QUOTES);
+                $html .= $value;
+                //$html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                
+                // name
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network name")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_name";
+                $value = htmlspecialchars($this->getName(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+                // homepage_url
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network's web site")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_homepage_url";
+                $value = htmlspecialchars($this->getHomepageURL(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+                // tech_support_email
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Technical support email")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_tech_support_email";
+                $value = htmlspecialchars($this->getTechSupportEmail(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+
+                //  network_authenticator_class
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network authenticator class.  The subclass of Authenticator to be used for user authentication (ex: AuthenticatorRadius)")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_network_authenticator_class";
+                $value = htmlspecialchars($this->getAuthenticatorClassName(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+                //  network_authenticator_params
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("The explicit parameters to be passed to the authenticator (ex: 'my_network_id', '192.168.0.11', 1812, 1813, 'secret_key', 'CHAP_MD5')")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_network_authenticator_params";
+                $value = htmlspecialchars($this->getAuthenticatorConstructorParams(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";            
+                
+                //  is_default_network
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Is this network the default network?")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_is_default_network";
+                $this->isDefaultNetwork()? $checked='CHECKED': $checked='';
+                $html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";                    
+        
+                //  validation_grace_time
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("The length of the validation grace period in seconds.  A new user is granted Internet access for this period check his email and validate his account.")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_validation_grace_time";
+                $value = htmlspecialchars($this->getValidationGraceTime(), ENT_QUOTES);
+                $html .= "<input type='text' size ='5' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                        
+                //  validation_email_from_address
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("This will be the from adress of the validation email")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_validation_email_from_address";
+                $value = htmlspecialchars($this->getValidationEmailFromAddress(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                
+                //  allow_multiple_login
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Can an account be connected more than once at the same time?")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_allow_multiple_login";
+                $this->getMultipleLoginAllowed()? $checked='CHECKED': $checked='';
+                $html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                
+                //  allow_splash_only_nodes
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Are nodes allowed to be set as splash-only (no login)?")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_allow_splash_only_nodes";
+                $this->getSplashOnlyNodesAllowed()? $checked='CHECKED': $checked='';
+                $html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                
+                //  allow_custom_portal_redirect
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Are nodes allowed to redirect users to an arbitrary web page instead of the portal?")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_allow_custom_portal_redirect";
+                $this->getCustomPortalRedirectAllowed()? $checked='CHECKED': $checked='';
+                $html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                
+                //      network_stakeholders
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network stakeholders")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                //$name = "network_".$this->getId()."_allow_custom_portal_redirect";
+                //$this->getCustomPortalRedirectAllowed()? $checked='CHECKED': $checked='';
+                //$html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "WRITEME!";
+                $html .= "</div>\n";
+                $html .= "</div>\n";            
+                                
                 // Create new nodes
                 $html .= "<div class='admin_section_container'>\n";
                 $html .= "<div class='admin_section_title'>"._("New node ID")." : </div>\n";
-                
+
                 $html .= "<div class='admin_section_data'>\n";
                 $name = "network_{$this->getId()}_new_node_id";
                 $html .= "<input type='text' size='10' name='{$name}'>\n";
-                
+
                 $html .= "<div class='admin_section_tools'>\n";
                 $name = "network_{$this->getId()}_create_node";
                 $html .= "<input type='submit' name='{$name}' value='"._("Create a new node")."'>\n";
                 $html .= "</div>\n";
-                
-                $html .= "</div>\n";
-                $html .= "</div>\n";
-                
+
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
                 // Content management           
                 $html .= "<div class='admin_section_container'>\n";
@@ -242 +676 @@
                 $html .= "</div>\n";
                 $html .= "</div>\n";
-                
+
                 return $html;
         }
-        
+
         /** Process admin interface of this object.
         */
         public function processAdminUI()
         {
-        $user = User::getCurrentUser();
-        if (!$user->isSuperAdmin())
-        {
-            throw new Exception(_('Access denied!'));
-        }
-        
-        // Node creation
-        $create_new_node = "network_{$this->getId()}_create_node";
-        $new_node_id = "network_{$this->getId()}_new_node_id";
-        if (!empty ($_REQUEST[$create_new_node]))
-                if(!empty ($_REQUEST[$new_node_id]))
-                {
-                                Node::createNewNode($_REQUEST[$new_node_id], $this);
-                                $url = GENERIC_OBJECT_ADMIN_ABS_HREF."?".http_build_query(array("object_class" => "Node", "action" => "edit", "object_id" => $_REQUEST[$new_node_id]));
+                //pretty_print_r($_REQUEST);
+                $user = User :: getCurrentUser();
+                if (!$user->isSuperAdmin())
+                {
+                        throw new Exception(_('Access denied!'));
+                }
+
+                // name
+                $name = "network_".$this->getId()."_name";
+                $this->setName($_REQUEST[$name]);
+                
+                // homepage_url
+                $name = "network_".$this->getId()."_homepage_url";
+                $this->setHomepageURL($_REQUEST[$name]);
+
+
+                // tech_support_email
+                $name = "network_".$this->getId()."_tech_support_email";
+                $this->setTechSupportEmail($_REQUEST[$name]);
+
+                //  network_authenticator_class
+                $name = "network_".$this->getId()."_network_authenticator_class";
+                $this->setAuthenticatorClassName($_REQUEST[$name]);
+
+                //  network_authenticator_params
+                $name = "network_".$this->getId()."_network_authenticator_params";
+                $this->setAuthenticatorConstructorParams($_REQUEST[$name]);
+                
+                //  is_default_network
+                $name = "network_".$this->getId()."_is_default_network";
+                if($_REQUEST[$name]=='on')
+                        $this->setAsDefaultNetwork();
+        
+                //  validation_grace_time
+                $name = "network_".$this->getId()."_validation_grace_time";
+                $this->setValidationGraceTime($_REQUEST[$name]);
+                        
+                //  validation_email_from_address
+                $name = "network_".$this->getId()."_validation_email_from_address";
+                $this->setValidationEmailFromAddress($_REQUEST[$name]); 
+                
+                //  allow_multiple_login
+                $name = "network_".$this->getId()."_allow_multiple_login";
+                $this->setMultipleLoginAllowed(empty($_REQUEST[$name])?false:true);     
+                
+                //  allow_splash_only_nodes
+                $name = "network_".$this->getId()."_allow_splash_only_nodes";
+                $this->setSplashOnlyNodesAllowed(empty($_REQUEST[$name])?false:true);   
+
+                //  allow_custom_portal_redirect
+                $name = "network_".$this->getId()."_allow_custom_portal_redirect";
+                $this->setCustomPortalRedirectAllowed(empty($_REQUEST[$name])?false:true);      
+                                
+                // Node creation
+                $create_new_node = "network_{$this->getId()}_create_node";
+                $new_node_id = "network_{$this->getId()}_new_node_id";
+                if (!empty ($_REQUEST[$create_new_node]))
+                        if (!empty ($_REQUEST[$new_node_id]))
+                        {
+                                Node :: createNewNode($_REQUEST[$new_node_id], $this);
+                                $url = GENERIC_OBJECT_ADMIN_ABS_HREF."?".http_build_query(array ("object_class" => "Node", "action" => "edit", "object_id" => $_REQUEST[$new_node_id]));
                                 header("Location: {$url}");
-                }
+                        }
                         else
                                 echo _("You MUST enter a node ID.");
-                
-        // Content management
+
+                // Content management
                 foreach ($this->getAllContent() as $content)
                 {
@@ -284 +765 @@
                         $name = "network_{$this->id}_new_content";
                         $content = Content :: processSelectContentUI($name);
-            if($content)
-                $this->addContent($content);
+                        if ($content)
+                                $this->addContent($content);
                 }
         }

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

@@ -33 +33 @@
 {
         private $mRow;
+        private $mdB; /**< An AbstractDb instance */
         private $id;
         private static $current_node_id = null;
@@ -251 +252 @@
 
         /** @param $node_id The id of the node */
-        function __construct($node_id)
-        {
-                global $db;
-
+        private function __construct($node_id)
+        {
+                global $db;
+                $this->mDb = & $db;
+                
                 $node_id_str = $db->EscapeString($node_id);
                 $sql = "SELECT * FROM nodes WHERE node_id='$node_id_str'";
@@ -263 +265 @@
                 }
                 $this->mRow = $row;
-                $this->mDb = & $db;
                 $this->id = $row['node_id'];
         }
@@ -269 +270 @@
         function getId()
         {
-                return $this->mRow['node_id'];
+                return $this->id;
+        }
+
+        /** Gets the Network to which the node belongs 
+         * @return Network object (never returns null)
+         */
+        public function getNetwork()
+        {
+                        return Network::getObject($this->mRow['network_id']);
         }
 

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

@@ -116 +116 @@
         $this->assign('wifidog_logo_url', COMMON_CONTENT_URL.WIFIDOG_LOGO_NAME);
         $this->assign('wifidog_logo_banner_url',COMMON_CONTENT_URL.WIFIDOG_LOGO_BANNER_NAME);
-        
+        $network = Network::GetCurrentNetwork();
 /* Usefull stuff from config.php */
-        $this->assign('hotspot_network_name',HOTSPOT_NETWORK_NAME);
-        $this->assign('hotspot_network_url',HOTSPOT_NETWORK_URL);
+        $this->assign('hotspot_network_name',$network->getName());
+        $this->assign('hotspot_network_url',$network->getHomepageURL());
 
      $this->assign('hotspot_logo_url', find_local_content_url(HOTSPOT_LOGO_NAME));

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

@@ -126 +126 @@
         }
 
-        /**
-         * Get the list of users associated with a username 
-         * Since we cannot guarantee the uniqueness of (user, e-mail) key this will
-         * return an array.
-         * 
-         * NB : This function will only extract users who authenticate
-         * through a LocalUserAuthenticator 
-         * (see AuthenticatorLocalUser::getAllLocalUserAccountOrigins)
-         * 
-         * @param $username : the username criterion
-         * @return array : array of User objects
-         */
-        public static function getUsersByUsername($username)
-        {
-                $users_list = array ();
-
-                // E-mail cannot be empty, will return an empty array.
-                if (!empty ($username))
-                {
-                        // Build SQL query, excluding users who do not authenticate through LocalUserAuth
-                        global $db;
-                        $username_str = $db->EscapeString($username);
-                        $sql = "SELECT user_id FROM users WHERE username = '$username_str'";
-                        $first = true;
-                        foreach (array_keys(AuthenticatorLocalUser :: getAllLocalUserAccountOrigins()) as $account_origin)
-                        {
-                                if ($first === true)
-                                {
-                                        $sql .= " AND (account_origin = '$account_origin'";
-                                        $first = false;
-                                }
-                                else
-                                        $sql .= " OR account_origin = '$account_origin'";
-                        }
-                        if ($first === false)
-                                $sql .= ")";
-                        $db->ExecSql($sql, $users_rows, false);
-
-                        // Fill an array with User objects corresponding to those we just got
-                        if (!empty ($users_rows))
-                                foreach ($users_rows as $user_row)
-                                        $users_list[] = new User($user_row['user_id']);
-                }
-
-                return $users_list;
-        }
-
-        /**
-         * Get the list of users associated with an e-mail address
-         * Since we cannot guarantee the unicity of (user, e-mail) key
-         * this will return an array.
-         * 
-         * NB : This function will only extract users who authenticate
-         * through a LocalUserAuthenticator 
-         * (see AuthenticatorLocalUser::getAllLocalUserAccountOrigins)
-         * 
-         * @param $email : the e-mail criterion
-         * @return array : array of User objects
-         */
-        public static function getUsersByEmail($email)
-        {
-                $users_list = array ();
-
-                // E-mail cannot be empty, will return an empty array.
-                if (!empty ($email))
-                {
-                        // Build SQL query, excluding users who do not authenticate through LocalUserAuth
-                        global $db;
-                        $email_str = $db->EscapeString($email);
-                        $sql = "SELECT user_id FROM users WHERE email = '$email_str'";
-                        $first = true;
-                        foreach (array_keys(AuthenticatorLocalUser :: getAllLocalUserAccountOrigins()) as $account_origin)
-                        {
-                                if ($first === true)
-                                {
-                                        $sql .= " AND (account_origin = '$account_origin'";
-                                        $first = false;
-                                }
-                                else
-                                        $sql .= " OR account_origin = '$account_origin'";
-                        }
-                        if ($first === false)
-                                $sql .= ")";
-                        $db->ExecSql($sql, $users_rows, false);
-
-                        // Fill an array with User objects corresponding to those we just got
-                        if (!empty ($users_rows))
-                                foreach ($users_rows as $user_row)
-                                        $users_list[] = new User($user_row['user_id']);
-                }
-
-                return $users_list;
-        }
-
         /** Returns the hash of the password suitable for storing or comparing in the database.  This hash is the same one as used in NoCat
          * @return The 32 character hash.
@@ -275 +181 @@
                 return $this->id;
         }
+        
+        /** Gets the Network to which the user belongs 
+         * @return Network object (never returns null)
+         */
+        public function getNetwork()
+        {
+                        return Network::getObject($this->mRow['account_origin']);
+        }
+
 
         /** Get a user display suitable for a user list.  Will include link to the user profile. */
@@ -365 +280 @@
                         if ($account_status == ACCOUNT_STATUS_VALIDATION)
                         {
-                                $sql = "SELECT CASE WHEN ((NOW() - reg_date) > interval '".VALIDATION_GRACE_TIME." minutes') THEN true ELSE false END AS validation_grace_time_expired FROM users WHERE (user_id='{$this->id}')";
+                                $sql = "SELECT CASE WHEN ((NOW() - reg_date) > interval networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired, networks.validation_grace_time FROM users  JOIN networks ON (users.account_origin = networks.network_id) WHERE (user_id='{$this->id}')";
                                 $db->ExecSqlUniqueRes($sql, $user_info, false);
 
                                 if ($user_info['validation_grace_time_expired'] == 't')
                                 {
-                                        $errmsg = _("Sorry, your ").VALIDATION_GRACE_TIME._(" minutes grace period to retrieve your email and validate your account has now expired. You will have to connect to the internet and validate your account from another location or create a new account. For help, please ").'<a href="'.BASEPATH.'faq.php'.'">'._("click here.").'</a>';
+                                        $errmsg = sprintf(_("Sorry, your %s minutes grace period to retrieve your email and validate your account has now expired. You will have to connect to the internet and validate your account from another location or create a new account. For help, please %s click here %s."), $user_info['validation_grace_time_expired'], '<a href="'.BASEPATH.'faq.php'.'">', '</a>');
                                         $retval = false;
                                 }
@@ -520 +435 @@
         function sendLostUsername()
         {
+                $network = $this->getNetwork();
                 $username = $this->getUsername();
                 $headers = 'MIME-Version: 1.0'."\r\n";
                 $headers .= 'Content-type: text/plain; charset=UTF-8'."\r\n";
-                $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
-                $subject = HOTSPOT_NETWORK_NAME._(" lost username request");
+                $headers .= "From: ".$network->getValidationEmailFromAddress();
+                $subject = $network->getName()._(" lost username request");
                 $body = _("Hello,\nYou have requested that the authentication server send you your username:\nUsername: ").$username._("\n\nHave a nice day,\nThe Team");
 
@@ -547 +463 @@
                         else
                         {
+                                $network = $this->getNetwork();
                                 $headers = 'MIME-Version: 1.0'."\r\n";
                                 $headers .= 'Content-type: text/plain; charset=UTF-8'."\r\n";
-                                $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
-                                $subject = HOTSPOT_NETWORK_NAME._(" new user validation");
+                                $headers .= "From: ".$network->getValidationEmailFromAddress();
+                                $subject = $network->getName()._(" new user validation");
                                 $url = "http://".$_SERVER["SERVER_NAME"]."/validate.php?user_id=".$this->getId()."&token=".$this->getValidationToken();
                                 $body = _("Hello,\nPlease follow the link below to validate your account.\n").$url._("\n\nThank you,\nThe Team.");
@@ -565 +482 @@
         {
                 global $db;
-
+                $network = $this->getNetwork();
                 $new_password = $this->randomPass();
                 $this->setPassword($new_password);
@@ -572 +489 @@
                 $headers = 'MIME-Version: 1.0'."\r\n";
                 $headers .= 'Content-type: text/plain; charset=UTF-8'."\r\n";
-                $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
-                $subject = HOTSPOT_NETWORK_NAME._(" new password request");
+                $headers .= "From: ".$network->getValidationEmailFromAddress();
+                $subject = $network->getName()._(" new password request");
                 $body = _("Hello,\nYou have requested that the authentication server send you a new password:\nUsername: ").$username._("\nPassword: ").$new_password._("\n\nHave a nice day,\nThe Team");
 

trunk/wifidog-auth/wifidog/config.php

@@ -17 +17 @@
 define('SYSTEM_PATH', '/');
 /**< Set this to true if your server has SSL available, otherwise, passwords will be transmitted in clear text over the air */
-define('SSL_AVAILABLE', true);
-/** @deprecated version - 2005-04-19 */
-define('HOTSPOT_NETWORK_NAME', 'Île sans fil');
-define('HOTSPOT_NETWORK_URL', 'http://www.ilesansfil.org/');
-define('TECH_SUPPORT_EMAIL', 'tech@ilesansfil.org');
-define('UNKNOWN_HOSTPOT_NAME', 'Unknown HotSpot');
+define('SSL_AVAILABLE', false);
 
-define('VALIDATION_GRACE_TIME', 20); /**< Number of minutes after new account creation during which internet access is available to validate your account.  Once elapsed, you have to validate from home... */
-define('VALIDATION_EMAIL_FROM_ADDRESS', 'validation@ilesansfil.org');
 /* RSS support.  If set to true, MAGPIERSS must be installed in MAGPIE_REL_PATH */
 define('RSS_SUPPORT', true);
@@ -71 +64 @@
 define('LOCAL_CONTENT_REL_PATH', 'local_content/');//Path to the directory containing the different node specific directories.  Relative to BASE_URL_PATH
 
-// Authentication sources section
-/* The array index for the source must match the account_origin in the user table */
-
-// Local User authenticators
-require_once BASEPATH.'classes/AuthenticatorLocalUser.php';
-
-/**********************************************
- * BIG FAT WARNING
- * DO NOT remove this authenticator under any circumstance
- * you SHOULD NOT change its name either
- * The system relies heavily on its main authenticator to do
- * multiple tasks with users...
- * ********************************************
- */
-define('LOCAL_USER_ACCOUNT_ORIGIN', 'LOCAL_USER');
-$AUTH_SOURCE_ARRAY[LOCAL_USER_ACCOUNT_ORIGIN]=array(
-                             'name'=>HOTSPOT_NETWORK_NAME,
-                             'authenticator'=>new AuthenticatorLocalUser(LOCAL_USER_ACCOUNT_ORIGIN));
-                             
-// RADIUS authenticators ( see AuthenticatorRadius constuctor doc for details )
-/*
-require_once BASEPATH.'classes/AuthenticatorRadius.php';
-
-define('IDRC_ACCOUNT_ORIGIN', 'IDRC_RADIUS_USER');
-$AUTH_SOURCE_ARRAY[IDRC_ACCOUNT_ORIGIN]=array(
-                             'name'=>"IDRC RADIUS Server",
-                             'authenticator'=>new AuthenticatorRadius(IDRC_ACCOUNT_ORIGIN, "192.168.0.11", 1812, 1813, "secret_key", "CHAP_MD5"));
-*/
-
 /*These are the file names of the different templates that can be put in the CONTENT_PATH/(node_id)/ folders */
 define('STYLESHEET_NAME', 'stylesheet.css');

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

@@ -25 +25 @@
 define('BASEPATH', '../');
 require_once BASEPATH.'include/common.php';
+require_once BASEPATH.'classes/MainUI.php';
 require_once BASEPATH.'include/common_interface.php';
 require_once BASEPATH.'classes/Node.php';
-require_once BASEPATH.'classes/MainUI.php';
 
 if (CONF_USE_CRON_FOR_DB_CLEANUP == false)
@@ -92 +92 @@
 $ui->setToolContent($tool_html);
 
-$hotspot_network_name = HOTSPOT_NETWORK_NAME;
-$hotspot_network_url = HOTSPOT_NETWORK_URL;
-$network_logo_url = COMMON_CONTENT_URL.NETWORK_LOGO_NAME;
-$network_logo_banner_url = COMMON_CONTENT_URL.NETWORK_LOGO_BANNER_NAME;
-
 $hotspot_logo_url = find_local_content_url(HOTSPOT_LOGO_NAME);
-$hotspot_logo_banner_url = find_local_content_url(HOTSPOT_LOGO_BANNER_NAME);
 
 $html = '';

trunk/wifidog-auth/wifidog/hotspot_status.php

@@ -62 +62 @@
                 
                 // Network metadata
+                $network = Network::getCurrentNetwork();
                 $network_metadata_node = $xmldoc->createElement("networkMetadata");
                 $network_metadata_node = $hotspot_status_root_node->appendChild($network_metadata_node);
-                $network_name_node = $xmldoc->createElement("networkUri", htmlspecialchars(HOTSPOT_NETWORK_URL, ENT_QUOTES));
+                $network_name_node = $xmldoc->createElement("networkUri", htmlspecialchars($network->getHomepageURL(), ENT_QUOTES));
                 $network_metadata_node->appendChild($network_name_node);
-                $network_name_node = $xmldoc->createElement("name", htmlspecialchars(HOTSPOT_NETWORK_NAME, ENT_QUOTES));
+                $network_name_node = $xmldoc->createElement("name", htmlspecialchars($network->getName(), ENT_QUOTES));
                 $network_metadata_node->appendChild($network_name_node);
-                $network_url_node = $xmldoc->createElement("websiteUrl", htmlspecialchars(HOTSPOT_NETWORK_URL, ENT_QUOTES));
+                $network_url_node = $xmldoc->createElement("websiteUrl", htmlspecialchars($network->getHomepageURL(), ENT_QUOTES));
                 $network_metadata_node->appendChild($network_url_node);
-                $network_mail_node = $xmldoc->createElement("techSupportEmail", TECH_SUPPORT_EMAIL);
-                $network_metadata_node->appendChild($network_mail_node);
+                $email = Network::GetCurrentNetwork()->getTechSupportEmail();
+                if(!empty($email))
+                {
+                        $network_mail_node = $xmldoc->createElement("techSupportEmail", $email);
+                        $network_metadata_node->appendChild($network_mail_node);
+                }
                 $nodes_count_node = $xmldoc->createElement("hotspotsCount", count($node_results));
                 $network_metadata_node->appendChild($nodes_count_node);
@@ -90 +95 @@
                         foreach ($node_results as $node_row)
                         {
+                                $node=Node::getObject($node_row['node_id']);
+                                $network=$node->getNetwork();
                                 $hotspot = $xmldoc->createElement("hotspot");
                                 $hotspot = $hotspots_metadata_node->appendChild($hotspot);
@@ -299 +306 @@
                 $title = $channel->appendChild($title);
 
-                $textnode = $xmldoc->createTextNode(HOTSPOT_NETWORK_NAME._(": Newest HotSpots"));
+                $textnode = $xmldoc->createTextNode($network->getName()._(": Newest HotSpots"));
                 $title->appendChild($textnode);
 
@@ -305 +312 @@
                 $link = $xmldoc->createElement("link");
                 $channel->appendChild($link);
-                $textnode = $xmldoc->createTextNode(HOTSPOT_NETWORK_URL);
+                $textnode = $xmldoc->createTextNode($network->getHomepageURL());
                 $link->appendChild($textnode);
 
@@ -311 +318 @@
                 $description = $xmldoc->createElement("description");
                 $channel->appendChild($description);
-                $textnode = $xmldoc->createTextNode(_("WiFiDog list of the most recent HotSpots opened by the network: ").HOTSPOT_NETWORK_NAME);
+                $textnode = $xmldoc->createTextNode(_("WiFiDog list of the most recent HotSpots opened by the network: ").$network->getName());
                 $description->appendChild($textnode);
 
@@ -325 +332 @@
                 $copyright = $xmldoc->createElement("copyright");
                 $channel->appendChild($copyright);
-                $textnode = $xmldoc->createTextNode(_("Copyright ").HOTSPOT_NETWORK_NAME);
+                $textnode = $xmldoc->createTextNode(_("Copyright ").$network->getName());
                 $copyright->appendChild($textnode);
 
                 /* managingEditor */
 
+
                 /* webMaster */
-
-                $webMaster = $xmldoc->createElement("webMaster");
-                $channel->appendChild($webMaster);
-                $textnode = $xmldoc->createTextNode(TECH_SUPPORT_EMAIL);
-                $webMaster->appendChild($textnode);
+                $email = Network::GetCurrentNetwork()->getTechSupportEmail();
+                if(!empty($email))
+                {
+                        $webMaster = $xmldoc->createElement("webMaster");
+                        $channel->appendChild($webMaster);
+                        $textnode = $xmldoc->createTextNode($email);
+                        $webMaster->appendChild($textnode);
+                }
 
                 /* pubDate */
@@ -383 +394 @@
                 $title = $xmldoc->createElement("title");
                 $image->appendChild($title);
-                $textnode = $xmldoc->createTextNode(HOTSPOT_NETWORK_NAME);
+                $textnode = $xmldoc->createTextNode($network->getName());
                 $title->appendChild($textnode);
                 /* url */
@@ -393 +404 @@
                 $link = $xmldoc->createElement("link");
                 $image->appendChild($link);
-                $textnode = $xmldoc->createTextNode(HOTSPOT_NETWORK_URL);
+                $textnode = $xmldoc->createTextNode($network->getHomepageURL());
                 $link->appendChild($textnode);
                 /* width */
@@ -553 +564 @@
                                 $guid->setAttribute('isPermaLink', 'false');
                                 $item->appendChild($guid);
-                                $textnode = $xmldoc->createTextNode(HOTSPOT_NETWORK_URL.$node_row['node_id']);
+                                $textnode = $xmldoc->createTextNode($network->getHomepageURL().$node_row['node_id']);
                                 $guid->appendChild($textnode);
 
@@ -589 +600 @@
                 $title = $channel->appendChild($title);
 
-                $textnode = $xmldoc->createTextNode(utf8_encode(HOTSPOT_NETWORK_NAME._(": Newest HotSpots")));
+                $textnode = $xmldoc->createTextNode(utf8_encode($network->getName()._(": Newest HotSpots")));
                 $title->appendChild($textnode);
 
@@ -595 +606 @@
                 $link = $xmldoc->createElement("link");
                 $channel->appendChild($link);
-                $textnode = $xmldoc->createTextNode(utf8_encode(HOTSPOT_NETWORK_URL));
+                $textnode = $xmldoc->createTextNode(utf8_encode($network->getHomepageURL()));
                 $link->appendChild($textnode);
 
@@ -601 +612 @@
                 $description = $xmldoc->createElement("description");
                 $channel->appendChild($description);
-                $textnode = $xmldoc->createTextNode(utf8_encode(_("WiFiDog list of the most recent HotSpots opened by the network: ").HOTSPOT_NETWORK_NAME));
+                $textnode = $xmldoc->createTextNode(utf8_encode(_("WiFiDog list of the most recent HotSpots opened by the network: ").$network->getName()));
                 $description->appendChild($textnode);
 
@@ -615 +626 @@
                 $copyright = $xmldoc->createElement("copyright");
                 $channel->appendChild($copyright);
-                $textnode = $xmldoc->createTextNode(utf8_encode(_("Copyright ").HOTSPOT_NETWORK_NAME));
+                $textnode = $xmldoc->createTextNode(utf8_encode(_("Copyright ").$network->getName()));
                 $copyright->appendChild($textnode);
 
@@ -621 +632 @@
 
                 /* webMaster */
-
-                $webMaster = $xmldoc->createElement("webMaster");
-                $channel->appendChild($webMaster);
-                $textnode = $xmldoc->createTextNode(utf8_encode(TECH_SUPPORT_EMAIL));
-                $webMaster->appendChild($textnode);
-
+                $email = Network::GetCurrentNetwork()->getTechSupportEmail();
+                if(!empty($email))
+                {
+                        $webMaster = $xmldoc->createElement("webMaster");
+                        $channel->appendChild($webMaster);
+                        $textnode = $xmldoc->createTextNode($email);
+                        $webMaster->appendChild($textnode);
+                }
+                
                 /* pubDate */
                 $pubDate = $xmldoc->createElement("pubDate");
@@ -673 +687 @@
                 $title = $xmldoc->createElement("title");
                 $image->appendChild($title);
-                $textnode = $xmldoc->createTextNode(utf8_encode(HOTSPOT_NETWORK_NAME));
+                $textnode = $xmldoc->createTextNode(utf8_encode($network->getName()));
                 $title->appendChild($textnode);
                 /* url */
@@ -683 +697 @@
                 $link = $xmldoc->createElement("link");
                 $image->appendChild($link);
-                $textnode = $xmldoc->createTextNode(utf8_encode(HOTSPOT_NETWORK_URL));
+                $textnode = $xmldoc->createTextNode(utf8_encode($network->getHomepageURL()));
                 $link->appendChild($textnode);
                 /* width */
@@ -808 +822 @@
                                 $guid->setAttribute('isPermaLink', 'false');
                                 $item->appendChild($guid);
-                                $textnode = $xmldoc->createTextNode(utf8_encode(HOTSPOT_NETWORK_URL.$node_row['node_id']));
+                                $textnode = $xmldoc->createTextNode(utf8_encode($network->getHomepageURL().$node_row['node_id']));
                                 $guid->appendChild($textnode);
 

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

@@ -28 +28 @@
 require_once BASEPATH.'classes/AbstractDb.php';
 require_once BASEPATH.'classes/Session.php';
-define('REQUIRED_SCHEMA_VERSION', 25);
+define('REQUIRED_SCHEMA_VERSION', 26);
 
 /** Check that the database schema is up to date.  If it isn't, offer to update it. */
@@ -34 +34 @@
 {
         global $db;
-
-        //check_users_not_empty();
         $db->ExecSqlUniqueRes("SELECT * FROM schema_info WHERE tag='schema_version'", $row, false);
         if (empty ($row))
@@ -74 +72 @@
 {
         // Extract the first account origin, assume it's the default
-        global $AUTH_SOURCE_ARRAY;
-        if (!empty ($AUTH_SOURCE_ARRAY))
-        {
-                $default_account_origin = array_values(array_keys($AUTH_SOURCE_ARRAY));
-                $default_account_origin = $default_account_origin[0];
-        }
-
-        if (!empty ($default_account_origin))
+        $network = Network::getDefaultNetwork();
+        if (!empty ($network))
         {
                 global $db;
-                $db->ExecSqlUniqueRes("SELECT user_id FROM users WHERE account_origin = '$default_account_origin' LIMIT 1", $row, false);
+                $db->ExecSqlUniqueRes("SELECT user_id FROM users WHERE account_origin = '{$network->getId()}' LIMIT 1", $row, false);
                 if ($row == null)
                 {
                         echo "<html><head><h1>";
-                        echo _("No user matches the default account origin, a new user admin/admin will be created. Change the password as soon as possible !");
+                        echo _("No user matches the default network, a new user admin/admin will be created. Change the password as soon as possible !");
                         echo "</html></head>";
                         $sql = "BEGIN;";
@@ -101 +93 @@
         {
                 echo "<html><head><h1>";
-                echo _("Could not get a default account origin, make sure you config.php has at least one AUTH_SOURCE_ARRAY entry.");
+                echo _("Could not get a default network!");
                 echo "</html></head>";
                 exit ();
@@ -134 +126 @@
                         {
                                 $user_id = $db->EscapeString($row['user_id']);
-                                $sql .= "UPDATE users SET username='$user_id', user_id='".get_guid()."', account_origin='".LOCAL_USER_ACCOUNT_ORIGIN."' WHERE user_id='$user_id';\n";
+                                $sql .= "UPDATE users SET username='$user_id', user_id='".get_guid()."', account_origin='LOCAL_USER' WHERE user_id='$user_id';\n";
                         }
                         $sql .= "CREATE UNIQUE INDEX idx_unique_username_and_account_origin ON users (username, account_origin);\n";
@@ -567 +559 @@
                         $sql .= "DROP TABLE node_tech_officers;\n";
                 }
-                
+                        
+                $new_schema_version = 26;
+                if ($schema_version < $new_schema_version)
+                {
+                        echo "<h2>Preparing SQL statements to update schema to version  $new_schema_version</h2>\n";
+                        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+                        $sql .= "CREATE TABLE networks ( \n";
+                        $sql .= "  network_id text NOT NULL PRIMARY KEY,\n";
+                        $sql .= "  network_authenticator_class text NOT NULL CHECK (network_authenticator_class<>''),\n";
+                        $sql .= "  network_authenticator_params text,\n";
+                        $sql .= "  is_default_network boolean NOT NULL DEFAULT FALSE,\n";
+                        $sql .= "  name text NOT NULL DEFAULT 'Unnamed network' CHECK (name<>''),\n";
+                        $sql .= "  creation_date date NOT NULL DEFAULT now(),\n";
+                        $sql .= "  homepage_url text,\n";
+                        $sql .= "  tech_support_email text,\n";
+                        $sql .= "  validation_grace_time interval NOT NULL DEFAULT '1200 seconds',\n";
+                        $sql .= "  validation_email_from_address text NOT NULL CHECK (validation_email_from_address<>'') DEFAULT 'validation@wifidognetwork',\n";
+                        $sql .= "  allow_multiple_login BOOLEAN NOT NULL DEFAULT FALSE,\n";
+                        $sql .= "  allow_splash_only_nodes BOOLEAN NOT NULL DEFAULT FALSE,\n";
+                        $sql .= "  allow_custom_portal_redirect BOOLEAN NOT NULL DEFAULT FALSE\n";
+                        $sql .= ");\n";
+                        $sql .= "INSERT INTO networks (network_id, network_authenticator_class, network_authenticator_params) SELECT  account_origin, COALESCE('AuthenticatorLocalUser') as network_authenticator_class, account_origin FROM users GROUP BY (account_origin) ORDER BY min(reg_date);\n";
+                        $sql .= "UPDATE networks SET is_default_network=TRUE WHERE network_id=(SELECT account_origin FROM users GROUP BY (account_origin) ORDER BY min(reg_date) LIMIT 1);\n";
+                        $sql .= "ALTER TABLE users ADD CONSTRAINT account_origin_fkey FOREIGN KEY (account_origin) REFERENCES networks (network_id) ON UPDATE CASCADE ON DELETE RESTRICT;\n";
+                        $sql .= "ALTER TABLE nodes ADD COLUMN network_id text; \n";
+                        $sql .= "UPDATE nodes SET network_id=(SELECT account_origin FROM users GROUP BY (account_origin) ORDER BY min(reg_date) LIMIT 1);\n";                   
+                        $sql .= "ALTER TABLE nodes ALTER COLUMN network_id SET NOT NULL; \n";
+                        $sql .= "ALTER TABLE nodes ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks ON UPDATE CASCADE ON DELETE RESTRICT;\n";
+                        $sql .= "ALTER TABLE network_has_content ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks ON UPDATE CASCADE ON DELETE CASCADE;\n";
+
+                        $sql .= "CREATE TABLE network_stakeholders ( \n";
+                        $sql .= "  network_id text REFERENCES networks,\n";
+                        $sql .= "  user_id VARCHAR(45) REFERENCES users,\n";
+                        $sql .= "  is_admin BOOLEAN NOT NULL DEFAULT FALSE,\n";
+                        $sql .= "  is_stat_viewer BOOLEAN NOT NULL DEFAULT FALSE,\n";
+                        $sql .= "PRIMARY KEY (network_id, user_id)\n";
+                        $sql .= ");\n";
+                }
                 $db->ExecSqlUpdate("BEGIN;\n$sql\nCOMMIT;\n", true);
                 //$db->ExecSqlUpdate("BEGIN;\n$sql\nROLLBACK;\n", true);

trunk/wifidog-auth/wifidog/index.php

@@ -26 +26 @@
 define('BASEPATH', './');
 require_once BASEPATH.'include/common.php';
+require_once BASEPATH.'classes/MainUI.php';
 require_once BASEPATH.'include/common_interface.php';
 require_once BASEPATH.'classes/Node.php';
-require_once BASEPATH.'classes/MainUI.php';
 
 $num_valid_users = $stats->getNumValidUsers();

trunk/wifidog-auth/wifidog/install.php

@@ -1237 +1237 @@
     print "<H1>Network</H1>";
 
-    $HOTSPOT_NETWORK_NAME          = $configArray['HOTSPOT_NETWORK_NAME'];
-    $HOTSPOT_NETWORK_URL           = $configArray['HOTSPOT_NETWORK_URL'];
-    $TECH_SUPPORT_EMAIL            = $configArray['TECH_SUPPORT_EMAIL'];
-    //$UNKNOWN_HOSTPOT_NAME          = $configArray['UNKNOWN_HOSTPOT_NAME'];
-    $VALIDATION_GRACE_TIME         = $configArray['VALIDATION_GRACE_TIME'];
-    $VALIDATION_EMAIL_FROM_ADDRESS = $configArray['VALIDATION_EMAIL_FROM_ADDRESS'];    
+    //$HOTSPOT_NETWORK_NAME          = $configArray['HOTSPOT_NETWORK_NAME'];
+    //$HOTSPOT_NETWORK_URL           = $configArray['HOTSPOT_NETWORK_URL'];
+    //$TECH_SUPPORT_EMAIL            = $configArray['TECH_SUPPORT_EMAIL'];
+    //$VALIDATION_GRACE_TIME         = $configArray['VALIDATION_GRACE_TIME'];
+    //$VALIDATION_EMAIL_FROM_ADDRESS = $configArray['VALIDATION_EMAIL_FROM_ADDRESS'];    
 
     print <<< EndHTML
@@ -1266 +1265 @@
 <script type="text/javascript">
   function submitOptionsValue() {
-    newConfig("HOTSPOT_NETWORK_NAME='" + document.myform.HOTSPOT_NETWORK_NAME.value + "'");
-    newConfig("HOTSPOT_NETWORK_URL='" + document.myform.HOTSPOT_NETWORK_URL.value + "'");
-    newConfig("TECH_SUPPORT_EMAIL='" + document.myform.TECH_SUPPORT_EMAIL.value + "'");
-   /* newConfig("UNKNOWN_HOSTPOT_NAME='" + document.myform.UNKNOWN_HOSTPOT_NAME.value + "'"); */
-    newConfig("VALIDATION_GRACE_TIME=" + document.myform.VALIDATION_GRACE_TIME.value);
-    newConfig("VALIDATION_EMAIL_FROM_ADDRESS='" + document.myform.VALIDATION_EMAIL_FROM_ADDRESS.value + "'");
+    //newConfig("HOTSPOT_NETWORK_NAME='" + document.myform.HOTSPOT_NETWORK_NAME.value + "'");
+    //newConfig("HOTSPOT_NETWORK_URL='" + document.myform.HOTSPOT_NETWORK_URL.value + "'");
+    //newConfig("TECH_SUPPORT_EMAIL='" + document.myform.TECH_SUPPORT_EMAIL.value + "'");
+    //newConfig("VALIDATION_GRACE_TIME=" + document.myform.VALIDATION_GRACE_TIME.value);
+    //newConfig("VALIDATION_EMAIL_FROM_ADDRESS='" + document.myform.VALIDATION_EMAIL_FROM_ADDRESS.value + "'");
   }
 </script>
@@ -1419 +1417 @@
 
 <B>Create the wifidog database</B>
-<PRE>  <I>postgres@yourserver $></I> createdb -O wifidog wifidog
+<PRE>  <I>postgres@yourserver $></I> createdb wifidog --encoding=UTF-8 --owner=wifidog
   CREATE DATABASE 
 </PRE>

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

@@ -78 +78 @@
 }
 
-// Add the auth servers list to smarty variables
-isset ($AUTH_SOURCE_ARRAY) && $smarty->assign('auth_sources', $AUTH_SOURCE_ARRAY);
-// Pass the account_origin along, if it's set
-isset ($_REQUEST["auth_source"]) && $smarty->assign('selected_auth_source', $_REQUEST["auth_source"]);
-
 $node = null;
 if (!empty ($_REQUEST['gw_id']))
@@ -92 +87 @@
                 $node = Node :: getObject($_REQUEST['gw_id']);
                 $hotspot_name = $node->getName();
+                $network = $node->getNetwork();
         }
         catch (Exception $e)
@@ -103 +99 @@
 {
         /* Gateway ID is not set... Virtual login */
+        $network = Network::getCurrentNetwork();
 }
 
@@ -174 +171 @@
 
 // HTML body
-$hotspot_network_name = HOTSPOT_NETWORK_NAME;
-$hotspot_network_url = HOTSPOT_NETWORK_URL;
+$hotspot_network_name = $network->getName();
+$hotspot_network_url = $network->getHomepageURL();
 $network_logo_banner_url = COMMON_CONTENT_URL.NETWORK_LOGO_BANNER_NAME;
 

trunk/wifidog-auth/wifidog/lost_password.php

@@ -36 +36 @@
         $username = $db->EscapeString($_REQUEST['username']);
         $email = $db->EscapeString($_REQUEST['email']);
-        // If the source is present and that it's in our AUTH_SOURCE_ARRAY, save it to a var for later use
-                $_REQUEST['auth_source'] && in_array($_REQUEST['auth_source'], array_keys($AUTH_SOURCE_ARRAY)) && $account_origin = $_REQUEST['auth_source'];
+
+                $account_origin = Network::getObject($_REQUEST['auth_source']);
 
         try {
@@ -69 +69 @@
 $sources = array ();
 // Preserve keys
-foreach (array_keys($AUTH_SOURCE_ARRAY) as $auth_source_key)
-        if ($AUTH_SOURCE_ARRAY[$auth_source_key]['authenticator']->isRegistrationPermitted())
-                $sources[$auth_source_key] = $AUTH_SOURCE_ARRAY[$auth_source_key];
-
+$network_array=Network::getAllNetworks();
+foreach ($network_array as $network)
+        if ($network->getAuthenticator()->isRegistrationPermitted())
+                $sources[$network->getId()] = $network->getName();
+                
 isset ($sources) && $smarty->assign('auth_sources', $sources);
 // Pass the account_origin along, if it's set
 isset ($_REQUEST["auth_source"]) && $smarty->assign('selected_auth_source', $_REQUEST["auth_source"]);
 
-//$smarty->display("templates/lost_password.html");
 $ui = new MainUI();
 $smarty->assign('SelectNetworkUI', Network::getSelectNetworkUI('auth_source'));

trunk/wifidog-auth/wifidog/lost_username.php

@@ -31 +31 @@
 
 if (isset($_REQUEST["submit"])) {
-        // If the source is present and that it's in our AUTH_SOURCE_ARRAY, save it to a var for later use
-        $_REQUEST['auth_source'] && in_array($_REQUEST['auth_source'], array_keys($AUTH_SOURCE_ARRAY)) && $account_origin = $_REQUEST['auth_source'];
-        
+                $account_origin = Networt::getObject($_REQUEST['auth_source']); 
     try {
         if(empty($account_origin))
@@ -61 +59 @@
 $sources = array ();
 // Preserve keys
-foreach (array_keys($AUTH_SOURCE_ARRAY) as $auth_source_key)
-        if ($AUTH_SOURCE_ARRAY[$auth_source_key]['authenticator']->isRegistrationPermitted())
-                $sources[$auth_source_key] = $AUTH_SOURCE_ARRAY[$auth_source_key];
-
+$network_array=Network::getAllNetworks();
+foreach ($network_array as $network)
+        if ($network->getAuthenticator()->isRegistrationPermitted())
+                $sources[$network->getId()] = $network->getName();
+                
 isset ($sources) && $smarty->assign('auth_sources', $sources);
 // Pass the account_origin along, if it's set
 isset ($_REQUEST["auth_source"]) && $smarty->assign('selected_auth_source', $_REQUEST["auth_source"]);
 
-//$smarty->display("templates/lost_username.html");
 $ui = new MainUI();
 $smarty->assign('SelectNetworkUI', Network::getSelectNetworkUI('auth_source'));

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

@@ -66 +66 @@
 if ($current_node != null)
 {
+        $network = $node->getNetwork();
         $current_node_id = $current_node->getId();
         $online_users = $current_node->getOnlineUsers();
@@ -84 +85 @@
 else
 {
+        $network = Network::getCurrentNetwork();
         $current_node_id = null;
         $tool_html .= _("You are not currently at a hotspot...");
@@ -204 +206 @@
 $ui->setToolContent($tool_html);
 
-$hotspot_network_name = HOTSPOT_NETWORK_NAME;
-$hotspot_network_url = HOTSPOT_NETWORK_URL;
+$hotspot_network_name = $network->getName();
+$hotspot_network_url = $network->getHomepageURL();
 $network_logo_url = COMMON_CONTENT_URL.NETWORK_LOGO_NAME;
 $network_logo_banner_url = COMMON_CONTENT_URL.NETWORK_LOGO_BANNER_NAME;

trunk/wifidog-auth/wifidog/resend_validation.php

@@ -34 +34 @@
         $smarty->assign("error", _("Please specify a username"));
     } else {
-        // If the source is present and that it's in our AUTH_SOURCE_ARRAY, save it to a var for later use
-                $_REQUEST['auth_source'] && in_array($_REQUEST['auth_source'], array_keys($AUTH_SOURCE_ARRAY)) && $account_origin = $_REQUEST['auth_source'];
-                
+                $account_origin = Networt::getObject($_REQUEST['auth_source']);         
         try {
                 if(empty($account_origin))
@@ -62 +60 @@
 $sources = array ();
 // Preserve keys
-foreach (array_keys($AUTH_SOURCE_ARRAY) as $auth_source_key)
-        if ($AUTH_SOURCE_ARRAY[$auth_source_key]['authenticator']->isRegistrationPermitted())
-                $sources[$auth_source_key] = $AUTH_SOURCE_ARRAY[$auth_source_key];
+$network_array=Network::getAllNetworks();
+foreach ($network_array as $network)
+        if ($network->getAuthenticator()->isRegistrationPermitted())
+                $sources[$network->getId()] = $network->getName();
                 
 isset ($sources) && $smarty->assign('auth_sources', $sources);

trunk/wifidog-auth/wifidog/signup.php

@@ -81 +81 @@
         $smarty->assign('username', $username);
         $smarty->assign('email', $email);
-        // If the source is present and that it's in our AUTH_SOURCE_ARRAY, save it to a var for later use
-        $_REQUEST['auth_source'] && in_array($_REQUEST['auth_source'], array_keys($AUTH_SOURCE_ARRAY)) && $account_origin = $_REQUEST['auth_source'];
-
+                $account_origin = Networt::getObject($_REQUEST['auth_source']);
         try
         {
@@ -136 +134 @@
         }
 }
-
 // Add the auth servers list to smarty variables
 $sources = array ();
 // Preserve keys
-foreach (array_keys($AUTH_SOURCE_ARRAY) as $auth_source_key)
-        if ($AUTH_SOURCE_ARRAY[$auth_source_key]['authenticator']->isRegistrationPermitted())
-                $sources[$auth_source_key] = $AUTH_SOURCE_ARRAY[$auth_source_key];
-
+$network_array=Network::getAllNetworks();
+foreach ($network_array as $network)
+        if ($network->getAuthenticator()->isRegistrationPermitted())
+                $sources[$network->getId()] = $network->getName();
+                
 isset ($sources) && $smarty->assign('auth_sources', $sources);
 // Pass the account_origin along, if it's set
 isset ($_REQUEST["auth_source"]) && $smarty->assign('selected_auth_source', $_REQUEST["auth_source"]);
 
-//$smarty->display("templates/signup.html");
 $ui = new MainUI();
 $smarty->assign('SelectNetworkUI', Network::getSelectNetworkUI('auth_source'));