config.py

@@ -27,6 +27,8 @@ session_timeout = int( os.environ.get( "SESSION_TIMEOUT", 15 * 60 ) )
 
 TOTP_VALIDWINDOW = 5
 
+PROXY = os.environ.get( "BEHIND_PROXY", True )
+
 pianosurl = os.environ.get( "DB_PIANOS_URL", "pgsql://pianos:pianos@pianos/pianos" )
 pianosdb = DatabasePiAnoS( pianosurl )
 pianosendpoint = os.environ.get( "PIANOS_ENDPOINT", "/pianos" )

module.py

@@ -26,6 +26,7 @@ from flask import url_for
 from flask_compress import Compress
 from flask_session import Session
 from werkzeug import abort, redirect
+from werkzeug.middleware.proxy_fix import ProxyFix
 import gnupg
 import pyotp
 import pytz
@@ -61,6 +62,9 @@ app.config.from_pyfile( "config.py" )
 Compress( app )
 Session( app )
 
+if config.PROXY:
+    app.wsgi_app = ProxyFix( app.wsgi_app )
+
 baseurl = os.environ.get( "BASEURL", "" )
 envtype = os.environ.get( "ENVTYPE", "" )
 

templates/login.html

@@ -183,14 +183,19 @@
                                     var time_diff = data.time_diff;
                                     time_diff = Math.abs( time_diff );
                                     
-                                    time_diff = moment.duration( time_diff, "seconds" )
-                                    time_diff = moment.utc( time_diff.asMilliseconds() ).format( "mm" );
+                                    time_diff_h = Math.floor( time_diff / 3600 );
+                                    time_diff_m = Math.floor( ( time_diff - time_diff_h * 3600 ) / 60 );
+                                    
+                                    var time_diff_msg = "Your phone time is probably off by "
+                                    if( time_diff_h > 0 )
+                                        time_diff_msg += time_diff_h + " hour(s) and "
+                                    time_diff_msg += time_diff_m + " minute(s).";
                                     
                                     $( "#icnml_login_warning" )
                                         .css( "margin-bottom", "0px" );
                                     
                                     $( "#icnml_login_warning2" )
-                                        .text( "Your phone time is probably off by " + time_diff + " minutes" );
+                                        .text( time_diff_msg );
                                 }
                             }
                         }