From 37d46bf72454f14b1ddabfa3f1b47d08b8158eb5 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Mon, 13 Jun 2011 08:21:42 +0000 Subject: [PATCH] Small update to apache like request logger. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@670 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/function.php | 22 +++++++++++++++++----- inc/misc/functions.php | 8 +++++++- inc/versioninfo.php | 4 ++-- sql.php | 10 +--------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/inc/function.php b/inc/function.php index 2ad43cb..3ad008b 100644 --- a/inc/function.php +++ b/inc/function.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: function.php - Last Update: 06/13/2011 SVN 669 - Author: cooldude2k $ + $FileInfo: function.php - Last Update: 06/13/2011 SVN 670 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="function.php"||$File3Name=="/function.php") { @@ -209,11 +209,13 @@ if($type!="location"&&$type!="refresh") { $type=="location"; } if($url!=null) { $file = $url.$file; } if($dbsr===true) { $file = str_replace("//", "/", $file); } if($type=="refresh") { header("Refresh: ".$time."; URL=".$file); } +if($type=="location") { idb_log_maker(302,"-"); } if($type=="location") { session_write_close(); header("Location: ".$file); } return true; } function redirects($type,$url,$time=0) { if($type!="location"&&$type!="refresh") { $type=="location"; } if($type=="refresh") { header("Refresh: ".$time."; URL=".$url); } +if($type=="location") { idb_log_maker(302,"-"); } if($type=="location") { header("Location: ".$url); } return true; } // Make xhtml tags function html_tag_make($name="br",$emptytag=true,$attbvar=null,$attbval=null,$extratest=null) { @@ -420,7 +422,7 @@ $qsep = htmlentities($qsep, ENT_QUOTES, $icharset); } $OldBoardQuery = preg_replace("/".$pregqstr."/isxS", $qstr, $_SERVER['QUERY_STRING']); $BoardQuery = "?".$OldBoardQuery; return $BoardQuery; } -function apache_log_maker($logtxt,$logfile=null) { +function apache_log_maker($logtxt,$logfile=null,$status=200,$contentsize="-") { global $Settings; if(!isset($_SERVER['HTTP_REFERER'])) { $URL_REFERER = "-"; } if(isset($_SERVER['HTTP_REFERER'])) { $URL_REFERER = $_SERVER['HTTP_REFERER']; } @@ -429,9 +431,9 @@ $logtxt = preg_replace("/".preg_quote("%l", "/")."/s", "-", $logtxt); $logtxt = preg_replace("/".preg_quote("%u", "/")."/s", "-", $logtxt); $logtxt = preg_replace("/".preg_quote("%t", "/")."/s", "[".date("d/M/Y:H:i:s O")."]", $logtxt); $logtxt = preg_replace("/".preg_quote("%r", "/")."/s", $_SERVER["REQUEST_METHOD"]." ".$_SERVER["REQUEST_URI"], $logtxt); -$logtxt = preg_replace("/".preg_quote("%s", "/")."/s", "200", $logtxt); -$logtxt = preg_replace("/".preg_quote("%>s", "/")."/s", "200", $logtxt); -$logtxt = preg_replace("/".preg_quote("%b", "/")."/s", "-", $logtxt); +$logtxt = preg_replace("/".preg_quote("%s", "/")."/s", $status, $logtxt); +$logtxt = preg_replace("/".preg_quote("%>s", "/")."/s", $status, $logtxt); +$logtxt = preg_replace("/".preg_quote("%b", "/")."/s", $contentsize, $logtxt); $logtxt = preg_replace("/".preg_quote("%{Referer}i", "/")."/s", $URL_REFERER, $logtxt); $logtxt = preg_replace("/".preg_quote("%{User-Agent}i", "/")."/s", $_SERVER["HTTP_USER_AGENT"], $logtxt); if(isset($logfile)&&$logfile!==null) { @@ -440,4 +442,14 @@ if(isset($logfile)&&$logfile!==null) { fwrite($fp, $logtxtnew, strlen($logtxtnew)); fclose($fp); } return $logtxt; } +function idb_log_maker($status=200,$contentsize="-") { +global $Settings,$SettDir; +if(!isset($Settings['log_http_request'])) { + $Settings['log_http_request'] = "off"; } +if(isset($Settings['log_http_request'])&&$Settings['log_http_request']=="on"&& + $Settings['log_http_request']!==null&&$Settings['log_http_request']!="off") { +return apache_log_maker("%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"", $SettDir['logs'].$Settings['sqltable'].date("m-d-Y").".log",$status,$contentsize); } +if(isset($Settings['log_http_request'])&&$Settings['log_http_request']!="on"&& + $Settings['log_http_request']!==null&&$Settings['log_http_request']!="off") { +return apache_log_maker("%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"", $SettDir['logs'].$Settings['log_http_request'],$status,$contentsize); } } ?> diff --git a/inc/misc/functions.php b/inc/misc/functions.php index 8dc8dc5..8f91c56 100644 --- a/inc/misc/functions.php +++ b/inc/misc/functions.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: functions.php - Last Update: 03/01/2011 SVN 625 - Author: cooldude2k $ + $FileInfo: functions.php - Last Update: 06/13/2011 SVN 670 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="functions.php"||$File3Name=="/functions.php") { @@ -64,12 +64,14 @@ $output = preg_replace("/&PHPSESSID/", "&PHPSESSID", $output); $qstrcode = htmlentities($Settings['qstr'], ENT_QUOTES, $Settings['charset']); $output = str_replace($Settings['qstr'].$SessName, $qstrcode.$SessName, $output); if($use_gzip!="on") { + idb_log_maker(200,strlen($output)); echo $output; } if($use_gzip=="on") { if($gzip_type=="gzip") { $goutput = gzencode($output); } if($gzip_type=="deflate") { $goutput = gzcompress($output); } + idb_log_maker(200,strlen($goutput)); echo $goutput; } } // Fix amp => (&) to & and gzip page function fix_amp($use_gzip="off",$gzip_type="gzip") { @@ -82,12 +84,14 @@ $output = preg_replace("/&PHPSESSID/", "&PHPSESSID", $output); $qstrcode = htmlentities($Settings['qstr'], ENT_QUOTES, $Settings['charset']); $output = str_replace($Settings['qstr'].$SessName, $qstrcode.$SessName, $output); if($use_gzip!="on") { + idb_log_maker(200,strlen($output)); echo $output; } if($use_gzip=="on") { if($gzip_type=="gzip") { $goutput = gzencode($output); } if($gzip_type=="deflate") { $goutput = gzcompress($output); } + idb_log_maker(200,strlen($goutput)); echo $goutput; } } $Names['RJ'] = "Rene Johnson"; define("_rene_", $Names['RJ']); @@ -97,12 +101,14 @@ global $Settings; $output = ob_get_clean(); if($gzip_type!="gzip") { if($gzip_type!="deflate") { $gzip_type = "gzip"; } } if($use_gzip!="on") { + idb_log_maker(200,strlen($output)); echo $output; } if($use_gzip=="on") { if($gzip_type=="gzip") { $goutput = gzencode($output); } if($gzip_type=="deflate") { $goutput = gzcompress($output); } + idb_log_maker(200,strlen($goutput)); echo $goutput; } } $foo="bar"; $$foo="foo"; $Names['KSP'] = "Kazuki Suzuki Przyborowski"; diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 18318f3..382fde0 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 06/13/2011 SVN 669 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 06/13/2011 SVN 670 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") { @@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) { return $return_var; } // Version number and date stuff. :P $VER1[0] = 0; $VER1[1] = 4; $VER1[2] = 4; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 669; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 670; $SVNDay[0] = 06; $SVNDay[1] = 13; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB"; $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards"; diff --git a/sql.php b/sql.php index bc61ea9..236382e 100644 --- a/sql.php +++ b/sql.php @@ -11,7 +11,7 @@ Copyright 2004-2011 iDB Support - http://idb.berlios.de/ Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: sql.php - Last Update: 06/13/2011 SVN 669 - Author: cooldude2k $ + $FileInfo: sql.php - Last Update: 06/13/2011 SVN 670 - Author: cooldude2k $ */ /* Some ini setting changes uncomment if you need them. Display PHP Errors */ @@ -175,14 +175,6 @@ if($Settings['use_hashtype']!="md2"&& require_once($SettDir['misc'].'setcheck.php'); $dayconv = array('second' => 1, 'minute' => 60, 'hour' => 3600, 'day' => 86400, 'week' => 604800, 'month' => 2630880, 'year' => 31570560, 'decade' => 315705600); require_once($SettDir['inc'].'function.php'); -if(!isset($Settings['log_http_request'])) { - $Settings['log_http_request'] = "off"; } -if(isset($Settings['log_http_request'])&&$Settings['log_http_request']=="on"&& - $Settings['log_http_request']!==null&&$Settings['log_http_request']!="off") { -apache_log_maker("%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"", $SettDir['logs'].$Settings['sqltable'].date("m-d-Y").".log"); } -if(isset($Settings['log_http_request'])&&$Settings['log_http_request']!="on"&& - $Settings['log_http_request']!==null&&$Settings['log_http_request']!="off") { -apache_log_maker("%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"", $SettDir['logs'].$Settings['log_http_request']); } $iDBVerName = "iDB|".$VER2[1]."|".$VER1[0].".".$VER1[1].".".$VER1[2]."|".$VER2[2]."|".$SubVerN; /* This way checks iDB version by sending the iDBVerName to the iDB Version Checker. -- 2.11.0