OSDN Git Service

Small update. :P
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Tue, 28 Jun 2011 05:25:05 +0000 (05:25 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Tue, 28 Jun 2011 05:25:05 +0000 (05:25 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@684 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/misc/useragents.php
inc/versioninfo.php
sql.php

index 1709f4d..92a1162 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: useragents.php - Last Update: 06/23/2011 SVN 681 - Author: cooldude2k $
+    $FileInfo: useragents.php - Last Update: 06/28/2011 SVN 684 - Author: cooldude2k $
 */
 // User Agent Checker
 function user_agent_check($user_agent) {
@@ -215,6 +215,8 @@ if (preg_match("/".preg_quote("Yandex", "/")."/i", $user_agent)) {
     return "Yandex"; }
 if (preg_match("/".preg_quote("YoudaoBot", "/")."/i", $user_agent)) {
     return "YoudaoBot"; }
+if (preg_match("/".preg_quote("YodaoBot", "/")."/i", $user_agent)) {
+    return "YodaoBot"; }
 if (preg_match("/".preg_quote("Yeti", "/")."/i", $user_agent)) {
     return "NHN Naver"; }
        return false; }
index 00af58e..49e3347 100644 (file)
@@ -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/24/2011 SVN 683 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 06/28/2011 SVN 684 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,12 +27,34 @@ 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 = 683;
-$SVNDay[0] = 06; $SVNDay[1] = 24; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 684;
+$SVNDay[0] = 06; $SVNDay[1] = 28; $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";
 if(!isset($Settings['usealtname'])) { $Settings['usealtname'] = "no"; }
 if(isset($Settings['usealtname'])&&$Settings['usealtname']=="yes") {
+if(isset($iDBAltName['VER1'][0])) { $VER1[0] = $iDBAltName['VER1'][0]; }
+if(isset($iDBAltName['VER1'][1])) { $VER1[1] = $iDBAltName['VER1'][1]; }
+if(isset($iDBAltName['VER1'][2])) { $VER1[2] = $iDBAltName['VER1'][2]; }
+if(isset($iDBAltName['VER1'][0])&&
+       isset($iDBAltName['VER1'][1])&&
+       isset($iDBAltName['VER1'][2])) { 
+       $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; }
+if(isset($iDBAltName['VER2'][0])) { $VER2[0] = $iDBAltName['VER2'][0]; }
+if(isset($iDBAltName['VER2'][1])) { $VER2[1] = $iDBAltName['VER2'][1]; }
+if(isset($iDBAltName['VER2'][2])) { $VER2[2] = $iDBAltName['VER2'][2]; }
+if(isset($iDBAltName['SubVerN'])) { $SubVerN = $iDBAltName['SubVerN']; }
+if(isset($iDBAltName['SVNDay'][0])) { $SVNDay[0] = $iDBAltName['SVNDay'][0]; }
+if(isset($iDBAltName['SVNDay'][1])) { $SVNDay[1] = $iDBAltName['SVNDay'][1]; }
+if(isset($iDBAltName['SVNDay'][2])) { $SVNDay[2] = $iDBAltName['SVNDay'][2]; }
+if(isset($iDBAltName['SVNDay'][0])&&
+       isset($iDBAltName['SVNDay'][1])&&
+       isset($iDBAltName['SVNDay'][2])) { 
+       $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; }
+if(isset($iDBAltName['AltName'])) { $AltName = $iDBAltName['AltName']; }
+if(isset($iDBAltName['AltName2'])) { $AltName2 = $iDBAltName['AltName2']; }
+if(isset($iDBAltName['AltFullName'])) { $AltFullName = $iDBAltName['AltFullName']; } }
+if(isset($Settings['usealtname'])&&$Settings['usealtname']=="yes") {
        //$RName = $AltName; $SFName = $AltName2; $RFullName = $AltFullName;
        $RName = $AltName2; $SFName = $AltName; $RFullName = $AltFullName; }
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
diff --git a/sql.php b/sql.php
index 6deaa01..42b7e4b 100644 (file)
--- 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/24/2011 SVN 682 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 06/28/2011 SVN 684 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -48,6 +48,10 @@ if ($File3Name=="sql.php"||$File3Name=="/sql.php") {
        exit(); }
 if(file_exists('settings.php')) {
        require_once('settings.php'); 
+       if(file_exists('extrasettings.php')) {
+               require_once('extrasettings.php'); }
+       if(file_exists('extendsettings.php')) {
+               require_once('extendsettings.php'); }
 if(!in_array("ini_set", $disfunc)&&$Settings['qstr']!="/"&&$Settings['qstr']!="&") {
 ini_set("arg_separator.output",htmlentities($Settings['qstr'], ENT_QUOTES, $Settings['charset']));
 ini_set("arg_separator.input",$Settings['qstr']); } }