Changeset 1018

Timestamp:

04/23/06 10:09:18 (7 years ago)

Author:

rob_janes

Message:

* javascript for validating and navigating forms.
* help text (untranslated).
* EVENT_LOGGING enabling/disabling flag.
* use SYSTEM_PATH instead of BASE_URL_PATH and BASE_SSL_PATH where ever appropriate.
* standardize Smarty variables for Network and User info by adding assignSmartyValues($smarty, $self) to Network and User.
* change_password only allowed if logged in.
* non-superadmin can only use change_password to change their own password.
* superadmin can use change_password to change any user password by entering in their password for the old password.
* page_header div defined and positioned in MainUI

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/auth/index.php (modified) (2 diffs)
• wifidog/change_password.php (modified) (3 diffs)
• wifidog/classes/MainUI.php (modified) (11 diffs)
• wifidog/classes/Network.php (modified) (1 diff)
• wifidog/classes/NodeLists/NodeListRSS.php (modified) (2 diffs)
• wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• wifidog/classes/User.php (modified) (1 diff)
• wifidog/help.php (added)
• wifidog/include/common.php (modified) (2 diffs)
• wifidog/include/path_defines_url_content.php (modified) (4 diffs)
• wifidog/index.php (modified) (2 diffs)
• wifidog/js/formutils.js (added)
• wifidog/local_content/default/stylesheet.css (modified) (3 diffs)
• wifidog/locale/de/LC_MESSAGES/messages.po (modified) (1 diff)
• wifidog/locale/fr/LC_MESSAGES/messages.po (modified) (1 diff)
• wifidog/locale/pt/LC_MESSAGES/messages.po (modified) (1 diff)
• wifidog/login/index.php (modified) (12 diffs)
• wifidog/lost_password.php (modified) (1 diff)
• wifidog/lost_username.php (modified) (1 diff)
• wifidog/resend_validation.php (modified) (2 diffs)
• wifidog/signup.php (modified) (5 diffs)
• wifidog/templates/change_password.html (modified) (1 diff)
• wifidog/templates/classes/MainUI_Display.tpl (modified) (2 diffs)
• wifidog/templates/classes/MainUI_ToolContent.tpl (modified) (3 diffs)
• wifidog/templates/classes/MainUI_ToolSection.tpl (modified) (4 diffs)
• wifidog/templates/sites/help.tpl (added)
• wifidog/templates/sites/index.tpl (modified) (2 diffs)
• wifidog/templates/sites/login.tpl (modified) (3 diffs)
• wifidog/templates/sites/lost_password.tpl (modified) (4 diffs)
• wifidog/templates/sites/lost_username.tpl (modified) (4 diffs)
• wifidog/templates/sites/resend_validation.tpl (modified) (4 diffs)
• wifidog/templates/sites/signup.tpl (modified) (2 diffs)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-04-17 Rob Janes <janes.rob@gmail.com>
+        * javascript for validating and navigating forms.
+        * help text (untranslated).
+        * EVENT_LOGGING enabling/disabling flag.
+        * use SYSTEM_PATH instead of BASE_URL_PATH and BASE_SSL_PATH where ever appropriate.
+        * standardize Smarty variables for Network and User info by adding assignSmartyValues($smarty, $self) to Network and User.
+        * change_password only allowed if logged in.
+        * non-superadmin can only use change_password to change their own password.
+        * superadmin can use change_password to change any user password by entering in their password for the old password.
+        * page_header div defined and positioned in MainUI
+
 2006-04-04 Benoit Grégoire  <bock@step.polymtl.ca>
         * /classes/Content/IFrame/IFrame.php: Change a few methods from private to protected as the private methods broke IFrameRest

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

@@ -71 +71 @@
     if (!$authenticator)
     {
-        $auth_message .= "| Error: Unable to instanciate authenticator. ";
+        $auth_message .= "| Error: Unable to instantiate authenticator. ";
         $auth_response = ACCOUNT_STATUS_ERROR;
     }
@@ -97 +97 @@
             }
             else
-                if ($info['token_status'] == TOKEN_INUSE && $info['gw_id'] == $_REQUEST['gw_id'] && $info['mac'] == $_REQUEST['mac'] && $info['ip'] == $_REQUEST['ip'])
+                if ($info['token_status'] == TOKEN_INUSE &&
+                                        isset($info['gw_id']) && isset($_REQUEST['gw_id']) && $info['gw_id'] == $_REQUEST['gw_id'] &&
+                                        isset($info['mac']) && isset($_REQUEST['mac']) && $info['mac'] == $_REQUEST['mac'] &&
+                                        isset($info['ip']) && isset($_REQUEST['ip']) && $info['ip'] == $_REQUEST['ip'])
                 {
                     // This solves the bug where the user clicks twice before getting the portal page

trunk/wifidog-auth/wifidog/change_password.php

@@ -55 +55 @@
 require_once('classes/User.php');
 
-isset($_REQUEST["username"]) && $smarty->assign("username", $_REQUEST["username"]);
+$smarty->assign('error', '');
 
-if (isset($_REQUEST["submit"])) {
+$smarty->assign('username', '');
+$smarty->assign('oldpassword', '');
+$smarty->assign('newpassword', '');
+$smarty->assign('newpassword_again', '');
+
+$user = User::getCurrentUser();
+if ($user) {
+        User::assignSmartyValues($smarty, $user);
+
+        if ($user->isSuperAdmin() && isset($_REQUEST['username'])) {
+                $smarty->assign('username', $_REQUEST['username']);
+                $username = $_REQUEST['username'];
+        }
+        else
+                $username = $user->getUsername();
+
+        // $user->getEmail();
+        // $user->getRealName();
+        // $user->getWebsiteURL();
+        // $user->isSuperAdmin();
+        // $user->isOwner();
+}
+else {
+        $smarty->assign('error', _("You must login before you can change your password."));
+}
+
+if ($user && isset($_REQUEST["form_request"])) {
     try {
         // If the source is present and that it's in our, save it to a var for later use
@@ -64 +90 @@
         if (!$account_origin || !$_REQUEST["username"] || !$_REQUEST["oldpassword"] || !$_REQUEST["newpassword"] || !$_REQUEST["newpassword_again"])
             throw new Exception(_('You MUST fill in all the fields.'));
-        $username = $db->escapeString(trim($_REQUEST['username']));
+
         $current_password = $db->escapeString(trim($_REQUEST['oldpassword']));
         $new_password = $db->escapeString(trim($_REQUEST['newpassword']));
@@ -75 +101 @@
 
         // Warning for now, password change only works for local users, registered through our signup process.
-        $user = User::getUserByUsernameAndOrigin($username, $account_origin);
-        if ($user->getPasswordHash() != User::passwordHash($current_password))
-            throw new Exception(_("Wrong password."));
+                if ($username == $user->getUsername()) {
+                        $victim = $user;
 
-        $user->SetPassword($new_password);
+                        if ($victim->getPasswordHash() != User::passwordHash($current_password))
+                                throw new Exception(_("Wrong password."));
+
+                        $victim->setPassword($new_password);
+                        $smarty->assign("message", _("Your password has been changed succesfully."));
+                }
+                else {
+                        if ($user->isSuperAdmin()) {
+                                $username =  $db->escapeString(trim($_REQUEST['username']));
+                                $victim = User::getUserByUsernameAndOrigin($username, $account_origin);
+
+                                if (!$victim)
+                                        throw new Exception(sprintf(_('Sorry, user %s does not exist !'), $username));
+
+                                if ($victim->getPasswordHash() != User::passwordHash($current_password)
+                                        && $user->getPasswordHash() != User::passwordHash($current_password))
+                                        throw new Exception(_("Wrong password."));
+
+                                $victim->setPassword($new_password);
+                                $smarty->assign("message", sprintf(_('The password for %s has been successfully changed.'), $username));
+                        }
+                        else {
+                                throw new Exception(_('Sorry, invalid change password request !'));
+                        }
+                }
+
         $ui = new MainUI();
-        $smarty->assign("message", _("Your password has been changed succesfully."));
         $ui->appendContent('main_area_middle', $smarty->fetch("templates/sites/validate.tpl"));
         $ui->display();
+
         exit;
     } catch (Exception $e) {

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

@@ -130 +130 @@
     private $footer_scripts = array ();
 
+        private $shrink_left_area = false;
+
     /**
      * Contructor
@@ -205 +207 @@
         $this->title = $title_string;
     }
+
+    public function shrinkLeftArea() {
+                $this->shrink_left_area = true;
+        }
 
     /**
@@ -280 +286 @@
 
                     // Init ALL smarty values
-                    $this->smarty->assign('isSuperAdmin', false);
-                    $this->smarty->assign('isOwner', false);
+                                        User::assignSmartyValues($this->smarty, $_currentUser);
                     $this->smarty->assign('formAction', "");
                     $this->smarty->assign('nodeUI', "");
                     $this->smarty->assign('networkUI', "");
-
-                    // Define user security levels for the template
-                    $this->smarty->assign('isSuperAdmin', $_currentUser && $_currentUser->isSuperAdmin());
-                    $this->smarty->assign('isOwner', $_currentUser && $_currentUser->isOwner());
 
                     /*
@@ -359 +360 @@
                 $_currentUser = User :: getCurrentUser();
 
-                // Init ALL smarty values
-                $this->smarty->assign('networkHomepageURL', "");
-                $this->smarty->assign('networkName', "");
-                $this->smarty->assign('isValidUser', false);
-                $this->smarty->assign('username', "");
+                                User::assignSmartyValues($this->smarty, $_currentUser);
+
                 $this->smarty->assign('logoutParameters', "");
                 $this->smarty->assign('loginParameters', "");
@@ -370 +368 @@
                 $this->smarty->assign('accountInformation', "");
                 $this->smarty->assign('techSupportInformation', "");
+                $this->smarty->assign('shrinkLeftArea', $this->shrink_left_area);
 
                 // Provide Smarty with information about the network
-                $this->smarty->assign('networkHomepageURL', Network :: getCurrentNetwork()->getHomepageURL());
-                $this->smarty->assign('networkName', Network :: getCurrentNetwork()->getName());
+                                Network::assignSmartyValues($this->smarty);
 
                 /*
@@ -381 +379 @@
                 if ($_currentUser != null) {
                     // User is logged in
-                    $this->smarty->assign('isValidUser', true);
-
-                    // Set username for Smarty
-                    $this->smarty->assign('username', $_currentUser->getUsername());
 
                     // Detect gateway information
@@ -447 +441 @@
      *
      * @access public
-     * @internal Uses a few request parameters to displaty debug information.
+     * @internal Uses a few request parameters to display debug information.
      * If $_REQUEST['debug_request'] is present, it will print out the
      * $_REQUEST array at the top of the page.
@@ -460 +454 @@
         $this->smarty->assign('stylesheetURL', "");
         $this->smarty->assign('stylesheetParsedFile', "");
-        $this->smarty->assign('isSuperAdmin', false);
-        $this->smarty->assign('isOwner', false);
+        // $this->smarty->assign('isSuperAdmin', false);
+        // $this->smarty->assign('isOwner', false);
         $this->smarty->assign('debugRequested', false);
         $this->smarty->assign('debugOutput', "");
@@ -496 +490 @@
 
         // Get information about user
-        $_currentUser = User :: getCurrentUser();
-
-        // Define user security levels for the template
-        $this->smarty->assign('isSuperAdmin', $_currentUser && $_currentUser->isSuperAdmin());
-        $this->smarty->assign('isOwner', $_currentUser && $_currentUser->isOwner());
-
-        if (isset ($_REQUEST['debug_request']) && ($_currentUser && $_currentUser->isSuperAdmin())) {
-            // Tell Smarty everything it needs to know
-            $this->smarty->assign('debugRequested', true);
-            $this->smarty->assign('debugOutput', print_r($_REQUEST, true));
-        }
+                User::assignSmartyValues($this->smarty);
+
+                $this->appendContent('page_header', $this->customBanner());
 
         /*
@@ -537 +523 @@
      */
     function displayError($errmsg, $show_tech_support_email = true) {
-            // Init ALL smarty values
-    $this->smarty->assign("error", "");
+        // Init ALL smarty values
+        $this->smarty->assign("error", "");
         $this->smarty->assign("show_tech_support_email", false);
         $this->smarty->assign("tech_support_email", "");
@@ -559 +545 @@
     }
 
+        static public function redirect($redirect_url, $redirect_to_title=null, $timeout=60) {
+                if (!$redirect_to_title) {
+                        $network = Network :: getCurrentNetwork();
+                        $redirect_to_title = $network ? sprintf(_("%s Login"), $network->getName()) : _("Login");
+                }
+
+                header("Location: $redirect_url");
+                echo "<html>\n" .
+                        "<head><meta http-equiv='Refresh' content='$timeout; URL=$redirect_url'/></head>\n".
+                        "<body>\n" .
+                        "<noscript>\n" .
+                        "<span style='display:none;'>\n" .
+                        "<h1>" . $redirect_to_title . "</h1>\n" .
+                        sprintf(_("Click <a href='%s'>here</a> to continue"), $redirect_url) . "<br/>\n" .
+                        _("The transfer from secure login back to regular http may cause a warning.") . "\n" .
+                        "</span>\n" .
+                        "</noscript>\n" .
+                        "</body>\n" .
+                        "</html>\n"
+                        ;
+                exit;
+        }
+
+        public function customBanner() {
+                $custom_banner = '';
+
+                return $custom_banner;
+        }
 }
 

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

@@ -1627 +1627 @@
         }
 
+        public static function assignSmartyValues($smarty, $net=null) {
+                if (!$net) $net = Network::getCurrentNetwork();
+
+                $smarty->assign('networkName', $net ? $net->getName() : '');
+                $smarty->assign('networkHomepageURL', $net ? $net->getHomepageURL() : '');
+                // Set networks usage information
+                $smarty->assign('networkNumValidUsers', $net ? $net->getNumValidUsers() : 0);
+                $smarty->assign('networkNumOnlineUsers', $net ? $net->getNumOnlineUsers() : 0);
+
+                // Set networks node information
+                $smarty->assign('networkNumDeployedNodes', $net ? $net->getNumDeployedNodes() : 0);
+                $smarty->assign('networkNumOnlineNodes', $net ? $net->getNumOnlineNodes() : 0);
+        }
 }
 

trunk/wifidog-auth/wifidog/classes/NodeLists/NodeListRSS.php

@@ -247 +247 @@
 
         // image
-        if (file_exists(WIFIDOG_ABS_FILE_PATH . "local_content/common/" . NETWORK_LOGO_NAME)) {
+        if (defined('NETWORK_LOGO_NAME') && file_exists(WIFIDOG_ABS_FILE_PATH . "local_content/common/" . constant('NETWORK_LOGO_NAME'))) {
             $_image = $this->_xmldoc->createElement("image");
             $_channel->appendChild($_image);
@@ -320 +320 @@
                 if ($_node->getDeploymentStatus() != 'NON_WIFIDOG_NODE') {
                     if ($_nodeData['is_up'] == 't') {
-                        $_descriptionText .= "<img src='" . BASE_URL_PATH . "images/HotspotStatus/up.gif' alt='' />";
+                        $_descriptionText .= "<img src='" . SYSTEM_PATH . "images/HotspotStatus/up.gif' alt='' />";
                     } else {
-                        $_descriptionText .= "<img src='" . BASE_URL_PATH . "images/HotspotStatus/down.gif' alt='' />";
+                        $_descriptionText .= "<img src='" . SYSTEM_PATH . "images/HotspotStatus/down.gif' alt='' />";
                     }
                 }

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

@@ -121 +121 @@
 /* Useful stuff from config.php */
 
+        $this->assign('system_path', SYSTEM_PATH);
         $this->assign('base_url_path', BASE_URL_PATH);
         $this->assign('base_ssl_path', BASE_SSL_PATH);

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

@@ -810 +810 @@
     }
 
+    /** Set Smarty template values.  Standardization routine. */
+        public static function assignSmartyValues($smarty, $user=null) {
+                if (!$user) $user = User::getCurrentUser();
+                $smarty->assign('username', $user ? $user->getUsername() : '');
+
+                /**
+                 * Define user security levels for the template
+                 *
+                 * These values are used in the default template of WiFoDog but could be
+                 * used in a customized template to restrict certain links to specific
+                 * user access levels.
+                 */
+                $smarty->assign('isValidUser', $user ? true : false);
+                $smarty->assign('isSuperAdmin', $user && $user->isSuperAdmin());
+                $smarty->assign('isOwner', $user && $user->isOwner());
+
+        if (isset ($_REQUEST['debug_request']) && ($user && $user->isSuperAdmin())) {
+            // Tell Smarty everything it needs to know
+            $smarty->assign('debugRequested', true);
+            $smarty->assign('debugOutput', print_r($_REQUEST, true));
+        }
+        }
 }
 

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

@@ -72 +72 @@
 require_once('classes/EventLogging.php');
 
-EventLogging::SetupErrorHandling( "strict~/var:\sDeprecated/(off)",
-                                                                  array( 'print' => new PrintChannel(new HTMLFormatter(), 'warning,notice', null, true),
-                                                                                 'debug' => new PrintChannel(new HTMLCommentsFormatter(), '=debug', null, false) )
-                                                                  );
+if (!defined('EVENT_LOGGING') || constant('EVENT_LOGGING')) {
+        EventLogging::SetupErrorHandling( "strict~/var:\sDeprecated/(off)",
+                                                                          array( 'print' => new PrintChannel(new HTMLFormatter(), 'warning,notice', null, true),
+                                                                                         'debug' => new PrintChannel(new HTMLCommentsFormatter(), '=debug', null, false) )
+                                                                          );
+}
 require_once('classes/AbstractDb.php');
 require_once('classes/Locale.php');
@@ -371 +373 @@
 }
 
-$myLogfile = !defined('WIFIDOG_LOGFILE') ? "tmp/wifidog.log" : constant('WIFIDOG_LOGFILE');
-if (!empty($myLogfile)) {
-        if (substr($myLogfile,0,1) != '/') $myLogfile = WIFIDOG_ABS_FILE_PATH.$myLogfile;
+if (!defined('EVENT_LOGGING') || constant('EVENT_LOGGING')) {
+        $myLogfile = !defined('WIFIDOG_LOGFILE') ? "tmp/wifidog.log" : constant('WIFIDOG_LOGFILE');
+        if (!empty($myLogfile)) {
+                if (substr($myLogfile,0,1) != '/') $myLogfile = WIFIDOG_ABS_FILE_PATH.$myLogfile;
         
-        EventLogging::stAddChannel( new FileChannel($myLogfile, new WifidogSyslogFormatter(), 'warning,notice'), 'logfile' );
-}
-
-// trigger_error("here i am", E_USER_NOTICE);
+                EventLogging::stAddChannel( new FileChannel($myLogfile, new WifidogSyslogFormatter(), 'warning,notice'), 'logfile' );
+        }
+
+        // trigger_error("here i am", E_USER_NOTICE);
+}
 
 /*

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

@@ -52 +52 @@
 //echo "<pre>";print_r($_SERVER);echo "</pre>";
 
-$curent_url = 'http';
+$current_url = 'http';
 if ($_SERVER['SERVER_PORT'] == '443') {
-    $curent_url .= 's';
+    $current_url .= 's';
 }
-$curent_url .= '://'.$_SERVER['HTTP_HOST'];
+$current_url .= '://'.$_SERVER['HTTP_HOST'];
 if ($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
-    $curent_url .= ':'.$_SERVER['SERVER_PORT'];
-$curent_url .= $_SERVER['REQUEST_URI'];
+    $current_url .= ':'.$_SERVER['SERVER_PORT'];
+$current_url .= $_SERVER['REQUEST_URI'];
 
 /**
  * Define current request URL
  */
-define('CURRENT_REQUEST_URL', $curent_url);
+define('CURRENT_REQUEST_URL', $current_url);
 
 if (SSL_AVAILABLE) {
@@ -82 +82 @@
 
 /* If we actually ARE in SSL mode, make all URLS http:// to avoid security warnings. */
-if (isset ($_SERVER['HTTPS'])) {
-    /**
-     * Define base web address to use (this time using SLL)
-     */
-    define('BASE_URL_PATH', BASE_SSL_PATH);
-}
-else {
+// no no no just use the SYSTEM_PATH ... use /login/index.php rather than http://auth.wirelesstoronto.ca/login/index.php
+// if (isset ($_SERVER['HTTPS'])) {
+//    /**
+//     * Define base web address to use (this time using SLL)
+//     */
+//    define('BASE_URL_PATH', BASE_SSL_PATH);
+// }
+// else {
     /**
      * Define base web address to use
@@ -95 +96 @@
      */
     define('BASE_URL_PATH', BASE_NON_SSL_PATH);
-}
+// }
 
 /**
@@ -118 +119 @@
  * Define URLs
  */
-define('NODE_CONTENT_URL', BASE_URL_PATH.LOCAL_CONTENT_REL_PATH.CURRENT_NODE_ID.'/');
+// define('NODE_CONTENT_URL', BASE_URL_PATH.LOCAL_CONTENT_REL_PATH.CURRENT_NODE_ID.'/');
+define('NODE_CONTENT_URL', SYSTEM_PATH.LOCAL_CONTENT_REL_PATH.CURRENT_NODE_ID.'/');
 define('NODE_CONTENT_PHP_RELATIVE_PATH', LOCAL_CONTENT_REL_PATH.CURRENT_NODE_ID.'/');
 
-define('COMMON_CONTENT_URL', BASE_URL_PATH.LOCAL_CONTENT_REL_PATH.'common/');
+// define('COMMON_CONTENT_URL', BASE_URL_PATH.LOCAL_CONTENT_REL_PATH.'common/');
+define('COMMON_CONTENT_URL', SYSTEM_PATH.LOCAL_CONTENT_REL_PATH.'common/');
 
-define('GENERIC_OBJECT_ADMIN_ABS_HREF', BASE_URL_PATH.'admin/generic_object_admin.php');
-define('CONTENT_ADMIN_ABS_HREF', BASE_URL_PATH.'admin/content_admin.php');
+// define('GENERIC_OBJECT_ADMIN_ABS_HREF', BASE_URL_PATH.'admin/generic_object_admin.php');
+define('GENERIC_OBJECT_ADMIN_ABS_HREF', SYSTEM_PATH.'admin/generic_object_admin.php');
+// define('CONTENT_ADMIN_ABS_HREF', BASE_URL_PATH.'admin/content_admin.php');
+define('CONTENT_ADMIN_ABS_HREF', SYSTEM_PATH.'admin/content_admin.php');
 
 ?>

trunk/wifidog-auth/wifidog/index.php

@@ -63 +63 @@
 
 // Init ALL smarty values
-$smarty->assign('isSuperAdmin', false);
-$smarty->assign('isOwner', false);
-$smarty->assign('networkName', "");
-$smarty->assign('networkNumValidUsers', 0);
-$smarty->assign('networkNumOnlineUsers', 0);
-$smarty->assign('networkNumDeployedNodes', 0);
-$smarty->assign('networkNumOnlineNodes', 0);
 $smarty->assign('googleMapsEnabled', false);
 
 // Get information about network
 $network = Network::getCurrentNetwork();
+Network::assignSmartyValues($smarty, $network);
 
 // Get information about user
-$currentUser = User::getCurrentUser();
-
-/**
- * Define user security levels for the template
- *
- * These values are used in the default template of WiFoDog but could be used
- * in a customized template to restrict certain links to specific user
- * access levels.
- */
-$smarty->assign('isSuperAdmin', $currentUser && $currentUser->isSuperAdmin());
-$smarty->assign('isOwner', $currentUser && $currentUser->isOwner());
+User::assignSmartyValues($smarty);
 
 /*
@@ -108 +92 @@
 // Set section of Smarty template
 $smarty->assign('sectionMAINCONTENT', true);
-
-// Set networks information
-$smarty->assign('networkName', $network->getName());
-
-// Set networks user information
-$smarty->assign('networkNumValidUsers', $network->getNumValidUsers());
-$smarty->assign('networkNumOnlineUsers', $network->getNumOnlineUsers());
-
-// Set networks node information
-$smarty->assign('networkNumDeployedNodes', $network->getNumDeployedNodes());
-$smarty->assign('networkNumOnlineNodes', $network->getNumOnlineNodes());
 
 // Set Google maps information

trunk/wifidog-auth/wifidog/local_content/default/stylesheet.css

@@ -11 +11 @@
 .bodyBackColor {
 {/literal}
-        background : #dbffa8 url({$base_url_path}images/bg_body.gif) repeat-x fixed 0px 0px;
+        background : #dbffa8 url({$system_path}images/bg_body.gif) repeat-x fixed 0px 0px;
 {literal}
 }
@@ -17 +17 @@
 div.navigation {
 {/literal}
-        background-image: url({$base_url_path}images/01_nav.gif);
+        background-image: url({$system_path}images/01_nav.gif);
 {literal}
 }
@@ -23 +23 @@
 div.avis{
 {/literal}
-        background-image: url({$base_url_path}images/03_avis.gif);
+        background-image: url({$system_path}images/03_avis.gif);
 {literal}
 }

trunk/wifidog-auth/wifidog/locale/de/LC_MESSAGES/messages.po

@@ -1611 +1611 @@
 
 #: ../login/index.php:124 ../login/index.php:125 ../login/index.php:197
-msgid "Your must specify your username and password"
+msgid "You must specify your username and password"
 msgstr "Sie müssen ihren Benutzernamen und ihr Passwort angeben"
 

trunk/wifidog-auth/wifidog/locale/fr/LC_MESSAGES/messages.po

@@ -3097 +3097 @@
 #: ../login/index.php:125
 #: ../login/index.php:197
-msgid "Your must specify your username and password"
+msgid "You must specify your username and password"
 msgstr "Veuillez entrer un nom d'usager et un mot de passe"
 

trunk/wifidog-auth/wifidog/locale/pt/LC_MESSAGES/messages.po

@@ -2566 +2566 @@
 
 #: ../login/index.php:124 ../login/index.php:125 ../login/index.php:197
-msgid "Your must specify your username and password"
+msgid "You must specify your username and password"
 msgstr "Você precisa especificar seu usuário e senha"
 

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

@@ -39 +39 @@
  * The login page will both display the login page, and process login and logout
  * request.
+ *
+ * Hotspots redirect newly active PCs to this page with this url:
+ * Refering to the wifidog.conf installed on the hotspot:
+ *
+ * {PROTOCOL}://{HOSTNAME}:{PORT}{PATH}login?gw_address=A&gw_port=P&gw_id=I&url=URL
+ *
+ * PROTOCOL, HOSTNAME, PORT and PATH refer to the settings for the hotspot's
+ * currently selected authserver.
+ * PROTOCOL http or https if SSLAvailable is yes for the hotspot's current authserver
+ * HOSTNAME Hostname of the current authserver
+ * PORT is HTTPPort or SSLPort of the current authserver
+ * PATH is the Path of the current authserver.  PATH starts and ends with a /
+ *
+ * gw_address is GatewayAddress from the config file
+ * gw_port is GatewayPort
+ * gw_id is GatewayID, is node id
+ * url is the original url requested but redirected here by the hotspot wifidog
+ *
+ * http://auth.wirelesstoronto.ca:80/login?gw_address=207.50.119.2&gw_port=2060&gw_id=215&url=http://hotmail.com
  *
  * @package    WiFiDogAuthServer
@@ -60 +79 @@
 require_once('classes/Network.php');
 require_once('classes/MainUI.php');
+// require_once('lib/magpie/rss_fetch.inc'); // Added so RSS code which depends on the Magpie RSS functions will work. //
 
 // Init values
@@ -70 +90 @@
 $logout = null;
 
+$create_a_free_account = _("Create a free account");
+
 /*
  * General request parameter processing section
@@ -101 +123 @@
 }
 
+if (isset($_REQUEST["form_signup"]) && $_REQUEST["form_signup"] == $create_a_free_account) {
+        MainUI::redirect(SYSTEM_PATH . "signup.php");
+        exit;
+}
+
 /*
  * Store original URL typed by user
@@ -119 +146 @@
     try {
         $node = Node::getObject($gw_id);
-        $hotspot_name = $node->getName();
-        $network = $node->getNetwork();
     }
 
@@ -128 +153 @@
         exit;
     }
+
+        $network = $node->getNetwork();
 } else {
     // Gateway ID is not set ... virtual login
     $network = Network::getCurrentNetwork();
-    $node = null;
+    $node = Node::getObject('default');
 }
 
@@ -160 +187 @@
  * Normal login process
  */
-if (!empty($username) && !empty($password)) {
-    // Init values
-    $errmsg = '';
-    // Authenticating the user through the selected auth source.
-    $network = Network::processSelectNetworkUI('auth_source');
-
-    $user = $network->getAuthenticator()->login($username, $password, $errmsg);
-
-    if ($user != null) {
-        if (!empty($gw_address) && !empty($gw_port)) {
-            // Login from a gateway, redirect to the gateway to activate the token
-            $token = $user->generateConnectionToken();
-
-            header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
-        } else {
-            // Virtual login, redirect to the auth server homepage
-            header("Location: " . BASE_SSL_PATH . ($continueToAdmin ? "admin/" : ""));
-        }
-
-        exit;
-    } else {
-        $error = $errmsg;
-    }
-} 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');
+if (isset ($_REQUEST["form_request"]) && $_REQUEST["form_request"] == "login") {
+        if (!empty($username) && !empty($password)) {
+                // Init values
+                $errmsg = '';
+                // Authenticating the user through the selected auth source.
+                $network = Network::processSelectNetworkUI('auth_source');
+
+                $user = $network->getAuthenticator()->login($username, $password, $errmsg);
+
+                if ($user != null) {
+                        if (!empty($gw_address) && !empty($gw_port)) {
+                                // Login from a gateway, redirect to the gateway to activate the token
+                                $token = $user->generateConnectionToken();
+
+                                header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
+                        } else {
+                                // Virtual login, redirect to the auth server homepage
+                                header("Location: " . BASE_SSL_PATH . ($continueToAdmin ? "admin/" : ""));
+                        }
+
+                        exit;
+                } else {
+                        $error = $errmsg;
+                }
+        }
 }
 
@@ -204 +227 @@
  */
  
-// Init ALL smarty values
-$smarty->assign('node', null);
-$smarty->assign('gwAddress', null);
-$smarty->assign('gwPort', null);
-$smarty->assign('gwId', null);
-$smarty->assign('origin', null);
-$smarty->assign('selectNetworkUI', null);
-$smarty->assign('username', null);
-$smarty->assign('error', null);
-
 /*
  * Tool content
@@ -225 +238 @@
 
 // Check if user wanted to enter the administration interface
-if (!empty($_REQUEST['origin'])) {
-    $smarty->assign('origin', $_REQUEST['origin']);
-}
+$smarty->assign('origin', empty($_REQUEST['origin']) ? null : $_REQUEST['origin']);
 
 // Set network selector
@@ -238 +249 @@
 $smarty->assign('error', !empty($error) ? $error : null);
 
+$smarty->assign('create_a_free_account', $create_a_free_account);
+
 // Compile HTML code
 $html = $smarty->fetch("templates/sites/login.tpl");
 
-
-
-
 $ui = new MainUI();
-if($node)
-{
-$ui->setTitle(sprintf(_("%s login page for %s"),$network->getName(), $node->getName()));
-}
-else
-{
+if($node) {
+        $ui->setTitle(sprintf(_("%s login page for %s"), $network->getName(), $node->getName()));
+} else {
     $ui->setTitle(_("Offsite login page"));
 }
 $ui->setPageName('login');
+$ui->shrinkLeftArea();
 $ui->appendContent('left_area_middle', $html);
+
 /*
  * Main content
@@ -290 +299 @@
 }
 
+$ui->appendContent('main_area_middle',
+        "\n<h1>" . sprintf(_("Welcome to the %s Hotspot network."), $network->getName()) . "</h1>\n" .
+
+        "<p>" .
+        _("Please use the login/signup form on the left to activate your connection with the internet.") .
+        "</p>\n".
+
+        "<p>" .
+        _("If you already have an account please use that to login.") . " " .
+        _("Thanks to the hospitality of your proprietor, this is a surfing free zone.") . " " .
+        _("Once you login you are welcome to use the internet as long as you like.") .
+        "</p>\n" .
+
+        "<p>" .
+        sprintf(_("If you are new to %s, please use the form on the left to create a new account."), $network->getName()) . " " .
+        _("There will be no charge for this service.") .
+        "</p>\n"
+);
+
 /*
  * Render output
@@ -302 +330 @@
  * End:
  */
+
+?>

trunk/wifidog-auth/wifidog/lost_password.php

@@ -72 +72 @@
 $smarty->assign('SelectNetworkUI', "");
 
-if (isset($_REQUEST['submit'])) {
+$smarty->assign('username', "");
+$smarty->assign('email', "");
+
+if (isset($_REQUEST['form_request'])) {
     $account_origin = Network::getObject($_REQUEST['auth_source']);
 

trunk/wifidog-auth/wifidog/lost_username.php

@@ -72 +72 @@
 $smarty->assign('SelectNetworkUI', "");
 
-if (isset($_REQUEST["submit"])) {
+$smarty->assign('email', "");
+
+if (isset($_REQUEST["form_request"])) {
     $account_origin = Network::getObject($_REQUEST['auth_source']);
 

trunk/wifidog-auth/wifidog/resend_validation.php

@@ -66 +66 @@
 
 // Init ALL smarty values
+$smarty->assign('username', "");
 $smarty->assign('message', "");
 $smarty->assign('error', "");
@@ -72 +73 @@
 $smarty->assign('SelectNetworkUI', "");
 
-if (isset($_REQUEST["submit"])) {
+if (isset($_REQUEST["form_request"])) {
     $account_origin = Network::getObject($_REQUEST['auth_source']);
 

trunk/wifidog-auth/wifidog/signup.php

@@ -161 +161 @@
 $smarty->assign('SelectNetworkUI', "");
 
-if (isset ($_REQUEST["submit"])) {
+if (isset ($_REQUEST["form_request"]) && $_REQUEST["form_request"] == "signup") {
     // Secure entered values
     $username = trim($_REQUEST['username']);
@@ -221 +221 @@
         $created_user->sendValidationEmail();
 
+                // Authenticate this new user automatically
+                $errmsg = "";
+                $authenticated_user = $network->getAuthenticator()->login($username, $password, $errmsg);
+
+                // While in validation period, alert user that he should validate his account ASAP
+                $validationMsgHtml = "<div id='warning_message_area'>\n";
+                $validationMsgHtml .= _("An email with confirmation instructions was sent to your email address.");
+                $validationMsgHtml .= sprintf(_("Your account has been granted %s minutes of access to retrieve your email and validate your account."), ($network->getValidationGraceTime() / 60));
+                $validationMsgHtml .= _('You may now open a browser window or start your email client and go to any remote Internet address to obtain the validation email.');
+                $validationMsgHtml .= "</div>\n";
+
         // If the user is at a REAL hotspot, give him his sign-up minutes right away
         $gw_id = $session->get(SESS_GW_ID_VAR);
@@ -227 +238 @@
 
         if ($gw_id && $gw_address && $gw_port) {
-            // Init values
-            $errmsg = "";
-
-            // Authenticate this new user automatically
-            $authenticated_user = $network->getAuthenticator()->login($username, $password, $errmsg);
-
             // Make sure the user IDs match
             if(($created_user->getId() == $authenticated_user->getId())) {
                 $token = $created_user->generateConnectionToken();
 
-                header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
+                $redirURL = "http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token;
             } else {
-                header("Location: " . BASE_NON_SSL_PATH);
+                $redirURL = BASE_NON_SSL_PATH;
             }
-        } else {
-            $smarty->assign('message', _('An email with confirmation instructions was sent to your email address.  Your account has been granted 15 minutes of access to retrieve your email and validate your account.  You may now open a browser window and go to any remote Internet address to obtain the login page.'));
+
+                        MainUI::redirect($redirURL, 0);
         }
 
@@ -252 +257 @@
          */
         $ui = new MainUI();
+
         $ui->appendContent('left_area_middle', $html);
         $ui->appendContent('main_area_middle', $html_body);
+
+                // $ui->appendContent('page_header', $validationMsgHtml);
+                $ui->appendContent('main_area_top', $validationMsgHtml);
+
         $ui->display();
 
@@ -276 +286 @@
  * Tool content
  */
+
+if (isset ($_REQUEST["form_request"]) && $_REQUEST["form_request"] == "login") {
+    $username = trim($_REQUEST['username']);
+        if (strpos($username, "@") === false)
+                $smarty->assign('username', $username);
+        else {
+                $email = $username;
+                $username = "";
+                $smarty->assign('email', $email);
+        }
+}
 
 // Set section of Smarty template

trunk/wifidog-auth/wifidog/templates/change_password.html

@@ -1 +1 @@
 <fieldset class="pretty_fieldset">
 <legend>{"Change my password"|_}</legend>
-
-        <form name="form" method="post">
-        <table>
+    <form name="form" method="post" onsubmit="return false" action="{$base_ssl_path}change_password.php">
+        <input type="hidden" name="form_request" value="change_password">
+    <table>
         {if $SelectNetworkUI}
         {$SelectNetworkUI}
         {/if}
-        <tr>
-            <td>{"Your username"|_}:</td>
-            <td><input type="text" name="username" value="{$username}" size="20"></td>
-        </tr>
-        <tr>
-            <td>{"Your current password"|_}:</td>
-            <td><input type="password" name="oldpassword" value="{$oldpassword}" size="20"></td>
-        </tr>
-        <tr>
-            <td>{"Your new password"|_}:</td>
-            <td><input type="password" name="newpassword" value="{$newpassword}" size="20"></td>
-        </tr>
-        <tr>
-            <td>{"Your new password"|_} {"(again)"|_}:</td>
-            <td><input type="password" name="newpassword_again" value="{$newpassword_again}" size="20"></td>
-        </tr>
-        <tr>
-            <td></td>
-            <td><input class="submit" type="submit" name="submit" value="{"Change my password"|_}"></td>
-        </tr>
-        </table>
-        </form>
-
+    <tr>
+        <td>{"Your username"|_}:</td>
+        <td><input type="text" name="username" value="{$username}" size="20" id="form_username" onkeypress="return focusNext(this.form, 'oldpassword', event)"{if !$isSuperAdmin} readonly{/if}></td>
+    </tr>
+    <tr>
+        <td>{"Your current password"|_}:</td>
+        <td><input type="password" name="oldpassword" value="{$oldpassword}" size="20" id="form_oldpassword" onkeypress="return focusNext(this.form, 'newpassword', event)"></td>
+    </tr>
+    <tr>
+        <td>{"Your new password"|_}:</td>
+        <td><input type="password" name="newpassword" value="{$newpassword}" size="20" onkeypress="return focusNext(this.form, 'newpassword_again', event)"></td>
+    </tr>
+    <tr>
+        <td>{"Your new password"|_} {"(again)"|_}:</td>
+        <td><input type="password" name="newpassword_again" value="{$newpassword_again}" size="20" onkeypress="return focusNext(this.form, 'form_submit', event)"></td>
+    </tr>
+    <tr>
+        <td></td>
+        <td><input class="submit" type="submit" name="form_submit" value="{"Change my password"|_}" onclick="if (validateForm(this.form)) this.form.submit()"></td>
+    </tr>
+    </table>
+    </form>
 </fieldset>
     
-    <div id="help">
-        {if $error}
-        {$error}
-        {else}
-        {"Please enter your current username, your current password, and your new password (with confirmation)"|_}.
-        {/if}
-    </div>
+<div id="help">
+        {"Please enter your current username, your current password, and your new password (with confirmation)"|_}.
+</div>
+
+<div id="form_errormsg" class="errormsg">
+        {if $error}
+        {$error}
+        {/if}
+</div>
+
+<script type="text/javascript">
+        <!--
+        {literal}
+        var messages = {
+        {/literal}
+          empty_form: "{"You must specify your username and password"|_}",
+          username_required: "{'Username is required.'|_}",
+          username_invalid: "{'Username contains invalid characters.'|_}",
+          password_empty: "{'A password of at least 6 characters is required.'|_}",
+          password_invalid: "{'Password contains invalid characters.'|_}",
+          password_short: "{'Password is too short, it must be 6 characters minimum'|_}",
+          password_twice: "{'You must type your password twice.'|_}",
+          password_match: "{'Passwords do not match.'|_}"
+        {literal}
+        };
+
+        {/literal}
+        {if $isSuperAdmin}
+        document.getElementById("form_username").focus();
+        {else}
+        document.getElementById("form_oldpassword").focus();
+        {/if}
+        {literal}
+
+        function validateForm(form) {
+          if (!isValidUsername(form.username)) {
+                if (isEmpty(form.username))
+                  document.getElementById("form_errormsg").innerHTML = messages.username_required;
+                else
+                  document.getElementById("form_errormsg").innerHTML = messages.username_invalid;
+
+                focusElement(form.name, 'username');
+
+                return false;
+          }
+
+          if (!isValidPassword(form.oldpassword)) {
+                if (isEmpty(form.oldpassword))
+                  document.getElementById("form_errormsg").innerHTML = messages.password_empty;
+                else if (form.oldpassword.value.length<6)
+                  document.getElementById("form_errormsg").innerHTML = messages.password_short;
+                else
+                  document.getElementById("form_errormsg").innerHTML = messages.password_invalid;
+
+                focusElement(form.name, 'oldpassword');
+
+                return false;
+          }
+
+          if (!isValidPassword(form.newpassword)) {
+                if (isEmpty(form.newpassword))
+                  document.getElementById("form_errormsg").innerHTML = messages.password_empty;
+                else if (form.newpassword.value.length<6)
+                  document.getElementById("form_errormsg").innerHTML = messages.password_short;
+                else
+                  document.getElementById("form_errormsg").innerHTML = messages.password_invalid;
+
+                focusElement(form.name, 'newpassword');
+
+                return false;
+          }
+
+          if (isEmpty(form.newpassword_again)) {
+                document.getElementById("form_errormsg").innerHTML = messages.password_twice;
+                focusElement(form.name, 'newpassword_again');
+                return false;
+          }
+
+          if (form.newpassword.value != form.newpassword_again.value) {
+                document.getElementById("form_errormsg").innerHTML = messages.password_match;
+                focusElement(form.name, 'newpassword_again');
+                return false;
+          }
+
+          return true;
+        }
+
+        {/literal}
+        //-->
+</script>

trunk/wifidog-auth/wifidog/templates/classes/MainUI_Display.tpl

@@ -60 +60 @@
 
                 <link rel="stylesheet" type="text/css" href="{$stylesheetURL}">
+                <script src="{$system_path}js/formutils.js"></script>
 
         <style type="text/css">
@@ -71 +72 @@
             {if $debugRequested}
                 <pre>{$debugOutput}</pre>
+                {/if}
+                        {if !empty($contentArray.page_header)}
+                                {$contentArray.page_header}
                 {/if}
                 </div>

trunk/wifidog-auth/wifidog/templates/classes/MainUI_ToolContent.tpl

@@ -55 +55 @@
                 {if $isValidUser}
                     <p>{"Logged in as"|_}: {$username}</p>
-                    <a class="administration" href="{$base_ssl_path}user_profile.php"><img class="administration" src="{$base_ssl_path}images/profile.gif" border="0">{"My Profile"|_}</a>
-                    <a class="administration" href="{$base_ssl_path}login/?logout=true{$logoutParameters}"><img class="administration" src="{$base_ssl_path}images/logout.gif" border="0">{"Logout"|_}</a>
+                    <a class="administration" href="{$system_path}user_profile.php"><img class="administration" src="{$system_path}images/profile.gif">{"My Profile"|_}</a>
+                    <a class="administration" href="{$system_path}login/?logout=true{$logoutParameters}"><img class="administration" src="{$system_path}images/logout.gif">{"Logout"|_}</a>
                 {else}
+                                        {if !$shrinkLeftArea}
                     <p>
                         {"I am not logged in."|_}<br>
-                        <a href="{$base_ssl_path}login/{$loginParameters}">{"Login"|_}</a>
+                        <a href="{$system_path}login/{$loginParameters}">{"Login"|_}</a>
                     </p>
+                                        {/if}
 
-                    <a class="administration" href="{$networkHomepageURL}"><img class="administration" src="{$base_url_path}images/lien_ext.gif">{$networkName}</a>
-                    <a class="administration" href="{$base_ssl_path}faq.php"><img class="administration" src="{$base_url_path}images/where.gif">{"Where am I?"|_}</a>
+                    <a class="administration" href="{$networkHomepageURL}"><img class="administration" src="{$system_path}images/lien_ext.gif">{$networkName}</a>
+                    <a class="administration" href="{$system_path}faq.php"><img class="administration" src="{$system_path}images/where.gif">{"Where am I?"|_}</a>
                 {/if}
             </span>
@@ -88 +90 @@
         </div>
 
+                {if !$shrinkLeftArea}
         <div class="avis">
             <span class="avis">
@@ -94 +97 @@
             </span>
         </div>
+                {/if}
 {*
     END section START

trunk/wifidog-auth/wifidog/templates/classes/MainUI_ToolSection.tpl

@@ -57 +57 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$base_ssl_path}admin/user_log.php">{"User logs"|_}</a></li>
-                        <li><a href="{$base_ssl_path}admin/online_users.php">{"Online Users"|_}</a></li>
-                        <li><a href="{$base_ssl_path}admin/stats.php">{"Statistics"|_}</a></li>
-                        <li><a href="{$base_ssl_path}admin/import_user_database.php">{"Import NoCat user database"|_}</a></li>
+                        <li><a href="{$system_path}admin/user_log.php">{"User logs"|_}</a></li>
+                        <li><a href="{$system_path}admin/online_users.php">{"Online Users"|_}</a></li>
+                        <li><a href="{$system_path}admin/stats.php">{"Statistics"|_}</a></li>
+                        <li><a href="{$system_path}admin/import_user_database.php">{"Import NoCat user database"|_}</a></li>
                     </ul>
                 </div>
@@ -87 +87 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$base_ssl_path}admin/generic_object_admin.php?object_class=Node&action=list">{"Nodes"|_}</a></li>
-                        <li><a href="{$base_ssl_path}admin/generic_object_admin.php?object_class=Node&action=new_ui">{"Add new Node"|_}</a></li>
+                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Node&action=list">{"Nodes"|_}</a></li>
+                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Node&action=new_ui">{"Add new Node"|_}</a></li>
                     </ul>
                 </div>
@@ -100 +100 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$base_ssl_path}admin/generic_object_admin.php?object_class=Network&action=list">{"Networks"|_}</a></li>
+                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Network&action=list">{"Networks"|_}</a></li>
                     </ul>
                 </div>
@@ -110 +110 @@
                 <div class="admin_section_data">
                     <ul>
-                        <li><a href="{$base_ssl_path}admin/generic_object_admin.php?object_class=Server&action=list">{"Servers"|_}</a></li>
-                        <li><a href="{$base_ssl_path}admin/generic_object_admin.php?object_class=Content&action=list">{"Content"|_}</a></li>
+                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Server&action=list">{"Servers"|_}</a></li>
+                        <li><a href="{$system_path}admin/generic_object_admin.php?object_class=Content&action=list">{"Content"|_}</a></li>
                     </ul>
                 </div>

trunk/wifidog-auth/wifidog/templates/sites/index.tpl

@@ -53 +53 @@
     <div id="login_form">
         <ul>
-            <li><a href="{$base_ssl_path}change_password.php">{"Change password"|_}</a></li>
-            <li><a href="{$base_ssl_path}faq.php">{"I have trouble connecting and I would like some help"|_}</a></li>
+                        {if $isValidUser}
+            <li><a href="{$system_path}change_password.php">{"Change password"|_}</a></li>
+                        {else}
+            <li><a href="{$system_path}faq.php">{"I have trouble connecting and I would like some help"|_}</a></li>
+                        {/if}
         </ul>
     </div>
@@ -99 +102 @@
     <ul>
         {if $googleMapsEnabled && !$userIsAtHotspot}
-            <li><a href="{$base_non_ssl_path}hotspots_map.php">{"Deployed HotSpots map"|_}</a></li>
+            <li><a href="{$system_path}hotspots_map.php">{"Deployed HotSpots map"|_}</a></li>
         {/if}
-        <li><a href="{$base_ssl_path}hotspot_status.php">{"Deployed HotSpots status with coordinates"|_}</a></li>
-        <li><a href="{$base_ssl_path}node_list.php">{"Full node technical status (includes non-deployed nodes)"|_}</a></li>
-        <li><a href="{$base_ssl_path}admin/index.php">{"Administration"|_}</a></li>
+        <li><a href="{$system_path}hotspot_status.php">{"Deployed HotSpots status with coordinates"|_}</a></li>
+        <li><a href="{$system_path}node_list.php">{"Full node technical status (includes non-deployed nodes)"|_}</a></li>
+        <li><a href="{$system_path}admin/index.php">{"Administration"|_}</a></li>
     </ul>
 {*

trunk/wifidog-auth/wifidog/templates/sites/login.tpl

@@ -48 +48 @@
 
     <div id="login_form">
-        <h1><a href="{$base_ssl_path}signup.php">{"Create a free account"|_}</a></h1>
-
-        <h1>{"I already have an account"|_}:</h1>
+        <h1>{"Login or Signup here"|_}:</h1>
 
         <p class="indent">
-            <form name="login_form" method="post">
+            <form name="login_form" method="post" onsubmit="return false" action="{$base_ssl_path}login/index.php">
+                        <input type="hidden" name="form_request" value="login">
                 {if $node != null}
                     <input type="hidden" name="gw_address" value="{$gw_address}">
@@ -66 +65 @@
 
                 {"Username (or email)"|_}:<br>
-                <input type="text" name="username" value="{$username}" size="20" id="form_username"><br>
+                <input type="text" name="username" value="{$username}" size="20" id="form_username" onkeypress="return focusNext(this.form, 'password', event)"><br>
                 {"Password"|_}:<br>
-                <input type="password" name="password" size="20"><br>
+                <input type="password" name="password" size="20" id="form_password" onkeypress="return focusNext(this.form, 'form_submit', event)"><br>
 
-                {if $error != null}
-                    <div class="errormsg">{$error}</div>
-                {/if}
+                <div id="form_errormsg" class="errormsg">
+                                {if $error == null}
+                                  &nbsp;
+                                {else}
+                                  {$error}
+                                {/if}
+                                </div>
 
-                <input class="submit" type="submit" name="submit" value="{"Login"|_}">
+                <input class="submit" type="button" name="form_submit" value="{"Login"|_}" onclick="if (validateForm(this.form)) this.form.submit()">
+                                &nbsp;
+                <input class="submit" type="button" name="form_signup" value="{$create_a_free_account}" onclick="this.form.action='{$base_ssl_path}signup.php'; this.form.submit()">
             </form>
         </p>
+
+                <div id="help">
+                {"You must specify your username and password"|_}.
+                </div>
 
         <h1>{"I'm having difficulties"|_}:</h1>
 
         <ul>
-            <li><a href="{$base_ssl_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$base_ssl_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$base_ssl_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$base_ssl_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>
@@ -90 +99 @@
     <script type="text/javascript">
         <!--
-            document.getElementById("form_username").focus();
+                {literal}
+                var messages = {
+                {/literal}
+                  empty_form: "{"You must specify your username and password"|_}",
+                  username_required: "{'Username is required.'|_}",
+                  username_invalid: "{'Username contains invalid characters.'|_}",
+                  email_invalid: "{'A valid email address is required.'|_}",
+                  password_empty: "{'A password of at least 6 characters is required.'|_}",
+                  password_invalid: "{'Password contains invalid characters.'|_}",
+                  password_short: "{'Password is too short, it must be 6 characters minimum'|_}"
+                {literal}
+                };
+
+                document.getElementById("form_username").focus();
+
+                function validateForm(form) {
+                  if (!isValidUsername(form.username)) {
+                        if (isEmpty(form.username)) {
+                          document.getElementById("form_errormsg").innerHTML = messages.username_required;
+                          return false;
+                        }
+                        else {
+                          if (!isValidEmail(form.username)) {
+                                document.getElementById("form_errormsg").innerHTML = messages.username_invalid;
+                                return false;
+                          }
+                        }
+                  }
+
+                  if (!isValidPassword(form.password)) {
+                        if (isEmpty(form.password))
+                          document.getElementById("form_errormsg").innerHTML = messages.password_empty;
+                        else if (form.password.value.length<6)
+                          document.getElementById("form_errormsg").innerHTML = messages.password_short;
+                        else
+                          document.getElementById("form_errormsg").innerHTML = messages.password_invalid;
+
+                        return false;
+                  }
+
+                  return true;
+                }
+
+                {/literal}
         //-->
     </script>

trunk/wifidog-auth/wifidog/templates/sites/lost_password.tpl

@@ -59 +59 @@
 
         <ul>
-            <li><a href="{$base_ssl_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$base_ssl_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$base_ssl_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$base_ssl_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>
@@ -77 +77 @@
        <legend>{"Lost password"|_}</legend>
 
-        <form name="form" method="post">
+        <form name="form" method="post" onsubmit="return false" action="{$base_ssl_path}lost_password.php">
+                <input type="hidden" name="form_request" value="lost_password">
             {if $SelectNetworkUI}
                 {$SelectNetworkUI}
@@ -85 +86 @@
                 <tr>
                     <th>{"Your username"|_}:</th>
-                    <td><input type="text" name="username" value="{$username}" size="20" id="form_username"></td>
+                    <td><input type="text" name="username" value="{$username}" size="20" id="form_username" onkeypress="return focusNext(this.form, 'email', event)"></td>
                 </tr>
                 <tr>
                     <th>{"Your email address"|_}:</th>
-                    <td><input type="text" name="email" value="{$email}" size="20"></td>
+                    <td><input type="text" name="email" value="{$email}" size="20" onkeypress="return focusNext(this.form, 'form_submit', event)"></td>
                 </tr>
                 <tr>
                     <th></th>
-                    <td><input class="submit" type="submit" name="submit" value="{"Reset my password"|_}"></td>
+                    <td><input class="submit" type="submit" name="form_submit" value="{"Reset my password"|_}" onclick="if (validateForm(this.form)) this.form.submit()"></td>
                 </tr>
             </table>
@@ -100 +101 @@
 
     <div id="help">
-        {if $error}
-            <div class="errormsg">{$error}</div>
-        {else}
-            {"Please enter your username or email address to reset your password"|_}.
-        {/if}
+    {"Please enter your username or email address to reset your password"|_}.
     </div>
 
+    <div id="form_errormsg" class="errormsg">
+    {if $error}
+                {$error}
+        {/if}
+        </div>
+
     <script type="text/javascript">
-        <!--
-            document.getElementById("form_username").focus();
-        //-->
+    <!--
+        {literal}
+                var messages = {
+        {/literal}
+                  username_required: "{'Please specify a username or email address'|_}",
+                  username_invalid: "{'Username contains invalid characters.'|_}",
+                  email_invalid: "{'The email address must be valid (i.e. user@domain.com). Please understand that we also black-listed various temporary-email-address providers.'|_}"
+        {literal}
+                };
+
+        document.getElementById("form_username").focus();
+
+                function validateForm(form) {
+                  if (!isValidUsername(form.username)) {
+                        if (isEmpty(form.username)) {
+                          if (isEmpty(form.email)) {
+                                // username and email cannot both be empty
+                                document.getElementById("form_errormsg").innerHTML = messages.username_required;
+                                return false;
+                          }
+                        }
+                        else {
+                          document.getElementById("form_errormsg").innerHTML = messages.username_invalid;
+                          return false;
+                        }
+                  }
+
+                  if (!isValidEmail(form.email)) {
+                        if (isNotEmpty(form.email)) {
+                          document.getElementById("form_errormsg").innerHTML = messages.email_invalid;
+                          return false;
+                        }
+                        else if (isEmpty(form.username)) {
+                          // username and email cannot both be empty
+                          document.getElementById("form_errormsg").innerHTML = messages.username_required;
+                          return false;
+                        }
+                  }
+
+                  return true;
+                }
+
+                {/literal}
+    //-->
     </script>
 {*

trunk/wifidog-auth/wifidog/templates/sites/lost_username.tpl

@@ -59 +59 @@
 
         <ul>
-            <li><a href="{$base_ssl_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$base_ssl_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$base_ssl_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$base_ssl_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>
@@ -77 +77 @@
         <legend>{"Lost username"|_}</legend>
 
-        <form name="form" method="post">
+        <form name="form" method="post" onsubmit="return false" action="{$base_ssl_path}lost_username.php">
+                <input type="hidden" name="form_request" value="lost_username">
             {if $SelectNetworkUI}
             {$SelectNetworkUI}
@@ -85 +86 @@
                 <tr>
                     <th>{"Your email address"|_}:</th>
-                    <td><input type="text" name="email" value="{$email}" size="20" id="form_email"></td>
+                    <td><input type="text" name="email" value="{$email}" size="20" id="form_email" onkeypress="return focusNext(this.form, 'form_submit', event)"></td>
                 </tr>
                 <tr>
                     <th></th>
-                    <td><input class="submit" type="submit" name="submit" value="{"Retrieve"|_}"></td>
+                    <td><input class="submit" type="submit" name="form_submit" value="{"Retrieve"|_}" onclick="if (validateForm(this.form)) this.form.submit()"></td>
                 </tr>
             </table>
@@ -96 +97 @@
 
     <div id="help">
-        {if $error}
-            <div class="errormsg">{$error}</div>
-        {else}
-            {"Please enter your email address to recover your username"|_}.
-        {/if}
+                {"Please enter your email address to recover your username"|_}.
     </div>
 
+        <div id="form_errormsg" class="errormsg">
+        {if $error}
+                {$error}
+        {/if}
+        </div>
+
     <script type="text/javascript">
-        <!--
-            document.getElementById("form_email").focus();
-        //-->
+    <!--
+        {literal}
+                var messages = {
+        {/literal}
+                  email_required: "{'Please specify an email address.'|_}",
+                  email_invalid: "{'The email address must be valid (i.e. user@domain.com). Please understand that we also black-listed various temporary-email-address providers.'|_}",
+        {literal}
+                };
+
+        document.getElementById("form_email").focus();
+
+                function validateForm(form) {
+                  if (!isValidEmail(form.email)) {
+                        if (isEmpty(form.email))
+                          document.getElementById("form_errormsg").innerHTML = messages.email_required;
+                        else
+                          document.getElementById("form_errormsg").innerHTML = messages.email_invalid;
+                        return false;
+                  }
+
+                  return true;
+                }
+                {/literal}
+    //-->
     </script>
 {*

trunk/wifidog-auth/wifidog/templates/sites/resend_validation.tpl

@@ -59 +59 @@
 
         <ul>
-            <li><a href="{$base_ssl_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$base_ssl_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$base_ssl_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$base_ssl_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+            <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+            <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
         </ul>
     </div>
@@ -77 +77 @@
         <legend>{"Re-send validation email"|_}</legend>
 
-        <form name="form">
+        <form name="form" method="post" onsubmit="return false" action="{$base_ssl_path}resend_validation.php">
+                <input type="hidden" name="form_request" value="resend_validation">
             {if $SelectNetworkUI}
                 {$SelectNetworkUI}
@@ -85 +86 @@
                 <tr>
                     <th>{"Your username"|_}:</th>
-                    <td><input type="text" name="username" value="{$username}" size="20" id="form_username"></td>
+                    <td><input type="text" name="username" value="{$username}" size="20" id="form_username" onkeypress="return focusNext(this.form, 'form_submit', event)"></td>
                 </tr>
                 <tr>
                     <th></th>
-                    <td><input class="submit" type="submit" name="submit" value="{"Re-send"|_}"></td>
+                    <td><input class="submit" type="submit" name="form_submit" value="{"Re-send"|_}" onclick="if (validateForm(this.form)) this.form.submit()"></td>
                 </tr>
             </table>
@@ -96 +97 @@
 
     <div id="help">
-        {if $error}
-            <div class="errormsg">{$error}</div>
-        {else}
-            {"Please enter your username and the validation email will be resent to your email address"|_}.
-        {/if}
+        {"Please enter your username and the validation email will be resent to your email address"|_}.
     </div>
 
+        <div id="form_errormsg" class="errormsg">
+        {if $error}
+                {$error}
+        {/if}
+        </div>
+
     <script type="text/javascript">
-        <!--
-            document.getElementById("form_username").focus();
-        //-->
+        <!--
+        {literal}
+                var messages = {
+        {/literal}
+                  username_required: "{'Username is required.'|_}",
+                  username_invalid: "{'Username contains invalid characters.'|_}",
+        {literal}
+                };
+
+                document.getElementById("form_username").focus();
+
+                function validateForm(form) {
+                  if (!isValidUsername(form.username)) {
+                        if (isEmpty(form.username))
+                          document.getElementById("form_errormsg").innerHTML = messages.username_required;
+                        else
+                          document.getElementById("form_errormsg").innerHTML = messages.username_invalid;
+
+                        return false;
+                  }
+
+                  return true;
+                }
+                {/literal}
+        //-->
     </script>
 {*

trunk/wifidog-auth/wifidog/templates/sites/signup.tpl

@@ -35 +35 @@
 
 /**
- * Sign up page
- *
- * @package    WiFiDogAuthServer
- * @subpackage Templates
- * @author     Philippe April
- * @author     Benoit Gregoire <bock@step.polymtl.ca>
- * @author     Max Horvath <max.horvath@maxspot.de>
- * @copyright  2004-2006 Philippe April
- * @copyright  2004-2006 Benoit Gregoire, Technologies Coeus inc.
- * @copyright  2006 Max Horvath, maxspot GmbH
- * @version    Subversion $Id$
- * @link       http://www.wifidog.org/
- */
+* Sign up page
+*
+* @package    WiFiDogAuthServer
+* @subpackage Templates
+* @author     Philippe April
+* @author     Benoit Gregoire <bock@step.polymtl.ca>
+* @author     Max Horvath <max.horvath@maxspot.de>
+* @copyright  2004-2006 Philippe April
+* @copyright  2004-2006 Benoit Gregoire, Technologies Coeus inc.
+* @copyright  2006 Max Horvath, maxspot GmbH
+* @version    Subversion $Id$
+* @link       http://www.wifidog.org/
+*/
 
 *}
@@ -53 +53 @@
 {if $sectionTOOLCONTENT}
 {*
-    BEGIN section TOOLCONTENT
-*}
-    <div id="login_form">
-        <h1>{"I'm having difficulties"|_}:</h1>
-
+BEGIN section TOOLCONTENT
+*}
+<div id="login_form">
+        <h1>{"I'm having difficulties"|_}:</h1>
+
+        <ul>
+                <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+                <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
+                <li><a href="{$system_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
+                <li><a href="{$system_path}faq.php">{"Frequently asked questions"|_}</a></li>
+        </ul>
+</div>
+{*
+END section TOOLCONTENT
+*}
+{/if}
+
+{if $sectionMAINCONTENT}
+{*
+BEGIN section MAINCONTENT
+*}
+<fieldset class="pretty_fieldset">
+        <legend>{"Register a free account with"|_} {$hotspot_network_name}</legend>
+
+        <form name="signup_form" method="post" onsubmit="return false" action="{$base_ssl_path}signup.php">
+        <input type="hidden" name="form_request" value="signup">
+                {if $SelectNetworkUI}
+                        {$SelectNetworkUI}
+                {/if}
+
+                <table>
+                        <tr>
+                                <th>{"Username desired"|_}:</th>
+                                <td><input type="text" name="username" value="{$username}" size="30" id="form_username" onkeypress="return focusNext(this.form, 'email', event)"></td>
+                        </tr>
+                        <tr>
+                                <th>{"Your email address"|_}:</th>
+                                <td><input type="text" name="email" value="{$email}" size="30" onkeypress="return focusNext(this.form, 'password', event)"></td>
+                        </tr>
+                        <tr>
+                                <th>{"Password"|_}:</th>
+                                <td><input type="password" name="password" size="30" onkeypress="return focusNext(this.form, 'password_again', event)"></td>
+                        </tr>
+            <tr>
+                <th>{"Password (again)"|_}:</th>
+                <td><input type="password" name="password_again" size="30" onkeypress="return focusNext(this.form, 'form_submit', event)"></td>
+            </tr>
+            <tr>
+                <th></th>
+                <td><input class="submit" type="submit" name="form_submit" value="{"Sign-up"|_}" onclick="if (validateForm(this.form)) this.form.submit()"></td>
+            </tr>
+        </table>
+    </form>
+
+    <hr>
+
+    <p>
+        <b>{"Please note"|_}</b>:
+        {"While accounts are free, we <em>strongly</em> suggest that you use your previously created account if you have one."|_}
+    </p>
+
+        <p>
+        {"<b>Your email address must be valid</b> in order for your account to be activated."|_}
+                {"A validation email will be sent to that email address."|_}
+                {"To fully activate your account you must respond to that email."|_}
+        </p>
+
+    <p>
+        <b>{"Note to free web-based email users"|_}</b>:
+        {"Sometimes our validation email ends up in the 'spam' folder of some providers. If you have not received any email with the validation URL 5 minutes after submitting this form, please take a look in the spam folder."|_}
+    </p>
+
+    <p>
+        <b>{"You can also use the following links if you need help"|_}:</b>
         <ul>
-            <li><a href="{$base_ssl_path}lost_username.php">{"I Forgot my username"|_}</a></li>
-            <li><a href="{$base_ssl_path}lost_password.php">{"I Forgot my password"|_}</a></li>
-            <li><a href="{$base_ssl_path}resend_validation.php">{"Re-send the validation email"|_}</a></li>
-            <li><a href="{$base_ssl_path}faq.php">{"Frequently asked questions"|_}</a></li>
+            <li><a href="{$system_path}lost_username.php">{"I Forgot my username"|_}</a></li>
+            <li><a href="{$system_path}lost_password.php">{"I Forgot my password"|_}</a></li>
         </ul>
-    </div>
-{*
-    END section TOOLCONTENT
-*}
-{/if}
-
-{if $sectionMAINCONTENT}
-{*
-    BEGIN section MAINCONTENT
-*}
-    <fieldset class="pretty_fieldset">
-        <legend>{"Register a free account with"|_} {$hotspot_network_name}</legend>
-
-        <form name="signup_form" method="post">
-            {if $SelectNetworkUI}
-                {$SelectNetworkUI}
-            {/if}
-
-            <table>
-                <tr>
-                    <th>{"Username desired"|_}:</th>
-                    <td><input type="text" name="username" value="{$username}" size="30" id="form_username"></td>
-                </tr>
-                <tr>
-                    <th>{"Your email address"|_}:</th>
-                    <td><input type="text" name="email" value="{$email}" size="30"></td>
-                </tr>
-                <tr>
-                    <th>{"Password"|_}:</th>
-                    <td><input type="password" name="password" size="30"></td>
-                </tr>
-                <tr>
-                    <th>{"Password (again)"|_}:</th>
-                    <td><input type="password" name="password_again" size="30"></td>
-                </tr>
-                <tr>
-                    <th></th>
-                    <td><input class="submit" type="submit" name="submit" value="{"Sign-up"|_}"></td>
-                </tr>
-            </table>
-        </form>
-
-        <hr>
-
-        <p>
-            <b>{"Please note"|_}</b>:
-            {"While accounts are free, we <em>strongly</em> suggest that you use your previously created account if you have one."|_}
-        </p>
-
-        <p>
-            <b>{"Note to free web-based email users"|_}</b>:
-            {"Sometimes our validation email ends up in the 'spam' folder of some providers. If you have not received any email with the validation URL 5 minutes after submitting this form, please take a look in the spam folder."|_}
-        </p>
-
-        <p>
-            <b>{"You can also use the following links if you need help"|_}:</b>
-            <ul>
-                <li><a href="{$smarty.const.BASE_SSL_PATH}lost_username.php">{"I Forgot my username"|_}</a></li>
-                <li><a href="{$smarty.const.BASE_SSL_PATH}lost_password.php">{"I Forgot my password"|_}</a></li>
-            </ul>
-        </p>
-    </fieldset>
-
-    <div id="help">
-        {if $error}
-            <div class="errormsg">{$error}</div>
-        {else}
-            {"Your email address must be valid in order for your account to be activated"|_}.
+    </p>
+</fieldset>
+
+    <div id="form_errormsg" class="errormsg">
+        {if $error != null}
+                  {$error}
         {/if}
-    </div>
+        </div>
 
     <script type="text/javascript">
         <!--
-            document.getElementById("form_username").focus();
+        {literal}
+                var messages = {
+        {/literal}
+                  username_required: "{'Username is required.'|_}",
+                  username_invalid: "{'Username contains invalid characters.'|_}",
+                  email_invalid: "{'The email address must be valid (i.e. user@domain.com). Please understand that we also black-listed various temporary-email-address providers.'|_}",
+                  password_empty: "{'A password of at least 6 characters is required.'|_}",
+                  password_invalid: "{'Password contains invalid characters.'|_}",
+                  password_twice: "{'You must type your password twice.'|_}",
+                  password_match: "{'Passwords do not match.'|_}",
+                  password_short: "{'Password is too short, it must be 6 characters minimum'|_}"
+        {literal}
+                };
+
+        document.getElementById("form_username").focus();
+
+                function validateForm(form) {
+                  if (!isValidUsername(form.username)) {
+                        if (isEmpty(form.username))
+                          document.getElementById("form_errormsg").innerHTML = messages.username_required;
+                        else
+                          document.getElementById("form_errormsg").innerHTML = messages.username_invalid;
+
+                        return false;
+                  }
+
+                  if (!isValidEmail(form.email)) {
+                        document.getElementById("form_errormsg").innerHTML = messages.email_invalid;
+                        return false;
+                  }
+
+                  if (!isValidPassword(form.password)) {
+                        if (isEmpty(form.password))
+                          document.getElementById("form_errormsg").innerHTML = messages.password_empty;
+                        else if (form.password.value.length<6)
+                          document.getElementById("form_errormsg").innerHTML = messages.password_short;
+                        else
+                          document.getElementById("form_errormsg").innerHTML = messages.password_invalid;
+
+                        return false;
+                  }
+
+                  if (isEmpty(form.password_again)) {
+                        document.getElementById("form_errormsg").innerHTML = messages.password_twice;
+                        focusElement(form.name, 'password_again');
+                        return false;
+                  }
+
+                  if (form.password.value != form.password_again.value) {
+                        document.getElementById("form_errormsg").innerHTML = messages.password_match;
+                        focusElement(form.name, 'password_again');
+                        return false;
+                  }
+
+                  return true;
+                }
+
+                {/literal}
         //-->
     </script>