OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4336ad)
Update to apache like request logger.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sat, 18 Jun 2011 19:11:03 +0000 (19:11 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sat, 18 Jun 2011 19:11:03 +0000 (19:11 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@678 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/admin/main.php patch | blob | history
inc/function.php patch | blob | history
inc/versioninfo.php patch | blob | history
setup/mkconfig.php patch | blob | history

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 3a08b98..811b05e 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 06/14/2011 SVN 672 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 06/18/2011 SVN 678 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -118,6 +118,12 @@ if(!isset($SettInfo['board_name'])&&isset($Settings['board_name'])) {
        $SettInfo['board_name'] = $Settings['board_name']; }
 if($Settings['board_name']!=$SettInfo['board_name']) {
        $SettInfo['board_name'] = $Settings['board_name']; }
+if(!isset($Settings['VerCheckURL'])) {
+       $Settings['VerCheckURL'] = ""; }
+if(!isset($Settings['IPCheckURL'])) {
+       $Settings['IPCheckURL'] = ""; }
+if(!isset($Settings['log_config_format'])) {
+       $Settings['log_config_format'] = "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""; }
 ?>
 <table class="Table3">
 <tr style="width: 100%; vertical-align: top;">
@@ -205,7 +211,10 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['enable_pathinfo'] = ".null_string($Settings['enable_pathinfo']).";\n".
 "\$Settings['rssurl'] = ".null_string($Settings['rssurl']).";\n".
 "\$Settings['board_offline'] = ".null_string($Settings['board_offline']).";\n".
+"\$Settings['VerCheckURL'] = ".null_string($Settings['VerCheckURL']).";\n".
+"\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
+"\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
 "\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
@@ -851,7 +860,10 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['enable_pathinfo'] = ".null_string($Settings['enable_pathinfo']).";\n".
 "\$Settings['rssurl'] = ".null_string($Settings['rssurl']).";\n".
 "\$Settings['board_offline'] = ".null_string($Settings['board_offline']).";\n".
+"\$Settings['VerCheckURL'] = ".null_string($Settings['VerCheckURL']).";\n".
+"\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
+"\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
 "\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
@@ -1027,7 +1039,10 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['enable_pathinfo'] = ".null_string($Settings['enable_pathinfo']).";\n".
 "\$Settings['rssurl'] = ".null_string($Settings['rssurl']).";\n".
 "\$Settings['board_offline'] = ".null_string($Settings['board_offline']).";\n".
+"\$Settings['VerCheckURL'] = ".null_string($Settings['VerCheckURL']).";\n".
+"\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
+"\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
 "\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
@@ -1186,7 +1201,10 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['enable_pathinfo'] = ".null_string($Settings['enable_pathinfo']).";\n".
 "\$Settings['rssurl'] = ".null_string($Settings['rssurl']).";\n".
 "\$Settings['board_offline'] = ".null_string($Settings['board_offline']).";\n".
+"\$Settings['VerCheckURL'] = ".null_string($Settings['VerCheckURL']).";\n".
+"\$Settings['IPCheckURL'] = ".null_string($Settings['IPCheckURL']).";\n".
 "\$Settings['log_http_request'] = ".null_string($Settings['log_http_request']).";\n".
+"\$Settings['log_config_format'] = ".null_string($Settings['log_config_format']).";\n".
 "\$Settings['BoardUUID'] = ".null_string($Settings['BoardUUID']).";\n".
 "\$Settings['KarmaBoostDays'] = ".null_string($Settings['KarmaBoostDays']).";\n".
 "\$Settings['KBoostPercent'] = ".null_string($Settings['KBoostPercent']).";\n".$pretext2[1]."\n".
diff --git a/inc/function.php b/inc/function.php
index c5244be..c0bf7f0 100644 (file)
--- 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/14/2011 SVN 672 - Author: cooldude2k $
+    $FileInfo: function.php - Last Update: 06/18/2011 SVN 678 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="function.php"||$File3Name=="/function.php") {
@@ -425,14 +425,33 @@ 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']; }
+if(!isset($_SERVER['PHP_AUTH_USER'])) { $AUTH_USER = "-"; }
+if(isset($_SERVER['PHP_AUTH_USER'])) { $AUTH_USER = $_SERVER['PHP_AUTH_USER']; }
+$LOG_QUERY_STRING = "";
+if($_SERVER["QUERY_STRING"]!=="") {
+$LOG_QUERY_STRING = "?".$_SERVER["QUERY_STRING"]; }
+$oldcontentsize = $contentsize;
+if($contentsize===0) { $contentsize = "-"; }
 $logtxt = preg_replace("/".preg_quote("%h", "/")."/s", $_SERVER['REMOTE_ADDR'], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%a", "/")."/s", $_SERVER['REMOTE_ADDR'], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%A", "/")."/s", $_SERVER["SERVER_ADDR"], $logtxt);
 $logtxt = preg_replace("/".preg_quote("%l", "/")."/s", "-", $logtxt);
-$logtxt = preg_replace("/".preg_quote("%u", "/")."/s", "-", $logtxt);
+$logtxt = preg_replace("/".preg_quote("%u", "/")."/s", $AUTH_USER, $logtxt);
+$logtxt = preg_replace("/".preg_quote("%f", "/")."/s", $_SERVER["SCRIPT_FILENAME"], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%H", "/")."/s", $_SERVER["SERVER_PROTOCOL"], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%m", "/")."/s", $_SERVER["REQUEST_METHOD"], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%p", "/")."/s", $_SERVER["SERVER_PORT"], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%q", "/")."/s", $LOG_QUERY_STRING, $logtxt);
+$logtxt = preg_replace("/".preg_quote("%U", "/")."/s", $_SERVER["PHP_SELF"], $logtxt);
+// Not what it should be but PHP dose not have variable to get Apache ServerName config value. :( 
+$logtxt = preg_replace("/".preg_quote("%v", "/")."/s", $_SERVER["SERVER_NAME"], $logtxt);
+$logtxt = preg_replace("/".preg_quote("%V", "/")."/s", $_SERVER["SERVER_NAME"], $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("%r", "/")."/s", $_SERVER["REQUEST_METHOD"]." ".$_SERVER["REQUEST_URI"]." ".$_SERVER["SERVER_PROTOCOL"], $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("%B", "/")."/s", $oldcontentsize, $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) {
@@ -445,10 +464,12 @@ 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_config_format'])) {
+       $Settings['log_config_format'] = "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""; }
 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("YW").".log",$status,$contentsize); }
+return apache_log_maker($Settings['log_config_format'], $SettDir['logs'].$Settings['sqltable'].date("YW").".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); } }
+return apache_log_maker($Settings['log_config_format'], $SettDir['logs'].$Settings['log_http_request'], $status, $contentsize); } }
 ?>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index f19a0db..423429f 100644 (file)
--- 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/18/2011 SVN 677 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 06/18/2011 SVN 678 - 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] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 677;
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 678;
 $SVNDay[0] = 06; $SVNDay[1] = 18; $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";
@@ -50,16 +50,20 @@ $KSPAlt = "Kazuki Suzuki Przyborowski";
 */
 $iDBHome = "http://idb.berlios.de/"; $DF2kHome = "http://df2k.berlios.de/"; 
 $OrgName = "iDB"; $AltOrgName = "RDB"; $AltiDB = "Renee Discussion Boards";
-if(!isset($Settings['VerCheckURL'])) {
+if(!isset($Settings['VerCheckURL'])||
+       $Settings['VerCheckURL']==="") {
 $VerCheckURL = $iDBHome."?act=vercheck"; }
-if(isset($Settings['VerCheckURL'])) {
+if(isset($Settings['VerCheckURL'])&&
+       $Settings['VerCheckURL']!=="") {
 $VerCheckURL = $Settings['VerCheckURL']; }
 $VerCheckQuery = parse_url($VerCheckURL);
 $VerCheckQuery = $VerCheckQuery['query'];
 if($VerCheckQuery=="") { $VerCheckURL = $VerCheckURL."?"; }
-if(!isset($Settings['IPCheckURL'])) {
+if(!isset($Settings['IPCheckURL'])||
+       $Settings['IPCheckURL']==="") {
 $IPCheckURL = 'http://cqcounter.com/whois/?query=%s'; }
-if(isset($Settings['IPCheckURL'])) {
+if(isset($Settings['IPCheckURL'])&&
+       $Settings['IPCheckURL']!=="") {
 $IPCheckURL = $Settings['IPCheckURL']; }
 $CD2k = "Kazuki Przyborowski"; $GM2k = "Game Maker 2k"; $iDB_Author = "Kazuki";
 $iDB = "Internet Discussion Boards"; $iTB = "Internet Tag Boards"; 
diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index 846e3ca..4f2d595 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 06/13/2011 SVN 669 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 06/18/2011 SVN 678 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -324,7 +324,10 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['enable_pathinfo'] = 'off';\n".
 "\$Settings['rssurl'] = 'off';\n".
 "\$Settings['board_offline'] = 'off';\n".
+"\$Settings['VerCheckURL'] = '';\n".
+"\$Settings['IPCheckURL'] = '';\n".
 "\$Settings['log_http_request'] = 'off';\n".
+"\$Settings['log_config_format'] = '%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"';\n".
 "\$Settings['BoardUUID'] = '".$ServerUUID."';\n".
 "\$Settings['KarmaBoostDays'] = '".$KarmaBoostDay."';\n".
 "\$Settings['KBoostPercent'] = '6|10';\n".$pretext2[1]."\n".
Internet Discussion Boards is a message board system by Game Maker 2k. Its very easy to set up. Your web host needs PHP and CUBRID / MySQL / MariaDB / PostgreSQL / SQLite. Internet Discussion Boards is Open Source so you can make changes to it.
About OSDN
Find Software
Develop Software
Help