From cf9456a36c1f05353c8f65b783d114cad3de5e13 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sun, 13 Jan 2008 17:04:48 +0000
Subject: [PATCH] Get rid of unneeded file

---
 e107_handlers/encrypt_handler.php | 39 -------------------------------
 userposts.php                     | 13 +++++++----
 2 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 e107_handlers/encrypt_handler.php

diff --git a/e107_handlers/encrypt_handler.php b/e107_handlers/encrypt_handler.php
deleted file mode 100644
index 29eba6aa2..000000000
--- a/e107_handlers/encrypt_handler.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_handlers/encrypt_handler.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-09-29 17:48:27 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
-
-if (!defined('e107_INIT')) { exit; }
-
-function encode_ip($ip)
-{
-  if (strpos($ip,':') !== FALSE) return $ip;			// IPV6 addresses - return unaltered
-	$ipa = explode('.', $ip);
-	return sprintf('%02x%02x%02x%02x', $ipa[0], $ipa[1], $ipa[2], $ipa[3]);
-}
-
-function decode_ip($encodedIP)
-{
-  if (strpos($encodedIP,':') !== FALSE) return $encodedIP;			// IPV6 addresses - return unaltered
-	$hexip = explode('.', chunk_split($encodedIP, 2, '.'));
-	return hexdec($hexip[0]). '.' . hexdec($hexip[1]) . '.' . hexdec($hexip[2]) . '.' . hexdec($hexip[3]);
-}
-
-
-
-
-?>
\ No newline at end of file
diff --git a/userposts.php b/userposts.php
index 23ba6f8f3..036106b63 100644
--- a/userposts.php
+++ b/userposts.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/userposts.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2007-10-28 15:01:49 $
+|     $Revision: 1.6 $
+|     $Date: 2008-01-13 17:04:47 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -87,8 +87,13 @@ if ($action == "comments")
 	}
 	else
 	{
-		require_once(e_HANDLER."encrypt_handler.php");
-		$dip = decode_ip($id);
+		$dip = $id;
+		if (strlen($dip) == 8)
+		{  // Legacy decode (IPV4 address as it used to be stored - hex string)
+		  $hexip = explode('.', chunk_split($dip, 2, '.'));
+		  $dip = hexdec($hexip[0]). '.' . hexdec($hexip[1]) . '.' . hexdec($hexip[2]) . '.' . hexdec($hexip[3]);
+		  
+		}
 		$ccaption = UP_LAN_1.$dip;
 		$data = $cobj->getCommentData($amount='10', $from, "comment_ip = '".$id."'");
 	}