Changeset 717

Timestamp:

09/07/05 22:16:10 (8 years ago)

Author:

benoitg

Message:

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

• RssPressReview?.php: Fix z-index so the hovers will overlap the expanded news.
• login/index.php: Reorganise code to make it more legible and comment what it does. Emphasise error messages and put them right above where they clicked so users can actually see them.
• Security.php: Remove deprecated login code
• Authenticator.php: Change calling convention for better encapsulation
• New feature: Support multiple simultaneous logins if enabled in network configuration
• New feature (in testing): Splash-only node support

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/hotspot.php (modified) (1 diff)
• wifidog/admin/hotspot_owner.php (modified) (1 diff)
• wifidog/auth/index.php (modified) (4 diffs)
• wifidog/change_password.php (modified) (1 diff)
• wifidog/classes/Authenticator.php (modified) (2 diffs)
• wifidog/classes/AuthenticatorLocalUser.php (modified) (2 diffs)
• wifidog/classes/AuthenticatorRadius.php (modified) (8 diffs)
• wifidog/classes/Network.php (modified) (1 diff)
• wifidog/classes/Security.php (modified) (2 diffs)
• wifidog/classes/User.php (modified) (10 diffs)
• wifidog/install.php (modified) (1 diff)
• wifidog/lib/RssPressReview/RssPressReview.php (modified) (4 diffs)
• wifidog/login/index.php (modified) (8 diffs)
• wifidog/signup.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-07 Benoit Grégoire  <bock@step.polymtl.ca>
+        * RssPressReview.php:  Fix z-index so the hovers will overlap the expanded news.
+        * login/index.php:  Reorganise code to make it more legible and comment what it does.  
+        Emphasise error messages and put them right above where they clicked so users can actually see them.  
+        * Security.php:  Remove deprecated login code
+        * Authenticator.php: Change calling convention for better encapsulation
+        * New feature:  Support multiple simultaneous logins if enabled in network configuration
+        * New feature (in testing): Splash-only node support
+          
 2005-09-05 Benoit Grégoire  <bock@step.polymtl.ca>
         * include/common.php:  Add code to undo the effect of magic_quote if enabled in the server config.  It is still strongly recommended to disable magic_quote

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

@@ -32 +32 @@
 require_once BASEPATH.'classes/Node.php';
 require_once BASEPATH.'classes/User.php';
-
-$user_id = $session->get(SESS_USER_ID_VAR);
-$smarty->assign("user_id", $user_id); // DEBUG
 
 empty($_REQUEST['action'])  ? $action  = '' : $action  = $_REQUEST['action'];

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

@@ -37 +37 @@
 require_once BASEPATH.'classes/User.php';
 
-$user_id = $session->get(SESS_USER_ID_VAR);
+$user_id = User::getCurrentUser()->getId();
 $smarty->assign("user_id", $user_id); // DEBUG
 

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

@@ -43 +43 @@
 {
         // Retrieve the associated authenticator
-        $authenticator = Network::getObject($info['account_origin'])->getAuthenticator();
+        $network = Network::getObject($info['account_origin']);
+        $authenticator = $network->getAuthenticator();
 if(!$authenticator)
 {
@@ -64 +65 @@
                         {
                                 // Start accounting
-                                if($authenticator->acctStart($info, $auth_message))
+                                if($authenticator->acctStart($info['conn_id'], $auth_message))
                                         $auth_response = ACCOUNT_STATUS_ALLOWED;
                                 else
@@ -94 +95 @@
                                 if ($info['token_status'] == TOKEN_INUSE)
                                 {
-                                        /* This is for the 15 minutes validation period, the exact same code is also present in when the stage is login.  If you update this one don't forget to update the other one! */
+                                        /* This is for the 15 minutes validation period, the exact same code is also present when the stage is login.  If you update this one don't forget to update the other one! */
                                         if (($info['account_status'] == ACCOUNT_STATUS_VALIDATION) && ($info['validation_grace_time_expired'] == 't'))
                                         {
@@ -115 +116 @@
                                 if (($incoming >= $info['incoming']) && ($outgoing >= $info['outgoing']))
                                 {
-                                        $authenticator->acctUpdate($info, $incoming, $outgoing);
+                                        $authenticator->acctUpdate($info['conn_id'], $incoming, $outgoing);
                                         $auth_message .= "| Updated counters. ";
                                 }

trunk/wifidog-auth/wifidog/change_password.php

@@ -51 +51 @@
         // Warning for now, password change only works for local users, registered through our signup process.
         $user = User::getUserByUsernameAndOrigin($username, $account_origin);
-        /**
-         * utf8_decode is used for backward compatibility with old passwords
-         * containing special characters. 
-         * Conversion from UTF-8 to ISO-8859-1 is done to match the MD5 hash 
-         */
-        if ($user->getPasswordHash() != User::passwordHash(utf8_decode($current_password)))
+        if ($user->getPasswordHash() != User::passwordHash($current_password))
             throw new Exception(_("Wrong password."));
 

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

@@ -49 +49 @@
         }
 
-        /** Start accounting traffic for the user */
-        function acctStart($info)
-        {
+        /** Start accounting traffic for the user 
+         * $conn_id:  The connection id for the connection to work on */
+        function acctStart($conn_id)
+        {//$info['conn_id']
                 global $db;
+                $conn_id = $db->escapeString($conn_id);
+                $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.conn_id='$conn_id'", $info, false);
+                $network= Network::getObject($info['network_id']);
+                $splash_user_id = $network->getSplashOnlyUser()->getId();
                 $auth_response = $info['account_status'];
                 /* Login the user */
                 $mac = $db->EscapeString($_REQUEST['mac']);
                 $ip = $db->EscapeString($_REQUEST['ip']);
-                $sql = "UPDATE connections SET "."token_status='".TOKEN_INUSE."',"."user_mac='$mac',"."user_ip='$ip',"."last_updated=NOW()"."WHERE conn_id='{$info['conn_id']}';\n";
+                $sql = "UPDATE connections SET "."token_status='".TOKEN_INUSE."',"."user_mac='$mac',"."user_ip='$ip',"."last_updated=NOW()"."WHERE conn_id='{$conn_id}';\n";
                 $db->ExecSqlUpdate($sql, false);
-
-                /* Logging in with a new token implies that all other active tokens should expire */
-                $token = $db->EscapeString($_REQUEST['token']);
-                $sql = "UPDATE connections SET "."timestamp_out=NOW(), token_status='".TOKEN_USED."' "."WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token!='$token';\n";
-                $db->ExecSqlUpdate($sql, false);
+                if($splash_user_id != $info['user_id'] && $network->getMultipleLoginAllowed()==false)
+                {
+                        /* The user isn't the splash_only user and the network config does not allow multiple logins.  
+                         * Logging in with a new token implies that all other active tokens should expire */
+                        $token = $db->EscapeString($_REQUEST['token']);
+                        $sql = "UPDATE connections SET "."timestamp_out=NOW(), token_status='".TOKEN_USED."' "."WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token!='$token';\n";
+                        $db->ExecSqlUpdate($sql, false);
+                }
+                
                 /* Delete all unused tokens for this user, so we don't fill the database with them */
                 $sql = "DELETE FROM connections "."WHERE token_status='".TOKEN_UNUSED."' AND user_id = '{$info['user_id']}';\n";
@@ -69 +78 @@
         }
 
-        /** Update traffic counters */
-        function acctUpdate($info, $incoming, $outgoing)
+        /** Update traffic counters
+         * $conn_id: The connection id for the connection to work on */
+        function acctUpdate($conn_id, $incoming, $outgoing)
         {
                 // Write traffic counters to database
                 global $db;
-                $db->ExecSqlUpdate("UPDATE connections SET "."incoming='$incoming',"."outgoing='$outgoing',"."last_updated=NOW() "."WHERE conn_id='{$info['conn_id']}'");
+                $conn_id = $db->escapeString($conn_id);
+                $db->ExecSqlUpdate("UPDATE connections SET "."incoming='$incoming',"."outgoing='$outgoing',"."last_updated=NOW() "."WHERE conn_id='{$conn_id}'");
         }
 
-        /** Final update and stop accounting */
-        function acctStop($info)
+        /** Final update and stop accounting
+         * $conn_id:  The connection id (the token id) for the connection to work on
+         * */
+         function acctStop($conn_id)
         {
                 // Stop traffic counters update
                 global $db;
-                $db->ExecSqlUpdate("UPDATE connections SET "."timestamp_out=NOW(),"."token_status='".TOKEN_USED."' "."WHERE conn_id='{$info['conn_id']}';\n", false);
+                $conn_id = $db->escapeString($conn_id);
+                $db->ExecSqlUpdate("UPDATE connections SET "."timestamp_out=NOW(),"."token_status='".TOKEN_USED."' "."WHERE conn_id='{$conn_id}';\n", false);
         }
         

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

@@ -61 +61 @@
                 $username = $db->EscapeString($username);
                 $password = $db->EscapeString($password);
-                /**
-         * utf8_decode is used for backward compatibility with old passwords
-         * containing special characters. 
-         * Conversion from UTF-8 to ISO-8859-1 is done to match the MD5 hash
-         */
-                $password_hash = User :: passwordHash(utf8_decode($_REQUEST['password']));
+                $password_hash = User :: passwordHash($_REQUEST['password']);
 
                 $sql = "SELECT user_id FROM users WHERE (username='$username' OR email='$username') AND account_origin='".$this->getAccountOrigin()."' AND pass='$password_hash'";
@@ -77 +72 @@
                         {
                                 $retval = & $user;
-                                $security->login($user->getId(), $password_hash);
+                                User::setCurrentUser($user);
                                 $errmsg = _("Login successfull");
                         }

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

@@ -74 +74 @@
          * @param username:  A valid identifying token for the source.  Not necessarily unique.  For local user, bots username and email are valid.
          * @param password:  Clear text password.
-         * @retval The actual User object if sogin was successfull, false otherwise.
+         * @retval The actual User object if login was successfull, false otherwise.
          */
         function login($username, $password, & $errmsg = null)
@@ -83 +83 @@
                 $username = $db->EscapeString($username);
                 $password = $db->EscapeString($password);
-                // Local database password hashing is based on an empty string ( we do not store remote passwords )
-                /**
-                 * Backward compatibility conversion is not needed since the password is
-                 * blank ( we do not keep RADIUS passwords
-                 */
-                $password_hash = User :: passwordHash("");
 
                 /*
@@ -161 +155 @@
                                 // RADIUS authentication succeeded !
                                 // Now checking for local copy of this user
-                                $sql = "SELECT user_id FROM users WHERE (username='$username') AND account_origin='".$this->getAccountOrigin()."' AND pass='$password_hash'";
+                                $sql = "SELECT user_id, pass FROM users WHERE (username='$username') AND account_origin='".$this->getAccountOrigin()."'";
                                 $db->ExecSqlUniqueRes($sql, $user_info, false);
 
@@ -170 +164 @@
                                         {
                                                 $retval = $user;
-                                                $security->login($user->getId(), $password_hash);
+                                                User::setCurrentUser($user);
                                                 $errmsg = _("Login successfull");
                                         }
@@ -183 +177 @@
                                         // This user has been succcessfully authenticated through remote RADIUS, but it's not yet in our local database
                                         // Creating the user with a Global Unique ID, empty email and password
+                                        // Local database password hashing is based on an empty string ( we do not store remote passwords )
                                         $user = User :: createUser(get_guid(), $username, $this->getAccountOrigin(), "", "");
                                         $retval = & $user;
                                         // Validate the user right away !
                                         $user->setAccountStatus(ACCOUNT_STATUS_ALLOWED);
-                                        $security->login($user->getId(), $password_hash);
+                                        User::setCurrentUser($user);
                                         $errmsg = _("Login successfull");
                                 }
@@ -208 +203 @@
         }
 
-        /** Start accounting traffic for the user */
-        function acctStart($info, & $errmsg = null)
-        {
+        /** Start accounting traffic for the user 
+         * $conn_id:  The connection id for the connection to work on */
+        function acctStart($conn_id, & $errmsg = null)
+        {
+                global $db;
+                $conn_id = $db->escapeString($conn_id);
+                $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.conn_id='$conn_id'", $info, false);
+                
                 // RADIUS accounting start
                 $radius_acct = new Auth_RADIUS_Acct_Start;
@@ -246 +246 @@
         }
 
-        /** Update traffic counters */
-        function acctUpdate($info, $incoming, $outgoing, & $errmsg = null)
+        /** Update traffic counters
+         * $conn_id: The connection id for the connection to work on */
+        function acctUpdate($conn_id, $incoming, $outgoing, & $errmsg = null)
         {
                 // Call generic traffic updater ( local database )
-                parent :: acctUpdate($info, $incoming, $outgoing);
-
+                parent :: acctUpdate($conn_id, $incoming, $outgoing);
+                global $db;
+                $conn_id = $db->escapeString($conn_id);
+                $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.conn_id='$conn_id'", $info, false);
+                
                 // RADIUS accounting ping
                 // Session is completely based on Database time
@@ -290 +294 @@
         }
 
-        /** Final update and stop accounting */
-        function acctStop($info, & $errmsg = null)
-        {
-                parent :: acctStop($info);
+        /** Final update and stop accounting
+         * $conn_id:  The connection id (the token id) for the connection to work on
+         * */
+        function acctStop($conn_id, & $errmsg = null)
+        {
+                parent :: acctStop($conn_id);
+                global $db;
+                $conn_id = $db->escapeString($conn_id);
+                $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.conn_id='$conn_id'", $info, false);
 
                 // RADIUS accounting stop

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

@@ -445 +445 @@
         }               
         
+                /** Get's the splash-only user.  This is the user that people logged-in at a splash-only hotspot will show up as.  This user always has multiple-login capabilities.
+         * @param $username The username of the user
+         * @param $account_origin The account origin
+         * @return a User object
+         */
+        public static function getSplashOnlyUser()
+        {
+                $username = 'SPLASH_ONLY_USER';
+
+                $user = getUserByUsernameAndOrigin($username, $this);
+                if(!$user)
+                {
+                        $user = User::createUser($id, $username, $this, '', '');
+                        $user->setAccountStatus(ACCOUNT_STATUS_ALLOWED);        
+                }       
+                return $user;
+        }
         /** Are nodes allowed to redirect users to an arbitrary web page instead of the portal?
          * @return true or false */

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

@@ -34 +34 @@
   }
 
-/**
- * @deprecated   Moved to User
-*/
-  function login($user_id, $hash) {
-    global $db;
-    $user_id = $db->EscapeString($user_id);
-    $hash = $db->EscapeString($hash);
-    $db->ExecSqlUniqueRes("SELECT * FROM users WHERE user_id='$user_id' AND pass='$hash'", $user_info, false);
-    if (empty($user_info)) {
-        echo '<p class=error>'._("Your user_id and password do not match")."</p>\n";
-        exit;
-    } else {
-      /* Access granted */
-      $this->session->set(SESS_USER_ID_VAR, $user_id);
-      $this->session->set(SESS_PASSWORD_HASH_VAR, $hash);
-    }
-  }
-
   function requireAdmin() {
        $current_user = User::getCurrentUser();
@@ -66 +48 @@
 
   function requireOwner($node_id) {
-        // If the user has super power let him it !
+        // If the user has super power let him in !
         $current_user = User::getCurrentUser();
         if ($current_user && User::getCurrentUser()->isSuperAdmin())
                 return true;
         
-    global $db;
-    //$this->session->dump();
-    $user = $this->session->get(SESS_USER_ID_VAR);
-    $password_hash = $this->session->get(SESS_PASSWORD_HASH_VAR);
-
-    $db->ExecSqlUniqueRes("SELECT * FROM users NATURAL JOIN node_stakeholders WHERE is_owner = true AND (users.user_id='$user') AND pass='$password_hash' AND node_stakeholders.node_id='$node_id'", $user_info, false);
-    if(empty($user_info)) {
+        $node=Node::getObject($node_id);
+    
+    if(!$node->isOwner($current_user)) {
         echo '<p class=error>'._("You do not have owner privileges")."</p>\n";
         exit;

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

@@ -69 +69 @@
         }
         
-        /** Associates the user passed in parameter with the session
+        /** Associates the user passed in parameter with the session.  This should NOT be called by anything except the Authenticators
          * @param User a user object
          * @return boolean true if everything went well setting the session...
@@ -90 +90 @@
         /** Instantiate a user object 
          * @param $username The username of the user
-         * @param $account_origin The account origin
+         * @param $account_origin Network:  The account origin
          * @return a User object, or null if there was an error
          */
-        public static function getUserByUsernameAndOrigin($username, $account_origin)
+        public static function getUserByUsernameAndOrigin($username, Network $account_origin)
         {
                 global $db;
@@ -99 +99 @@
 
                 $username_str = $db->EscapeString($username);
-                $account_origin_str = $db->EscapeString($account_origin);
+                $account_origin_str = $db->EscapeString($account_origin->getId());
                 $db->ExecSqlUniqueRes("SELECT user_id FROM users WHERE username = '$username_str' AND account_origin = '$account_origin_str'", $user_info, false);
 
@@ -109 +109 @@
         /** Instantiate a user object 
          * @param $email The email of the user
-         * @param $account_origin The account origin
+         * @param $account_origin Network:  The account origin
          * @return a User object, or null if there was an error
          */
-        public static function getUserByEmailAndOrigin($email, $account_origin)
+        public static function getUserByEmailAndOrigin($email, Network $account_origin)
         {
                 global $db;
@@ -118 +118 @@
 
                 $email_str = $db->EscapeString($email);
-                $account_origin_str = $db->EscapeString($account_origin);
+                $account_origin_str = $db->EscapeString($account_origin->getId());
                 $db->ExecSqlUniqueRes("SELECT user_id FROM users WHERE email = '$email_str' AND account_origin = '$account_origin_str'", $user_info, false);
 
@@ -131 +131 @@
         public static function passwordHash($password)
         {
-                return base64_encode(pack("H*", md5($password)));
-        }
-
-        /** Create a new User in the database 
-         * @param $id The id to be given to the new user
-         * @return the newly created User object, or null if there was an error
-         */
-        static function createUser($id, $username, $account_origin, $email, $password)
-        {
-                global $db;
-
-                $object = null;
-                $id_str = $db->EscapeString($id);
-                $username_str = $db->EscapeString($username);
-                $account_origin_str = $db->EscapeString($account_origin);
-                $email_str = $db->EscapeString($email);
                 /**
                  * utf8_decode is used for backward compatibility with old passwords
@@ -152 +136 @@
                  * Conversion from UTF-8 to ISO-8859-1 is done to match the MD5 hash
                  */
-                $password_hash = $db->EscapeString(User :: passwordHash(utf8_decode($password)));
+                return base64_encode(pack("H*", md5(utf8_decode($password))));
+        }
+
+        /** Create a new User in the database 
+         * @param $id The id to be given to the new user
+         * @return the newly created User object, or null if there was an error
+         */
+        static function createUser($id, $username, Network $account_origin, $email, $password)
+        {
+                global $db;
+
+                $object = null;
+                $id_str = $db->EscapeString($id);
+                $username_str = $db->EscapeString($username);
+                $account_origin_str = $db->EscapeString($account_origin->getId());
+                $email_str = $db->EscapeString($email);
+
+                $password_hash = $db->EscapeString(User :: passwordHash($password));
                 $status = ACCOUNT_STATUS_VALIDATION;
                 $token = User :: generateToken();
@@ -241 +242 @@
         }
 
+/** get the hashed password stored in the database */
         public function getPasswordHash()
         {
@@ -378 +380 @@
                 global $db;
 
-                $new_password_hash = User :: passwordHash(utf8_decode($password));
+                $new_password_hash = User :: passwordHash($password);
                 if (!($update = $db->ExecSqlUpdate("UPDATE users SET pass='$new_password_hash' WHERE user_id='{$this->id}'")))
                 {
@@ -575 +577 @@
                         {
                                 $username = $_REQUEST[$name];
-                                return self :: getUserByUsernameAndOrigin($username, $network->GetId());
+                                return self :: getUserByUsernameAndOrigin($username, $network);
                         }
                         else

trunk/wifidog-auth/wifidog/install.php

@@ -1172 +1172 @@
       require_once BASEPATH.'classes/User.php';
 
-      $created_user = User :: CreateUser(get_guid(), $username, 'LOCAL_USER', $email, $password);
+      $created_user = User :: createUser(get_guid(), $username, Network::getDefaultNetwork(), $email, $password);
       $user_id = $created_user->getId();
 

trunk/wifidog-auth/wifidog/lib/RssPressReview/RssPressReview.php

@@ -656 +656 @@
                                                 text-decoration: none;
                                                 /*border: 1px solid black*/ }
-                                                /*.rpr_expand_switch:before { content: "+"; }*/
                                                 
                                                 .rpr_popup_inner_div { 
-                                                z-index: 1000;
-                                                display: inline;
                                                 padding: 0.5em;
                                                 border: 2px outset #324C48;
@@ -670 +667 @@
                                                 width: 350px;
                                                 -moz-opacity: 0.95; filter: alpha(opacity=95);
+                                                z-index: 1;
                                                 }
                                                 
@@ -678 +676 @@
                                                 background-color: #f9f9f9;
                                                 } 
+
                                                 .rpr_popup_outer_div { 
-                                                z-index: 1000;
                                                  position: relative;
-                                                 display: inline;
                                                 }
                                                 
@@ -768 +765 @@
                                                 $feed_html .= "</span></p>\n";
                                                 $feed_html .= "<div class='rpr_popup_outer_div'>\n";
+                                                $class = 'rpr_popup_inner_div';
                                                 $item['rpr_is_today'] ? $class = 'rpr_popup_inner_div_expanded' : $class = 'rpr_popup_inner_div';
-                                                $feed_html .= "<div class='$class' id='$dhtml_id'>\n";
+                                                $style = '';
+                                                //$item['rpr_is_today'] ? $style = 'z-index: 1000;' : $style = '';
+                                                $item['rpr_is_today'] ? $script= "changestyle('$dhtml_id','visible');" : $script = '';
+                                                $feed_html .= "<div class='$class' style='$style' id='$dhtml_id'>\n";
+                                                //$feed_html .= "<script type=\"text/javascript\">$script</script>\n";
                                                 $feed_html .= "<p class='rpr_text'>{$item['rpr_author']} ({$feed['channel']['title']}) $display_date</p>\n";
                                                 $summary = strip_tags($item['rpr_content'], "<br><p><a><img><b><i>");

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

@@ -21 +21 @@
  \********************************************************************/
 /**@file
- * Login page
+ * Login page, will both display the login page, and process login and logout
+ * requests.
  * @author Copyright (C) 2004 Benoit Grégoire et Philippe April
  */
@@ -32 +33 @@
 require_once BASEPATH.'classes/Network.php';
 
-// Logout process
-if ((!empty ($_REQUEST['logout']) && $_REQUEST['logout'] == true) && ($user = User::getCurrentUser()) != null)
-{
-    $user->logout();
-}
+
+/* Start general request parameter processing section */
+$node = null;
+if (!empty ($_REQUEST['gw_id']))
+{
+        $gw_id = $_REQUEST['gw_id'];
+
+        try
+        {
+                $node = Node :: getObject($_REQUEST['gw_id']);
+                $hotspot_name = $node->getName();
+                $network = $node->getNetwork();
+        }
+        catch (Exception $e)
+        {
+                $smarty->assign("error", $e->getMessage());
+                $smarty->display("templates/generic_error.html");
+                exit;
+        }
+}
+else
+{
+        /* Gateway ID is not set... Virtual login */
+        $network = Network::getCurrentNetwork();
+}
+
+isset ($_REQUEST["username"]) && $username = $_REQUEST["username"];
+isset ($_REQUEST["gw_address"]) && $gw_address = $_REQUEST['gw_address'];
+isset ($_REQUEST["gw_port"]) && $gw_port = $_REQUEST['gw_port'];
+isset ($_REQUEST["gw_id"]) && $gw_id = $_REQUEST['gw_id'];
+
+isset ($_REQUEST["gw_address"]) && $session->set(SESS_GW_ADDRESS_VAR, $_REQUEST['gw_address']);
+isset ($_REQUEST["gw_port"]) && $session->set(SESS_GW_PORT_VAR, $_REQUEST['gw_port']);
+isset ($_REQUEST["gw_id"]) && $session->set(SESS_GW_ID_VAR, $_REQUEST['gw_id']);
 
 // Store original URL typed by user.
@@ -44 +74 @@
         $session->set(SESS_ORIGINAL_URL_VAR, $_REQUEST['url']);
 }
-
-// Actual login process
+/* End general request parameter processing section */
+
+/* Start login process section.
+ * If  successfull, the browser is redirected to another page */
+
+/*  If this is a splash-only node, skip the login interface and log-in using the splash_only user */ 
+if($node && $node->isSplashOnly())
+{
+        $user = getSplashOnlyUser();
+        $token = $user->generateConnectionToken();
+        User::setCurrentUser($user);
+        header("Location: http://".$_REQUEST['gw_address'].":".$_REQUEST['gw_port']."/wifidog/auth?token=$token");
+}
+
+/* Normal login process */
 if (!empty ($_REQUEST['username']) && !empty ($_REQUEST['password']) && !empty ($_REQUEST['auth_source']))
 {
+
         $errmsg = '';
         $username = $db->EscapeString($_REQUEST['username']);
@@ -57 +101 @@
         if ($user != null)
         {
-                if (isset ($_REQUEST['gw_address']) && isset ($_REQUEST['gw_port']) && ($token = $user->generateConnectionToken()))
+                if (isset ($_REQUEST['gw_address']) && isset ($_REQUEST['gw_port']))
                 {
+                        /* Login from a gateway, redirect to the gateway to activate the token */
+                        $token = $user->generateConnectionToken();
                         header("Location: http://".$_REQUEST['gw_address'].":".$_REQUEST['gw_port']."/wifidog/auth?token=$token");
                 }
                 else
                 {
-                        /* Virtual login */
-                        header("Location: ".BASE_NON_SSL_PATH);
+                        /* Virtual login, redirect to the auth server homepage */
+                        header("Location: ".BASE_SSL_PATH);
                 }
                 exit;
@@ -75 +121 @@
 else
 {
+        //Note that this is executed even when we have just arrived at the login page, so the user is reminded to supply a username and password
         $error = _('Your must specify your username and password');
 }
-
-$node = null;
-if (!empty ($_REQUEST['gw_id']))
-{
-        $gw_id = $_REQUEST['gw_id'];
-
-        try
-        {
-                $node = Node :: getObject($_REQUEST['gw_id']);
-                $hotspot_name = $node->getName();
-                $network = $node->getNetwork();
-        }
-        catch (Exception $e)
-        {
-                $smarty->assign("error", $e->getMessage());
-                $smarty->display("templates/generic_error.html");
-                exit;
-        }
-}
-else
-{
-        /* Gateway ID is not set... Virtual login */
-        $network = Network::getCurrentNetwork();
-}
-
-isset ($_REQUEST["username"]) && $username = $_REQUEST["username"];
-isset ($_REQUEST["gw_address"]) && $gw_address = $_REQUEST['gw_address'];
-isset ($_REQUEST["gw_port"]) && $gw_port = $_REQUEST['gw_port'];
-isset ($_REQUEST["gw_id"]) && $gw_id = $_REQUEST['gw_id'];
-
-isset ($_REQUEST["gw_address"]) && $session->set(SESS_GW_ADDRESS_VAR, $_REQUEST['gw_address']);
-isset ($_REQUEST["gw_port"]) && $session->set(SESS_GW_PORT_VAR, $_REQUEST['gw_port']);
-isset ($_REQUEST["gw_id"]) && $session->set(SESS_GW_ID_VAR, $_REQUEST['gw_id']);
-
+/* End login process section.*/
+
+/* Start logout process section.
+ * Once logged out, we display the login page */
+if ((!empty ($_REQUEST['logout']) && $_REQUEST['logout'] == true) && ($user = User::getCurrentUser()) != null)
+{
+    $user->logout();
+}
+/* End logout process section. */
+
+/* Start login interface section */
 $html = '';
 $html .= '<div id="form">'."\n";
@@ -141 +165 @@
 $html .= _("Password").':<br>'."\n";
 $html .= '<input type="password" name="password" size="20"><br>'."\n";
+if ($error)
+{
+        $html .= '<div class="errormsg">'."\n";
+        $html .= "$error\n";
+        $html .= '</div>'."\n";
+}
+
 $html .= '<input class="submit" type="submit" name="submit" value="'._("Login").'"><br>'."\n";
 ;
@@ -163 +194 @@
 $html .= '</div>'."\n";
 
-if ($error)
-{
-        $html .= '<div id="help">'."\n";
-        $html .= "$error\n";
-        $html .= '</div>'."\n";
-}
-
 // HTML body
 $hotspot_network_name = $network->getName();
@@ -190 +214 @@
 $ui->setMainContent($html_body);
 $ui->display();
+/* End login interface section */
 ?>

trunk/wifidog-auth/wifidog/signup.php

@@ -97 +97 @@
                         throw new Exception(_("Sorry, a user account is already associated to this email address."));
 
-                $created_user = User :: CreateUser(get_guid(), $username, $account_origin, $email, $password);
+                $created_user = User :: createUser(get_guid(), $username, $account_origin, $email, $password);
                 $created_user->sendValidationEmail();
                 
@@ -112 +112 @@
                 
                 // Make sure the user IDs match
-                        if(($created_user->getId() == $authenticated_user->getId()) && ($token = $created_user->generateConnectionToken()))
+                        if(($created_user->getId() == $authenticated_user->getId()))
                         {
+                                $token = $created_user->generateConnectionToken();
                                 header("Location: http://{$gw_address}:{$gw_port}/wifidog/auth?token={$token}");
                         }