Some more minor fixes

diff --git a/webapp/backend/database.py b/webapp/backend/database.py
index f092b13d71002284b23a10533c84d9231aee66db..7adb605090c3c04af5a3a597c07444fb9e05be92 100644 (file)
--- a/webapp/backend/database.py
+++ b/webapp/backend/database.py
@@ -170,7 +170,7 @@ class Connection(object):
                return self._db.cursor()
 
        def _execute(self, cursor, query, parameters, kwparameters):
-               logging.info("Query: %s" % (query % parameters))
+               #logging.info("Query: %s" % (query % parameters))
 
                try:
                        return cursor.execute(query, kwparameters or parameters)

diff --git a/webapp/handlers_base.py b/webapp/handlers_base.py
index b6ccdff51fc87f44c66cab00956a57cbd260e34a..a52aacf9da2646b39e852d1c01be163fc9c99962 100644 (file)
--- a/webapp/handlers_base.py
+++ b/webapp/handlers_base.py
@@ -84,6 +84,7 @@ class BaseHandler(tornado.web.RequestHandler):
        def get_remote_ip(self):
                # Fix for clients behind a proxy that sends "X-Forwarded-For".
                remote_ips = self.request.remote_ip.split(", ")
+
                for remote_ip in remote_ips:
                        try:
                                addr = ipaddr.IPAddress(remote_ip)
@@ -98,6 +99,9 @@ class BaseHandler(tornado.web.RequestHandler):
 
                        return remote_ip
 
+               # Return the last IP if nothing else worked
+               return remote_ips.pop()
+
        def get_remote_location(self):
                if not hasattr(self, "__remote_location"):
                        remote_ip = self.get_remote_ip()

diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index e74049115df0e930f9fc237fef6f2cfc24e2f4aa..47673ee712f0877ddfffc5548733f76e58f0c58e 100644 (file)
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -13,6 +13,8 @@ import tornado.locale
 import tornado.web
 import unicodedata
 
+import backend
+
 class UIModule(tornado.web.UIModule):
        @property
        def accounts(self):
@@ -111,7 +113,7 @@ class FireinfoGeoTableModule(UIModule):
                                other_countries.append(name)
                                continue
 
-                       country = tornado.database.Row({
+                       country = backend.database.Row({
                                "code"  : code,
                                "name"  : name,
                                "value" : value,