hotspotlogin 1.2.2 → 1.3.0.1

data/Changelog

@@ -0,0 +1,41 @@
+* 1.3.0 (2011-09-29)
+  * Italian and English localization based on R18n
+  * some mobile-friendliness (without special layouts or device detection)
+  * improved JS code for user stats
+
+* 1.2.2 (2011-08-08)
+  * Fix logo link and links style
+
+* 1.2.1 (2011-08-08)
+  * Fix command line options
+
+* 1.2.0 (2011-08-08)
+  * --logo-link
+  * --my-url ("My Account" link w/ dynamic replacement of the actual username) 
+
+* 1.1.0 (2011-08-03)
+  * --signup-url
+
+* 1.0.2 (2010-12-08)
+	* Display Reply-Message properly
+		* fix serious encoding issues
+		* use Rack instead of ERB utils for escaping
+
+* 1.0.1 (2010-11-17)
+	* Urgent bugfix -- handle config['logo'] == nil (TypeError)
+
+* 1.0.0 (2010-11-16)
+  * Major rewrite based on CoovaChilli JSON API (coova.org/CoovaChilli/JSON).
+    * tested with CoovaChilli 1.2.5, and IE7, FF3, Epiphany/WebKit
+    * uses JavaScript and popups, your browser must support/allow them
+    * periodic auto-refresh of accounting data to the end user, including
+      downstream and upstream network traffic
+    * supports Session and Idle Timeout, showing relevant info if applicable,
+      and refreshing info when user is disconnected
+    * view customization, with Your Org logo, custom text, etc.
+    * some legacy code still around, sorry
+
+* 0.1.2 (2010-11-08) 
+  * Become session leader when forking/daemonizing.
+    * this is to avoid trapping terminal interrupts from a parent console
+      process, etc.

data/README.rdoc

@@ -7,8 +7,8 @@ hotspotlogin.cgi used with ChilliSpot and compatible Network Access
 Controllers to provide a Captive Portal environment.
 
 This release features displaying of detailed accounting info for the end user,
-and is strongly based on CoovaChilli Network Access Controller and its
-JSON interface.
+Italian and English localization (based on R18n) and is strongly based on 
+CoovaChilli Network Access Controller and its JSON interface.
 
 * http://github.com/gderosa/hotspotlogin.rb
 
@@ -71,15 +71,22 @@ All this options may be put into the YAML config file specified by --conf
 
 See also chilli.conf(5) manual page.
 
+==== CoovaChilli configuration
+
+If hotspotlogin.rb listens, say, at 192.168.100.100:4990, CoovaChilli must be 
+configured to redirect user to http://192.168.100.100:4990/hotspotlogin 
+(+uamserver+ parameter). Also +uamsecret+ must match in Chilli and hotspotlogin 
+configuration.
+
 ==== Unix Signals
 
   USR1                            sync/update log file (flush buffered I/O) 
-  
+
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2010 Guido De Rosa (guido.derosa*vemarsas.it)
+Copyright (c) 2010, 2011 Guido De Rosa (guido.derosa*vemarsas.it)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/i18n/en.yml

@@ -0,0 +1,31 @@
+login:
+  "you!": sign in
+  result:
+    success:      "logged in to HotSpot"
+    failed:       "HotSpot login failed"
+    logoff:       "logged out from HotSpot"
+    already:      "already logged in to HotSpot"
+    notyet:       "logged out from HotSpot"
+    logging_into: "logging into HotSpot"
+    none:         "what do you want here?"
+signup:
+  "you!": sign up
+account:
+  dont_have:
+    you: "don”t have an account"
+username:
+  short: login
+  long: username
+logout: logout
+refresh: refresh
+my: my account
+status:
+  username: username
+  client_state: client state
+  session_time: session time
+  session_time_left: session time left
+  idle_time_timeout: idle time/timeout
+  download_traffic: download
+  upload_traffic: upload
+  auto_updated_every: auto updated every
+

data/i18n/it.yml

@@ -0,0 +1,30 @@
+login:
+  "you!": accedi
+  result:
+    success:      "accesso effettuato"
+    failed:       "autenticazione fallita"
+    logoff:       "disconnesso dall’HotSpot"
+    already:      "già connesso all’HotSpot"
+    notyet:       "accedi all’HotSpot"
+    logging_into: "accesso in corso"
+    none:         "uhm..."
+signup:
+  "you!": registrati
+account:
+  dont_have:
+    you: non hai un account
+username:
+  short: utente
+  long: nome utente
+logout: esci
+refresh: aggiorna
+my: gestisci account
+status:
+  username: utente
+  client_state: stato
+  session_time: durata sessione
+  session_time_left: tempo rimanente
+  idle_time_timeout: "inattività/(max)"
+  download_traffic: download
+  upload_traffic: upload
+  auto_updated_every: "aggiornato automaticam. ogni"

data/lib/hotspotlogin/app.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
+require 'facets/string'
 require 'sinatra/base'
+require 'sinatra/r18n'
 require 'erb'
 
 require 'hotspotlogin/constants'
@@ -16,6 +18,8 @@ module HotSpotLogin
     set :port,    HotSpotLogin.config['port']
     set :logging, HotSpotLogin.config['log-http']
 
+    register Sinatra::R18n
+
     #set :run,     false
 
     result, titel, headline, bodytext = '', '', '', ''
@@ -64,7 +68,7 @@ module HotSpotLogin
     # setup of "conditional" HTTPS reverse proxies
     
     get '/' do
-      redirect '/hotspotlogin'
+      redirect "/hotspotlogin?#{request.query_string}"
     end
 
     get '/hotspotlogin/favicon.ico' do
@@ -92,6 +96,11 @@ module HotSpotLogin
         not_found
       end
     end
+
+    get '/hotspotlogin/js/UserStatus.js' do
+      content_type 'text/javascript'
+      erb :"js/UserStatus.js", :layout => false # localized strings...
+    end
     
     get '/hotspotlogin/?' do 
       if HotSpotLogin.config['uamsecret'] and
@@ -103,7 +112,9 @@ module HotSpotLogin
       userpassword = HotSpotLogin.config['userpassword']
 
       # attempt to login
-      if params['login'] == 'login'
+      if params['login']  # == 'login'
+                          # So you can put whichever text you want in submit button
+                          # as in <input type="submit" name="login" value="MyText"...
         hexchal = Array[params['chal']].pack('H32')
         if uamsecret
           newchal = 
@@ -116,8 +127,8 @@ module HotSpotLogin
         # bitwise XOR between (binary) Strings (operator ^) 
         # implemented in extensions/ 
         pappassword = (newpwd ^ newchal).unpack('H32').join 
-        titel = 'Logging in to HotSpot'
-        headline = 'Logging in to HotSpot'
+        titel = headline = t.login.result.logging_into.uppercase + '...'
+                                                        # 'Logging in to HotSpot'
 
         #if uamsecret and userpassword
         if userpassword # PAP
@@ -133,41 +144,45 @@ module HotSpotLogin
         end
       elsif params['res'] == 'success' 
         result = Result::SUCCESS
-        titel = 'Logged in to HotSpot'
-        headline = 'Logged in to HotSpot'
-        bodytext = 'Welcome'
+        titel = headline = t.login.result.success.uppercase   
+                                                  # 'Logged in to HotSpot'
+        bodytext = 'Welcome' # used?
       elsif params['res'] == 'failed' 
         result = Result::FAILED
-        titel = 'HotSpot Login Failed'
-        headline = 'HotSpot Login Failed'
+        titel = headline = t.login.result.failed.uppercase    
+                                                  # 'HotSpot Login Failed'
       elsif params['res'] == 'logoff'
         result = Result::LOGOFF
-        titel = 'Logged out from HotSpot'
-        headline = 'Logged out from HotSpot'
+        titel = headline = t.login.result.logoff.uppercase    
+                                                  # 'Logged out from HotSpot'
       elsif params['res'] == 'already' 
         result = Result::ALREADY 
-        titel = 'Already logged in to HotSpot'
-        headline = 'Already logged in to HotSpot'
+        titel = headline = t.login.result.already.uppercase   
+                                                  # 'Already logged in to HotSpot'
       elsif params['res'] == 'notyet'
         result = Result::NOTYET
-        titel = 'Logged out from HotSpot'
-        headline = 'Logged out from HotSpot'
+        titel = headline = t.login.result.notyet.uppercase    
+                                                  # 'Logged out from HotSpot'
       elsif params['res'] == 'popup1'
         result = Result::PopUp::LOGGING_IN
-        titel = 'Logging into HotSpot'
-        headline = 'Logged in to HotSpot'
+        titel = t.login.result.logging_into.uppercase + '...'
+                                                  # 'Logging into HotSpot'
+        headline = t.login.result.success.uppercase
+                                                  # 'Logged in to HotSpot'
       elsif params['res'] == 'popup2'
         result = Result::PopUp::LOGGED_IN
-        titel = 'Logged in to HotSpot'
-        headline = 'Logged in to HotSpot'
+        titel = headline = t.login.result.success.uppercase
+                                                  # 'Logged in to HotSpot'
       elsif params['res'] == 'popup3'
-        result= Result::PopUp::LOGGED_OUT
-        titel = 'Logged out from HotSpot'
-        headline = 'Logged out from HotSpot'
-      elsif params['res'] == '' or !params['res'] # not a form request: err!
+        result = Result::PopUp::LOGGED_OUT
+        titel = headline = t.login.result.logoff.uppercase
+                                                  # 'Logged out from HotSpot'
+
+      elsif params['res'] == '' or !params['res'] # Not a form request nor a redirect..
         result = Result::NONE
-        titel = 'What do you want here?'
-        headline = 'HotSpot Login Failed'
+        titel = t.login.result.none.uppercase    # 'What do you want here?'
+        headline = t.login.result.failed.uppercase
+                                                  # 'HotSpot Login Failed'
       end
 
       logoext = nil

data/lib/hotspotlogin/constants.rb

@@ -1,6 +1,6 @@
 module HotSpotLogin
 
-  VERSION = '1.2.2'
+  VERSION = '1.3.0.1'
 
   DEFAULT_CONFIG = {
     'listen-address'    => '0.0.0.0',

data/lib/hotspotlogin/extensions/string.rb

@@ -1,5 +1,14 @@
-class String
-  # bitwise XOR, behaves like in Perl or PHP
+require 'facets/string'
+
+class String 
+
+  # Escape single quote for use in generated JavaScript
+  def escape_js
+    gsub("'", "\\\\'")
+  end
+
+=begin # use Facets implementation instead
+  # Bitwise XOR, behaves like in Perl or PHP
   def ^(other)
     # treat as a raw/binary sequence of bytes
     s1 = self.force_encoding  'ASCII-8BIT'
@@ -13,6 +22,6 @@ class String
     end
     return bytes_result.map{|b| b.chr}.join
   end
+=end
 end
 
-

data/public/hotspotlogin/css/default.css

@@ -1,27 +1,30 @@
 body {
-  font-size: 10pt;
+  font-family: sans-serif;
+  margin: 1em auto;
+  padding: 0 0.75em;
 }
 h1, h2 {
   text-align: center;
-  font-family: sans-serif;
 }
 h1 {
-  font-size: 160%;
   margin: 0.1ex 0;
 }
-h2 {
-  font-size: 135%;
+h1#custom-headline {
+  font-style: italic;
+  font-weight: normal;  
+}
+h2#headline {
+  font-size: 110%;
   margin-top: 0.1ex;
-  margin-bottom: 0.5ex;
+  margin-bottom: 0.1em;
   font-style: italic;
 }
 #powered-by {
   text-align: right; 
   font-style: italic; 
-  margin-right: 3em; 
+  margin-right: 2em; 
   margin-bottom: 1ex;
-  font-family: sans-serif; 
-  font-size:smaller;
+  font-size:70%;
 }
 #logo-container {
   text-align: center;
@@ -43,35 +46,41 @@ h2 {
 }
 #logInLogOut-container {
   padding: 0;
-  margin: 0.5em 0;
+  margin: 0 0 0.5em 0;
   text-align: center;
+  line-height: 1.6em;
 }
 #logInLogOut-container a {
-  margin: 0 0.4ex;
+  margin: 0 0.5ex;
+  white-space: nowrap;
 }
 #status-container {
   text-align: center;
-  margin: 0 0 1em 0;
 }
 #status-table {
-  margin: auto;
-  border: 1px blue solid;
-  padding: 0.5ex;
+  font-size: 90%;
+  margin: 0.5em auto;
 }
 #status-table th {
   text-align: left;
+  text-transform: capitalize;
 }
 #status-table td {
   text-align: right;
 }
+#status-table th, #status-table td {
+  background: #eef;
+}
 #status-table th.optinfo {
-  font-size: smaller;
+  font-size: 90%;
   font-style: italic;
 }
 #submit-container {
+  text-align: left;
 }
 #submit-container button, #submit-container input[type="submit"] {
-  width: 5em;
+  width: 4.5em;
+  margin-top: 0.3em;
 }
 #custom-text {
   font-size: 94%;
@@ -79,8 +88,33 @@ h2 {
   margin-bottom: 1.5em;
 }
 #custom-footer {
-  margin-top: 2em;
-  font-size: small;
-  font-family: sans-serif;
-  text-align: center;
+  margin-top: 2.6em;
+  font-size: 90%;
+}
+
+/* button, input[type="submit"] {
+  background: white;
+} */
+
+#signup-container{
+  font-style:italic;
+  font-weight: normal;
+  margin-top:0.2em;
+}
+
+a#signup {
+  border: none;
+  color: white;
+  background: #77f;
+  padding: 0 0.2em 0.1em 0.2em;
+  font-style:normal;
+}
+
+a#signup {
+  text-decoration: none;
+  margin-left: 0.2em;
+}
+
+a img {
+  border: none;
 }

data/views/_login_form.erb

@@ -6,16 +6,23 @@
   <table>
     <tbody>
       <tr>
-        <th scope="row">Login:</td>
-        <td><input type="text" name="UserName" size="20" maxlength="255"></td>
+        <th scope="row"><%= t.username.short.capitalize %>:</td>
+        <td><input type="text" name="UserName" size="16" maxlength="255"></td>
       </tr>
       <tr>
         <th scope="row">Password:</td>
-        <td><input type="password" name="Password" size="20" maxlength="255"></td>
+        <td><input type="password" name="Password" size="16" maxlength="255"></td>
+      </tr>
+      <tr> <!-- yeah, it's horrible -->
+        <td colspan="2" id="submit-container">
+          <input type="submit" name="login" value="<%= t.login.you!.capitalize %>">
+        </td>
       </tr>
     </tbody>
   </table>
-  <div id="submit-container">
-    <input type="submit" name="login" value="login"><% if signup_url =~ /\S/ %> OR <a href="<%= signup_url %>" target="_blank">Signup!</a><% end %>
-  </div>
 </form>
+<% if signup_url =~ /\S/ %><span id="signup-container">
+  <%= t.account.dont_have.you.capitalize %>?
+  <a id="signup" href="<%= signup_url %>" target="_blank"><%= t.signup.you!.capitalize %>!</a>
+</span><% end %>
+

data/views/hotspotlogin.erb

@@ -1,4 +1,6 @@
 <%
+  require 'facets/string'
+  require 'sinatra/r18n'
   require 'hotspotlogin/app/helpers'
 %>
 
@@ -8,17 +10,18 @@
 -->
 
 <% if custom_headline %>
-  <h1><%= custom_headline %></h1>
+  <h1 id="custom-headline"><%= custom_headline %></h1>
 <% end %>
 <% if logoext %>
   <div id="logo-container">
-    <% if logo_link =~ /\S/ %><a href="<%= logo_link %>" target="_blank"><% end %>
+    <% if logo_link =~ /\S/ %><a class="img" href="<%= logo_link %>" target="_blank"><% end %>
       <img src="/hotspotlogin/logo<%= logoext %>"/>
     <% if logo_link =~ /\S/ %></a><% end %>
   </div>
 <% end %>
 
 <h2 id="headline"><%= titel %></h2>
+
 <div id="Reply-Message">
   <% if params['reply'] %>
     <%= Rack::Utils::escape_html params['reply'] %>
@@ -34,14 +37,14 @@
   <div id="logInLogOut-container">
     <a 
       id="logInLogOut" 
-      href="http://<%= uamip %>:<%= uamport %>/logoff">Logout</a>
-    <a href="#" onClick="javascript:chilliController.refresh();">Refresh</a>
+      href="http://<%= uamip %>:<%= uamport %>/logoff"><%= t.logout.titlecase %></a>
+    <a href="#logInLogOut-container" onClick="javascript:chilliController.refresh();"><%= t.refresh.titlecase %></a>
     <a
       id="myAccount"
       href=""
       target="_blank"
       style="display:none;"
-    >My Account<a>
+    ><%= t.my.titlecase %></a>
   </div>
 <% elsif [2, 5, 3, 13].include? result %>
   <div id="form-container">
@@ -66,36 +69,39 @@
   <div id="status-container">
     <table id="status-table">
       <tbody>
+        <%
+          # Yeah, do not use Ruby String methods, instead use CSS text-transform...
+        %>
         <tr id="userName:row">
-          <th scope="row">Username</th>
+          <th scope="row"><%= t.status.username %></th>
           <td id="userName"></td>
         <tr id="clientState:row">
-          <th scope="row">Client State</th>
+          <th scope="row"><%= t.status.client_state %></th>
           <td id="clientState"></td>
         </tr>
         <tr id="sessionTime:row">
-          <th scope="row">Session Time</th>
+          <th scope="row"><%= t.status.session_time %></th>
           <td id="sessionTime"></td>
         </tr>
         <tr id="sessionTimeLeft:row">
-          <th scope="row">Session Time Left</th>
+          <th scope="row"><%= t.status.session_time_left %></th>
           <td id="sessionTimeLeft"></th>
         </tr>
-        <tr id="idleTimeout:row">
-          <th scope="row">Idle Time/Timeout</th>
+        <!-- nobody really cares... -->
+        <tr id="idleTimeout:row" style="display:none;">
+          <th scope="row"><%= t.status.idle_time_timeout %></th>
           <td id="idleTimeout"></th>
         </tr>
         <tr id="download:row">
-          <th scope="row">Download Traffic</th>
+          <th scope="row"><%= t.status.download_traffic %></th>
           <td id="download"></td>
         </tr>
         <tr id="upload:row">
-          <th scope="row">Upload Traffic</th>
+          <th scope="row"><%= t.status.upload_traffic %></th>
           <td id="upload"></td>
         </tr>
-        <tr id="interval:row">
-          <th scope="row" class="optinfo">Automatically updated every</th>
-          <td id="interval"></td>
+        <tr id="interval:row" style="font-size:95%">
+          <td style="background:transparent; text-align:right" colspan="2" class="optinfo"><span style="font-style:italic; margin-left:0.8em;"><%= t.status.auto_updated_every.uppercase %>:</span> <span style="" id="interval"></td>
         </tr>
       </tbody>
     </table>

data/{public/hotspotlogin/js/UserStatus.js → views/js/UserStatus.js.erb}

@@ -1,3 +1,8 @@
+<% 
+  require 'facets/string'
+  require 'sinatra/r18n'
+  require 'hotspotlogin/extensions/string'
+%>
 // Requires ChilliLibrary.js
 // See: http://www.coova.org/CoovaChilli/JSON
 //
@@ -53,6 +58,21 @@ chilliController.scheduleIdleTimeoutAutorefresh = function() {
   }
 }
 
+chilliController.formatBytesShort = function( b , zeroReturn ) {
+  return chilliController.formatBytes( b , zeroReturn ).
+    replace('Bytes',      'B' ).
+    replace('Kilobytes',  'KB').
+    replace('Megabytes',  'MB').
+    replace('Gigabytes',  'GB'); 
+}
+
+chilliController.refreshAndLogoff = function() {
+  chilliController.refresh();
+  setTimeout('chilliController.logoff()', 250); // a delay is necessary...
+}
+
+
+
 function showUserStatus(h) {
 
   // Utility functions and objects
@@ -113,10 +133,10 @@ function showUserStatus(h) {
     txt = null;
     switch(clientState) {
       case chilliController.stateCodes.NOT_AUTH:
-        txt = 'Logged out from HotSpot';
+        txt = '<%= t.login.result.logoff.uppercase.escape_js %>';
         break;
       case chilliController.stateCodes.AUTH:
-        txt = 'Logged in to HotSpot';
+        txt = '<%= t.login.result.success.uppercase.escape_js %>';
         break;
     }
     if (txt) {
@@ -132,12 +152,13 @@ function showUserStatus(h) {
       switch(clientState) {
         case chilliController.stateCodes.NOT_AUTH:
           e.setAttribute('href', loginURL());
-          e.innerHTML = 'Login';
+          e.innerHTML = '<%= t.login.you!.uppercase.escape_js %>';
           break;
         case chilliController.stateCodes.AUTH:
-          e.setAttribute('href', '#');
-          e.onclick = chilliController.logoff; 
-          e.innerHTML = 'Logout';
+          e.setAttribute('href', '#headline');
+          // e.onclick = chilliController.logoff; 
+          e.onclick = chilliController.refreshAndLogoff;
+          e.innerHTML = '<%= t.logout.uppercase.escape_js %>';
           break;
       }
     }
@@ -176,6 +197,8 @@ function showUserStatus(h) {
     var download_e        = document.getElementById('download');
     var upload_e          = document.getElementById('upload');
     var interval_e        = document.getElementById('interval');
+    var interval_row_e    = document.getElementById('interval:row');
+
     if (userName_e) {
       userName_e.innerHTML = (
           chilliController.session.userName
@@ -186,56 +209,67 @@ function showUserStatus(h) {
         formatStateCode(chilliController.clientState) 
       );
     }
+    
     //if (chilliController.terminateCause) {
     //  document.getElementById('terminateCause').innerHTML = (
     //    chilliController.terminateCause
     //  )
     //}
-    if (sessionTime_e) {
-      document.getElementById('sessionTime').innerHTML = (
-        chilliController.formatTime(
-          chilliController.accounting.sessionTime, '0')
-      );
-    }
-    if (sessionTimeLeft_e) {
-      if (chilliController.session.sessionTimeout) {
-        document.getElementById('sessionTimeLeft').innerHTML = (
-          chilliController.formatTime(chilliController.sessionTimeLeft(), 0) 
+
+    // So at logoff session stats are preserved :)
+    if (chilliController.clientState == chilliController.stateCodes.AUTH) {
+
+      if (sessionTime_e) {
+        document.getElementById('sessionTime').innerHTML = (
+          chilliController.formatTime(
+            chilliController.accounting.sessionTime, '0')
+        );
+      }
+      if (sessionTimeLeft_e) {
+        if (chilliController.session.sessionTimeout) {
+          document.getElementById('sessionTimeLeft').innerHTML = (
+            chilliController.formatTime(chilliController.sessionTimeLeft(), 0) 
+          );
+          document.getElementById('sessionTimeLeft:row').style.display = '';
+        } else {
+          document.getElementById('sessionTimeLeft').innerHTML = ''
+        }
+      }
+      if (chilliController.session.idleTimeout) {
+        document.getElementById('idleTimeout').innerHTML = (
+            chilliController.formatTime(chilliController.accounting.idleTime) +
+            ' / '                                                             +
+            chilliController.formatTime(chilliController.session.idleTimeout)
+        );
+        // document.getElementById('idleTimeout:row').style.display = '';
+        // nobody really cares...
+      }
+      var download_bytes = 
+        chilliController.accounting.inputOctets +
+        Math.pow(2, 32) * chilliController.accounting.inputGigawords; 
+      var upload_bytes = 
+        chilliController.accounting.outputOctets +
+        Math.pow(2, 32) * chilliController.accounting.outputGigawords;    
+      if (download_e) {
+        download_e.innerHTML = (
+          chilliController.formatBytesShort(download_bytes, 0)
+        );
+      }
+      if (upload_e) {
+        upload_e.innerHTML = (
+          chilliController.formatBytesShort(upload_bytes, 0)
         );
-        document.getElementById('sessionTimeLeft:row').style.display = '';
-      } else {
-        document.getElementById('sessionTimeLeft').innerHTML = ''
       }
     }
-    if (chilliController.session.idleTimeout) {
-      document.getElementById('idleTimeout').innerHTML = (
-          chilliController.formatTime(chilliController.accounting.idleTime) +
-          ' / '                                                             +
-          chilliController.formatTime(chilliController.session.idleTimeout)
-      );
-      document.getElementById('idleTimeout:row').style.display = '';
-    }
-    var download_bytes = 
-      chilliController.accounting.inputOctets +
-      Math.pow(2, 32) * chilliController.accounting.inputGigawords; 
-    var upload_bytes = 
-      chilliController.accounting.outputOctets +
-      Math.pow(2, 32) * chilliController.accounting.outputGigawords;    
-    if (download_e) {
-      download_e.innerHTML = (
-        chilliController.formatBytes(download_bytes, 0)
-      );
-    }
-    if (upload_e) {
-      upload_e.innerHTML = (
-        chilliController.formatBytes(upload_bytes, 0)
-      );
-    }
+
     if (interval_e) {
       interval_e.innerHTML = (
         chilliController.formatTime(chilliController.interval, 0)
       );
     }
+    if (chilliController.clientState == chilliController.stateCodes.NOT_AUTH) {
+      interval_row_e.style.display = 'none';
+    }
     
     chilliController.scheduleSessionTimeoutAutorefresh();
     chilliController.scheduleIdleTimeoutAutorefresh();
@@ -248,4 +282,3 @@ function showUserStatus(h) {
 
 
 }
-

data/views/layout.erb

@@ -13,9 +13,11 @@
     <meta http-equiv="Cache-control" content="no-cache">
     <meta http-equiv="Pragma" content="no-cache">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+
     <script language="JavaScript"> // legacy stuff from hotspotlogin.cgi/php
       var width = 560;  // popup
-      var height = 560; // popup
+      var height = 600; // popup
       var blur = 0;
       var starttime = new Date();
       var startclock = starttime.getTime();

metadata

@@ -4,9 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  - 1
+  version: 1.3.0.1
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -14,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +00:00
+date: 2011-09-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: facets
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,6 +44,32 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sinatra-r18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Traditionally, a PHP or Perl/CGI web page has been used to login unauthenticated users to a Network Access Controller like ChilliSpot; this hotspotlogin implementation is based on Sinatra instead, and relies heavily on the CoovaChilli JSON interface.
 email: guido.derosa@vemarsas.it
 executables: 
@@ -52,10 +79,13 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- Changelog
 - README.rdoc
 - bin/hotspotlogin
 - examples/hotspotlogin.conf.yaml
 - examples/etc/lighttpd/lighttpd.conf
+- i18n/en.yml
+- i18n/it.yml
 - lib/hotspotlogin.rb
 - lib/hotspotlogin/app.rb
 - lib/hotspotlogin/app/helpers.rb
@@ -64,7 +94,7 @@ files:
 - lib/hotspotlogin/extensions/string.rb
 - public/hotspotlogin/css/default.css
 - public/hotspotlogin/js/ChilliLibrary.js
-- public/hotspotlogin/js/UserStatus.js
+- views/js/UserStatus.js.erb
 - views/layout.erb
 - views/hotspotlogin.erb
 - views/404.erb