From 35325bd0110d62ff0468c2b57251678409e674f2 Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Thu, 17 Feb 2011 20:58:34 +1100
Subject: IPv6_IPv4

---
 inc/functions.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index 14733ec8..b7b4ce90 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2,7 +2,7 @@
 	loadConfig();
 	
 	function loadConfig() {
-		global $board, $config;
+		global $board, $config, $__ip;
 		
 		require 'config.php';
 		if (file_exists('inc/instance-config.php')) {
@@ -54,6 +54,16 @@
 			error_reporting(E_ALL);
 			ini_set('display_errors', 1);
 		}
+		
+		if($config['ipv6_ipv4']) {
+			// Keep the original address to properly comply with other board configuartions
+			if(!isset($__ip))
+				$__ip = $_SERVER['REMOTE_ADDR'];
+			
+			// ::ffff:0.0.0.0
+			if(preg_match('/^\:\:ffff\:(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m))
+				$_SERVER['REMOTE_ADDR'] = $m[1];
+		}
 	}
 	
 	function sprintf3($str, $vars, $delim = '%') {
-- 
cgit v1.3