mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4925 - monthly stats were being double counted

Browse Source 
Also some notice removal
This commit is contained in:
e107steved
2010-03-13 22:14:30 +00:00
parent eeee1e20cd
commit c03a06be82
2 changed files with 264 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e107_plugins/log/log.php
View File

@@ -8,7 +8,7 @@
* *
* Administration Area - User classes * Administration Area - User classes
* *
* $Source: /cvs_backup/e107_0.8/e107_plugins/log/log.php,v $ * $Source: /cvsroot/e107/e107_0.8/e107_plugins/log/log.php,v $
* $Revision$ * $Revision$
* $Date$ * $Date$
* $Author$ * $Author$
@@ -23,15 +23,24 @@
res= res res= res
err_direct - optional error flag err_direct - optional error flag
err_referer - referrer if came via error page err_referer - referrer if came via error page
qry = 1 to log query part as well
// Normally the file is 'silent' - if any errors occur, not sure where they'll appear - (file type now text/html instead of text/css) // Normally the file is 'silent' - if any errors occur, not sure where they'll appear - (file type now text/html instead of text/css)
*/ */
define('log_INIT', TRUE); define('log_INIT', TRUE);
// Array of page names which should have individual query values recorded.
// The top level array index is the page name.
// If the top level value is an array, it must be an array of query string beginnings to match.
$pageUnique = array('page' => 1, 'content' => array('content'));
$logVals = urldecode(base64_decode($_SERVER['QUERY_STRING'])); $logVals = urldecode(base64_decode($_SERVER['QUERY_STRING']));
parse_str($logVals, $vals); parse_str($logVals, $vals);
echo "\n"; // This is harmless data which seems to avoid intermittent problems.
header('Cache-Control: no-cache, must-revalidate'); // See if this discourages browser caching
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
//$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, $logVals."\n"); fclose($logfp); //$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, $logVals."\n"); fclose($logfp);
//$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, print_r($vals, TRUE)."\n"); fclose($logfp); //$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, print_r($vals, TRUE)."\n"); fclose($logfp);
@@ -40,8 +49,10 @@ $colour = strip_tags((isset($vals['colour']) ? $vals['colour'] : ''));
$res = strip_tags((isset($vals['res']) ? $vals['res'] : '')); $res = strip_tags((isset($vals['res']) ? $vals['res'] : ''));
$self = strip_tags((isset($vals['eself']) ? $vals['eself'] : '')); $self = strip_tags((isset($vals['eself']) ? $vals['eself'] : ''));
$ref = addslashes(strip_tags((isset($vals['referer']) ? $vals['referer'] : ''))); $ref = addslashes(strip_tags((isset($vals['referer']) ? $vals['referer'] : '')));
$date = date("z.Y", time()); $logQry = isset($vals['qry']) && $vals['qry'];
$logPfile = "logs/logp_".$date.".php";
$date = date('z.Y', time());
$logPfile = 'logs/logp_'.$date.'.php';
//$logString = "Colour: {$colour} Res: {$res} Self: {$self} Referrer: {$ref} ErrCode: {$vals['err_direct']}\n"; //$logString = "Colour: {$colour} Res: {$res} Self: {$self} Referrer: {$ref} ErrCode: {$vals['err_direct']}\n";
//$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, $logString); fclose($logfp); //$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, $logString); fclose($logfp);
@@ -98,18 +109,23 @@ $pageDisallow = "cache|file|eself|admin";
$tagRemove = "(\\\)|(\s)|(\')|(\")|(eself)|( )|(\.php)|(\.html)"; $tagRemove = "(\\\)|(\s)|(\')|(\")|(eself)|( )|(\.php)|(\.html)";
$tagRemove2 = "(\\\)|(\s)|(\')|(\")|(eself)|( )"; $tagRemove2 = "(\\\)|(\s)|(\')|(\")|(eself)|( )";
preg_match("#/(.*?)(\?|$)#si", $self, $match); preg_match("#/(.*?)(\?|$)(.*)#si", $self, $match);
$match[1] = isset($match[1]) ? $match[1] : ''; $match[1] = isset($match[1]) ? $match[1] : '';
$pageName = substr($match[1], (strrpos($match[1], "/")+1)); $pageName = substr($match[1], (strrpos($match[1], "/")+1));
$PN = $pageName; $PN = $pageName;
$pageName = preg_replace("/".$tagRemove."/si", "", $pageName); $pageName = preg_replace("/".$tagRemove."/si", "", $pageName);
if($pageName == "") $pageName = "index"; if($pageName == "") $pageName = "index";
$pageName = $err_code.$pageName; // Add the error code at the beginning, so its treated uniquely
if(preg_match("/".$pageDisallow."/i", $pageName)) return; if(preg_match("/".$pageDisallow."/i", $pageName)) return;
if ($logQry)
{
$pageName .= '+'.$match[3]; // All queries match
}
$pageName = $err_code.$pageName; // Add the error code at the beginning, so its treated uniquely
//$logfp = fopen('logs/rcvstring.txt', 'a+'); fwrite($logfp, $pageName."\n"); fclose($logfp);
$p_handle = fopen($logPfile, 'r+'); $p_handle = fopen($logPfile, 'r+');
if($p_handle && flock( $p_handle, LOCK_EX ) ) if($p_handle && flock( $p_handle, LOCK_EX ) )
{ {

13
e107_plugins/log/stats_csv.php
View File

@@ -17,28 +17,27 @@
//define('CSV_DEBUG', TRUE); //define('CSV_DEBUG', TRUE);
require_once("../../class2.php"); require_once('../../class2.php');
if (!getperms("P")) if (!getperms('P'))
{ {
header("location:../index.php"); header('Location: '.e_BASE.'index.php');
exit; exit;
} }
if (e_QUERY) if (e_QUERY)
{ {
$sl_qs = explode(".", e_QUERY); $sl_qs = explode('.', e_QUERY);
} }
$action = varset($sl_qs[0],'config'); $action = varset($sl_qs[0],'config');
$params = varset($sl_qs[1],''); $params = varset($sl_qs[1],'');
if (($action != 'export') || $params) if (($action != 'export') || $params)
{ {
header("location:../index.php"); header('Location: '.e_BASE.'index.php');
exit; exit;
} }
define("LOGPATH", e_PLUGIN."log/"); include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin_log.php'); // LANs may be needed for error messages
include_lan(LOGPATH."languages/admin/".e_LANGUAGE.".php"); // LANs may be needed for error messages
// List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well. (Here, only keys are used for validation) // List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well. (Here, only keys are used for validation)