From 3e2a2f40b8b2e64fe10fb6c0c271ba1d922ce436 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Mon, 26 Jul 2010 22:04:36 +0000
Subject: [PATCH] Adjust logging string to try and please suhosin - thanks rgk
 for thought/testing

---
 e107_plugins/log/e_meta.php | 30 ++++++++++++++----------------
 e107_plugins/log/log.php    | 27 +++++++++++++--------------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/e107_plugins/log/e_meta.php b/e107_plugins/log/e_meta.php
index b60cf5942..9f2abdcc2 100644
--- a/e107_plugins/log/e_meta.php
+++ b/e107_plugins/log/e_meta.php
@@ -1,18 +1,16 @@
 <?php
 /*
- * e107 website system
- *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- * Administration Area - User classes
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/log/e_meta.php,v $
- * $Revision$
- * $Date$
- * $Author$
- *
+* e107 website system
+*
+* Copyright 2001-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Site access logging
+*
+* $URL$
+* $Id$
+*
 */
 if (!defined('e107_INIT')) { exit; }
 
@@ -26,7 +24,7 @@ if (isset($pref['statActivate']) && $pref['statActivate'])
 	// Page to log here
 	require_once(e_PLUGIN.'log/consolidate.php');
 	$err_flag = '';
-	if (defined("ERR_PAGE_ACTIVE"))
+	if (defined('ERR_PAGE_ACTIVE'))
 	{	// We've got an error - set a flag to log it
 		$err_flag = "&err_direct=".ERR_PAGE_ACTIVE;
 		if (is_numeric(e_QUERY)) $err_flag .= '/'.substr(e_QUERY,0,10);		// This should pick up the error code - and limit numeric length to upset the malicious
@@ -55,9 +53,9 @@ function rstr2b64(input)
 var ref=\"\"+escape(top.document.referrer);
 var colord = window.screen.colorDepth;
 var res = window.screen.width + \"x\" + window.screen.height;
-var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + document.location + '&res=' + res + '".$err_flag."';
+var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + eself + '&res=' + res + '".$err_flag."';
 logString = rstr2b64(logString);
-document.write( '<link rel=\"stylesheet\" type=\"text/html\" href=\"".e_PLUGIN_ABS."log/log.php?'+logString + '\">' );
+document.write('<link rel=\"stylesheet\" type=\"text/css\" href=\"".e_PLUGIN_ABS."log/log.php?lv='+logString + '\">' );
 ";
 	$e107 = e107::getInstance();
 	$e107->getJs()->headerInline($logJS, 5);
diff --git a/e107_plugins/log/log.php b/e107_plugins/log/log.php
index 44c071ae4..6f760e9a0 100644
--- a/e107_plugins/log/log.php
+++ b/e107_plugins/log/log.php
@@ -1,18 +1,16 @@
 <?php
 /*
- * e107 website system
- *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- * Administration Area - User classes
- *
- * $Source: /cvsroot/e107/e107_0.8/e107_plugins/log/log.php,v $
- * $Revision$
- * $Date$
- * $Author$
- *
+* e107 website system
+*
+* Copyright 2001-2010 e107 Inc (e107.org)
+* Released under the terms and conditions of the
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+*
+* Site access logging - 'receiver'
+*
+* $URL$
+* $Id$
+*
 */
 
 /* File to log page accesses - called with
@@ -35,7 +33,8 @@ define('log_INIT', TRUE);
 $pageUnique = array('page' => 1, 'content' => array('content'));
 
 
-$logVals = urldecode(base64_decode($_SERVER['QUERY_STRING']));
+//$logVals = urldecode(base64_decode($_SERVER['QUERY_STRING']));
+$logVals = urldecode(base64_decode($_GET['lv']));
 parse_str($logVals, $vals);