From 9b943da60a39b6a4cdc6291ed658908f0e144d89 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 6 Jul 2014 02:13:08 +0200
Subject: Revert "Rework the GeoIP code, add country-based poster names"

This reverts commit db3c7f4ee984002fccb86e0cb3fda45edde74351.
---
 post.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'post.php')

diff --git a/post.php b/post.php
index dbef412e..d6dfdaa1 100644
--- a/post.php
+++ b/post.php
@@ -488,8 +488,26 @@ if (isset($_POST['delete'])) {
 	}
 	
 	if ($config['country_flags']) {
-		if (!in_array($country_code, array('eu', 'ap', 'o1', 'a1', 'a2')))
-			$post['body'] .= "\n<tinyboard flag>".$country_code."</tinyboard>\n<tinyboard flag alt>".$country_name."</tinyboard>";
+		require 'inc/lib/geoip/geoip.inc';
+		$gi=geoip\geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
+	
+		function ipv4to6($ip) {
+			if (strpos($ip, ':') !== false) {
+				if (strpos($ip, '.') > 0)
+					$ip = substr($ip, strrpos($ip, ':')+1);
+				else return $ip;  //native ipv6
+			}
+			$iparr = array_pad(explode('.', $ip), 4, 0);
+			$part7 = base_convert(($iparr[0] * 256) + $iparr[1], 10, 16);
+			$part8 = base_convert(($iparr[2] * 256) + $iparr[3], 10, 16);
+			return '::ffff:'.$part7.':'.$part8;
+		}
+	
+		if ($country_code = geoip\geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) {
+			if (!in_array(strtolower($country_code), array('eu', 'ap', 'o1', 'a1', 'a2')))
+				$post['body'] .= "\n<tinyboard flag>".strtolower($country_code)."</tinyboard>".
+				"\n<tinyboard flag alt>".geoip\geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))."</tinyboard>";
+		}
 	}
 	
 	if ($config['user_flag'] && isset($_POST['user_flag']))
-- 
cgit v1.3