From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 28 Sep 2015 22:00:01 +0000 (+0200)
Subject: geoip: Tolerate lots of spaces in database fields
X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=commitdiff_plain;h=f28bd37a953eb51dd7a9e5ae6524f651b3f0757a

geoip: Tolerate lots of spaces in database fields

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/webapp/backend/geoip.py b/webapp/backend/geoip.py
index 9a3650f0..16159a58 100644
--- a/webapp/backend/geoip.py
+++ b/webapp/backend/geoip.py
@@ -24,7 +24,16 @@ class GeoIP(Object):
 		query = "SELECT * FROM geoip \
 			WHERE %s BETWEEN start_ip AND end_ip LIMIT 1"
 
-		return self.db.get(query, addr)
+		ret = self.db.get(query, addr)
+
+		if ret:
+			if ret.city:
+				ret.city = ret.city.strip()
+
+			if ret.postal_code:
+				ret.postal_code = ret.postal_code.strip()
+
+		return ret
 
 	def get_asn(self, addr):
 		query = "SELECT asn FROM geoip_asn \