From aae12576c9ce6a05b9ac38c912283be191f4de34 Mon Sep 17 00:00:00 2001 From: Kazuki Suzuki Przyborowski Date: Wed, 6 Apr 2022 20:25:41 -0500 Subject: [PATCH] Add files via upload --- inc/function.php | 4 ++-- inc/groupsetup.php | 2 +- inc/html5.php | 2 +- inc/iwrapper.php | 2 +- inc/navbar.php | 3 ++- inc/versioninfo.php | 4 ++-- install.php | 10 ++++++---- setup/html5.php | 10 ++++++++-- sql.php | 20 +++++++++++--------- 9 files changed, 34 insertions(+), 23 deletions(-) diff --git a/inc/function.php b/inc/function.php index 303a0bf..b9eae61 100644 --- a/inc/function.php +++ b/inc/function.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: function.php - Last Update: 08/02/2019 SVN 905 - Author: cooldude2k $ + $FileInfo: function.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="function.php"||$File3Name=="/function.php") { @@ -419,7 +419,7 @@ if(!isset($_GET['id'])) { $_GET['id'] = null; } if(!isset($_GET['debug'])) { $_GET['debug'] = "false"; } if(!isset($_GET['post'])) { $_GET['post'] = null; } if(!isset($_POST['License'])) { $_POST['License'] = null; } } -if($_SERVER['PATH_INFO']==null) { +if(isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO']==null) { if(getenv('PATH_INFO')!=null&&getenv('PATH_INFO')!="1") { $_SERVER['PATH_INFO'] = getenv('PATH_INFO'); } if(getenv('PATH_INFO')==null) { diff --git a/inc/groupsetup.php b/inc/groupsetup.php index 95afe6a..f716272 100644 --- a/inc/groupsetup.php +++ b/inc/groupsetup.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: groupsetup.php - Last Update: 4/6/2022 SVN 944 - Author: cooldude2k $ + $FileInfo: groupsetup.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="groupsetup.php"||$File3Name=="/groupsetup.php") { diff --git a/inc/html5.php b/inc/html5.php index 83accee..c02d870 100644 --- a/inc/html5.php +++ b/inc/html5.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: html5.php - Last Update: 4/6/2022 SVN 944 - Author: cooldude2k $ + $FileInfo: html5.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="html5.php"||$File3Name=="/html5.php") { diff --git a/inc/iwrapper.php b/inc/iwrapper.php index 3acd89c..dfc339a 100644 --- a/inc/iwrapper.php +++ b/inc/iwrapper.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: iwrapper.php - Last Update: 4/6/2022 SVN 944 - Author: cooldude2k $ + $FileInfo: iwrapper.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="iwrapper.php"||$File3Name=="/iwrapper.php") { diff --git a/inc/navbar.php b/inc/navbar.php index 227313e..a13b9d6 100644 --- a/inc/navbar.php +++ b/inc/navbar.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: navbar.php - Last Update: 08/02/2019 SVN 905 - Author: cooldude2k $ + $FileInfo: navbar.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="navbar.php"||$File3Name=="/navbar.php") { @@ -36,6 +36,7 @@ $AmIHidden = $PreAmIHidden['Hidden']; } $NavBarCurMonth = $usercurtime->format("m"); $NavBarCurYear = $usercurtime->format("Y"); $NavBarCurDate = $NavBarCurMonth.$NavBarCurYear; +if(!isset($idbpowertitle)) { $idbpowertitle = null; } ?>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php index fa30f3f..56ffa5b 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: versioninfo.php - Last Update: 4/6/2022 SVN 944 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 4/6/2022 SVN 946 - 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] = 5; $VER1[2] = 4; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 944; $GitRevN = '$Id$'; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 946; $GitRevN = '$Id$'; $SVNDay[0] = 4; $SVNDay[1] = 6; $SVNDay[2] = 2022; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; $AltName = "DF2k"; $AltName2 = "DF2k"; $RName = "iDB"; $SFName = "IntDB"; $RFullName = "Internet Discussion Boards"; $AltFullName = "Discussion Forums 2k"; $AltGM2k = "Game Maker 2k"; diff --git a/install.php b/install.php index ba4113d..1e469ef 100644 --- a/install.php +++ b/install.php @@ -12,7 +12,7 @@ Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 iDB Installer made by Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2support/category.php?act=view&id=2 - $FileInfo: install.php - Last Update: 11/27/2020 SVN 926 - Author: cooldude2k $ + $FileInfo: install.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ *//* if(ini_get("register_globals")) { require_once('inc/misc/killglobals.php'); } @@ -30,7 +30,7 @@ if(!in_array("ini_set", $disfunc)) { @ini_set("report_memleaks", false); @ini_set("display_startup_errors", false); //@ini_set("error_log","logs/error.log"); -//@ini_set("log_errors","On"); +//@ini_set("log_errors","On"); @ini_set("docref_ext", ""); @ini_set("docref_root", "http://php.net/"); } if(!defined("E_DEPRECATED")) { define("E_DEPRECATED", 0); } @@ -98,7 +98,8 @@ if ($_GET['act']!="Part4"&&$_POST['act']!="Part4") { $SetupDir['setup'] = "setup/"; $ConvertDir['setup'] = $SetupDir['setup']; $SetupDir['sql'] = "setup/sql/"; $SetupDir['convert'] = "setup/convert/"; $ConvertDir['convert'] = $SetupDir['convert']; $ConvertDir['sql'] = $SetupDir['sql']; $Settings['output_type'] = "html"; $Settings['html_type'] = "html5"; -$Settings['board_name'] = $iDB; +if(isset($iD)) { +$Settings['board_name'] = $iDB; } if(!isset($Settings['charset'])) { $Settings['charset'] = "ISO-8859-15"; header("Content-Type: text/html; charset=ISO-8859-15"); } @@ -165,13 +166,14 @@ function get_theme_values($matches) { if(!isset($ThemeSet[$matches[1]])) { $return_text = null; } return $return_text; } foreach($ThemeSet AS $key => $value) { + if(isset($ThemeSet[$key])) { $ThemeSet[$key] = preg_replace("/%%/s", "{percent}p", $ThemeSet[$key]); $ThemeSet[$key] = preg_replace_callback("/%\{([^\}]*)\}T/s", "get_theme_values", $ThemeSet[$key]); $ThemeSet[$key] = preg_replace_callback("/%\{([^\}]*)\}e/s", "get_env_values", $ThemeSet[$key]); $ThemeSet[$key] = preg_replace_callback("/%\{([^\}]*)\}i/s", "get_server_values", $ThemeSet[$key]); $ThemeSet[$key] = preg_replace_callback("/%\{([^\}]*)\}s/s", "get_setting_values", $ThemeSet[$key]); $ThemeSet[$key] = preg_replace_callback("/%\{([^\}]*)\}t/s", "get_time", $ThemeSet[$key]); - $ThemeSet[$key] = preg_replace("/\{percent\}p/s", "%", $ThemeSet[$key]); } + $ThemeSet[$key] = preg_replace("/\{percent\}p/s", "%", $ThemeSet[$key]); } } require($SetupDir['convert'].'info.php'); require($SetupDir['setup'].'html5.php'); $Error = null; $_GET['time'] = false; diff --git a/setup/html5.php b/setup/html5.php index 110c080..149b20d 100644 --- a/setup/html5.php +++ b/setup/html5.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: html5.php - Last Update: 11/27/2020 SVN 928 - Author: cooldude2k $ + $FileInfo: html5.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="xhtml10.php"||$File3Name=="/xhtml10.php") { @@ -201,7 +201,13 @@ if(strpos($_SERVER['HTTP_USER_AGENT'], "msie") && - + diff --git a/sql.php b/sql.php index b80babb..bb5cc66 100644 --- a/sql.php +++ b/sql.php @@ -11,7 +11,7 @@ Copyright 2004-2019 iDB Support - https://idb.osdn.jp/support/category.php?act=view&id=1 Copyright 2004-2019 Game Maker 2k - https://idb.osdn.jp/support/category.php?act=view&id=2 - $FileInfo: sql.php - Last Update: 4/6/2022 SVN 944 - Author: cooldude2k $ + $FileInfo: sql.php - Last Update: 4/6/2022 SVN 946 - Author: cooldude2k $ */ /* Some ini setting changes uncomment if you need them. Display PHP Errors */ @@ -82,28 +82,30 @@ function unparse_url($parsed_url) { return $scheme.$user.$pass.$host.$port.$path.$query.$fragment; } $OrgBoardURL = $Settings['idburl']; -$PreBestURL = parse_url($Settings['idburl']); +if(isset($Settings['idburl'])) { +$PreBestURL = parse_url($Settings['idburl']); } $PreServURL = parse_url((isset($_SERVER['HTTPS']) ? "https" : "http") . "://".$_SERVER['HTTP_HOST'].substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '/') + 1)); -if($PreBestURL['host']=="localhost.url"&&str_replace("/", "", $PreBestURL['path'])=="localpath") { +if(isset($PreBestURL['host'])&&$PreBestURL['host']=="localhost.url"&&str_replace("/", "", $PreBestURL['path'])=="localpath") { $PreBestURL['host'] = "localhost"; $PreBestURL['path'] = $PreServURL['path']; $Settings['idburl'] = unparse_url($PreBestURL); } -if($PreBestURL['host']=="localhost.url"&&str_replace("/", "", $PreBestURL['path'])!="localpath") { +if(isset($PreBestURL['host'])&&$PreBestURL['host']=="localhost.url"&&str_replace("/", "", $PreBestURL['path'])!="localpath") { $PreBestURL['host'] = $PreServURL['host']; $Settings['idburl'] = unparse_url($PreBestURL); } -if($PreBestURL['host']!="localhost.url"&&str_replace("/", "", $PreBestURL['path'])=="localpath") { +if(isset($PreBestURL['host'])&&$PreBestURL['host']!="localhost.url"&&str_replace("/", "", $PreBestURL['path'])=="localpath") { $PreBestURL['path'] = $PreServURL['path']; $Settings['idburl'] = unparse_url($PreBestURL); } $OrgWebSiteURL = $Settings['weburl']; -$PreWestURL = parse_url($Settings['weburl']); -if($PreWestURL['host']=="localhost.url"&&str_replace("/", "", $PreWestURL['path'])=="localpath") { +if(isset($Settings['idburl'])) { +$PreWestURL = parse_url($Settings['weburl']); } +if(isset($PreWestURL['host'])&&$PreWestURL['host']=="localhost.url"&&str_replace("/", "", $PreWestURL['path'])=="localpath") { $PreWestURL['host'] = $PreServURL['host']; $PreWestURL['path'] = $PreServURL['path']; $Settings['weburl'] = unparse_url($PreWestURL); } -if($PreWestURL['host']=="localhost.url"&&str_replace("/", "", $PreWestURL['path'])!="localpath") { +if(isset($PreWestURL['host'])&&$PreWestURL['host']=="localhost.url"&&str_replace("/", "", $PreWestURL['path'])!="localpath") { $PreWestURL['host'] = $PreServURL['host']; $Settings['weburl'] = unparse_url($PreWestURL); } -if($PreWestURL['host']!="localhost.url"&&str_replace("/", "", $PreWestURL['path'])=="localpath") { +if(isset($PreWestURL['host'])&&$PreWestURL['host']!="localhost.url"&&str_replace("/", "", $PreWestURL['path'])=="localpath") { $PreWestURL['path'] = $PreServURL['path']; $Settings['weburl'] = unparse_url($PreWestURL); } if(!isset($Settings['fixbasedir'])) { $Settings['fixbasedir'] = null; } -- 2.11.0