From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Mar 2015 22:29:21 +0000 (+0100)
Subject: Some more minor fixes
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=494d80e6065ff5dc39058578f874df0db758e720;p=ipfire.org.git

Some more minor fixes
---

diff --git a/webapp/backend/database.py b/webapp/backend/database.py
index f092b13d..7adb6050 100644
--- 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 b6ccdff5..a52aacf9 100644
--- 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 e7404911..47673ee7 100644
--- 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,