OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6404920)
Small bug fix to http logger.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sun, 1 Jan 2012 19:58:18 +0000 (19:58 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sun, 1 Jan 2012 19:58:18 +0000 (19:58 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@784 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/function.php patch | blob | history
inc/members.php patch | blob | history
inc/stats.php patch | blob | history
inc/versioninfo.php patch | blob | history

diff --git a/inc/function.php b/inc/function.php
index 8856bda..5bb62b6 100644 (file)
--- a/inc/function.php
+++ b/inc/function.php
@@ -11,7 +11,7 @@
     Copyright 2004-2012 iDB Support - http://idb.berlios.de/
     Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: function.php - Last Update: 12/29/2012 SVN 776 - Author: cooldude2k $
+    $FileInfo: function.php - Last Update: 01/01/2012 SVN 784 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="function.php"||$File3Name=="/function.php") {
@@ -459,6 +459,10 @@ $qsep = htmlentities($qsep, ENT_QUOTES, $icharset); }
 $OldBoardQuery = preg_replace("/".$pregqstr."/isxS", $qstr, $_SERVER['QUERY_STRING']);
 $BoardQuery = "?".$OldBoardQuery;
 return $BoardQuery; }
+function log_fix_quotes($logtxt) {
+       $logtxt = str_replace("\"", "\\\"", $logtxt);
+       $logtxt = str_replace("'", "", $logtxt);
+       return $logtxt; }
 function get_server_values($matches) {
        $return_text = "-";
        if(isset($_SERVER[$matches[1]])) { $return_text = $_SERVER[$matches[1]]; }
@@ -480,6 +484,14 @@ function get_setting_values($matches) {
        if(isset($Settings[$matches[1]])) { $return_text = $Settings[$matches[1]]; }
        if(!isset($Settings[$matches[1]])) { $return_text = null; }
        return $return_text; }
+function log_fix_get_server_values($matches) {
+       return log_fix_quotes(get_server_values($matches)); }
+function log_fix_get_cookie_values($matches) {
+       return log_fix_quotes(get_cookie_values($matches)); }
+function log_fix_get_env_values($matches) {
+       return log_fix_quotes(get_env_values($matches)); }
+function log_fix_get_setting_values($matches) {
+       return log_fix_quotes(get_setting_values($matches)); }
 function get_time($matches) {
        return date(convert_strftime($matches[1])); }
 function convert_strftime($strftime) {
@@ -525,10 +537,18 @@ $strftime = preg_replace("/\{percent\}p/s", "%", $strftime);
 return $strftime; }
 function apache_log_maker($logtxt,$logfile=null,$status=200,$contentsize="-",$headersize=0) {
 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']; }
+if(!isset($_SERVER['HTTP_REFERER'])) { $LOG_URL_REFERER = "-"; }
+if(isset($_SERVER['HTTP_REFERER'])) { $LOG_URL_REFERER = $_SERVER['HTTP_REFERER']; }
+if($LOG_URL_REFERER==""||$LOG_URL_REFERER==null) { $LOG_URL_REFERER = "-"; }
+$LOG_URL_REFERER = log_fix_quotes($LOG_URL_REFERER);
+if(!isset($_SERVER['PHP_AUTH_USER'])) { $LOG_AUTH_USER = "-"; }
+if(isset($_SERVER['PHP_AUTH_USER'])) { $LOG_AUTH_USER = $_SERVER['PHP_AUTH_USER']; }
+if($LOG_AUTH_USER==""||$LOG_AUTH_USER==null) { $LOG_AUTH_USER = "-"; }
+$LOG_AUTH_USER = log_fix_quotes($LOG_AUTH_USER);
+if(!isset($_SERVER["HTTP_USER_AGENT"])) { $LOG_USER_AGENT = "-"; }
+if(isset($_SERVER["HTTP_USER_AGENT"])) { $LOG_USER_AGENT = $_SERVER["HTTP_USER_AGENT"]; }
+if($LOG_USER_AGENT==""||$LOG_USER_AGENT==null) { $LOG_USER_AGENT = "-"; }
+$LOG_USER_AGENT = log_fix_quotes($LOG_USER_AGENT);
 $LogMemName = "-";
 if(!isset($_SESSION['MemberName'])) {
        $_SESSION['MemberName'] = null; }
@@ -536,6 +556,7 @@ if($_SESSION['MemberName']===null) {
        $LogMemName = "-"; }
 if(isset($_SESSION['MemberName'])&&$_SESSION['MemberName']!==null) {
        $LogMemName = $_SESSION['MemberName']; }
+$LogMemName = log_fix_quotes($LogMemName);
 $LogMemID = "-";
 if(!isset($_SESSION['UserID'])) {
        $_SESSION['UserID'] = 0; }
@@ -543,6 +564,7 @@ if($_SESSION['UserID']===null||$_SESSION['UserID']===0) {
        $LogMemID = "-"; }
 if(isset($_SESSION['UserID'])&&$_SESSION['UserID']!==null&&$_SESSION['UserID']!==0) {
        $LogMemID = $_SESSION['UserID']; }
+$LogMemID = log_fix_quotes($LogMemID);
 $LogGroupName = "-";
 if(!isset($_SESSION['UserGroup'])) {
        $LogGroupName = "-"; }
@@ -550,6 +572,7 @@ if(isset($_SESSION['UserGroup'])&&$_SESSION['UserGroup']===null) {
        $LogGroupName = "-"; }
 if(isset($_SESSION['UserGroup'])&&$_SESSION['UserGroup']!==null) {
        $LogGroupName = $_SESSION['UserGroup']; }
+$LogGroupName = log_fix_quotes($LogGroupName);
 $LogGroupID = "-";
 if(!isset($_SESSION['UserGroupID'])) {
        $LogGroupID = "-"; }
@@ -557,9 +580,11 @@ if(isset($_SESSION['UserGroupID'])&&$_SESSION['UserGroupID']===null) {
        $LogGroupID = "-"; }
 if(isset($_SESSION['UserGroupID'])&&$_SESSION['UserGroupID']!==null) {
        $LogGroupID = $_SESSION['UserGroupID']; }
+$LogGroupID = log_fix_quotes($LogGroupID);
 $LOG_QUERY_STRING = "";
 if($_SERVER["QUERY_STRING"]!=="") {
 $LOG_QUERY_STRING = "?".$_SERVER["QUERY_STRING"]; }
+$LOG_QUERY_STRING = log_fix_quotes($LOG_QUERY_STRING);
 $oldcontentsize = $contentsize;
 if($oldcontentsize=="-") { $oldcontentsize = 0; }
 if($contentsize===0) { $contentsize = "-"; }
@@ -567,6 +592,7 @@ if($contentsize=="-"&&$headersize!==0) { $fullsitesize = $headersize; }
 if($contentsize!="-"&&$headersize!==0) { $fullsitesize = $contentsize + $headersize; }
 if($status=="302") { $contentsize = "-"; }
 $HTTP_REQUEST_LINE = $_SERVER["REQUEST_METHOD"]." ".$_SERVER["REQUEST_URI"]." ".$_SERVER["SERVER_PROTOCOL"];
+$HTTP_REQUEST_LINE = log_fix_quotes($HTTP_REQUEST_LINE);
 $logtxt = preg_replace("/%%/s", "{percent}p", $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)a/s", $_SERVER['REMOTE_ADDR'], $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)A/s", $_SERVER["SERVER_ADDR"], $logtxt);
@@ -574,11 +600,11 @@ $logtxt = preg_replace("/%([\<\>]*?)B/s", $oldcontentsize, $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)b/s", $contentsize, $logtxt);
 $logtxt = preg_replace_callback("/%([\<\>]*?)\{([^\}]*)\}C/s", "get_cookie_values", $logtxt);
 $logtxt = preg_replace_callback("/%([\<\>]*?)\{([^\}]*)\}e/s", "get_env_values", $logtxt);
-$logtxt = preg_replace("/%([\<\>]*?)f/s", $_SERVER["SCRIPT_FILENAME"], $logtxt);
+$logtxt = preg_replace("/%([\<\>]*?)f/s", log_fix_quotes($_SERVER["SCRIPT_FILENAME"]), $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)h/s", $_SERVER['REMOTE_ADDR'], $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)H/s", $_SERVER["SERVER_PROTOCOL"], $logtxt);
-$logtxt = preg_replace("/%([\<\>]*?)\{Referer\}i/s", $URL_REFERER, $logtxt);
-$logtxt = preg_replace("/%([\<\>]*?)\{User-Agent\}i/s", $_SERVER["HTTP_USER_AGENT"], $logtxt);
+$logtxt = preg_replace("/%([\<\>]*?)\{Referer\}i/s", $LOG_URL_REFERER, $logtxt);
+$logtxt = preg_replace("/%([\<\>]*?)\{User-Agent\}i/s", $LOG_USER_AGENT, $logtxt);
 $logtxt = preg_replace_callback("/%([\<\>]*?)\{([^\}]*)\}i/s", "get_server_values", $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)l/s", "-", $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)m/s", $_SERVER["REQUEST_METHOD"], $logtxt);
@@ -588,8 +614,8 @@ $logtxt = preg_replace("/%([\<\>]*?)r/s", $HTTP_REQUEST_LINE, $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)s/s", $status, $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)t/s", "[".date("d/M/Y:H:i:s O")."]", $logtxt);
 $logtxt = preg_replace_callback("/%([\<\>]*?)\{([^\}]*)\}t/s", "get_time", $logtxt);
-$logtxt = preg_replace("/%([\<\>]*?)u/s", $AUTH_USER, $logtxt);
-$logtxt = preg_replace("/%([\<\>]*?)U/s", $_SERVER["PHP_SELF"], $logtxt);
+$logtxt = preg_replace("/%([\<\>]*?)u/s", $LOG_AUTH_USER, $logtxt);
+$logtxt = preg_replace("/%([\<\>]*?)U/s", log_fix_quotes($_SERVER["PHP_SELF"]), $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)v/s", $_SERVER["SERVER_NAME"], $logtxt);
 $logtxt = preg_replace("/%([\<\>]*?)V/s", $_SERVER["SERVER_NAME"], $logtxt);
 // Not what it should be but PHP dose not have variable to get Apache ServerName config value. :( 
diff --git a/inc/members.php b/inc/members.php
index be37122..ea5ac29 100644 (file)
--- a/inc/members.php
+++ b/inc/members.php
@@ -11,7 +11,7 @@
     Copyright 2004-2012 iDB Support - http://idb.berlios.de/
     Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: members.php - Last Update: 12/30/2011 SVN 781 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 01/01/2012 SVN 784 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -546,7 +546,7 @@ if($AmIHiddenUser=="no"&&$UserSessInfo['UserID']>0) {
 ?>
 <tr id="Member<?php echo $i; ?>" class="TableRow3">
 <td class="TableColumn3" style="text-align: center;"><?php echo $UserSessInfo['UserID']; ?></td>
-<td class="TableColumn3" style="text-align: center;"><a<?php if($GroupInfo['HasAdminCP']=="yes") { ?> title="<?php echo $session_user_agent; ?>"<?php } ?> href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$UserSessInfo['UserID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $UserSessInfo['MemberName']; ?></a>
+<td class="TableColumn3" style="text-align: center;"><a<?php if($GroupInfo['HasAdminCP']=="yes") { ?> title="<?php echo htmlentities($session_user_agent, ENT_QUOTES, $Settings['charset']); ?>"<?php } ?> href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$UserSessInfo['UserID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $UserSessInfo['MemberName']; ?></a>
 <?php if($GroupInfo['CanViewIPAddress']=="yes") { ?> ( <a title="<?php echo $session_ip_address; ?>" onclick="window.open(this.href);return false;" href="<?php echo sprintf($IPCheckURL,$session_ip_address); ?>"><?php echo $session_ip_address; ?></a> )<?php } ?></td>
 <td class="TableColumn3" style="text-align: center;"><?php echo $UserSessInfo['UserGroup']; ?></td>
 <td class="TableColumn3" style="text-align: center;"><a href="<?php echo url_maker($PreFileName,"no+ext",$PreExpPage,$Settings['qstr'],$Settings['qsep'],null,null); ?>"><?php echo $UserSessInfo['PreViewingTitle']; ?> <?php echo $UserSessInfo['ViewingTitle']; ?></a></td>
@@ -564,7 +564,7 @@ if(user_agent_check($session_user_agent)) {
 ?>
 <tr id="Member<?php echo $i; ?>" class="TableRow3">
 <td class="TableColumn3" style="text-align: center;"><?php echo $UserSessInfo['UserID']; ?></td>
-<td class="TableColumn3" style="text-align: center;"><span<?php if($GroupInfo['HasAdminCP']=="yes") { ?> title="<?php echo $session_user_agent; ?>"<?php } ?>><?php echo $UserSessInfo['GuestName']; ?></span>
+<td class="TableColumn3" style="text-align: center;"><span<?php if($GroupInfo['HasAdminCP']=="yes") { ?> title="<?php echo htmlentities($session_user_agent, ENT_QUOTES, $Settings['charset']); ?>"<?php } ?>><?php echo $UserSessInfo['GuestName']; ?></span>
 <?php if($GroupInfo['CanViewIPAddress']=="yes") { ?> ( <a title="<?php echo $session_ip_address; ?>" onclick="window.open(this.href);return false;" href="<?php echo sprintf($IPCheckURL,$session_ip_address); ?>"><?php echo $session_ip_address; ?></a> )<?php } ?></td>
 <td class="TableColumn3" style="text-align: center;"><?php echo $UserSessInfo['UserGroup']; ?></td>
 <td class="TableColumn3" style="text-align: center;"><a href="<?php echo url_maker($PreFileName,"no+ext",$PreExpPage,$Settings['qstr'],$Settings['qsep'],null,null); ?>"><?php echo $UserSessInfo['PreViewingTitle']; ?> <?php echo $UserSessInfo['ViewingTitle']; ?></a></td>
diff --git a/inc/stats.php b/inc/stats.php
index 466254c..dd9ecb7 100644 (file)
--- a/inc/stats.php
+++ b/inc/stats.php
@@ -11,7 +11,7 @@
     Copyright 2004-2012 iDB Support - http://idb.berlios.de/
     Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: stats.php - Last Update: 12/30/2011 SVN 781 - Author: cooldude2k $
+    $FileInfo: stats.php - Last Update: 01/01/2012 SVN 784 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="stats.php"||$File3Name=="/stats.php") {
@@ -55,14 +55,14 @@ if(($AmIHiddenUser=="no"&&$UserSessInfo['UserID']>0)||$user_agent_check!==false)
 if($olmbn>0) { $MembersOnline .= ", "; }
 if($user_agent_check===false) {
 $uatitleadd = null;
-if($GroupInfo['CanViewUserAgent']=="yes") { $uatitleadd = " title=\"".$session_user_agent."\""; }
+if($GroupInfo['CanViewUserAgent']=="yes") { $uatitleadd = " title=\"".htmlentities($session_user_agent, ENT_QUOTES, $Settings['charset'])."\""; }
 $MembersOnline .= "<a".$uatitleadd." href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$UserSessInfo['UserID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">".$UserSessInfo['MemberName']."</a>"; 
 if($GroupInfo['CanViewIPAddress']=="yes") {
 $MembersOnline .= " (<a title=\"".$session_ip_address."\" onclick=\"window.open(this.href);return false;\" href=\"".sprintf($IPCheckURL,$session_ip_address)."\">".$session_ip_address."</a>)"; }
 ++$olmn; ++$olmbn; }
 if($user_agent_check!==false) {
 $uatitleadd = null;
-if($GroupInfo['CanViewUserAgent']=="yes") { $uatitleadd = " title=\"".$session_user_agent."\""; }
+if($GroupInfo['CanViewUserAgent']=="yes") { $uatitleadd = " title=\"".htmlentities($session_user_agent, ENT_QUOTES, $Settings['charset'])."\""; }
 $MembersOnline .= "<span".$uatitleadd.">".$user_agent_check."</span>"; 
 if($GroupInfo['CanViewIPAddress']=="yes") {
 $MembersOnline .= " (<a title=\"".$session_ip_address."\" onclick=\"window.open(this.href);return false;\" href=\"".sprintf($IPCheckURL,$session_ip_address)."\">".$session_ip_address."</a>)"; }
@@ -72,7 +72,7 @@ if($user_agent_check===false) {
 ++$olan; } } }
 if($UserSessInfo['UserGroup']==$Settings['GuestGroup']) {
 /*$uatitleadd = null;
-if($GroupInfo['CanViewUserAgent']=="yes") { $uatitleadd = " title=\"".$session_user_agent."\""; }
+if($GroupInfo['CanViewUserAgent']=="yes") { $uatitleadd = " title=\"".htmlentities($session_user_agent, ENT_QUOTES, $Settings['charset'])."\""; }
 $GuestsOnline .= "<a".$uatitleadd." href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$MemList['ID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">".$MemList['Name']."</a>";
 if($GroupInfo['CanViewIPAddress']=="yes") {
 $GuestsOnline .= " (<a title=\"".$session_ip_address."\" onclick=\"window.open(this.href);return false;\" href=\"".sprintf($IPCheckURL,$session_ip_address)."\">".$session_ip_address."</a>)"; } */
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 61a06de..55bde5b 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2012 iDB Support - http://idb.berlios.de/
     Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 01/01/2012 SVN 783 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 01/01/2012 SVN 784 - 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] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 783;
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 784;
 $SVNDay[0] = 01; $SVNDay[1] = 01; $SVNDay[2] = 2012; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards"; $AltGM2k = "ReneeDB Team";
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